修改

src/views/dike/engineeringCondition/dikeBaseInfo/index.vue

@@ -505,7 +505,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="form.dikeType == 0">
+          <el-col :span="8" v-if="form.dikeType == 1">
             <el-form-item label="所在河流" prop="riverLocation">
               <!-- <el-input
                 v-model="form.riverLocation"
@@ -525,7 +525,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="form.dikeType == 0">
+          <el-col :span="8" v-if="form.dikeType == 1">
             <el-form-item label="河流岸别">
               <el-radio-group v-model="form.riversideClassification">
                 <el-radio
@@ -537,7 +537,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="form.dikeType == 1">
+          <el-col :span="8" v-if="form.dikeType == 2">
             <el-form-item label="所在湖泊名称" prop="lakeName">
               <el-input
                 v-model="form.lakeName"
@@ -545,7 +545,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="form.dikeType == 2">
+          <el-col :span="8" v-if="form.dikeType == 3">
             <el-form-item label="所在海岸名称" prop="coastlineName">
               <el-input
                 v-model="form.coastlineName"
@@ -553,7 +553,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="form.dikeType != 2">
+          <el-col :span="8" v-if="form.dikeType != 3">
             <el-form-item label="是否为蓄滞洪区堤防">
               <el-radio-group v-model="form.isFloodStorageDetention">
                 <el-radio
@@ -567,7 +567,7 @@
           </el-col>
           <el-col
             :span="8"
-            v-if="form.dikeType != 2 && form.isFloodStorageDetention == 1"
+            v-if="form.dikeType != 3 && form.isFloodStorageDetention == 1"
           >
             <el-form-item
               label="所在蓄滞洪区名称"
@@ -581,7 +581,7 @@
           </el-col>
           <el-col
             :span="8"
-            v-if="form.dikeType != 2 && form.isFloodStorageDetention == 1"
+            v-if="form.dikeType != 3 && form.isFloodStorageDetention == 1"
           >
             <el-form-item
               label="堤防蓄滞洪区段起点桩号"
@@ -595,7 +595,7 @@
           </el-col>
           <el-col
             :span="8"
-            v-if="form.dikeType != 2 && form.isFloodStorageDetention == 1"
+            v-if="form.dikeType != 3 && form.isFloodStorageDetention == 1"
           >
             <el-form-item
               label="堤防蓄滞洪区段终点桩号"
@@ -609,7 +609,7 @@
           </el-col>
           <el-col
             :span="8"
-            v-if="form.dikeType != 2 && form.isFloodStorageDetention == 1"
+            v-if="form.dikeType != 3 && form.isFloodStorageDetention == 1"
           >
             <el-form-item
               label="堤防蓄滞洪区段总长度(m)"
@@ -623,7 +623,7 @@
           </el-col>
           <el-col
             :span="8"
-            v-if="form.dikeType != 2 && form.isFloodStorageDetention == 1"
+            v-if="form.dikeType != 3 && form.isFloodStorageDetention == 1"
           >
             <el-form-item
               label="蓄滞洪区特殊情况说明"
@@ -813,14 +813,14 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <el-form-item label="关联字段1" prop="relations">
               <el-input
                 v-model="form.relations"
                 placeholder="请输入关联字段1"
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-form>
       </el-row>
       <div slot="footer" class="dialog-footer">

src/views/dike/engineeringCondition/dikeBaseInfo/options/basePage.vue

@@ -390,11 +390,11 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <el-form-item label="关联字段1" prop="relations">
             <el-input v-model="form.relations" placeholder="请输入关联字段1" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-form>
     </el-row>
     <div class="btnList">

src/views/dike/engineeringCondition/dikeBaseInfo/options/projectManagement.vue

@@ -97,7 +97,11 @@
             label="水行政主管部门"
             prop="waterAdministrativeDepartment"
           >
-            <el-select
+            <el-input
+              v-model="form.waterAdministrativeDepartment"
+              placeholder="请输入水行政主管部门"
+            />
+            <!-- <el-select
               v-model="form.waterAdministrativeDepartment"
               placeholder="请选择水行政主管部门"
               style="width: 100%"
@@ -108,7 +112,7 @@
                 :label="dict.dictLabel"
                 :value="dict.dictValue"
               ></el-option>
-            </el-select>
+            </el-select> -->
           </el-form-item>
         </el-col>
         <el-col :span="8">

src/views/sluice/engineeringCondition/sluiceBaseInfo/index.vue

@@ -871,11 +871,11 @@
               </el-checkbox-group>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <el-form-item label="关联字段1" prop="relation">
               <el-input v-model="form.relation" placeholder="请输入关联字段1" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-form>
       </el-row>
       <div slot="footer" class="dialog-footer">
@@ -1216,7 +1216,15 @@ export default {
     },
     // 水闸类型字典翻译
     wagaTypeFormat(row, column) {
-      return this.selectDictLabel(this.wagaTypeOptions, row.wagaType);
+      // console.log(66666454, row.wagaType);
+      let res = "";
+      let arr = row.wagaType ? JSON.parse(row.wagaType) : [];
+      if (arr) {
+        arr.forEach((item) => {
+          res = res + "+" + this.selectDictLabel(this.wagaTypeOptions, item);
+        });
+        return res.slice(1);
+      }
     },
     // 工程规模字典翻译
     engScalFormat(row, column) {

src/views/sluice/engineeringCondition/sluiceBaseInfo/options/basePage.vue

@@ -431,11 +431,11 @@
             </el-checkbox-group>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <el-form-item label="关联字段1" prop="relation">
             <el-input v-model="form.relation" placeholder="请输入关联字段1" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-form>
     </el-row>
     <div class="btnList">

src/views/sluice/engineeringCondition/sluiceBaseInfo/options/projectManagement.vue

@@ -97,7 +97,11 @@
             label="水行政主管部门"
             prop="waterAdministrativeDepartment"
           >
-            <el-select
+            <el-input
+              v-model="form.waterAdministrativeDepartment"
+              placeholder="请输入水行政主管部门"
+            />
+            <!-- <el-select
               v-model="form.waterAdministrativeDepartment"
               placeholder="请选择水行政主管部门"
               style="width: 100%"
@@ -108,7 +112,7 @@
                 :label="dict.dictLabel"
                 :value="dict.dictValue"
               ></el-option>
-            </el-select>
+            </el-select> -->
           </el-form-item>
         </el-col>
         <el-col :span="8">