|
@@ -1167,7 +1167,7 @@
|
|
|
</el-dialog>
|
|
|
<!-- 元素公式 -->
|
|
|
<el-dialog
|
|
|
- :title="(curEleTable.tableName?curEleTable.tableName:'')+' 元素公式..'"
|
|
|
+ :title="(curEleTable.tableName?curEleTable.tableName:'')+' 元素公式(项目级)'"
|
|
|
|
|
|
:visible.sync="editEleFormulaVisible"
|
|
|
width="800px"
|
|
@@ -1202,6 +1202,7 @@
|
|
|
>全局公式</el-link
|
|
|
>
|
|
|
<el-link
|
|
|
+ v-show="scope.row.hasPartFormula"
|
|
|
class="mg-l-10"
|
|
|
:type="scope.row.isSaveFormula == 1 ? 'warning' : 'primary'"
|
|
|
@click="toFormulaEdit(scope.row,20)"
|
|
@@ -1796,6 +1797,7 @@ export default {
|
|
|
eleReg: /(≥|≤|±|【】)?([^≥≤±【】]*)/,
|
|
|
|
|
|
editEleFormulaVisible: false,
|
|
|
+ isMeter:false,
|
|
|
formulaInput: "",
|
|
|
editEleListFilter: [],
|
|
|
editEleListAll: [],
|
|
@@ -2615,15 +2617,8 @@ export default {
|
|
|
|
|
|
//跳转到公式配置页面
|
|
|
toFormulaEdit(row,type) {
|
|
|
- // this.$router.push({
|
|
|
- // path: '/formula/edit',
|
|
|
- // query: {
|
|
|
- // wbsid: this.id,
|
|
|
- // eleid: row.id,
|
|
|
- // nodeid:this.curTreeData.id,
|
|
|
- // projectid:this.projectid
|
|
|
- // }
|
|
|
- // });
|
|
|
+
|
|
|
+ this.curEleTable.hasPartFormula=row.hasPartFormula;
|
|
|
this.formulaCurRow = row;
|
|
|
this.formulaCurRow.globaltype = type;
|
|
|
if(type===10){
|