|
@@ -97,7 +97,7 @@
|
|
|
<template slot-scope="{type,size,row}" slot="menu">
|
|
|
<el-button :size="size" :type="type" @click="Associationlist(row)">关联清表</el-button>
|
|
|
<el-button :size="size" :type="type" :disabled="row.excelIds == -1" @click="rightClick(row)">编辑元素</el-button>
|
|
|
- <el-button :size="size" :type="type" :disabled="row.excelIds == -1" @click="adjustExcel(row.id,row.primaryKeyId)">调整表单</el-button>
|
|
|
+ <el-button :size="size" :type="type" :disabled="row.excelIds == -1" @click="adjustExcel(row.id,row.excelIds)">调整表单</el-button>
|
|
|
<el-button :size="size" :type="type" @click="handleEditFormula(row)">编辑公式</el-button>
|
|
|
|
|
|
</template>
|
|
@@ -139,6 +139,7 @@
|
|
|
@remove="removeExcel"
|
|
|
v-if="excelHtml"
|
|
|
:pkeyId="GLExcelFrom.id"
|
|
|
+ :excelId="GLExcelFrom.excelId"
|
|
|
/>
|
|
|
</div>
|
|
|
<!-- 元素公式 -->
|
|
@@ -713,11 +714,12 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
//#region 调整表单
|
|
|
- adjustExcel(pkeyId) {
|
|
|
+ adjustExcel(pkeyId,excelIds) {
|
|
|
console.log(pkeyId,'pkeyId');
|
|
|
this.excelHtml=false;
|
|
|
// //调整表单
|
|
|
this.GLExcelFrom.id = pkeyId;
|
|
|
+ this.GLExcelFrom.excelId=excelIds
|
|
|
this.getExcelHtml(pkeyId);
|
|
|
},
|
|
|
handleEditFormula(row) {
|