|
@@ -296,6 +296,14 @@
|
|
|
</template>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
+ <!-- 调整表单模板 -->
|
|
|
+ <div
|
|
|
+ v-if="excelHtml"
|
|
|
+ class="excelHtml"
|
|
|
+ >
|
|
|
+ <dynamicExcel @remove="removeExcel" />
|
|
|
+ </div>
|
|
|
+
|
|
|
<!-- 关联清表 -->
|
|
|
<el-dialog
|
|
|
title="关联清表"
|
|
@@ -314,7 +322,7 @@
|
|
|
@change="changetherr()"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="(item,key) in GLExcelData"
|
|
|
+ v-for="(item,key) in GLExcelData"
|
|
|
:key="key"
|
|
|
:label="item.name"
|
|
|
:value="item.id"
|
|
@@ -328,7 +336,7 @@
|
|
|
placeholder="请输入需要选择的内容"
|
|
|
></el-input>
|
|
|
<el-tree
|
|
|
- :filter-node-method="filterNode"
|
|
|
+ :filter-node-method="filterNode222"
|
|
|
ref="tree"
|
|
|
class="filter-tree"
|
|
|
style="margin-top:10px;"
|
|
@@ -1240,6 +1248,7 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
+import dynamicExcel from "@/template/dynamicExcel";
|
|
|
import {
|
|
|
saveFormAndElement, selectFormElements,
|
|
|
importWbsTree
|
|
@@ -1253,7 +1262,7 @@ import { findProjectTree as getAlltree } from "@/api/manager/projectinfo";
|
|
|
import { getList as getAttchFromOriginalName } from "@/api/resource/attach";
|
|
|
import { getDictionary } from "@/api/system/dict";
|
|
|
import { mapGetters } from "vuex";
|
|
|
-import { getList, tabLazytreeAll, saveLinkTab } from '@/api/exctab/excelmodel'
|
|
|
+import { getList, tabLazytreeAll, saveLinkTab, getExcelHtml } from '@/api/exctab/excelmodel'
|
|
|
export default {
|
|
|
data () {
|
|
|
return {
|
|
@@ -1275,6 +1284,11 @@ export default {
|
|
|
exceldata: [],//清表模板
|
|
|
//#endregion
|
|
|
|
|
|
+ //#region 调整表单
|
|
|
+ adjustmentExcel: '',
|
|
|
+ excelHtml: false,
|
|
|
+ //#endregion
|
|
|
+
|
|
|
//#region
|
|
|
id: '',
|
|
|
projectid: '',
|
|
@@ -2003,22 +2017,40 @@ export default {
|
|
|
this.GLExcelMD()
|
|
|
}
|
|
|
},
|
|
|
- filterNode (value, data) {
|
|
|
- console.log(value, data);
|
|
|
+ filterNode222 (value, data) {
|
|
|
if (!value) return true;
|
|
|
return data.name.indexOf(value) !== -1;
|
|
|
},
|
|
|
//#endregion
|
|
|
- adjustExcel () {//调整表单
|
|
|
- this.$router.push('/ceshi/trees')
|
|
|
+
|
|
|
+ //#region
|
|
|
+ async adjustExcel () {//调整表单
|
|
|
+ await this.getExcelHtml()
|
|
|
+ this.excelHtml = true
|
|
|
+ // console.log();
|
|
|
+ // this.$router.push('/ceshi/trees')
|
|
|
},
|
|
|
+ async getExcelHtml () {
|
|
|
+ const { data: res } = await getExcelHtml()
|
|
|
+ console.log(res);
|
|
|
+ if (res.code === 200) {
|
|
|
+ localStorage.setItem('excelHtnl', res.data)
|
|
|
+ this.adjustmentExcel = res.data
|
|
|
+ }
|
|
|
+ },
|
|
|
+ removeExcel () {
|
|
|
+ this.excelHtml = false
|
|
|
+ },
|
|
|
+ //#endregion
|
|
|
},
|
|
|
watch: {
|
|
|
'GLExcelFrom.search' (val) {
|
|
|
this.$refs.tree.filter(val);
|
|
|
}
|
|
|
},
|
|
|
-
|
|
|
+ components: {
|
|
|
+ dynamicExcel,
|
|
|
+ },
|
|
|
};
|
|
|
</script>
|
|
|
|
|
@@ -2053,4 +2085,12 @@ export default {
|
|
|
padding: 20px;
|
|
|
}
|
|
|
}
|
|
|
+//调整表单样式
|
|
|
+.excelHtml {
|
|
|
+ position: absolute;
|
|
|
+ top: 50px;
|
|
|
+ left: 0px;
|
|
|
+ width: 100%;
|
|
|
+ height: 100%;
|
|
|
+}
|
|
|
</style>
|