|
@@ -189,33 +189,32 @@
|
|
></el-input>
|
|
></el-input>
|
|
<el-button type="info" class="mg-l-10" @click="searchFormulaName">搜索</el-button>
|
|
<el-button type="info" class="mg-l-10" @click="searchFormulaName">搜索</el-button>
|
|
</div>
|
|
</div>
|
|
- <el-table
|
|
|
|
|
|
+ <el-table
|
|
:data="editEleListFilter"
|
|
:data="editEleListFilter"
|
|
border
|
|
border
|
|
style="width: 100%"
|
|
style="width: 100%"
|
|
height="400px"
|
|
height="400px"
|
|
>
|
|
>
|
|
- <el-table-column
|
|
|
|
- align="center"
|
|
|
|
- prop="eName"
|
|
|
|
- label="元素名称"
|
|
|
|
- >
|
|
|
|
|
|
+ <el-table-column align="center" prop="eName" label="字段信息">
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column
|
|
|
|
- align="center"
|
|
|
|
- label="操作"
|
|
|
|
- width="200"
|
|
|
|
- >
|
|
|
|
|
|
+ <el-table-column align="center" label="操作" width="200">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<el-link
|
|
<el-link
|
|
- :type="scope.row.isSaveFormula == 1?'warning':'primary'"
|
|
|
|
- @click="toFormulaEdit(scope.row)"
|
|
|
|
- >公式配置</el-link>
|
|
|
|
|
|
+ :type="scope.row.globalFormula == 1 ? 'warning' : 'primary'"
|
|
|
|
+ @click="toFormulaEdit(scope.row,1)"
|
|
|
|
+ >全局公式</el-link
|
|
|
|
+ >
|
|
<el-link
|
|
<el-link
|
|
|
|
+ class="mg-l-10"
|
|
|
|
+ :type="scope.row.isSaveFormula == 1 ? 'warning' : 'primary'"
|
|
|
|
+ @click="toFormulaEdit(scope.row,10)"
|
|
|
|
+ >节点公式</el-link
|
|
|
|
+ >
|
|
|
|
+ <!-- <el-link
|
|
class="mg-l-10"
|
|
class="mg-l-10"
|
|
type="danger"
|
|
type="danger"
|
|
@click="delEleRowHandle(scope.$index,editEleListFilter)"
|
|
@click="delEleRowHandle(scope.$index,editEleListFilter)"
|
|
- >删除</el-link>
|
|
|
|
|
|
+ >删除</el-link> -->
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
@@ -931,7 +930,8 @@ export default {
|
|
})
|
|
})
|
|
updateBatchElements(this.editEleList, this.curEleTable.initTableName).then(() => {
|
|
updateBatchElements(this.editEleList, this.curEleTable.initTableName).then(() => {
|
|
this.editEleVisible = false;
|
|
this.editEleVisible = false;
|
|
- this.updateNodeTable();
|
|
|
|
|
|
+ // this.updateNodeTable();
|
|
|
|
+ this.onLoad(this.page);
|
|
this.$message({
|
|
this.$message({
|
|
type: "success",
|
|
type: "success",
|
|
message: "保存成功!"
|
|
message: "保存成功!"
|
|
@@ -939,7 +939,8 @@ export default {
|
|
})
|
|
})
|
|
} else {
|
|
} else {
|
|
this.editEleVisible = false;
|
|
this.editEleVisible = false;
|
|
- this.updateNodeTable();
|
|
|
|
|
|
+ // this.updateNodeTable();
|
|
|
|
+ this.onLoad(this.page);
|
|
this.$message({
|
|
this.$message({
|
|
type: "success",
|
|
type: "success",
|
|
message: "保存成功!"
|
|
message: "保存成功!"
|
|
@@ -963,7 +964,7 @@ export default {
|
|
})
|
|
})
|
|
},
|
|
},
|
|
//跳转到公式配置页面
|
|
//跳转到公式配置页面
|
|
- toFormulaEdit(row) {
|
|
|
|
|
|
+ toFormulaEdit(row,type) {
|
|
// this.$router.push({
|
|
// this.$router.push({
|
|
// path: '/formula/edit',
|
|
// path: '/formula/edit',
|
|
// query: {
|
|
// query: {
|
|
@@ -975,6 +976,7 @@ export default {
|
|
// });
|
|
// });
|
|
|
|
|
|
this.formulaCurRow = row;
|
|
this.formulaCurRow = row;
|
|
|
|
+ this.formulaCurRow.globaltype = type;
|
|
this.formulaCompVisible = true;
|
|
this.formulaCompVisible = true;
|
|
},
|
|
},
|
|
editele(){
|
|
editele(){
|