Merge branch 'master' of http://175.178.86.109:3000/ljf/shuili-vue

src/components/linkNameSelect/linkRes.vue

@@ -0,0 +1,154 @@
+<template>
+  <div>
+    <el-select
+      v-if="isMultiple"
+      v-model="form.resCode"
+      placeholder="请选择水库名称"
+      style="width: 100%"
+      v-scroll="selectSearch"
+      filterable
+      clearable
+      remote
+      reserve-keyword
+      :remote-method="remoteMethod"
+      :loading="loading"
+      @change="handleChange"
+      multiple
+    >
+      <el-option
+        v-for="dict in dikeNameOptions"
+        :key="dict.id"
+        :label="dict.resName"
+        :value="dict.resCode"
+        @click.native="chooseDike(dict)"
+      ></el-option>
+    </el-select>
+    <el-select
+      v-else
+      v-model="form.resCode"
+      placeholder="请选择水库名称"
+      style="width: 100%"
+      v-scroll="selectSearch"
+      filterable
+      clearable
+      remote
+      reserve-keyword
+      :remote-method="remoteMethod"
+      :loading="loading"
+      @change="handleChange"
+      :disabled="disabled"
+    >
+      <el-option
+        v-for="dict in dikeNameOptions"
+        :key="dict.id"
+        :label="dict.resName"
+        :value="dict.resCode"
+        @click.native="chooseDike(dict)"
+      ></el-option>
+    </el-select>
+  </div>
+</template>
+<script>
+import { listBase, getJbxx } from "@/api/res/base";
+export default {
+  props: ["form", "isMultiple",'disabled'],
+  data() {
+    return {
+      loading: false,
+      dikeNameOptions: [],
+      // 堤防查询参数
+      dikeNameQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        ids: null,
+        data: {
+          status:6,
+          dikeName: null,
+          dikeCode: null,
+        },
+        cv:{
+          name:'resCode',
+          value:null,
+          type:'like'
+        },
+        // 排序方式
+        params: {
+          // 按哪个字段排序
+          orderBy: "create_time",
+          // desc降序，升序asc
+          sortBy: "desc",
+        },
+      },
+    };
+  },
+  created() {
+    if (this.form.resName) {
+      this.dikeNameQueryParams.cv.value = this.form.resName;
+    }
+    listBase(this.dikeNameQueryParams).then((res) => {
+      console.log(111, res);
+      this.dikeNameOptions = res.records;
+    });
+  },
+  methods: {
+    aaaa(value) {
+      console.log(999);
+      return true;
+    },
+    reset() {
+      this.dikeNameQueryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        ids: null,
+        data: {
+          dikeName: null,
+          dikeCode: null,
+        },
+        // 排序方式
+        params: {
+          // 按哪个字段排序
+          orderBy: "create_time",
+          // desc降序，升序asc
+          sortBy: "desc",
+        },
+      };
+    },
+    handleChange(keyWork) {
+      // console.log(1111, this.form);
+      // if (!keyWork) {
+      this.reset();
+      listBase(this.dikeNameQueryParams).then((res) => {
+        this.dikeNameOptions = res.records;
+      });
+      // }else{
+
+      // }
+    },
+    remoteMethod(query) {
+      this.selectLoading = true;
+      if (query !== "") {
+        // console.log(444, query);
+        this.dikeNameQueryParams.data.dikeName = query;
+      } else {
+        this.reset();
+      }
+      listBase(this.dikeNameQueryParams).then((res) => {
+        this.dikeNameOptions = res.records;
+        this.selectLoading = false;
+      });
+    },
+    selectSearch() {
+      this.dikeNameQueryParams.pageNum += 1;
+      listBase(this.dikeNameQueryParams).then((res) => {
+        // console.log(111, res);
+        this.dikeNameOptions = [...this.dikeNameOptions, ...res.records];
+        // console.log(111, this.dikeNameOptions);
+      });
+    },
+    chooseDike(item) {
+      this.form.resName = item.resName;
+      this.form.resCode=item.resCode
+    },
+  },
+};
+</script>

src/views/res/engineeringCondition/resBaseInfo/index.vue

@@ -85,7 +85,6 @@
         </template>
       </el-table-column>
       <el-table-column label="归口管理部门" align="center" prop="admDep" :formatter="admDepFormat" min-width="120"/>
-      <el-table-column label="水库概况" align="center" prop="resOv" min-width="120"/>
       <el-table-column label="记录生效时间" align="center" prop="effDate" min-width="120">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.effDate, '{y}-{m}-{d}') }}</span>
@@ -121,7 +120,7 @@
 
     <!-- 添加或修改水库基本信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
         <el-form-item label="水库名称" prop="resName">
           <el-input v-model="form.resName" placeholder="请输入水库名称" />
         </el-form-item>
@@ -151,16 +150,37 @@
           <el-input v-model="form.cmun" placeholder="请输入主管单位" />
         </el-form-item>
         <el-form-item label="工程等别" prop="engGrad">
-          <el-input v-model="form.engGrad" placeholder="请输入工程等别" />
+          <el-select v-model="form.engGrad" placeholder="请选择工程等别" style="width:100%">
+            <el-option
+              v-for="dict in engGradOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="工程规模" prop="engScal">
-          <el-input v-model="form.engScal" placeholder="请输入工程规模" />
+          <el-select v-model="form.engScal" placeholder="请选择工程规模" style="width:100%">
+            <el-option
+              v-for="dict in engScalOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="坝址控制流域面积" prop="watShedArea">
           <el-input v-model="form.watShedArea" placeholder="请输入坝址控制流域面积" />
         </el-form-item>
         <el-form-item label="工程建设状况" prop="engStat">
-          <el-input v-model="form.engStat" placeholder="请输入工程建设状况" />
+          <el-select v-model="form.engStat" placeholder="请选择工程建设状况" style="width:100%">
+            <el-option
+              v-for="dict in engStatOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="开工时间" prop="startDate">
           <el-date-picker clearable size="small" style="width: 200px"
@@ -179,10 +199,18 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="归口管理部门" prop="admDep">
-          <el-input v-model="form.admDep" placeholder="请输入归口管理部门" />
-        </el-form-item>
+          <el-select v-model="form.admDep" placeholder="请选择归口管理部门" style="width:100%">
+            <el-option
+              v-for="dict in admDepOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>        </el-form-item>
         <el-form-item label="水库概况" prop="resOv">
-          <el-input v-model="form.resOv" placeholder="请输入水库概况" />
+          <el-input v-model="form.resOv" placeholder="请输入水库概况"
+                    type="textarea"
+          />
         </el-form-item>
         <el-form-item label="记录生效时间" prop="effDate">
           <el-date-picker clearable size="small" style="width: 200px"

src/views/res/engineeringCondition/reslimit/index.vue

@@ -100,13 +100,13 @@
 
     <!-- 添加或修改水库汛限水位对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="160px">
+        <el-form-item label="水库名称" prop="resName">
+          <link-res :form="form"></link-res>
+        </el-form-item>
         <el-form-item label="水库代码" prop="resCode">
           <el-input v-model="form.resCode" placeholder="请输入水库代码" />
         </el-form-item>
-        <el-form-item label="水库名称" prop="resName">
-          <el-input v-model="form.resName" placeholder="请输入水库名称" />
-        </el-form-item>
         <el-form-item label="状态">
           <el-radio-group v-model="form.status">
             <el-radio
@@ -142,9 +142,11 @@
 
 <script>
 import { listExamine, getExamine, delExamine, addExamine, updateExamine, exportExamine } from "@/api/res/examine";
+import LinkRes from "../../../../components/linkNameSelect/linkRes.vue";
 
 export default {
   name: "Examine",
+  components: {LinkRes},
   data() {
     return {
       // 遮罩层