Browse Source

fix: 修复第二轮提测回归bug

sy-water-data-board-ui
hejunjie 9 months ago
parent
commit
a03e28c7fa
  1. 7
      src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
  2. 14
      src/views/dike/runManage/maintenance/maintenancePlan/index.vue
  3. 11
      src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue
  4. 8
      src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
  5. 3
      src/views/dike/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue
  6. 20
      src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
  7. 19
      src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
  8. 2
      src/views/sluice/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
  9. 4
      src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
  10. 11
      src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue
  11. 9
      src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
  12. 3
      src/views/sluice/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue
  13. 24
      src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
  14. 13
      src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue

7
src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue

@ -122,6 +122,7 @@
<el-form-item label="资金金额" prop="amount" class="ml-24"> <el-form-item label="资金金额" prop="amount" class="ml-24">
<el-input-number <el-input-number
:disabled="!canEdit || type === 'audit'" :disabled="!canEdit || type === 'audit'"
:controls="false"
class="w-240" class="w-240"
size="small" size="small"
:min="0" :min="0"
@ -252,6 +253,7 @@
<div class="form-row-title">验收意见</div> <div class="form-row-title">验收意见</div>
<el-timeline :reverse="true"> <el-timeline :reverse="true">
<el-timeline-item <el-timeline-item
placement="top"
v-for="(activity, index) in activities" v-for="(activity, index) in activities"
:key="index" :key="index"
:timestamp="activity.approvalTime"> :timestamp="activity.approvalTime">
@ -657,17 +659,16 @@ export default {
}, },
}) })
.then((res) => { .then((res) => {
console.log(1421241)
if (type === 'passed') { if (type === 'passed') {
this.$message.success("通过成功"); this.$message.success("通过成功");
} else { } else {
this.$message.success("驳回成功"); this.$message.success("驳回成功");
} }
if (reset) {
this.reset();
}
r(); r();
}) })
.catch(() => { .catch(() => {
console.log(12312);
j(); j();
}); });
}) })

14
src/views/dike/runManage/maintenance/maintenancePlan/index.vue

