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

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/material/BOMmanage/components/baseInfo.vue

@@ -74,7 +74,11 @@
       <el-button
         type="primary"
         size="medium"
-        v-if="dataInfo.parentId != '0' && dataInfo.resourceBomId"
+        v-if="
+          dataInfo.parentId != '0' &&
+          dataInfo.resourceBomId &&
+          dataInfo.id != dataInfo.resourceBomId
+        "
         @click="bomConfig"
         >跳转来源版本</el-button
       >

src/views/material/BOMmanage/components/routing.vue

@@ -11,9 +11,16 @@
         row-key="id"
       >
         <!-- 表头工具栏 -->
+        <!-- v-if="attributeData.status != 1 && !isWt" -->
         <template v-slot:toolbar>
           <el-button
-            v-if="attributeData.status != 1 && !isWt"
+            v-if="
+              attributeData.approvalStatus != 1 &&
+              attributeData.approvalStatus != 2 &&
+              !isWt &&
+              attributeData.parentId == '0' &&
+              attributeData.id != attributeData.resourceBomId
+            "
             size="small"
             type="primary"
             icon="el-icon-plus"
@@ -45,7 +52,9 @@
             @click="handleDel(row)"
             v-if="
               attributeData.approvalStatus != 1 &&
-              attributeData.approvalStatus != 2
+              attributeData.approvalStatus != 2 &&
+              attributeData.parentId == '0' &&
+              attributeData.id != attributeData.resourceBomId
             "
             >删除</el-link
           >
@@ -170,6 +179,11 @@
         loading: false
       };
     },
+
+    created() {
+      console.log(this.attributeData, 'attributeDataattributeData');
+    },
+
     methods: {
       add() {
         console.log(this.taskParam, this.tableData);

src/views/material/BOMmanage/components/workmanship.vue

@@ -562,7 +562,16 @@
         });
         if (data?.length > 0) {
           this.currentTableData = data[0];
-          return data[0].taskParam;
+          let dataList = [];
+          if (data[0].taskParam.length != 0) {
+            dataList = data[0].taskParam.sort(
+              (it, ie) => Number(it.sort) - Number(ie.sort)
+            );
+          }
+
+          return dataList;
+
+          // return data[0].taskParam;
         } else {
           return [];
         }

src/views/material/BOMmanage/qualityTesting/term.vue

@@ -4,12 +4,13 @@
       ref="table"
       :columns="columns"
       :datasource="list"
-      height="calc(100vh - 500px)"
+      :height="tableHeight"
       tool-class="ele-toolbar-form"
       cache-key="inspectionClassify"
       row-key="qualityLevelId"
       :selection.sync="selection"
       @selection-change="handleSelectionChange"
+      @fullscreen-change="fullscreenChange"
     >
       <template v-slot:toolbar>
         <el-button @click="handAdd" size="mini" type="primary" v-if="!isView"
@@ -233,7 +234,8 @@
             slot: 'action',
             fixed: 'right'
           }
-        ]
+        ],
+        tableHeight: 'calc(100vh - 500px)'
       };
     },
 
@@ -262,6 +264,14 @@
         this.$refs.termRef.open(this.list);
       },
 
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 500px)';
+        }
+      },
+
       async getDictList(code) {
         let { data: res } = await getByCode(code);
         this.dictList = res.map((item) => {

src/views/rulesManagement/inspectionPoint/index.vue

@@ -314,7 +314,7 @@
         let url =
           this.ruleType == 7
             ? '/rulesManagement/serviceList/detail?date='
-            : ' /rulesManagement/inspectionPoint/detail?date=';
+            : '/rulesManagement/inspectionPoint/detail?date=';
         this.$router.push({
           path: url + new Date().valueOf(),
           query: {

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
         });
       },
       /* 表格数据源 */

vue.config.js

@@ -38,12 +38,12 @@ module.exports = {
 
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.125:18086',
-
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186',
 
         // target: 'http://192.168.1.251:18087',
 
-        target: 'http://192.168.1.116:18086',
+        // target: 'http://192.168.1.116:18086',
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {