diff --git a/src/views/oem/baseTemplate/components/maintenanceDialog.vue b/src/views/oem/baseTemplate/components/maintenanceDialog.vue
index 7c709a8..a670f3f 100644
--- a/src/views/oem/baseTemplate/components/maintenanceDialog.vue
+++ b/src/views/oem/baseTemplate/components/maintenanceDialog.vue
@@ -128,6 +128,7 @@ export default {
this.form.tableData = this.list
this.form.tableData.map(item =>{
item.caId = item.caId && item.caId + '',
+ // item.ocId = item.ocId && item.ocId + ''
item._select = false
})
console.log('table-------------',this.form.tableData)
@@ -188,11 +189,26 @@ export default {
return;
}
+ // if(this.selectChange)
+ let tmp = this.form.tableData.find(item => item._select)
+ if(!tmp){
+ this.$message.error('请先选择数据!')
+ return
+ }
+
+ let submitArr = this.form.tableData.filter(item => item._select)
+
// 校验通过:准备提交数据(过滤无用字段)
- const submitData = this.form.tableData.map(row => {
+ // const submitData = this.form.tableData.map(row => {
+ // const { _select, ...validData } = row; // 剔除选择状态字段
+ // return validData;
+ // });
+
+ const submitData = submitArr.map(row => {
const { _select, ...validData } = row; // 剔除选择状态字段
return validData;
});
+
console.log('submitData',submitData)
console.log('deleteArr',this.deleteArr)
const ids = this.deleteArr
diff --git a/src/views/oem/performanceApplication/components/addQuality.vue b/src/views/oem/performanceApplication/components/addQuality.vue
index dc4df53..c88d7b8 100644
--- a/src/views/oem/performanceApplication/components/addQuality.vue
+++ b/src/views/oem/performanceApplication/components/addQuality.vue
@@ -504,9 +504,13 @@ export default {
// this.data.map(item =>{
// item.ocId = parseInt(item.ocId)
// })
+ if(this.selectionList.length == 0){
+ this.$message.error('请先勾选数据')
+ return
+ }
let params = {
date:this.submitForm.date,
- oemMeritsEntities:this.data
+ oemMeritsEntities:this.selectionList
}
console.log('param---------',params)
performanceApply(params).then(res =>{
diff --git a/src/views/productionDisposition/hearingDialog.vue b/src/views/productionDisposition/hearingDialog.vue
index fabf63d..1878a28 100644
--- a/src/views/productionDisposition/hearingDialog.vue
+++ b/src/views/productionDisposition/hearingDialog.vue
@@ -21,7 +21,7 @@
{{detailInfo.cardNo}}
{{detailInfo.batchNo}}
{{detailInfo.totalNum}}
- {{detailInfo.partCode}}
+ {{detailInfo.materialCode}}
{{detailInfo.materialName}}