diff --git a/src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue b/src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
index e8b5a1a..b7d7090 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
@@ -261,6 +261,7 @@
审批中
已通过
已驳回
+ 已撤回
审批意见: {{activity.comment}}
审批附件: {{
activity.docs &&
@@ -686,6 +687,11 @@ export default {
// 重置
reset() {
this.$refs.formRef.resetFields();
+ if (this.$refs.supplementFormRef) {
+ this.$refs.supplementFormRef.forEach((item) => {
+ item.resetFields();
+ });
+ }
this.projectList = [];
this.formData.supplements = [
{
diff --git a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
index f9efe7c..03df410 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
@@ -25,7 +25,7 @@ export default {
adcd: "",
dikeName: "",
dikeType: "",
- engScal: "",
+ dikeGrad: "",
name: "",
status: "",
planDateArr: [],
@@ -150,7 +150,7 @@ export default {
: null,
dikeName: this.paramsData.dikeName,
dikeType: this.paramsData.dikeType,
- engScal: this.paramsData.engScal,
+ dikeGrad: this.paramsData.dikeGrad,
status: this.paramsData.status,
},
pageSize: this.pageData.pageSize,
@@ -212,7 +212,7 @@ export default {
this.paramsData.planDateArr = [];
this.paramsData.dikeName = "";
this.paramsData.dikeType = "";
- this.paramsData.engScal = "";
+ this.paramsData.dikeGrad = "";
this.paramsData.status = "";
this.reqCountCalc();
@@ -253,7 +253,7 @@ export default {
this.getDicts("embankment_type").then((response) => {
this.embankmentTypeOptions = response.data;
});
- this.getDicts("df-scale").then((response) => {
+ this.getDicts("embankment_level").then((response) => {
this.scaleOptions = response.data;
});
@@ -333,12 +333,12 @@ export default {
/>
-
工程规模
+
堤防级别
- {{ item.name }}、
+ {{ item.name }}
diff --git a/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue b/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
index e120eef..05bf376 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
@@ -436,7 +436,7 @@ export default {
v-for="item in getFileName(scope.row.detail.doc)"
@click="handlePreview(item.file)"
>
- {{ item.name }}、
+ {{ item.name }}
@@ -462,7 +462,7 @@ export default {
v-for="item in getFileName(scope.row.doc)"
@click="handlePreview(item.file)"
>
- {{ item.name }}、
+ {{ item.name }}
diff --git a/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue b/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
index 6dd7e6c..36347e8 100644
--- a/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
+++ b/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
@@ -267,6 +267,7 @@
审批中
已通过
已驳回
+ 已撤回
审批意见: {{activity.comment}}
审批附件: {{
activity.docs &&
@@ -591,7 +592,7 @@ export default {
searchPlan(value) {
postDFMaintenancePlanList({
data: {
- dikeName: value,
+ name: value,
},
pageSize: 100,
pageNum: 1,
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlan/components/PlanDetail.vue b/src/views/sluice/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
index 8cd03a4..d653b89 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
@@ -261,6 +261,7 @@
审批中
已通过
已驳回
+
已撤回
审批意见: {{activity.comment}}
审批附件: {{
activity.docs &&
@@ -683,6 +684,11 @@ export default {
// 重置
reset() {
this.$refs.formRef.resetFields();
+ if (this.$refs.supplementFormRef) {
+ this.$refs.supplementFormRef.forEach((item) => {
+ item.resetFields();
+ });
+ }
this.projectList = [];
this.formData.supplements = [
{
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
index 82eace8..42a7c8b 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
@@ -255,7 +255,7 @@ export default {
this.embankmentTypeOptions = response.data;
});
- this.getDicts("sz-scale").then((response) => {
+ this.getDicts("engineering_scale").then((response) => {
this.scaleOptions = response.data;
});
this.getDicts("xs_yh_supplement").then((response) => {
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue
index 02097a7..dab21f8 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue
@@ -459,7 +459,7 @@ export default {
v-for="item in getFileName(scope.row.doc)"
@click="handlePreview(item.file)"
>
- {{ item.name }}、
+ {{ item.name }}
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
index ff11a24..eae815d 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
@@ -429,7 +429,7 @@ export default {
v-for="item in getFileName(scope.row.detail.doc)"
@click="handlePreview(item.file)"
>
- {{ item.name }}、
+ {{ item.name }}
@@ -455,7 +455,7 @@ export default {
v-for="item in getFileName(scope.row.doc)"
@click="handlePreview(item.file)"
>
- {{ item.name }}、
+ {{ item.name }}
diff --git a/src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue b/src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
index 6f308b4..984b35c 100644
--- a/src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
+++ b/src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
@@ -269,6 +269,7 @@
审批中
已通过
已驳回
+
已撤回
审批意见: {{activity.comment}}
审批附件: {{
activity.docs &&
@@ -402,6 +403,7 @@ export default {
this.filesList1 = fileList
},
handleRemoveledger(index) {
+ if (!this.canEdit || this.type === 'accept') return
this.ledgerList.splice(index, 1);
},
// 验证维养台账
@@ -590,7 +592,7 @@ export default {
console.log(value)
postRunSzYhPlanList({
data: {
- wagaName: value,
+ name: value,
},
pageSize: 100,
pageNum: 1,