|
@@ -256,6 +256,7 @@ const tabTypeChange = ({key}) => {
|
|
|
// console.log(ListItemRef.value?.getFormData(),'ListItemRef.value?.getFormData()');
|
|
|
tabTypeKey.value = key
|
|
|
let curform=ListItemRef.value?.getFormData()
|
|
|
+ console.log(curform,'curform');
|
|
|
setAllListData(curform)
|
|
|
if( listItemBaseData.value.detectionResult===''&&tabTypeKey.value==2){
|
|
|
window.$message?.warning('请选择报告单是否合格')
|
|
@@ -773,7 +774,8 @@ const tableFormSaveClick = async () => {
|
|
|
contractId: contractId.value,
|
|
|
pkeyId: item.pKeyId,
|
|
|
nodeId: routerQuery?.nodeId,
|
|
|
- isCollapseLoad: false
|
|
|
+ isCollapseLoad: false,
|
|
|
+ isBussShow:item.isBussShow
|
|
|
}
|
|
|
// 过滤存在的key_的键值
|
|
|
let ishasKey= Object.keys(item).filter(e => e.indexOf("key_") >= 0)
|
|
@@ -811,7 +813,6 @@ const tableFormSaveClick = async () => {
|
|
|
}
|
|
|
listItemBaseData.value.tableType=tabTypeKey.value
|
|
|
}
|
|
|
- console.log(FormData,'FormData22222222222');
|
|
|
//效验数据
|
|
|
if (FormData.length > 0) {
|
|
|
if( listItemBaseData.value.detectionResult===''&& listItemBaseData.value.tableType == "1,2"){
|
|
@@ -820,9 +821,16 @@ const tableFormSaveClick = async () => {
|
|
|
tableFormSaveLoading.value = true
|
|
|
console.log(listItemData.value,'listItemData.value');
|
|
|
if(listItemData.value.id&&listItemData.value.id.length<0){
|
|
|
- console.log(dataId,'dataId');
|
|
|
listItemData.value.id=dataId
|
|
|
}
|
|
|
+ console.log(FormData,'lastFormData');
|
|
|
+ //过滤掉已经隐藏表的数据
|
|
|
+ FormData= FormData.filter((item)=>{
|
|
|
+ if(item.isBussShow!==2){
|
|
|
+ return item
|
|
|
+ }
|
|
|
+ })
|
|
|
+ console.log(FormData,'lastFormData1');
|
|
|
const {error, code,data} = await dataApi.saveExcelBussData({
|
|
|
...listItemBaseData.value,
|
|
|
isBatchSave:1,
|
|
@@ -862,7 +870,6 @@ const tableFormSaveClick = async () => {
|
|
|
}
|
|
|
|
|
|
const setAllListData = (curform) => {
|
|
|
- console.log(curform,'setAllListData curform');
|
|
|
curform.forEach((item)=>{
|
|
|
let pkeyId = item.pkeyId;
|
|
|
item.oper = false
|
|
@@ -872,12 +879,11 @@ const setAllListData = (curform) => {
|
|
|
}
|
|
|
|
|
|
let types = orgAlllistData.value.filter(e => e.pKeyId === pkeyId);
|
|
|
- item.type = types[0].tableType;
|
|
|
+ item.type = types[0]?.tableType;
|
|
|
alllistData.value = alllistData.value.filter(e => e.pkeyId != pkeyId); //去掉老数据
|
|
|
alllistData.value.push(item) //加入新数据
|
|
|
})
|
|
|
|
|
|
- console.log(alllistData.value,'setAllListData alllistData');
|
|
|
}
|
|
|
|
|
|
//效验数据
|