|
@@ -1364,12 +1364,24 @@
|
|
</span>
|
|
</span>
|
|
</el-dialog>
|
|
</el-dialog>
|
|
|
|
|
|
|
|
+ <!-- 公式 -->
|
|
|
|
+ <el-dialog title="元素公式" :visible.sync="formulaCompVisible" fullscreen append-to-body class="full-dialog">
|
|
|
|
+ <FormulaEdit :wbsid="id" :nodeid="curTreeData.id" :eleid="formulaCurRow.id" :projectid="projectid" @hideDialog="formulaCompVisible = false" v-if="formulaCompVisible"></FormulaEdit>
|
|
|
|
+ </el-dialog>
|
|
|
|
+
|
|
|
|
+ <!-- 编辑元素 -->
|
|
|
|
+ <el-dialog title="编辑元素" :visible.sync="editElementVisible" fullscreen append-to-body class="full-dialog">
|
|
|
|
+ <EditElement :pkeyId="editElementQuery.pkeyId" :excelId="editElementQuery.excelId" :id="editElementQuery.id" :initTableName="editElementQuery.initTableName" :pid="editElementQuery.pid" :wbsid="editElementQuery.wbsid" :nodeid="editElementQuery.nodeid" @hideDialog="editElementVisible = false" v-if="editElementVisible"></EditElement>
|
|
|
|
+ </el-dialog>
|
|
|
|
+
|
|
</basic-container>
|
|
</basic-container>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
import ManualSorting from '@/components/WbsTree/ManualSorting'
|
|
import ManualSorting from '@/components/WbsTree/ManualSorting'
|
|
import dynamicExcel from "./treeTemplate/dynamicExcel.vue";
|
|
import dynamicExcel from "./treeTemplate/dynamicExcel.vue";
|
|
|
|
+import FormulaEdit from '@/views/formula/edit.vue'
|
|
|
|
+import EditElement from '@/views/manager/projectinfo/editElement/editElement.vue'
|
|
import {
|
|
import {
|
|
saveFormAndElement, selectFormElements,
|
|
saveFormAndElement, selectFormElements,
|
|
importWbsTree, findWbsTreePrivateSameLevel, wbsTreePrivateSort, parameters, saveOrUpdateBatch, keymap, updateBatchNodeTableInfo2, updateStatus
|
|
importWbsTree, findWbsTreePrivateSameLevel, wbsTreePrivateSort, parameters, saveOrUpdateBatch, keymap, updateBatchNodeTableInfo2, updateStatus
|
|
@@ -1548,6 +1560,20 @@ export default {
|
|
aliasVisible:false,//别名
|
|
aliasVisible:false,//别名
|
|
aliasInput:'',
|
|
aliasInput:'',
|
|
aliasArr:[],
|
|
aliasArr:[],
|
|
|
|
+
|
|
|
|
+ formulaCompVisible:false,//公式弹框
|
|
|
|
+ formulaCurRow:{},//当前元素
|
|
|
|
+
|
|
|
|
+ editElementVisible:false,//编辑元素弹框
|
|
|
|
+ editElementQuery:{
|
|
|
|
+ pkeyId: '',
|
|
|
|
+ excelId: '',
|
|
|
|
+ id: '',
|
|
|
|
+ initTableName:'',
|
|
|
|
+ pid: '',
|
|
|
|
+ wbsid: '',
|
|
|
|
+ nodeid: '',
|
|
|
|
+ },//传参
|
|
};
|
|
};
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
@@ -2115,15 +2141,18 @@ export default {
|
|
|
|
|
|
//跳转到公式配置页面
|
|
//跳转到公式配置页面
|
|
toFormulaEdit (row) {
|
|
toFormulaEdit (row) {
|
|
- this.$router.push({
|
|
|
|
- path: '/formula/edit',
|
|
|
|
- query: {
|
|
|
|
- wbsid: this.id,
|
|
|
|
- eleid: row.id,
|
|
|
|
- nodeid:this.curTreeData.id,
|
|
|
|
- projectid:this.projectid
|
|
|
|
- }
|
|
|
|
- });
|
|
|
|
|
|
+ // this.$router.push({
|
|
|
|
+ // path: '/formula/edit',
|
|
|
|
+ // query: {
|
|
|
|
+ // wbsid: this.id,
|
|
|
|
+ // eleid: row.id,
|
|
|
|
+ // nodeid:this.curTreeData.id,
|
|
|
|
+ // projectid:this.projectid
|
|
|
|
+ // }
|
|
|
|
+ // });
|
|
|
|
+
|
|
|
|
+ this.formulaCurRow = row;
|
|
|
|
+ this.formulaCompVisible = true;
|
|
},
|
|
},
|
|
|
|
|
|
getNodeTypelist () {
|
|
getNodeTypelist () {
|
|
@@ -2507,18 +2536,29 @@ export default {
|
|
//#region 编辑元素
|
|
//#region 编辑元素
|
|
async rightClick (pkeyId, excelId, id, initTableName) {
|
|
async rightClick (pkeyId, excelId, id, initTableName) {
|
|
await this.getExcelHtml2(pkeyId)
|
|
await this.getExcelHtml2(pkeyId)
|
|
- this.$router.push({
|
|
|
|
- path: '/project/editElement',
|
|
|
|
- query: {
|
|
|
|
- pkeyId: pkeyId,
|
|
|
|
- excelId: excelId,
|
|
|
|
- id: id,
|
|
|
|
- initTableName,
|
|
|
|
- pid: this.$route.query.pid,
|
|
|
|
- wbsid: this.$route.query.wbsid,
|
|
|
|
- nodeid:this.curTreeData.id,
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
|
|
+
|
|
|
|
+ // this.$router.push({
|
|
|
|
+ // path: '/project/editElement',
|
|
|
|
+ // query: {
|
|
|
|
+ // pkeyId: pkeyId,
|
|
|
|
+ // excelId: excelId,
|
|
|
|
+ // id: id,
|
|
|
|
+ // initTableName,
|
|
|
|
+ // pid: this.$route.query.pid,
|
|
|
|
+ // wbsid: this.$route.query.wbsid,
|
|
|
|
+ // nodeid:this.curTreeData.id,
|
|
|
|
+ // }
|
|
|
|
+ // })
|
|
|
|
+
|
|
|
|
+ this.editElementQuery.pkeyId = pkeyId;
|
|
|
|
+ this.editElementQuery.excelId = excelId;
|
|
|
|
+ this.editElementQuery.id = id;
|
|
|
|
+ this.editElementQuery.initTableName = initTableName;
|
|
|
|
+ this.editElementQuery.pid = this.$route.query.pid;
|
|
|
|
+ this.editElementQuery.wbsid = this.$route.query.wbsid;
|
|
|
|
+ this.editElementQuery.nodeid = this.curTreeData.id;
|
|
|
|
+
|
|
|
|
+ this.editElementVisible = true;
|
|
},
|
|
},
|
|
async getExcelHtml2 (pkeyId) {
|
|
async getExcelHtml2 (pkeyId) {
|
|
const { data: res } = await getExcelHtml({ pkeyId })
|
|
const { data: res } = await getExcelHtml({ pkeyId })
|
|
@@ -2677,6 +2717,8 @@ export default {
|
|
components: {
|
|
components: {
|
|
dynamicExcel,
|
|
dynamicExcel,
|
|
ManualSorting,
|
|
ManualSorting,
|
|
|
|
+ FormulaEdit,
|
|
|
|
+ EditElement
|
|
},
|
|
},
|
|
};
|
|
};
|
|
</script>
|
|
</script>
|
|
@@ -2730,4 +2772,15 @@ export default {
|
|
min-width: 100%;
|
|
min-width: 100%;
|
|
display: inline-block;
|
|
display: inline-block;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+.full-dialog{
|
|
|
|
+ /deep/ .el-dialog__body{
|
|
|
|
+ padding-bottom: 0;
|
|
|
|
+ padding-top: 0;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /deep/ .basic-container{
|
|
|
|
+ height: calc(100vh - 60px);
|
|
|
|
+ }
|
|
|
|
+}
|
|
</style>
|
|
</style>
|