From 34e88afb957ce6fb1b2b72074881e51f6225eafd Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 17 Oct 2024 10:13:34 +0800 Subject: [PATCH] =?UTF-8?q?10/17=20=E5=8D=95=E6=8D=AE=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=20=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=99=A8=E6=A2=B0=E7=95=8C=E9=9D=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/busType/bussinessType.vue | 17 ++++++++++++-- .../basic/busType/bussinessTypeModify.vue | 23 ++++++++++++++++--- src/views/basic/business/stockOrder.vue | 1 + src/views/basic/product/product.vue | 2 ++ src/views/basic/product/productAdd.vue | 2 +- src/views/basic/product/productEdit.vue | 22 +++++++++--------- src/views/inout/DialogCreateOrder.vue | 4 +++- src/views/inout/InvoiceRegByOrder.vue | 1 + src/views/inout/IoAuditedOrder.vue | 1 + src/views/inout/IoCheckAuditBusOrder.vue | 1 + src/views/inout/IoCheckAuditNewOrder.vue | 1 + src/views/inout/IoCheckAuditOrder.vue | 1 + src/views/inout/IoCheckErrorOrder.vue | 1 + src/views/inout/IoCheckSuccessOrder.vue | 1 + src/views/inout/IoCreateBusOrder.vue | 1 + src/views/inout/IoCreateErrorOrder.vue | 1 + src/views/inout/IoCreateOrder.vue | 1 + src/views/inout/IoCreateScanOrder.vue | 1 + src/views/inout/IoDealCheckOrder.vue | 1 + src/views/inout/IoDealOrder.vue | 1 + src/views/inout/IoUploadOrder.vue | 1 + src/views/inoutDrug/DialogCreateDrugOrder.vue | 4 +++- src/views/inoutDrug/IoAuditedOrder.vue | 1 + src/views/inoutDrug/IoCheckAuditOrder.vue | 1 + src/views/inoutDrug/IoCheckErrorOrder.vue | 1 + src/views/inoutDrug/IoCheckSuccessOrder.vue | 1 + src/views/inoutDrug/IoCreateBusOrder.vue | 1 + .../inoutDrug/IoCreateErrorDrugOrder.vue | 1 + src/views/inoutDrug/IoCreateOrder.vue | 1 + src/views/inoutDrug/IoCreateScanOrder.vue | 1 + src/views/inoutDrug/IoDealCheckOrder.vue | 1 + src/views/inoutDrug/IoDealOrder.vue | 1 + 32 files changed, 80 insertions(+), 19 deletions(-) diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue index 5e7b1f2f..2f31eed3 100644 --- a/src/views/basic/busType/bussinessType.vue +++ b/src/views/basic/busType/bussinessType.vue @@ -35,6 +35,14 @@ + + + + + + + + @@ -121,7 +129,7 @@ top="5vh" > -
+
提交 - 取消 @@ -182,6 +190,7 @@ export default { filterQuery: { name: null, mainAction: null, + productType: null, enable: '1', page: 1, limit: 20 @@ -363,6 +372,10 @@ export default { this.$message.error('单据类型名称不能为空！') return } + if (isBlank(this.inputQuery.productType)) { + this.$message.error('单据类型不能为空！') + return + } // if (isBlank(this.inputQuery.actionType)) { // this.$message.error("请选择单据类型！"); // return; diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue index cd0914b8..cbb57869 100644 --- a/src/views/basic/busType/bussinessTypeModify.vue +++ b/src/views/basic/busType/bussinessTypeModify.vue @@ -231,9 +231,11 @@ - - + + + + + @@ -247,6 +249,14 @@ + + + + + + +
@@ -1501,6 +1511,13 @@ export default { trigger: 'change' } ], + productType: [ + { + required: true, + message: '请选择单据类型', + trigger: 'change' + } + ], inStock: [ { required: true, diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue index fcfebdea..53fb8fd2 100644 --- a/src/views/basic/business/stockOrder.vue +++ b/src/views/basic/business/stockOrder.vue @@ -734,6 +734,7 @@ export default { let query = { enabled: true, vueType: "stock", + productType:1 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index b7079245..fc8927c8 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -2021,6 +2021,8 @@ export default { }, defaultSys: null, isImport: false, + + isImportUdi: false, isUploadSmp: false, isSpCombine: false, diff --git a/src/views/basic/product/productAdd.vue b/src/views/basic/product/productAdd.vue index 7d9312e2..372215e0 100644 --- a/src/views/basic/product/productAdd.vue +++ b/src/views/basic/product/productAdd.vue @@ -173,7 +173,7 @@
提交 - 取消 + 取消
@@ -282,7 +282,7 @@ @@ -294,7 +294,7 @@ @@ -304,7 +304,7 @@ @@ -328,7 +328,7 @@ @@ -378,7 +378,7 @@ @@ -394,7 +394,7 @@ size="small" type="number" oninput="value=value.replace(/[^\d]/g,'')" - splaceholder="请输入内容" + placeholder="请输入挤压预警数" v-model="editQuery.overStockNum" > @@ -406,7 +406,7 @@ size="small" type="number" oninput="value=value.replace(/[^\d]/g,'')" - splaceholder="请输入内容" + placeholder="低库存预警数量" v-model="editQuery.lowStockNum" > @@ -521,7 +521,7 @@ remote clearable="true" reserve-keyword - placeholder="请选择物价类别" + laceholder="请选择物价类别" :remote-method="findHsflMethod" :loading="loading" style="width: 80%" @@ -570,7 +570,7 @@ @@ -584,7 +584,7 @@ style="width: 80%" min="1" size="small" - splaceholder="请输入内容" + placeholder="请输入工位预警数" v-model="editQuery.workPlaceCount" > diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index eb1e8c58..7259ef91 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -905,12 +905,14 @@ export default { let query = { code: this.orderFormData.invCode, editType: 2, //可编辑 + productType:1 }; if (this.viewTypeKsck) { query = { code: this.orderFormData.invCode, editType: 2, //可编辑 - useDyCount: 2 //可编辑 + useDyCount: 2, //可编辑 + productType:1 }; } diff --git a/src/views/inout/InvoiceRegByOrder.vue b/src/views/inout/InvoiceRegByOrder.vue index 7757c8dd..221a197e 100644 --- a/src/views/inout/InvoiceRegByOrder.vue +++ b/src/views/inout/InvoiceRegByOrder.vue @@ -1198,6 +1198,7 @@ export default { code: _this.filterQuery.invCode, enable: true, vueType: "supInvoice", + productType:1 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue index 9af7f291..c750f4b7 100644 --- a/src/views/inout/IoAuditedOrder.vue +++ b/src/views/inout/IoAuditedOrder.vue @@ -1294,6 +1294,7 @@ export default { let query = { code: this.filterQuery.invCode, enabled: true, + productType:1 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inout/IoCheckAuditBusOrder.vue b/src/views/inout/IoCheckAuditBusOrder.vue index 3f6d9235..ba5af60e 100644 --- a/src/views/inout/IoCheckAuditBusOrder.vue +++ b/src/views/inout/IoCheckAuditBusOrder.vue @@ -494,6 +494,7 @@ export default { code: this.filterQuery.invCode, enabled: true, vueType: "supDelivery", + productType:1 }; getLocalJoinByUser(query) .then((response) => { diff --git a/src/views/inout/IoCheckAuditNewOrder.vue b/src/views/inout/IoCheckAuditNewOrder.vue index daae4e15..1c964989 100644 --- a/src/views/inout/IoCheckAuditNewOrder.vue +++ b/src/views/inout/IoCheckAuditNewOrder.vue @@ -368,6 +368,7 @@ export default { let query = { code: this.filterQuery.invCode, enabled: true, + productType:1 }; getLocalJoinByUser(query) .then((response) => { diff --git a/src/views/inout/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue index 6b5f3aba..1ac51619 100644 --- a/src/views/inout/IoCheckAuditOrder.vue +++ b/src/views/inout/IoCheckAuditOrder.vue @@ -1583,6 +1583,7 @@ export default { let query = { code: this.filterQuery.invCode, enabled: true, + productType:1 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue index 1111c112..7132e1b1 100644 --- a/src/views/inout/IoCheckErrorOrder.vue +++ b/src/views/inout/IoCheckErrorOrder.vue @@ -1360,6 +1360,7 @@ export default { let query = { code: _this.filterQuery.invWarehouseCode, enabled: true, + productType:1 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue index 7a8d7560..3e001efd 100644 --- a/src/views/inout/IoCheckSuccessOrder.vue +++ b/src/views/inout/IoCheckSuccessOrder.vue @@ -1112,6 +1112,7 @@ export default { let query = { code: this.filterQuery.invCode, enabled: true, + productType:1 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue index 74ccdea2..07705123 100644 --- a/src/views/inout/IoCreateBusOrder.vue +++ b/src/views/inout/IoCreateBusOrder.vue @@ -573,6 +573,7 @@ export default { let query = { code: this.filterQuery.invCode, enabled: true, + productType:1 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inout/IoCreateErrorOrder.vue b/src/views/inout/IoCreateErrorOrder.vue index 351b7036..b10b7a9c 100644 --- a/src/views/inout/IoCreateErrorOrder.vue +++ b/src/views/inout/IoCreateErrorOrder.vue @@ -514,6 +514,7 @@ export default { let query = { code: this.filterQuery.invCode, enabled: true, + productType:1 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue index 25473071..d7bf9250 100644 --- a/src/views/inout/IoCreateOrder.vue +++ b/src/views/inout/IoCreateOrder.vue @@ -628,6 +628,7 @@ export default { let query = { code: this.filterQuery.invCode, enabled: true, + productType:1 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue index 09652d17..5f0faaff 100644 --- a/src/views/inout/IoCreateScanOrder.vue +++ b/src/views/inout/IoCreateScanOrder.vue @@ -570,6 +570,7 @@ export default { let query = { code: this.filterQuery.invCode, enabled: true, + productType:1 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inout/IoDealCheckOrder.vue b/src/views/inout/IoDealCheckOrder.vue index 875355a4..05265c35 100644 --- a/src/views/inout/IoDealCheckOrder.vue +++ b/src/views/inout/IoDealCheckOrder.vue @@ -509,6 +509,7 @@ export default { code: this.filterQuery.invCode, enabled: true, vueType: "waitCheck", + productType:1 }; getLocalJoinByUser(query) .then((response) => { diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue index ade497e7..5b1fa31e 100644 --- a/src/views/inout/IoDealOrder.vue +++ b/src/views/inout/IoDealOrder.vue @@ -702,6 +702,7 @@ export default { code: _this.filterQuery.invCode, enabled: true, vueType: "waitDeal", + productType:1 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inout/IoUploadOrder.vue b/src/views/inout/IoUploadOrder.vue index 7b6fd7b6..146b1622 100644 --- a/src/views/inout/IoUploadOrder.vue +++ b/src/views/inout/IoUploadOrder.vue @@ -708,6 +708,7 @@ export default { let query = { code: this.filterQuery.invCode, enabled: true, + productType:1 }; getLocalJoinByUser(query) .then((response) => { diff --git a/src/views/inoutDrug/DialogCreateDrugOrder.vue b/src/views/inoutDrug/DialogCreateDrugOrder.vue index c1c1da3a..4d761554 100644 --- a/src/views/inoutDrug/DialogCreateDrugOrder.vue +++ b/src/views/inoutDrug/DialogCreateDrugOrder.vue @@ -835,12 +835,14 @@ export default { let query = { code: this.orderFormData.invCode, editType: 2, //可编辑 + productType:2 }; if (this.viewTypeKsck) { query = { code: this.orderFormData.invCode, editType: 2, //可编辑 - useDyCount: 2 //可编辑 + useDyCount: 2, //可编辑 + productType:2 }; } diff --git a/src/views/inoutDrug/IoAuditedOrder.vue b/src/views/inoutDrug/IoAuditedOrder.vue index bac6673e..a84f4614 100644 --- a/src/views/inoutDrug/IoAuditedOrder.vue +++ b/src/views/inoutDrug/IoAuditedOrder.vue @@ -1294,6 +1294,7 @@ export default { let query = { code: this.filterQuery.invCode, enabled: true, + productType:2 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inoutDrug/IoCheckAuditOrder.vue b/src/views/inoutDrug/IoCheckAuditOrder.vue index b1bfaa22..fdbec27d 100644 --- a/src/views/inoutDrug/IoCheckAuditOrder.vue +++ b/src/views/inoutDrug/IoCheckAuditOrder.vue @@ -1585,6 +1585,7 @@ export default { let query = { code: this.filterQuery.invCode, enabled: true, + productType:2 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inoutDrug/IoCheckErrorOrder.vue b/src/views/inoutDrug/IoCheckErrorOrder.vue index f7fe2461..ef0cefda 100644 --- a/src/views/inoutDrug/IoCheckErrorOrder.vue +++ b/src/views/inoutDrug/IoCheckErrorOrder.vue @@ -1362,6 +1362,7 @@ export default { let query = { code: _this.filterQuery.invWarehouseCode, enabled: true, + productType:2 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inoutDrug/IoCheckSuccessOrder.vue b/src/views/inoutDrug/IoCheckSuccessOrder.vue index a12bff35..3eb539c7 100644 --- a/src/views/inoutDrug/IoCheckSuccessOrder.vue +++ b/src/views/inoutDrug/IoCheckSuccessOrder.vue @@ -1114,6 +1114,7 @@ export default { let query = { code: this.filterQuery.invCode, enabled: true, + productType:2 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inoutDrug/IoCreateBusOrder.vue b/src/views/inoutDrug/IoCreateBusOrder.vue index 7cbf7a97..6f25efb4 100644 --- a/src/views/inoutDrug/IoCreateBusOrder.vue +++ b/src/views/inoutDrug/IoCreateBusOrder.vue @@ -575,6 +575,7 @@ export default { let query = { code: this.filterQuery.invCode, enabled: true, + productType:2 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inoutDrug/IoCreateErrorDrugOrder.vue b/src/views/inoutDrug/IoCreateErrorDrugOrder.vue index 4c8e38cf..cf72a9e7 100644 --- a/src/views/inoutDrug/IoCreateErrorDrugOrder.vue +++ b/src/views/inoutDrug/IoCreateErrorDrugOrder.vue @@ -514,6 +514,7 @@ export default { let query = { code: this.filterQuery.invCode, enabled: true, + productType:2 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inoutDrug/IoCreateOrder.vue b/src/views/inoutDrug/IoCreateOrder.vue index 96476e34..5b2d24b6 100644 --- a/src/views/inoutDrug/IoCreateOrder.vue +++ b/src/views/inoutDrug/IoCreateOrder.vue @@ -459,6 +459,7 @@ export default { let query = { code: this.filterQuery.invCode, enabled: true, + productType:2 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inoutDrug/IoCreateScanOrder.vue b/src/views/inoutDrug/IoCreateScanOrder.vue index 9d29d58d..9e1e0a04 100644 --- a/src/views/inoutDrug/IoCreateScanOrder.vue +++ b/src/views/inoutDrug/IoCreateScanOrder.vue @@ -584,6 +584,7 @@ export default { let query = { code: this.filterQuery.invCode, enabled: true, + productType:2 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inoutDrug/IoDealCheckOrder.vue b/src/views/inoutDrug/IoDealCheckOrder.vue index 3f525835..a2ac4e6a 100644 --- a/src/views/inoutDrug/IoDealCheckOrder.vue +++ b/src/views/inoutDrug/IoDealCheckOrder.vue @@ -526,6 +526,7 @@ export default { code: this.filterQuery.invCode, enabled: true, vueType: "waitCheck", + productType:2 }; getLocalJoinByUser(query) .then((response) => { diff --git a/src/views/inoutDrug/IoDealOrder.vue b/src/views/inoutDrug/IoDealOrder.vue index 79c0e737..e161fc88 100644 --- a/src/views/inoutDrug/IoDealOrder.vue +++ b/src/views/inoutDrug/IoDealOrder.vue @@ -726,6 +726,7 @@ export default { code: _this.filterQuery.invCode, enabled: true, vueType: "waitDeal", + productType:2 }; getLocalJoinByUserOptimize(query) .then((response) => {