From ac21fcaf46124a0483cec7777d018eefd167342a Mon Sep 17 00:00:00 2001 From: hejunjie Date: Tue, 11 Mar 2025 23:42:21 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AF=B9=E6=8E=A5=E7=8E=A9=E5=85=BB?= =?UTF-8?q?=E6=8A=A4=E5=92=8C=E7=BC=BA=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/dike/patrolMaintenance.js | 2 +- .../acceptanceRecords/index.vue | 5 +- .../componentsDetails/acceptanceDetails.vue | 396 ++++++++++++++++ .../componentsDetails/defectDetails.vue | 179 ++----- .../componentsDetails/maintenanceDetails.vue | 446 ++++++++++++++++++ .../patrolMaintenance/defectList/index.vue | 23 +- .../maintenanceRecords/index.vue | 16 +- 7 files changed, 898 insertions(+), 169 deletions(-) create mode 100644 src/views/dike/runManage/patrolMaintenance/componentsDetails/acceptanceDetails.vue create mode 100644 src/views/dike/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue diff --git a/src/api/dike/patrolMaintenance.js b/src/api/dike/patrolMaintenance.js index 5c7d73c..9106c0a 100644 --- a/src/api/dike/patrolMaintenance.js +++ b/src/api/dike/patrolMaintenance.js @@ -67,7 +67,7 @@ export function postV2Yh (data, commit) { // 审批列表 export function postV2ApprovalList (data) { return request({ - url: '/run/df/v2/approval/list', + url: '/run/df/v2/yh/approval/list', method: 'post', data }) diff --git a/src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue b/src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue index 40135c8..6169a2a 100644 --- a/src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue +++ b/src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue @@ -297,11 +297,10 @@ export default { this.pageData.pageSize = pageSize; this.getTableData(); }, - handleCheckDetails(row, mode) { this.$router.push({ - path: "defectDetails", - query: { id: row.id, formId: row.formId , mode: mode, module: 'acceptance' }, + path: "acceptanceDetails", + query: { id: row.id, recordId: row.recordId, defectId: row.problemId, mode: mode }, }); }, getDictLabelName(type, dictListName) { diff --git a/src/views/dike/runManage/patrolMaintenance/componentsDetails/acceptanceDetails.vue b/src/views/dike/runManage/patrolMaintenance/componentsDetails/acceptanceDetails.vue new file mode 100644 index 0000000..b11db1c --- /dev/null +++ b/src/views/dike/runManage/patrolMaintenance/componentsDetails/acceptanceDetails.vue @@ -0,0 +1,396 @@ + + + diff --git a/src/views/dike/runManage/patrolMaintenance/componentsDetails/defectDetails.vue b/src/views/dike/runManage/patrolMaintenance/componentsDetails/defectDetails.vue index 6750043..b16f249 100644 --- a/src/views/dike/runManage/patrolMaintenance/componentsDetails/defectDetails.vue +++ b/src/views/dike/runManage/patrolMaintenance/componentsDetails/defectDetails.vue @@ -22,7 +22,7 @@
堤防巡查开始/结束时间：
-
{{ form.time[0] }}/{{ form.time[1] }}
+
{{ form.startDate }}/{{ form.endDate }}
巡查部位：
@@ -47,7 +47,7 @@
@@ -55,121 +55,6 @@
-
养护记录
- - - - - - - - - - - - - - - - - - - - - - - - - 123 - - - - - - - -
验收意见
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- 通过 - 驳回 - 保存并提交 - 保存 - 返回
@@ -177,9 +62,9 @@ import TopBackTitle from "@/components/TopBackTitle/index.vue"; import {calcTableHeight} from "@/mixins/calcTableHeight"; import SyMixMap from "@/views/components/SyMixMap.vue"; -import {getRecordDetails, getRecordTraceList} from "@/api/dike"; import {getV2Yh, postV2Yh, getV2ApprovalComment, gettV2Record, postV2ApprovalPassed, postV2ApprovalRejected} from "@/api/dike/patrolMaintenance"; import {getDictMapData} from "@/api/system/dict/data"; +import {mapGetters} from "vuex"; export default { components: { @@ -199,12 +84,13 @@ export default { }], form: { createName: '', - name: '', + userName: '', dikeName: '', category: '', parts: '', partsName: '', content: '', + describe: '', position: '', problemImages: '', problemLevel: '', @@ -216,7 +102,7 @@ export default { scope: '', }, rules: { - name: [{required: true}], + userName: [{required: true}], projectName: [{required: true}], dikeName: [{required: true}], inspectionCategory: [{required: true}], @@ -236,20 +122,32 @@ export default { mounted() { this.initData() }, + computed: { + ...mapGetters({ + userId: "uid", + userName: "name", + }), + }, methods: { async initData() { const checking = await gettV2Record(this.$route.query.recordId) console.log('checking',checking) + console.log('checking',this.userName) this.form.createName = checking.data.createName - this.form.name = checking.data.name + this.form.userName = this.userName + this.form.userId = this.userId this.form.dikeName = checking.data.dikeName + this.form.checkingId = checking.data.checkingId + this.form.checkingName = checking.data.checkingName + this.form.status = checking.data.status + this.form.problems = checking.data.problems this.form.category = checking.data.category this.form.createUid = checking.data.createUid this.form.dikeCode = checking.data.dikeCode this.form.dikeType = checking.data.dikeType this.form.type = checking.data.type - this.form.time[0] = checking.data.startDate - this.form.time[1] = checking.data.endDate + this.form.startDate = checking.data.startDate + this.form.endDate = checking.data.endDate console.log(checking) checking.data.problems.forEach(item => { if(item.id === this.$route.query.defectId) { @@ -290,27 +188,24 @@ export default { }, handleSave(commit) { const data = { - category: this.form.category, - checkingId: this.form.category, - checkingName: this.form.category, - createName: this.form.category, - createUid: this.form.category, - dikeCode: this.form.dikeCode, - dikeName: this.form.dikeName, - dikeType: this.form.dikeType, - startDate: this.form.dikeType, - endDate: this.form.dikeType, - doc: this.form.dikeType, - problems: this.form.dikeType, - scope: this.form.dikeType, - status: this.form.dikeType, - type: this.form.dikeType, + checkingId: this.form.checkingId, + content: this.form.describe, + dutyHolderId: this.form.userId, + dutyHolderName: this.form.userName, + issueLevel: this.form.problemLevel, + problemId: this.$route.query.defectId, + recordId: this.$route.query.recordId, + startDate: this.form.time && this.form.time.length > 1 ? this.form.time[0] : '', + endDate: this.form.time && this.form.time.length > 1 ? this.form.time[1] : '', } console.log(data) - // postV2Yh(data, commit).then(res => { - // this.$message.success('保存成功') - // this.$router.go(-1) - // }) + if (this.$route.query.id) { + data.id = this.$route.query.id + } + postV2Yh(data, commit).then(res => { + this.$message.success('保存成功') + this.$router.go(-1) + }) } }, }; diff --git a/src/views/dike/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue b/src/views/dike/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue new file mode 100644 index 0000000..e0292cf --- /dev/null +++ b/src/views/dike/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue @@ -0,0 +1,446 @@ + + + diff --git a/src/views/dike/runManage/patrolMaintenance/defectList/index.vue b/src/views/dike/runManage/patrolMaintenance/defectList/index.vue index 1bf5112..d361c83 100644 --- a/src/views/dike/runManage/patrolMaintenance/defectList/index.vue +++ b/src/views/dike/runManage/patrolMaintenance/defectList/index.vue @@ -172,14 +172,7 @@ - - - @@ -209,13 +202,13 @@ 领单 查看 @@ -296,10 +289,16 @@ export default { this.pageData.pageSize = pageSize; this.getTableData(); }, - handleCheckDetails(row, mode) { + handleReceiveDetails(row) { + this.$router.push({ + path: "maintenanceDetails", + query: { recordId: row.recordId, defectId: row.id, checkingId: row.checkingId }, + }); + }, + handleCheckDetails(row) { this.$router.push({ path: "defectDetails", - query: { recordId: row.recordId, defectId: row.id , mode: mode, module: 'maintenance' }, + query: { recordId: row.recordId, defectId: row.id , mode: 'check' }, }); }, getDictLabelName(type, dictListName) { diff --git a/src/views/dike/runManage/patrolMaintenance/maintenanceRecords/index.vue b/src/views/dike/runManage/patrolMaintenance/maintenanceRecords/index.vue index faaf4be..8f69556 100644 --- a/src/views/dike/runManage/patrolMaintenance/maintenanceRecords/index.vue +++ b/src/views/dike/runManage/patrolMaintenance/maintenanceRecords/index.vue @@ -46,7 +46,7 @@ class="ml-10" v-model="paramsData.time" type="daterange" - value-format="yyyy-MM-dd" + value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @@ -154,7 +154,7 @@ border > - + @@ -304,8 +298,8 @@ export default { }, handleCheckDetails(row, mode) { this.$router.push({ - path: "defectDetails", - query: { id: row.id, mode: mode, module: 'maintenance' }, + path: "maintenanceDetails", + query: { id: row.id, recordId: row.recordId, defectId: row.problemId, mode: mode }, }); }, getDictLabelName(type, dictListName) {