diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index d43d9d9..40400ef 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -32,6 +32,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -47,29 +63,13 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
@@ -939,7 +939,7 @@
site: '',
userName: this.$store.state.user.name,
inspectionNo: '',
- state: '待检验',
+ state: '',
inspectionResult: '',
orderNo: '',
operationDesc: '',
@@ -956,6 +956,7 @@
page: 1,
limit: 10,
seqNo: '',
+ states: ['未开始','待检验'],
},
pageIndex: 1,
pageSize: 20,
diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index 59a4a3a..56a22c5 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -32,7 +32,22 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -49,29 +64,13 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
@@ -933,7 +932,8 @@
disposalMeasures: '',
page: 1,
limit: 10,
- seqNo: ''
+ seqNo: '',
+ states: ['未开始','待检验'],
},
pageIndex: 1,
pageSize: 20,
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index bf88500..37eb12f 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -32,28 +32,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -79,6 +57,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -936,7 +936,7 @@
site: '',
userName: this.$store.state.user.name,
inspectionNo: '',
- state: '待检验',
+ state: '',
inspectionResult: '',
orderNo: '',
operationDesc: '',
@@ -953,7 +953,8 @@
disposalMeasures: '',
page: 1,
limit: 10,
- seqNo: ''
+ seqNo: '',
+ states: ['未开始','待检验'],
},
pageIndex: 1,
pageSize: 20,
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 1eccb70..1b842f4 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -50,7 +50,7 @@
-
+
@@ -648,7 +648,7 @@
partDesc:'',
cinvSourceCode:'',
sku:'',
- state: '待检验',
+ state: '',
inspectionResult: '',
supplierDesc: '',
disposalMeasures: '',
@@ -657,7 +657,8 @@
limit: 10,
poOrderNo: '',
poItemNo: '',
- orderType: ''
+ orderType: '',
+ states: ['未开始','待检验'],
},
pageIndex: 1,
pageSize: 20,
@@ -1635,7 +1636,6 @@
duration: 1500
})
}
- console.log(this.acquisitionList)
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
@@ -2042,6 +2042,8 @@
getDataList () {
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
+ //this.searchData.state = this.searchData.state.join(',')
+ console.log(this.searchData.states)
qcIQCInspectionSearch(this.searchData).then(({data}) => {
if (data.code === 0) {
this.dataList = data.page.list
diff --git a/src/views/modules/qc/qcItem.vue b/src/views/modules/qc/qcItem.vue
index d97db41..c80f18c 100644
--- a/src/views/modules/qc/qcItem.vue
+++ b/src/views/modules/qc/qcItem.vue
@@ -171,14 +171,6 @@
-
-
-
-
-
-
-
-
@@ -192,6 +184,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 采集标记
+
+
保存
关闭
@@ -343,7 +360,9 @@
samplingProgrammeDesc: '',
samplingLevelNo: '',
samplingLevelDesc: '',
- defaultSamplingProportion: ''
+ defaultSamplingProportion: '',
+ collectionFlag: '',
+ collectionSource: ''
},
// 检验项目展示标头
columnList: [
@@ -919,7 +938,9 @@
samplingProgrammeDesc: '',
samplingLevelNo: '',
samplingLevelDesc: '',
- defaultSamplingProportion: ''
+ defaultSamplingProportion: '',
+ collectionFlag: '',
+ collectionSource: ''
}
this.modalDisableFlag = false
this.modalFlag = true
@@ -948,7 +969,9 @@
samplingProgrammeDesc: row.samplingProgrammeDesc,
samplingLevelNo: row.samplingLevelNo,
samplingLevelDesc: row.samplingLevelDesc,
- defaultSamplingProportion: row.defaultSamplingProportion
+ defaultSamplingProportion: row.defaultSamplingProportion,
+ collectionFlag: row.collectionFlag,
+ collectionSource: row.collectionSource
}
this.modalDisableFlag = true
this.modalFlag = true