|
@@ -285,7 +285,8 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-link
|
|
|
type="primary"
|
|
|
- @click="rightClick(scope.row.pkeyId,scope.row.excelId,scope.row.id,scope.row.initTableName,)"
|
|
|
+ :disabled='scope.row.isLinkTable==-1'
|
|
|
+ @click="rightClick(scope.row.pkeyId,scope.row.excelId,scope.row.id,scope.row.initTableName)"
|
|
|
>编辑元素</el-link>
|
|
|
<el-link
|
|
|
class="mg-l-10"
|
|
@@ -1369,6 +1370,9 @@ export default {
|
|
|
id: "",
|
|
|
name: '',
|
|
|
search: '',//搜素框舒服的值
|
|
|
+ ids: '',
|
|
|
+ excelId: '',
|
|
|
+ initTableName: '',
|
|
|
},
|
|
|
GLExcelData: [],//
|
|
|
GLExcelProps: {
|
|
@@ -1407,7 +1411,7 @@ export default {
|
|
|
editType: 1,
|
|
|
|
|
|
dialogVisible: false,
|
|
|
- saveNodeLoading:false,
|
|
|
+ saveNodeLoading: false,
|
|
|
deptCategorylist: [],
|
|
|
majorDataTypeList: [],
|
|
|
rules: {
|
|
@@ -1541,7 +1545,7 @@ export default {
|
|
|
type: "success",
|
|
|
message: "新增成功!"
|
|
|
});
|
|
|
- this.$nextTick(()=>{
|
|
|
+ this.$nextTick(() => {
|
|
|
this.saveNodeLoading = false;
|
|
|
})
|
|
|
})
|
|
@@ -2117,6 +2121,9 @@ export default {
|
|
|
this.$refs.tree.setCheckedKeys([scope.row.excelId])
|
|
|
}, 2000)
|
|
|
this.GLExcelFrom.id = scope.row.pkeyId
|
|
|
+ this.GLExcelFrom.excelId = scope.row.excelId
|
|
|
+ this.GLExcelFrom.ids = scope.row.id
|
|
|
+ this.GLExcelFrom.initTableName = scope.row.initTableName
|
|
|
},
|
|
|
changetherr () {//清表类型选择框change事件
|
|
|
if (this.GLExcelFrom.name != "") {
|
|
@@ -2152,14 +2159,7 @@ export default {
|
|
|
message: '关联清表成功',
|
|
|
})
|
|
|
this.GLExcel = false
|
|
|
- this.GLExcelMD()
|
|
|
- selectByNodeTable(this.jiedianId, this.projectid, this.id).then((res) => {
|
|
|
- if (res.data.data.length) {
|
|
|
- this.formData = res.data.data;
|
|
|
- } else {
|
|
|
- this.formData = [];
|
|
|
- }
|
|
|
- })
|
|
|
+ this.rightClick(this.GLExcelFrom.id, this.GLExcelFrom.excelId, this.GLExcelFrom.ids, this.GLExcelFrom.initTableName,)
|
|
|
}
|
|
|
} else {
|
|
|
this.$message({
|
|
@@ -2429,8 +2429,8 @@ export default {
|
|
|
padding: 10px 20px !important;
|
|
|
}
|
|
|
}
|
|
|
-.filter-tree{
|
|
|
+.filter-tree {
|
|
|
min-width: 100%;
|
|
|
- display:inline-block;
|
|
|
+ display: inline-block;
|
|
|
}
|
|
|
</style>
|