bug修复

src/views/batchRecord/components/editModal.vue

@@ -1248,6 +1248,10 @@
           );
           this.teamUserList = this.teamAllList[index];
         }
+        // 加载班组列表
+        if(this.teamList.length == 0 && this.form.teamId){
+          this.getTeamList(this.form.teamId);
+        }
         console.log('this.form', this.form);
         this.loading = false;
         this.getListByWorkOrderId();
@@ -1849,6 +1853,7 @@
         console.log('this.teamUserList', this.teamUserList);
       },
       async getTeamList(id) {
+        if(!id) return;
         const ids = id.split(',');
         this.teamList = [];
         this.teamUserList = [];

src/views/produce/components/feeding/index.vue

@@ -607,6 +607,7 @@
       },
 
       async getTeamList(id) {
+        if(!id) return;
         const ids = id.split(',');
         this.teamList = [];
         this.teamUserList = [];

src/views/produce/components/jobBooking/index.vue

@@ -772,6 +772,7 @@
       },
 
       async getTeamList(id) {
+        if(!id) return;
         const ids = id.split(',');
         this.teamList = [];
         this.teamUserList = [];

src/views/produce/components/prenatalExamination/releaseRulesDialog.vue

@@ -1211,6 +1211,7 @@
       },
 
       async getTeamList(id) {
+        if(!id) return;
         const ids = id.split(',');
         this.teamList = [];
         this.teamUserList = [];

src/views/produce/components/routings.vue

@@ -54,6 +54,13 @@
           <el-tab-pane label="生产明细">
             <productionDetails :workOrderInfo="routeObj"></productionDetails>
           </el-tab-pane>
+
+          <el-tab-pane label="记录详情" v-if="sourceTaskId && routeObj && sourceTaskId != '-1'">
+            <recordRules
+              :produceTaskId="sourceTaskId"
+              :workOrderInfo="routeObj"
+            ></recordRules>
+          </el-tab-pane>
         </el-tabs>
       </div>
     </ele-modal>
@@ -65,12 +72,15 @@
   import jobDetails from '../components/jobBooking/details.vue';
   import pickDetails from '../components/picking/details.vue';
   import productionDetails from '@/views//workOrderList/components/productionDetails.vue';
+  import recordRules from '@/views/produceOrder/components/recordRules/recordRules.vue';
+
   export default {
     components: {
       feedDetails,
       jobDetails,
       pickDetails,
-      productionDetails
+      productionDetails,
+      recordRules
     },
     props: {
       routeObj: {
@@ -87,7 +97,8 @@
         activeIndex: 0,
         desIndex: 0,
         newId: '',
-        curTaskObj: null
+        curTaskObj: null,
+        sourceTaskId: ''
       };
     },
     methods: {
@@ -104,6 +115,7 @@
 
           console.log('res', res, index);
           this.newId = res[index].taskId;
+          this.sourceTaskId = this.routeList[this.desIndex]?.sourceTaskId || '';
 
           console.log(this.routeObj, 666666);
 

src/views/produce/components/warehousing/index.vue

@@ -813,6 +813,7 @@
       },
 
       async getTeamList(id) {
+        if(!id) return;
         const ids = id.split(',');
         this.teamList = [];
         this.teamUserList = [];
@@ -828,6 +829,10 @@
 
           this.teamAllList.push(item.userVOList);
         });
+
+        if(this.form.teamId && this.teamUserList.length == 0){
+          this.checkTeamList(this.form.teamId);
+        }
       },
 
       changeId() {

src/views/produceOrder/components/details/index.vue

@@ -81,7 +81,12 @@
 
           <el-tab-pane
             label="记录详情"
-            v-if="sourceTaskId && workOrderInfo.bomCategoryId"
+            v-if="
+              sourceTaskId &&
+              workOrderInfo &&
+              sourceTaskId != '-1' &&
+              sourceTaskId != '-2'
+            "
           >
             <recordRules
               :produceTaskId="sourceTaskId"

vue.config.js

@@ -37,14 +37,14 @@ module.exports = {
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.125:18086',
-        target: 'http://192.168.1.116:18086', // 赵沙金
+        // target: 'http://192.168.1.116:18086', // 赵沙金
         // target: 'http://192.168.1.251:18086', // 开发环境
         // target: 'http://192.168.1.103:18086',192.168.1.116
         // target: 'http://192.168.1.144:18086',
         // target: 'http://192.168.1.30:18086',
         // target: 'http://192.168.1.211:18086',
         // target: 'http://192.168.1.33:18086',
-        // target: 'http://192.168.1.251:18186', // 测试环境
+        target: 'http://192.168.1.251:18186', // 测试环境
         // target: 'http://192.168.1.251:18087',
         // target: 'http://116.163.22.90:86/api', // 嘉实生产
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域