生产处置单修改

src/api/qualityManagement/productionTesting/productionDisposition.js

@@ -4,8 +4,8 @@ import request from '@/axios';
 // 获取故障分类下拉
 export const getFaultClassList = (params) => {
   return request({
-    // url: '/api/blade-desk/QA/Ng/listForSelectGZLB',
-    url:"/api/blade-system/dict/dictionary?code=FAULT_TYPE",
+    url: '/api/blade-desk/QA/Ng/listForSelectGZLB',
+    // url:"/api/blade-system/dict/dictionary?code=FAULT_TYPE",
     method: 'get',
     params
   });

src/views/productionDisposition/hearingDialog.vue

@@ -166,9 +166,9 @@
                                 <span><i style="color:red">*</i>故障类别</span>
                             </template>
                             <template #default="scope">
-                                <el-select v-model="scope.row.ngType2Id" :disabled="type == 'view'">
-                                    <el-option v-for="item in errorTypeArr" :key="item.id" :value="item.dictKey"
-                                        :label="item.dictValue"></el-option>
+                                <el-select v-model="scope.row.ngType2Id" :disabled="type == 'view'" @change="() => changeGzType(scope.row.ngType2Id,scope.$index)">
+                                    <el-option v-for="item in errorTypeArr" :key="item.id" :value="item.id"
+                                        :label="item.name"></el-option>
                                 </el-select>
                             </template>
                         </el-table-column>
@@ -179,7 +179,7 @@
                             <template #default="scope">
                                 <el-select v-model="scope.row.ngType3Id" :disabled="!scope.row.ngType2Id || type == 'view'"  
                                 @change="(val) => changeBigQuestion(val,scope.$index)" >
-                                    <el-option v-for="item in errorBigArr" :key="item.id" :value="item.id"
+                                    <el-option v-for="item in scope.row.errorBigArr" :key="item.id" :value="item.id"
                                         :label="item.name"></el-option>
                                 </el-select>
                             </template>
@@ -350,7 +350,7 @@ export default {
     mounted() {
         this.openShow = this.showDialog
         this.getError()
-        this.getQuestionBig()
+        // this.getQuestionBig()
         this.getDetail()
         // this.getHistory()
         this.getDisposeType()
@@ -530,6 +530,15 @@ export default {
                 this.errorBigArr = res.data.data
             })
         },
+        changeGzType(val,index){
+            this.faultList[index].ngType3Id = ''
+            this.faultList[index].ngType4Id = ''
+            getQuestionClassList({
+                parentId:val
+            }).then(res =>{
+                this.faultList[index].errorBigArr = res.data.data
+            })
+        },
         changeBigQuestion(val,index){
             this.faultList[index].ngType4Id = ''
             this.getQuestionSmall(val,index)

src/views/qualityManagement/inspectionArchiving/ERecord/index.vue

@@ -22,7 +22,7 @@
       <template #menu="{ row }">
         <span>
           <el-button type="text"  @click="inspectionRecord(row)">检验记录</el-button>
-          <el-button v-if="row.yieldType == 1" type="text"  @click="rbPrint(row,2)">热表打印</el-button>
+          <el-button v-if="row.yieldType == 12001" type="text"  @click="rbPrint(row,2)">热表打印</el-button>
           <el-button v-else type="text"  @click="sjPrint(row)">烧结打印</el-button>
         </span>
         <el-button type="text"  @click="handleThickness(row)">测厚打印</el-button>
@@ -763,7 +763,7 @@ export default {
       this.checkedList = []
       this.prWorkPlanList = []
       this.checkRow = row
-      // if(row.yieldType == 2){
+      if(row.yieldType == 12002){
         getProcessList({
           woId:'2019646268865155074'
           // woId:row.woId
@@ -784,9 +784,9 @@ export default {
           this.planOpenSj = true
           this.previewOpen = true
           })
-      // }else{
-      //   this.showSjPrint = true
-      // }
+      }else{
+        this.showSjPrint = true
+      }
     },
     handleThickness(row){
       window.open(window.THICKNESS_PRINT+'?woId='+row.woId)

src/views/qualityManagement/reviewFormMess/options.js

@@ -69,7 +69,7 @@ export const insideOption = {
         },
         {
             label: '物料名称',
-            prop: 'goodName',
+            prop: 'partName',
             search: false,
             sortable: true,
             span: 12,
@@ -288,7 +288,7 @@ export const erpOption = {
             // prop: 'dutyPart',
             prop:'p5layer1',
             // bind: 'dsPart.partCode',
-            search: true,
+            search: false,
             sortable: true,
             span: 12,
             width:150
@@ -300,7 +300,7 @@ export const erpOption = {
             // prop: 'dutyBatNo',
             prop: 'p5layer3',
             // bind: 'dsPart.plate',
-            search: true,
+            search: false,
             sortable: true,
             span: 12,
             display: false,