From 06c418c66c51cb70675c23829a31a675f4b108c4 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Thu, 18 Apr 2024 14:08:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86PDA=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/show-modal/show-modal.vue | 2 +-
.../balance/balanceDetailPopup.vue | 2 +-
src/mycomponents/balance/balanceMove.vue | 2 +-
src/mycomponents/common/comListHint.vue | 4 +-
src/mycomponents/common/comMessage.vue | 2 +-
src/mycomponents/detail/comDetailCard.vue | 7 +-
.../detail/comRequestDetailCard.vue | 1 -
src/mycomponents/detail/detailCommonInfo.vue | 8 +-
.../detail/recordDetailCommonInfo.vue | 4 +-
src/mycomponents/detail/recordDetailPopup.vue | 6 +-
.../detail/requestDetailCommonInfo.vue | 4 +-
src/mycomponents/item/itemInfoPopup.vue | 4 +-
src/mycomponents/item/itemQty.vue | 10 +-
src/mycomponents/job/jobComMainCard.vue | 12 +--
src/mycomponents/job/jobCommonInfo.vue | 6 +-
src/mycomponents/job/jobInfoPopup.vue | 4 +-
src/mycomponents/job/jobcomDetailCard.vue | 2 +-
.../package/packageDetailPopup.vue | 2 +-
src/mycomponents/qty/balanceQty.vue | 3 +-
src/mycomponents/qty/balanceQtyEdit.vue | 12 +--
src/mycomponents/qty/countQtyEdit.vue | 12 +--
src/mycomponents/qty/inspectQtyEdit.vue | 8 +-
src/mycomponents/qty/recommendQtyEdit.vue | 8 +-
src/mycomponents/recommend/recommend.vue | 8 +-
src/mycomponents/record/record.vue | 2 +-
.../record/recordComDetailCard.vue | 4 +-
src/mycomponents/record/recordComMainCard.vue | 41 +++++++
src/mycomponents/record/recordCommonInfo.vue | 6 +-
.../record/recordDetailCommonInfo.vue | 2 +-
.../record/recordListDetailPoup.vue | 4 +-
src/mycomponents/record/recordTop.vue | 2 +-
.../request/requestComMainCard.vue | 2 +-
.../request/requestCommonInfo.vue | 6 +-
.../container/coms/comContainerBindCard.vue | 2 +-
src/pages/container/coms/comPalletRecord.vue | 4 +-
.../container/record/containerBindRecord.vue | 2 +-
.../record/containerUnBindRecord.vue | 2 +-
src/pages/count/coms/comCountDetailCard.vue | 2 +-
src/pages/count/coms/jobListPopup.vue | 2 +-
src/pages/count/job/countDetail.vue | 2 +-
src/pages/count/record/countRecord.vue | 4 +-
.../customerReturn/coms/comReturnRecord.vue | 4 +-
.../customerReturn/coms/jobInfoPopup.vue | 2 +-
.../customerReturn/coms/jobListPopup.vue | 2 +-
.../customerReturn/coms/requestInfoPopup.vue | 2 +-
src/pages/customerReturn/job/returnDetail.vue | 2 +-
.../deliver/coms/comDeliverDetailCard.vue | 1 -
.../deliver/coms/comDeliverRequestPopup.vue | 8 +-
src/pages/deliver/coms/jobInfoPopup.vue | 2 +-
src/pages/deliver/coms/jobListPopup.vue | 2 +-
src/pages/deliver/coms/requestInfoPopup.vue | 2 +-
src/pages/deliver/job/deliverDetail.vue | 9 +-
src/pages/deliver/record/deliverRecord.vue | 2 +-
.../deliver/request/deliverRequestDetail.vue | 2 +-
.../inspect/coms/comInspectDetailCard.vue | 4 +-
src/pages/inspect/coms/comInspectJobList.vue | 2 +-
.../inspect/coms/inspectComDetailCard.vue | 8 +-
src/pages/inspect/coms/inspectInfoPopup.vue | 2 +-
src/pages/inspect/coms/requestInfoPopup.vue | 2 +-
src/pages/inspect/job/inspectResult.vue | 2 +-
.../inspect/request/inspectRequestDetail.vue | 2 +-
.../coms/comInventoryDetailCard.vue | 4 +-
src/pages/inventoryMove/coms/comMove.vue | 4 +-
.../inventoryMove/coms/comMoveRecord.vue | 2 +-
.../inventoryMove/coms/comMoveRecordCard.vue | 2 +-
src/pages/inventoryMove/coms/jobListPopup.vue | 2 +-
.../inventoryMove/job/inventoryMoveDetail.vue | 2 +-
.../coms/comIssueDetailCard.vue | 4 +-
.../coms/comIssueRecommend.vue | 2 +-
src/pages/issue/coms/comIssueDetailCard.vue | 20 ++--
src/pages/issue/coms/comIssueJobCard.vue | 7 +-
src/pages/issue/coms/comIssueRecommend.vue | 2 +-
.../issue/coms/comIssueRequestCreator.vue | 2 +-
.../issue/coms/comIssueRequestDetailCard.vue | 2 +-
src/pages/issue/coms/comIssueRequestPopup.vue | 10 +-
src/pages/issue/coms/jobListPopup.vue | 2 +-
src/pages/issue/coms/requestInfoPopup.vue | 2 +-
src/pages/issue/job/issueDetail.vue | 5 +-
.../package/coms/comOverPackJobDetailCard.vue | 2 +-
.../package/job/overPackageJobDetail.vue | 6 +-
.../package/record/mergePackageRecord.vue | 2 +-
.../package/record/overPackageRecord.vue | 2 +-
.../coms/comProductDetailCard.vue | 2 +-
.../coms/comProductRecord.vue | 4 +-
.../productDismantle/coms/jobListPopup.vue | 2 +-
.../coms/requestInfoPopup.vue | 2 +-
.../job/productDismantleDetail.vue | 4 +-
.../record/productDismantleRecord.vue | 2 +-
.../coms/comProductDetailCard.vue | 2 +-
.../productPutaway/coms/jobListPopup.vue | 2 +-
.../productPutaway/coms/requestInfoPopup.vue | 2 +-
.../job/productPutawayDetail.vue | 3 +-
.../record/productPutawayRecord.vue | 2 +-
.../request/putawayRequestDetail.vue | 2 +-
.../coms/comProductDetailCard.vue | 6 +-
.../productReceipt/coms/comProductJobCard.vue | 100 ++++++++++--------
.../productReceipt/coms/comProductRecord.vue | 2 +-
.../productReceipt/coms/jobInfoPopup.vue | 2 +-
.../productReceipt/coms/jobListPopup.vue | 2 +-
.../coms/productDetailInfoPopup.vue | 2 +-
.../job/completeReceiveJobDetail.vue | 4 +-
.../job/fgProductReceiptDetail.vue | 62 +++++++----
.../job/productReceiptDetail.vue | 35 +++++-
.../productReceipt/job/scrapReceiptDetail.vue | 14 +--
.../job/semiProductReceiptDetail.vue | 4 +-
.../record/productReceiptRecord.vue | 2 +-
.../coms/requestDetailInfoPopup.vue | 2 +-
.../productRecycle/coms/requestInfoPopup.vue | 2 +-
.../productRecycle/coms/returnInfoPopup.vue | 2 +-
.../coms/returnJobListPopup.vue | 2 +-
.../job/productRecycleJobDetail.vue | 2 +-
.../record/productRecycleRecord.vue | 2 +-
.../coms/comProductionDetailCard.vue | 2 +-
.../coms/comProductionRecord.vue | 4 +-
.../productionReceipt/coms/jobInfoPopup.vue | 2 +-
.../productionReceipt/coms/jobListPopup.vue | 2 +-
.../job/productionReceiptDetail.vue | 2 +-
.../record/productionReceiptRecord.vue | 2 +-
src/pages/productionReturn/coms/comReturn.vue | 2 +-
.../coms/comReturnDetailCard.vue | 2 -
.../productionReturn/coms/comReturnRecord.vue | 2 +-
.../coms/comReturnRequestCreator.vue | 2 +-
.../coms/comReturnRequestInfo.vue | 4 +-
.../coms/comReturnRequestPopup.vue | 8 +-
.../productionReturn/coms/jobListPopup.vue | 2 +-
.../coms/requestInfoPopup.vue | 2 +-
.../coms/returnDetailInfoPopup.vue | 2 +-
.../productionReturn/job/returnDetail.vue | 33 +++---
.../productionReturn/record/returnToHold.vue | 4 +-
.../productionReturn/record/returnToStore.vue | 4 +-
.../request/requestDetail.vue | 8 +-
.../coms/receiptDetailInfoPopup.vue | 2 +-
.../purchaseReceipt/coms/receiptInfoPopup.vue | 2 +-
.../coms/receiptJobListPopup.vue | 2 +-
.../coms/requestDetailInfoPopup.vue | 2 +-
.../purchaseReturn/coms/requestInfoPopup.vue | 2 +-
.../purchaseReturn/coms/returnInfoPopup.vue | 2 +-
.../coms/returnJobListPopup.vue | 2 +-
src/pages/purchaseReturn/job/returnDetail.vue | 2 +-
.../purchaseReturn/record/returnRecord.vue | 2 +-
.../request/returnRequestCreate.vue | 2 +-
.../putaway/coms/putawayJobListPopup.vue | 2 +-
src/pages/putaway/coms/requestInfoPopup.vue | 2 +-
src/pages/putaway/job/putawayDetail.vue | 2 +-
src/pages/putaway/record/putawayRecord.vue | 2 +-
.../putaway/request/putawayRequestCreate.vue | 2 +-
src/pages/query/coms/comItemBalance.vue | 2 +-
.../query/coms/comLocationDetailCard.vue | 2 +-
src/pages/query/container.vue | 2 +-
src/pages/query/item.vue | 2 +-
src/pages/query/location_copy.vue | 2 +-
.../coms/comRepleinshRequestPopup.vue | 8 +-
.../repleinsh/coms/comRepleishDetailCard.vue | 1 -
.../repleinsh/coms/repleinshJobListPopup.vue | 2 +-
src/pages/repleinsh/coms/requestInfoPopup.vue | 2 +-
src/pages/repleinsh/job/repleinshDetail.vue | 2 +-
.../repleinsh/record/repleinshRecord.vue | 2 +-
src/pages/scrap/coms/comScrapDetailCard.vue | 4 +-
src/pages/scrap/coms/requestInfoPopup.vue | 2 +-
src/pages/scrap/coms/scrapDetailInfoPopup.vue | 2 +-
src/pages/scrap/coms/scrapInfoPopup.vue | 2 +-
src/pages/scrap/coms/scrapJobListPopup.vue | 2 +-
src/pages/scrap/job/scrapJobDetail.vue | 4 +-
src/pages/scrap/record/scrapRecord.vue | 2 +-
.../scrap/request/scrapRequestCreate.vue | 2 +-
.../stockUp/coms/comStockUpDetailCard.vue | 2 +-
src/pages/stockUp/coms/jobInfoPopup.vue | 2 +-
src/pages/stockUp/coms/jobListPopup.vue | 2 +-
.../stockUp/coms/stockUpDetailInfoPopup.vue | 2 +-
src/pages/stockUp/job/stockUpJobDetail.vue | 4 +-
.../supplierDeliver/coms/comRecordCard.vue | 12 +--
.../coms/comRecordDetailCard.vue | 1 -
.../coms/recordDetailInfoPopup.vue | 2 +-
.../supplierDeliver/coms/recordInfoPopup.vue | 2 +-
.../coms/recordListDetailPop.vue | 2 +-
.../supplierDeliver/coms/recordListPopup.vue | 2 +-
.../coms/recordtDetailInfoPopup.vue | 2 +-
.../record/supplierDeliverRecord.vue | 10 +-
.../record/supplierDeliverRecordDetail.vue | 21 ++--
.../transfer/coms/comReceiptDetailCard.vue | 4 +-
src/pages/transfer/coms/comTransferRecord.vue | 2 +-
src/pages/transfer/coms/jobInfoPopup.vue | 2 +-
src/pages/transfer/coms/jobListPopup.vue | 2 +-
src/pages/transfer/job/receiptDetail.vue | 2 +-
src/pages/transfer/job/transferDetail.vue | 2 +-
src/pages/transfer/record/deliverRecord.vue | 2 +-
src/pages/transfer/record/receiptRecord.vue | 2 +-
src/pages/unPlanned/coms/comBalance.vue | 2 +-
.../unPlanned/coms/comIssueDetailCard.vue | 4 +-
.../unPlanned/coms/comReceiptDetailCard.vue | 4 +-
src/pages/unPlanned/coms/comReceiptRecord.vue | 4 +-
.../unPlanned/coms/comReceiptRequestPopup.vue | 8 +-
src/pages/unPlanned/coms/jobListPopup.vue | 2 +-
.../unPlanned/coms/requestIssInfoPopup.vue | 2 +-
.../unPlanned/coms/requestRecInfoPopup.vue | 2 +-
src/pages/unPlanned/job/issueJobDetail.vue | 3 +-
src/pages/unPlanned/job/receiptJobDetail.vue | 4 +-
src/pages/unPlanned/record/issueRecord.vue | 2 +-
src/pages/unPlanned/record/receiptRecord.vue | 4 +-
.../unPlanned/request/issueRequestCreate.vue | 2 +-
.../request/receiptRequestCreate.vue | 4 +-
201 files changed, 515 insertions(+), 428 deletions(-)
create mode 100644 src/mycomponents/record/recordComMainCard.vue
diff --git a/src/components/show-modal/show-modal.vue b/src/components/show-modal/show-modal.vue
index f8b523a3..554f06f1 100644
--- a/src/components/show-modal/show-modal.vue
+++ b/src/components/show-modal/show-modal.vue
@@ -13,7 +13,7 @@
-
+
diff --git a/src/mycomponents/balance/balanceDetailPopup.vue b/src/mycomponents/balance/balanceDetailPopup.vue
index 62c0be1e..6aa87db6 100644
--- a/src/mycomponents/balance/balanceDetailPopup.vue
+++ b/src/mycomponents/balance/balanceDetailPopup.vue
@@ -4,7 +4,7 @@
-
+
{{item.title}} :
{{item.content}}
-
+
diff --git a/src/mycomponents/common/comMessage.vue b/src/mycomponents/common/comMessage.vue
index 9b560ca5..b81f2019 100644
--- a/src/mycomponents/common/comMessage.vue
+++ b/src/mycomponents/common/comMessage.vue
@@ -11,7 +11,7 @@
-
+
diff --git a/src/mycomponents/detail/comDetailCard.vue b/src/mycomponents/detail/comDetailCard.vue
index 708a35d4..d229d897 100644
--- a/src/mycomponents/detail/comDetailCard.vue
+++ b/src/mycomponents/detail/comDetailCard.vue
@@ -3,10 +3,11 @@
-
+
-
+
+
\ No newline at end of file
diff --git a/src/mycomponents/detail/comRequestDetailCard.vue b/src/mycomponents/detail/comRequestDetailCard.vue
index e687afaf..dc5aef20 100644
--- a/src/mycomponents/detail/comRequestDetailCard.vue
+++ b/src/mycomponents/detail/comRequestDetailCard.vue
@@ -11,7 +11,6 @@
:isShowStdPack="false">
-
-
+
-
+
-
+
-
+
diff --git a/src/mycomponents/detail/recordDetailCommonInfo.vue b/src/mycomponents/detail/recordDetailCommonInfo.vue
index ef7a547f..1ec09e4a 100644
--- a/src/mycomponents/detail/recordDetailCommonInfo.vue
+++ b/src/mycomponents/detail/recordDetailCommonInfo.vue
@@ -1,12 +1,12 @@
-
+
-
+
diff --git a/src/mycomponents/detail/recordDetailPopup.vue b/src/mycomponents/detail/recordDetailPopup.vue
index a92991f0..19122fc8 100644
--- a/src/mycomponents/detail/recordDetailPopup.vue
+++ b/src/mycomponents/detail/recordDetailPopup.vue
@@ -2,14 +2,14 @@
-
+
-
+
-
+
diff --git a/src/mycomponents/detail/requestDetailCommonInfo.vue b/src/mycomponents/detail/requestDetailCommonInfo.vue
index 3fa9226c..9e19ff1f 100644
--- a/src/mycomponents/detail/requestDetailCommonInfo.vue
+++ b/src/mycomponents/detail/requestDetailCommonInfo.vue
@@ -1,12 +1,12 @@
-
+
-
+
diff --git a/src/mycomponents/item/itemInfoPopup.vue b/src/mycomponents/item/itemInfoPopup.vue
index 9ce35800..ea5eb275 100644
--- a/src/mycomponents/item/itemInfoPopup.vue
+++ b/src/mycomponents/item/itemInfoPopup.vue
@@ -39,14 +39,14 @@
-->
-
+
{{item.title}} :
{{item.content}}
-
+
diff --git a/src/mycomponents/item/itemQty.vue b/src/mycomponents/item/itemQty.vue
index fb792eba..dc9623f7 100644
--- a/src/mycomponents/item/itemQty.vue
+++ b/src/mycomponents/item/itemQty.vue
@@ -4,19 +4,11 @@
-
-
-
+
-
+
\ No newline at end of file
diff --git a/src/mycomponents/job/jobCommonInfo.vue b/src/mycomponents/job/jobCommonInfo.vue
index 28afb772..aa6baedf 100644
--- a/src/mycomponents/job/jobCommonInfo.vue
+++ b/src/mycomponents/job/jobCommonInfo.vue
@@ -1,15 +1,15 @@
-
+
-
+
-
+
diff --git a/src/mycomponents/job/jobInfoPopup.vue b/src/mycomponents/job/jobInfoPopup.vue
index 92f04d7f..a16bdb82 100644
--- a/src/mycomponents/job/jobInfoPopup.vue
+++ b/src/mycomponents/job/jobInfoPopup.vue
@@ -3,13 +3,13 @@
-
+
-
+
diff --git a/src/mycomponents/job/jobcomDetailCard.vue b/src/mycomponents/job/jobcomDetailCard.vue
index 77fc6fef..50ca15ca 100644
--- a/src/mycomponents/job/jobcomDetailCard.vue
+++ b/src/mycomponents/job/jobcomDetailCard.vue
@@ -6,7 +6,7 @@
-
+
-
+
diff --git a/src/mycomponents/qty/balanceQty.vue b/src/mycomponents/qty/balanceQty.vue
index 11fa2ed9..1ea92f78 100644
--- a/src/mycomponents/qty/balanceQty.vue
+++ b/src/mycomponents/qty/balanceQty.vue
@@ -6,7 +6,8 @@
{{Number(dataContent.qty)}}
-
+
+
diff --git a/src/mycomponents/qty/balanceQtyEdit.vue b/src/mycomponents/qty/balanceQtyEdit.vue
index 4651d59a..11f048de 100644
--- a/src/mycomponents/qty/balanceQtyEdit.vue
+++ b/src/mycomponents/qty/balanceQtyEdit.vue
@@ -10,7 +10,7 @@
-
+
@@ -22,7 +22,7 @@
-
+
标包量 :
@@ -31,7 +31,7 @@
-
+
数量 :
@@ -40,7 +40,7 @@
-
+
库存数量 :
@@ -48,7 +48,7 @@
-
+
库存状态 :
@@ -58,7 +58,7 @@
-
+
diff --git a/src/mycomponents/qty/countQtyEdit.vue b/src/mycomponents/qty/countQtyEdit.vue
index dc42195f..17ff75ab 100644
--- a/src/mycomponents/qty/countQtyEdit.vue
+++ b/src/mycomponents/qty/countQtyEdit.vue
@@ -10,7 +10,7 @@
-
+
@@ -24,7 +24,7 @@
-
+
标包量 :
@@ -33,7 +33,7 @@
-
+
数量 :
@@ -42,7 +42,7 @@
-
+
库存数量 :
@@ -51,7 +51,7 @@
-
+
库存状态 :
@@ -61,7 +61,7 @@
-
+
diff --git a/src/mycomponents/qty/inspectQtyEdit.vue b/src/mycomponents/qty/inspectQtyEdit.vue
index 0ce8e195..3a9403ba 100644
--- a/src/mycomponents/qty/inspectQtyEdit.vue
+++ b/src/mycomponents/qty/inspectQtyEdit.vue
@@ -10,7 +10,7 @@
-
+
@@ -22,7 +22,7 @@
-
+
不合格数量 :
@@ -31,7 +31,7 @@
-
+
@@ -41,7 +41,7 @@
placeholder="请选择原因" popup-title="选择不合格原因" :localdata="reasonList" v-model="reason">
-
+
diff --git a/src/mycomponents/qty/recommendQtyEdit.vue b/src/mycomponents/qty/recommendQtyEdit.vue
index 38300018..ef5ce407 100644
--- a/src/mycomponents/qty/recommendQtyEdit.vue
+++ b/src/mycomponents/qty/recommendQtyEdit.vue
@@ -10,7 +10,7 @@
-
+
@@ -22,7 +22,7 @@
-
+
包装规格 :
@@ -31,7 +31,7 @@
-
+
总数量 :
@@ -40,7 +40,7 @@
-
+
diff --git a/src/mycomponents/recommend/recommend.vue b/src/mycomponents/recommend/recommend.vue
index 3061f1c9..564be34d 100644
--- a/src/mycomponents/recommend/recommend.vue
+++ b/src/mycomponents/recommend/recommend.vue
@@ -13,18 +13,18 @@
-
+
+ {{detail.handleQty}}
-
- 复制采购
- |制品
+ 复制
+
diff --git a/src/mycomponents/record/record.vue b/src/mycomponents/record/record.vue
index bd7e6b1d..e22d36c2 100644
--- a/src/mycomponents/record/record.vue
+++ b/src/mycomponents/record/record.vue
@@ -16,7 +16,7 @@
-
+
diff --git a/src/mycomponents/record/recordComDetailCard.vue b/src/mycomponents/record/recordComDetailCard.vue
index 81d1cd06..ddcce89c 100644
--- a/src/mycomponents/record/recordComDetailCard.vue
+++ b/src/mycomponents/record/recordComDetailCard.vue
@@ -10,7 +10,7 @@
-
+
-
+
diff --git a/src/mycomponents/record/recordComMainCard.vue b/src/mycomponents/record/recordComMainCard.vue
new file mode 100644
index 00000000..7d3442a0
--- /dev/null
+++ b/src/mycomponents/record/recordComMainCard.vue
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/mycomponents/record/recordCommonInfo.vue b/src/mycomponents/record/recordCommonInfo.vue
index efcd0f76..524d54f3 100644
--- a/src/mycomponents/record/recordCommonInfo.vue
+++ b/src/mycomponents/record/recordCommonInfo.vue
@@ -1,14 +1,14 @@
-
+
diff --git a/src/mycomponents/record/recordDetailCommonInfo.vue b/src/mycomponents/record/recordDetailCommonInfo.vue
index 7655126f..512d2af3 100644
--- a/src/mycomponents/record/recordDetailCommonInfo.vue
+++ b/src/mycomponents/record/recordDetailCommonInfo.vue
@@ -1,7 +1,7 @@
-
+
diff --git a/src/mycomponents/record/recordListDetailPoup.vue b/src/mycomponents/record/recordListDetailPoup.vue
index 7bbdf298..89b9935d 100644
--- a/src/mycomponents/record/recordListDetailPoup.vue
+++ b/src/mycomponents/record/recordListDetailPoup.vue
@@ -3,10 +3,10 @@
-
+
-
+
diff --git a/src/mycomponents/record/recordTop.vue b/src/mycomponents/record/recordTop.vue
index 6c52a50a..215c0e9e 100644
--- a/src/mycomponents/record/recordTop.vue
+++ b/src/mycomponents/record/recordTop.vue
@@ -2,7 +2,7 @@
-
+
diff --git a/src/mycomponents/request/requestComMainCard.vue b/src/mycomponents/request/requestComMainCard.vue
index 0f4ca8a5..1ae30fe9 100644
--- a/src/mycomponents/request/requestComMainCard.vue
+++ b/src/mycomponents/request/requestComMainCard.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/mycomponents/request/requestCommonInfo.vue b/src/mycomponents/request/requestCommonInfo.vue
index b044adb5..d8f18495 100644
--- a/src/mycomponents/request/requestCommonInfo.vue
+++ b/src/mycomponents/request/requestCommonInfo.vue
@@ -1,14 +1,14 @@
-
+
diff --git a/src/pages/container/coms/comContainerBindCard.vue b/src/pages/container/coms/comContainerBindCard.vue
index 234aa32e..e126487f 100644
--- a/src/pages/container/coms/comContainerBindCard.vue
+++ b/src/pages/container/coms/comContainerBindCard.vue
@@ -11,7 +11,7 @@
-
+
-
+
-
+
diff --git a/src/pages/container/record/containerBindRecord.vue b/src/pages/container/record/containerBindRecord.vue
index 64e0d7e7..3aa3175d 100644
--- a/src/pages/container/record/containerBindRecord.vue
+++ b/src/pages/container/record/containerBindRecord.vue
@@ -9,7 +9,7 @@
-
+
diff --git a/src/pages/container/record/containerUnBindRecord.vue b/src/pages/container/record/containerUnBindRecord.vue
index c985da11..af7d0981 100644
--- a/src/pages/container/record/containerUnBindRecord.vue
+++ b/src/pages/container/record/containerUnBindRecord.vue
@@ -9,7 +9,7 @@
-
+
diff --git a/src/pages/count/coms/comCountDetailCard.vue b/src/pages/count/coms/comCountDetailCard.vue
index 8722bde8..566ac3cf 100644
--- a/src/pages/count/coms/comCountDetailCard.vue
+++ b/src/pages/count/coms/comCountDetailCard.vue
@@ -21,7 +21,7 @@
-
+
diff --git a/src/pages/count/coms/jobListPopup.vue b/src/pages/count/coms/jobListPopup.vue
index fe98c8cf..7f554bb5 100644
--- a/src/pages/count/coms/jobListPopup.vue
+++ b/src/pages/count/coms/jobListPopup.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/pages/count/job/countDetail.vue b/src/pages/count/job/countDetail.vue
index 74cd9c54..af684cf4 100644
--- a/src/pages/count/job/countDetail.vue
+++ b/src/pages/count/job/countDetail.vue
@@ -31,7 +31,7 @@
@updateData="updateData">
-
+
diff --git a/src/pages/count/record/countRecord.vue b/src/pages/count/record/countRecord.vue
index 072e882b..7b1e4679 100644
--- a/src/pages/count/record/countRecord.vue
+++ b/src/pages/count/record/countRecord.vue
@@ -7,7 +7,7 @@
-
+
@@ -17,7 +17,7 @@
@editItem="editItem">
-
+
diff --git a/src/pages/customerReturn/coms/comReturnRecord.vue b/src/pages/customerReturn/coms/comReturnRecord.vue
index 784d610b..ec8b8f5a 100644
--- a/src/pages/customerReturn/coms/comReturnRecord.vue
+++ b/src/pages/customerReturn/coms/comReturnRecord.vue
@@ -11,7 +11,7 @@
-
+
-
+
diff --git a/src/pages/customerReturn/coms/jobInfoPopup.vue b/src/pages/customerReturn/coms/jobInfoPopup.vue
index cd90fcad..56c95d71 100644
--- a/src/pages/customerReturn/coms/jobInfoPopup.vue
+++ b/src/pages/customerReturn/coms/jobInfoPopup.vue
@@ -34,7 +34,7 @@
-
+
diff --git a/src/pages/customerReturn/coms/jobListPopup.vue b/src/pages/customerReturn/coms/jobListPopup.vue
index 4c73872a..07de2e65 100644
--- a/src/pages/customerReturn/coms/jobListPopup.vue
+++ b/src/pages/customerReturn/coms/jobListPopup.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/pages/customerReturn/coms/requestInfoPopup.vue b/src/pages/customerReturn/coms/requestInfoPopup.vue
index 1799e48b..cf979d8d 100644
--- a/src/pages/customerReturn/coms/requestInfoPopup.vue
+++ b/src/pages/customerReturn/coms/requestInfoPopup.vue
@@ -5,7 +5,7 @@
-
+
diff --git a/src/pages/customerReturn/job/returnDetail.vue b/src/pages/customerReturn/job/returnDetail.vue
index 089ba105..9d3342fc 100644
--- a/src/pages/customerReturn/job/returnDetail.vue
+++ b/src/pages/customerReturn/job/returnDetail.vue
@@ -9,7 +9,7 @@
:locationAreaTypeList="toLocationAreaTypeList">
-
+
diff --git a/src/pages/deliver/coms/comDeliverDetailCard.vue b/src/pages/deliver/coms/comDeliverDetailCard.vue
index 81c35f23..31da1f5c 100644
--- a/src/pages/deliver/coms/comDeliverDetailCard.vue
+++ b/src/pages/deliver/coms/comDeliverDetailCard.vue
@@ -10,7 +10,6 @@
-
diff --git a/src/pages/deliver/coms/comDeliverRequestPopup.vue b/src/pages/deliver/coms/comDeliverRequestPopup.vue
index 046c5de4..14e332b3 100644
--- a/src/pages/deliver/coms/comDeliverRequestPopup.vue
+++ b/src/pages/deliver/coms/comDeliverRequestPopup.vue
@@ -10,7 +10,7 @@
-
+
@@ -23,7 +23,7 @@
@confirm="confirmSelect">
-
+
物料 :
@@ -36,7 +36,7 @@
-
+
数量 :
@@ -52,7 +52,7 @@
-
+
diff --git a/src/pages/deliver/coms/jobInfoPopup.vue b/src/pages/deliver/coms/jobInfoPopup.vue
index 831b56ea..f5e5970c 100644
--- a/src/pages/deliver/coms/jobInfoPopup.vue
+++ b/src/pages/deliver/coms/jobInfoPopup.vue
@@ -34,7 +34,7 @@
-
+
diff --git a/src/pages/deliver/coms/jobListPopup.vue b/src/pages/deliver/coms/jobListPopup.vue
index f58edcf5..e63d998e 100644
--- a/src/pages/deliver/coms/jobListPopup.vue
+++ b/src/pages/deliver/coms/jobListPopup.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/pages/deliver/coms/requestInfoPopup.vue b/src/pages/deliver/coms/requestInfoPopup.vue
index 6ecf270d..991575c8 100644
--- a/src/pages/deliver/coms/requestInfoPopup.vue
+++ b/src/pages/deliver/coms/requestInfoPopup.vue
@@ -6,7 +6,7 @@
-
+
diff --git a/src/pages/deliver/job/deliverDetail.vue b/src/pages/deliver/job/deliverDetail.vue
index 2993946b..eb654637 100644
--- a/src/pages/deliver/job/deliverDetail.vue
+++ b/src/pages/deliver/job/deliverDetail.vue
@@ -4,18 +4,17 @@
-
diff --git a/src/pages/deliver/record/deliverRecord.vue b/src/pages/deliver/record/deliverRecord.vue
index 6352785b..9e58789d 100644
--- a/src/pages/deliver/record/deliverRecord.vue
+++ b/src/pages/deliver/record/deliverRecord.vue
@@ -13,7 +13,7 @@
@removePack="removePack">
-
+
diff --git a/src/pages/deliver/request/deliverRequestDetail.vue b/src/pages/deliver/request/deliverRequestDetail.vue
index 93151927..c1cbc1dd 100644
--- a/src/pages/deliver/request/deliverRequestDetail.vue
+++ b/src/pages/deliver/request/deliverRequestDetail.vue
@@ -15,7 +15,7 @@
{{detailSource.customerCode}}
-
+
diff --git a/src/pages/inspect/coms/comInspectDetailCard.vue b/src/pages/inspect/coms/comInspectDetailCard.vue
index 15ecd57a..5c7ce1e6 100644
--- a/src/pages/inspect/coms/comInspectDetailCard.vue
+++ b/src/pages/inspect/coms/comInspectDetailCard.vue
@@ -5,7 +5,7 @@
-
+
-
+
diff --git a/src/pages/inspect/coms/comInspectJobList.vue b/src/pages/inspect/coms/comInspectJobList.vue
index 87f0b010..c72d9c45 100644
--- a/src/pages/inspect/coms/comInspectJobList.vue
+++ b/src/pages/inspect/coms/comInspectJobList.vue
@@ -4,7 +4,7 @@
-
+
diff --git a/src/pages/inspect/coms/inspectComDetailCard.vue b/src/pages/inspect/coms/inspectComDetailCard.vue
index f6c62e7e..6c30b2bd 100644
--- a/src/pages/inspect/coms/inspectComDetailCard.vue
+++ b/src/pages/inspect/coms/inspectComDetailCard.vue
@@ -25,10 +25,10 @@
{{jobContent.crackQty}}{{getUomInfo(jobContent.uom)}}
-
+
-
+
@@ -39,7 +39,7 @@
-
+
-
+
diff --git a/src/pages/inspect/coms/inspectInfoPopup.vue b/src/pages/inspect/coms/inspectInfoPopup.vue
index f222e756..d7c84d66 100644
--- a/src/pages/inspect/coms/inspectInfoPopup.vue
+++ b/src/pages/inspect/coms/inspectInfoPopup.vue
@@ -62,7 +62,7 @@
-
+
diff --git a/src/pages/inspect/coms/requestInfoPopup.vue b/src/pages/inspect/coms/requestInfoPopup.vue
index 0fcc258b..6b26321d 100644
--- a/src/pages/inspect/coms/requestInfoPopup.vue
+++ b/src/pages/inspect/coms/requestInfoPopup.vue
@@ -5,7 +5,7 @@
-
+
diff --git a/src/pages/inspect/job/inspectResult.vue b/src/pages/inspect/job/inspectResult.vue
index ff43ba72..275cbddd 100644
--- a/src/pages/inspect/job/inspectResult.vue
+++ b/src/pages/inspect/job/inspectResult.vue
@@ -122,7 +122,7 @@
库位:{{item.fromLocationCode}}
-
+
diff --git a/src/pages/inspect/request/inspectRequestDetail.vue b/src/pages/inspect/request/inspectRequestDetail.vue
index 4f89b76b..7fb0f7be 100644
--- a/src/pages/inspect/request/inspectRequestDetail.vue
+++ b/src/pages/inspect/request/inspectRequestDetail.vue
@@ -11,7 +11,7 @@
供应商代码 : {{requestContent.supplierCode}}
-
+
-
+
-
+
diff --git a/src/pages/inventoryMove/coms/comMove.vue b/src/pages/inventoryMove/coms/comMove.vue
index 7bc3165e..3d5ca05e 100644
--- a/src/pages/inventoryMove/coms/comMove.vue
+++ b/src/pages/inventoryMove/coms/comMove.vue
@@ -4,7 +4,7 @@
-
+
@@ -14,7 +14,7 @@
:allowEditStatus="allowEditStatus">
-
+
diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue
index 42ba0c14..be1c383e 100644
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@@ -4,7 +4,7 @@
-
+
diff --git a/src/pages/inventoryMove/coms/comMoveRecordCard.vue b/src/pages/inventoryMove/coms/comMoveRecordCard.vue
index 1387b86b..80c1c590 100644
--- a/src/pages/inventoryMove/coms/comMoveRecordCard.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecordCard.vue
@@ -21,7 +21,7 @@
:isShowLocation="true" :allowEditStatus='allowEditStatus'>
-
+
diff --git a/src/pages/inventoryMove/coms/jobListPopup.vue b/src/pages/inventoryMove/coms/jobListPopup.vue
index 59ace1d4..1ee3b99e 100644
--- a/src/pages/inventoryMove/coms/jobListPopup.vue
+++ b/src/pages/inventoryMove/coms/jobListPopup.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
index 84019b17..0896ee9c 100644
--- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -7,7 +7,7 @@
-
+
diff --git a/src/pages/issue-按批次推荐/coms/comIssueDetailCard.vue b/src/pages/issue-按批次推荐/coms/comIssueDetailCard.vue
index 80dcf056..0ddb16c7 100644
--- a/src/pages/issue-按批次推荐/coms/comIssueDetailCard.vue
+++ b/src/pages/issue-按批次推荐/coms/comIssueDetailCard.vue
@@ -3,7 +3,7 @@
-
+
@@ -11,7 +11,7 @@
-
+
diff --git a/src/pages/issue-按批次推荐/coms/comIssueRecommend.vue b/src/pages/issue-按批次推荐/coms/comIssueRecommend.vue
index c9256fd9..c08bf3e6 100644
--- a/src/pages/issue-按批次推荐/coms/comIssueRecommend.vue
+++ b/src/pages/issue-按批次推荐/coms/comIssueRecommend.vue
@@ -25,7 +25,7 @@
-
+
diff --git a/src/pages/issue/coms/comIssueDetailCard.vue b/src/pages/issue/coms/comIssueDetailCard.vue
index 9b3fd707..1826af97 100644
--- a/src/pages/issue/coms/comIssueDetailCard.vue
+++ b/src/pages/issue/coms/comIssueDetailCard.vue
@@ -2,11 +2,11 @@
-
+
-->
-
+
+
@@ -30,7 +31,8 @@
:isShowPack="batch.packingNumber!=null && batch.packingNumber!=''">
-
+
扫描
@@ -77,7 +79,7 @@
} from '@/common/array.js';
export default {
- emits: ['updateData',"removeItemCode"],
+ emits: ['updateData', "removeItemCode"],
components: {
itemQty,
recommend,
@@ -112,7 +114,7 @@
batchItem: {},
detailOptions: [],
scanOptions: [],
- removeOptions:[]
+ removeOptions: []
}
},
@@ -141,12 +143,12 @@
this.remove(batch, record, index)
}
},
-
- itemCoceClick(e,item,index){
+
+ itemCoceClick(e, item, index) {
if (e.content.text == "移除") {
this.dataContent.Items.splice(index, 1);
this.$emit('removeItemCode')
- }
+ }
},
edit(batch, item) {
@@ -185,4 +187,4 @@
+
\ No newline at end of file
diff --git a/src/pages/issue/coms/comIssueJobCard.vue b/src/pages/issue/coms/comIssueJobCard.vue
index 9226463b..94b8969d 100644
--- a/src/pages/issue/coms/comIssueJobCard.vue
+++ b/src/pages/issue/coms/comIssueJobCard.vue
@@ -1,12 +1,15 @@
-
+
车间 {{dataContent.workShopCode}}
+
+ 生产线 {{dataContent.workShopCode}}
+
diff --git a/src/pages/issue/coms/comIssueRecommend.vue b/src/pages/issue/coms/comIssueRecommend.vue
index c9256fd9..c08bf3e6 100644
--- a/src/pages/issue/coms/comIssueRecommend.vue
+++ b/src/pages/issue/coms/comIssueRecommend.vue
@@ -25,7 +25,7 @@
-
+
diff --git a/src/pages/issue/coms/comIssueRequestCreator.vue b/src/pages/issue/coms/comIssueRequestCreator.vue
index 07f13bd7..ce68e6dd 100644
--- a/src/pages/issue/coms/comIssueRequestCreator.vue
+++ b/src/pages/issue/coms/comIssueRequestCreator.vue
@@ -11,7 +11,7 @@
-
+
diff --git a/src/pages/issue/coms/comIssueRequestDetailCard.vue b/src/pages/issue/coms/comIssueRequestDetailCard.vue
index 60db0b14..1737cd31 100644
--- a/src/pages/issue/coms/comIssueRequestDetailCard.vue
+++ b/src/pages/issue/coms/comIssueRequestDetailCard.vue
@@ -10,7 +10,7 @@
-
+
diff --git a/src/pages/issue/coms/comIssueRequestPopup.vue b/src/pages/issue/coms/comIssueRequestPopup.vue
index 32d1923e..33d04731 100644
--- a/src/pages/issue/coms/comIssueRequestPopup.vue
+++ b/src/pages/issue/coms/comIssueRequestPopup.vue
@@ -10,7 +10,7 @@
-
+
@@ -24,7 +24,7 @@
-
+
位置:
@@ -35,7 +35,7 @@
@confirm="confirmSelect">
-
+
物料:
@@ -49,7 +49,7 @@
-
+
数量:
-
+
diff --git a/src/pages/issue/coms/jobListPopup.vue b/src/pages/issue/coms/jobListPopup.vue
index 315991f6..6e49a0d1 100644
--- a/src/pages/issue/coms/jobListPopup.vue
+++ b/src/pages/issue/coms/jobListPopup.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/pages/issue/coms/requestInfoPopup.vue b/src/pages/issue/coms/requestInfoPopup.vue
index 433374aa..c2ce5c56 100644
--- a/src/pages/issue/coms/requestInfoPopup.vue
+++ b/src/pages/issue/coms/requestInfoPopup.vue
@@ -5,7 +5,7 @@
-
+
diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue
index bfba40ea..01e75dc1 100644
--- a/src/pages/issue/job/issueDetail.vue
+++ b/src/pages/issue/job/issueDetail.vue
@@ -4,9 +4,9 @@
-
@@ -17,6 +17,7 @@
+
diff --git a/src/pages/package/coms/comOverPackJobDetailCard.vue b/src/pages/package/coms/comOverPackJobDetailCard.vue
index 7cd7c1f1..e3a8de4c 100644
--- a/src/pages/package/coms/comOverPackJobDetailCard.vue
+++ b/src/pages/package/coms/comOverPackJobDetailCard.vue
@@ -17,7 +17,7 @@
-
+
diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue
index 048411fc..ffa515e9 100644
--- a/src/pages/package/job/overPackageJobDetail.vue
+++ b/src/pages/package/job/overPackageJobDetail.vue
@@ -4,9 +4,9 @@
-
@@ -26,7 +26,7 @@
-
+
-
+
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index 1aacd9e3..7bd7be06 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/src/pages/package/record/overPackageRecord.vue
@@ -30,7 +30,7 @@
:isShowFromLocation="false" :isShowToLocation="false">
-
+
diff --git a/src/pages/productDismantle/coms/comProductDetailCard.vue b/src/pages/productDismantle/coms/comProductDetailCard.vue
index 4c567370..72489db6 100644
--- a/src/pages/productDismantle/coms/comProductDetailCard.vue
+++ b/src/pages/productDismantle/coms/comProductDetailCard.vue
@@ -5,7 +5,7 @@
-
+
-
+
-
+
diff --git a/src/pages/productDismantle/coms/jobListPopup.vue b/src/pages/productDismantle/coms/jobListPopup.vue
index 7d0c8b93..f4c0e319 100644
--- a/src/pages/productDismantle/coms/jobListPopup.vue
+++ b/src/pages/productDismantle/coms/jobListPopup.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/pages/productDismantle/coms/requestInfoPopup.vue b/src/pages/productDismantle/coms/requestInfoPopup.vue
index 3a39a00b..3ed9a6cb 100644
--- a/src/pages/productDismantle/coms/requestInfoPopup.vue
+++ b/src/pages/productDismantle/coms/requestInfoPopup.vue
@@ -36,7 +36,7 @@
-
+
diff --git a/src/pages/productDismantle/job/productDismantleDetail.vue b/src/pages/productDismantle/job/productDismantleDetail.vue
index e6604b48..c8a8f7c5 100644
--- a/src/pages/productDismantle/job/productDismantleDetail.vue
+++ b/src/pages/productDismantle/job/productDismantleDetail.vue
@@ -7,7 +7,7 @@
-
+
@@ -17,7 +17,7 @@
@remove="updateData" @updateData="updateData" @openDetail="openDetail">
-
+
diff --git a/src/pages/productDismantle/record/productDismantleRecord.vue b/src/pages/productDismantle/record/productDismantleRecord.vue
index 1a6f1930..0ff35dbd 100644
--- a/src/pages/productDismantle/record/productDismantleRecord.vue
+++ b/src/pages/productDismantle/record/productDismantleRecord.vue
@@ -13,7 +13,7 @@
@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
-
+
diff --git a/src/pages/productPutaway/coms/comProductDetailCard.vue b/src/pages/productPutaway/coms/comProductDetailCard.vue
index 4c567370..72489db6 100644
--- a/src/pages/productPutaway/coms/comProductDetailCard.vue
+++ b/src/pages/productPutaway/coms/comProductDetailCard.vue
@@ -5,7 +5,7 @@
-
+
-
+
diff --git a/src/pages/productPutaway/coms/requestInfoPopup.vue b/src/pages/productPutaway/coms/requestInfoPopup.vue
index eea5cfd4..0168f889 100644
--- a/src/pages/productPutaway/coms/requestInfoPopup.vue
+++ b/src/pages/productPutaway/coms/requestInfoPopup.vue
@@ -5,7 +5,7 @@
-
+
diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue
index 3df6170a..23f7cb71 100644
--- a/src/pages/productPutaway/job/productPutawayDetail.vue
+++ b/src/pages/productPutaway/job/productPutawayDetail.vue
@@ -7,7 +7,7 @@
-
+
@@ -18,7 +18,6 @@
:locationAreaTypeList='toLocationAreaTypeList'>
-
diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue
index d4871a2e..adba4f24 100644
--- a/src/pages/productPutaway/record/productPutawayRecord.vue
+++ b/src/pages/productPutaway/record/productPutawayRecord.vue
@@ -13,7 +13,7 @@
@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
-
+
diff --git a/src/pages/productPutaway/request/putawayRequestDetail.vue b/src/pages/productPutaway/request/putawayRequestDetail.vue
index 1d71a3d0..ab816d24 100644
--- a/src/pages/productPutaway/request/putawayRequestDetail.vue
+++ b/src/pages/productPutaway/request/putawayRequestDetail.vue
@@ -7,7 +7,7 @@
-
+
diff --git a/src/pages/productReceipt/coms/comProductDetailCard.vue b/src/pages/productReceipt/coms/comProductDetailCard.vue
index 6f191ad7..7b251c84 100644
--- a/src/pages/productReceipt/coms/comProductDetailCard.vue
+++ b/src/pages/productReceipt/coms/comProductDetailCard.vue
@@ -5,19 +5,17 @@
-
-
+
+ style="margin-left: 20px;" v-for="(fg, index) in item.fgList" :key="index">
diff --git a/src/pages/productReceipt/coms/comProductJobCard.vue b/src/pages/productReceipt/coms/comProductJobCard.vue
index a8daf825..e97859ae 100644
--- a/src/pages/productReceipt/coms/comProductJobCard.vue
+++ b/src/pages/productReceipt/coms/comProductJobCard.vue
@@ -1,50 +1,60 @@
-
-
-
-
- 申请单号 : {{dataContent.requestNumber}}
-
-
-
-
-
- 车间代码 : {{dataContent.workShopCode}}
-
-
-
-
+
+
+
+
+ 申请单号 : {{dataContent.requestNumber}}
+
+
+
+
+
+ 计划单号 : {{dataContent.productionPlanNumber}}
+
+
+
+
+ 车间代码 : {{dataContent.workShopCode}}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/productReceipt/coms/comProductRecord.vue b/src/pages/productReceipt/coms/comProductRecord.vue
index de707d53..2e8c04a5 100644
--- a/src/pages/productReceipt/coms/comProductRecord.vue
+++ b/src/pages/productReceipt/coms/comProductRecord.vue
@@ -11,7 +11,7 @@
-
+
-
+
diff --git a/src/pages/productReceipt/coms/jobListPopup.vue b/src/pages/productReceipt/coms/jobListPopup.vue
index cbcf1996..af583353 100644
--- a/src/pages/productReceipt/coms/jobListPopup.vue
+++ b/src/pages/productReceipt/coms/jobListPopup.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/pages/productReceipt/coms/productDetailInfoPopup.vue b/src/pages/productReceipt/coms/productDetailInfoPopup.vue
index 046c093d..960ecbb8 100644
--- a/src/pages/productReceipt/coms/productDetailInfoPopup.vue
+++ b/src/pages/productReceipt/coms/productDetailInfoPopup.vue
@@ -15,7 +15,7 @@
-
+
diff --git a/src/pages/productReceipt/job/completeReceiveJobDetail.vue b/src/pages/productReceipt/job/completeReceiveJobDetail.vue
index 44829342..73b5a7d4 100644
--- a/src/pages/productReceipt/job/completeReceiveJobDetail.vue
+++ b/src/pages/productReceipt/job/completeReceiveJobDetail.vue
@@ -7,7 +7,7 @@
-
+
@@ -18,7 +18,7 @@
@remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'>
-
+
diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
index e432f79d..966f9871 100644
--- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
@@ -4,15 +4,39 @@
-
-
-
+
+
+
+ 车间
+
+ {{jobContent.workShopCode}}
+
+
+
+ 生产线
+
+ {{item.subList[0].productionLineCode}}
+
+
+
+ 班组
+
+ {{jobContent.team}}
+
+
+
+ 班次
+
+ {{jobContent.shift}}
+
+
+
+
+
@@ -86,7 +110,6 @@
import jobTop from '@/mycomponents/job/jobTop.vue'
import comProductDetailCard from "@/pages/productReceipt/coms/comProductDetailCard.vue"
-
export default {
name: 'receipt_detail',
components: {
@@ -193,6 +216,7 @@
that.jobToLocationCode = that.subList[0].toLocationCode
that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
that.detailSource = getDataSource(that.subList)
+
} else {
that.showMessage('列表数据为0');
}
@@ -211,25 +235,25 @@
result.uom = item.uom;
if (item.subList.length > 0) {
let subItem = item.subList[0];
- subItem.scaned=true;
+ subItem.scaned = true;
if (subItem.fgList == undefined) {
subItem.fgList = [];
}
-
- if(subItem.fgList.length==0){
+
+ if (subItem.fgList.length == 0) {
subItem.fgList.push(result);
that.calcFgQty(this.detailSource);
- }else {
+ } else {
var itemIndex = subItem.fgList.findIndex(r =>
r.itemCode == result.itemCode &&
r.productDate == result.productDate &&
r.order == result.order);
- if (itemIndex ==-1) {
+ if (itemIndex == -1) {
subItem.fgList.push(result);
that.calcFgQty(this.detailSource);
} else {
- this.showQuestionMessage("标签【"+result.content+'】已经扫描,是否移除',confirm=>{
- subItem.fgList.splice(itemIndex,1)
+ this.showQuestionMessage("标签【" + result.content + '】已经扫描,是否移除', confirm => {
+ subItem.fgList.splice(itemIndex, 1)
that.calcFgQty(this.detailSource);
})
}
@@ -374,11 +398,11 @@
detail.toContainerNumber = '';
detail.toInventoryStatus = detail.inventoryStatus
detail.toLocationCode = this.toLocationCode
- if(detail.fgList){
- detail.fgList.forEach(res=>{
- res.outsideItemCode =res.itemCode
+ if (detail.fgList) {
+ detail.fgList.forEach(res => {
+ res.outsideItemCode = res.itemCode
res.outsideProduceDate = res.productDate
- res.outsideSerialNumber =res.order
+ res.outsideSerialNumber = res.order
})
}
subList.push(detail)
@@ -430,8 +454,8 @@
navigateBack(1)
})
},
-
- showQuestionMessage(hint,callback){
+
+ showQuestionMessage(hint, callback) {
this.$refs.comMessage.showQuestionMessage(hint, res => {
if (res) {
callback(true)
diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index 2abfb59d..a54e75db 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -4,22 +4,47 @@
-
-
+
+
+
+ 车间
+
+ {{jobContent.workShopCode}}
+
+
+
+ 生产线
+
+ {{item.subList[0].productionLineCode}}
+
+
+
+ 班组
+
+ {{jobContent.team}}
+
+
+
+ 班次
+
+ {{jobContent.shift}}
+
+
+
+
+
+
-
diff --git a/src/pages/productReceipt/job/scrapReceiptDetail.vue b/src/pages/productReceipt/job/scrapReceiptDetail.vue
index d78a4282..c0db8193 100644
--- a/src/pages/productReceipt/job/scrapReceiptDetail.vue
+++ b/src/pages/productReceipt/job/scrapReceiptDetail.vue
@@ -7,7 +7,7 @@
-
+
@@ -27,8 +27,8 @@
-
@@ -103,8 +103,8 @@
detailSource: [], //绑定在页面上的数据源
toLocationTypeList: [],
managementList: [],
- jobStatus:"",
- jobToLocationCode:""
+ jobStatus: "",
+ jobToLocationCode: ""
};
},
@@ -132,7 +132,7 @@
onBackPress(e) {
//已经接收但是没提交任务
if (e.from == 'backbutton') {
- if (this.jobStatus=="2") {
+ if (this.jobStatus == "2") {
//取消承接任务
cancleTakeProductReceiptJob(this.id).then(res => {
uni.navigateBack();
@@ -413,4 +413,4 @@
+
\ No newline at end of file
diff --git a/src/pages/productReceipt/job/semiProductReceiptDetail.vue b/src/pages/productReceipt/job/semiProductReceiptDetail.vue
index 1941513b..860914fc 100644
--- a/src/pages/productReceipt/job/semiProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/semiProductReceiptDetail.vue
@@ -7,7 +7,7 @@
-
+
@@ -18,7 +18,7 @@
@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
-
+
diff --git a/src/pages/productReceipt/record/productReceiptRecord.vue b/src/pages/productReceipt/record/productReceiptRecord.vue
index 87aca59e..6cec6f09 100644
--- a/src/pages/productReceipt/record/productReceiptRecord.vue
+++ b/src/pages/productReceipt/record/productReceiptRecord.vue
@@ -12,7 +12,7 @@
@updateData="updateData" @removePack="removePack">
-
+
diff --git a/src/pages/productRecycle/coms/requestDetailInfoPopup.vue b/src/pages/productRecycle/coms/requestDetailInfoPopup.vue
index b7edbb2e..c3c0e081 100644
--- a/src/pages/productRecycle/coms/requestDetailInfoPopup.vue
+++ b/src/pages/productRecycle/coms/requestDetailInfoPopup.vue
@@ -3,7 +3,7 @@
-
+
订单号 :
diff --git a/src/pages/productRecycle/coms/requestInfoPopup.vue b/src/pages/productRecycle/coms/requestInfoPopup.vue
index 80d32c45..62821cc5 100644
--- a/src/pages/productRecycle/coms/requestInfoPopup.vue
+++ b/src/pages/productRecycle/coms/requestInfoPopup.vue
@@ -5,7 +5,7 @@
-
+
diff --git a/src/pages/productRecycle/coms/returnInfoPopup.vue b/src/pages/productRecycle/coms/returnInfoPopup.vue
index abef1359..3e0cdd9a 100644
--- a/src/pages/productRecycle/coms/returnInfoPopup.vue
+++ b/src/pages/productRecycle/coms/returnInfoPopup.vue
@@ -30,7 +30,7 @@
-
+
diff --git a/src/pages/productRecycle/coms/returnJobListPopup.vue b/src/pages/productRecycle/coms/returnJobListPopup.vue
index 56759af1..4f5e672b 100644
--- a/src/pages/productRecycle/coms/returnJobListPopup.vue
+++ b/src/pages/productRecycle/coms/returnJobListPopup.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/pages/productRecycle/job/productRecycleJobDetail.vue b/src/pages/productRecycle/job/productRecycleJobDetail.vue
index c6654b55..e4fc279a 100644
--- a/src/pages/productRecycle/job/productRecycleJobDetail.vue
+++ b/src/pages/productRecycle/job/productRecycleJobDetail.vue
@@ -7,7 +7,7 @@
-
+
diff --git a/src/pages/productRecycle/record/productRecycleRecord.vue b/src/pages/productRecycle/record/productRecycleRecord.vue
index f524bb56..1159cd2b 100644
--- a/src/pages/productRecycle/record/productRecycleRecord.vue
+++ b/src/pages/productRecycle/record/productRecycleRecord.vue
@@ -11,7 +11,7 @@
-
+
diff --git a/src/pages/productionReceipt/coms/comProductionDetailCard.vue b/src/pages/productionReceipt/coms/comProductionDetailCard.vue
index 4c567370..72489db6 100644
--- a/src/pages/productionReceipt/coms/comProductionDetailCard.vue
+++ b/src/pages/productionReceipt/coms/comProductionDetailCard.vue
@@ -5,7 +5,7 @@
-
+
-
+
-
+
diff --git a/src/pages/productionReceipt/coms/jobInfoPopup.vue b/src/pages/productionReceipt/coms/jobInfoPopup.vue
index 005efdb1..288c27f4 100644
--- a/src/pages/productionReceipt/coms/jobInfoPopup.vue
+++ b/src/pages/productionReceipt/coms/jobInfoPopup.vue
@@ -18,7 +18,7 @@
-
+
diff --git a/src/pages/productionReceipt/coms/jobListPopup.vue b/src/pages/productionReceipt/coms/jobListPopup.vue
index 79eff277..c96712d4 100644
--- a/src/pages/productionReceipt/coms/jobListPopup.vue
+++ b/src/pages/productionReceipt/coms/jobListPopup.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue
index a23ef4d4..c24722b9 100644
--- a/src/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -8,7 +8,7 @@
-
+
diff --git a/src/pages/productionReceipt/record/productionReceiptRecord.vue b/src/pages/productionReceipt/record/productionReceiptRecord.vue
index 628af9ef..f0b20c4b 100644
--- a/src/pages/productionReceipt/record/productionReceiptRecord.vue
+++ b/src/pages/productionReceipt/record/productionReceiptRecord.vue
@@ -13,7 +13,7 @@
@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
-
+
diff --git a/src/pages/productionReturn/coms/comReturn.vue b/src/pages/productionReturn/coms/comReturn.vue
index a4baeb6d..9b81b788 100644
--- a/src/pages/productionReturn/coms/comReturn.vue
+++ b/src/pages/productionReturn/coms/comReturn.vue
@@ -12,7 +12,7 @@
@updateData="updateData" @removePack="removePack">
-
+
diff --git a/src/pages/productionReturn/coms/comReturnDetailCard.vue b/src/pages/productionReturn/coms/comReturnDetailCard.vue
index a8b5c6c3..304ee867 100644
--- a/src/pages/productionReturn/coms/comReturnDetailCard.vue
+++ b/src/pages/productionReturn/coms/comReturnDetailCard.vue
@@ -5,7 +5,6 @@
-
-
diff --git a/src/pages/productionReturn/coms/comReturnRecord.vue b/src/pages/productionReturn/coms/comReturnRecord.vue
index 0236cd32..fc3c3eb2 100644
--- a/src/pages/productionReturn/coms/comReturnRecord.vue
+++ b/src/pages/productionReturn/coms/comReturnRecord.vue
@@ -10,7 +10,7 @@
-
+
-->
-
+
diff --git a/src/pages/productionReturn/coms/comReturnRequestInfo.vue b/src/pages/productionReturn/coms/comReturnRequestInfo.vue
index 4bed79ff..8c876373 100644
--- a/src/pages/productionReturn/coms/comReturnRequestInfo.vue
+++ b/src/pages/productionReturn/coms/comReturnRequestInfo.vue
@@ -18,7 +18,7 @@
{{ dataContent.fromLocationCode}}
-
+
@@ -54,4 +54,4 @@
+
\ No newline at end of file
diff --git a/src/pages/productionReturn/coms/comReturnRequestPopup.vue b/src/pages/productionReturn/coms/comReturnRequestPopup.vue
index c55dc974..0484cdc0 100644
--- a/src/pages/productionReturn/coms/comReturnRequestPopup.vue
+++ b/src/pages/productionReturn/coms/comReturnRequestPopup.vue
@@ -10,7 +10,7 @@
-
+
@@ -24,7 +24,7 @@
-
+
@@ -40,7 +40,7 @@
-
+
数量 :
@@ -56,7 +56,7 @@
-
+
diff --git a/src/pages/productionReturn/coms/jobListPopup.vue b/src/pages/productionReturn/coms/jobListPopup.vue
index 4c73872a..07de2e65 100644
--- a/src/pages/productionReturn/coms/jobListPopup.vue
+++ b/src/pages/productionReturn/coms/jobListPopup.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/pages/productionReturn/coms/requestInfoPopup.vue b/src/pages/productionReturn/coms/requestInfoPopup.vue
index 685f2c6b..240f9064 100644
--- a/src/pages/productionReturn/coms/requestInfoPopup.vue
+++ b/src/pages/productionReturn/coms/requestInfoPopup.vue
@@ -5,7 +5,7 @@
-
+
diff --git a/src/pages/productionReturn/coms/returnDetailInfoPopup.vue b/src/pages/productionReturn/coms/returnDetailInfoPopup.vue
index 4aae7781..67862954 100644
--- a/src/pages/productionReturn/coms/returnDetailInfoPopup.vue
+++ b/src/pages/productionReturn/coms/returnDetailInfoPopup.vue
@@ -15,7 +15,7 @@
-
+
diff --git a/src/pages/productionReturn/job/returnDetail.vue b/src/pages/productionReturn/job/returnDetail.vue
index ca6980c6..3314d567 100644
--- a/src/pages/productionReturn/job/returnDetail.vue
+++ b/src/pages/productionReturn/job/returnDetail.vue
@@ -4,24 +4,23 @@
-
-
-
-
+
+
+
-
@@ -30,8 +29,8 @@
-
@@ -111,8 +110,8 @@
toLocationInfo: {},
businessTypeInfo: {},
titleInfo: "",
- jobStatus:"",
- jobToLocationCode:""
+ jobStatus: "",
+ jobToLocationCode: ""
};
},
onLoad(option) {
@@ -138,7 +137,7 @@
onBackPress(e) {
//已经接收但是没提交任务
if (e.from == 'backbutton') {
- if (this.jobStatus=="2") {
+ if (this.jobStatus == "2") {
//取消承接任务
cancleTakeProductionReturnJob(this.id).then(res => {
uni.navigateBack();
@@ -240,9 +239,9 @@
// item.subList.forEach(l => {
// //重复的库位不往里面插入
// var location = fromlocationList.find(res => res == l.fromLocationCode)
- // if (location == undefined) {
- // fromlocationList.push(l.fromLocationCode);
- // }
+ // if (location == undefined) {
+ // fromlocationList.push(l.fromLocationCode);
+ // }
// //来源库位赋默认值
// if (fromlocationCode == '') {
// if (!l.scaned) {
@@ -508,4 +507,4 @@
+
\ No newline at end of file
diff --git a/src/pages/productionReturn/record/returnToHold.vue b/src/pages/productionReturn/record/returnToHold.vue
index da2793a6..f31af81d 100644
--- a/src/pages/productionReturn/record/returnToHold.vue
+++ b/src/pages/productionReturn/record/returnToHold.vue
@@ -9,7 +9,7 @@
:workStationCode="workStationCode" :rawLocationCode="rawLocationCode"
:fgLocationCode="fgLocationCode">
-
+
@@ -18,7 +18,7 @@
@updateData="updateData" @removePack="removePack" :isShowToLocation="false">
-
+
diff --git a/src/pages/productionReturn/record/returnToStore.vue b/src/pages/productionReturn/record/returnToStore.vue
index cf5596ec..27983949 100644
--- a/src/pages/productionReturn/record/returnToStore.vue
+++ b/src/pages/productionReturn/record/returnToStore.vue
@@ -9,7 +9,7 @@
:workStationCode="workStationCode" :rawLocationCode="rawLocationCode"
:fgLocationCode="fgLocationCode">
-
+
@@ -19,7 +19,7 @@
@updateData="updateData" @removePack="removePack">
-
+
diff --git a/src/pages/productionReturn/request/requestDetail.vue b/src/pages/productionReturn/request/requestDetail.vue
index 1dba06ab..2e8c137a 100644
--- a/src/pages/productionReturn/request/requestDetail.vue
+++ b/src/pages/productionReturn/request/requestDetail.vue
@@ -1,15 +1,13 @@
-
@@ -138,4 +136,4 @@
+
\ No newline at end of file
diff --git a/src/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue b/src/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue
index 2bd900de..73aac0f6 100644
--- a/src/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue
+++ b/src/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue
@@ -27,7 +27,7 @@
-
+
diff --git a/src/pages/purchaseReceipt/coms/receiptInfoPopup.vue b/src/pages/purchaseReceipt/coms/receiptInfoPopup.vue
index dc5bf8e0..90d4b648 100644
--- a/src/pages/purchaseReceipt/coms/receiptInfoPopup.vue
+++ b/src/pages/purchaseReceipt/coms/receiptInfoPopup.vue
@@ -30,7 +30,7 @@
-
+
diff --git a/src/pages/purchaseReceipt/coms/receiptJobListPopup.vue b/src/pages/purchaseReceipt/coms/receiptJobListPopup.vue
index c1e6bcf2..e494bc3e 100644
--- a/src/pages/purchaseReceipt/coms/receiptJobListPopup.vue
+++ b/src/pages/purchaseReceipt/coms/receiptJobListPopup.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/pages/purchaseReturn/coms/requestDetailInfoPopup.vue b/src/pages/purchaseReturn/coms/requestDetailInfoPopup.vue
index b7edbb2e..c3c0e081 100644
--- a/src/pages/purchaseReturn/coms/requestDetailInfoPopup.vue
+++ b/src/pages/purchaseReturn/coms/requestDetailInfoPopup.vue
@@ -3,7 +3,7 @@
-
+
订单号 :
diff --git a/src/pages/purchaseReturn/coms/requestInfoPopup.vue b/src/pages/purchaseReturn/coms/requestInfoPopup.vue
index 80d32c45..62821cc5 100644
--- a/src/pages/purchaseReturn/coms/requestInfoPopup.vue
+++ b/src/pages/purchaseReturn/coms/requestInfoPopup.vue
@@ -5,7 +5,7 @@
-
+
diff --git a/src/pages/purchaseReturn/coms/returnInfoPopup.vue b/src/pages/purchaseReturn/coms/returnInfoPopup.vue
index abef1359..3e0cdd9a 100644
--- a/src/pages/purchaseReturn/coms/returnInfoPopup.vue
+++ b/src/pages/purchaseReturn/coms/returnInfoPopup.vue
@@ -30,7 +30,7 @@
-
+
diff --git a/src/pages/purchaseReturn/coms/returnJobListPopup.vue b/src/pages/purchaseReturn/coms/returnJobListPopup.vue
index 56759af1..4f5e672b 100644
--- a/src/pages/purchaseReturn/coms/returnJobListPopup.vue
+++ b/src/pages/purchaseReturn/coms/returnJobListPopup.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/pages/purchaseReturn/job/returnDetail.vue b/src/pages/purchaseReturn/job/returnDetail.vue
index bb3f3f6c..dca98876 100644
--- a/src/pages/purchaseReturn/job/returnDetail.vue
+++ b/src/pages/purchaseReturn/job/returnDetail.vue
@@ -7,7 +7,7 @@
-
+
diff --git a/src/pages/purchaseReturn/record/returnRecord.vue b/src/pages/purchaseReturn/record/returnRecord.vue
index ae52e6c1..aea24018 100644
--- a/src/pages/purchaseReturn/record/returnRecord.vue
+++ b/src/pages/purchaseReturn/record/returnRecord.vue
@@ -11,7 +11,7 @@
-
+
diff --git a/src/pages/purchaseReturn/request/returnRequestCreate.vue b/src/pages/purchaseReturn/request/returnRequestCreate.vue
index 09e369f8..3fc09f71 100644
--- a/src/pages/purchaseReturn/request/returnRequestCreate.vue
+++ b/src/pages/purchaseReturn/request/returnRequestCreate.vue
@@ -4,7 +4,7 @@
-
+
diff --git a/src/pages/putaway/coms/putawayJobListPopup.vue b/src/pages/putaway/coms/putawayJobListPopup.vue
index 9a17ec18..abbceb7f 100644
--- a/src/pages/putaway/coms/putawayJobListPopup.vue
+++ b/src/pages/putaway/coms/putawayJobListPopup.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/pages/putaway/coms/requestInfoPopup.vue b/src/pages/putaway/coms/requestInfoPopup.vue
index d4aed62f..d7eca4f0 100644
--- a/src/pages/putaway/coms/requestInfoPopup.vue
+++ b/src/pages/putaway/coms/requestInfoPopup.vue
@@ -5,7 +5,7 @@
-
+
diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue
index 770cf474..3fa97815 100644
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.vue
@@ -7,7 +7,7 @@
-
+
diff --git a/src/pages/putaway/record/putawayRecord.vue b/src/pages/putaway/record/putawayRecord.vue
index 581efa96..9a67134d 100644
--- a/src/pages/putaway/record/putawayRecord.vue
+++ b/src/pages/putaway/record/putawayRecord.vue
@@ -9,7 +9,7 @@
-
+
diff --git a/src/pages/putaway/request/putawayRequestCreate.vue b/src/pages/putaway/request/putawayRequestCreate.vue
index bf8774a9..5f7c3df6 100644
--- a/src/pages/putaway/request/putawayRequestCreate.vue
+++ b/src/pages/putaway/request/putawayRequestCreate.vue
@@ -12,7 +12,7 @@
-
+
diff --git a/src/pages/query/coms/comItemBalance.vue b/src/pages/query/coms/comItemBalance.vue
index 0a16c2f5..aab76ce0 100644
--- a/src/pages/query/coms/comItemBalance.vue
+++ b/src/pages/query/coms/comItemBalance.vue
@@ -17,7 +17,7 @@
-
+
diff --git a/src/pages/query/coms/comLocationDetailCard.vue b/src/pages/query/coms/comLocationDetailCard.vue
index d43e7d7d..1e49dbf0 100644
--- a/src/pages/query/coms/comLocationDetailCard.vue
+++ b/src/pages/query/coms/comLocationDetailCard.vue
@@ -2,7 +2,7 @@
-
+
diff --git a/src/pages/query/container.vue b/src/pages/query/container.vue
index 5976b976..82f5cd38 100644
--- a/src/pages/query/container.vue
+++ b/src/pages/query/container.vue
@@ -8,7 +8,7 @@
-
+
diff --git a/src/pages/query/item.vue b/src/pages/query/item.vue
index d2036a1f..bcdc8592 100644
--- a/src/pages/query/item.vue
+++ b/src/pages/query/item.vue
@@ -8,7 +8,7 @@
-
+
diff --git a/src/pages/query/location_copy.vue b/src/pages/query/location_copy.vue
index a31f1f12..63806188 100644
--- a/src/pages/query/location_copy.vue
+++ b/src/pages/query/location_copy.vue
@@ -7,7 +7,7 @@
-
+
-
+
@@ -25,7 +25,7 @@
-
+
物料:
@@ -38,7 +38,7 @@
-
+
数量:
@@ -54,7 +54,7 @@
-
+
diff --git a/src/pages/repleinsh/coms/comRepleishDetailCard.vue b/src/pages/repleinsh/coms/comRepleishDetailCard.vue
index 6019b9bb..3b2c7a76 100644
--- a/src/pages/repleinsh/coms/comRepleishDetailCard.vue
+++ b/src/pages/repleinsh/coms/comRepleishDetailCard.vue
@@ -10,7 +10,6 @@
-
diff --git a/src/pages/repleinsh/coms/repleinshJobListPopup.vue b/src/pages/repleinsh/coms/repleinshJobListPopup.vue
index 9a17ec18..abbceb7f 100644
--- a/src/pages/repleinsh/coms/repleinshJobListPopup.vue
+++ b/src/pages/repleinsh/coms/repleinshJobListPopup.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/pages/repleinsh/coms/requestInfoPopup.vue b/src/pages/repleinsh/coms/requestInfoPopup.vue
index 14f9d09d..65785e25 100644
--- a/src/pages/repleinsh/coms/requestInfoPopup.vue
+++ b/src/pages/repleinsh/coms/requestInfoPopup.vue
@@ -37,7 +37,7 @@
-
+
diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue
index 1959f855..e23b3a21 100644
--- a/src/pages/repleinsh/job/repleinshDetail.vue
+++ b/src/pages/repleinsh/job/repleinshDetail.vue
@@ -7,7 +7,7 @@
-
+
diff --git a/src/pages/repleinsh/record/repleinshRecord.vue b/src/pages/repleinsh/record/repleinshRecord.vue
index 80c68b2a..8a1fab48 100644
--- a/src/pages/repleinsh/record/repleinshRecord.vue
+++ b/src/pages/repleinsh/record/repleinshRecord.vue
@@ -15,7 +15,7 @@
@updateData='updateData'>
-
+
diff --git a/src/pages/scrap/coms/comScrapDetailCard.vue b/src/pages/scrap/coms/comScrapDetailCard.vue
index 38f39440..aabb5aa5 100644
--- a/src/pages/scrap/coms/comScrapDetailCard.vue
+++ b/src/pages/scrap/coms/comScrapDetailCard.vue
@@ -5,7 +5,7 @@
-
+
-
+
diff --git a/src/pages/scrap/coms/requestInfoPopup.vue b/src/pages/scrap/coms/requestInfoPopup.vue
index 871a73f8..e700f817 100644
--- a/src/pages/scrap/coms/requestInfoPopup.vue
+++ b/src/pages/scrap/coms/requestInfoPopup.vue
@@ -5,7 +5,7 @@
-
+
diff --git a/src/pages/scrap/coms/scrapDetailInfoPopup.vue b/src/pages/scrap/coms/scrapDetailInfoPopup.vue
index 987db207..1b116f71 100644
--- a/src/pages/scrap/coms/scrapDetailInfoPopup.vue
+++ b/src/pages/scrap/coms/scrapDetailInfoPopup.vue
@@ -27,7 +27,7 @@
-
+
diff --git a/src/pages/scrap/coms/scrapInfoPopup.vue b/src/pages/scrap/coms/scrapInfoPopup.vue
index 8bb7ec38..516a9722 100644
--- a/src/pages/scrap/coms/scrapInfoPopup.vue
+++ b/src/pages/scrap/coms/scrapInfoPopup.vue
@@ -30,7 +30,7 @@
-
+
diff --git a/src/pages/scrap/coms/scrapJobListPopup.vue b/src/pages/scrap/coms/scrapJobListPopup.vue
index 66af3f14..4961c4ab 100644
--- a/src/pages/scrap/coms/scrapJobListPopup.vue
+++ b/src/pages/scrap/coms/scrapJobListPopup.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/pages/scrap/job/scrapJobDetail.vue b/src/pages/scrap/job/scrapJobDetail.vue
index 318693f3..e122f8cc 100644
--- a/src/pages/scrap/job/scrapJobDetail.vue
+++ b/src/pages/scrap/job/scrapJobDetail.vue
@@ -7,7 +7,7 @@
-
+
@@ -18,7 +18,7 @@
@remove="updateData" @updateData="updateData">
-
+
diff --git a/src/pages/scrap/record/scrapRecord.vue b/src/pages/scrap/record/scrapRecord.vue
index 0c35c693..d565bd37 100644
--- a/src/pages/scrap/record/scrapRecord.vue
+++ b/src/pages/scrap/record/scrapRecord.vue
@@ -23,7 +23,7 @@
@removePack="removePack">
-
+
diff --git a/src/pages/scrap/request/scrapRequestCreate.vue b/src/pages/scrap/request/scrapRequestCreate.vue
index f7c38479..c80e2ec2 100644
--- a/src/pages/scrap/request/scrapRequestCreate.vue
+++ b/src/pages/scrap/request/scrapRequestCreate.vue
@@ -23,7 +23,7 @@
@removePack="removePack">
-
+
diff --git a/src/pages/stockUp/coms/comStockUpDetailCard.vue b/src/pages/stockUp/coms/comStockUpDetailCard.vue
index 78531c49..dcfd5cc1 100644
--- a/src/pages/stockUp/coms/comStockUpDetailCard.vue
+++ b/src/pages/stockUp/coms/comStockUpDetailCard.vue
@@ -10,7 +10,7 @@
-
+
diff --git a/src/pages/stockUp/coms/jobInfoPopup.vue b/src/pages/stockUp/coms/jobInfoPopup.vue
index 831b56ea..f5e5970c 100644
--- a/src/pages/stockUp/coms/jobInfoPopup.vue
+++ b/src/pages/stockUp/coms/jobInfoPopup.vue
@@ -34,7 +34,7 @@
-
+
diff --git a/src/pages/stockUp/coms/jobListPopup.vue b/src/pages/stockUp/coms/jobListPopup.vue
index f58edcf5..e63d998e 100644
--- a/src/pages/stockUp/coms/jobListPopup.vue
+++ b/src/pages/stockUp/coms/jobListPopup.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/pages/stockUp/coms/stockUpDetailInfoPopup.vue b/src/pages/stockUp/coms/stockUpDetailInfoPopup.vue
index 046c093d..960ecbb8 100644
--- a/src/pages/stockUp/coms/stockUpDetailInfoPopup.vue
+++ b/src/pages/stockUp/coms/stockUpDetailInfoPopup.vue
@@ -15,7 +15,7 @@
-
+
diff --git a/src/pages/stockUp/job/stockUpJobDetail.vue b/src/pages/stockUp/job/stockUpJobDetail.vue
index fe2b4dbe..b9d7ad26 100644
--- a/src/pages/stockUp/job/stockUpJobDetail.vue
+++ b/src/pages/stockUp/job/stockUpJobDetail.vue
@@ -7,7 +7,7 @@
-
+
diff --git a/src/pages/supplierDeliver/coms/comRecordCard.vue b/src/pages/supplierDeliver/coms/comRecordCard.vue
index dc00310d..5e32693e 100644
--- a/src/pages/supplierDeliver/coms/comRecordCard.vue
+++ b/src/pages/supplierDeliver/coms/comRecordCard.vue
@@ -1,5 +1,5 @@
-
+
+
@@ -26,14 +26,14 @@
- -->
+