修改bug

src/components/processSubmitDialog/processSubmitDialog.vue

@@ -340,6 +340,12 @@
               return roleOption.name;
             }
           }
+        } else if (row.type == 11) {
+          for (const roleOption of this.roleOptions) {
+            if (roleOption.id === option) {
+              return roleOption.name;
+            }
+          }
         } else if (row.type === 20 || row.type === 21) {
           for (const deptOption of this.deptOptions) {
             if (deptOption.id === option) {

src/views/batchRecord/components/printSelector.vue

@@ -1,6 +1,7 @@
 <template>
   <div style="display: inline-block; margin-left: 8px">
     <el-button
+      v-if="$hasPermission('mes:batchRecord:print')"
       type="primary"
       icon="el-icon-printer"
       size="small"

src/views/batchRecord/components/tables/qualityReportApproval.vue

@@ -219,7 +219,11 @@
           { value: 7, label: '作废' }
         ],
         printOptions: [
-          { key: 'finishedProductReport', label: '成品检验报告', code: 'ZL-055' }
+          {
+            key: 'finishedProductReport',
+            label: '成品检验报告',
+            code: 'ZL-055'
+          }
         ],
         tableData: [],
         selection: []

src/views/produce/components/qualityInspection/components/selfInspectionReporting.vue

@@ -214,8 +214,9 @@
             type="primary"
             @click="addInspection"
             v-if="
-              (form.items.length == 0 && clientEnvironmentId != 9) ||
-              clientEnvironmentId == 9
+              ((list.length == 0 && clientEnvironmentId != 9) ||
+                clientEnvironmentId == 9) &&
+              $hasPermission('mes:firstarticledualinspectionitem:choose')
             "
             >选择质检方案</el-button
           >

src/views/produce/components/qualityInspection/components/selfInspectionRequest.vue

@@ -118,8 +118,9 @@
             type="primary"
             @click="addInspection"
             v-if="
-              (list.length == 0 && clientEnvironmentId != 9) ||
-              clientEnvironmentId == 9
+              ((list.length == 0 && clientEnvironmentId != 9) ||
+                clientEnvironmentId == 9) &&
+              $hasPermission('mes:firstarticledualinspectionitem:choose')
             "
             >选择质检方案</el-button
           >

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

@@ -259,6 +259,8 @@
         this.type = type;
         this.dialogVisible = true;
         this.getData();
+        await this.$nextTick();
+
         const res = await parameterGetByCode({
           code: 'mes_craft_file_by_category_code'
         });
@@ -266,9 +268,9 @@
         const byCategory = res?.value === '1';
 
         if (byCategory) {
-          this.$refs.wokePopupRef.openTwo(req);
+          this.$refs.wokePopupRef?.openTwo(req);
         } else {
-          this.$refs.wokePopupRef.open(req);
+          this.$refs.wokePopupRef?.open(req);
         }
       },
 

src/views/produce/index.vue

@@ -1633,7 +1633,8 @@
 
         const req = {
           taskId: this.taskObj.id,
-          workOrderId: this.workListIds[0],
+          workOrderId:
+            row.workOrderId || row.mesWorkOrderId || this.workListIds[0],
           productCode: row.productCode
         };
 

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

@@ -674,11 +674,7 @@
                 staffDis: false, // 人员按钮
                 lineDis: false // 产线按钮
               },
-              isDisable:
-                this.form.workCenterId == item.workCenterId &&
-                item.type != 2 &&
-                item.type != 3 &&
-                item.type != 6,
+              isDisable: this.form.workCenterId == item.workCenterId,
               startDate: '', // 开始日期 (当前工序中最早的计划开始时间)
               endDate: '', // 结束日期 (当前工序中最晚的计划结束时间)
               workCenterId: item.workCenterId,

src/views/produceOrder/components/releaseDialog/planDotLineReleaseDialog.vue

@@ -681,10 +681,7 @@
               isDisable:
                 teamIdSet.has(item.executionTeamId) &&
                 this.$store.state.user.info.userId ==
-                  item.executionTeamLeaderId &&
-                item.type != 2 &&
-                item.type != 3 &&
-                item.type != 6,
+                  item.executionTeamLeaderId,
               startDate: '', // 开始日期 (当前工序中最早的计划开始时间)
               endDate: '', // 结束日期 (当前工序中最晚的计划结束时间)
               workCenterId: item.workCenterId,

vue.config.js

@@ -32,7 +32,7 @@ module.exports = {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
         // target: 'http://124.71.68.31:50001',
-        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18086', // 开发环境
@@ -45,7 +45,7 @@ module.exports = {
         // target: 'http://192.168.1.251:18186', // 测试环境
         // target: 'http://192.168.1.251:18087',
         // target: 'http://116.163.22.90:86/api', // 嘉实生产
-        target: 'http://aiot.zoomwin.com.cn:51001/api',
+        // target: 'http://aiot.zoomwin.com.cn:51005/api',
         // target: 'http://f222326r53.imwork.net',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {