From cbaebb9a3a14e4d3f368133df4305892da0ba3d1 Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Tue, 15 Feb 2022 14:50:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E4=BB=BB=E5=8A=A1=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E8=AF=B4=E6=98=8E=E5=8A=A0=E4=B8=8A=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD=E5=92=8C=E6=89=80=E6=9C=89?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=B8=AD=E5=A4=87=E6=B3=A8=E4=B9=9F=E6=98=AF?= =?UTF-8?q?=E4=B8=80=E6=A0=B7=E5=8A=A0=E4=B8=8A=E7=BC=96=E8=BE=91=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/components/ImportExcel-base/index.vue | 10 +- vue/src/router/modules/vw_menu.js | 20 +- .../InvoiceSettledDetailDiff/index.vue | 278 ++++++------------ .../billManage/InvoiceSettledDiff/index.vue | 266 ++++++----------- .../ux/billManage/IssuedUnsettled/index.vue | 269 +++++++---------- .../ux/billManage/KanbanUnSettled/index.vue | 123 +++++--- .../ux/billManage/SettleDoorPanel/index.vue | 8 +- .../UnInvoiceSettledDetailDiff/index.vue | 276 ++++++----------- .../billManage/UnSettleDiffExport/index.vue | 265 ++++++----------- .../ux/billManage/UnSettledDiff/index.vue | 11 +- .../ux/billManage/kanBanWithCode/index.vue | 119 ++++++-- .../ux/billManage/kanBanWithOutCode/index.vue | 4 +- .../ux/billManage/kanbanOutOrder/index.vue | 94 +++++- .../billManage/kanbanWithOutOrder/index.vue | 104 ++++++- .../views/ux/billManage/sparePart/index.vue | 268 ++++++----------- .../views/ux/billManage/sparePart90/index.vue | 268 ++++++----------- .../billManage/sparepartOutOrder/detail.vue | 5 + .../ux/billManage/sparepartOutOrder/index.vue | 100 ++++++- .../billManage/sparepartOutOrder90/index.vue | 100 ++++++- .../views/ux/billManage/vwOutOrder/index.vue | 97 +++++- .../ux/vw/dataInput/hq_f_outorder/index.vue | 101 ++++++- .../hq_f_outorder_chickout/index.vue | 100 ++++++- .../ux/vw/dataInput/hq_f_report/index.vue | 138 +++++++-- .../ux/vw/dataInput/hq_f_sparepart/index.vue | 154 +++++++--- .../ux/vw/dataInput/hq_h_checkout/index.vue | 101 ++++++- .../ux/vw/dataInput/hq_h_outorder/index.vue | 101 ++++++- .../ux/vw/dataInput/hq_h_report/index.vue | 144 +++++++-- .../ux/vw/dataInput/hq_h_sparepart/index.vue | 142 +++++++-- .../ux/vw/dataInput/hq_kb_output/detail.vue | 34 +-- .../ux/vw/dataInput/hq_kb_output/index.vue | 96 +++++- .../ux/vw/dataInput/hq_m_checkout/index.vue | 101 ++++++- .../ux/vw/dataInput/hq_m_outorder/index.vue | 100 ++++++- .../ux/vw/dataInput/hq_m_report/index.vue | 137 +++++++-- .../ux/vw/dataInput/hq_m_sparepart/index.vue | 138 +++++++-- .../ux/vw/dataInput/hq_y_checkout/index.vue | 101 ++++++- .../ux/vw/dataInput/hq_y_outorder/index.vue | 101 ++++++- .../ux/vw/dataInput/hq_y_report/index.vue | 149 ++++++++-- .../ux/vw/dataInput/hq_y_sparepart/index.vue | 20 +- 38 files changed, 3048 insertions(+), 1595 deletions(-) diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue index b1243eb4..d13d468b 100644 --- a/vue/src/components/ImportExcel-base/index.vue +++ b/vue/src/components/ImportExcel-base/index.vue @@ -394,7 +394,7 @@ export default { HQ_H_CHECKOUT: "/api/settleaccount/WmsHQHSharePartoutput/ExcelImport", //H平台备件出库单导入 HQ_M_CHECKOUT: "/api/settleaccount/WmsHQMSharePartoutput/ExcelImport", //M平台备件出库单导入 Wms_HqKB_Output: - "/api/settleaccount/WmsHQMSharePartoutput/ExcelImport", //红旗数据调整导入 + "/api/settleaccount/WmsHQKBOutput/ExcelImport", //红旗数据调整导入 //HQ_Y_CHECKOUT: "/api/settleaccount//ExcelImport", //一汽轿车平台备件出库单导入 }[this.crmType] || "" ); @@ -533,9 +533,11 @@ export default { }, //执行按钮 sureClick() { - if (this.versionValue == "") { - this.$message.error("必须选择版本!"); - return false; + if (this.crmType != "priceList" && this.crmType != "spareparts") { + if (this.versionValue == "") { + this.$message.error("必须选择版本!"); + return false; + } } if ( this.fileuploadList === [] || diff --git a/vue/src/router/modules/vw_menu.js b/vue/src/router/modules/vw_menu.js index 4c6b8a0b..fe56893b 100644 --- a/vue/src/router/modules/vw_menu.js +++ b/vue/src/router/modules/vw_menu.js @@ -167,16 +167,16 @@ const vwMenudataRouter = { icon: '看板' } }, - { - path: '/kbunsettle', - component: () => import('@/views/ux/billManage/KanbanUnSettled'), - name: 'KanbanUnSettled',//命名路由 - meta: { - title: '看板未结输出', - roles: ['SettleAccount.Reports'],//控制页面角色(可以设置多个角色) - icon: '看板' - } - }, + // { + // path: '/kbunsettle', + // component: () => import('@/views/ux/billManage/KanbanUnSettled'), + // name: 'KanbanUnSettled',//命名路由 + // meta: { + // title: '看板未结输出', + // roles: ['SettleAccount.Reports'],//控制页面角色(可以设置多个角色) + // icon: '看板' + // } + // }, // { // path: '/kbwithoutcode', // component: () => import('@/views/ux/billManage/kanBanWithOutCode'), diff --git a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue index 7925ae0c..bfeae6fa 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue @@ -88,6 +88,7 @@ @row-click="handleRowClick" @selection-change="handleSelectionChange" @filter-change="filterChange" + @cell-dblclick="dblhandleCurrentChange" > - - + - - - {{ item.label }} - - + + {{ scope.row.remark }} + + + cancel + - --> + - - - - - - - - - - - - - - - {{ item.title }} - - - - - - - - - - - - - - 当前状态:等待执行 - - - 当前状态:执行中... - - - - - 执行结果:执行成功 - - - 执行结果:执行失败 - - - - - - {{ - form.name - }} - {{ - form.actionName - }} - - - {{ - form.creator - }} - - - - - - - 下载错误数据 - - - 下载生成数据 - - - - - - - - - - - - - - - - - { + //自动获取焦点 element组件autofocus失效 + //this.$refs.inputRef.focus(); + this.$refs["inputRef"].focus(); + }); + } + this.list = this.list.filter((item) => { + return item; + }); + }, + // 可以编辑框失去焦点 + cellBlur(row, column) { + row.isEditCell = false; + this.$set(row, "isEditCell", false); + }, + // 在线编辑中提交 + submitName(row) { + let getguid = row.id; + let getremark = row.remark; + this.$axios + .gets("/api/settleaccount/Job/updateRemark", { + p_id: getguid, + remark: getremark, + }) + .then((response) => { + if (response == true) { + this.$notify({ + title: "成功", + message: "更新成功", + type: "success", + duration: 2000, + }); + this.getList(); + } + }) + .catch(() => { + this.listLoading = false; + }); + }, + // 取消 + handleCancel(row) { + row.isEditCell = false; + this.$set(row, "isEditCell", false); + this.getList(); + }, + handleSelectionChange(val) { + this.multipleSelection = val; + }, sortChange(data) { const { prop, order } = data; if (!prop || !order) { @@ -1311,21 +1223,21 @@ export default { }, getdateValue(val) { this.startTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, getdateVal(val) { this.endTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, //cp5 getdateValueCp5(val) { this.cp5startTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, getdateValCp5(val) { this.cp5endTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, getCurrentMonthFirst() { var date = new Date(); @@ -1622,6 +1534,10 @@ export default { .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { this.list = response; + //动态加一个是否编辑的标识 + this.list.forEach((element) => { + element["isEditCell"] = false; + }); setTimeout(() => { //大数据量加载时 this.listLoading = false; diff --git a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue index 3d000416..c6146c41 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue @@ -70,6 +70,7 @@ style="width: 100%" @row-click="handleRowClick" @filter-change="filterChange" + @cell-dblclick="dblhandleCurrentChange" > - - + + - - - {{ item.label }} - - + + {{ scope.row.remark }} + + + cancel + + - - - - - - - - - - - - - - - {{ item.title }} - - - - - - - - - - - - - - 当前状态:等待执行 - - - 当前状态:执行中... - - - - - 执行结果:执行成功 - - - 执行结果:执行失败 - - - - - - {{ - form.name - }} - {{ - form.actionName - }} - - - {{ - form.creator - }} - - - - - - - 下载错误数据 - - - 下载生成数据 - - - - - - - - - - - - - - - - - { + //自动获取焦点 element组件autofocus失效 + //this.$refs.inputRef.focus(); + this.$refs["inputRef"].focus(); + }); + } + this.list = this.list.filter((item) => { + return item; + }); + }, + // 可以编辑框失去焦点 + cellBlur(row, column) { + row.isEditCell = false; + this.$set(row, "isEditCell", false); + }, + // 在线编辑中提交 + submitName(row) { + let getguid = row.id; + let getremark = row.remark; + this.$axios + .gets("/api/settleaccount/Job/updateRemark", { + p_id: getguid, + remark: getremark, + }) + .then((response) => { + if (response == true) { + this.$notify({ + title: "成功", + message: "更新成功", + type: "success", + duration: 2000, + }); + this.getList(); + } + }) + .catch(() => { + this.listLoading = false; + }); + }, + // 取消 + handleCancel(row) { + row.isEditCell = false; + this.$set(row, "isEditCell", false); + this.getList(); + }, handleSelectionChange(val) { this.multipleSelection = val; }, @@ -755,11 +661,11 @@ export default { }, getdateValue(val) { this.startTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, getdateVal(val) { this.endTime = val; - this.getbalanceIndexData(); + //his.getbalanceIndexData(); }, getCurrentMonthFirst() { @@ -995,6 +901,10 @@ export default { .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { this.list = response; + //动态加一个是否编辑的标识 + this.list.forEach((element) => { + element["isEditCell"] = false; + }); setTimeout(() => { //大数据量加载时 this.listLoading = false; diff --git a/vue/src/views/ux/billManage/IssuedUnsettled/index.vue b/vue/src/views/ux/billManage/IssuedUnsettled/index.vue index 7b1db815..256471aa 100644 --- a/vue/src/views/ux/billManage/IssuedUnsettled/index.vue +++ b/vue/src/views/ux/billManage/IssuedUnsettled/index.vue @@ -70,6 +70,7 @@ @row-click="handleRowClick" @selection-change="handleSelectionChange" @filter-change="filterChange" + @cell-dblclick="dblhandleCurrentChange" > + + + + {{ scope.row.remark }} + + + cancel + + + + - - + --> - - - - - - - - - - - - - - - {{ item.title }} - - - - - - - - - - - - - - 当前状态:等待执行 - - - 当前状态:执行中... - - - - - 执行结果:执行成功 - - - 执行结果:执行失败 - - - - - - {{ - form.name - }} - {{ - form.actionName - }} - - - {{ - form.creator - }} - - - - - - - 下载错误数据 - - - 下载生成数据 - - - - - - - - - - - - - - - - - { + //自动获取焦点 element组件autofocus失效 + //this.$refs.inputRef.focus(); + this.$refs["inputRef"].focus(); + }); + } + this.list = this.list.filter((item) => { + return item; + }); + }, + // 可以编辑框失去焦点 + cellBlur(row, column) { + row.isEditCell = false; + this.$set(row, "isEditCell", false); + }, + // 在线编辑中提交 + submitName(row) { + let getguid = row.id; + let getremark = row.remark; + this.$axios + .gets("/api/settleaccount/Job/updateRemark", { + p_id: getguid, + remark: getremark, + }) + .then((response) => { + if (response == true) { + this.$notify({ + title: "成功", + message: "更新成功", + type: "success", + duration: 2000, + }); + this.getList(); + } + }) + .catch(() => { + this.listLoading = false; + }); + }, + // 取消 + handleCancel(row) { + row.isEditCell = false; + //row.stockQty = row.originalstockQty; + this.$set(row, "isEditCell", false); + // this.$message({ + // message: "取消后,恢复当前原值!", + // type: "warning", + // }); + this.getList(); + }, handleSelectionChange(val) { this.multipleSelection = val; }, @@ -825,8 +766,9 @@ export default { this.$axios .posts("/api/settleaccount/Job/versionlist", this.listQuery) .then((response) => { + let res = response.reverse(); //降序排列 this.JobVersionList = []; - response.forEach((element) => { + res.forEach((element, index) => { let options = {}; options.value = element; options.label = element; @@ -853,11 +795,11 @@ export default { }, getdateValue(val) { this.startTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, getdateVal(val) { this.endTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, getCurrentMonthFirst() { @@ -994,9 +936,12 @@ export default { }); }, handleCreate() { - this.$nextTick(() => { + // this.$nextTick(() => { + // this.$refs["formCount"].resetFields(); + // }); + if (this.$refs["formCount"] !== undefined) { this.$refs["formCount"].resetFields(); - }); + } this.formTitle = "报表统计"; this.isEdit = false; this.form = {}; @@ -1124,6 +1069,10 @@ export default { .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { this.list = response; + //动态加一个是否编辑的标识 + this.list.forEach((element) => { + element["isEditCell"] = false; + }); setTimeout(() => { //大数据量加载时 this.listLoading = false; diff --git a/vue/src/views/ux/billManage/KanbanUnSettled/index.vue b/vue/src/views/ux/billManage/KanbanUnSettled/index.vue index 1bc667e9..a459d395 100644 --- a/vue/src/views/ux/billManage/KanbanUnSettled/index.vue +++ b/vue/src/views/ux/billManage/KanbanUnSettled/index.vue @@ -70,6 +70,7 @@ @row-click="handleRowClick" @selection-change="handleSelectionChange" @filter-change="filterChange" + @cell-dblclick="dblhandleCurrentChange" > - - + - - - {{ item.label }} - - + + {{ scope.row.remark }} + + + cancel + - --> + + { + //自动获取焦点 element组件autofocus失效 + //this.$refs.inputRef.focus(); + this.$refs["inputRef"].focus(); + }); + } + this.list = this.list.filter((item) => { + return item; + }); + }, + // 可以编辑框失去焦点 + cellBlur(row, column) { + row.isEditCell = false; + this.$set(row, "isEditCell", false); + }, + // 在线编辑中提交 + submitName(row) { + let getguid = row.id; + let getremark = row.remark; + this.$axios + .gets("/api/settleaccount/Job/updateRemark", { + p_id: getguid, + remark: getremark, + }) + .then((response) => { + if (response == true) { + this.$notify({ + title: "成功", + message: "更新成功", + type: "success", + duration: 2000, + }); + this.getList(); + } + }) + .catch(() => { + this.listLoading = false; + }); + }, + // 取消 + handleCancel(row) { + row.isEditCell = false; + this.$set(row, "isEditCell", false); + this.getList(); + }, handleSelectionChange(val) { this.multipleSelection = val; }, @@ -739,11 +793,11 @@ export default { }, getdateValue(val) { this.startTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, getdateVal(val) { this.endTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, getCurrentMonthFirst() { @@ -836,8 +890,7 @@ export default { : undefined; this.listExportQuery.end = this.endTime ? this.endTime : undefined; console.log( - "大众看板未结明细-导出条件:" + - JSON.stringify(this.listExportQuery) + "大众看板未结明细-导出条件:" + JSON.stringify(this.listExportQuery) ); this.$axios .posts( @@ -994,6 +1047,10 @@ export default { .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { this.list = response; + //动态加一个是否编辑的标识 + this.list.forEach((element) => { + element["isEditCell"] = false; + }); setTimeout(() => { //大数据量加载时 this.listLoading = false; diff --git a/vue/src/views/ux/billManage/SettleDoorPanel/index.vue b/vue/src/views/ux/billManage/SettleDoorPanel/index.vue index 00000723..6777519a 100644 --- a/vue/src/views/ux/billManage/SettleDoorPanel/index.vue +++ b/vue/src/views/ux/billManage/SettleDoorPanel/index.vue @@ -897,20 +897,20 @@ export default { //cp7 getdateValue(val) { this.startTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, getdateVal(val) { this.endTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, //cp5 getdateValueCp5(val) { this.cp5startTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, getdateValCp5(val) { this.cp5endTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, getCurrentMonthFirst() { diff --git a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue index 3d45d141..cf1c722b 100644 --- a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue @@ -70,6 +70,7 @@ @row-click="handleRowClick" @selection-change="handleSelectionChange" @filter-change="filterChange" + @cell-dblclick="dblhandleCurrentChange" > - - + + - - - {{ item.label }} - - + + {{ scope.row.remark }} + + + cancel + @@ -193,154 +201,6 @@ /> - - - - - - - - - - - - - - - {{ item.title }} - - - - - - - - - - - - - - 当前状态:等待执行 - - - 当前状态:执行中... - - - - - 执行结果:执行成功 - - - 执行结果:执行失败 - - - - - - {{ - form.name - }} - {{ - form.actionName - }} - - - {{ - form.creator - }} - - - - - - - 下载错误数据 - - - 下载生成数据 - - - - - - - - - - - - - - - - - { + //自动获取焦点 element组件autofocus失效 + //this.$refs.inputRef.focus(); + this.$refs["inputRef"].focus(); + }); + } + this.list = this.list.filter((item) => { + return item; + }); + }, + // 可以编辑框失去焦点 + cellBlur(row, column) { + row.isEditCell = false; + this.$set(row, "isEditCell", false); + }, + // 在线编辑中提交 + submitName(row) { + let getguid = row.id; + let getremark = row.remark; + this.$axios + .gets("/api/settleaccount/Job/updateRemark", { + p_id: getguid, + remark: getremark, + }) + .then((response) => { + if (response == true) { + this.$notify({ + title: "成功", + message: "更新成功", + type: "success", + duration: 2000, + }); + this.getList(); + } + }) + .catch(() => { + this.listLoading = false; + }); + }, + // 取消 + handleCancel(row) { + row.isEditCell = false; + this.$set(row, "isEditCell", false); + this.getList(); + }, handleSelectionChange(val) { this.multipleSelection = val; }, @@ -896,21 +801,21 @@ export default { }, getdateValue(val) { this.startTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, getdateVal(val) { this.endTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, //cp5 getdateValueCp5(val) { this.cp5startTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, getdateValCp5(val) { this.cp5endTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, getCurrentMonthFirst() { @@ -1055,9 +960,12 @@ export default { }); }, handleCreate() { - this.$nextTick(() => { + // this.$nextTick(() => { + // this.$refs["formCount"].resetFields(); + // }); + if (this.$refs["formCount"] !== undefined) { this.$refs["formCount"].resetFields(); - }); + } this.formTitle = "报表统计"; this.isEdit = false; this.form = {}; @@ -1187,6 +1095,10 @@ export default { .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { this.list = response; + //动态加一个是否编辑的标识 + this.list.forEach((element) => { + element["isEditCell"] = false; + }); setTimeout(() => { //大数据量加载时 this.listLoading = false; diff --git a/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue b/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue index 3d4474cd..a954258a 100644 --- a/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue +++ b/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue @@ -71,6 +71,7 @@ @row-click="handleRowClick" @selection-change="handleSelectionChange" @filter-change="filterChange" + @cell-dblclick="dblhandleCurrentChange" > - - + + - - - {{ item.label }} - - + + {{ scope.row.remark }} + + + cancel + @@ -194,154 +202,6 @@ /> - - - - - - - - - - - - - - - {{ item.title }} - - - - - - - - - - - - - - 当前状态:等待执行 - - - 当前状态:执行中... - - - - - 执行结果:执行成功 - - - 执行结果:执行失败 - - - - - - {{ - form.name - }} - {{ - form.actionName - }} - - - {{ - form.creator - }} - - - - - - - 下载错误数据 - - - 下载生成数据 - - - - - - - - - - - - - - - - - { + //自动获取焦点 element组件autofocus失效 + //this.$refs.inputRef.focus(); + this.$refs["inputRef"].focus(); + }); + } + this.list = this.list.filter((item) => { + return item; + }); + }, + // 可以编辑框失去焦点 + cellBlur(row, column) { + row.isEditCell = false; + this.$set(row, "isEditCell", false); + }, + // 在线编辑中提交 + submitName(row) { + let getguid = row.id; + let getremark = row.remark; + this.$axios + .gets("/api/settleaccount/Job/updateRemark", { + p_id: getguid, + remark: getremark, + }) + .then((response) => { + if (response == true) { + this.$notify({ + title: "成功", + message: "更新成功", + type: "success", + duration: 2000, + }); + this.getList(); + } + }) + .catch(() => { + this.listLoading = false; + }); + }, + // 取消 + handleCancel(row) { + row.isEditCell = false; + this.$set(row, "isEditCell", false); + this.getList(); + }, handleSelectionChange(val) { this.multipleSelection = val; }, @@ -862,11 +767,11 @@ export default { }, getdateValue(val) { this.startTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, getdateVal(val) { this.endTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, getCurrentMonthFirst() { @@ -1138,6 +1043,10 @@ export default { .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { this.list = response; + //动态加一个是否编辑的标识 + this.list.forEach((element) => { + element["isEditCell"] = false; + }); setTimeout(() => { //大数据量加载时 this.listLoading = false; diff --git a/vue/src/views/ux/billManage/UnSettledDiff/index.vue b/vue/src/views/ux/billManage/UnSettledDiff/index.vue index 5f64fd79..b6a1fc09 100644 --- a/vue/src/views/ux/billManage/UnSettledDiff/index.vue +++ b/vue/src/views/ux/billManage/UnSettledDiff/index.vue @@ -852,11 +852,11 @@ export default { }, getdateValue(val) { this.startTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, getdateVal(val) { this.endTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, getCurrentMonthFirst() { @@ -992,9 +992,12 @@ export default { }); }, handleCreate() { - this.$nextTick(() => { + // this.$nextTick(() => { + // this.$refs["formCount"].resetFields(); + // }); + if (this.$refs["formCount"] !== undefined) { this.$refs["formCount"].resetFields(); - }); + } this.formTitle = "报表统计"; this.isEdit = false; this.form = {}; diff --git a/vue/src/views/ux/billManage/kanBanWithCode/index.vue b/vue/src/views/ux/billManage/kanBanWithCode/index.vue index 484b1dcd..634b0b43 100644 --- a/vue/src/views/ux/billManage/kanBanWithCode/index.vue +++ b/vue/src/views/ux/billManage/kanBanWithCode/index.vue @@ -87,6 +87,7 @@ @row-click="handleRowClick" @selection-change="handleSelectionChange" @filter-change="filterChange" + @cell-dblclick="dblhandleCurrentChange" > - - + - - - {{ item.label }} - - + + {{ scope.row.remark }} + + + cancel + - --> + { + //自动获取焦点 element组件autofocus失效 + //this.$refs.inputRef.focus(); + this.$refs["inputRef"].focus(); + }); + } + this.list = this.list.filter((item) => { + return item; + }); + }, + // 可以编辑框失去焦点 + cellBlur(row, column) { + row.isEditCell = false; + this.$set(row, "isEditCell", false); + }, + // 在线编辑中提交 + submitName(row) { + let getguid = row.id; + let getremark = row.remark; + this.$axios + .gets("/api/settleaccount/Job/updateRemark", { + p_id: getguid, + remark: getremark, + }) + .then((response) => { + if (response == true) { + this.$notify({ + title: "成功", + message: "更新成功", + type: "success", + duration: 2000, + }); + this.getList(); + } + }) + .catch(() => { + this.listLoading = false; + }); + }, + // 取消 + handleCancel(row) { + row.isEditCell = false; + this.$set(row, "isEditCell", false); + this.getList(); + }, handleSelectionChange(val) { this.multipleSelection = val; }, @@ -1073,11 +1126,11 @@ export default { }, getdateValue(val) { this.startTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, getdateVal(val) { this.endTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, getCurrentMonthFirst() { @@ -1329,6 +1382,10 @@ export default { .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { this.list = response; + //动态加一个是否编辑的标识 + this.list.forEach((element) => { + element["isEditCell"] = false; + }); setTimeout(() => { //大数据量加载时 this.listLoading = false; diff --git a/vue/src/views/ux/billManage/kanBanWithOutCode/index.vue b/vue/src/views/ux/billManage/kanBanWithOutCode/index.vue index f53e6021..e5859f16 100644 --- a/vue/src/views/ux/billManage/kanBanWithOutCode/index.vue +++ b/vue/src/views/ux/billManage/kanBanWithOutCode/index.vue @@ -1073,11 +1073,11 @@ export default { }, getdateValue(val) { this.startTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, getdateVal(val) { this.endTime = val; - this.getbalanceIndexData(); + //this.getbalanceIndexData(); }, getCurrentMonthFirst() { diff --git a/vue/src/views/ux/billManage/kanbanOutOrder/index.vue b/vue/src/views/ux/billManage/kanbanOutOrder/index.vue index 6d4b1156..adef60cf 100644 --- a/vue/src/views/ux/billManage/kanbanOutOrder/index.vue +++ b/vue/src/views/ux/billManage/kanbanOutOrder/index.vue @@ -45,6 +45,7 @@ @sort-change="sortChange" @selection-change="handleSelectionChange" @row-click="handleRowClick" + @cell-dblclick="dblhandleCurrentChange" > + + + + + {{ scope.row.remark }} + + + cancel + + + - - - - - - - - - - - - - - - {{ item.title }} - - - - - - - - - - - - - - 当前状态:等待执行 - - - 当前状态:执行中... - - - - - 执行结果:执行成功 - - - 执行结果:执行失败 - - - - - - {{ - form.name - }} - {{ - form.actionName - }} - - - {{ - form.creator - }} - - - - - - - 下载错误数据 - - - 下载生成数据 - - - - - - - - - - - - - - - - - { + //自动获取焦点 element组件autofocus失效 + //this.$refs.inputRef.focus(); + this.$refs["inputRef"].focus(); + }); + } + this.list = this.list.filter((item) => { + return item; + }); + }, + // 可以编辑框失去焦点 + cellBlur(row, column) { + row.isEditCell = false; + this.$set(row, "isEditCell", false); + }, + // 在线编辑中提交 + submitName(row) { + let getguid = row.id; + let getremark = row.remark; + this.$axios + .gets("/api/settleaccount/Job/updateRemark", { + p_id: getguid, + remark: getremark, + }) + .then((response) => { + if (response == true) { + this.$notify({ + title: "成功", + message: "更新成功", + type: "success", + duration: 2000, + }); + this.getList(); + } + }) + .catch(() => { + this.listLoading = false; + }); + }, + // 取消 + handleCancel(row) { + row.isEditCell = false; + //row.stockQty = row.originalstockQty; + this.$set(row, "isEditCell", false); + // this.$message({ + // message: "取消后,恢复当前原值!", + // type: "warning", + // }); + this.getList(); + }, //cp5 getdateValueCp5(val) { this.cp5startTime = val; @@ -1301,6 +1211,10 @@ export default { .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { this.list = response; + //动态加一个是否编辑的标识 + this.list.forEach((element) => { + element["isEditCell"] = false; + }); setTimeout(() => { //大数据量加载时 this.listLoading = false; diff --git a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue index fd21a3f8..bc11413e 100644 --- a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue @@ -330,6 +330,11 @@ export default { prop: "materialCode", width: 150, }); + tempsTabs.push({ + label: "物料代码", + prop: "extend1", + width: 150, + }); tempsTabs.push({ label: "零件描述", prop: "materialDesc", width: 250 }); tempsTabs.push({ label: "寄售库存", prop: "stockQty", width: 100 }); tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 }); diff --git a/vue/src/views/ux/billManage/sparepartOutOrder/index.vue b/vue/src/views/ux/billManage/sparepartOutOrder/index.vue index 4563688b..d49d998d 100644 --- a/vue/src/views/ux/billManage/sparepartOutOrder/index.vue +++ b/vue/src/views/ux/billManage/sparepartOutOrder/index.vue @@ -45,6 +45,7 @@ @sort-change="sortChange" @selection-change="handleSelectionChange" @row-click="handleRowClick" + @cell-dblclick="dblhandleCurrentChange" > + + + + {{ scope.row.remark }} + + + cancel + + +
- -