工厂模型bug修复提交

src/enum/dict.js

@@ -40,6 +40,5 @@ export const numberList = [
   'schedule_type',
   'leadtime_unit',
   'inspection_scheme',
-  'angle',
-  'weight_unit'
+  'angle'
 ];

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

@@ -75,7 +75,12 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="负责人部门:" prop="extInfo.principalDep">
-            <ele-tree-select
+            <deptSelect
+              v-model="form.extInfo.principalDep"
+              @changeGroup="change_principalDep"
+              placeholder="请选择负责人部门"
+            />
+<!--            <ele-tree-select
               clearable
               :data="options_groupId"
               v-model="form.extInfo.principalDep"
@@ -84,12 +89,17 @@
               placeholder="请选择负责人部门"
               @change="change_principalDep"
               default-expand-all
-            />
+            /> -->
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="负责人:" prop="leaderId">
-            <el-select
+            <personSelect
+              ref="directorRef"
+              v-model="form.leaderId"
+              :init="false"
+            />
+            <!-- <el-select
               v-model="form.leaderId"
               placeholder="请选择负责人"
               style="width: 100%"
@@ -101,7 +111,7 @@
                 :value="item.id"
               >
               </el-option>
-            </el-select>
+            </el-select> -->
           </el-form-item>
         </el-col>
         <el-col :span="12" style="margin-bottom: 22px">
@@ -128,6 +138,8 @@
 <script>
 import { saveOrUpdate } from '@/api/factoryModel';
 import { getUserPage } from '@/api/system/organization';
+import deptSelect from '@/components/CommomSelect/dept-select.vue';
+import personSelect from '@/components/CommomSelect/person-select.vue';
 export default {
   props: {
     options_groupId: {
@@ -148,6 +160,10 @@ export default {
       this.toTreeData(nval);
     }
   },
+  components: {
+    deptSelect,
+    personSelect
+  },
   data() {
     const defaultForm = function () {
       return {
@@ -211,6 +227,12 @@ export default {
     open(type, row) {
       this.type = type;
       this.visible = true;
+      if(row.extInfo.principalDep){
+         const params = { executeGroupId: row.extInfo.principalDep };
+         this.$nextTick(() => {
+           this.$refs.directorRef.getList(params);
+         });
+      }
       if (type == 'edit') {
         for (const key of Object.keys(this.form)) {
           if (key !== 'extInfo') {
@@ -267,20 +289,25 @@ export default {
       });
     },
     // 选择负责人部门
-    change_principalDep() {
+    change_principalDep(id,info) {
       this.form.leaderId = '';
-      this.getUserPage();
+      // this.getUserPage();
+      // 根据部门获取人员
+      const params = { executeGroupId: id };
+      this.$nextTick(() => {
+        this.$refs.directorRef.getList(params);
+      });
     },
     // 获取人员
-    getUserPage() {
-      let par = {
-        groupId: this.form.extInfo.principalDep,
-        size: 999
-      };
-      getUserPage(par).then((res) => {
-        this.options.leaderId = res.list;
-      });
-    }
+    // getUserPage() {
+    //   let par = {
+    //     groupId: this.form.extInfo.principalDep,
+    //     size: 999
+    //   };
+    //   getUserPage(par).then((res) => {
+    //     this.options.leaderId = res.list;
+    //   });
+    // }
   }
 };
 </script>

src/views/material/productLinkMaterial/components/link-material-dialog.vue

@@ -1,7 +1,7 @@
 <template>
-  <ele-modal :visible.sync="visible" title="" width="90%" @close="cancel">
+  <ele-modal :visible.sync="visible" title="" width="95%" @close="cancel">
     <el-row :gutter="40">
-      <el-col :span="12">
+      <el-col :span="11">
         <headerTitle>
           <template v-slot:title>
             可选
@@ -75,7 +75,7 @@
         >
         </ele-pro-table>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="13">
         <headerTitle
           ><template v-slot:title
             >已关联
@@ -169,8 +169,9 @@
           <template v-slot:angle="{ row }">
             <DictSelection dictName="角度" clearable v-model="row.angle">
             </DictSelection>
-          </template> </ele-pro-table
-      ></el-col>
+          </template> 
+          </ele-pro-table>
+        </el-col>
     </el-row>
 
     <div slot="footer" class="footer">
@@ -290,7 +291,7 @@
                   label: '产能',
                   slot: 'capacity',
                   action: 'capacity',
-                  width: 200
+                  width: 240
                 }
               ]
             : [])