diff --git a/src/views/modules/eam/eamWorkPlanForCheck.vue b/src/views/modules/eam/eamWorkPlanForCheck.vue
index 50554e3..35629d8 100644
--- a/src/views/modules/eam/eamWorkPlanForCheck.vue
+++ b/src/views/modules/eam/eamWorkPlanForCheck.vue
@@ -2269,8 +2269,7 @@
message: '操作成功',
type: 'success',
duration: 1500,
- onClose: () => {
- }
+ onClose: () => {}
})
} else {
this.$alert(data.msg, '错误', {
diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index 8083c75..585af89 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -165,16 +165,28 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -185,7 +197,12 @@
-
+
+
+
+
+
+
保存
关闭
@@ -195,22 +212,25 @@
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
@@ -505,7 +525,10 @@
inspectorName: '',
submit_flag: '',
seqNo: '',
- batchRollNo: ''
+ batchRollNo: '',
+ spec: '',
+ sku: '',
+ specialRequirements: ''
},
// 展示列集
columnList: [
@@ -629,6 +652,18 @@
status: true,
fixed: '',
},
+ {
+ columnProp: 'spec',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '物料类别',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ },
{
columnProp: 'cinvSourceCode',
headerAlign: "center",
@@ -737,6 +772,18 @@
status: true,
fixed: '',
},
+ {
+ columnProp: 'specialRequirements',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '特殊要求',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ },
],
//项目清单
detailData:{
@@ -755,7 +802,8 @@
inspectionRemark: '',
submitFlag: '',
cinvSourceCode: '',
- sku: ''
+ sku: '',
+ spec: ''
},
detailInformationFlag:false,
detailList:[],
@@ -991,13 +1039,6 @@
trigger: 'change'
}
],
- partNoType:[
- {
- required: true,
- message: ' ',
- trigger: 'change'
- }
- ],
rollQtyType:[
{
required: true,
@@ -1085,6 +1126,8 @@
this.partList = data.rows
this.modalData.partNo = this.partList[0].partNo
this.modalData.partDesc = this.partList[0].partDesc
+ this.modalData.spec = this.partList[0].spec
+ this.modalData.sku = this.partList[0].sku
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
@@ -1163,7 +1206,10 @@
resourceDesc: '',
rollQty: '',
seqNo: '',
- batchRollNo: ''
+ batchRollNo: '',
+ spec: '',
+ sku: '',
+ specialRequirements: ''
};
this.operationList = [];
this.resourceList = [];
@@ -1440,11 +1486,12 @@
this.detailData.inspectionRemark = row.inspectionRemark
this.detailData.cinvSourceCode = row.cinvSourceCode
this.detailData.sku = row.sku
+ this.detailData.spec = row.spec
faiDetailSearch(this.detailData).then(({data}) => {
this.detailList = data.rows
})
- this.inspectorSearch();
- this.detailInformationFlag = true;
+ this.inspectorSearch()
+ this.detailInformationFlag = true
},
// 子明细记录信息查询
diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index 267344e..224b5e2 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -163,16 +163,28 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -183,7 +195,12 @@
-
+
+
+
+
+
+
保存
关闭
@@ -193,22 +210,25 @@
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
@@ -501,7 +521,10 @@
inspectorName: '',
submit_flag: '',
seqNo: '',
- batchRollNo: ''
+ batchRollNo: '',
+ spec: '',
+ sku: '',
+ specialRequirements: ''
},
// 展示列集
columnList: [
@@ -625,6 +648,18 @@
status: true,
fixed: '',
},
+ {
+ columnProp: 'spec',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '物料类别',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ },
{
columnProp: 'cinvSourceCode',
headerAlign: "center",
@@ -733,6 +768,18 @@
status: true,
fixed: '',
},
+ {
+ columnProp: 'specialRequirements',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '特殊要求',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ },
],
//项目清单
detailData:{
@@ -751,7 +798,8 @@
inspectionRemark: '',
submitFlag: '',
cinvSourceCode: '',
- sku: ''
+ sku: '',
+ spec: ''
},
detailInformationFlag:false,
detailList:[],
@@ -987,13 +1035,6 @@
trigger: 'change'
}
],
- partNoType:[
- {
- required: true,
- message: ' ',
- trigger: 'change'
- }
- ],
rollQtyType:[
{
required: true,
@@ -1081,6 +1122,8 @@
this.partList = data.rows
this.modalData.partNo = this.partList[0].partNo
this.modalData.partDesc = this.partList[0].partDesc
+ this.modalData.spec = this.partList[0].spec
+ this.modalData.sku = this.partList[0].sku
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
@@ -1159,7 +1202,10 @@
resourceDesc: '',
rollQty: '',
seqNo: '',
- batchRollNo: ''
+ batchRollNo: '',
+ spec: '',
+ sku: '',
+ specialRequirements: ''
};
this.operationList = [];
this.resourceList = [];
@@ -1426,6 +1472,7 @@
this.detailData.inspectionRemark = row.inspectionRemark
this.detailData.cinvSourceCode = row.cinvSourceCode
this.detailData.sku = row.sku
+ this.detailData.spec = row.spec
fqcDetailSearch(this.detailData).then(({data}) => {
this.detailList = data.rows
})
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 4e508d1..97d503c 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -173,16 +173,36 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -203,7 +223,12 @@
-
+
+
+
+
+
+
保存
关闭
@@ -213,22 +238,25 @@
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
@@ -582,7 +610,10 @@
resourceDesc: '',
rollQty: '',
seqNo: '',
- batchRollNo: ''
+ batchRollNo: '',
+ spec: '',
+ sku: '',
+ specialRequirements: ''
},
// 展示列集
columnList: [
@@ -718,6 +749,18 @@
status: true,
fixed: '',
},
+ {
+ columnProp: 'spec',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '物料类别',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ },
{
columnProp: 'cinvSourceCode',
headerAlign: "center",
@@ -826,6 +869,18 @@
status: true,
fixed: '',
},
+ {
+ columnProp: 'specialRequirements',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '特殊要求',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ },
],
//项目清单
detailData:{
@@ -844,7 +899,8 @@
inspectionRemark: '',
submitFlag: '',
cinvSourceCode: '',
- sku: ''
+ sku: '',
+ spec: ''
},
detailInformationFlag:false,
detailList:[],
@@ -1091,13 +1147,6 @@
trigger: 'change'
}
],
- partNoType: [
- {
- required: true,
- message: ' ',
- trigger: 'change'
- }
- ],
rollQtyType: [
{
required: true,
@@ -1111,7 +1160,7 @@
message: ' ',
trigger: 'change'
}
- ],
+ ]
},
// orderNoData:{
// limit: 10,
@@ -1362,6 +1411,8 @@
this.partList = data.rows
this.modalData.partNo = this.partList[0].partNo
this.modalData.partDesc = this.partList[0].partDesc
+ this.modalData.spec = this.partList[0].spec
+ this.modalData.sku = this.partList[0].sku
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
@@ -1389,13 +1440,16 @@
resourceDesc: '',
rollQty: '',
seqNo: '',
- batchRollNo: ''
- };
- this.operationList = [];
- this.resourceList = [];
- this.partList = [];
- this.modalDisableFlag = false;
- this.modalFlag = true;
+ batchRollNo: '',
+ spec: '',
+ sku: '',
+ specialRequirements: ''
+ }
+ this.operationList = []
+ this.resourceList = []
+ this.partList = []
+ this.modalDisableFlag = false
+ this.modalFlag = true
},
// 新增IPQC巡检记录
@@ -1612,6 +1666,7 @@
this.detailData.inspectionRemark = row.inspectionRemark
this.detailData.cinvSourceCode = row.cinvSourceCode
this.detailData.sku = row.sku
+ this.detailData.spec = row.spec
ipqcDetailSearch(this.detailData).then(({data}) => {
this.detailList = data.rows
})