diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue index 187e4678..31f247b7 100644 --- a/vue/src/components/ImportExcel-base/index.vue +++ b/vue/src/components/ImportExcel-base/index.vue @@ -309,9 +309,14 @@ export default { sparepartoutorder: "大众备件出库单", kanbanoutorder: "大众看板出库单", HQ_H_OUTORDER:"红旗H平台出库单", - HQ_F_OUTORDER:"红旗F平台出库单", + 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:"一汽轿车平台备件出库单", prebatch: "预批量", secondaryPriceRatio: "二配结算价格比例", factory: "工厂设置", @@ -344,8 +349,16 @@ 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平台备件出库单 + +<<<<<<< .mine HQ_F_OUTORDER: "/api/settleaccount/WMSHQFKanbanoutput/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", //一汽轿车平台出库单导入 +>>>>>>> .theirs sparepartoutorder: "/api/settleaccount/wmsSharePartoutput/ExcelImport", //大众备件出库单导入 bomdatabase: "/api/settleaccount/bom/ExcelImport", @@ -369,6 +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" //一汽轿车平台备件出库单导入 }[this.crmType] || "" ); }, diff --git a/vue/src/router/modules/hq_menu.js b/vue/src/router/modules/hq_menu.js index 34d22a2b..f0e3c5f0 100644 --- a/vue/src/router/modules/hq_menu.js +++ b/vue/src/router/modules/hq_menu.js @@ -35,7 +35,7 @@ const hqMenudataRouter = { } }, { - path: 'hq-H-platform-export', + path: 'hq-H-report', component: () => import('@/views/ux/vw/dataInput/hq_h_report'), name: 'HQH', meta: { @@ -66,7 +66,7 @@ const hqMenudataRouter = { meta: { title: 'M平台', //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns'], - icon: '结算' + icon: '看板' }, children: [ { @@ -79,17 +79,36 @@ const hqMenudataRouter = { icon: '结算' } }, - + { + path: 'hq-M-report', + component: () => import('@/views/ux/vw/dataInput/hq_m_report'), + name: 'HQM', + meta: { + title: 'M平台核对明细', + //roles: ['SettleAccount.FISs'], + icon: '文件' + } + }, { - path: 'hq-M-platform-export', - component: () => import('@/views/ux/billManage/sparePart'), - name: 'SparePartReport',//命名路由 + path: 'hq-M-sparepart-export', + component: () => import('@/views/ux/vw/dataInput/hq_m_sparepart'), + name: 'HQM', meta: { - title: 'H平台结算差异输出', - //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色(可以设置多个角色) - icon: '二配' + title: 'M平台备件明细', + //roles: ['SettleAccount.FISs'], + icon: '文件' } - } + }, + // { + // path: 'hq-M-platform-export', + // component: () => import('@/views/ux/billManage/sparePart'), + // name: 'SparePartReport',//命名路由 + // meta: { + // title: 'M平台结算差异输出', + // //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色(可以设置多个角色) + // icon: '二配' + // } + // } ] }, { @@ -100,7 +119,7 @@ const hqMenudataRouter = { meta: { title: 'F平台', //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns'], - icon: '结算' + icon: '看板' }, children: [ { @@ -170,15 +189,35 @@ const hqMenudataRouter = { } }, { - path: 'hq-Y-platform-export', - component: () => import('@/views/ux/vw/dataInput/ScrapClaims'), - name: 'ScrapClaims', + path: 'hq-Y-report', + component: () => import('@/views/ux/vw/dataInput/hq_y_report'), + name: 'HQY',//命名路由 meta: { - title: '一汽轿车平台结算差异输出', - roles: ['SettleAccount.FISs'], + 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'), + // name: 'ScrapClaims', + // meta: { + // title: '一汽轿车平台结算差异输出', + // roles: ['SettleAccount.FISs'], + // icon: '文件' + // } + // } ] }, diff --git a/vue/src/router/modules/hq_out_order.js b/vue/src/router/modules/hq_out_order.js index 14fa2c92..2f0b378a 100644 --- a/vue/src/router/modules/hq_out_order.js +++ b/vue/src/router/modules/hq_out_order.js @@ -27,6 +27,36 @@ const hqOutOrderDataRouter = { } }, { + path: 'hq-h-checkout', + component: () => import('@/views/ux/vw/dataInput/hq_h_checkout'), + name: 'SettleAccount',//命名路由 + meta: { + title: '红旗H平台备件出库单', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色(可以设置多个角色) + icon: '结算' + } + }, + { + path: 'hq-m-outorder', + component: () => import('@/views/ux/vw/dataInput/hq_m_outorder'), + name: 'SettleAccount',//命名路由 + meta: { + title: '红旗M平台出库单', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色(可以设置多个角色) + icon: '结算' + } + }, + { + path: 'hq-m-checkout', + component: () => import('@/views/ux/vw/dataInput/hq_m_checkout'), + name: 'SettleAccount',//命名路由 + meta: { + title: '红旗M平台备件出库单', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色(可以设置多个角色) + icon: '结算' + } + }, + { path: 'hq-f-outorder', component: () => import('@/views/ux/vw/dataInput/hq_f_outorder'), name: 'SettleAccount',//命名路由 @@ -46,6 +76,26 @@ const hqOutOrderDataRouter = { icon: '结算' } }, + { + path: 'hq-y-outorder', + component: () => import('@/views/ux/vw/dataInput/hq_y_outorder'), + 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_h_checkout/detail.vue b/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue new file mode 100644 index 00000000..3bf6e2f7 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue @@ -0,0 +1,621 @@ + + + + + + + + diff --git a/vue/src/views/ux/vw/dataInput/hq_h_checkout/index.vue b/vue/src/views/ux/vw/dataInput/hq_h_checkout/index.vue new file mode 100644 index 00000000..c4edf3c8 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_h_checkout/index.vue @@ -0,0 +1,340 @@ + + + + + + + + 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 53ea0196..41dc9ac8 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 @@ -557,6 +557,7 @@ export default { taskId: "", name: "", type: "", + stateName:"" }, listBillQuery: { version: "", 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 53ea0196..00f1ab8f 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 @@ -736,7 +736,7 @@ export default { .then(() => { this.$axios .posts( - "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPutAudit", + "/api/settleaccount/WmsHQHSharePartoutput/WmsSharePartOutPutAudit", params ) .then((response) => { @@ -813,7 +813,7 @@ export default { this.formLoading = true; this.$axios .posts( - "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut", + "/api/settleaccount/WmsHQHSharePartoutput/WmsSharePartOutPut", this.listBillQuery ) .then((response) => { @@ -1121,12 +1121,12 @@ export default { } console.log( - "H平台核对明细-导出条件:" + + "H平台备件明细-导出条件:" + JSON.stringify(this.listExportQuery) ); this.$axios .posts( - "/api/settleaccount/ReportMakeService/HQHSettledDetailDiffExportService", + "/api/settleaccount/ReportMakeService/", 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/Job/list", this.listQuery) + .posts("/api/settleaccount/ReportMakeService/HQHSharePartSettledDetailDiffExportService", 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 new file mode 100644 index 00000000..c1edc1a7 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue @@ -0,0 +1,621 @@ + + + + + + + + diff --git a/vue/src/views/ux/vw/dataInput/hq_m_checkout/index.vue b/vue/src/views/ux/vw/dataInput/hq_m_checkout/index.vue new file mode 100644 index 00000000..33af0b04 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_m_checkout/index.vue @@ -0,0 +1,340 @@ + + + + + + + + diff --git a/vue/src/views/ux/vw/dataInput/hq_m_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_m_outorder/detail.vue new file mode 100644 index 00000000..364da8d3 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_m_outorder/detail.vue @@ -0,0 +1,621 @@ + + + + + + + + diff --git a/vue/src/views/ux/vw/dataInput/hq_m_outorder/index.vue b/vue/src/views/ux/vw/dataInput/hq_m_outorder/index.vue new file mode 100644 index 00000000..7d147145 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_m_outorder/index.vue @@ -0,0 +1,340 @@ + + + + + + + + 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 new file mode 100644 index 00000000..c295b3f6 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_m_report/index.vue @@ -0,0 +1,1317 @@ + + + + + + \ No newline at end of file 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 new file mode 100644 index 00000000..0d6f276d --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_m_sparepart/index.vue @@ -0,0 +1,1316 @@ + + + + + + \ No newline at end of file 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 new file mode 100644 index 00000000..f1388381 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_y_checkout/detail.vue @@ -0,0 +1,621 @@ + + + + + + + + diff --git a/vue/src/views/ux/vw/dataInput/hq_y_checkout/index.vue b/vue/src/views/ux/vw/dataInput/hq_y_checkout/index.vue new file mode 100644 index 00000000..ada0ce3e --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_y_checkout/index.vue @@ -0,0 +1,340 @@ + + + + + + + + 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 new file mode 100644 index 00000000..f0468bd9 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue @@ -0,0 +1,621 @@ + + + + + + + + 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 new file mode 100644 index 00000000..b3e0c775 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_y_outorder/index.vue @@ -0,0 +1,340 @@ + + + + + + + + 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 new file mode 100644 index 00000000..bf013e53 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue @@ -0,0 +1,1317 @@ + + + + + + \ No newline at end of file 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 new file mode 100644 index 00000000..099ce2e4 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_y_sparepart/index.vue @@ -0,0 +1,1316 @@ + + + + + + \ No newline at end of file diff --git a/vue/static/tableFieldForSearch.json b/vue/static/tableFieldForSearch.json index 2ae0c1f1..f0bb53dd 100644 --- a/vue/static/tableFieldForSearch.json +++ b/vue/static/tableFieldForSearch.json @@ -3107,11 +3107,204 @@ "setting": [] } ] + }, + "hq-m-OutOrder": { + "id": "36", + "data": [ + { + "fieldId": 3, + "formType": "text", + "name": "订货看板编号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "kanban", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "交货单号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "wmsBillNum", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "Sap编码", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "materialCode", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "物料组(车型)", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "materialGroup", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "发货零件号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "extend1", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "收货仓库", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "extend2", + "setting": [] + } + ] + }, + "hq-f-OutOrder": { + "id": "36", + "data": [ + { + "fieldId": 3, + "formType": "text", + "name": "订货看板编号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "kanban", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "交货单号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "wmsBillNum", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "Sap编码", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "materialCode", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "物料组(车型)", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "materialGroup", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "发货零件号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "extend1", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "收货仓库", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "extend2", + "setting": [] + } + ] + }, "hq-y-OutOrder": { + "id": "36", + "data": [ + { + "fieldId": 3, + "formType": "text", + "name": "订货看板编号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "kanban", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "交货单号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "wmsBillNum", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "Sap编码", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "materialCode", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "物料组(车型)", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "materialGroup", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "发货零件号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "extend1", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "收货仓库", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "extend2", + "setting": [] + } + ] } - } \ No newline at end of file