@ -511,13 +511,13 @@ export default {
></PlanDetail> ></PlanDetail>
</div> </div>
<div class="drawer-footer p-16"> <div class="drawer-footer p-16">
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="primary" <!-- type="primary"-->
v-hasPermi="['df:run:inspection:plan:item:edit']" <!-- v-hasPermi="['df:run:inspection:plan:item:edit']"-->
@click="handleEdit(currentRow)" <!-- @click="handleEdit(currentRow)"-->
>编辑</el-button <!-- >编辑</el-button-->
> <!-- >-->
<el-button size="mini" @click="dialogVisible = false">取消</el-button> <el-button size="mini" @click="dialogVisible = false">取消</el-button>
</div> </div>
</el-drawer> </el-drawer>

11
src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue

@ -385,8 +385,8 @@ export default {
> >
<el-radio-button label="">全部</el-radio-button> <el-radio-button label="">全部</el-radio-button>
<el-radio-button label="1">待验收</el-radio-button> <el-radio-button label="1">待验收</el-radio-button>
<el-radio-button label="2">驳回</el-radio-button> <el-radio-button label="2">验收</el-radio-button>
<el-radio-button label="3">验收</el-radio-button> <el-radio-button label="3">驳回</el-radio-button>
</el-radio-group> </el-radio-group>
</div> </div>
@ -561,10 +561,10 @@ export default {
></RecordDetail> ></RecordDetail>
</div> </div>
<div class="drawer-footer p-16"> <div class="drawer-footer p-16">
<el-button size="mini" type="primary" @click="handleEdit(currentRow)" <!-- <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
v-hasPermi="['df:run:inspection:accept:item:edit']" v-hasPermi="['df:run:inspection:accept:item:edit']"
>编辑</el-button >编辑</el-button
> >-->
<el-button size="mini" @click="dialogVisible = false">取消</el-button> <el-button size="mini" @click="dialogVisible = false">取消</el-button>
</div> </div>
</el-drawer> </el-drawer>
@ -657,4 +657,7 @@ export default {
padding-bottom: 72px; padding-bottom: 72px;
overflow: auto; overflow: auto;
} }
/deep/.el-button--text {
text-wrap: wrap;
}
</style> </style>

8
src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue

@ -374,7 +374,6 @@ export default {
border border
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="dikeName" align="center" label="堤防名称" > <el-table-column prop="dikeName" align="center" label="堤防名称" >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.detail.dikeName }}</span> <span>{{ scope.row.detail.dikeName }}</span>
@ -559,10 +558,10 @@ export default {
></PlanDetail> ></PlanDetail>
</div> </div>
<div class="drawer-footer p-16"> <div class="drawer-footer p-16">
<el-button size="mini" type="primary" @click="handleEdit(currentRow)" <!-- <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
v-hasPermi="['df:run:inspection:audit:item:edit']" v-hasPermi="['df:run:inspection:audit:item:edit']"
>编辑</el-button >编辑</el-button
> >-->
<el-button size="mini" @click="dialogVisible = false">取消</el-button> <el-button size="mini" @click="dialogVisible = false">取消</el-button>
</div> </div>
</el-drawer> </el-drawer>
@ -655,4 +654,7 @@ export default {
padding-bottom: 72px; padding-bottom: 72px;
overflow: auto; overflow: auto;
} }
/deep/.el-button--text {
text-wrap: wrap;
}
</style> </style>

3
src/views/dike/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue

@ -66,8 +66,11 @@ export default {
} else { } else {
await postYhRecord(data) await postYhRecord(data)
} }
this.$message.success("提交成功");
if (!reset) { if (!reset) {
this.$router.go(-1) this.$router.go(-1)
} else {
formRef.reset()
} }
} catch (error) { } catch (error) {
console.log(error) console.log(error)

20
src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue

@ -127,6 +127,7 @@
<el-form-item label="资金金额" prop="amount" class="ml-24"> <el-form-item label="资金金额" prop="amount" class="ml-24">
<el-input-number <el-input-number
:disabled="!canEdit || type === 'audit'" :disabled="!canEdit || type === 'audit'"
:controls="false"
class="w-240" class="w-240"
size="small" size="small"
:min="0" :min="0"
@ -258,6 +259,7 @@
<div class="form-row-title">验收意见</div> <div class="form-row-title">验收意见</div>
<el-timeline :reverse="true"> <el-timeline :reverse="true">
<el-timeline-item <el-timeline-item
placement="top"
v-for="(activity, index) in activities" v-for="(activity, index) in activities"
:key="index" :key="index"
:timestamp="activity.approvalTime"> :timestamp="activity.approvalTime">
@ -332,7 +334,7 @@ export default {
activities: [], activities: [],
rules: { rules: {
planId: [ planId: [
{ required: false, message: "请输入维养计划名称", trigger: "blur" }, { required: true, message: "请选择维养计划名称", trigger: "blur" },
], ],
remark: [ remark: [
{ required: true, message: "请输入维修描述", trigger: "blur" }, { required: true, message: "请输入维修描述", trigger: "blur" },
@ -686,13 +688,21 @@ export default {
}); });
}, },
reset() { reset() {
this.formData = {}; this.$refs.ruleForm.resetFields();
this.$refs.formRef.resetFields(); if (this.$refs.supplementFormRef) {
if (this.$refs.subFormRef) { this.$refs.supplementFormRef.forEach((item) => {
this.$refs.subFormRef.forEach((item) => {
item.resetFields(); item.resetFields();
}); });
} }
this.filesList1 = [];
this.filesList = [];
this.ledgerList = [];
this.formData.supplements = [
{
supplement: "",
amount: 0,
},
];
}, },
}, },
}; };

19
src/views/dike/runManage/maintenance/maintenanceRecords/index.vue

