Merge branch 'js_dev' of http://113.44.0.55:8014/jiaxiaoqiang/JG-ADMIN-TEMP into js_dev

src/views/base/modeling/station/index.vue

@@ -183,7 +183,7 @@ const binding = (row) => {
   stationDevice.value = row;
 };
 const onSelectedFinish = (selectedValue) => {
-  form.value.manager = selectedValue.userName;
+  form.value.manager = selectedValue.nickName;
   form.value.managerId = selectedValue.id;
 };
 const stationUpdate = ref({});
@@ -276,9 +276,9 @@ option.value = Object.assign(option.value, {
       prop: "manager",
       overHidden: true,
       width: 90,
-      type: "select",
+      /*type: "select",
       dicData: dicts.user_name_list,
-      props: {"label": "dictLabel","value":"dictValue"},
+      props: {"label": "dictLabel","value":"dictValue"},*/
       rules: [
         {
           required: true,

src/views/storage/wmsOrder/components/choice_out_materials.vue

@@ -103,7 +103,7 @@ option.value = Object.assign(option.value, {
   column: [
     {
       label: "仓库编码",
-      prop: "houseType",
+      prop: "houseNo",
       type: "select",
       search: true,
       width: 90,

src/views/system/user/index.vue

@@ -256,7 +256,9 @@
                 v-model="formData.deptIds"
                 placeholder="请选择所属部门"
                 :data="deptList"
+                :multiple="true"
                 filterable
+                show-checkbox
                 load-key="deptName"
                 value-key="id"
                 :props="{
@@ -275,7 +277,11 @@
         <el-row :gutter="22">
           <el-col :span="22">
             <el-form-item label="角色" prop="roleIds">
-              <el-select v-model="formData.roleIds" placeholder="请选择">
+              <el-select
+                v-model="formData.roleIds"
+                multiple
+                placeholder="请选择"
+              >
                 <el-option
                   v-for="item in roleList"
                   :key="item.id"
@@ -290,7 +296,11 @@
         <el-row :gutter="22">
           <el-col :span="22">
             <el-form-item label="岗位" prop="postIds">
-              <el-select v-model="formData.postIds" placeholder="请选择">
+              <el-select
+                v-model="formData.postIds"
+                multiple
+                placeholder="请选择"
+              >
                 <el-option
                   v-for="item in postList"
                   :key="item.id"