From ecb70a7f6e96cc827be3aa04073b4b49dca467d0 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 20 Mar 2023 10:37:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=B8=BA=E7=89=A9=E8=B5=84=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/business/stockOrder.vue | 2 +- .../basic/business/stockOrderDistribution.vue | 2 +- .../basic/product/basicCompanyProductsImport.vue | 8 ++++---- src/views/basic/product/bindHospProduct.vue | 6 +++--- src/views/basic/product/product.vue | 8 ++++---- src/views/basic/product/productEdit.vue | 4 ++-- src/views/basic/product/productSingleEdit.vue | 2 +- src/views/basic/product/udIInfoSelect.vue | 8 ++++---- src/views/basic/product/udiInfoManageSp.vue | 14 +++++++------- src/views/basic/product/udiInfoselectErpUdi.vue | 8 ++++---- src/views/basic/product/udilnfoManageSpDetail.vue | 4 ++-- src/views/basic/product/unbindHospProduct.vue | 6 +++--- src/views/inout/DialogSelectProduct.vue | 6 +++--- src/views/inout/DialogSelectReceiveOrder.vue | 4 ++-- src/views/inout/DialogSelectRl.vue | 4 ++-- src/views/inout/DialogSelectThrOrder.vue | 2 +- src/views/inout/InvoiceRegister.vue | 2 +- src/views/inout/IoArrivalSearchOrder.vue | 13 ++++++++++--- src/views/inout/IoCheckSuccessOrder.vue | 4 ++-- src/views/inout/IoEditOrder.vue | 4 ++-- src/views/inout/receive/receiveAdd.vue | 2 +- src/views/inout/receive/receiveAudit.vue | 2 +- src/views/inout/receive/receiveSearch.vue | 2 +- src/views/inventory/DeviceMAOrderCompleted.vue | 2 +- src/views/inventory/DeviceMAOrderModify.vue | 2 +- src/views/inventory/DeviceReceiveOrderAudit.vue | 2 +- .../inventory/DeviceReceiveOrderCompleted.vue | 2 +- src/views/inventory/DeviceReceiveOrderModify.vue | 2 +- src/views/inventory/InvCountOrderModify.vue | 2 +- src/views/inventory/InvMAOrderAudit.vue | 2 +- src/views/inventory/InvMAOrderCompleted.vue | 2 +- src/views/inventory/InvMAOrderModify.vue | 2 +- src/views/inventory/inner/innerOrderEditDialog.vue | 2 +- .../inventory/inner/innerOrderSelectProduct.vue | 6 +++--- src/views/inventory/trace/invUdiTraceOrder.vue | 2 +- .../purchase/company/basicSelectSingleProducts.vue | 8 ++++---- src/views/purchase/company/companyProducts.vue | 8 ++++---- src/views/purchase/purApply/purApply.vue | 2 +- .../purchase/purApply/purApplyEditDiaolog.vue | 2 +- src/views/purchase/purApply/purApplyProducts.vue | 8 ++++---- .../purchase/purApply/purOrderSelectProduct.vue | 6 +++--- .../purchase/purApply/purUdiRlDetailDialog.vue | 2 +- .../purchase/purApply/pureApplyDetailDialog.vue | 2 +- src/views/purchase/purApply/pureApplySearch.vue | 2 +- .../purchase/purApply/selectApplyListDialog.vue | 2 +- .../purArrival/purArrivalSelectProduct.vue | 6 +++--- .../purchase/purOrder/purOrderDetailDialog.vue | 2 +- .../purOrder/purOrderOrderSelectProduct.vue | 4 ++-- .../purchase/purOrder/purOrderSelectProduct.vue | 6 +++--- src/views/purchase/purPlan/purPlanAudit.vue | 2 +- src/views/purchase/purReturned/purReturned.vue | 2 +- .../purchase/purReturned/purReturnedAudit.vue | 2 +- .../purReturned/purReturnedDetailDialog.vue | 2 +- .../purchase/purReturned/purReturnedEditDialog.vue | 2 +- .../purchase/purReturned/purReturnedSearch.vue | 2 +- .../supplier/company/basicCompanyProducts.vue | 6 +++--- .../company/basicCompanyProductsImport.vue | 8 ++++---- src/views/supplier/company/basicProductEdit.vue | 2 +- src/views/supplier/company/selectProduct.vue | 2 +- src/views/thirdSys/order/thrOrder.vue | 2 +- 60 files changed, 122 insertions(+), 115 deletions(-) diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue index 8138bd9..8e43bd0 100644 --- a/src/views/basic/business/stockOrder.vue +++ b/src/views/basic/business/stockOrder.vue @@ -125,7 +125,7 @@ - + diff --git a/src/views/basic/business/stockOrderDistribution.vue b/src/views/basic/business/stockOrderDistribution.vue index efed7f8..52ca1f3 100644 --- a/src/views/basic/business/stockOrderDistribution.vue +++ b/src/views/basic/business/stockOrderDistribution.vue @@ -79,7 +79,7 @@ - + diff --git a/src/views/basic/product/basicCompanyProductsImport.vue b/src/views/basic/product/basicCompanyProductsImport.vue index f1b7401..b31140f 100644 --- a/src/views/basic/product/basicCompanyProductsImport.vue +++ b/src/views/basic/product/basicCompanyProductsImport.vue @@ -9,8 +9,8 @@ - - + + @@ -54,7 +54,7 @@ - + @@ -88,7 +88,7 @@ - + diff --git a/src/views/basic/product/bindHospProduct.vue b/src/views/basic/product/bindHospProduct.vue index c235759..44c87e6 100644 --- a/src/views/basic/product/bindHospProduct.vue +++ b/src/views/basic/product/bindHospProduct.vue @@ -22,8 +22,8 @@ - - + @@ -79,7 +79,7 @@ - + diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index ef5e66d..08dbaf4 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -36,8 +36,8 @@ - - + @@ -136,7 +136,7 @@ show-overflow-tooltip > @@ -214,7 +214,7 @@ - + diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue index 373d7e1..6eccf7a 100644 --- a/src/views/basic/product/productEdit.vue +++ b/src/views/basic/product/productEdit.vue @@ -11,7 +11,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/src/views/basic/product/productSingleEdit.vue b/src/views/basic/product/productSingleEdit.vue index 946bbf4..7dc5aea 100644 --- a/src/views/basic/product/productSingleEdit.vue +++ b/src/views/basic/product/productSingleEdit.vue @@ -23,7 +23,7 @@ - + - - + + @@ -75,7 +75,7 @@ - + @@ -96,7 +96,7 @@ - + diff --git a/src/views/basic/product/udiInfoManageSp.vue b/src/views/basic/product/udiInfoManageSp.vue index f023df6..de568d3 100644 --- a/src/views/basic/product/udiInfoManageSp.vue +++ b/src/views/basic/product/udiInfoManageSp.vue @@ -28,14 +28,14 @@ - + - - + @@ -67,8 +67,8 @@ - - + @@ -103,9 +103,9 @@ - + - + diff --git a/src/views/basic/product/udiInfoselectErpUdi.vue b/src/views/basic/product/udiInfoselectErpUdi.vue index 76f86b8..2bff339 100644 --- a/src/views/basic/product/udiInfoselectErpUdi.vue +++ b/src/views/basic/product/udiInfoselectErpUdi.vue @@ -5,7 +5,7 @@ - + @@ -69,7 +69,7 @@ v-loading="erpLloading" @current-change="handleErpChange" @selection-change="handleSelectionChange"> - + @@ -400,7 +400,7 @@ export default { return; } if (selected != '') { - this.$confirm("产品编码：" + selected + "已被添加,是否继续添加", "提示", { + this.$confirm("物资编码：" + selected + "已被添加,是否继续添加", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", @@ -459,7 +459,7 @@ export default { if (this.currentRow.checked) { - this.$confirm("产品编码：" + this.currentRow.code + "已被选入,是否继续选入", "提示", { + this.$confirm("物资编码：" + this.currentRow.code + "已被选入,是否继续选入", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", diff --git a/src/views/basic/product/udilnfoManageSpDetail.vue b/src/views/basic/product/udilnfoManageSpDetail.vue index d710315..ad3434c 100644 --- a/src/views/basic/product/udilnfoManageSpDetail.vue +++ b/src/views/basic/product/udilnfoManageSpDetail.vue @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + diff --git a/src/views/basic/product/unbindHospProduct.vue b/src/views/basic/product/unbindHospProduct.vue index a3ae165..1aadfee 100644 --- a/src/views/basic/product/unbindHospProduct.vue +++ b/src/views/basic/product/unbindHospProduct.vue @@ -22,8 +22,8 @@ - - + @@ -79,7 +79,7 @@ - + diff --git a/src/views/inout/DialogSelectProduct.vue b/src/views/inout/DialogSelectProduct.vue index 28e4f3e..366e650 100644 --- a/src/views/inout/DialogSelectProduct.vue +++ b/src/views/inout/DialogSelectProduct.vue @@ -22,8 +22,8 @@ - - + @@ -91,7 +91,7 @@ show-overflow-tooltip > diff --git a/src/views/inout/DialogSelectReceiveOrder.vue b/src/views/inout/DialogSelectReceiveOrder.vue index 1b0725e..92d3229 100644 --- a/src/views/inout/DialogSelectReceiveOrder.vue +++ b/src/views/inout/DialogSelectReceiveOrder.vue @@ -112,8 +112,8 @@ - - + + diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue index 19db5c9..6df4916 100644 --- a/src/views/inout/DialogSelectRl.vue +++ b/src/views/inout/DialogSelectRl.vue @@ -25,7 +25,7 @@ show-overflow-tooltip > @@ -109,7 +109,7 @@ > diff --git a/src/views/inout/DialogSelectThrOrder.vue b/src/views/inout/DialogSelectThrOrder.vue index c0e11b1..8f4b67d 100644 --- a/src/views/inout/DialogSelectThrOrder.vue +++ b/src/views/inout/DialogSelectThrOrder.vue @@ -114,7 +114,7 @@ - + diff --git a/src/views/inout/InvoiceRegister.vue b/src/views/inout/InvoiceRegister.vue index beee98c..45d5cc9 100644 --- a/src/views/inout/InvoiceRegister.vue +++ b/src/views/inout/InvoiceRegister.vue @@ -12,7 +12,7 @@ diff --git a/src/views/inout/IoArrivalSearchOrder.vue b/src/views/inout/IoArrivalSearchOrder.vue index 25c8166..8109fbc 100644 --- a/src/views/inout/IoArrivalSearchOrder.vue +++ b/src/views/inout/IoArrivalSearchOrder.vue @@ -241,17 +241,24 @@ prop="batchNo" > + + + + @@ -288,7 +288,7 @@ > diff --git a/src/views/inout/IoEditOrder.vue b/src/views/inout/IoEditOrder.vue index f77d7a4..a475901 100644 --- a/src/views/inout/IoEditOrder.vue +++ b/src/views/inout/IoEditOrder.vue @@ -97,7 +97,7 @@ > @@ -180,7 +180,7 @@ > diff --git a/src/views/inout/receive/receiveAdd.vue b/src/views/inout/receive/receiveAdd.vue index 6c0bc7b..5d794ac 100644 --- a/src/views/inout/receive/receiveAdd.vue +++ b/src/views/inout/receive/receiveAdd.vue @@ -95,7 +95,7 @@ - + diff --git a/src/views/inout/receive/receiveAudit.vue b/src/views/inout/receive/receiveAudit.vue index 994bdda..1d53ac7 100644 --- a/src/views/inout/receive/receiveAudit.vue +++ b/src/views/inout/receive/receiveAudit.vue @@ -83,7 +83,7 @@ - + diff --git a/src/views/inout/receive/receiveSearch.vue b/src/views/inout/receive/receiveSearch.vue index 7190e18..de0502c 100644 --- a/src/views/inout/receive/receiveSearch.vue +++ b/src/views/inout/receive/receiveSearch.vue @@ -81,7 +81,7 @@ - + diff --git a/src/views/inventory/DeviceMAOrderCompleted.vue b/src/views/inventory/DeviceMAOrderCompleted.vue index 19117c6..e76b70c 100644 --- a/src/views/inventory/DeviceMAOrderCompleted.vue +++ b/src/views/inventory/DeviceMAOrderCompleted.vue @@ -56,7 +56,7 @@ - + diff --git a/src/views/inventory/DeviceMAOrderModify.vue b/src/views/inventory/DeviceMAOrderModify.vue index 6f105b8..ba7ebd4 100644 --- a/src/views/inventory/DeviceMAOrderModify.vue +++ b/src/views/inventory/DeviceMAOrderModify.vue @@ -63,7 +63,7 @@ border max-height="300" height="300"> - + diff --git a/src/views/inventory/DeviceReceiveOrderAudit.vue b/src/views/inventory/DeviceReceiveOrderAudit.vue index 9f56bb1..33b7660 100644 --- a/src/views/inventory/DeviceReceiveOrderAudit.vue +++ b/src/views/inventory/DeviceReceiveOrderAudit.vue @@ -100,7 +100,7 @@ - + diff --git a/src/views/inventory/DeviceReceiveOrderCompleted.vue b/src/views/inventory/DeviceReceiveOrderCompleted.vue index 62fce61..f2d62b5 100644 --- a/src/views/inventory/DeviceReceiveOrderCompleted.vue +++ b/src/views/inventory/DeviceReceiveOrderCompleted.vue @@ -82,7 +82,7 @@ - + diff --git a/src/views/inventory/DeviceReceiveOrderModify.vue b/src/views/inventory/DeviceReceiveOrderModify.vue index 2d11e0b..663d38d 100644 --- a/src/views/inventory/DeviceReceiveOrderModify.vue +++ b/src/views/inventory/DeviceReceiveOrderModify.vue @@ -148,7 +148,7 @@ diff --git a/src/views/inventory/InvCountOrderModify.vue b/src/views/inventory/InvCountOrderModify.vue index 9c0606b..bc98241 100644 --- a/src/views/inventory/InvCountOrderModify.vue +++ b/src/views/inventory/InvCountOrderModify.vue @@ -115,7 +115,7 @@ highlight-current-row border max-height="300" height="300"> - + diff --git a/src/views/inventory/InvMAOrderAudit.vue b/src/views/inventory/InvMAOrderAudit.vue index 846d15f..ac75198 100644 --- a/src/views/inventory/InvMAOrderAudit.vue +++ b/src/views/inventory/InvMAOrderAudit.vue @@ -86,7 +86,7 @@ - + diff --git a/src/views/inventory/InvMAOrderCompleted.vue b/src/views/inventory/InvMAOrderCompleted.vue index ca443db..d5471c4 100644 --- a/src/views/inventory/InvMAOrderCompleted.vue +++ b/src/views/inventory/InvMAOrderCompleted.vue @@ -69,7 +69,7 @@ - + diff --git a/src/views/inventory/InvMAOrderModify.vue b/src/views/inventory/InvMAOrderModify.vue index 1887d91..e002c21 100644 --- a/src/views/inventory/InvMAOrderModify.vue +++ b/src/views/inventory/InvMAOrderModify.vue @@ -109,7 +109,7 @@ diff --git a/src/views/inventory/inner/innerOrderEditDialog.vue b/src/views/inventory/inner/innerOrderEditDialog.vue index 0a56bb5..7ad7d27 100644 --- a/src/views/inventory/inner/innerOrderEditDialog.vue +++ b/src/views/inventory/inner/innerOrderEditDialog.vue @@ -43,7 +43,7 @@ - + diff --git a/src/views/inventory/inner/innerOrderSelectProduct.vue b/src/views/inventory/inner/innerOrderSelectProduct.vue index 335a8c1..a2d2186 100644 --- a/src/views/inventory/inner/innerOrderSelectProduct.vue +++ b/src/views/inventory/inner/innerOrderSelectProduct.vue @@ -22,8 +22,8 @@ - - + + @@ -60,7 +60,7 @@ - + diff --git a/src/views/inventory/trace/invUdiTraceOrder.vue b/src/views/inventory/trace/invUdiTraceOrder.vue index 9b4202b..2b2cc42 100644 --- a/src/views/inventory/trace/invUdiTraceOrder.vue +++ b/src/views/inventory/trace/invUdiTraceOrder.vue @@ -129,7 +129,7 @@ > diff --git a/src/views/purchase/company/basicSelectSingleProducts.vue b/src/views/purchase/company/basicSelectSingleProducts.vue index 9fab203..072b63a 100644 --- a/src/views/purchase/company/basicSelectSingleProducts.vue +++ b/src/views/purchase/company/basicSelectSingleProducts.vue @@ -9,8 +9,8 @@ - - + + @@ -54,7 +54,7 @@ - + @@ -87,7 +87,7 @@ - + diff --git a/src/views/purchase/company/companyProducts.vue b/src/views/purchase/company/companyProducts.vue index 982ce7c..2a1c385 100644 --- a/src/views/purchase/company/companyProducts.vue +++ b/src/views/purchase/company/companyProducts.vue @@ -9,8 +9,8 @@ - - + + @@ -53,7 +53,7 @@ - + @@ -86,7 +86,7 @@ - + diff --git a/src/views/purchase/purApply/purApply.vue b/src/views/purchase/purApply/purApply.vue index 837f09a..06a4e8a 100644 --- a/src/views/purchase/purApply/purApply.vue +++ b/src/views/purchase/purApply/purApply.vue @@ -80,7 +80,7 @@ - + diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue index 7005a0c..c5adae0 100644 --- a/src/views/purchase/purApply/purApplyEditDiaolog.vue +++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue @@ -77,7 +77,7 @@ - + diff --git a/src/views/purchase/purApply/purApplyProducts.vue b/src/views/purchase/purApply/purApplyProducts.vue index 2f0fc58..b25b81e 100644 --- a/src/views/purchase/purApply/purApplyProducts.vue +++ b/src/views/purchase/purApply/purApplyProducts.vue @@ -9,8 +9,8 @@ - - + + @@ -54,7 +54,7 @@ - + @@ -87,7 +87,7 @@ - + diff --git a/src/views/purchase/purApply/purOrderSelectProduct.vue b/src/views/purchase/purApply/purOrderSelectProduct.vue index e365208..7c8be12 100644 --- a/src/views/purchase/purApply/purOrderSelectProduct.vue +++ b/src/views/purchase/purApply/purOrderSelectProduct.vue @@ -22,8 +22,8 @@ - - + + @@ -60,7 +60,7 @@ - + diff --git a/src/views/purchase/purApply/purUdiRlDetailDialog.vue b/src/views/purchase/purApply/purUdiRlDetailDialog.vue index a08cae7..cc7b50b 100644 --- a/src/views/purchase/purApply/purUdiRlDetailDialog.vue +++ b/src/views/purchase/purApply/purUdiRlDetailDialog.vue @@ -9,7 +9,7 @@ - + diff --git a/src/views/purchase/purApply/pureApplyDetailDialog.vue b/src/views/purchase/purApply/pureApplyDetailDialog.vue index d8689a2..84a5507 100644 --- a/src/views/purchase/purApply/pureApplyDetailDialog.vue +++ b/src/views/purchase/purApply/pureApplyDetailDialog.vue @@ -94,7 +94,7 @@ - + diff --git a/src/views/purchase/purApply/pureApplySearch.vue b/src/views/purchase/purApply/pureApplySearch.vue index 8b05e5d..a648231 100644 --- a/src/views/purchase/purApply/pureApplySearch.vue +++ b/src/views/purchase/purApply/pureApplySearch.vue @@ -78,7 +78,7 @@ - + diff --git a/src/views/purchase/purApply/selectApplyListDialog.vue b/src/views/purchase/purApply/selectApplyListDialog.vue index aa74e28..cd43f24 100644 --- a/src/views/purchase/purApply/selectApplyListDialog.vue +++ b/src/views/purchase/purApply/selectApplyListDialog.vue @@ -65,7 +65,7 @@ - + diff --git a/src/views/purchase/purArrival/purArrivalSelectProduct.vue b/src/views/purchase/purArrival/purArrivalSelectProduct.vue index 06988bf..751826b 100644 --- a/src/views/purchase/purArrival/purArrivalSelectProduct.vue +++ b/src/views/purchase/purArrival/purArrivalSelectProduct.vue @@ -25,8 +25,8 @@ - - + @@ -65,7 +65,7 @@ - + diff --git a/src/views/purchase/purOrder/purOrderDetailDialog.vue b/src/views/purchase/purOrder/purOrderDetailDialog.vue index 9a2639e..5b2890c 100644 --- a/src/views/purchase/purOrder/purOrderDetailDialog.vue +++ b/src/views/purchase/purOrder/purOrderDetailDialog.vue @@ -101,7 +101,7 @@ - + diff --git a/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue b/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue index 70169af..4ba0746 100644 --- a/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue +++ b/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue @@ -19,7 +19,7 @@ clearable="true"> - + @@ -81,7 +81,7 @@ show-overflow-tooltip > diff --git a/src/views/purchase/purOrder/purOrderSelectProduct.vue b/src/views/purchase/purOrder/purOrderSelectProduct.vue index 953b311..a44c864 100644 --- a/src/views/purchase/purOrder/purOrderSelectProduct.vue +++ b/src/views/purchase/purOrder/purOrderSelectProduct.vue @@ -24,8 +24,8 @@ - - + @@ -64,7 +64,7 @@ - + diff --git a/src/views/purchase/purPlan/purPlanAudit.vue b/src/views/purchase/purPlan/purPlanAudit.vue index 09b1af3..6c806ea 100644 --- a/src/views/purchase/purPlan/purPlanAudit.vue +++ b/src/views/purchase/purPlan/purPlanAudit.vue @@ -81,7 +81,7 @@ - + diff --git a/src/views/purchase/purReturned/purReturned.vue b/src/views/purchase/purReturned/purReturned.vue index 0c5af1a..4f36510 100644 --- a/src/views/purchase/purReturned/purReturned.vue +++ b/src/views/purchase/purReturned/purReturned.vue @@ -83,7 +83,7 @@ - + diff --git a/src/views/purchase/purReturned/purReturnedAudit.vue b/src/views/purchase/purReturned/purReturnedAudit.vue index 462d78c..5ac3cfc 100644 --- a/src/views/purchase/purReturned/purReturnedAudit.vue +++ b/src/views/purchase/purReturned/purReturnedAudit.vue @@ -81,7 +81,7 @@ - + diff --git a/src/views/purchase/purReturned/purReturnedDetailDialog.vue b/src/views/purchase/purReturned/purReturnedDetailDialog.vue index 806e968..1921490 100644 --- a/src/views/purchase/purReturned/purReturnedDetailDialog.vue +++ b/src/views/purchase/purReturned/purReturnedDetailDialog.vue @@ -102,7 +102,7 @@ - + diff --git a/src/views/purchase/purReturned/purReturnedEditDialog.vue b/src/views/purchase/purReturned/purReturnedEditDialog.vue index cc88c8a..888a065 100644 --- a/src/views/purchase/purReturned/purReturnedEditDialog.vue +++ b/src/views/purchase/purReturned/purReturnedEditDialog.vue @@ -104,7 +104,7 @@ - +