diff --git a/vue/src/router/index.js b/vue/src/router/index.js index d5f65438..4f0f543f 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: '系统首页', @@ -174,8 +175,8 @@ export const asyncRoutes = [ //billdataRouter,//销售结算与开票报表 //businessdataRouter, //wheeldataRouter,//大众看板和备件 - pgfisPrint,//排序单打印 - pgfis,//派格fis + pgfisPrint,//排序单打印 + pgfis,//派格fis //JobTimeDataRouter,//后台作业监控 // 404 page must be placed at the end !!! diff --git a/vue/src/router/modules/fisprint.js b/vue/src/router/modules/fisprint.js index 888a6399..ea3309a8 100644 --- a/vue/src/router/modules/fisprint.js +++ b/vue/src/router/modules/fisprint.js @@ -35,17 +35,8 @@ const pgfisPrint = { //roles: ['SettleAccount.Reports'], icon: '结算对比' } - }, - { - path: '/pg-M100Online', - component: () => import('@/views/pg-fis/basedate/m100Online'), - name: 'pg-M100Online',//命名路由 - meta: { - title: 'M100上线信息', - //roles: ['SettleAccount.Reports'], - icon: '售后' - } } + ] } diff --git a/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue b/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue index 0f10550b..cb254ea2 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue @@ -126,7 +126,7 @@ type="success" icon="el-icon-s-shop" @click="handleUpdate()" - >重打(只支持单选)重打 @@ -517,7 +517,6 @@ export default { if (this.customerInfo.productLine != "") { this.listQuery.ProductLine = this.customerInfo.productLine; } - console.log(JSON.stringify(this.listQuery)); this.$axios .posts( @@ -777,7 +776,7 @@ export default { } }, handleRowClick(row, column, event) { - this.$refs.multipleTable.clearSelection(); + //this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.toggleRowSelection(row); }, diff --git a/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue index ea70478e..2a6856c1 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue @@ -99,7 +99,7 @@ type="success" icon="el-icon-s-shop" @click="handleUpdate()" - >重打(只支持单选)重打 @@ -678,7 +678,7 @@ export default { } }, handleRowClick(row, column, event) { - this.$refs.multipleTable.clearSelection(); + //this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.toggleRowSelection(row); }, diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue index cd8a206a..3f2b7d7b 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue @@ -47,7 +47,6 @@ /> - @@ -60,8 +76,10 @@ highlight-current-row style="width: 100%" @row-click="handleRowClick" + @selection-change="handleSelectionChange" @filter-change="filterChange" > + - + @@ -414,12 +433,13 @@ - + @@ -469,7 +489,7 @@ style="color: #37b328" > - + + + + + + + + + + + @@ -654,6 +691,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(); + }, + }, pickerOptionsCp7: { disabledDate: (time) => { let now = new Date(); @@ -715,6 +765,8 @@ export default { // kennCode: "", // version: "", }, + cp5startTime: "", + cp5endTime: "", dataKenCode: "", datachassisNumber: "", datamaterialCode: "", @@ -746,7 +798,7 @@ export default { listQuery: { taskId: "", name: "", - type:"" + type: "", }, page: 1, JobversionValue: "", @@ -839,6 +891,107 @@ export default { }, }, methods: { + handleSelectionChange(val) { + this.multipleSelection = val; + }, + //出库单 + handleCreateBills(row){ + if (this.multipleSelection.length == 0) { + this.$message({ + message: "至少选择一行！", + type: "warning", + }); + return; + } + var params = []; + let myalert = ""; //声明变量，其变量必须在此声明后使用 + if (row) { + //单行 + params.push(row.id); + myalert = row.name; + } else { + //多选 + this.multipleSelection.forEach((element) => { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.$confirm("是否确认出库" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/wms/WmsJitOutPut", params) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "生成成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, + //批量删除 + handleDelete(row) { + if (this.multipleSelection.length == 0) { + this.$message({ + message: "至少选择一行！", + type: "warning", + }); + return; + } + var params = []; + let myalert = ""; //声明变量，其变量必须在此声明后使用 + if (row) { + //单行 + params.push(row.id); + myalert = row.name; + } else { + //多选 + this.multipleSelection.forEach((element) => { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/Job/delete", params) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, //版本下拉列表选择项 JobVersionValue(params) { //版本下拉选择 @@ -934,12 +1087,13 @@ export default { this.getbalanceIndexData(); }, - cp5getdateValue(val) { + //cp5 + getdateValueCp5(val) { this.cp5startTime = val; this.getbalanceIndexData(); }, - cp5getdateValue(val) { - this.cp5startTime = val; + getdateValCp5(val) { + this.cp5endTime = val; this.getbalanceIndexData(); }, getCurrentMonthFirst() { @@ -1048,8 +1202,6 @@ export default { "大众发票与结算核对明细表-导出条件：" + JSON.stringify(this.listExportQuery) ); - this.formLoading = false; - this.dialogFormVisible = false; this.$axios .gets( "/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make", diff --git a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue index 8cbf03e3..736c2e9d 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue @@ -19,6 +19,14 @@ @click="handleCreate" >统计 + 删除(支持批量) @@ -58,10 +66,12 @@ stripe border highlight-current-row + @selection-change="handleSelectionChange" style="width: 100%" @row-click="handleRowClick" @filter-change="filterChange" > + { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/Job/delete", params) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, valueChange(data) { this.getmaterialGroupValue = ""; this.getmaterialGroupValue += data + ","; diff --git a/vue/src/views/ux/billManage/IssuedUnsettled/index.vue b/vue/src/views/ux/billManage/IssuedUnsettled/index.vue index 618ec3d1..fe737698 100644 --- a/vue/src/views/ux/billManage/IssuedUnsettled/index.vue +++ b/vue/src/views/ux/billManage/IssuedUnsettled/index.vue @@ -19,6 +19,14 @@ @click="handleCreate" >统计 + 删除(支持批量) @@ -60,8 +68,10 @@ highlight-current-row style="width: 100%" @row-click="handleRowClick" + @selection-change="handleSelectionChange" @filter-change="filterChange" > + - + + + + + + + + + + + + + + + + + + @@ -717,6 +761,58 @@ export default { }, }, methods: { + handleSelectionChange(val) { + this.multipleSelection = val; + }, + //批量删除 + handleDelete(row) { + if (this.multipleSelection.length == 0) { + this.$message({ + message: "至少选择一行！", + type: "warning", + }); + return; + } + var params = []; + let myalert = ""; //声明变量，其变量必须在此声明后使用 + if (row) { + //单行 + params.push(row.id); + myalert = row.name; + } else { + //多选 + this.multipleSelection.forEach((element) => { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/Job/delete", params) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, //版本下拉列表选择项 JobVersionValue(params) { //版本下拉选择 @@ -844,18 +940,23 @@ export default { 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; - } + // 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.startTime + ? this.startTime + : undefined; + this.listExportQuery.end = this.endTime ? this.endTime : undefined; if (this.formCount.chassisNumber != "") { this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号 } diff --git a/vue/src/views/ux/billManage/SettleDoorPanel/index.vue b/vue/src/views/ux/billManage/SettleDoorPanel/index.vue index 07992a16..2aa3f604 100644 --- a/vue/src/views/ux/billManage/SettleDoorPanel/index.vue +++ b/vue/src/views/ux/billManage/SettleDoorPanel/index.vue @@ -5,6 +5,12 @@
+ 统计 + 删除(支持批量)
@@ -54,8 +68,10 @@ highlight-current-row style="width: 100%" @row-click="handleRowClick" + @selection-change="handleSelectionChange" @filter-change="filterChange" > + - + + + + + + + + + + + + + + + + + @@ -447,16 +499,26 @@ - - + + - - + + @@ -466,16 +528,26 @@ - - + + - + - - + + @@ -499,21 +571,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 +617,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 +683,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 +756,7 @@ export default { this.getAllVersionList(); this.getMaterialGroup(); this.getList(); + this.getJobVersionInfo(); // this.getCurrentMonthFirst(); // this.getCurrentMonthLast(); }, @@ -713,6 +803,98 @@ export default { }, }, methods: { + handleSelectionChange(val) { + this.multipleSelection = val; + }, + //批量删除 + handleDelete(row) { + if (this.multipleSelection.length == 0) { + this.$message({ + message: "至少选择一行！", + type: "warning", + }); + return; + } + var params = []; + let myalert = ""; //声明变量，其变量必须在此声明后使用 + if (row) { + //单行 + params.push(row.id); + myalert = row.name; + } else { + //多选 + this.multipleSelection.forEach((element) => { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/Job/delete", params) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, + 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 +903,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 +963,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 +977,8 @@ export default { this.datetime5 = []; this.startTime = ""; this.endTime = ""; - // this.datetime7 = []; + this.cp5startTime = ""; + this.cp5endTime = ""; }, save() { this.$refs.formCount.validate((valid) => { @@ -797,21 +989,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 +1011,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 +1050,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 +1169,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..7d837232 100644 --- a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue @@ -5,6 +5,12 @@
+ 统计 + 删除(支持批量)
@@ -54,8 +68,10 @@ highlight-current-row style="width: 100%" @row-click="handleRowClick" + @selection-change="handleSelectionChange" @filter-change="filterChange" > + - + + + + + + + + + + + + + + + + + @@ -448,7 +500,12 @@ - + @@ -456,7 +513,12 @@ - + @@ -465,19 +527,29 @@ - + - + - +
@@ -499,16 +571,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 +586,7 @@ export default { { required: true, message: "必须输入！", trigger: "change" }, ], }, + getmaterialGroupValue: "", pickerOptionsCp5: { disabledDate: (time) => { let now = new Date(); @@ -546,6 +614,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 +644,7 @@ export default { }, datetime5: [], checkedCities: [0], - cities: cityOptions, + JobVersionList: [], selectValue: "", selectNameValue: "", radio: "0", //结算状态：0未结 1部分结算 @@ -600,14 +681,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 +711,7 @@ export default { materialGroup: undefined, begin: undefined, end: undefined, + sapCode: undefined, }, listQuery: { taskId: "", @@ -672,6 +755,7 @@ export default { this.getAllVersionList(); this.getMaterialGroup(); this.getList(); + this.getJobVersionInfo(); }, beforeDestroy() { clearInterval(this.timer); @@ -681,7 +765,11 @@ export default { /* 主表头 */ getDefaultField() { var tempsTabs = []; - + tempsTabs.push({ + label: "版本号", + prop: "type", + width: 85, + }); tempsTabs.push({ label: "单据流水号", prop: "taskId", @@ -702,10 +790,106 @@ export default { prop: "createdAt", width: 150, }); + tempsTabs.push({ + label: "说明", + prop: "remark", + width: 220, + }); return tempsTabs; }, }, methods: { + handleSelectionChange(val) { + this.multipleSelection = val; + }, + //批量删除 + handleDelete(row) { + if (this.multipleSelection.length == 0) { + this.$message({ + message: "至少选择一行！", + type: "warning", + }); + return; + } + var params = []; + let myalert = ""; //声明变量，其变量必须在此声明后使用 + if (row) { + //单行 + params.push(row.id); + myalert = row.name; + } else { + //多选 + this.multipleSelection.forEach((element) => { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/Job/delete", params) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, + 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; this.getbalanceIndexData(); @@ -715,6 +899,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 +959,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 +973,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 +996,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 +1017,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 +1056,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 +1176,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) => { diff --git a/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue b/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue index 688da86d..5fa2d4c3 100644 --- a/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue +++ b/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue @@ -20,6 +20,14 @@ @click="handleCreate" >统计 + 删除(支持批量)
@@ -61,8 +69,10 @@ highlight-current-row style="width: 100%" @row-click="handleRowClick" + @selection-change="handleSelectionChange" @filter-change="filterChange" > + - + + + + + + + + + + + + + + + + + + @@ -620,7 +664,7 @@ export default { materialGroup: undefined, begin: undefined, end: undefined, - sapCode:undefined + sapCode: undefined, }, listQuery: { taskId: "", @@ -717,6 +761,58 @@ export default { }, }, methods: { + handleSelectionChange(val) { + this.multipleSelection = val; + }, + //批量删除 + handleDelete(row) { + if (this.multipleSelection.length == 0) { + this.$message({ + message: "至少选择一行！", + type: "warning", + }); + return; + } + var params = []; + let myalert = ""; //声明变量，其变量必须在此声明后使用 + if (row) { + //单行 + params.push(row.id); + myalert = row.name; + } else { + //多选 + this.multipleSelection.forEach((element) => { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/Job/delete", params) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, valueChange(data) { this.getmaterialGroupValue = ""; this.getmaterialGroupValue += data + ","; @@ -839,25 +935,29 @@ export default { this.listExportQuery.materialCode = this.formCount.materialCode; //物料号 } if (this.formCount.sapMaterialCode != "") { - this.listExportQuery.sapCode = - this.formCount.sapMaterialCode; //厂内物料号 + this.listExportQuery.sapCode = this.formCount.sapMaterialCode; //厂内物料号 } if (this.formCount.kennCode != "") { this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号 } //CP5 - 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; - } + // 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.startTime + ? this.startTime + : undefined; + this.listExportQuery.end = this.endTime ? this.endTime : undefined; if (this.formCount.chassisNumber != "") { this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号 } diff --git a/vue/src/views/ux/billManage/UnSettledDiff/index.vue b/vue/src/views/ux/billManage/UnSettledDiff/index.vue index 5a7bf4f0..fc2a3da1 100644 --- a/vue/src/views/ux/billManage/UnSettledDiff/index.vue +++ b/vue/src/views/ux/billManage/UnSettledDiff/index.vue @@ -19,6 +19,14 @@ @click="handleCreate" >统计 + 删除(支持批量) @@ -59,9 +67,11 @@ border highlight-current-row style="width: 100%" + @selection-change="handleSelectionChange" @row-click="handleRowClick" @filter-change="filterChange" > + - + + + + + + + + + + + + + + + + + @@ -716,6 +759,58 @@ export default { }, }, methods: { + handleSelectionChange(val) { + this.multipleSelection = val; + }, + //批量删除 + handleDelete(row) { + if (this.multipleSelection.length == 0) { + this.$message({ + message: "至少选择一行！", + type: "warning", + }); + return; + } + var params = []; + let myalert = ""; //声明变量，其变量必须在此声明后使用 + if (row) { + //单行 + params.push(row.id); + myalert = row.name; + } else { + //多选 + this.multipleSelection.forEach((element) => { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/Job/delete", params) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, valueChange(data) { this.getmaterialGroupValue = ""; this.getmaterialGroupValue += data + ","; @@ -843,18 +938,22 @@ export default { 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; - } + // 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; + // } + 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; //底盘号 } diff --git a/vue/src/views/ux/billManage/kanBanWithCode/index.vue b/vue/src/views/ux/billManage/kanBanWithCode/index.vue index 86b3e803..9e0f12b1 100644 --- a/vue/src/views/ux/billManage/kanBanWithCode/index.vue +++ b/vue/src/views/ux/billManage/kanBanWithCode/index.vue @@ -5,6 +5,12 @@
+ 统计 + 删除(支持批量) + 生成出库单(支持批量)
@@ -54,8 +76,10 @@ highlight-current-row style="width: 100%" @row-click="handleRowClick" + @selection-change="handleSelectionChange" @filter-change="filterChange" > + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + +
+ 统计 + 删除(支持批量) + 生成出库单(支持批量)
@@ -54,8 +76,10 @@ highlight-current-row style="width: 100%" @row-click="handleRowClick" + @selection-change="handleSelectionChange" @filter-change="filterChange" > + { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/Job/delete", params) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, + //出库单 + handleCreateBills(row) { + if (this.multipleSelection.length == 0) { + this.$message({ + message: "至少选择一行！", + type: "warning", + }); + return; + } + var params = []; + let myalert = ""; //声明变量，其变量必须在此声明后使用 + if (row) { + //单行 + params.push(row.id); + myalert = row.name; + } else { + //多选 + this.multipleSelection.forEach((element) => { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.$confirm("是否确认出库" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/wms/WmsJitOutPut", params) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "生成成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, + 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; this.getbalanceIndexData(); @@ -832,8 +1001,7 @@ export default { this.formCount.materialGroupValue; //物料组车型 } console.log( - "大众备件结算核对-导出条件：" + - JSON.stringify(this.listExportQuery) + "大众备件结算核对-导出条件：" + JSON.stringify(this.listExportQuery) ); this.$axios .gets( diff --git a/vue/static/config.js b/vue/static/config.js index 92b67e09..448019ab 100644 --- a/vue/static/config.js +++ b/vue/static/config.js @@ -2,8 +2,8 @@ let configJSON if (process.env.NODE_ENV === 'development') { configJSON = { base: { - - ip: 'http://192.168.0.140', + ip: 'http://192.168.0.63', + //ip: 'http://192.168.0.140', //ip: 'http://149.223.116.5', auth_port: '8066', public_port: '8092', @@ -36,8 +36,9 @@ if (process.env.NODE_ENV === 'development') { // 发布环境 configJSON = { base: { - ip: 'http://192.168.0.140', - //ip: 'http://192.168.0.62', + + ip: 'http://192.168.0.63', + //ip: 'http://192.168.0.140', //ip: 'http://149.223.116.5', //ip: 'http://114.116.225.148', //ip: 'http://10.123.148.162',