@ -414,19 +414,19 @@ export default {
<span>{{ getDikeTypeName(scope.row.dikeType) }}</span> <span>{{ getDikeTypeName(scope.row.dikeType) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="维养计划名称" > <el-table-column prop="name" align="center" label="维养计划名称">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.plan.name }}</span> <span>{{ scope.row.plan ? scope.row.plan.name : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="维养类型"> <el-table-column align="center" label="维养类型">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ getTypeName(scope.row.plan.type) }}</span> <span>{{ getTypeName(scope.row.plan ? scope.row.plan.type : '') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="完成维养时间"> <el-table-column align="center" label="完成维养时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.plan.endDate}}</span> <span>{{ scope.row.plan ? scope.row.plan.endDate : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="维养单位"> <el-table-column align="center" label="维养单位">
@ -436,8 +436,11 @@ export default {
</el-table-column> </el-table-column>
<el-table-column align="center" label="维养负责人"> <el-table-column align="center" label="维养负责人">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.plan.responsiblePerson && <span>{{
scope.row.plan.responsiblePerson.name }}</span> scope.row.plan &&
scope.row.plan.responsiblePerson &&
scope.row.plan.responsiblePerson.name
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="supplements" align="center" label="资金来源/万元" > <el-table-column prop="supplements" align="center" label="资金来源/万元" >
@ -562,10 +565,10 @@ export default {
></RecordDetail> ></RecordDetail>
</div> </div>
<div class="drawer-footer p-16"> <div class="drawer-footer p-16">
<el-button size="mini" type="primary" @click="handleEdit(currentRow)" <!-- <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
v-hasPermi="['df:run:inspection:record:item:edit']" v-hasPermi="['df:run:inspection:record:item:edit']"
>编辑</el-button >编辑</el-button
> >-->
<el-button size="mini" @click="dialogVisible = false">取消</el-button> <el-button size="mini" @click="dialogVisible = false">取消</el-button>
</div> </div>
</el-drawer> </el-drawer>

2
src/views/sluice/runManage/maintenance/maintenancePlan/components/PlanDetail.vue

@ -122,6 +122,7 @@
<el-form-item label="资金金额" prop="amount" class="ml-24"> <el-form-item label="资金金额" prop="amount" class="ml-24">
<el-input-number <el-input-number
:disabled="!canEdit || type === 'audit'" :disabled="!canEdit || type === 'audit'"
:controls="false"
class="w-240" class="w-240"
size="small" size="small"
:min="0" :min="0"
@ -252,6 +253,7 @@
<div class="form-row-title">验收意见</div> <div class="form-row-title">验收意见</div>
<el-timeline :reverse="true"> <el-timeline :reverse="true">
<el-timeline-item <el-timeline-item
placement="top"
v-for="(activity, index) in activities" v-for="(activity, index) in activities"
:key="index" :key="index"
:timestamp="activity.approvalTime"> :timestamp="activity.approvalTime">

4
src/views/sluice/runManage/maintenance/maintenancePlan/index.vue

@ -511,10 +511,10 @@ export default {
></PlanDetail> ></PlanDetail>
</div> </div>
<div class="drawer-footer p-16"> <div class="drawer-footer p-16">
<el-button size="mini" type="primary" @click="handleEdit(currentRow)" <!-- <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
v-hasPermi="['sz:run:inspection:plan:item:edit']" v-hasPermi="['sz:run:inspection:plan:item:edit']"
>编辑</el-button >编辑</el-button
> >-->
<el-button size="mini" @click="dialogVisible = false">取消</el-button> <el-button size="mini" @click="dialogVisible = false">取消</el-button>
</div> </div>
</el-drawer> </el-drawer>

11
src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue

@ -378,8 +378,8 @@ export default {
> >
<el-radio-button label="">全部</el-radio-button> <el-radio-button label="">全部</el-radio-button>
<el-radio-button label="1">待验收</el-radio-button> <el-radio-button label="1">待验收</el-radio-button>
<el-radio-button label="2">驳回</el-radio-button> <el-radio-button label="2">验收</el-radio-button>
<el-radio-button label="3">验收</el-radio-button> <el-radio-button label="3">驳回</el-radio-button>
</el-radio-group> </el-radio-group>
</div> </div>
@ -554,10 +554,10 @@ export default {
></RecordDetail> ></RecordDetail>
</div> </div>
<div class="drawer-footer p-16"> <div class="drawer-footer p-16">
<el-button size="mini" type="primary" @click="handleEdit(currentRow)" <!-- <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
v-hasPermi="['sz:run:inspection:accept:item:edit']" v-hasPermi="['sz:run:inspection:accept:item:edit']"
>编辑</el-button >编辑</el-button
> >-->
<el-button size="mini" @click="dialogVisible = false">取消</el-button> <el-button size="mini" @click="dialogVisible = false">取消</el-button>
</div> </div>
</el-drawer> </el-drawer>
@ -650,4 +650,7 @@ export default {
padding-bottom: 72px; padding-bottom: 72px;
overflow: auto; overflow: auto;
} }
/deep/.el-button--text {
text-wrap: wrap;
}
</style> </style>

9
src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue

@ -365,7 +365,6 @@ export default {
border border
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="wagaName" align="center" label="水闸名称" > <el-table-column prop="wagaName" align="center" label="水闸名称" >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.detail.wagaName }}</span> <span>{{ scope.row.detail.wagaName }}</span>
@ -420,6 +419,7 @@ export default {
<el-button <el-button
type="text" type="text"
size="small" size="small"
v-for="item in getFileName(scope.row.detail.doc)" v-for="item in getFileName(scope.row.detail.doc)"
@click="handlePreview(item.file)" @click="handlePreview(item.file)"
> >
@ -550,10 +550,10 @@ export default {
></PlanDetail> ></PlanDetail>
</div> </div>
<div class="drawer-footer p-16"> <div class="drawer-footer p-16">
<el-button size="mini" type="primary" @click="handleEdit(currentRow)" <!-- <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
v-hasPermi="['sz:run:inspection:audit:item:edit']" v-hasPermi="['sz:run:inspection:audit:item:edit']"
>编辑</el-button >编辑</el-button
> >-->
<el-button size="mini" @click="dialogVisible = false">取消</el-button> <el-button size="mini" @click="dialogVisible = false">取消</el-button>
</div> </div>
</el-drawer> </el-drawer>
@ -646,4 +646,7 @@ export default {
padding-bottom: 72px; padding-bottom: 72px;
overflow: auto; overflow: auto;
} }
/deep/.el-button--text {
text-wrap: wrap;
}
</style> </style>

3
src/views/sluice/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue

@ -66,8 +66,11 @@ export default {
} else { } else {
await postRunSzYhRecord(data) await postRunSzYhRecord(data)
} }
this.$message.success("提交成功");
if (!reset) { if (!reset) {
this.$router.go(-1) this.$router.go(-1)
} else {
formRef.reset()
} }
} catch (error) { } catch (error) {
console.log(error) console.log(error)

24
src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue

@ -127,6 +127,7 @@
<el-form-item label="资金金额" prop="amount" class="ml-24"> <el-form-item label="资金金额" prop="amount" class="ml-24">
<el-input-number <el-input-number
:disabled="!canEdit || type === 'audit'" :disabled="!canEdit || type === 'audit'"
:controls="false"
class="w-240" class="w-240"
size="small" size="small"
:min="0" :min="0"
@ -260,6 +261,7 @@
<div class="form-row-title">验收意见</div> <div class="form-row-title">验收意见</div>
<el-timeline :reverse="true"> <el-timeline :reverse="true">
<el-timeline-item <el-timeline-item
placement="top"
v-for="(activity, index) in activities" v-for="(activity, index) in activities"
:key="index" :key="index"
:timestamp="activity.approvalTime"> :timestamp="activity.approvalTime">
@ -331,7 +333,7 @@ export default {
activities: [], activities: [],
rules: { rules: {
planId: [ planId: [
{ required: false, message: "请输入维养计划名称", trigger: "blur" }, { required: true, message: "请选择维养计划名称", trigger: "blur" },
], ],
remark: [ remark: [
{ required: true, message: "请输入维修描述", trigger: "blur" }, { required: true, message: "请输入维修描述", trigger: "blur" },
@ -401,7 +403,7 @@ export default {
// //
validatorProjectList(rule, value, callback) { validatorProjectList(rule, value, callback) {
if (this.filesList.length === 0) { if (this.filesList.length === 0) {
callback(new Error("请上传计划方案")); callback(new Error("请上传维养台账"));
} else { } else {
callback(); callback();
} }
@ -410,7 +412,7 @@ export default {
// //
validatorProjectListImg(rule, value, callback) { validatorProjectListImg(rule, value, callback) {
if (this.ledgerList.length === 0) { if (this.ledgerList.length === 0) {
callback(new Error("请上传计划方案")); callback(new Error("请上传维养图片"));
} else { } else {
callback(); callback();
} }
@ -685,13 +687,21 @@ export default {
}); });
}, },
reset() { reset() {
this.formData = {}; this.$refs.ruleForm.resetFields();
this.$refs.formRef.resetFields(); if (this.$refs.supplementFormRef) {
if (this.$refs.subFormRef) { this.$refs.supplementFormRef.forEach((item) => {
this.$refs.subFormRef.forEach((item) => {
item.resetFields(); item.resetFields();
}); });
} }
this.filesList1 = [];
this.filesList = [];
this.ledgerList = [];
this.formData.supplements = [
{
supplement: "",
amount: 0,
},
];
}, },
}, },
}; };

13
src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue

@ -143,7 +143,7 @@ export default {
.then(() => { .then(() => {
console.log("删除"); console.log("删除");
const ids = this.tableCheckData.map((item) => item.id); const ids = this.tableCheckData.map((item) => item.id);
delRunSzYhRecord(ids.join(",")).then((res) => { delRunSzYhRecord({id: ids.join(",")}).then((res) => {
if (res) { if (res) {
this.$message.success("删除成功"); this.$message.success("删除成功");
this.getTableData(); this.getTableData();
@ -411,17 +411,17 @@ export default {
</el-table-column> </el-table-column>
<el-table-column prop="name" align="center" label="维养计划名称"> <el-table-column prop="name" align="center" label="维养计划名称">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.plan.name }}</span> <span>{{ scope.row.plan ? scope.row.plan.name : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="维养类型"> <el-table-column align="center" label="维养类型">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ getTypeName(scope.row.plan.type) }}</span> <span>{{ getTypeName(scope.row.plan ? scope.row.plan.type : '') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="完成维养时间"> <el-table-column align="center" label="完成维养时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.plan.endDate }}</span> <span>{{ scope.row.plan ? scope.row.plan.endDate : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="维养单位"> <el-table-column align="center" label="维养单位">
@ -432,6 +432,7 @@ export default {
<el-table-column align="center" label="维养负责人"> <el-table-column align="center" label="维养负责人">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
scope.row.plan &&
scope.row.plan.responsiblePerson && scope.row.plan.responsiblePerson &&
scope.row.plan.responsiblePerson.name scope.row.plan.responsiblePerson.name
}}</span> }}</span>
@ -563,11 +564,11 @@ export default {
></RecordDetail> ></RecordDetail>
</div> </div>
<div class="drawer-footer p-16"> <div class="drawer-footer p-16">
<el-button size="mini" type="primary" @click="handleEdit(currentRow)" <!-- <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
v-hasPermi="['sz:run:inspection:record:item:edit']" v-hasPermi="['sz:run:inspection:record:item:edit']"
>编辑 >编辑
</el-button </el-button
> >-->
<el-button size="mini" @click="dialogVisible = false">取消</el-button> <el-button size="mini" @click="dialogVisible = false">取消</el-button>
</div> </div>
</el-drawer> </el-drawer>

Loading…
Cancel
Save