|
@@ -289,15 +289,16 @@ const CollapseChange = async (name) => {
|
|
emit('upcheckTableId', item.id)
|
|
emit('upcheckTableId', item.id)
|
|
formKeyIds.value = getValString(item.pKeyId)
|
|
formKeyIds.value = getValString(item.pKeyId)
|
|
console.log(nodeIdvaluedata.value,'nodeIdvaluedata.value');
|
|
console.log(nodeIdvaluedata.value,'nodeIdvaluedata.value');
|
|
|
|
+ console.log(item,'item');
|
|
if (!item.isTableFormRender) {
|
|
if (!item.isTableFormRender) {
|
|
- //获取已填写的数据
|
|
|
|
- if(!isaddType){
|
|
|
|
|
|
+
|
|
|
|
+
|
|
await getBussDataInfo(item, index)
|
|
await getBussDataInfo(item, index)
|
|
- }
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
|
|
- // //渲染表单
|
|
|
|
- // await getExcelHtml(item,index)
|
|
|
|
}
|
|
}
|
|
|
|
+
|
|
//渲染表单
|
|
//渲染表单
|
|
await getExcelHtml(item,index)
|
|
await getExcelHtml(item,index)
|
|
} else {
|
|
} else {
|
|
@@ -377,7 +378,7 @@ const getBussDataInfo = async (item, index) => {
|
|
if (pkeyIds) {
|
|
if (pkeyIds) {
|
|
const { id } = baseData.value
|
|
const { id } = baseData.value
|
|
const {error, code, data} = await dataApi.getBussDataInfo({
|
|
const {error, code, data} = await dataApi.getBussDataInfo({
|
|
- id: id,
|
|
|
|
|
|
+ id: id||nodeIdvaluedata.value,
|
|
pkeyId: pkeyIds
|
|
pkeyId: pkeyIds
|
|
}, false)
|
|
}, false)
|
|
data.forEach((item1)=>{
|
|
data.forEach((item1)=>{
|