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

src/api/workforceManagement/team.js

@@ -31,6 +31,14 @@ export async function saveteam(data) {
     }
     return Promise.reject(new Error(res.data.message));
 }
+// 编辑班组
+export async function updateteam(data) {
+    const res = await request.put(`/main/team/update`, data);
+    if (res.data.code == 0) {
+        return res.data.message;
+    }
+    return Promise.reject(new Error(res.data.message));
+}
 // 列表
 export async function getteampage(data) {
     const res = await request.get(`/main/team/page`, {

src/views/ledgerAssets/equipment/components/DialogGoods.vue

@@ -153,22 +153,23 @@
             label: '型号',
             showOverflowTooltip: true
           },
-          {
-            prop: 'type',
-            label: '物品类型',
-            showOverflowTooltip: true,
-            formatter: (_row) => this.getDictValue('类型用途', _row.type)
-          },
+          // {
+          //   prop: 'type',
+          //   label: '物品类型',
+          //   showOverflowTooltip: true,
+          //   formatter: (_row) => this.getDictValue('类型用途', _row.type)
+          // },
           {
             prop: 'categoryLevelPath',
             label: '分类',
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
           },
           {
             columnKey: 'action',
             slot: 'action',
             align: 'center',
-            fixed: 'right'
+            fixed: 'right',
+            width:50
           }
         ];
       }

src/views/workforceManagement/team/components/edit.vue

@@ -120,7 +120,8 @@ import {
   listWorkshopByParentId,
   listFactoryLineByParentId,
   listByProductionLineId,
-  saveteam
+  saveteam,
+  updateteam
 } from '@/api/workforceManagement/team';
 import userTable from './userTable.vue';
 export default {
@@ -235,7 +236,8 @@ export default {
         if (this.type == 'add') {
           delete par.id;
         }
-        saveteam(par)
+        const saveOrUpdate = this.type == 'add'? saveteam : updateteam
+        saveOrUpdate(par)
           .then((msg) => {
             this.loading = false;
             this.$message.success(msg);

src/views/workforceManagement/team/components/staffSelection.vue

@@ -42,7 +42,8 @@
                 <el-table
                   :data="staffList"
                   tooltip-effect="dark"
-                  style="width: 100%"
+                  style="width: 100%;"
+                  max-height="500"
                   :header-cell-style="{
                     background: '#F0F3F3',
                     border: 'none'
@@ -95,6 +96,7 @@
                   :data="selectStafflist"
                   tooltip-effect="dark"
                   style="width: 100%"
+                  max-height="500"
                   :header-cell-style="{
                     background: '#F0F3F3',
                     border: 'none'
@@ -259,13 +261,14 @@ export default {
   }
 };
 </script>
-  
+
   <style lang='scss' scoped>
 .container {
   padding: 10px 0;
 }
 .zw-container {
   height: 500px;
+  overflow-y: auto;
 }
 .zw-header-title {
   display: inline-block;
@@ -288,7 +291,8 @@ export default {
 }
 .zw-page {
   background: #fff;
-  //   padding: 20px 0;
+  //padding: 20px 0;
+  height:600px;
   .zw-page-left {
     padding: 0 10px;
   }
@@ -335,4 +339,4 @@ export default {
   font-size: 12px;
   color: #909090;
 }
-</style>
+</style>