From 73928a0ed0a92251c45c491908d6e6e0dfb95ac7 Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Fri, 15 Mar 2024 13:33:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=82=E5=8A=A1=E8=AE=A2=E5=8D=95=E9=87=8C?= =?UTF-8?q?=E6=94=B9=E4=B8=AA=E5=B7=A5=E5=8D=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/base/orderManage.js | 9 + .../base/energyQuantityManual/index.vue | 92 ++++----- .../energyType/components/energyTypeAdd.vue | 91 ++++----- .../components/groupTeamViewDetail.vue | 2 +- .../orderManage/components/addWorkOrder.vue | 179 ++++++++---------- 5 files changed, 151 insertions(+), 222 deletions(-) diff --git a/src/api/base/orderManage.js b/src/api/base/orderManage.js index 732e13c7..00174a7d 100644 --- a/src/api/base/orderManage.js +++ b/src/api/base/orderManage.js @@ -34,6 +34,15 @@ export function workOrderList(query) { }) } +// 条件获得工单列表 +export function getFreeWOlist(query) { + return request({ + url: '/base/core-work-order/getFreeWOlist', + method: 'get', + params: query + }) +} + // 获得订单分页 export function getOrderPage(query) { return request({ diff --git a/src/views/energy/base/energyQuantityManual/index.vue b/src/views/energy/base/energyQuantityManual/index.vue index 49f6329b..14dd96e6 100644 --- a/src/views/energy/base/energyQuantityManual/index.vue +++ b/src/views/energy/base/energyQuantityManual/index.vue @@ -2,44 +2,20 @@
- + - - + + - + - - + +
@@ -68,7 +44,7 @@ const tableProps = [ }, { prop: 'tableName', - label: '水/气表名', + label: '能源表名', filter: publicFormatter('table_name'), minWidth: 110 }, @@ -142,25 +118,25 @@ export default { // 班次基础信息列表 list: [], tableBtn: [ - this.$auth.hasPermi('base:energy-quantity-manual:create') + this.$auth.hasPermi('base:energy-quantity-manual:create') ? { - type: 'meterReading', - btnName: '抄表' - } + type: 'meterReading', + btnName: '抄表' + } : undefined, this.$auth.hasPermi('base:energy-quantity-manual:update') ? { - type: 'edit', - btnName: '编辑' - } + type: 'edit', + btnName: '编辑' + } : undefined, this.$auth.hasPermi('base:energy-quantity-manual:delete') ? { - type: 'delete', - btnName: '删除' - } + type: 'delete', + btnName: '删除' + } : undefined - ].filter((v)=>v), + ].filter((v) => v), // 查询参数 queryParams: { pageNo: 1, @@ -209,10 +185,10 @@ export default { break default: this.$modal.confirm('是否确认导出').then(() => { - return energyQuantityManualExport({...this.queryParams}); - }).then(response => { - this.$download.excel(response, '能源报表.xls'); - }).catch(() => {}) + return energyQuantityManualExport({ ...this.queryParams }); + }).then(response => { + this.$download.excel(response, '能源报表.xls'); + }).catch(() => { }) } }, /** 查询列表 */ @@ -281,13 +257,13 @@ export default { /** 删除按钮操作 */ handleDelete(row) { console.log(row.id) - this.$modal.confirm('是否确认删除能源类型为"' + row.energyType + '"的数据项?').then(function() { - return energyQuantityManualDelete({id: row.id}); - }).then(() => { - this.queryParams.pageNo = 1; - this.getList(); - this.$modal.msgSuccess("删除成功"); - }).catch(() => {}); + this.$modal.confirm('是否确认删除能源类型为"' + row.energyType + '"的数据项?').then(function () { + return energyQuantityManualDelete({ id: row.id }); + }).then(() => { + this.queryParams.pageNo = 1; + this.getList(); + this.$modal.msgSuccess("删除成功"); + }).catch(() => { }); } } }; diff --git a/src/views/energy/base/energyType/components/energyTypeAdd.vue b/src/views/energy/base/energyType/components/energyTypeAdd.vue index 1b808543..efe5b35a 100644 --- a/src/views/energy/base/energyType/components/energyTypeAdd.vue +++ b/src/views/energy/base/energyType/components/energyTypeAdd.vue @@ -16,10 +16,7 @@ - @@ -28,9 +25,9 @@ - - - + + + @@ -38,56 +35,33 @@ - + - - + + - + - - + + - - + + @@ -182,15 +156,15 @@ export default { if (id) { this.isEdit = true this.form.id = id - getEnergyType( id ).then((res) => { + getEnergyType(id).then((res) => { if (res.code === 0) { this.form.name = res.data.name this.form.code = res.data.code this.form.unit = res.data.unit this.form.pricingMethod = res.data.pricingMethod this.form.leaderName = res.data.leaderName - this.form.push = res.data.push ? true : false - switch(this.form.pricingMethod) { + this.form.push = res.data.push ? true : false + switch (this.form.pricingMethod) { case 0: this.tableData1 = res.data.segPriceList || [] break; @@ -198,6 +172,7 @@ export default { this.tableData2 = res.data.usedPriceList || [] break; default: + this.form.singlePrice = res.data.singlePrice || 0 } } }) @@ -234,7 +209,7 @@ export default { emitButtonClick1() { let n = this.tableData1.length let obj = {} - obj.startTime = n === 0 ? '' : this.tableData1[n-1].endTime + obj.startTime = n === 0 ? '' : this.tableData1[n - 1].endTime obj.endTime = '' obj.price = 0 this.tableData1.push(obj) @@ -242,7 +217,7 @@ export default { emitButtonClick2() { let n = this.tableData2.length let obj = {} - obj.startUsed = n === 0 ? 0 : this.tableData2[n-1].endUsed + obj.startUsed = n === 0 ? 0 : this.tableData2[n - 1].endUsed obj.endUsed = 0 obj.price = 0 this.tableData2.push(obj) @@ -259,7 +234,7 @@ export default { submitForm() { this.$refs['form'].validate((valid) => { if (valid) { - switch(this.form.pricingMethod) { + switch (this.form.pricingMethod) { case 0:// 时间段 if (this.tableData1.length === 0) { this.$modal.msgError('时间段表格数据不能为空') @@ -289,7 +264,7 @@ export default { default:// 固定单价 if (!this.form.singlePrice) { this.$modal.msgError('单价有误请检查，请检查') - return false + return false } } console.log(this.form) @@ -302,11 +277,11 @@ export default { unit: this.form.unit, pricingMethod: this.form.pricingMethod, description: this.form.description, - dim: this.form.pricingMethod === 1 ? this.form.dim: '', + dim: this.form.pricingMethod === 1 ? this.form.dim : '', singlePrice: this.form.pricingMethod === 2 ? this.form.singlePrice : '', - segPriceList: this.form.pricingMethod === 0 ? this.tableData1: [], - usedPriceList: this.form.pricingMethod === 1 ? this.tableData2: [], - push:this.form.push ? 1 : 0 + segPriceList: this.form.pricingMethod === 0 ? this.tableData1 : [], + usedPriceList: this.form.pricingMethod === 1 ? this.tableData2 : [], + push: this.form.push ? 1 : 0 }).then((res) => { if (res.code === 0) { this.$modal.msgSuccess("操作成功"); @@ -320,11 +295,11 @@ export default { unit: this.form.unit, pricingMethod: this.form.pricingMethod, description: this.form.description, - dim: this.form.pricingMethod === 1 ? this.form.dim: '', + dim: this.form.pricingMethod === 1 ? this.form.dim : '', singlePrice: this.form.pricingMethod === 2 ? this.form.singlePrice : '', - segPriceList: this.form.pricingMethod === 0 ? this.tableData1: [], - usedPriceList: this.form.pricingMethod === 1 ? this.tableData2: [], - push:this.form.push ? 1 : 0 + segPriceList: this.form.pricingMethod === 0 ? this.tableData1 : [], + usedPriceList: this.form.pricingMethod === 1 ? this.tableData2 : [], + push: this.form.push ? 1 : 0 }).then((res) => { if (res.code === 0) { this.$modal.msgSuccess("操作成功"); diff --git a/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue b/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue index 3e46b185..de22d382 100644 --- a/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue +++ b/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue @@ -1,6 +1,6 @@