From 9159f23362e43cfed2623e619c2d659680967810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 9 May 2021 22:40:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E4=BB=93=E5=BA=93=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=9F=E8=B4=A3=E4=BA=BA=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/api/api.js                     |  6 +-----
 .../src/views/system/modules/DepotModal.vue   | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/jshERP-web/src/api/api.js b/jshERP-web/src/api/api.js
index 28f9117a..0b36ae5e 100644
--- a/jshERP-web/src/api/api.js
+++ b/jshERP-web/src/api/api.js
@@ -16,9 +16,7 @@ const queryall = (params)=>getAction("/sys/role/queryall",params);
 //用户管理
 const addUser = (params)=>postAction("/user/addUser",params);
 const editUser = (params)=>putAction("/user/updateUser",params);
-const queryUserRole = (params)=>getAction("/sys/user/queryUserRole",params);
-const getUserList = (params)=>getAction("/sys/user/list",params);
-const frozenBatch = (params)=>putAction("/sys/user/frozenBatch",params);
+const getUserList = (params)=>getAction("/user/getUserList",params);
 //验证用户是否存在
 const checkOnlyUser = (params)=>getAction("/sys/user/checkOnlyUser",params);
 //改变密码
@@ -173,10 +171,8 @@ export {
   findUserRole,
   addUser,
   editUser,
-  queryUserRole,
   getUserList,
   queryall,
-  frozenBatch,
   checkOnlyUser,
   changePassword,
   getPermissionList,
diff --git a/jshERP-web/src/views/system/modules/DepotModal.vue b/jshERP-web/src/views/system/modules/DepotModal.vue
index da887872..ea496010 100644
--- a/jshERP-web/src/views/system/modules/DepotModal.vue
+++ b/jshERP-web/src/views/system/modules/DepotModal.vue
@@ -24,7 +24,11 @@
           <a-input placeholder="请输入搬运费" v-decorator.trim="[ 'truckage' ]" suffix="元"/>
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="负责人">
-          <a-input placeholder="请输入负责人" v-decorator.trim="[ 'principalName' ]" />
+          <a-select placeholder="选择负责人" v-decorator="[ 'principal' ]" :dropdownMatchSelectWidth="false">
+            <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
+              {{ item.userName }}
+            </a-select-option>
+          </a-select>
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
           <a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
@@ -38,7 +42,7 @@
 </template>
 <script>
   import pick from 'lodash.pick'
-  import {addDepot,editDepot,checkDepot } from '@/api/api'
+  import {addDepot,editDepot,checkDepot,getUserList } from '@/api/api'
   export default {
     name: "DepotModal",
     data () {
@@ -46,6 +50,7 @@
         title:"操作",
         visible: false,
         model: {},
+        userList: [],
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },
@@ -67,6 +72,7 @@
       }
     },
     created () {
+      this.initUser()
     },
     methods: {
       add () {
@@ -78,7 +84,7 @@
         this.visible = true;
         this.$nextTick(() => {
           this.form.setFieldsValue(pick(this.model,
-            'name', 'address', 'warehousing', 'truckage', 'principalName', 'sort', 'remark'))
+            'name', 'address', 'warehousing', 'truckage', 'principal', 'sort', 'remark'))
         });
       },
       close () {
@@ -130,6 +136,13 @@
             callback(res.data);
           }
         });
+      },
+      initUser() {
+        getUserList({}).then((res)=>{
+          if(res) {
+            this.userList = res;
+          }
+        });
       }
     }
   }