Browse Source

fix: 修复明显问题

sy-water-data-board-ui
hejunjie 1 month ago
parent
commit
f55a5a709d
  1. 2
      src/views/dike/runManage/patrolMaintenance/InspectionRecords/index.vue
  2. 31
      src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue
  3. 8
      src/views/dike/runManage/patrolMaintenance/componentsDetails/acceptanceDetails.vue
  4. 2
      src/views/dike/runManage/patrolMaintenance/componentsDetails/defectDetails.vue
  5. 2
      src/views/dike/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue
  6. 8
      src/views/dike/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue
  7. 1
      src/views/dike/runManage/patrolMaintenance/maintenanceRecords/index.vue

2
src/views/dike/runManage/patrolMaintenance/InspectionRecords/index.vue

@ -187,7 +187,7 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
:disabled="!scope.row.status === '1'" :disabled="scope.row.status !== '1'"
@click="handleEditDetails(scope.row, true)" @click="handleEditDetails(scope.row, true)"
>编辑</el-button >编辑</el-button
> >

31
src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue

@ -150,50 +150,42 @@
</div> </div>
<el-table :height="tableHeight" :data="tableData" border> <el-table :height="tableHeight" :data="tableData" border>
<el-table-column prop="id" align="center" label="单号" /> <el-table-column prop="id" align="center" label="单号" />
<el-table-column prop="name" align="center" label="巡查名称" /> <el-table-column prop="detail.name" align="center" label="巡查名称" />
<el-table-column prop="type" align="center" label="巡查类型"> <el-table-column align="center" label="巡查类型">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
getDictLabelName(scope.row.type, "maintenanceType") getDictLabelName(scope.row.detail.type, "maintenanceType")
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="category" align="center" label="巡查类别"> <el-table-column prop="category" align="center" label="巡查类别">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
getDictLabelName(scope.row.category, "maintenanceCategory") getDictLabelName(scope.row.detail.category || '', "maintenanceCategory")
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="status" align="center" label="巡查状态"> <el-table-column prop="status" align="center" label="巡查状态">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
getDictLabelName(scope.row.status, "maintenanceStatus") getDictLabelName(scope.row.detail.status || '', "maintenanceStatus")
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="level" align="center" label="问题等级"> <el-table-column align="center" label="问题等级">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
getDictLabelName(scope.row.level, "maintenanceLevel") getDictLabelName(scope.row.detail.problemLevel || '', "maintenanceLevel")
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="dutyHolderName" align="center" label="责任人" /> <el-table-column prop="detail.dutyHolderName" align="center" label="责任人" />
<el-table-column <el-table-column
prop="startDate" prop="submitTime"
align="center" align="center"
label="巡查开始时间/结束时间" label="养护时间"
> />
<template slot-scope="scope">
<span
>{{ scope.row.startDate || "-" }}/{{
scope.row.endDate || "-"
}}</span
>
</template>
</el-table-column>
<el-table-column <el-table-column
prop="opera" prop="opera"
@ -212,6 +204,7 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
:disabled="scope.row.detail.status === '5'"
@click="handleCheckDetails(scope.row, 'edit')" @click="handleCheckDetails(scope.row, 'edit')"
>编辑</el-button >编辑</el-button
> >

8
src/views/dike/runManage/patrolMaintenance/componentsDetails/acceptanceDetails.vue

@ -310,11 +310,9 @@ export default {
this.form.time = [...this.form.time] this.form.time = [...this.form.time]
this.form.images = Yh.data.doc.images this.form.images = Yh.data.doc.images
this.fileData = Yh.data.doc.docs this.fileData = Yh.data.doc.docs
if (this.$route.query.id) { const ApprovalComment = await getV2ApprovalComment(this.$route.query.formId)
const ApprovalComment = await getV2ApprovalComment(this.$route.query.id) this.form.approvalTime = ApprovalComment.data.approvalTime
this.form.approvalTime = ApprovalComment.data.approvalTime this.form.comment = ApprovalComment.data.comment
this.form.comment = ApprovalComment.data.comment
}
}, },
getDictLabelName(type, dictListName) { getDictLabelName(type, dictListName) {

2
src/views/dike/runManage/patrolMaintenance/componentsDetails/defectDetails.vue

@ -192,7 +192,7 @@ export default {
content: this.form.describe, content: this.form.describe,
dutyHolderId: this.form.userId, dutyHolderId: this.form.userId,
dutyHolderName: this.form.userName, dutyHolderName: this.form.userName,
issueLevel: this.form.problemLevel, problemLevel: this.form.problemLevel,
problemId: this.$route.query.defectId, problemId: this.$route.query.defectId,
recordId: this.$route.query.recordId, recordId: this.$route.query.recordId,
startDate: this.form.time && this.form.time.length > 1 ? this.form.time[0] : '', startDate: this.form.time && this.form.time.length > 1 ? this.form.time[0] : '',

2
src/views/dike/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue

@ -424,7 +424,7 @@ export default {
poistion: "", poistion: "",
content: "", content: "",
problemImages: [], problemImages: [],
status: "4", status: "0",
}); });
}, },
getDictLabelName(type, dictListName) { getDictLabelName(type, dictListName) {

8
src/views/dike/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue

@ -382,11 +382,17 @@ export default {
handleSave(commit) { handleSave(commit) {
const data = { const data = {
name: this.form.checkingName, name: this.form.checkingName,
dikeCode: this.form.dikeCode,
dikeType: this.form.dikeType,
dikeName: this.form.dikeName,
status: this.form.status,
type: this.form.type,
category: this.form.category,
checkingId: this.form.checkingId, checkingId: this.form.checkingId,
content: this.form.describe, content: this.form.describe,
dutyHolderId: this.form.userId, dutyHolderId: this.form.userId,
dutyHolderName: this.form.userName, dutyHolderName: this.form.userName,
issueLevel: this.form.problemLevel, problemLevel: this.form.problemLevel,
problemId: this.$route.query.defectId, problemId: this.$route.query.defectId,
recordId: this.$route.query.recordId, recordId: this.$route.query.recordId,
doc: { doc: {

1
src/views/dike/runManage/patrolMaintenance/maintenanceRecords/index.vue

@ -216,6 +216,7 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
:disabled="scope.row.status !== '4'"
@click="handleCheckDetails(scope.row, 'edit')" @click="handleCheckDetails(scope.row, 'edit')"
>编辑</el-button >编辑</el-button
> >

Loading…
Cancel
Save