From 159fbf597890e5ee886a9a988484bed3ba1f7474 Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Tue, 11 Jan 2022 15:09:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?H=E5=B9=B3=E5=8F=B0=E5=A4=87=E4=BB=B6?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ux/vw/dataInput/hq_h_checkout/detail.vue | 17 +++++++++-------- .../ux/vw/dataInput/hq_h_outorder/detail.vue | 9 +++++++-- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue b/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue index 3bf6e2f7..c97ffa6a 100644 --- a/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue @@ -231,20 +231,21 @@ export default { prop: "version", width: 110, }); - tempsTabs.push({ - label: "订货看板编号", - prop: "kanban", - width: 150, - }); - tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 }); + // tempsTabs.push({ + // label: "订货看板编号", + // prop: "kanban", + // width: 150, + // }); + // tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 }); tempsTabs.push({ label: "Sap编码", prop: "materialCode", width: 150 }); tempsTabs.push({ label: "物料组(车型)", prop: "materialGroup", width: 220, }); - tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 }); - tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 }); + tempsTabs.push({ label: "结算零件号", prop: "extend1", width: 220 }); + //tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 }); + tempsTabs.push({ label: "寄售库存", prop: "StockQty", width: 100 }); tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 }); return tempsTabs; diff --git a/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue index b0a4b4c2..fbd57802 100644 --- a/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue @@ -36,7 +36,7 @@ v-model="searchContent" clearable size="small" - placeholder="按照零件号搜索..." + placeholder="按照看板号搜索..." style="width: 230px" class="search-container" @keyup.enter.native="handleFilter" @@ -231,6 +231,11 @@ export default { prop: "version", width: 110, }); + tempsTabs.push({ + label: "订单号", + prop: "billNum", + width: 170, + }); tempsTabs.push({ label: "订货看板编号", prop: "kanban", @@ -515,7 +520,7 @@ export default { this.getList(); this.listQuery.Filters = []; if (this.searchContent != "") { - var column = "materialCode"; + var column = "billNum"; let filter = { logic: 0, column: column, From 4add46f29c02450b98ce9f78c6f6d483088af1f2 Mon Sep 17 00:00:00 2001 From: "xunyu.guo" <916759660@qq.com> Date: Tue, 11 Jan 2022 15:23:28 +0800 Subject: [PATCH 2/2] 2022.1.11 --- vue/src/components/ImportExcel-base/index.vue | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue index a0ebca43..34d458f6 100644 --- a/vue/src/components/ImportExcel-base/index.vue +++ b/vue/src/components/ImportExcel-base/index.vue @@ -308,15 +308,15 @@ export default { vwoutorder: "准时化出库单", sparepartoutorder: "大众备件出库单", kanbanoutorder: "大众看板出库单", - HQ_H_OUTORDER:"红旗H平台出库单", - HQ_M_OUTORDER:"红旗M平台出库单", - HQ_Y_OUTORDER:"一汽轿车平台出库单", - HQ_F_OUTORDER:"红旗F平台出库单", - HQ_F_OUTORDER_CHICKOUT:"红旗F平台备件出库单", + HQ_H_OUTORDER: "红旗H平台出库单", + HQ_M_OUTORDER: "红旗M平台出库单", + HQ_Y_OUTORDER: "一汽轿车平台出库单", + HQ_F_OUTORDER: "红旗F平台出库单", + HQ_F_OUTORDER_CHICKOUT: "红旗F平台备件出库单", bomdatabase: "产品结构BOM", - HQ_H_CHECKOUT:"红旗H平台备件出库单", - HQ_M_CHECKOUT:"红旗M平台备件出库单", - HQ_Y_CHECKOUT:"一汽轿车平台备件出库单", + HQ_H_CHECKOUT: "红旗H平台备件出库单", + HQ_M_CHECKOUT: "红旗M平台备件出库单", + HQ_Y_CHECKOUT: "一汽轿车平台备件出库单", prebatch: "预批量", secondaryPriceRatio: "二配结算价格比例", factory: "工厂设置", @@ -331,7 +331,6 @@ export default { customerStorageLocation: "客户存储地点", secondaryAdjustment: "二配数量调整输入", secondaryDiscount: "二配折扣调整输入", - }[this.crmType] || "" ); }, @@ -349,12 +348,13 @@ export default { vwoutorder: "/api/settleaccount/wmsjitoutput/ExcelImport", //准时化出库单导入 kanbanoutorder: "/api/settleaccount/wmskanbanoutput/ExcelImport", //大众看板出库单导入 HQ_H_OUTORDER: "/api/settleaccount/WmsHQHKanbanoutput/ExcelImport", //红旗H平台出库单导入 - HQ_F_OUTORDER: "/api/settleaccount/WMSHQFKanbanoutput/ExcelImport", //红旗F平台出库单导入 - HQ_F_OUTORDER_CHICKOUT:"/api/settleaccount/wmsHQFSharePartoutput/ExcelImport",//红旗F平台备件出库单 - + HQ_F_OUTORDER: "/api/settleaccount/WMSHQFKanbanoutput/ExcelImport", //红旗F平台出库单导入 + HQ_F_OUTORDER_CHICKOUT: + "/api/settleaccount/wmsHQFSharePartoutput/ExcelImport", //红旗F平台备件出库单 HQ_F_OUTORDER: "/api/settleaccount/WMSHQFKanbanoutput/ExcelImport", //红旗F平台出库单导入 - HQ_F_OUTORDER_CHICKOUT:"/api/settleaccount/wmsHQFSharePartoutput/ExcelImport",//红旗F平台备件出库单导入 + HQ_F_OUTORDER_CHICKOUT: + "/api/settleaccount/wmsHQFSharePartoutput/ExcelImport", //红旗F平台备件出库单导入 HQ_M_OUTORDER: "/api/settleaccount/WMSHQMKanbanoutput/ExcelImport", //红旗M平台出库单导入 HQ_Y_OUTORDER: "/api/settleaccount//ExcelImport", //一汽轿车平台出库单导入 @@ -382,10 +382,10 @@ export default { secondaryAdjustment: "/api/settleaccount/SecondaryAdjustment/ExcelImport", secondaryDiscount: "/api/settleaccount/SecondaryDiscount/ExcelImport", - - HQ_H_CHECKOUT:"/api/settleaccount/WmsHQHSharePartoutput/ExcelImport", //H平台备件出库单导入 - HQ_M_CHECKOUT:"/api/settleaccount/WmsHQMSharePartoutput/ExcelImport", //M平台备件出库单导入 - HQ_Y_CHECKOUT:"/api/settleaccount//ExcelImport" //一汽轿车平台备件出库单导入 + + HQ_H_CHECKOUT: "/api/settleaccount/WmsHQHSharePartoutput/ExcelImport", //H平台备件出库单导入 + HQ_M_CHECKOUT: "/api/settleaccount/WmsHQMSharePartoutput/ExcelImport", //M平台备件出库单导入 + HQ_Y_CHECKOUT: "/api/settleaccount//ExcelImport", //一汽轿车平台备件出库单导入 }[this.crmType] || "" ); },