diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue index b57ab088..fac4ea54 100644 --- a/vue/src/components/ImportExcel-base/index.vue +++ b/vue/src/components/ImportExcel-base/index.vue @@ -312,7 +312,7 @@ export default { sparepartoutorder: "大众备件出库单", sparepartoutorder90: "大众备件调整出库单", kanbanoutorder: "大众看板出库单", - HQ_H_OUTORDER: "红旗H平台出库单", + HQ_H_OUTORDER: "红旗批量出库单", HQ_M_OUTORDER: "红旗M平台出库单", HQ_Y_OUTORDER: "一汽轿车平台出库单", HQ_F_OUTORDER: "红旗F平台出库单", diff --git a/vue/src/router/index.js b/vue/src/router/index.js index 93cac310..cf4a7735 100644 --- a/vue/src/router/index.js +++ b/vue/src/router/index.js @@ -23,6 +23,7 @@ import vwOutOrderDataRouter from './modules/vw_out_order' import hqOutOrderDataRouter from './modules/hq_out_order' import vwsOutOrderDataRouter from './modules/wms_out_order' import onetimesaleDataRouter from './modules/onetimesale' +import hqcarManagerDataRouter from './modules/hqcardata' import pgfis from './modules/fis' import pgfisPrint from './modules/fisprint' @@ -180,6 +181,7 @@ export const asyncRoutes = [ basedataRouter,//基础数据维护 vwMenudataRouter,//大众 hqMenudataRouter,//红旗 + hqcarManagerDataRouter,//一汽轿车 vwOutOrderDataRouter, hqOutOrderDataRouter, onetimesaleDataRouter,//一次性寄售销售 diff --git a/vue/src/router/modules/hq_menu.js b/vue/src/router/modules/hq_menu.js index 25b9fee5..46159749 100644 --- a/vue/src/router/modules/hq_menu.js +++ b/vue/src/router/modules/hq_menu.js @@ -73,199 +73,41 @@ const hqMenudataRouter = { icon: '未结算' } }, - { - path: '/hqcar', - name: 'import-y-data',//命名路由-二级 - component: () => import('@/views/ux/vw/dataInput/index'), - redirect: 'ux/vw/dataInput/index', - meta: { - title: '一汽轿车平台', - roles: ['SettleAccount.BT_Carlatform', 'SettleAccount.Reports'], - icon: '看板' - }, - children: [ - { - path: 'hq-Y-platform', - component: () => import('@/views/ux/vw/dataInput/hq_y'), - name: 'ERPEI',//命名路由 - meta: { - title: '一汽轿车平台导入', - roles: ['SettleAccount.BT_Carlatform'],//控制页面角色（可以设置多个角色） - icon: '单据导入' - } - }, - { - path: 'hq-Y-report', - component: () => import('@/views/ux/vw/dataInput/hq_y_report'), - name: 'HQY',//命名路由 - meta: { - title: '一汽轿车平台核对明细', - roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） - icon: '业务' - } - }, - ] - - }, - - - - // { - // path: '/H', - // name: 'import-h-data',//命名路由-二级 + // path: '/hqcar', + // name: 'import-y-data',//命名路由-二级 // component: () => import('@/views/ux/vw/dataInput/index'), // redirect: 'ux/vw/dataInput/index', // meta: { - // title: 'H平台', - // roles: ['SettleAccount.HQ_HPlatform', 'SettleAccount.Reports'], + // title: '一汽轿车平台', + // roles: ['SettleAccount.BT_Carlatform', 'SettleAccount.Reports'], // icon: '看板' // }, // children: [ - // { - // path: 'hq-H-platform', - // component: () => import('@/views/ux/vw/dataInput/hq_h'), + // path: 'hq-Y-platform', + // component: () => import('@/views/ux/vw/dataInput/hq_y'), // name: 'ERPEI',//命名路由 // meta: { - // title: '红旗H平台导入', - // roles: ['SettleAccount.HQ_HPlatform'],//控制页面角色（可以设置多个角色） + // title: '一汽轿车平台导入', + // roles: ['SettleAccount.BT_Carlatform'],//控制页面角色（可以设置多个角色） // icon: '单据导入' // } // }, // { - // path: 'hq-H-report', - // component: () => import('@/views/ux/vw/dataInput/hq_h_report'), - // name: 'HQH', + // path: 'hq-Y-report', + // component: () => import('@/views/ux/vw/dataInput/hq_y_report'), + // name: 'HQY',//命名路由 // meta: { - // title: 'H平台核对明细', - // roles: ['SettleAccount.Reports'], + // title: '一汽轿车平台核对明细', + // roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） // icon: '业务' // } // }, - // { - // path: 'hq-H-sparepart-export', - // component: () => import('@/views/ux/vw/dataInput/hq_h_sparepart'), - // name: 'HQH', - // meta: { - // title: 'H平台备件明细', - // roles: ['SettleAccount.Reports'], - // icon: '文件' - // } - // } // ] // }, - // { - // path: '/M', - // component: () => import('@/views/ux/vw/dataInput/index'), - // name: 'export-m-data',//命名路由 - // redirect: 'ux/vw/dataInput/index', - // meta: { - // title: 'M平台', - // roles: ['SettleAccount.HQ_MPlatform', 'SettleAccount.Reports'], - // icon: '看板' - // }, - // children: [ - // { - // path: 'hq-M-platform', - // component: () => import('@/views/ux/vw/dataInput/hq_m'), - // name: 'ERPEI',//命名路由 - // meta: { - // title: '红旗M平台导入', - // roles: ['SettleAccount.HQ_MPlatform'],//控制页面角色（可以设置多个角色） - // icon: '单据导入' - // } - // }, - // { - // path: 'hq-M-report', - // component: () => import('@/views/ux/vw/dataInput/hq_m_report'), - // name: 'HQM', - // meta: { - // title: 'M平台核对明细', - // roles: ['SettleAccount.Reports'], - // icon: '业务' - // } - // }, - // { - // path: 'hq-M-sparepart-export', - // component: () => import('@/views/ux/vw/dataInput/hq_m_sparepart'), - // name: 'HQM', - // meta: { - // title: 'M平台备件明细', - // roles: ['SettleAccount.Reports'], - // icon: '文件' - // } - // }, - // // { - // // path: 'hq-M-platform-export', - // // component: () => import('@/views/ux/billManage/sparePart'), - // // name: 'SparePartReport',//命名路由 - // // meta: { - // // title: 'M平台结算差异输出', - // // //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色（可以设置多个角色） - // // icon: '二配' - // // } - // // } - // ] - // }, - // { - // path: '/F', - // component: () => import('@/views/ux/vw/dataInput/index'), - // name: 'export-f-data',//命名路由 - // redirect: 'ux/vw/dataInput/index', - // meta: { - // title: 'F平台', - // roles: ['SettleAccount.HQ_FPlatform', 'SettleAccount.Reports'], - // icon: '看板' - // }, - // children: [ - // { - // path: 'hq-F-platform', - // component: () => import('@/views/ux/vw/dataInput/hq_f'), - // name: 'ERPEI',//命名路由 - // meta: { - // title: '红旗F平台导入', - // roles: ['SettleAccount.HQ_FPlatform'],//控制页面角色（可以设置多个角色） - // icon: '单据导入' - // } - // }, - - // { - // path: 'hq-F-platform-export', - // component: () => import('@/views/ux/vw/dataInput/hq_f_report'), - // name: 'HQF', - // meta: { - // title: 'F平台核对明细', - // roles: ['SettleAccount.Reports'], - // icon: '业务' - // } - // }, - // { - // path: 'hq-F-sparepart-export', - // component: () => import('@/views/ux/vw/dataInput/hq_f_sparepart'), - // name: 'HQF', - // meta: { - // title: 'F平台备件明细', - // roles: ['SettleAccount.Reports'], - // icon: '文件' - // } - // }, - - // // { - // // path: 'hq-F-platform-export', - // // component: () => import('@/views/ux/billManage/sparePart'), - // // name: 'SparePartReport',//命名路由 - // // meta: { - // // title: 'F平台结算差异输出', - // // //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色（可以设置多个角色） - // // icon: '二配' - // // } - // // } - // ], - // }, - ] diff --git a/vue/src/router/modules/hqcardata.js b/vue/src/router/modules/hqcardata.js new file mode 100644 index 00000000..68e2e211 --- /dev/null +++ b/vue/src/router/modules/hqcardata.js @@ -0,0 +1,45 @@ +//大众-FIS结算-路由 +import Layout from '@/layout' + +const hqcarManagerDataRouter = { + path: '/cpat-hq-car', + component: Layout, + redirect: 'pg', + name: '业务数据', + //hidden: true, + meta: { + //requiresAuth: true, + title: '一汽轿车平台', + index: 0, + type: 'crm', + icon: '看板', + roles: ['SettleAccount.BT_Carlatform', 'SettleAccount.Reports'], + keepAlive: false, + }, + children: [ + { + path: 'hq-Y-platform', + component: () => import('@/views/ux/vw/dataInput/hq_y'), + name: 'ERPEI',//命名路由 + meta: { + title: '一汽轿车平台导入', + roles: ['SettleAccount.BT_Carlatform'],//控制页面角色（可以设置多个角色） + icon: '单据导入' + } + }, + { + path: 'hq-Y-report', + component: () => import('@/views/ux/vw/dataInput/hq_y_report'), + name: 'HQY',//命名路由 + meta: { + title: '一汽轿车平台核对明细', + roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） + icon: '业务' + } + }, + + ] +} + +export default hqcarManagerDataRouter + diff --git a/vue/src/router/modules/wms_out_order.js b/vue/src/router/modules/wms_out_order.js index 766cdb21..39f20df2 100644 --- a/vue/src/router/modules/wms_out_order.js +++ b/vue/src/router/modules/wms_out_order.js @@ -43,7 +43,18 @@ const vwsOutOrderDataRouter = { name: 'WMSOutputSumReport',//命名路由 meta: { title: '结算出库SAP接口', - roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） + roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） + icon: '零件' + } + }, + + { + path: '/wms-OutputDetailDiffReport', + component: () => import('@/views/ux/billManage/WMSOutputDetailDiffReport'), + name: 'WMSOutputDetailDiffReport',//命名路由 + meta: { + title: '结算单出库接口', + roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） icon: '零件' } }, diff --git a/vue/src/views/ux/billManage/KanbanUnSettled/index.vue b/vue/src/views/ux/billManage/KanbanUnSettled/index.vue index 5a4aa18e..c22a5872 100644 --- a/vue/src/views/ux/billManage/KanbanUnSettled/index.vue +++ b/vue/src/views/ux/billManage/KanbanUnSettled/index.vue @@ -219,9 +219,9 @@ > - + - + + + 是否过滤掉当期结算数据 + @@ -281,7 +286,6 @@ v-model="formCount.startTime" type="datetime" size="small" - :picker-options="pickerOptions0" @change="getdateValue" value-format="yyyy-MM-dd HH:mm:ss" default-time="00:00:00" @@ -294,7 +298,6 @@ { diff --git a/vue/src/views/ux/billManage/WMSOutputDetailDiffReport/index.vue b/vue/src/views/ux/billManage/WMSOutputDetailDiffReport/index.vue new file mode 100644 index 00000000..94abbd58 --- /dev/null +++ b/vue/src/views/ux/billManage/WMSOutputDetailDiffReport/index.vue @@ -0,0 +1,849 @@ + + + + + + + + + + diff --git a/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue b/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue index 4be2e7a8..54a8e86c 100644 --- a/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue +++ b/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue @@ -33,6 +33,18 @@ >导出Excel + + + + + + + 同步到SAP @@ -173,6 +185,48 @@ + + +
+ 取消 + + 确认 +
+ + + + @@ -191,11 +245,11 @@
- - 重置 - + + 确认
@@ -257,6 +311,8 @@ export default { customerId: "", projectId: "", }, + JobversionValue: "", + JobversionValueVerson: "", list: null, totalCount: 0, listLoading: true, @@ -280,15 +336,16 @@ export default { Filters: [ { logic: 0, - column: "Extend", + column: "Enabled", action: 0, - value: "not90", + value: "true", }, //默认查询可用的 ], //OrgID:"", SkipCount: 0, MaxResultCount: 15, version: "", + state: undefined, }, listExportQuery: { Filters: [ @@ -309,6 +366,7 @@ export default { }, page: 1, dialogFormVisible: false, + dialogAccounDateVisible: false, multipleSelection: [], formTitle: "", drawer: false, @@ -336,6 +394,7 @@ export default { /** 列表字段 */ getDefaultField() { var tempsTabs = []; + tempsTabs.push({ label: "状态", prop: "state", width: 180 }); tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 }); tempsTabs.push({ label: "版本号", prop: "version", width: 150 }); tempsTabs.push({ @@ -385,15 +444,26 @@ export default { tempsTabs.push({ label: "物料组(车型)", prop: "materialGroup", - width: 150, + width: 320, }); - tempsTabs.push({ label: "物料组描述", prop: "materialDesc", width: 180 }); + tempsTabs.push({ label: "物料组描述", prop: "materialDesc", width: 420 }); tempsTabs.push({ label: "备注", prop: "remark1", width: 220 }); - tempsTabs.push({ label: "状态", prop: "state", width: 180 }); + return tempsTabs; }, }, methods: { + //版本下拉列表选择项 + JobVersionValue(params) { + //版本下拉选择 + this.JobversionValue = params.value; + this.getList(); + }, + selectState(params) { + //版本下拉选择 + this.listQuery.state = params; + this.getList(); + }, //从期间管理中获取版本数据，生成结算出库用 getAllVersionList() { this.$axios @@ -441,22 +511,35 @@ export default { // this.$nextTick(() => { // this.$refs["formCount"].resetFields(); // }); + this.JobversionValue = ""; this.formTitle = "生成结算出库数据"; this.isEdit = false; this.form = {}; this.dialogFormVisible = true; }, + + handleImportSap() { + // this.$nextTick(() => { + // this.$refs["formCount"].resetFields(); + // }); + this.dataValue = ""; + this.formTitle = "同步SAP"; + this.isEdit = false; + this.form = {}; + this.dialogAccounDateVisible = true; + }, + //生成出库单数据 save() { this.$refs.formCount.validate((valid) => { if (valid) { this.formLoading = true; - if (this.versionValue === "" || this.dataValue == "") { - this.$message.error("必需选择版本和过账日期！"); + if (this.versionValue === "") { + this.$message.error("必需选择版本！"); this.formLoading = false; return; } this.listExportQuery.version = this.versionValue; //版本 - this.listExportQuery.accountDate = this.dataValue; //过账日期 + //this.listExportQuery.accountDate = this.dataValue; //过账日期 console.log( "生成出库数据-保存条件：" + JSON.stringify(this.listExportQuery) ); @@ -474,14 +557,14 @@ export default { duration: 2000, }); this.getList(); - this.formLoading = false; - this.dialogFormVisible = false; } else { this.$message({ message: "数据生成失败！", type: "warning", }); } + this.formLoading = false; + this.dialogFormVisible = false; }) .catch(() => { this.formLoading = false; @@ -490,6 +573,46 @@ export default { } }); }, + //同步到SAP + saveDate() { + this.$refs.formCount.validate((valid) => { + if (valid) { + this.formLoading = true; + if (this.dataValue === "") { + this.$message.error("必需选择过账日期！"); + this.formLoading = false; + return; + } + console.log("日期传值：" + this.dataValue); + this.$axios + .posts("/api/settleaccount/WMSOutputSumReport/SyncSap", { + accountDate: this.dataValue, + }) + .then((res) => { + if (res == true) { + this.$notify({ + title: "成功", + message: "数据同步成功！", + type: "success", + duration: 2000, + }); + this.getList(); + this.formLoading = false; + this.dialogAccounDateVisible = false; + } else { + this.$message({ + message: "数据同步失败！", + type: "warning", + }); + } + }) + .catch(() => { + this.formLoading = false; + this.dialogAccounDateVisible = false; + }); + } + }); + }, //导出功能 async handleDownload() { this.listLoading = true; @@ -498,10 +621,10 @@ export default { // this.listLoading = false; // return; // } - if (this.versionValue != "") { - this.listQuery.version = this.versionValue; - } - console.log("大众看板导出：" + JSON.stringify(this.listQuery)); + // if (this.versionValue != "") { + // this.listQuery.version = this.versionValue; + // } + console.log("结算出库SAP接口导出：" + JSON.stringify(this.listQuery)); this.$axios .posts("/api/settleaccount/WMSOutputSumReport/Export", this.listQuery) .then((res) => { @@ -536,13 +659,11 @@ export default { } this.listLoading = false; }); + }) + .catch(() => { + this.listLoading = false; }); }, - selectValue(params) { - //版本下拉选择 - this.versionValue = params.value; - this.getList(); - }, selectOptionsChange(item) { this.getList(); }, @@ -560,9 +681,11 @@ export default { }, /** 格式化字段 */ fieldFormatter(row, column) { - // if (column.property === "state") { - // return { 0: "其他", 2: "已结" }[row[column.property]]; - // } + if (column.property === "state") { + return { 0: "新建", 1: "已申请", 2: "成功", 3: "失败" }[ + row[column.property] + ]; + } if ( column.property == "settleInputDate" || column.property == "settleDate" @@ -585,8 +708,8 @@ export default { getList() { this.listLoading = true; this.listQuery.SkipCount = (this.page - 1) * 10; - if (this.versionValue != "") { - this.listQuery.version = this.versionValue; + if (this.JobversionValue != "") { + this.listQuery.version = this.JobversionValue; } console.log("列表查询条件：" + JSON.stringify(this.listQuery)); this.$axios @@ -681,11 +804,15 @@ export default { }, /** 通过回调控制style */ cellStyle({ row, column, rowIndex, columnIndex }) { - // if (column.property === "qty") { - // return { textAlign: "right" }; - // } else { - // return { textAlign: "left" }; - // } + if ( + column.property === "qty" || + column.property === "outputQty" || + column.property === "diffQty" + ) { + return { textAlign: "right" }; + } else { + return { textAlign: "left" }; + } return { textAlign: "left" }; }, /** 通过回调控制表头style */ diff --git a/vue/src/views/ux/vw/dataInput/r3-open/index.vue b/vue/src/views/ux/vw/dataInput/r3-open/index.vue index 3fa74589..fa5aa795 100644 --- a/vue/src/views/ux/vw/dataInput/r3-open/index.vue +++ b/vue/src/views/ux/vw/dataInput/r3-open/index.vue @@ -2,12 +2,12 @@