|
@@ -904,6 +904,7 @@ export default {
|
|
|
},
|
|
|
conditionMap: {},
|
|
|
};
|
|
|
+ console.log("primary", primary);
|
|
|
payLoad.conditionMap[this.templateInfo.template?.primaryKey] =
|
|
|
row[primary];
|
|
|
// }
|
|
@@ -935,18 +936,21 @@ export default {
|
|
|
if (res.data.mainForm) {
|
|
|
//表单组
|
|
|
// console.log(res.data);
|
|
|
+
|
|
|
this.transformDataFormat(res.data);
|
|
|
- this.tableName = res.data.mainForm.showTemplate.dfTableName;
|
|
|
+ // this.tableName = res.data.mainForm.showTemplate.dfTableName;
|
|
|
} else {
|
|
|
this.formList = res.data;
|
|
|
- this.tableName = res.data.dfTableName;
|
|
|
+ // this.tableName = res.data.dfTableName;
|
|
|
}
|
|
|
// console.log(this.formList);
|
|
|
this.open = true;
|
|
|
if (btnData.btnFormType == "dragFormGroup") {
|
|
|
this.times--;
|
|
|
if (this.times) {
|
|
|
+ // debugger;
|
|
|
this.$nextTick(() => {
|
|
|
+ // debugger;
|
|
|
setTimeout(() => {
|
|
|
this.handleUpdate(row, btnData);
|
|
|
}, 1000);
|
|
@@ -2059,7 +2063,8 @@ export default {
|
|
|
|
|
|
// 操作列回调
|
|
|
excuteHandler(btnData, row) {
|
|
|
- // console.log("btnData", btnData, row);
|
|
|
+ console.log("btnData", btnData);
|
|
|
+ console.log("row", row);
|
|
|
let { btnType, btnParams, btnFormType } = btnData;
|
|
|
this.currentBtnData = btnData;
|
|
|
this.currentRow = JSON.parse(JSON.stringify(row));
|