diff --git a/vue/src/router/index.js b/vue/src/router/index.js index d5f65438..b056bd43 100644 --- a/vue/src/router/index.js +++ b/vue/src/router/index.js @@ -86,7 +86,8 @@ export const constantRoutes = [ children: [ { path: 'dashboard', - component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'), + //component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),//fis + component: () => import('@/views/ux/backGroundWork'), name: 'Dashboard', meta: { title: '系统首页', @@ -169,14 +170,14 @@ export const asyncRoutes = [ /** when your routing map is too long, you can split it into small modules **/ managerRouter,//系统首页 personRouter,//系统管理 - //basedataRouter,//基础数据维护 - //vwFisDataRouter,//结算与开票数据导入 - //billdataRouter,//销售结算与开票报表 + basedataRouter,//基础数据维护 + vwFisDataRouter,//结算与开票数据导入 + billdataRouter,//销售结算与开票报表 //businessdataRouter, - //wheeldataRouter,//大众看板和备件 - pgfisPrint,//排序单打印 - pgfis,//派格fis - //JobTimeDataRouter,//后台作业监控 + wheeldataRouter,//大众看板和备件 + // pgfisPrint,//排序单打印 + // pgfis,//派格fis + JobTimeDataRouter,//后台作业监控 // 404 page must be placed at the end !!! { path: '*', redirect: '/404', hidden: true } diff --git a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue index 09029aad..de9dcb3b 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue @@ -369,7 +369,7 @@ - + @@ -378,12 +378,9 @@
+ - + + + + + + + + + + + + + + + + + @@ -447,16 +489,26 @@ - - + + - - + + @@ -466,16 +518,26 @@ - - + + - + - - + + @@ -499,21 +561,25 @@ import permission from "@/directive/permission/index.js"; import { downloadFile } from "@/utils/crmindex.js"; import CRMTableHead from "../../components/CRMTableHead"; import moment from "moment"; - +import JobSelectVerson from "@/components/CreateCom/Job-Select.vue"; export default { name: "SettleDoorPanel", - components: { Pagination, CRMTableHead }, + components: { Pagination, CRMTableHead, JobSelectVerson }, directives: { permission }, data() { return { crmType: "backJob", + JobVersionList: [], + getmaterialGroupValue: "", rules: { versionValue: [ { required: true, message: "必须输入！", trigger: "change" }, ], }, + JobversionValue: "", + JobversionValueVerson: "", pickerOptionsCp5: { disabledDate: (time) => { let now = new Date(); @@ -541,8 +607,22 @@ export default { return time.getTime() <= new Date(this.startTime).getTime(); }, }, + pickerOptions2: { + disabledDate: (time) => { + //if (this.endTime != "") { + return time.getTime() > new Date(this.cp5endTime).getTime(); + //} + }, + }, + pickerOptions3: { + disabledDate: (time) => { + return time.getTime() <= new Date(this.cp5startTime).getTime(); + }, + }, startTime: "", endTime: "", + cp5startTime: "", + cp5endTime: "", pickerOptionsCp7: { disabledDate: (time) => { let now = new Date(); @@ -593,15 +673,14 @@ export default { searchContent: "", // 输入内容 form: {}, formCount: { - name: "未结算对比", - // datetime5: [], - // datetime7: [], - settledate: "", + startTime: "", + endTime: "", + cp5startTime: "", + cp5endTime: "", materialCode: "", sapMaterialCode: "", chassisNumber: "", kennCode: "", - version: "", }, list: null, totalCount: 0, @@ -667,6 +746,7 @@ export default { this.getAllVersionList(); this.getMaterialGroup(); this.getList(); + this.getJobVersionInfo(); // this.getCurrentMonthFirst(); // this.getCurrentMonthLast(); }, @@ -713,6 +793,46 @@ export default { }, }, methods: { + valueChange(data) { + this.getmaterialGroupValue = ""; + this.getmaterialGroupValue += data + ","; + this.getmaterialGroupValue = this.getmaterialGroupValue.substring( + 0, + this.getmaterialGroupValue.length - 1 + ); + }, + //版本下拉列表选择项 + JobVersionValue(params) { + //版本下拉选择 + this.JobversionValue = params.value; + this.getList(); + }, + getJobVersionInfo() { + //取版本列表信息 + //this.listLoading = true; + this.listQuery.SkipCount = (this.page - 1) * 1000; + this.$axios + .posts("/api/settleaccount/Job/versionlist", this.listQuery) + .then((response) => { + this.JobVersionList = []; + response.forEach((element) => { + let options = {}; + options.value = element; + options.label = element; + this.JobVersionList.push(options); + }); + if (JSON.stringify(this.JobVersionList) != "[]") { + //因版本下拉有默认值，所以详表要自动绑定子表数据 + this.JobversionValue = this.JobVersionList[0].value; + this.JobversionValueVerson = this.JobVersionList[0].label; + this.getList(); + } + }) + .catch(() => { + //this.listLoading = false; + }); + }, + //cp7 getdateValue(val) { this.startTime = val; this.getbalanceIndexData(); @@ -721,6 +841,15 @@ export default { this.endTime = val; this.getbalanceIndexData(); }, + //cp5 + getdateValueCp5(val) { + this.cp5startTime = val; + this.getbalanceIndexData(); + }, + getdateValCp5(val) { + this.cp5endTime = val; + this.getbalanceIndexData(); + }, getCurrentMonthFirst() { var date = new Date(); @@ -772,7 +901,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); }); }) @@ -786,7 +915,8 @@ export default { this.datetime5 = []; this.startTime = ""; this.endTime = ""; - // this.datetime7 = []; + this.cp5startTime = ""; + this.cp5endTime = ""; }, save() { this.$refs.formCount.validate((valid) => { @@ -797,21 +927,18 @@ export default { this.listExportQuery.materialCode = this.formCount.materialCode; //物料号 } if (this.formCount.sapMaterialCode != "") { - this.listExportQuery.sapMaterialCode = this.formCount.sapMaterialCode; //厂内物料号 + this.listExportQuery.sapMaterialCode = + this.formCount.sapMaterialCode; //厂内物料号 } if (this.formCount.kennCode != "") { this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号 } - var getdate5 = JSON.stringify(this.datetime5); - if (getdate5 != "[]") { - alert(this.datetime5[0]); - this.listExportQuery.begin = this.datetime5 - ? this.datetime5[0] || undefined - : undefined; - this.listExportQuery.end = this.datetime5 - ? this.datetime5[1] || undefined - : undefined; - } + this.listExportQuery.begin = this.cp5startTime + ? this.cp5startTime + : undefined; + this.listExportQuery.end = this.cp5endTime + ? this.cp5endTime + : undefined; if (this.startTime != "") { this.listExportQuery.cp7begin = this.startTime; //CP7开始时间 } @@ -822,8 +949,7 @@ export default { this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号 } if (this.formCount.materialGroupValue != "") { - this.listExportQuery.materialGroup = - this.formCount.materialGroupValue; //物料组车型 + this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型 } console.log( "大众准时化结算门板价格差异比对报表-导出条件：" + @@ -862,6 +988,10 @@ export default { this.formTitle = "报表统计"; this.isEdit = false; this.form = {}; + this.startTime = ""; + this.endTime = ""; + this.cp5startTime = ""; + this.cp5endTime = ""; this.dialogFormVisible = true; }, filterHandler(value, row, column) { @@ -977,6 +1107,7 @@ export default { this.listLoading = true; //导入界面中超链接过来的参数 this.listQuery.name = "大众准时化结算门板价格差异比对报表"; + this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { diff --git a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue index 19a560e5..2e817124 100644 --- a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue @@ -5,6 +5,12 @@
+ - + + + + + + + + + + + + + + + + + @@ -448,7 +490,12 @@ - + @@ -456,7 +503,12 @@ - + @@ -465,19 +517,29 @@ - + - + - +
@@ -499,16 +561,11 @@ 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: "预批量" }, */ -]; +import JobSelectVerson from "@/components/CreateCom/Job-Select.vue"; export default { name: "UnInvoiceSettledDetailDiff", - components: { Pagination, CRMTableHead }, + components: { Pagination, CRMTableHead, JobSelectVerson }, directives: { permission }, data() { @@ -519,6 +576,7 @@ export default { { required: true, message: "必须输入！", trigger: "change" }, ], }, + getmaterialGroupValue: "", pickerOptionsCp5: { disabledDate: (time) => { let now = new Date(); @@ -546,6 +604,19 @@ export default { return time.getTime() <= new Date(this.startTime).getTime(); }, }, + + pickerOptions2: { + disabledDate: (time) => { + //if (this.endTime != "") { + return time.getTime() > new Date(this.cp5endTime).getTime(); + //} + }, + }, + pickerOptions3: { + disabledDate: (time) => { + return time.getTime() <= new Date(this.cp5startTime).getTime(); + }, + }, // startTime: "", // endTime: "", pickerOptionsCp7: { @@ -563,7 +634,7 @@ export default { }, datetime5: [], checkedCities: [0], - cities: cityOptions, + JobVersionList: [], selectValue: "", selectNameValue: "", radio: "0", //结算状态：0未结 1部分结算 @@ -600,14 +671,15 @@ export default { formCount: { startTime: "", endTime: "", - // name: "未结算对比", - // settledate: "", - // materialCode: "", - // sapMaterialCode: "", - // chassisNumber: "", - // kennCode: "", - // version: "", + cp5startTime: "", + cp5endTime: "", + materialCode: "", + sapMaterialCode: "", + chassisNumber: "", + kennCode: "", }, + cp5startTime: "", + cp5endTime: "", list: null, totalCount: 0, listLoading: true, @@ -629,6 +701,7 @@ export default { materialGroup: undefined, begin: undefined, end: undefined, + sapCode: undefined, }, listQuery: { taskId: "", @@ -672,6 +745,7 @@ export default { this.getAllVersionList(); this.getMaterialGroup(); this.getList(); + this.getJobVersionInfo(); }, beforeDestroy() { clearInterval(this.timer); @@ -681,7 +755,11 @@ export default { /* 主表头 */ getDefaultField() { var tempsTabs = []; - + tempsTabs.push({ + label: "版本号", + prop: "type", + width: 85, + }); tempsTabs.push({ label: "单据流水号", prop: "taskId", @@ -702,12 +780,57 @@ export default { prop: "createdAt", width: 150, }); + tempsTabs.push({ + label: "说明", + prop: "remark", + width: 220, + }); return tempsTabs; }, }, methods: { + valueChange(data) { + this.getmaterialGroupValue = ""; + this.getmaterialGroupValue += data + ","; + this.getmaterialGroupValue = this.getmaterialGroupValue.substring( + 0, + this.getmaterialGroupValue.length - 1 + ); + }, + //版本下拉列表选择项 + JobVersionValue(params) { + //版本下拉选择 + this.JobversionValue = params.value; + this.getList(); + }, + getJobVersionInfo() { + //取版本列表信息 + //this.listLoading = true; + this.listQuery.SkipCount = (this.page - 1) * 1000; + this.$axios + .posts("/api/settleaccount/Job/versionlist", this.listQuery) + .then((response) => { + this.JobVersionList = []; + response.forEach((element) => { + let options = {}; + options.value = element; + options.label = element; + this.JobVersionList.push(options); + }); + if (JSON.stringify(this.JobVersionList) != "[]") { + //因版本下拉有默认值，所以详表要自动绑定子表数据 + this.JobversionValue = this.JobVersionList[0].value; + this.JobversionValueVerson = this.JobVersionList[0].label; + this.getList(); + } + }) + .catch(() => { + //this.listLoading = false; + }); + }, getdateValue(val) { this.startTime = val; + alert(this.startTime); this.getbalanceIndexData(); }, getdateVal(val) { @@ -715,6 +838,16 @@ export default { this.getbalanceIndexData(); }, + //cp5 + getdateValueCp5(val) { + this.cp5startTime = val; + this.getbalanceIndexData(); + }, + getdateValCp5(val) { + this.cp5endTime = val; + this.getbalanceIndexData(); + }, + getCurrentMonthFirst() { var date = new Date(); date.setDate(1); @@ -765,7 +898,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); }); }) @@ -779,7 +912,21 @@ export default { this.datetime5 = []; this.startTime = ""; this.endTime = ""; + this.cp5startTime = ""; + this.cp5endTime = ""; }, + // 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; + // } save() { this.$refs.formCount.validate((valid) => { if (valid) { @@ -788,25 +935,19 @@ export default { if (this.formCount.materialCode != "") { this.listExportQuery.materialCode = this.formCount.materialCode; //物料号 } - // if (this.formCount.sapMaterialCode != "") { - // this.listExportQuery.sapMaterialCode = - // this.formCount.sapMaterialCode; //厂内物料号 - // } + if (this.formCount.sapMaterialCode != "") { + this.listExportQuery.sapCode = this.formCount.sapMaterialCode; //厂内物料号 + } if (this.formCount.kennCode != "") { this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号 } - 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; - } + //cp5 + this.listExportQuery.begin = this.cp5startTime + ? this.cp5startTime + : undefined; + this.listExportQuery.end = this.cp5endTime + ? this.cp5endTime + : undefined; this.listExportQuery.cp7begin = this.startTime ? this.startTime : undefined; @@ -815,15 +956,12 @@ export default { this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号 } if (this.formCount.materialGroupValue != "") { - this.listExportQuery.materialGroup = - this.formCount.materialGroupValue; //物料组车型 + this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型 } console.log( "准时化结算数量差异比对-导出条件：" + JSON.stringify(this.listExportQuery) ); - // this.formLoading = false; - // this.dialogFormVisible = false; this.$axios .gets( "/api/settleaccount/ReportMakeService/UnInvoiceSettledDetailDiff-Make", @@ -857,9 +995,11 @@ export default { this.formTitle = "报表统计"; this.isEdit = false; this.form = {}; - this.datetime5 = []; + //this.datetime5 = []; this.startTime = ""; this.endTime = ""; + this.cp5startTime = ""; + this.cp5endTime = ""; this.dialogFormVisible = true; }, @@ -975,7 +1115,8 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "大众结算未发运核对明细表"; + this.listQuery.name = "大众准时化结算数量差异比对表"; + this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => {