diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml index 1c23e9fe..60050289 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml @@ -2663,10 +2663,10 @@ 看板号 厂内零件号 - + 版本 客户物料号 - t物料组（车型） + 物料组（车型） @@ -2728,7 +2728,7 @@ - + 1.大众发票与结算核对汇总表 diff --git a/vue/src/router/index.js b/vue/src/router/index.js index 08ed61be..5bc90fcf 100644 --- a/vue/src/router/index.js +++ b/vue/src/router/index.js @@ -173,7 +173,7 @@ export const asyncRoutes = [ billdataRouter,//销售结算与开票报表 //businessdataRouter, wheeldataRouter,//大众看板和备件 - pgfis,//派格fis + //pgfis,//派格fis JobTimeDataRouter,//后台作业监控 // 404 page must be placed at the end !!! diff --git a/vue/src/router/modules/vwFisData.js b/vue/src/router/modules/vwFisData.js index b542de29..6b4da0d5 100644 --- a/vue/src/router/modules/vwFisData.js +++ b/vue/src/router/modules/vwFisData.js @@ -78,16 +78,16 @@ const vwFisDataRouter = { } }, - // { - // path: '/EP', - // component: () => import('@/views/ux/vw/dataInput/erpei'), - // name: 'ERPEI',//命名路由 - // meta: { - // title: '二配结算表', - // roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） - // icon: '结算' - // } - // }, + { + path: 'hq-H-platform', + component: () => import('@/views/ux/vw/dataInput/hq_h'), + name: 'ERPEI',//命名路由 + meta: { + title: '红旗H平台导入', + roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, ] } diff --git a/vue/src/router/modules/vwKBdata.js b/vue/src/router/modules/vwKBdata.js index d1830568..3443ebb0 100644 --- a/vue/src/router/modules/vwKBdata.js +++ b/vue/src/router/modules/vwKBdata.js @@ -37,7 +37,7 @@ const billdataRouter = { } }, { - path: 'unSettle-diffExport', + path: 'unsettle-diff/export', component: () => import('@/views/ux/billManage/UnSettleDiffExport'), name: 'UnSettleDiffExport',//命名路由 meta: { @@ -66,16 +66,16 @@ const billdataRouter = { icon: '结算对比' } }, - { - path: 'FisUnSettledDiff', - component: () => import('@/views/ux/billManage/FisUnSettledDiff'), - name: 'FisUnSettledDiff',//命名路由 - meta: { - title: '准时化交货与结算核对', - roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） - icon: '看板' - } - }, + // { + // path: 'FisUnSettledDiff', + // component: () => import('@/views/ux/billManage/FisUnSettledDiff'), + // name: 'FisUnSettledDiff',//命名路由 + // meta: { + // title: '准时化交货与结算核对', + // roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） + // icon: '看板' + // } + // }, { path: 'unInvoice-settled/detailDiff', component: () => import('@/views/ux/billManage/UnInvoiceSettledDetailDiff'), diff --git a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue index 35374ec0..cca2e0d0 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue @@ -372,9 +372,12 @@ - + + + + + + + + + + + + + + + + + @@ -446,17 +480,32 @@ - + - + + + + - + - + @@ -467,17 +516,31 @@ - + - +
@@ -499,12 +562,6 @@ import permission from "@/directive/permission/index.js"; import { downloadFile } from "@/utils/crmindex.js"; import CRMTableHead from "../../components/CRMTableHead"; import moment from "moment"; -const cityOptions = [ - { id: 0, name: "未结" }, - { id: 1, name: "部分结算" }, - { id: 2, name: "已结" }, - /* { id: 3, name: "预批量" }, */ -]; export default { name: "InvoiceSettledDetailDiff", @@ -546,8 +603,6 @@ export default { return time.getTime() <= new Date(this.startTime).getTime(); }, }, - // startTime: "", - // endTime: "", pickerOptionsCp7: { disabledDate: (time) => { let now = new Date(); @@ -563,7 +618,6 @@ export default { }, datetime5: [], checkedCities: [0], - cities: cityOptions, selectValue: "", selectNameValue: "", radio: "0", //结算状态：0未结 1部分结算 @@ -572,7 +626,7 @@ export default { // 是否显示详细弹出层 openView: false, versionValue: "", - materialGroupValue: "", + materialGroupValue: [], formTitle: "", timer: null, //定时器名称 //当前位置 @@ -600,6 +654,8 @@ export default { formCount: { startTime: "", endTime: "", + cp5startTime: "", + cp5endTime: "", // name: "未结算对比", // settledate: "", // materialCode: "", @@ -608,6 +664,11 @@ export default { // kennCode: "", // version: "", }, + dataKenCode: "", + datachassisNumber: "", + datamaterialCode: "", + datasapCode: "", + getmaterialGroupValue: "", list: null, totalCount: 0, listLoading: true, @@ -622,6 +683,7 @@ export default { listExportQuery: { version: "", materialCode: undefined, + sapCode: undefined, cp7begin: undefined, cp7end: undefined, kenncode: undefined, @@ -718,6 +780,81 @@ export default { }, }, methods: { + valueChange(data) { + this.getmaterialGroupValue = ""; + this.getmaterialGroupValue += data + ","; + this.getmaterialGroupValue = this.getmaterialGroupValue.substring( + 0, + this.getmaterialGroupValue.length - 1 + ); + }, + //如果是要获得粘贴excel的内容，需要把粘贴的内容转换成二维数组 + pasteExcelToKennCode(e) { + let source = e.clipboardData.getData("Text"); + // 首先对源头进行解析 + let rows = source.split("\r\n"); // 拆成很多行 + this.dataKenCode = ""; + for (let i = 0; i < rows.length; i++) { + if (rows[i] != "") { + // 如果某一行不是空，再按列拆分 + let columns = rows[i].split("\t"); // 已经按列划分 + + for (let j = 0; j < columns.length; j++) { + this.dataKenCode += columns[j] + ","; + } + } + } + //alert(this.dataKenCode.trimEnd(",")); + }, + pasteExcelTochassisNumber(e) { + let source = e.clipboardData.getData("Text"); + // 首先对源头进行解析 + let rows = source.split("\r\n"); // 拆成很多行 + this.datachassisNumber = ""; + for (let i = 0; i < rows.length; i++) { + if (rows[i] != "") { + // 如果某一行不是空，再按列拆分 + let columns = rows[i].split("\t"); // 已经按列划分 + + for (let j = 0; j < columns.length; j++) { + this.datachassisNumber += columns[j] + ","; + } + } + } + }, + pasteExcelTomaterialCode(e) { + let source = e.clipboardData.getData("Text"); + // 首先对源头进行解析 + let rows = source.split("\r\n"); // 拆成很多行 + this.datamaterialCode = ""; + for (let i = 0; i < rows.length; i++) { + if (rows[i] != "") { + // 如果某一行不是空，再按列拆分 + let columns = rows[i].split("\t"); // 已经按列划分 + + for (let j = 0; j < columns.length; j++) { + this.datamaterialCode += columns[j] + ","; + } + } + } + }, + + pasteExcelTosapCode(e) { + let source = e.clipboardData.getData("Text"); + // 首先对源头进行解析 + let rows = source.split("\r\n"); // 拆成很多行 + this.datasapCode = ""; + for (let i = 0; i < rows.length; i++) { + if (rows[i] != "") { + // 如果某一行不是空，再按列拆分 + let columns = rows[i].split("\t"); // 已经按列划分 + + for (let j = 0; j < columns.length; j++) { + this.datasapCode += columns[j] + ","; + } + } + } + }, getdateValue(val) { this.startTime = val; this.getbalanceIndexData(); @@ -727,6 +864,14 @@ export default { this.getbalanceIndexData(); }, + cp5getdateValue(val) { + this.cp5startTime = val; + this.getbalanceIndexData(); + }, + cp5getdateValue(val) { + this.cp5startTime = val; + this.getbalanceIndexData(); + }, getCurrentMonthFirst() { var date = new Date(); date.setDate(1); @@ -777,7 +922,7 @@ export default { response.items.forEach((element) => { let options = {}; options.value = element.description; - options.label = element.description; + options.label = element.description + "/" + element.value; this.materialGroupList.push(options); }); }) @@ -791,6 +936,8 @@ export default { this.datetime5 = []; this.startTime = ""; this.endTime = ""; + this.cp5startTime = ""; + this.cp5endTime = ""; }, save() { this.$refs.formCount.validate((valid) => { @@ -798,65 +945,80 @@ export default { this.formLoading = true; this.listExportQuery.version = this.formCount.versionValue; //版本 if (this.formCount.materialCode != "") { - this.listExportQuery.materialCode = this.formCount.materialCode; //物料号 + var getmaterialCode = this.datamaterialCode.substring( + 0, + this.datamaterialCode.length - 1 + ); + this.listExportQuery.materialCode = getmaterialCode; //物料号 } - // if (this.formCount.sapMaterialCode != "") { - // this.listExportQuery.sapMaterialCode = - // this.formCount.sapMaterialCode; //厂内物料号 - // } - if (this.formCount.kennCode != "") { - this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号 + if (this.formCount.sapCode != "") { + var getsapCode = this.datasapCode.substring( + 0, + this.datasapCode.length - 1 + ); + this.listExportQuery.sapCode = getsapCode; //厂内物料号 } - var getdate5 = JSON.stringify(this.datetime5); - if (getdate5 != "[]") { - this.listExportQuery.begin = this.datetime5 - ? this.datetime5[0] || undefined - : undefined; - this.listExportQuery.end = this.datetime5 - ? this.datetime5[1] || undefined - : undefined; - } else { - this.listExportQuery.begin = undefined; - this.listExportQuery.end = undefined; + if (this.formCount.kennCode != "") { + var getgroupValue = this.dataKenCode.substring( + 0, + this.dataKenCode.length - 1 + ); + this.listExportQuery.kenncode = getgroupValue; //KEEN号 } + this.listExportQuery.begin = this.cp5startTime + ? this.cp5startTime + : undefined; + this.listExportQuery.end = this.cp5endTime + ? this.cp5endTime + : undefined; this.listExportQuery.cp7begin = this.startTime ? this.startTime : undefined; this.listExportQuery.cp7end = this.endTime ? this.endTime : undefined; if (this.formCount.chassisNumber != "") { - this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号 + var getchassisNumber = this.datachassisNumber.substring( + 0, + this.datachassisNumber.length - 1 + ); + this.listExportQuery.chassisNumber = getchassisNumber; //底盘号 } + // if (this.formCount.materialGroupValue != "") { + // this.listExportQuery.materialGroup = + // '"'+this.formCount.materialGroupValue+'"'; //物料组车型 + // } if (this.formCount.materialGroupValue != "") { - this.listExportQuery.materialGroup = - this.formCount.materialGroupValue; //物料组车型 + this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型 } + console.log( "大众发票与结算核对明细表-导出条件：" + JSON.stringify(this.listExportQuery) ); - this.$axios - .gets( - "/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make", - this.listExportQuery - ) - .then((res) => { - let taskid = res; - if (Number.isInteger(taskid)) { - this.$notify({ - title: "成功", - message: "任务生成成功！任务号:" + taskid, - type: "success", - duration: 2000, - }); - } - this.getList(); - this.formLoading = false; - this.dialogFormVisible = false; - }) - .catch(() => { - this.formLoading = false; - this.dialogFormVisible = false; - }); + this.formLoading = false; + this.dialogFormVisible = false; + // this.$axios + // .gets( + // "/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make", + // this.listExportQuery + // ) + // .then((res) => { + // let taskid = res; + // if (Number.isInteger(taskid)) { + // this.$notify({ + // title: "成功", + // message: "任务生成成功！任务号:" + taskid, + // type: "success", + // duration: 2000, + // }); + // } + // this.getList(); + // this.formLoading = false; + // this.dialogFormVisible = false; + // }) + // .catch(() => { + // this.formLoading = false; + // this.dialogFormVisible = false; + // }); } }); }, @@ -870,6 +1032,8 @@ export default { this.datetime5 = []; this.startTime = ""; this.endTime = ""; + this.cp5startTime = ""; + this.cp5endTime = ""; this.dialogFormVisible = true; }, diff --git a/vue/src/views/ux/billManage/IssuedUnsettled/index.vue b/vue/src/views/ux/billManage/IssuedUnsettled/index.vue index 2b9f4a4f..e63870d9 100644 --- a/vue/src/views/ux/billManage/IssuedUnsettled/index.vue +++ b/vue/src/views/ux/billManage/IssuedUnsettled/index.vue @@ -1,4 +1,4 @@ - +