Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dengfei

src/api/workforceManagement/team.js

@@ -100,6 +100,7 @@ export async function settingTeamTime(data) {
 
 // 根据班组ids查所有人信息
 export async function listUserByIds(data) {
+    console.log(data,'data')
     const res = await request.post(`/main/team/listUserByIds`, data);
     console.log(res.data.code == 0)
     if (res.data.code == 0) {

src/views/factoryModel/station/components/edit.vue

@@ -860,10 +860,9 @@
             // }
           }
           this.form = Object.assign({}, this.form, res);
-          if (this.form?.extInfo?.teamId) {
+          if ( this.form?.extInfo?.teamId&&typeof(this.form?.extInfo?.teamId ) === 'string') {
             this.userListFn(this.form.extInfo.teamId);
           }
-
           if (res.taskList?.length) {
             this.form.taskNames = res.taskList.map((i) => i.name);
           }

src/views/system/organization/components/org-user-list.vue

@@ -241,6 +241,19 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'groupName',
+            label: '所属机构',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'deptName',
+            label: '隶属部门',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+
           {
             prop: 'jobNumber',
             label: '工号',
@@ -248,12 +261,12 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+
           {
             prop: 'postName',
             label: '岗位',
             showOverflowTooltip: true,
-            minWidth: 110,
-       
+            minWidth: 110
           },
           {
             prop: 'factoryId',
@@ -325,6 +338,7 @@
             width: 200,
             align: 'left',
             resizable: false,
+            fixed:'right',
             slot: 'action',
             showOverflowTooltip: true
           }
@@ -454,7 +468,8 @@
           sortBy: order.sort || '',
           size: limit,
           groupId: this.organizationId,
-          isQueryLZ: 1
+          isQueryLZ: 1,
+          affiDeptId:1
         });
       },
       /* 表格数据源 */