From 080a1de3fca5e8bf8281e2f608cb0845fc5c0841 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=90=20=E5=BC=A0?= <2366389513@qq.com> Date: Tue, 11 Jan 2022 09:17:56 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=B8=80=E6=B1=BD?= =?UTF-8?q?=E8=BD=BF=E8=BD=A6=E5=B9=B3=E5=8F=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/components/ImportExcel-base/index.vue | 8 ++++---- vue/src/router/modules/hq_menu.js | 20 +++++++++---------- vue/src/router/modules/hq_out_order.js | 20 +++++++++---------- .../ux/vw/dataInput/hq_f_sparepart/index.vue | 2 +- .../ux/vw/dataInput/hq_h_sparepart/index.vue | 4 ++-- .../ux/vw/dataInput/hq_m_sparepart/index.vue | 4 ++-- .../ux/vw/dataInput/hq_y_outorder/detail.vue | 8 ++++---- .../ux/vw/dataInput/hq_y_outorder/index.vue | 2 +- .../ux/vw/dataInput/hq_y_report/index.vue | 6 +++--- 9 files changed, 37 insertions(+), 37 deletions(-) diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue index a0ebca43..3e9a1d0a 100644 --- a/vue/src/components/ImportExcel-base/index.vue +++ b/vue/src/components/ImportExcel-base/index.vue @@ -311,12 +311,12 @@ export default { HQ_H_OUTORDER:"红旗H平台出库单", HQ_M_OUTORDER:"红旗M平台出库单", HQ_Y_OUTORDER:"一汽轿车平台出库单", - HQ_F_OUTORDER:"红旗F平台出库单", + HQ_F_OUTORDER:"红旗F平台出库单", HQ_F_OUTORDER_CHICKOUT:"红旗F平台备件出库单", bomdatabase: "产品结构BOM", HQ_H_CHECKOUT:"红旗H平台备件出库单", HQ_M_CHECKOUT:"红旗M平台备件出库单", - HQ_Y_CHECKOUT:"一汽轿车平台备件出库单", + //HQ_Y_CHECKOUT:"一汽轿车平台备件出库单", prebatch: "预批量", secondaryPriceRatio: "二配结算价格比例", factory: "工厂设置", @@ -357,7 +357,7 @@ export default { HQ_F_OUTORDER_CHICKOUT:"/api/settleaccount/wmsHQFSharePartoutput/ExcelImport",//红旗F平台备件出库单导入 HQ_M_OUTORDER: "/api/settleaccount/WMSHQMKanbanoutput/ExcelImport", //红旗M平台出库单导入 - HQ_Y_OUTORDER: "/api/settleaccount//ExcelImport", //一汽轿车平台出库单导入 + HQ_Y_OUTORDER: "/api/settleaccount/WmsHQCaroutput/ExcelImport", //一汽轿车平台出库单导入 sparepartoutorder: "/api/settleaccount/wmsSharePartoutput/ExcelImport", //大众备件出库单导入 @@ -385,7 +385,7 @@ export default { HQ_H_CHECKOUT:"/api/settleaccount/WmsHQHSharePartoutput/ExcelImport", //H平台备件出库单导入 HQ_M_CHECKOUT:"/api/settleaccount/WmsHQMSharePartoutput/ExcelImport", //M平台备件出库单导入 - HQ_Y_CHECKOUT:"/api/settleaccount//ExcelImport" //一汽轿车平台备件出库单导入 + //HQ_Y_CHECKOUT:"/api/settleaccount//ExcelImport" //一汽轿车平台备件出库单导入 }[this.crmType] || "" ); }, diff --git a/vue/src/router/modules/hq_menu.js b/vue/src/router/modules/hq_menu.js index e53f2562..9cc9ef40 100644 --- a/vue/src/router/modules/hq_menu.js +++ b/vue/src/router/modules/hq_menu.js @@ -198,16 +198,16 @@ const hqMenudataRouter = { icon: '文件' } }, - { - path: 'hq-Y-sparepart-export', - component: () => import('@/views/ux/vw/dataInput/hq_y_sparepart'), - name: 'HQY',//命名路由 - meta: { - title: '一汽轿车平台备件明细', - roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） - icon: '文件' - } - }, + // { + // path: 'hq-Y-sparepart-export', + // component: () => import('@/views/ux/vw/dataInput/hq_y_sparepart'), + // name: 'HQY',//命名路由 + // meta: { + // title: '一汽轿车平台备件明细', + // roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） + // icon: '文件' + // } + // }, // { // path: 'hq-Y-platform-export', // component: () => import('@/views/ux/vw/dataInput/ScrapClaims'), diff --git a/vue/src/router/modules/hq_out_order.js b/vue/src/router/modules/hq_out_order.js index 2f0b378a..57796239 100644 --- a/vue/src/router/modules/hq_out_order.js +++ b/vue/src/router/modules/hq_out_order.js @@ -86,16 +86,16 @@ const hqOutOrderDataRouter = { icon: '结算' } }, - { - path: 'hq-y-checkout', - component: () => import('@/views/ux/vw/dataInput/hq_y_checkout'), - name: 'SettleAccount',//命名路由 - meta: { - title: '一汽轿车平台备件出库单', - roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色） - icon: '结算' - } - }, + // { + // path: 'hq-y-checkout', + // component: () => import('@/views/ux/vw/dataInput/hq_y_checkout'), + // name: 'SettleAccount',//命名路由 + // meta: { + // title: '一汽轿车平台备件出库单', + // roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色） + // icon: '结算' + // } + // }, // { // path: 'hq-m-outorder', // component: () => import('@/views/ux/billManage/kanbanOutOrder/index'), diff --git a/vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue b/vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue index 97e84f6a..a46d1fea 100644 --- a/vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue @@ -1263,7 +1263,7 @@ export default { this.listQuery.name = "F平台备件明细"; this.listQuery.type = this.JobversionValue; this.$axios - .posts("/api/settleaccount/ReportMakeService/HQFSharePartSettledDetailDiffExportService", this.listQuery) + .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { this.list = response; setTimeout(() => { diff --git a/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue b/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue index 00f1ab8f..92b3a6ad 100644 --- a/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue @@ -1126,7 +1126,7 @@ export default { ); this.$axios .posts( - "/api/settleaccount/ReportMakeService/", + "/api/settleaccount/ReportMakeService/HQHSharePartSettledDetailDiffExportService", this.listExportQuery ) .then((res) => { @@ -1263,7 +1263,7 @@ export default { this.listQuery.name = "H平台备件明细"; this.listQuery.type = this.JobversionValue; this.$axios - .posts("/api/settleaccount/ReportMakeService/HQHSharePartSettledDetailDiffExportService", this.listQuery) + .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { this.list = response; setTimeout(() => { diff --git a/vue/src/views/ux/vw/dataInput/hq_m_sparepart/index.vue b/vue/src/views/ux/vw/dataInput/hq_m_sparepart/index.vue index 0d6f276d..d2c72935 100644 --- a/vue/src/views/ux/vw/dataInput/hq_m_sparepart/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_m_sparepart/index.vue @@ -1126,7 +1126,7 @@ export default { ); this.$axios .posts( - "/api/settleaccount/ReportMakeService/", + "/api/settleaccount/ReportMakeService/HQMSharePartSettledDetailDiffExportService", this.listExportQuery ) .then((res) => { @@ -1263,7 +1263,7 @@ export default { this.listQuery.name = "M平台备件明细"; this.listQuery.type = this.JobversionValue; this.$axios - .posts("/api/settleaccount/ReportMakeService/HQMSharePartSettledDetailDiffExportService", this.listQuery) + .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { this.list = response; setTimeout(() => { diff --git a/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue index f0468bd9..4d7107a2 100644 --- a/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue @@ -301,7 +301,7 @@ export default { .then(() => { this.$axios .posts( - "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut-Cancel", + "/api/settleaccount/WmsHQCaroutput/WmsSharePartOutPut-Cancel", this.listOutPutQuery ) .then((response) => { @@ -340,7 +340,7 @@ export default { .then(() => { this.$axios .posts( - "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut-Pass", + "/api/settleaccount/WmsHQCaroutput/WmsSharePartOutPut-Pass", this.listOutPutQuery ) .then((response) => { @@ -392,7 +392,7 @@ export default { .then(() => { this.$axios .posts( - "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut-Pass", + "/api/settleaccount/WmsHQCaroutput/WmsSharePartOutPut-Pass", this.listOutPutQuery ) .then((response) => { @@ -493,7 +493,7 @@ export default { console.log("查询条件：" + JSON.stringify(this.listQuery)); this.$axios .posts( - "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanDetailList", + "/api/settleaccount/WmsHQCaroutput/WmsSharePartDetailList", this.listQuery ) .then((response) => { diff --git a/vue/src/views/ux/vw/dataInput/hq_y_outorder/index.vue b/vue/src/views/ux/vw/dataInput/hq_y_outorder/index.vue index b3e0c775..52d7de8a 100644 --- a/vue/src/views/ux/vw/dataInput/hq_y_outorder/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_y_outorder/index.vue @@ -277,7 +277,7 @@ export default { this.listQuery.SkipCount = (this.page - 1) * 15; } this.$axios - .posts("/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanList", this.listQuery) + .posts("/api/settleaccount/WmsHQCaroutput/WmsSharePartList", this.listQuery) .then((response) => { this.list = response.items; //alert(JSON.stringify(response.Items)) diff --git a/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue b/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue index bf013e53..26ead6c5 100644 --- a/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue @@ -737,7 +737,7 @@ export default { .then(() => { this.$axios .posts( - "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPutAudit", + "/api/settleaccount/WmsHQCaroutput/WmsSharePartOutPutAudit", params ) .then((response) => { @@ -814,7 +814,7 @@ export default { this.formLoading = true; this.$axios .posts( - "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut", + "/api/settleaccount/WmsHQCaroutput/WmsSharePartOutPut", this.listBillQuery ) .then((response) => { @@ -1127,7 +1127,7 @@ export default { ); this.$axios .posts( - "/api/settleaccount/ReportMakeService/HQHSettledDetailDiffExportService", + "/api/settleaccount/ReportMakeService/HQCarSettledDetailDiffExportService", this.listExportQuery ) .then((res) => { From 551f95ef57660494eab4b16e2716fa98824bf06d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=90=20=E5=BC=A0?= <2366389513@qq.com> Date: Tue, 11 Jan 2022 09:25:05 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue | 2 +- vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue | 2 +- vue/src/views/ux/vw/dataInput/hq_m_sparepart/index.vue | 2 +- vue/src/views/ux/vw/dataInput/hq_y_sparepart/index.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue b/vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue index a46d1fea..8d0c825b 100644 --- a/vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue @@ -1260,7 +1260,7 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "F平台备件明细"; + this.listQuery.name = "F平台备件核对明细"; this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) diff --git a/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue b/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue index 92b3a6ad..cbc6ebed 100644 --- a/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue @@ -1260,7 +1260,7 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "H平台备件明细"; + this.listQuery.name = "H平台备件核对明细"; this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) diff --git a/vue/src/views/ux/vw/dataInput/hq_m_sparepart/index.vue b/vue/src/views/ux/vw/dataInput/hq_m_sparepart/index.vue index d2c72935..244ddfd5 100644 --- a/vue/src/views/ux/vw/dataInput/hq_m_sparepart/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_m_sparepart/index.vue @@ -1260,7 +1260,7 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "M平台备件明细"; + this.listQuery.name = "M平台备件核对明细"; this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) diff --git a/vue/src/views/ux/vw/dataInput/hq_y_sparepart/index.vue b/vue/src/views/ux/vw/dataInput/hq_y_sparepart/index.vue index 099ce2e4..5b797b42 100644 --- a/vue/src/views/ux/vw/dataInput/hq_y_sparepart/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_y_sparepart/index.vue @@ -1260,7 +1260,7 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "一汽轿车平台备件明细"; + this.listQuery.name = "一汽轿车平台备件核对明细"; this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/ReportMakeService/HQHSettledDetailDiffExportService", this.listQuery) From 44cc9a10bc77c920f74af3df3d3433602e49aedb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=90=20=E5=BC=A0?= <2366389513@qq.com> Date: Tue, 11 Jan 2022 11:01:23 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue b/vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue index 8d0c825b..35f8b5d3 100644 --- a/vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue @@ -1126,7 +1126,7 @@ export default { ); this.$axios .posts( - "/api/settleaccount/ReportMakeService/HQHSettledDetailDiffExportService", + "/api/settleaccount/ReportMakeService/HQFSettledDetailDiffExportService", this.listExportQuery ) .then((res) => { @@ -1260,7 +1260,7 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "F平台备件核对明细"; + this.listQuery.name = "F平台核对明细"; this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) From 61b14af1ab37f7ecd3b28fd273d0a42814e1e452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=90=20=E5=BC=A0?= <2366389513@qq.com> Date: Tue, 11 Jan 2022 13:20:55 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/router/modules/hq_out_order.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue/src/router/modules/hq_out_order.js b/vue/src/router/modules/hq_out_order.js index 57796239..69edefb2 100644 --- a/vue/src/router/modules/hq_out_order.js +++ b/vue/src/router/modules/hq_out_order.js @@ -2,7 +2,7 @@ import Layout from '@/layout' const hqOutOrderDataRouter = { - path: '/cpat-order', + path: '/cpat-order-hq', component: Layout, redirect: 'pg', name: '业务数据', 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 5/5] =?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,