|
|
@@ -820,7 +820,28 @@ const tableFormSaveClick = async () => {
|
|
|
|
|
|
}
|
|
|
else if (setTypes.length == 1) {// 操作过一边的数据
|
|
|
- console.log(FormData,'FormData');
|
|
|
+ console.log(FormData,'FormData1');
|
|
|
+ orgAlllistData.value.forEach((item1)=>{
|
|
|
+ if(item1.tableType.toString()!==tabTypeKey.value){
|
|
|
+ let data1 = {
|
|
|
+ projectId: item1.projectId,
|
|
|
+ contractId: contractId.value,
|
|
|
+ pkeyId: item1.pKeyId,
|
|
|
+ nodeId: routerQuery?.nodeId,
|
|
|
+ isCollapseLoad: false,
|
|
|
+ isBussShow:item1.isBussShow
|
|
|
+ }
|
|
|
+ // 过滤存在的key_的键值
|
|
|
+ let ishasKey= Object.keys(item1).filter(e => e.indexOf("key_") >= 0)
|
|
|
+ if (ishasKey.length > 0) {
|
|
|
+ ishasKey.forEach(key => {
|
|
|
+ data1[key] = item1[key]
|
|
|
+ })
|
|
|
+ }
|
|
|
+ FormData.push(data1)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ console.log(FormData,'FormData22222222');
|
|
|
let tableTypeArr = listItemBaseData.value.tableType.split(",");
|
|
|
if (tableTypeArr[0] != type) { //两边都有数据/当前操作的数据不是进来时的选项，筛选另一边的数据
|
|
|
listItemBaseData.value.tableType = "1,2"
|
|
|
@@ -1002,7 +1023,7 @@ const queryNodeStatus = async () => {
|
|
|
const info = getStoreData('prenodeDataInfo') || {}
|
|
|
const {error, code, data} = await wbsApi.queryNodeStatusTrial({
|
|
|
// primaryKeyId: info['contractIdRelation'] ? info['id'] : info['primaryKeyId'],
|
|
|
- id: dataId,
|
|
|
+ id: dataId.length>0?dataId:nodeIdvalue.value,
|
|
|
classify: authBtnTabKey.value
|
|
|
})
|
|
|
//1 未填报，2待上报，3已上报
|
duy