diff --git a/src/api/qualityManagement/productionTesting/productionDisposition.js b/src/api/qualityManagement/productionTesting/productionDisposition.js
index 79e1efb..7ec719f 100644
--- a/src/api/qualityManagement/productionTesting/productionDisposition.js
+++ b/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
});
diff --git a/src/views/productionDisposition/hearingDialog.vue b/src/views/productionDisposition/hearingDialog.vue
index e3d53a8..15610b4 100644
--- a/src/views/productionDisposition/hearingDialog.vue
+++ b/src/views/productionDisposition/hearingDialog.vue
@@ -166,9 +166,9 @@
*故障类别
-
-
+ changeGzType(scope.row.ngType2Id,scope.$index)">
+
@@ -179,7 +179,7 @@
changeBigQuestion(val,scope.$index)" >
-
@@ -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)
diff --git a/src/views/qualityManagement/inspectionArchiving/ERecord/index.vue b/src/views/qualityManagement/inspectionArchiving/ERecord/index.vue
index 1239275..d4f8bd8 100644
--- a/src/views/qualityManagement/inspectionArchiving/ERecord/index.vue
+++ b/src/views/qualityManagement/inspectionArchiving/ERecord/index.vue
@@ -22,7 +22,7 @@
检验记录
- 热表打印
+ 热表打印
烧结打印
测厚打印
@@ -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)
diff --git a/src/views/qualityManagement/reviewFormMess/options.js b/src/views/qualityManagement/reviewFormMess/options.js
index 1b12f4d..23216e2 100644
--- a/src/views/qualityManagement/reviewFormMess/options.js
+++ b/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,