Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0

src/views/dike/runManage/dangerWeakProject/inspectProjects/index.vue

@@ -10,8 +10,6 @@ export default {
   name: "InspectionItems",
   data() {
     return {
-      searchWagaName: "",
-      searchManageName: "",
       areasOptionProps: {
         emitPath: false,
         checkStrictly: true, //选择任意一级
@@ -163,8 +161,12 @@ export default {
     },
     // 重置搜索
     resetSearch() {
-      this.searchWagaName = null;
+      this.paramsData.adcdStart = null;
-      this.searchManageName = null;
+      this.paramsData.dikePatt = null;
+      this.paramsData.engineeringManagementUnit = null;
+      this.paramsData.riverLocation = null;
+      this.paramsData.dikeName = null;
+      this.paramsData.dikeType = null;
       this.getTableData();
     },
     // 删除

src/views/dike/runManage/dangerWeakProject/inspectReport/index.vue

@@ -214,7 +214,9 @@ export default {
               class="search-input ml-10"
               v-model="paramsData.groupId"
               filterable
+              clearable
               remote
+              @focus="searchGroupList('')"
               :remote-method="searchGroupList"
               placeholder="请选择"
             >

src/views/dike/runManage/dangerWeakProject/inspectTasks/taskDetails.vue

@@ -55,7 +55,7 @@ export default {
       rules: {
         name: [
           { required: true, message: "请输入名称", trigger: "blur" },
-          { max: 20, message: "名称最长为20个字符", trigger: "blur" },
+          { max: 50, message: "名称最长为50个字符", trigger: "blur" },
         ],
         groupId: [{ required: true, message: "请选择小组", trigger: "change" }],
         doneTime: [
@@ -292,6 +292,7 @@ export default {
       });
     },
     handleAddPro() {
+      this.handleSearchDialogPro();
       this.dialogVisible = true;
     },
     // 检索
@@ -325,6 +326,26 @@ export default {
       this.radioValue = "";
       this.dialogVisible = false;
     },
+    // 返回
+    handleGoBack() {
+      if (this.previewMode) {
+        this.$router.go(-1);
+        return;
+      }
+      // 二次确认返回是否保存数据
+      this.$confirm("是否保存信息", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.handleSubmit();
+        })
+        .catch(() => {
+          // 取消返回
+          this.$router.go(-1);
+        });
+    },
   },
   created() {
     this.getDicts("embankment_type").then((response) => {
@@ -364,6 +385,7 @@ export default {
               <el-input
                 :disabled="previewMode"
                 style="width: 240px"
+                :maxLength="50"
                 v-model="ruleForm.name"
                 placeholder="请输入"
               />
@@ -461,6 +483,7 @@ export default {
               :disabled="previewMode"
               type="textarea"
               :rows="5"
+              :maxLength="500"
               placeholder=" 请输入"
             />
           </el-form-item>
@@ -574,7 +597,7 @@ export default {
       <el-button type="primary" @click="handleSubmit" v-if="!previewMode"
         >确认</el-button
       >
-      <el-button @click="$router.go(-1)">返回</el-button>
+      <el-button @click="handleGoBack">返回</el-button>
     </div>
 
     <!-- 添加堤防弹窗 -->

src/views/dike/runManage/superVisionInspetion/projectManage/index.vue

@@ -88,6 +88,7 @@ export default {
       getSuperviseWayTaskListData({
         data: {
           name: this.searchTaskName || null,
+          dikeName: this.searchProjectName || null,
           engineeringManagementUnit: this.searchManageName || null,
         },
         pageSize: this.pageData.pageSize,
@@ -108,6 +109,7 @@ export default {
     resetSearch() {
       this.searchTaskName = null;
       this.searchManageName = null;
+      this.searchProjectName = null;
       this.getTableData();
     },
   },

src/views/dike/runManage/supervisionInspetion/projectManage/index.vue

@@ -88,6 +88,7 @@ export default {
       getSuperviseWayTaskListData({
         data: {
           name: this.searchTaskName || null,
+          dikeName: this.searchProjectName || null,
           engineeringManagementUnit: this.searchManageName || null,
         },
         pageSize: this.pageData.pageSize,
@@ -108,6 +109,7 @@ export default {
     resetSearch() {
       this.searchTaskName = null;
       this.searchManageName = null;
+      this.searchProjectName = null;
       this.getTableData();
     },
   },

src/views/sluice/runManage/dangerWeakProject/inspectProjects/index.vue

@@ -10,8 +10,6 @@ export default {
   name: "InspectionItems",
   data() {
     return {
-      searchWagaName: "",
-      searchManageName: "",
       areasOptionProps: {
         emitPath: false,
         checkStrictly: true, //选择任意一级
@@ -166,8 +164,12 @@ export default {
     },
     // 重置搜索
     resetSearch() {
-      this.searchWagaName = null;
+      this.paramsData.adcd = null;
-      this.searchManageName = null;
+      this.paramsData.engScal = null;
+      this.paramsData.engineeringManagementUnit = null;
+      this.paramsData.riverLocation = null;
+      this.paramsData.wagaName = null;
+      this.paramsData.wagaType = null;
       this.getTableData();
     },
     // 删除

src/views/sluice/runManage/dangerWeakProject/inspectTasks/taskDetails.vue

@@ -303,6 +303,7 @@ export default {
       });
     },
     handleAddPro() {
+      this.handleSearchDialogPro();
       this.dialogVisible = true;
     },
     // 检索
@@ -336,6 +337,26 @@ export default {
       this.radioValue = "";
       this.dialogVisible = false;
     },
+    // 返回
+    handleGoBack() {
+      if (this.previewMode) {
+        this.$router.go(-1);
+        return;
+      }
+      // 二次确认返回是否保存数据
+      this.$confirm("是否保存信息", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.handleSubmit();
+        })
+        .catch(() => {
+          // 取消返回
+          this.$router.go(-1);
+        });
+    },
   },
   created() {
     this.getDicts("sluice_type").then((response) => {
@@ -471,6 +492,7 @@ export default {
               v-model="ruleForm.content"
               :disabled="previewMode"
               type="textarea"
+              :maxLength="500"
               :rows="5"
               placeholder=" 请输入"
             />
@@ -585,7 +607,7 @@ export default {
       <el-button type="primary" @click="handleSubmit" v-if="!previewMode"
         >确认</el-button
       >
-      <el-button @click="$router.go(-1)">返回</el-button>
+      <el-button @click="handleGoBack">返回</el-button>
     </div>
 
     <!-- 添加水闸弹窗 -->

src/views/sluice/runManage/supervisionInspetion/projectManage/index.vue

@@ -91,6 +91,7 @@ export default {
             timeField: "create_time",
           },
           name: this.searchTaskName || null,
+          wagaName: this.searchProjectName || null,
           engineeringManagementUnit: this.searchManageName || null,
         },
         params: {
@@ -116,6 +117,7 @@ export default {
     resetSearch() {
       this.searchTaskName = null;
       this.searchManageName = null;
+      this.searchProjectName = null;
       this.getTableData();
     },
   },