diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue index 8538df45..9a305b0f 100644 --- a/vue/src/components/ImportExcel-base/index.vue +++ b/vue/src/components/ImportExcel-base/index.vue @@ -308,6 +308,7 @@ export default { vwoutorder: "准时化出库单", sparepartoutorder: "大众备件出库单", kanbanoutorder: "大众看板出库单", + HQ_H_OUTORDER:"红旗H平台出库单", bomdatabase: "产品结构BOM", prebatch: "预批量", secondaryPriceRatio: "二配结算价格比例", @@ -339,6 +340,7 @@ export default { hqYPlatform: "/api/settleaccount/BT_Carlatform/ExcelImport", //一汽轿车平台导入 vwoutorder: "/api/settleaccount/wmsjitoutput/ExcelImport", //准时化出库单导入 kanbanoutorder: "/api/settleaccount/wmskanbanoutput/ExcelImport", //大众看板出库单导入 + HQ_H_OUTORDER: "/api/settleaccount/WmsHQHKanbanoutput/ExcelImport", //红旗H平台出库单导入 sparepartoutorder: "/api/settleaccount/wmsSharePartoutput/ExcelImport", //大众备件出库单导入 bomdatabase: "/api/settleaccount/bom/ExcelImport", diff --git a/vue/src/router/index.js b/vue/src/router/index.js index a1bc2d5a..311c25df 100644 --- a/vue/src/router/index.js +++ b/vue/src/router/index.js @@ -20,6 +20,7 @@ import vwMenudataRouter from './modules/vw_menu' import hqMenudataRouter from './modules/hq_menu' import btcarDataRouter from './modules/bt_menu' import vwOutOrderDataRouter from './modules/vw_out_order' +import hqOutOrderDataRouter from './modules/hq_out_order' //import newjitRouter from './modules/newjit-basedata' import pgfis from './modules/fis' import pgfisPrint from './modules/fisprint' @@ -178,6 +179,7 @@ export const asyncRoutes = [ vwMenudataRouter,//大众 hqMenudataRouter,//红旗 vwOutOrderDataRouter, + hqOutOrderDataRouter, //btcarDataRouter,//一汽轿车 //vwFisDataRouter,//结算与开票数据导入 //billdataRouter,//销售结算与开票报表 diff --git a/vue/src/router/modules/hq_menu.js b/vue/src/router/modules/hq_menu.js index a9e76a13..8575e230 100644 --- a/vue/src/router/modules/hq_menu.js +++ b/vue/src/router/modules/hq_menu.js @@ -39,7 +39,17 @@ const hqMenudataRouter = { component: () => import('@/views/ux/vw/dataInput/hq_h_report'), name: 'HQH', meta: { - title: 'H平台结算差异输出', + title: 'H平台核对明细', + //roles: ['SettleAccount.FISs'], + icon: '文件' + } + }, + { + path: 'hq-H-sparepart-export', + component: () => import('@/views/ux/vw/dataInput/hq_h_sparepart'), + name: 'HQH', + meta: { + title: 'H平台备件明细', //roles: ['SettleAccount.FISs'], icon: '文件' } diff --git a/vue/src/router/modules/hq_out_order.js b/vue/src/router/modules/hq_out_order.js new file mode 100644 index 00000000..f2700825 --- /dev/null +++ b/vue/src/router/modules/hq_out_order.js @@ -0,0 +1,64 @@ +//大众-FIS结算-路由 +import Layout from '@/layout' + +const hqOutOrderDataRouter = { + path: '/cpat-order', + component: Layout, + redirect: 'pg', + name: '业务数据', + //hidden: true, + meta: { + //requiresAuth: true, + title: '红旗出库单管理', + index: 0, + type: 'crm', + icon: '单据导入', + keepAlive: false, + }, + children: [ + { + path: 'hq-h-outorder', + component: () => import('@/views/ux/vw/dataInput/hq_h_outorder'), + name: 'SettleAccount',//命名路由 + meta: { + title: '红旗H平台出库单', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色(可以设置多个角色) + icon: '结算' + } + }, + // { + // path: 'hq-m-outorder', + // component: () => import('@/views/ux/billManage/kanbanOutOrder/index'), + // name: 'SettleAccount',//命名路由 + // meta: { + // title: '大众看板出库单', + // roles: ['SettleAccount.SettleAccounts'],//控制页面角色(可以设置多个角色) + // icon: '结算' + // } + // }, + // { + // path: 'hq-f-withoutorder', + // component: () => import('@/views/ux/billManage/kanbanWithOutOrder/index'), + // name: 'SettleAccount',//命名路由 + // meta: { + // title: '大众无条码看板出库单', + // roles: ['SettleAccount.SettleAccounts'],//控制页面角色(可以设置多个角色) + // icon: '结算' + // } + // }, + // { + // path: 'hq-car-outorder', + // component: () => import('@/views/ux/billManage/sparepartOutOrder/index'), + // name: 'Invoices',//命名路由 + // meta: { + // title: '大众备件出库单', + // roles: ['SettleAccount.Invoices'], + // icon: '对比' + // } + // }, + + ] +} + +export default hqOutOrderDataRouter + diff --git a/vue/src/views/ux/vw/dataInput/hq_f/index.vue b/vue/src/views/ux/vw/dataInput/hq_f/index.vue index ff358a34..1247756e 100644 --- a/vue/src/views/ux/vw/dataInput/hq_f/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_f/index.vue @@ -291,7 +291,8 @@ export default { prop: "acceptanceDate", width: 170, }); - tempsTabs.push({ label: "数量", prop: "price", width: 100 }); + tempsTabs.push({ label: "数量", prop: "qty", width: 100 }); + tempsTabs.push({ label: "单价", prop: "price", width: 100 }); tempsTabs.push({ label: "金额", prop: "amt", width: 100 }); tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 }); tempsTabs.push({ diff --git a/vue/src/views/ux/vw/dataInput/hq_h/index.vue b/vue/src/views/ux/vw/dataInput/hq_h/index.vue index 5c981f11..66cbe312 100644 --- a/vue/src/views/ux/vw/dataInput/hq_h/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_h/index.vue @@ -291,7 +291,8 @@ export default { prop: "acceptanceDate", width: 170, }); - tempsTabs.push({ label: "数量", prop: "price", width: 100 }); + tempsTabs.push({ label: "数量", prop: "qty", width: 100 }); + tempsTabs.push({ label: "单价", prop: "price", width: 100 }); tempsTabs.push({ label: "金额", prop: "amt", width: 100 }); tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 }); tempsTabs.push({ 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 new file mode 100644 index 00000000..b0a4b4c2 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue @@ -0,0 +1,621 @@ + + + + + + + + diff --git a/vue/src/views/ux/vw/dataInput/hq_h_outorder/index.vue b/vue/src/views/ux/vw/dataInput/hq_h_outorder/index.vue new file mode 100644 index 00000000..b37bd9e8 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_h_outorder/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 6e1f5941..53ea0196 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 @@ -269,37 +269,24 @@ + - - - - {{ item.label }} - {{ - item.value - }} - - + + + @@ -348,10 +335,10 @@ - + - + - + - + @@ -399,23 +386,6 @@ style="width: 170px" type="textarea" :rows="4" - placeholder="多个结算零件号,请以回车换行形式添加!" - /> - - - - - - - - - - - @@ -434,36 +404,6 @@ > - - - -
- - - - - -
-
- -
@@ -483,7 +423,7 @@ export default { data() { return { - crmType: "backJob", + crmType: "hq-h-backJob", activeNames: ["1"], tableData: [ { @@ -575,15 +515,26 @@ export default { searchContent: "", // 输入内容 form: {}, formCount: { + version: undefined, startTime: "", endTime: "", - // name: "未结算对比", - // settledate: "", - // materialCode: "", - // sapMaterialCode: "", - // chassisNumber: "", - // kennCode: "", - // version: "", + materialCode: undefined, + materialGroup: undefined, + sapCode: undefined, + warehouseDesc: undefined, + acceptNo: undefined, + kanban: undefined, + }, + listExportQuery: { + version: "", + materialCode: undefined, + begin: undefined, + end: undefined, + materialGroup: undefined, + sapCode: undefined, + warehouseDesc: undefined, + acceptNo: undefined, + kanban: undefined, }, dataKenCode: "", datachassisNumber: "", @@ -601,18 +552,7 @@ export default { return {}; }, }, - listExportQuery: { - version: "", - materialCode: undefined, - sapCode: undefined, - cp7Begin: undefined, - cp7End: undefined, - kenncode: undefined, - chassisNumber: undefined, - materialGroup: undefined, - begin: undefined, - end: undefined, - }, + listQuery: { taskId: "", name: "", @@ -796,7 +736,7 @@ export default { .then(() => { this.$axios .posts( - "/api/settleaccount/wmsjitoutput/WmsJitOutPutAudit", + "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPutAudit", params ) .then((response) => { @@ -873,7 +813,7 @@ export default { this.formLoading = true; this.$axios .posts( - "/api/settleaccount/wmsjitoutput/WmsJitOutPut", + "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut", this.listBillQuery ) .then((response) => { @@ -1156,38 +1096,37 @@ export default { this.$refs.formCount.validate((valid) => { if (valid) { this.formLoading = true; - this.listExportQuery.version = this.formCount.versionValue; //版本 + this.listExportQuery.version = this.formCount.versionValue; //1版本 if (this.formCount.materialCode != "") { - this.listExportQuery.materialCode = this.formCount.materialCode; //物料号 + this.listExportQuery.materialCode = this.formCount.materialCode; //2发货零件号 } if (this.formCount.sapCode != "") { - this.listExportQuery.sapCode = this.formCount.sapCode; //厂内物料号 + this.listExportQuery.sapCode = this.formCount.sapCode; //3厂内物料号 } - if (this.formCount.kennCode != "") { - this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号 + if (this.formCount.warehouseDesc != "") { + this.listExportQuery.warehouseDesc = this.formCount.warehouseDesc; //4收货仓库描述 } this.listExportQuery.begin = this.startTime ? this.startTime : undefined; this.listExportQuery.end = this.endTime ? this.endTime : undefined; - if (this.formCount.chassisNumber != "") { - this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号 + if (this.formCount.acceptNo != "") { + this.listExportQuery.acceptNo = this.formCount.acceptNo; //5结算验收单号 + } + if (this.formCount.kanban != "") { + this.listExportQuery.kanban = this.formCount.kanban; //6订货看板编号 } - // if (this.formCount.materialGroupValue != "") { - // this.listExportQuery.materialGroup = - // '"'+this.formCount.materialGroupValue+'"'; //物料组车型 - // } if (this.formCount.materialGroupValue != "") { - this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型 + this.listExportQuery.materialGroup = this.getmaterialGroupValue; //7物料组车型 } console.log( - "大众发票与结算核对明细表-导出条件:" + + "H平台核对明细-导出条件:" + JSON.stringify(this.listExportQuery) ); this.$axios .posts( - "/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make", + "/api/settleaccount/ReportMakeService/HQHSettledDetailDiffExportService", this.listExportQuery ) .then((res) => { @@ -1218,7 +1157,6 @@ export default { this.formTitle = "报表统计"; this.isEdit = false; this.form = {}; - this.datetime5 = []; this.startTime = ""; this.endTime = ""; this.dialogFormVisible = true; @@ -1236,28 +1174,6 @@ export default { const property = column["property"]; return row[property] === value; }, - /* 任务详细信息 */ - handleView(row) { - this.listQuery.taskId = row.taskId; - this.$axios - .posts("/api/settleaccount/Job/list", this.listQuery) - .then((response) => { - this.form = response[0]; - switch (response[0].stateName) { - case "Succeeded": - case "Failed": - this.activeIndex = 3; - break; - case "Processing": - this.activeIndex = 2; - break; - case "Enqueued": - this.activeIndex = 1; - break; - } - this.openView = true; - }); - }, /* 刷新 */ refresh() { this.list = []; @@ -1344,7 +1260,7 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "准时化结算核对明细"; + this.listQuery.name = "H平台核对明细"; this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) @@ -1359,14 +1275,6 @@ export default { this.listLoading = false; }); }, - // fetchData(id) { - // //循环动态,取客户名称 - // this.$axios - // .gets("/api/settleaccount/MaterialRelationship/" + id) - // .then((response) => { - // this.form = response; - // }); - // }, resetQuery() {}, /** 通过回调控制style */ cellStyle({ row, column, rowIndex, columnIndex }) { 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 new file mode 100644 index 00000000..53ea0196 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue @@ -0,0 +1,1316 @@ + + + + + + \ No newline at end of file diff --git a/vue/src/views/ux/vw/dataInput/hq_m/index.vue b/vue/src/views/ux/vw/dataInput/hq_m/index.vue index 8ebbf02b..29c7df3e 100644 --- a/vue/src/views/ux/vw/dataInput/hq_m/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_m/index.vue @@ -291,7 +291,8 @@ export default { prop: "acceptanceDate", width: 170, }); - tempsTabs.push({ label: "数量", prop: "price", width: 100 }); + tempsTabs.push({ label: "数量", prop: "qty", width: 100 }); + tempsTabs.push({ label: "单价", prop: "price", width: 100 }); tempsTabs.push({ label: "金额", prop: "amt", width: 100 }); tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 }); tempsTabs.push({ diff --git a/vue/src/views/ux/vw/dataInput/hq_y/index.vue b/vue/src/views/ux/vw/dataInput/hq_y/index.vue index cfcc0f30..97e7a101 100644 --- a/vue/src/views/ux/vw/dataInput/hq_y/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_y/index.vue @@ -262,7 +262,7 @@ export default { }, computed: { /** 列表字段 */ - getDefaultField() { + getDefaultField() { var tempsTabs = []; tempsTabs.push({ label: "看板号", @@ -291,7 +291,8 @@ export default { prop: "acceptanceDate", width: 170, }); - tempsTabs.push({ label: "数量", prop: "price", width: 100 }); + tempsTabs.push({ label: "数量", prop: "qty", width: 100 }); + tempsTabs.push({ label: "单价", prop: "price", width: 100 }); tempsTabs.push({ label: "金额", prop: "amt", width: 100 }); tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 }); tempsTabs.push({ diff --git a/vue/static/tableFieldForSearch.json b/vue/static/tableFieldForSearch.json index 51f5ea6e..2ae0c1f1 100644 --- a/vue/static/tableFieldForSearch.json +++ b/vue/static/tableFieldForSearch.json @@ -2815,17 +2815,17 @@ { "fieldId": 3, "formType": "text", - "name": "采购订单号", + "name": "看板号", "type": 1, "value": "", "fieldType": 1, - "fieldName": "purchaseOrderNo", + "fieldName": "hqmKanBan", "setting": [] }, { "fieldId": 5, "formType": "text", - "name": "物料代码", + "name": "物料号", "type": 1, "value": "", "fieldType": 1, @@ -2835,41 +2835,81 @@ { "fieldId": 5, "formType": "text", - "name": "科目号", + "name": "存储地点描述", "type": 1, "value": "", "fieldType": 1, - "fieldName": "accountNum", + "fieldName": "storageLocationDesc", + "setting": [] + } + ] + }, + "hqFPlatform": { + "id": "36", + "data": [ + { + "fieldId": 3, + "formType": "text", + "name": "看板号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "hqhKanBan", "setting": [] }, { "fieldId": 5, "formType": "text", - "name": "交货单号", + "name": "物料号", "type": 1, "value": "", "fieldType": 1, - "fieldName": "deliveryOrderNo", + "fieldName": "materialCode", "setting": [] }, { "fieldId": 5, "formType": "text", - "name": "工厂", + "name": "存储地点描述", "type": 1, "value": "", "fieldType": 1, - "fieldName": "factory", + "fieldName": "storageLocationDesc", + "setting": [] + } + ] + }, + "hqYPlatform": { + "id": "36", + "data": [ + { + "fieldId": 3, + "formType": "text", + "name": "看板号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "btCarKanBan", "setting": [] }, { "fieldId": 5, "formType": "text", - "name": "工厂名称", + "name": "物料号", "type": 1, "value": "", "fieldType": 1, - "fieldName": "factoryName", + "fieldName": "materialCode", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "存储地点描述", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "storageLocationDesc", "setting": [] } ] @@ -3002,5 +3042,76 @@ ] } ] + }, + "hq-h-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