fix: 堤防工程规模改为堤防级别

9 months ago · f27b44ae02
10 changed files with 30 additions and 15 deletions
--- a/src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
@ -261,6 +261,7 @@
            <el-tag v-if="activity.status == 1" style="position: absolute; left: 200px;top: -5px;" size="small" type="success">审批中</el-tag>
            <el-tag v-if="activity.status == 2" style="position: absolute; left: 200px;top: -5px;" size="small" type="success">已通过</el-tag>
            <el-tag v-if="activity.status == 3" style="position: absolute; left: 200px;top: -5px;" size="small" type="danger">已驳回</el-tag>
+            <el-tag v-if="activity.status == 4" style="position: absolute; left: 200px;top: -5px;" size="small" type="danger">已撤回</el-tag>
            <div>审批意见: {{activity.comment}}</div>
            <div>审批附件: {{
              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 = [
        {
--- 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 {
          />
        </div>
        <div class="search-item flex items-center">
-          <span class="search-label">工程规模</span>
+          <span class="search-label">堤防级别</span>
          <el-select
            clearable
            size="small"
            class="w-202 ml-10"
-            v-model="paramsData.engScal"
+            v-model="paramsData.dikeGrad"
            :popper-append-to-body="false"
            filterable
            placeholder="请选择"
--- a/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue
@ -466,7 +466,7 @@ export default {
              v-for="item in getFileName(scope.row.doc)"
              @click="handlePreview(item.file)"
            >
-              {{ item.name }}、
+              {{ item.name }}
            </el-button>
          </template>
        </el-table-column>
--- 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 }}
            </el-button>
          </template>
        </el-table-column>
@ -462,7 +462,7 @@ export default {
              v-for="item in getFileName(scope.row.doc)"
              @click="handlePreview(item.file)"
            >
-              {{ item.name }}、
+              {{ item.name }}
            </el-button>
          </template>
        </el-table-column>
--- a/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
+++ b/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
@ -267,6 +267,7 @@
            <el-tag v-if="activity.status == 1" style="position: absolute; left: 200px;top: -5px;" size="small" type="success">审批中</el-tag>
            <el-tag v-if="activity.status == 2" style="position: absolute; left: 200px;top: -5px;" size="small" type="success">已通过</el-tag>
            <el-tag v-if="activity.status == 3" style="position: absolute; left: 200px;top: -5px;" size="small" type="danger">已驳回</el-tag>
+            <el-tag v-if="activity.status == 4" style="position: absolute; left: 200px;top: -5px;" size="small" type="danger">已撤回</el-tag>
            <div>审批意见: {{activity.comment}}</div>
            <div>审批附件: {{
                activity.docs &&
@ -591,7 +592,7 @@ export default {
    searchPlan(value) {
      postDFMaintenancePlanList({
        data: {
-          dikeName: value,
+          name: value,
        },
        pageSize: 100,
        pageNum: 1,
--- a/src/views/sluice/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
@ -261,6 +261,7 @@
            <el-tag v-if="activity.status == 1" style="position: absolute; left: 200px;top: -5px;" size="small" type="success">审批中</el-tag>
            <el-tag v-if="activity.status == 2" style="position: absolute; left: 200px;top: -5px;" size="small" type="success">已通过</el-tag>
            <el-tag v-if="activity.status == 3" style="position: absolute; left: 200px;top: -5px;" size="small" type="danger">已驳回</el-tag>
+            <el-tag v-if="activity.status == 4" style="position: absolute; left: 200px;top: -5px;" size="small" type="danger">已撤回</el-tag>
            <div>审批意见: {{activity.comment}}</div>
            <div>审批附件: {{
              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 = [
        {
--- 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) => {
--- 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 }}
            </el-button>
          </template>
        </el-table-column>
--- 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 }}
            </el-button>
          </template>
        </el-table-column>
@ -455,7 +455,7 @@ export default {
              v-for="item in getFileName(scope.row.doc)"
              @click="handlePreview(item.file)"
            >
-              {{ item.name }}、
+              {{ item.name }}
            </el-button>
          </template>
        </el-table-column>
--- a/src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
+++ b/src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
@ -269,6 +269,7 @@
            <el-tag v-if="activity.status == 1" style="position: absolute; left: 200px;top: -5px;" size="small" type="success">审批中</el-tag>
            <el-tag v-if="activity.status == 2" style="position: absolute; left: 200px;top: -5px;" size="small" type="success">已通过</el-tag>
            <el-tag v-if="activity.status == 3" style="position: absolute; left: 200px;top: -5px;" size="small" type="danger">已驳回</el-tag>
+            <el-tag v-if="activity.status == 4" style="position: absolute; left: 200px;top: -5px;" size="small" type="danger">已撤回</el-tag>
            <div>审批意见: {{activity.comment}}</div>
            <div>审批附件: {{
                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,