From a57512a854b9f3d1ea9cc7421e5d20c6bf0e5824 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Mon, 15 Jul 2024 16:29:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F=E5=92=8C?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comRequest/comKittingRequestItem.vue | 2 +- .../assembleIssueRequestListDetail.vue | 5 +- .../request/coatingIssueRequestListDetail.vue | 4 +- .../injectionIssueRequestListDetail.vue | 6 +- .../request/kittingIssueRequestListDetail.vue | 4 +- .../sparePartIssueRequestListDetail.vue | 2 +- fe/PDA/pages/task/sparePartIssueJob.vue | 2 +- fe/PDA/static/config_zhuoyue.js | 59 +++++++++++++++++++ 8 files changed, 71 insertions(+), 13 deletions(-) create mode 100644 fe/PDA/static/config_zhuoyue.js diff --git a/fe/PDA/mycomponents/comRequest/comKittingRequestItem.vue b/fe/PDA/mycomponents/comRequest/comKittingRequestItem.vue index a171e921c..1bcf362e7 100644 --- a/fe/PDA/mycomponents/comRequest/comKittingRequestItem.vue +++ b/fe/PDA/mycomponents/comRequest/comKittingRequestItem.vue @@ -22,7 +22,7 @@ 目标库位 ：{{dataContent.details[0].toLocationCode}} - 叫料数量 ：{{dataContent.details[0].issuedQty}} + 叫料数量 ：{{dataContent.details[0].notFinishQty}} 单位 ：{{dataContent.details[0].uom}} diff --git a/fe/PDA/pages/request/assembleIssueRequestListDetail.vue b/fe/PDA/pages/request/assembleIssueRequestListDetail.vue index 24f949986..431e68c94 100644 --- a/fe/PDA/pages/request/assembleIssueRequestListDetail.vue +++ b/fe/PDA/pages/request/assembleIssueRequestListDetail.vue @@ -3,8 +3,7 @@ - - + @@ -52,7 +51,7 @@ - {{item.issuedQty}} + {{item.notFinishQty}} diff --git a/fe/PDA/pages/request/coatingIssueRequestListDetail.vue b/fe/PDA/pages/request/coatingIssueRequestListDetail.vue index b3996dfb0..6fa71b76f 100644 --- a/fe/PDA/pages/request/coatingIssueRequestListDetail.vue +++ b/fe/PDA/pages/request/coatingIssueRequestListDetail.vue @@ -3,7 +3,7 @@ - + @@ -52,7 +52,7 @@ - {{item.issuedQty}} + {{item.notFinishQty}} diff --git a/fe/PDA/pages/request/injectionIssueRequestListDetail.vue b/fe/PDA/pages/request/injectionIssueRequestListDetail.vue index 7dd7b533b..0f9a5e632 100644 --- a/fe/PDA/pages/request/injectionIssueRequestListDetail.vue +++ b/fe/PDA/pages/request/injectionIssueRequestListDetail.vue @@ -3,9 +3,9 @@ - + - + @@ -52,7 +52,7 @@ - {{item.issuedQty}} + {{item.notFinishQty}} diff --git a/fe/PDA/pages/request/kittingIssueRequestListDetail.vue b/fe/PDA/pages/request/kittingIssueRequestListDetail.vue index b6f97dfa2..4cad93802 100644 --- a/fe/PDA/pages/request/kittingIssueRequestListDetail.vue +++ b/fe/PDA/pages/request/kittingIssueRequestListDetail.vue @@ -3,7 +3,7 @@ - + @@ -52,7 +52,7 @@ - {{item.issuedQty}} + {{item.notFinishQty}} diff --git a/fe/PDA/pages/request/sparePartIssueRequestListDetail.vue b/fe/PDA/pages/request/sparePartIssueRequestListDetail.vue index 50580fbca..6ac3a4a6f 100644 --- a/fe/PDA/pages/request/sparePartIssueRequestListDetail.vue +++ b/fe/PDA/pages/request/sparePartIssueRequestListDetail.vue @@ -52,7 +52,7 @@ - {{item.issuedQty}} + {{item.notFinishQty}} diff --git a/fe/PDA/pages/task/sparePartIssueJob.vue b/fe/PDA/pages/task/sparePartIssueJob.vue index effc8ab5b..8be302c72 100644 --- a/fe/PDA/pages/task/sparePartIssueJob.vue +++ b/fe/PDA/pages/task/sparePartIssueJob.vue @@ -69,7 +69,7 @@ isToday: false, titleArray: ['任务编号'], loadingType: "nomore", - taps:["全部","待处理","待库移"], + taps:["全部","待处理"], current:0 }; }, diff --git a/fe/PDA/static/config_zhuoyue.js b/fe/PDA/static/config_zhuoyue.js new file mode 100644 index 000000000..bdc2370fe --- /dev/null +++ b/fe/PDA/static/config_zhuoyue.js @@ -0,0 +1,59 @@ +const configList = [{ + "name": "公司代码", + "value": "DongYang" + }, { + "name": "仓库代码", + "value": "T9" + }, + { + "name": "服务地址", + "value": "http://10.164.233.5:60099" + }, + { + "name": "原料报废扫描库位", + "value": "否" + }, + { + "name": "只看当天采购任务", + "value": "是" + } + ] + + const params = { + "companyCode": "DongYang", + "warehouseCode": "T9", + "putawayLocationTypes": "1,2,3,4", + "putawayInventoryStatus": "2", + "dev": "http://10.164.233.5:60099", + "print_url": "http://10.164.233.5:59095", + "version_update_url": "http://10.164.233.5:60071", + "isScrapScanToLocation": false, + "isReceiptToday": false, + "scrapReason": "ScrapReason", + "purchaseReturnReason": "PurReturnReason", + "returnBeforPutawayReason": "UnqualifiedReason", + "receiptCheckReason": "UnqualifiedReason" + } + const desc = { + "companyCode": "公司代码", + "warehouseCode": "仓库代码", + "putawayLocationTypes": "上架库位类型", + "putawayInventoryStatus": "上架库存状态", + "dev": "api请求地址", + "print_url": "", + "version_update_url": "版本更新地址", + "isScrapScanToLocation": "原料报废是否显示扫描库位(false : 不显示扫描库位,true:显示扫描库位)", + "isReceiptToday": "采购收货是否只看今天的采购任务 (false : 看所有,true:只看今天):", + "ScrapReason": "原料报废原因字典项", + "purchaseReturnReason": "采购退货原因字典项", + "returnBeforPutawayReason": "上架前退货原因字典项", + "receiptCheckReason": "采购收货不合格原因字典项" + } + + + +export default { + configList, + params, + desc +}