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..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: '业务数据', @@ -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_outorder_chickout/detail.vue b/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue index 258aab71..6e609f82 100644 --- a/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue @@ -231,12 +231,12 @@ 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: "物料组(车型)", @@ -244,7 +244,8 @@ export default { width: 220, }); tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 }); - tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 }); + //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_f_sparepart/index.vue b/vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue index 97e84f6a..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,10 +1260,10 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "F平台备件明细"; + 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_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, diff --git a/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue b/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue index 41dc9ac8..cd1a8679 100644 --- a/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue @@ -715,6 +715,14 @@ export default { }); return; } else { + if(this.stateNameCateMap == Failed){ + this.$message({ + message: + "已经生成出库单的不能再确认！单号：" , + + type: "warning", + }); + }else{ var params = []; let myalert = ""; //声明变量，其变量必须在此声明后使用 if (row) { @@ -757,6 +765,7 @@ export default { message: "已取消操作", }); }); + } } }, //出库单 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..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 @@ -1126,7 +1126,7 @@ export default { ); this.$axios .posts( - "/api/settleaccount/ReportMakeService/", + "/api/settleaccount/ReportMakeService/HQHSharePartSettledDetailDiffExportService", this.listExportQuery ) .then((res) => { @@ -1260,10 +1260,10 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "H平台备件明细"; + 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_checkout/detail.vue b/vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue index c1edc1a7..e503768b 100644 --- a/vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue @@ -231,12 +231,12 @@ 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: "物料组(车型)", @@ -244,7 +244,8 @@ export default { width: 220, }); tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 }); - tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 }); + //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_m_report/index.vue b/vue/src/views/ux/vw/dataInput/hq_m_report/index.vue index c295b3f6..c3577194 100644 --- a/vue/src/views/ux/vw/dataInput/hq_m_report/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_m_report/index.vue @@ -570,6 +570,7 @@ export default { multipleSelection: [], tableHeight: document.documentElement.clientHeight - 260, isEdit: false, + isEdit1: false, menuCateMap: [ { label: "导出", value: "导出", cssName: "warning" }, { label: "消息", value: "消息", cssName: "info" }, @@ -715,6 +716,7 @@ export default { }); return; } else { + var params = []; let myalert = ""; //声明变量，其变量必须在此声明后使用 if (row) { @@ -757,6 +759,7 @@ export default { message: "已取消操作", }); }); + } }, //出库单 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..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 @@ -1126,7 +1126,7 @@ export default { ); this.$axios .posts( - "/api/settleaccount/ReportMakeService/", + "/api/settleaccount/ReportMakeService/HQMSharePartSettledDetailDiffExportService", this.listExportQuery ) .then((res) => { @@ -1260,10 +1260,10 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "M平台备件明细"; + 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_checkout/detail.vue b/vue/src/views/ux/vw/dataInput/hq_y_checkout/detail.vue index f1388381..fa5debfb 100644 --- a/vue/src/views/ux/vw/dataInput/hq_y_checkout/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_y_checkout/detail.vue @@ -231,12 +231,12 @@ 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: "物料组(车型)", @@ -244,7 +244,8 @@ export default { width: 220, }); tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 }); - tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 }); + //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_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) => { 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)