From 4a78d458cc5488db1c49ccdc3484ef9dbc4c25b0 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 26 Jun 2023 19:03:17 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.production b/.env.production index 41898042..d4bcb835 100644 --- a/.env.production +++ b/.env.production @@ -8,7 +8,7 @@ ENV = 'production' #林纪裕cd -VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:81/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:81/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/' @@ -25,7 +25,7 @@ VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:81/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/' # 平潭正式 -# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' +VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' # 吴总测试服务器 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' From bdf245e83dccdf6971993196c5f7f54729e285eb Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 26 Jun 2023 22:35:52 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/busType/bussinessTypeModify.vue | 74 +- src/views/inout/DialogCreateOrder.vue | 19 +- src/views/inout/IoCreateBusOrder.vue | 16 +- src/views/inout/IoCreateErrorOrder.vue | 16 +- src/views/inout/IoCreateOrder.vue | 16 +- src/views/inout/IoCreateScanOrder.vue | 40 +- src/views/inout/IoDealCheckOrder.vue | 705 ++++++++++++++++++ src/views/inout/IoDealOrder.vue | 16 +- .../inout/PanelCreateOrderCheckDetail.vue | 413 ++++++++++ 9 files changed, 1233 insertions(+), 82 deletions(-) create mode 100644 src/views/inout/IoDealCheckOrder.vue create mode 100644 src/views/inout/PanelCreateOrderCheckDetail.vue diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue index 24280f0f..9ac57337 100644 --- a/src/views/basic/busType/bussinessTypeModify.vue +++ b/src/views/basic/busType/bussinessTypeModify.vue @@ -552,10 +552,10 @@ - - - - + + + + @@ -575,10 +575,10 @@ - - - - + + + + @@ -598,10 +598,10 @@ - - - - + + + + @@ -621,10 +621,10 @@ - - - - + + + + @@ -644,10 +644,10 @@ - - - - + + + + @@ -667,10 +667,10 @@ - - - - + + + + @@ -689,10 +689,10 @@ - - - - + + + + @@ -712,10 +712,10 @@ - - - - + + + + @@ -734,11 +734,10 @@ - - - - - + + + + @@ -747,7 +746,6 @@ - diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index e4c53f00..05dad06a 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -386,6 +386,14 @@ + + + 删除 - 提交校验 - + + + + + + + + diff --git a/src/views/inout/IoCreateErrorOrder.vue b/src/views/inout/IoCreateErrorOrder.vue index da88a6ba..2697302a 100644 --- a/src/views/inout/IoCreateErrorOrder.vue +++ b/src/views/inout/IoCreateErrorOrder.vue @@ -151,14 +151,14 @@ >删除 - 校验提交 - + + + + + + + + diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue index 32bccd1c..f24a02b1 100644 --- a/src/views/inout/IoCreateOrder.vue +++ b/src/views/inout/IoCreateOrder.vue @@ -186,14 +186,14 @@ >删除 - 校验提交 - + + + + + + + + diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue index daaf65f9..b5a2cefb 100644 --- a/src/views/inout/IoCreateScanOrder.vue +++ b/src/views/inout/IoCreateScanOrder.vue @@ -104,11 +104,12 @@ 新增单据 + 异常扫码单 @@ -155,14 +156,14 @@ >删除 - 提交校验 - + + + + + + + + @@ -182,6 +183,19 @@ :viewType="viewType" > + + + +
+ + + + + + + + + + + + + + + + + + + + + + + {{ item.name }} + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ item.name }} + + + + + + + + + + + + + + + + + + +
+ + 显示/隐藏搜索栏 + 重置 + + 查询 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 单据 {{ currentRow == null ? '' : currentRow.billNo }}-业务扫码校验结果 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue index e9f24dc7..d5fcd26a 100644 --- a/src/views/inout/IoDealOrder.vue +++ b/src/views/inout/IoDealOrder.vue @@ -128,7 +128,7 @@ {{ scope.row.createTime }} - + @@ -165,13 +165,13 @@ >删除 - 校验提交 - + + + + + + + diff --git a/src/views/inout/PanelCreateOrderCheckDetail.vue b/src/views/inout/PanelCreateOrderCheckDetail.vue new file mode 100644 index 00000000..c8759171 --- /dev/null +++ b/src/views/inout/PanelCreateOrderCheckDetail.vue @@ -0,0 +1,413 @@ + + + + + + + From f89cbb534010234ecdf89b22241b764aaab3ef37 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 27 Jun 2023 18:43:10 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inout/order.js | 12 ++ src/views/basic/product/productEdit.vue | 2 +- src/views/inout/DialogCreateOrder.vue | 109 ++++++++++++++---- src/views/inout/IoDealCheckOrder.vue | 7 +- src/views/inout/IoDealOrder.vue | 7 +- .../inout/PanelCreateOrderCheckDetail.vue | 9 +- 6 files changed, 120 insertions(+), 26 deletions(-) diff --git a/src/api/inout/order.js b/src/api/inout/order.js index 903376ab..50853826 100644 --- a/src/api/inout/order.js +++ b/src/api/inout/order.js @@ -553,3 +553,15 @@ export function orderChange(query) { }); } + + +export function rollbackWaitcheck(params) { + return axios({ + url: "/udiwms/inout/order/waitCheck/rollback", + method: "get", + params: params + }); +} + + + diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue index 96027f24..5a2ed847 100644 --- a/src/views/basic/product/productEdit.vue +++ b/src/views/basic/product/productEdit.vue @@ -345,7 +345,7 @@ + type="number" v-model="editQuery.useNum"> diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index 05dad06a..7ca663da 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -22,23 +22,29 @@ >草稿保存 立即提交 - 待配货提交 - + 完成验收 + >撤回单据 - 完成验收 - + + + + + + + + + + + + + + + @@ -69,7 +75,6 @@ - - + > - - + + {{ checkTip }} + + 取消 + 确定 + + + @@ -524,7 +539,7 @@ import { submitOrderWeb, saveOrderWeb, updateCodeBindSup, - enterCodeWeb, submitAllocateBiz, + enterCodeWeb, submitAllocateBiz, rollbackWaitcheck, } from "../../api/inout/order"; import {filterSubAll, findByFrom, findInvByUser} from "../../api/system/invSubWarehouse"; import {parseTime} from "../../utils/coTools"; @@ -618,7 +633,7 @@ export default { fromOptions: [], isCodeAlive: true, bizShow: true, - isCheckResultAlive: false, + isCheckResultAlive: true, isBizDetailAlive: true, isCodeDetailAlive: true, editCodeVisible: false, @@ -679,6 +694,8 @@ export default { preSpaceShow: false, //寄售，预验收仓库界面 spaceCodeList: [], + checkTipDialogVisible: false, + checkTip: null, }; }, components: { @@ -1189,18 +1206,66 @@ export default { this.isCodeAlive = false; this.isBizDetailAlive = false; this.isCodeDetailAlive = false; + this.$nextTick(() => { //重新加载组件 this.isCodeAlive = true; this.isBizDetailAlive = true; this.isCodeDetailAlive = true; + }); + + //选择性刷新 + if (this.isCheckResultAlive) { + this.isCheckResultAlive = false; + this.$nextTick(() => { + //重新加载组件 + this.isCheckResultAlive = true; + }); + } }, refreshOrder(orderQuery) { this.orderFormData = orderQuery; }, + //撤回单据 + revokeBill() { + this.$confirm("是否确定撤回改单据?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + let query = {billNo: this.orderFormData.billNo}; + + rollbackWaitcheck(query) + .then((response) => { + if (response.code == 20000) { + this.$message.success("撤回成功！"); + } else { + this.$message.error(response.message); + } + }) + .catch(() => { + }); + }) + .catch(() => { + }); + }, + + + //待校验以扫码结果为准 + submitCodeResult() { + + }, + + //待校验以正确结果为准 + submitCheckResult() { + + }, + + submit(val) { if (this.$isBlank(this.orderFormData.action)) { this.$message.warning("单据类型不能为空！"); @@ -1262,7 +1327,11 @@ export default { this.$message.error(response.message); } }); - } else { //校验后提交 + } + if (this.viewType = 7) { //待校验提交 + + + } else { //配货拣货后后提交 submitOrderWeb(tQuery).then((response) => { if (response.code === 20000) { this.$message.success("提交成功"); diff --git a/src/views/inout/IoDealCheckOrder.vue b/src/views/inout/IoDealCheckOrder.vue index edc56719..f7612135 100644 --- a/src/views/inout/IoDealCheckOrder.vue +++ b/src/views/inout/IoDealCheckOrder.vue @@ -342,6 +342,7 @@ export default { startTime: null, endTime: null, invCode: this.$store.getters.locInvCode, + vueType: "waitCheck", }, viewType: 7, checkStatus: { @@ -460,6 +461,7 @@ export default { limit: 10, startTime: null, endTime: null, + vueType: "waitCheck", invCode: this.$store.getters.locInvCode, }; this.actDateRange = []; @@ -495,7 +497,7 @@ export default { let query = { code: this.filterQuery.invCode, enabled: true, - vueType: "supDelivery", + vueType: "waitCheck", }; getLocalJoinByUser(query) .then((response) => { @@ -639,6 +641,9 @@ export default { if (!row.checkSuccess) { rowBackground.color = '#f60303'; } + if (row.count != row.scanCount) { + rowBackground.color = '#f60303'; + } return rowBackground; }, diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue index d5fcd26a..efaced76 100644 --- a/src/views/inout/IoDealOrder.vue +++ b/src/views/inout/IoDealOrder.vue @@ -366,6 +366,7 @@ export default { startTime: null, endTime: null, invCode: this.$store.getters.locInvCode, + vueType: "waitDeal", }, viewType: 3, checkStatus: { @@ -484,6 +485,7 @@ export default { limit: 10, startTime: null, endTime: null, + vueType: "waitDeal", invCode: this.$store.getters.locInvCode, }; this.actDateRange = []; @@ -519,7 +521,7 @@ export default { let query = { code: this.filterQuery.invCode, enabled: true, - vueType: "supDelivery", + vueType: "waitDeal", }; getLocalJoinByUser(query) .then((response) => { @@ -664,6 +666,9 @@ export default { if (!row.checkSuccess) { rowBackground.color = '#f60303'; } + if (row.count != row.scanCount) { + rowBackground.color = '#f60303'; + } return rowBackground; }, diff --git a/src/views/inout/PanelCreateOrderCheckDetail.vue b/src/views/inout/PanelCreateOrderCheckDetail.vue index c8759171..163d7b17 100644 --- a/src/views/inout/PanelCreateOrderCheckDetail.vue +++ b/src/views/inout/PanelCreateOrderCheckDetail.vue @@ -151,11 +151,11 @@ export default { methods: { getOrderDetails() { this.loading = true; - this.query.orderId = this.idQuery.billNo; + this.query.orderIdFk = this.idQuery.billNo; getCheckDetailList(this.query) //查找该单号下的所有条码 .then((response) => { - this.detailList = response.data.list || []; - this.total = response.data.total || 0; + this.detailList = response.data || []; + this.total = response.data || 0; this.loading = false; }) .catch(() => { @@ -198,6 +198,9 @@ export default { if (!row.checkSuccess) { rowBackground.color = '#f60303'; } + if (row.count != row.scanCount) { + rowBackground.color = '#f60303'; + } return rowBackground; }, From a9b1ea3f754b3fb73917f4c368e31fb01679bf46 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 27 Jun 2023 19:15:01 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/thirdSys/api/DialogEditBusDown.vue | 2 +- src/views/thirdSys/api/DialogEditBusUpload.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/thirdSys/api/DialogEditBusDown.vue b/src/views/thirdSys/api/DialogEditBusDown.vue index 97837bec..44d8f451 100644 --- a/src/views/thirdSys/api/DialogEditBusDown.vue +++ b/src/views/thirdSys/api/DialogEditBusDown.vue @@ -35,7 +35,7 @@ :value="item.action"> {{ item.name }} {{ - item.remark + item.action }} diff --git a/src/views/thirdSys/api/DialogEditBusUpload.vue b/src/views/thirdSys/api/DialogEditBusUpload.vue index 2ff051db..3be68aee 100644 --- a/src/views/thirdSys/api/DialogEditBusUpload.vue +++ b/src/views/thirdSys/api/DialogEditBusUpload.vue @@ -35,7 +35,7 @@ :value="item.action"> {{ item.name }} {{ - item.remark + item.action }} From a22b6520d76e7ecdbfa6ec18a829a44bc91220a0 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 29 Jun 2023 10:40:22 +0800 Subject: [PATCH 05/13] =?UTF-8?q?UDI=E5=BE=85=E6=A0=A1=E9=AA=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inout/order.js | 17 ++++- src/api/inout/orderDetailCode.js | 9 +++ src/views/inout/DialogCreateOrder.vue | 78 ++++++++++++++++++----- src/views/inout/PanelCreateOrderCodes.vue | 74 ++++++++++++++++----- 4 files changed, 145 insertions(+), 33 deletions(-) diff --git a/src/api/inout/order.js b/src/api/inout/order.js index 50853826..6b4f02b2 100644 --- a/src/api/inout/order.js +++ b/src/api/inout/order.js @@ -554,7 +554,6 @@ export function orderChange(query) { } - export function rollbackWaitcheck(params) { return axios({ url: "/udiwms/inout/order/waitCheck/rollback", @@ -564,4 +563,20 @@ export function rollbackWaitcheck(params) { } +export function submitCodeResult(query) { + return axios({ + url: "/warehouse/inout/codeResult/submitOrderWeb", + method: "post", + data: query + }); +} + +export function submitCheckResult(query) { + return axios({ + url: "/warehouse/inout/codeCheck/submitOrderWeb", + method: "post", + data: query + }); +} + diff --git a/src/api/inout/orderDetailCode.js b/src/api/inout/orderDetailCode.js index 332e1e82..895b8d42 100644 --- a/src/api/inout/orderDetailCode.js +++ b/src/api/inout/orderDetailCode.js @@ -9,6 +9,15 @@ export function getDetailCodes(query) { }); } + +export function getCheckDetailCodes(query) { + return axios({ + url: "/admin/warehouse/inout/findCheckCode", + method: "get", + params: query + }); +} + //获取业务明细 export function getDetailBizs(query) { return axios({ diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index 7ca663da..135a7c10 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -22,12 +22,19 @@ >草稿保存 立即提交 - 撤回单据 + 校验结果提交 + + 扫码结果提交 + + + 撤回单据 @@ -429,7 +436,6 @@ > - {{ checkTip }} 取消 - 确定 + + + + 校验结果提交 + 扫码结果提交 @@ -539,7 +550,7 @@ import { submitOrderWeb, saveOrderWeb, updateCodeBindSup, - enterCodeWeb, submitAllocateBiz, rollbackWaitcheck, + enterCodeWeb, submitAllocateBiz, rollbackWaitcheck, submitCodeResult, submitCheckResult, } from "../../api/inout/order"; import {filterSubAll, findByFrom, findInvByUser} from "../../api/system/invSubWarehouse"; import {parseTime} from "../../utils/coTools"; @@ -1231,7 +1242,7 @@ export default { //撤回单据 revokeBill() { - this.$confirm("是否确定撤回改单据?", "提示", { + this.$confirm("是否确定撤回单据至草稿状态?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", @@ -1255,14 +1266,32 @@ export default { }, - //待校验以扫码结果为准 - submitCodeResult() { + submitCheckDialog() { + this.checkTipDialogVisible = true; + }, + //待校验以扫码结果为准 + submitCodeResult(query) { + submitCodeResult(query).then((response) => { + if (response.code === 20000) { + this.$message.success("提交成功"); + this.closeDialog(); + } else { + this.$message.error(response.message); + } + }); }, //待校验以正确结果为准 - submitCheckResult() { - + submitCheckResult(query) { + submitCheckResult(query).then((response) => { + if (response.code === 20000) { + this.$message.success("提交成功"); + this.closeDialog(); + } else { + this.$message.error(response.message); + } + }); }, @@ -1289,13 +1318,10 @@ export default { return; } } - - let tQuery = Object.assign( JSON.parse(JSON.stringify(this.orderFormData)) ); tQuery.orderId = this.orderFormData.billNo; - console.log(this.curAction) if (this.viewType == 2) { //扫码单据立即提交 submitCodes(tQuery).then((response) => { if (response.code === 20000) { @@ -1329,8 +1355,31 @@ export default { }); } if (this.viewType = 7) { //待校验提交 + if (val = 1) { + this.$confirm("此操作将以校验的正确结果重新生成业务单并提交，是否继续？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.submitCheckResult(tQuery); + }) + .catch(() => { + }); + } else { + this.$confirm("此操作将以扫码结果重新生成业务单并提交，是否继续？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.submitCodeResult(tQuery); + }) + .catch(() => { + }); + } } else { //配货拣货后后提交 submitOrderWeb(tQuery).then((response) => { if (response.code === 20000) { @@ -1341,7 +1390,6 @@ export default { } }); } - }, saveOrder() { let tQuery = Object.assign( diff --git a/src/views/inout/PanelCreateOrderCodes.vue b/src/views/inout/PanelCreateOrderCodes.vue index 3492962d..99c69382 100644 --- a/src/views/inout/PanelCreateOrderCodes.vue +++ b/src/views/inout/PanelCreateOrderCodes.vue @@ -94,13 +94,24 @@ + + + +
红色:多余条码 + + +
+ 黄色:包含多余条码 + + +
@@ -166,6 +177,7 @@ import selectRlDialog from "./DialogSelectRl"; import DialogSelectUnit from "./DialogSelectUnit"; import editCodeDialog from "./DialogEditCode"; import {parseTime} from "@/utils/coTools"; +import {getCheckDetailCodes} from "@/api/inout/orderDetailCode"; export default { name: "IoAddCodeDetail", @@ -189,6 +201,10 @@ export default { editTitle: { type: Object, required: true, + }, + viewType: { + type: Object, + required: true, } }, @@ -214,22 +230,41 @@ export default { getCodeList() { this.loading = true; this.query.orderId = this.idQuery.billNo; - errorCodeList(this.query) //查找该单号下的所有条码 - .then((response) => { - this.codeArray = response.data.list || []; - this.total = response.data.total || 0; - for (let i = 0; i < this.codeArray.length; i++) { - this.codeArray[i].fromType = this.formData.fromType; - this.codeArray[i].billType = this.formData.billType; - } - this.tableSelection(); - this.loading = false; - }) - .catch(() => { - this.loading = false; - this.list = []; - this.total = 0; - }); + + if (this.viewType == 7) { + //展示带校验条码 + getCheckDetailCodes(this.query) //查找该单号下的所有条码 + .then((response) => { + this.codeArray = response.data.list || []; + this.total = response.data.total || 0; + this.loading = false; + }) + .catch(() => { + this.loading = false; + this.detailList = []; + this.total = 0; + }); + + } else { + errorCodeList(this.query) //查找该单号下的所有条码 + .then((response) => { + this.codeArray = response.data.list || []; + this.total = response.data.total || 0; + for (let i = 0; i < this.codeArray.length; i++) { + this.codeArray[i].fromType = this.formData.fromType; + this.codeArray[i].billType = this.formData.billType; + } + this.tableSelection(); + this.loading = false; + }) + .catch(() => { + this.loading = false; + this.list = []; + this.total = 0; + }); + } + + }, deleteCode(index, row) { @@ -277,6 +312,11 @@ export default { if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.relId)) { rowBackground.color = '#f60303'; } + if (row.checkStatus == 2) { + rowBackground.color = '#F7BB29'; + } else if (row.checkStatus == 1) { + rowBackground.color = '#FC4A45'; + } return rowBackground; }, From ebdd11e4e4dc3f607ddcb52e413a85e7a7d8f889 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 30 Jun 2023 11:14:36 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 +- src/views/inout/DialogCreateOrder.vue | 102 +++++++++++----------- src/views/inout/PanelCreateOrderCodes.vue | 36 ++++++-- 3 files changed, 83 insertions(+), 59 deletions(-) diff --git a/.env.production b/.env.production index d4bcb835..4405b8bc 100644 --- a/.env.production +++ b/.env.production @@ -18,14 +18,14 @@ ENV = 'production' # 文明东1 # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/' # 文明东2 -# VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/' +VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/' # VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER" 刘恩典 # VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/' # 平潭正式 -VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' # 吴总测试服务器 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index 135a7c10..b2090e8b 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -8,52 +8,56 @@ label-width="110px" style="margin-bottom: -15px" > - - 选入预验收库单 - - 草稿保存 - - 立即提交 - - - 校验结果提交 - - 扫码结果提交 - - - 撤回单据 - - - - - - - - - - - - - - - - - - - + + + 选入预验收库单 + + 草稿保存 + + 立即提交 + + + 校验结果提交 + + 扫码结果提交 + + + 撤回单据 + + + + + + + + + + + + + + + + + + + + + + @@ -1254,6 +1258,7 @@ export default { .then((response) => { if (response.code == 20000) { this.$message.success("撤回成功！"); + this.closeDialog(); } else { this.$message.error(response.message); } @@ -1353,9 +1358,8 @@ export default { this.$message.error(response.message); } }); - } - if (this.viewType = 7) { //待校验提交 - if (val = 1) { + } else if (this.viewType == 7) { //待校验提交 + if (val == 1) { this.$confirm("此操作将以校验的正确结果重新生成业务单并提交，是否继续？", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", diff --git a/src/views/inout/PanelCreateOrderCodes.vue b/src/views/inout/PanelCreateOrderCodes.vue index 99c69382..00510b12 100644 --- a/src/views/inout/PanelCreateOrderCodes.vue +++ b/src/views/inout/PanelCreateOrderCodes.vue @@ -15,6 +15,18 @@ width="280" show-overflow-tooltip > + + - - - -
红色:多余条码 - - -
- 黄色:包含多余条码 + + +
+ +
+ + 红色:多余条码 + +
+ + + 黄色:包含多余条码 + + +
+
Date: Fri, 7 Jul 2023 09:25:23 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF?= =?UTF-8?q?=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.env.development b/.env.development index eed92e7d..c36d00d3 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统 ENV = 'development' # 开发环境 -VUE_APP_BASE_API = 'http://127.0.0.1:9991' +VUE_APP_BASE_API = 'http://192.168.0.166:9991' VUE_APP_SYNC_API ="http://127.0.0.1:10001" diff --git a/.env.production b/.env.production index 4405b8bc..b3751a76 100644 --- a/.env.production +++ b/.env.production @@ -18,8 +18,12 @@ ENV = 'production' # 文明东1 # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/' # 文明东2 -VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/' -# VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER" +# VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/' + + +# 林树波 +VUE_APP_BASE_API = 'http://192.168.0.231:9150/UDI_WMS_MC/' + 刘恩典 # VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/' From 24d8541a244658b5c52397e6da24bcc19a89f7f7 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 14 Jul 2023 11:34:16 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=A0=8F=E5=9B=BA=E5=AE=9A=E9=97=AE=E9=A2=98=20=E7=89=A9?= =?UTF-8?q?=E8=B5=84=E8=B5=84=E8=B4=A8=E9=87=8D=E6=96=B0=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/IoCheckErrorOrder.vue | 2 +- src/views/purchase/product/supProductEditDialog.vue | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue index 83337fac..897bbd5a 100644 --- a/src/views/inout/IoCheckErrorOrder.vue +++ b/src/views/inout/IoCheckErrorOrder.vue @@ -143,7 +143,7 @@ - + +