Merge remote-tracking branch 'origin/dev' into dev

src/api/workforceManagement/team.js

@@ -88,4 +88,14 @@ export async function settingTeamTime(data) {
         return res.data.message;
     }
     return Promise.reject(new Error(res.data.message));
+}
+
+// 根据班组ids查所有人信息
+export async function listUserByIds(data) {
+    const res = await request.post(`/main/team/listUserByIds`, data);
+    console.log(res.data.code == 0)
+    if (res.data.code == 0) {
+        return res.data.data        ;
+    }
+    return Promise.reject(new Error(res.data.message));
 }

src/views/system/menu/components/menu-edit.vue

@@ -36,11 +36,11 @@
 
 
         <el-col :span="12">
-          <el-form-item v-if="form.rootId != -1" label="菜单图标:">
+          <el-form-item v-if="form.rootId != 99999" label="菜单图标:">
             <ele-icon-picker v-model="form.icon" placeholder="请选择菜单图标" :disabled="form.type === 2" />
           </el-form-item>
 
-          <el-form-item v-if="form.rootId == -1" label="菜单图标:">
+          <el-form-item v-if="form.rootId == 99999" label="菜单图标:">
             <el-input clearable v-model="form.icon" placeholder="请输入pda图标" />
           </el-form-item>
 

src/views/system/menu/index.vue

@@ -79,7 +79,7 @@
             class="ele-action"
             title="确定要删除吗？"
             @confirm="remove(row)"
-            v-if="row.id != -1"
+            v-if="row.id != 99999"
           >
             <template v-slot:reference>
               <el-link type="danger" :underline="false" icon="el-icon-delete">

src/views/technology/production/components/user-setting.vue

@@ -6,7 +6,7 @@
     :append-to-body="true"
     :close-on-click-modal="true"
     custom-class="ele-dialog-form"
-    :title="`给工序【${this.data?.code}${this.data?.name}】配置参数`"
+    :title="`给工序配置参数`"
     @update:visible="updateVisible"
   >
     <div class="ele-body">

src/views/technology/route/components/production/components/user-setting.vue

@@ -6,7 +6,7 @@
     :append-to-body="true"
     :close-on-click-modal="true"
     custom-class="ele-dialog-form"
-    :title="`给工序【${this.data?.code}${this.data?.name}】配置参数`"
+    :title="`给工序配置参数`"
     @update:visible="updateVisible"
   >
     <div class="ele-body">

src/views/workforceManagement/schedule/components/SchedulingGroup.vue

@@ -18,6 +18,8 @@
           placeholder="请选择"
           style="width: 100%"
           multiple
+          filterable
+          @change="changeTeam"
         >
           <el-option
             v-for="item in options"
@@ -28,6 +30,26 @@
           </el-option>
         </el-select>
       </el-form-item>
+
+
+      <el-form-item label="姓名"  style="margin-bottom: 22px">
+        <el-select
+          v-model="form.checkedUserIds"
+          placeholder="请选择"
+          style="width: 100%"
+          multiple
+         filterable
+        >
+          <el-option
+            v-for="item in userOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+
     </el-form>
     <template v-slot:footer>
       <el-button @click="handleClose">取消</el-button>
@@ -39,13 +61,14 @@
 </template>
   
   <script>
-import { getteampage } from '@/api/workforceManagement/team';
+import { getteampage, listUserByIds } from '@/api/workforceManagement/team';
 import { teamqueuesave } from '@/api/workforceManagement/schedule';
 export default {
   data() {
     const defaultForm = {
       name: '',
-      teamIds: []
+      teamIds: [],
+      checkedUserIds: []
     };
     return {
       defaultForm,
@@ -58,7 +81,8 @@ export default {
       },
       visible: false,
       loading: false,
-      options: []
+      options: [],
+      userOptions: []
     };
   },
   methods: {
@@ -105,7 +129,16 @@ export default {
       getteampage().then((res) => {
         this.options = res.list;
       });
-    }
+    },
+
+    changeTeam() {
+      console.log()
+
+      listUserByIds( this.form.teamIds).then(res => {
+
+        this.userOptions = res
+      })
+    },
   }
 };
 </script>