Преглед изворни кода

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

Z пре 1 година
родитељ
комит
c1c6106e9d
3 измењених фајлова са 15 додато и 7 уклоњено
  1. 10 2
      src/views/material/BOMmanage/details.vue
  2. 4 4
      src/views/material/product/detail.vue
  3. 1 1
      vue.config.js

+ 10 - 2
src/views/material/BOMmanage/details.vue

@@ -103,14 +103,22 @@
                 <document></document>
               </el-tab-pane>
               <el-tab-pane
-                v-if="currentNodeData.children?.length < 1"
+                v-if="
+                  currentNodeData.bomType == 2 &&
+                  treeList.length > 0 &&
+                  currentNodeData.children?.length < 1
+                "
                 label="工艺路线"
                 name="工艺路线"
               >
                 <routing :taskParam="currentNodeData"></routing>
               </el-tab-pane>
               <el-tab-pane
-                v-if="currentNodeData.children?.length < 1"
+                v-if="
+                  currentNodeData.bomType == 2 &&
+                  treeList.length > 0 &&
+                  currentNodeData.children?.length < 1
+                "
                 label="工艺"
                 name="工艺"
               >

+ 4 - 4
src/views/material/product/detail.vue

@@ -140,7 +140,7 @@
           <el-col :span="8">
             <el-form-item label="所属部门">
               <deptSelect
-                v-model="form.deptLeaderId"
+                v-model="form.chargeDeptId"
                 @changeGroup="searchDeptNodeClick"
               />
             </el-form-item>
@@ -149,7 +149,7 @@
             <el-form-item label="负责人">
               <personSelect
                 ref="directorRef"
-                v-model="form.deptIds"
+                v-model="form.chargeUserId"
                 @selfChange="handleDirectorChange"
                 :init="false"
               />
@@ -348,7 +348,7 @@
 
         this.categoryLevelPathId = info.category.categoryLevelPathIdParent;
         this.judgeSet(info);
-        this.searchDeptNodeClick(this.form.deptLeaderId);
+        this.searchDeptNodeClick(this.form.chargeDeptId);
       },
       // 判断字段类型并赋值
       judgeSet(info) {
@@ -391,7 +391,7 @@
       // 选择所属部门
       searchDeptNodeClick(id, info) {
         // 根据部门获取人员
-        const params = { executeGroupId: id };
+        const params = { executeGroupId: id ? id : '' };
         this.$nextTick(() => {
           this.$refs.directorRef.getList(params);
         });

+ 1 - 1
vue.config.js

@@ -33,7 +33,7 @@ module.exports = {
       '/api': {
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.147:18086',
-        target: 'http://192.168.1.147:18086',
+        target: 'http://192.168.1.125:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''