diff --git a/src/views/modules/rohs/rohsRecord.vue b/src/views/modules/rohs/rohsRecord.vue
index e96aaa0..b2ba74e 100644
--- a/src/views/modules/rohs/rohsRecord.vue
+++ b/src/views/modules/rohs/rohsRecord.vue
@@ -460,10 +460,9 @@
style="width: 100%">
-
-
-
-
+
+
+
@@ -535,17 +534,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
查询
@@ -562,10 +558,9 @@
:height="320"
style="width: 100%">
-
-
-
-
+
+
+
-
-
-
-
+
+
+
@@ -1106,10 +1100,9 @@ export default {
customerId: undefined,
},
projectMaterialSearchData: {
- testPartNo: '',
- partDesc: '',
finalPartNo: '',
- customerPartNo: ''
+ partDesc: '',
+ partStatus: ''
},
projectMaterialList: [],
projectMaterialSelections: [],
@@ -1986,10 +1979,9 @@ export default {
this.projectMaterialTotal = 0
this.projectMaterialList = []
this.projectMaterialSearchData = {
- testPartNo: '',
- partDesc: '',
finalPartNo: '',
- customerPartNo: ''
+ partDesc: '',
+ partStatus: ''
}
this.showModalFlag = !!(row && (row.status === '已完成' || !this.authUpdate))
@@ -2279,10 +2271,9 @@ export default {
site: this.$store.state.user.site,
projectId: this.modalData.projectId,
endCustomer: this.modalData.endCustomer,
- testPartNo: this.projectMaterialSearchData.testPartNo,
partDesc: this.projectMaterialSearchData.partDesc,
finalPartNo: this.projectMaterialSearchData.finalPartNo,
- customerPartNo: this.projectMaterialSearchData.customerPartNo
+ partStatus: this.projectMaterialSearchData.partStatus
}
api.getRohsProjectMaterialList(params).then(({data}) => {
if (data && data.code === 0 && data.page) {
@@ -2368,9 +2359,8 @@ export default {
projectId: this.modalData.projectId,
testPartNo: testPartNo,
finalPartNo: row.finalPartNo || row.final_part_no || '',
- customerPartNo: row.customerPartNo || row.customer_part_no || '',
partDesc: row.partDesc || row.part_desc || '',
- partSpec: row.partSpec || row.part_spec || ''
+ partStatus: row.partStatus || row.part_status || ''
})
})
return {
@@ -2387,11 +2377,16 @@ export default {
normalizeMaterialListForSave (materialList) {
return (materialList || []).map((item, index) => {
return {
- ...item,
- lineNo: index + 1,
- projectId: item.projectId || this.modalData.projectId || ''
+ site: item.site || this.modalData.site || '',
+ referenceNo: item.referenceNo || this.modalData.referenceNo || '',
+ projectId: item.projectId || this.modalData.projectId || '',
+ testPartNo: item.testPartNo || item.test_part_no || '',
+ finalPartNo: item.finalPartNo || item.final_part_no || '',
+ partDesc: item.partDesc || item.part_desc || '',
+ partStatus: item.partStatus || item.part_status || '',
+ lineNo: index + 1
}
- })
+ }).filter(item => item.testPartNo)
},
persistMaterialList (materialList, successMsg, successCallback) {
const normalizedList = this.normalizeMaterialListForSave(materialList)