|
@@ -996,8 +996,11 @@ const tableFormSaveClick = async () => {
|
|
|
})
|
|
|
let setTypes = Array.from(new Set(types))
|
|
|
let type = setTypes.length > 0 ? setTypes[0] : "";
|
|
|
-
|
|
|
+ if(newId.value?.length>0){
|
|
|
+ isaddType=false
|
|
|
+ }
|
|
|
if (isaddType) { //新增
|
|
|
+ console.log('xinzeng');
|
|
|
if (setTypes.length > 1) {
|
|
|
console.log(setTypes.length,'setTypes.length222222');
|
|
|
FormData = alllistData.value;
|
|
@@ -1157,7 +1160,7 @@ const tableFormSaveClick = async () => {
|
|
|
})
|
|
|
console.log( listItemBaseData.value.tableType,' listItemBaseData.value.tableType');
|
|
|
console.log(FormData, 'lastFormData1');
|
|
|
- if(listItemBaseData.value.tableType&&listItemBaseData.value?.tableType.length==1){
|
|
|
+ if(listItemBaseData.value.tableType&&listItemBaseData.value?.tableType.length==1&&newId.value.length==0){
|
|
|
console.log('只要一边的数据');
|
|
|
FormData=FormData.filter((ele)=>{
|
|
|
if(ele.type==listItemBaseData.value.tableType){
|
|
@@ -1231,8 +1234,11 @@ const setAllListData = (curform) => {
|
|
|
let orgData = orgAlllistData.value.filter(e => e.pKeyId === pkeyId);
|
|
|
item.type = orgData[0]?.tableType;
|
|
|
alllistData.value = alllistData.value.filter(e => e.pkeyId != pkeyId); //去掉老数据
|
|
|
-
|
|
|
- ishasKey = Object.keys(orgData[0]).filter(e => e.indexOf("key_") >= 0)
|
|
|
+ console.log(orgData,'orgData');
|
|
|
+ if(orgData.length>0){
|
|
|
+ ishasKey = Object.keys(orgData[0]).filter(e => e.indexOf("key_") >= 0)
|
|
|
+ }
|
|
|
+
|
|
|
if (!item.isCollapseLoad && ishasKey.length > 0) { //没操作过,并且存在KEY
|
|
|
ishasKey.forEach(key => {
|
|
|
item[key] = orgData[0][key]
|