冲突

src/components/selectPlanRules/selectPlanRules.vue

@@ -62,9 +62,11 @@
         })
       },
       // 1巡点检 2保养
-      ruleType: {
-        type: Number,
-        default: 1
+      ruleTypes: {
+        type: Array,
+        default: () => {
+          return [1, 2];
+        }
       }
     },
     computed: {
@@ -241,7 +243,7 @@
           size: limit,
           ...where,
           ...this.where,
-          ruleType: this.ruleType
+          ruleTypes: this.ruleTypes
         });
       },
       /* 刷新表格 */

src/views/material/BOMmanage/components/workingProcedure.vue

@@ -236,6 +236,7 @@
           <term
             :qualityParam="qualityParam"
             :isView="isView"
+            :isQualityInspection="false"
             ref="qualityParamRef"
           ></term>
         </el-tab-pane>
@@ -797,6 +798,13 @@
             ref="userSettingMatterProcessRef"
           ></userSettingMatterProcess>
         </el-tab-pane>
+        <el-tab-pane label="首件两检" name="首件两检">
+          <term
+            :qualityParam="firstArticleDualInspectionParam"
+            :isView="isView"
+            ref="firstArticleDualInspectionParamRef"
+          ></term>
+        </el-tab-pane>
       </el-tabs>
     </el-card>
     <!-- 选择工艺参数 -->
@@ -1239,6 +1247,7 @@
         },
 
         qualityParam: [],
+        firstArticleDualInspectionParam:[],
         qualityPointParam: [],
 
         fileShow: false,
@@ -1602,7 +1611,10 @@
         } else if (this.activeName === '质检项参数') {
           this.qualityParam =
             this.tableData.taskParam[this.currentIndex].qualityParam || [];
-        } else if (this.activeName === '生产节拍') {
+        }else if (this.activeName === '首件两检') {
+          this.firstArticleDualInspectionParam =
+            this.tableData.taskParam[this.currentIndex].firstArticleDualInspectionParam || [];
+        }  else if (this.activeName === '生产节拍') {
           this.beatParam =
             this.tableData.taskParam[this.currentIndex].beatParam ||
             this.beatParam;
@@ -1876,6 +1888,10 @@
                 this.tableData.taskParam[this.currentIndex].qualityParam =
                   this.$refs.qualityParamRef.getDate() || [];
               }
+              if (this.$refs.firstArticleDualInspectionParamRef) {
+                this.tableData.taskParam[this.currentIndex].firstArticleDualInspectionParam =
+                  this.$refs.firstArticleDualInspectionParamRef.getDate() || [];
+              }
               //工艺文件只传id
               let fileParamArr = JSON.parse(
                 JSON.stringify(this.tableData.taskParam)

src/views/material/BOMmanage/qualityTesting/term.vue

@@ -13,7 +13,7 @@
       @fullscreen-change="fullscreenChange"
     >
       <template v-slot:toolbar>
-        <el-button @click="handAdd" size="mini" type="primary" v-if="!isView"
+        <el-button @click="handAdd" size="mini" type="primary" v-if="!isView&&isQualityInspection" 
           >新增质检项</el-button
         >
         <el-button @click="handSelect" size="mini" type="primary" v-if="!isView"
@@ -152,6 +152,10 @@
       isView: {
         type: Boolean,
         default: false
+      },
+      isQualityInspection: {
+        type: Boolean,
+        default: true
       }
     },
 

src/views/rulesManagement/recordrulesexecutemethod/components/edit.vue

@@ -87,7 +87,6 @@
     recordrulesexecutemethodUpdate,
     recordrulesexecutemethodGetById
   } from '@/api/recordrulesexecutemethod/index';
-  import { load } from '@amap/amap-jsapi-loader';
 
   export default {
     mixins: [dictMixins],

src/views/technology/production/index.vue

@@ -59,6 +59,7 @@
             批量修改工作中心
           </el-button>
           <el-button
+            v-if="$hasPermission('main:producetask:pre_after_config_item')"
             size="small"
             type="primary"
             class="ele-btn-icon"
@@ -141,6 +142,7 @@
             :underline="false"
             icon="el-icon-setting"
             @click="openSettingMatterProcess(row)"
+            v-if="$hasPermission('main:produce_task:config_item')"
           >
             配置
           </el-link>

vue.config.js

@@ -37,6 +37,9 @@ module.exports = {
         // target: 'http://192.168.1.176:18086',
         target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186',
+        // target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.251:18186',
+        // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186', // 测试环境
         // target: 'http://192.168.1.251:18087',
         // target: 'http://192.168.1.116:18086',