提交代码

src/api/gas/user.js

@@ -8,10 +8,11 @@ export function listUser(query) {
     params: query
   })
 }// 工人列表
-export function getWorker() {
+export function getWorker(data) {
   return request({
     url: '/gas/user/getWorker',
     method: 'get',
+    params:data
   })
 }
 

src/views/gas/area/index.vue

@@ -397,8 +397,14 @@ export default {
       }
       return name
     },
-    getWorkerList() {
-      getWorker().then(req => {
+    getWorkerList(ranks) {
+      let data = null
+      if(ranks){
+        data = {
+          ranks:ranks
+        }
+      }
+      getWorker(data).then(req => {
         this.workerList = req.data
       })
     },

src/views/gas/courtyardNetworkManagement/index.vue

@@ -15,17 +15,9 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建人" prop="createBy">
-        <el-select v-model="queryParams.createBy" filterable placeholder="请选择创建人" clearable size="small">
-          <el-option v-for="item in workerList"
-                     :key="item.id"
-                     :label="item.name"
-                     :value="item.id"/>
-        </el-select>
-      </el-form-item>
       <el-form-item label="队伍">
         <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍"
-                   :disabled="postName.indexOf('xx') > -1">
+                   :disabled="postName.indexOf('xx') > -1" @change="getWorkerList(queryParams.ranks);queryParams.createBy = undefined">
           <el-option
             v-for="item in postOptions"
             :key="item.postId"
@@ -34,6 +26,14 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="创建人" prop="createBy">
+        <el-select v-model="queryParams.createBy" filterable placeholder="请选择创建人" clearable size="small">
+          <el-option v-for="item in workerList"
+                     :key="item.id"
+                     :label="item.name"
+                     :value="item.id"/>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -334,8 +334,14 @@ export default {
         this.postOptions = response.data;
       });
     },
-    getWorkerList() {
-      getWorker().then(req => {
+    getWorkerList(ranks) {
+      let data = null
+      if(ranks){
+        data = {
+          ranks:ranks
+        }
+      }
+      getWorker(data).then(req => {
         this.workerList = req.data
       })
     },

src/views/gas/pressureRegulatingBox/index.vue

@@ -502,8 +502,14 @@ export default {
     this.getWorkerList();
   },
   methods: {
-    getWorkerList() {
-      getWorker().then(req => {
+    getWorkerList(ranks) {
+      let data = null
+      if(ranks){
+        data = {
+          ranks:ranks
+        }
+      }
+      getWorker(data).then(req => {
         this.workerList = req.data
       })
     },

src/views/gas/regulatingBoxMaintenance/index.vue

@@ -242,7 +242,7 @@
           <el-input v-model="form.number" placeholder="请输入编号"/>
         </el-form-item>
         <el-form-item label="管理所" prop="administrativeOffice">
-          <el-select v-model="form.administrativeOffice" placeholder="请选择管理所" clearable multiple>
+          <el-select v-model="form.administrativeOffice" placeholder="请选择管理所" clearable>
             <el-option
               v-for="dict in dict.type.administrative_office"
               :key="dict.value"

src/views/gas/regulatorBox/index.vue

@@ -22,16 +22,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="创建人" prop="createBy">
-        <el-select v-model="queryParams.createBy" filterable placeholder="请选择创建人" clearable size="small">
-          <el-option v-for="item in workerList"
-                     :key="item.id"
-                     :label="item.name"
-                     :value="item.id"/>
-        </el-select>
-      </el-form-item>
       <el-form-item label="队伍" >
-        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍" :disabled="postName.indexOf('xx') > -1">
+        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍" :disabled="postName.indexOf('xx') > -1" @change="getWorkerList(queryParams.ranks);queryParams.createBy = undefined">
           <el-option
             v-for="item in postOptions"
             :key="item.postId"
@@ -40,6 +32,14 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="创建人" prop="createBy">
+        <el-select v-model="queryParams.createBy" filterable placeholder="请选择创建人" clearable size="small">
+          <el-option v-for="item in workerList"
+                     :key="item.id"
+                     :label="item.name"
+                     :value="item.id"/>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -792,8 +792,14 @@ export default {
         this.postOptions = response.data;
       });
     },
-    getWorkerList() {
-      getWorker().then(req => {
+    getWorkerList(ranks) {
+      let data = null
+      if(ranks){
+        data = {
+          ranks:ranks
+        }
+      }
+      getWorker(data).then(req => {
         this.workerList = req.data
       })
     },