|
|
@@ -52,7 +52,7 @@
|
|
|
<!-- <el-dropdown-item
|
|
|
@click.native="setLeftType(1,data,node)"
|
|
|
icon="el-icon-circle-plus-outline"
|
|
|
- v-if="data.deptCategory != 6 && data.isExistForm != 1"
|
|
|
+ v-if="data.nodeType != 6 && data.isExistForm != 1"
|
|
|
>新增子级</el-dropdown-item> -->
|
|
|
<el-dropdown-item
|
|
|
@click.native="setLeftType(2,data,node)"
|
|
|
@@ -128,7 +128,7 @@
|
|
|
<!-- <el-dropdown-item
|
|
|
@click.native="setLeftType(1,data,node)"
|
|
|
icon="el-icon-circle-plus-outline"
|
|
|
- v-if="data.deptCategory != 6 && data.isExistForm != 1"
|
|
|
+ v-if="data.nodeType != 6 && data.isExistForm != 1"
|
|
|
>新增子级</el-dropdown-item> -->
|
|
|
<el-dropdown-item
|
|
|
@click.native="setLeftType(2,data,node)"
|
|
|
@@ -182,12 +182,12 @@
|
|
|
>
|
|
|
<el-table-column
|
|
|
align="center"
|
|
|
- prop="deptName"
|
|
|
+ prop="nodeName"
|
|
|
label="当前节点"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
align="center"
|
|
|
- prop="deptCategory"
|
|
|
+ prop="nodeType"
|
|
|
:formatter="formatCat"
|
|
|
label="节点类型"
|
|
|
width="180"
|
|
|
@@ -571,9 +571,9 @@
|
|
|
>
|
|
|
<el-form-item
|
|
|
label="节点名称"
|
|
|
- prop="deptName"
|
|
|
+ prop="nodeName"
|
|
|
>
|
|
|
- <el-input v-model="nodeDetail.deptName"></el-input>
|
|
|
+ <el-input v-model="nodeDetail.nodeName"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="上级节点">
|
|
|
<el-input
|
|
|
@@ -582,16 +582,16 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
|
label="节点类型"
|
|
|
- prop="deptCategory"
|
|
|
+ prop="nodeType"
|
|
|
>
|
|
|
<el-select
|
|
|
- v-model="nodeDetail.deptCategory"
|
|
|
+ v-model="nodeDetail.nodeType"
|
|
|
disabled
|
|
|
placeholder="请选择"
|
|
|
class="w-100p"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="item in deptCategorylist"
|
|
|
+ v-for="item in nodeTypelist"
|
|
|
:key="item.id"
|
|
|
:label="item.dictValue"
|
|
|
:value="item.dictKey"
|
|
|
@@ -604,7 +604,7 @@
|
|
|
<el-form-item label="唯一编码">
|
|
|
<el-input v-model="nodeDetail.uniqueCode"></el-input>
|
|
|
</el-form-item>
|
|
|
- <template v-if="nodeDetail.deptCategory == 6">
|
|
|
+ <template v-if="nodeDetail.nodeType == 6">
|
|
|
<el-form-item label="是否有混凝土">
|
|
|
<el-radio-group
|
|
|
v-model="nodeDetail.isConcrete"
|
|
|
@@ -680,9 +680,9 @@
|
|
|
>
|
|
|
<el-form-item
|
|
|
label="表名"
|
|
|
- prop="deptName"
|
|
|
+ prop="nodeName"
|
|
|
>
|
|
|
- <el-input v-model="eleForm.deptName"></el-input>
|
|
|
+ <el-input v-model="eleForm.nodeName"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
@@ -1321,9 +1321,9 @@ export default {
|
|
|
data () {
|
|
|
|
|
|
var checkMajorDataType = (rule, value, callback) => {
|
|
|
- //console.log(this.nodeDetail.deptCategory)
|
|
|
+ //console.log(this.nodeDetail.nodeType)
|
|
|
//console.log(this.nodeDetail.majorDataType)
|
|
|
- if(this.nodeDetail.deptCategory == 6){
|
|
|
+ if(this.nodeDetail.nodeType == 6){
|
|
|
if(!this.nodeDetail.majorDataType){
|
|
|
callback(new Error('工序节点必须选择内业资料类型'));
|
|
|
}
|
|
|
@@ -1396,7 +1396,7 @@ export default {
|
|
|
if (data.isExistForm == 1) {
|
|
|
tag = true
|
|
|
}
|
|
|
- if (data.deptCategory >= 6 && data.deptCategory <= 13) {
|
|
|
+ if (data.nodeType >= 6 && data.nodeType <= 13) {
|
|
|
tag = true
|
|
|
}
|
|
|
return tag
|
|
|
@@ -1412,13 +1412,13 @@ export default {
|
|
|
|
|
|
dialogVisible: false,
|
|
|
saveNodeLoading: false,
|
|
|
- deptCategorylist: [],
|
|
|
+ nodeTypelist: [],
|
|
|
majorDataTypeList: [],
|
|
|
rules: {
|
|
|
- deptName: [
|
|
|
+ nodeName: [
|
|
|
{ required: true, message: '请输入节点名称', trigger: 'blur' },
|
|
|
],
|
|
|
- deptCategory: [
|
|
|
+ nodeType: [
|
|
|
{ required: true, message: '请选择节点类型', trigger: 'change' }
|
|
|
],
|
|
|
majorDataType:[
|
|
|
@@ -1434,7 +1434,7 @@ export default {
|
|
|
elementList: [],
|
|
|
},
|
|
|
eleRules: {
|
|
|
- deptName: [
|
|
|
+ nodeName: [
|
|
|
{ required: true, message: '请输入表名称', trigger: 'blur' },
|
|
|
],
|
|
|
tableType: [
|
|
|
@@ -1499,7 +1499,7 @@ export default {
|
|
|
init () {
|
|
|
this.id = this.$route.query.wbsid;
|
|
|
this.projectid = this.$route.query.pid;
|
|
|
- this.getDeptCategorylist();
|
|
|
+ this.getNodeTypelist();
|
|
|
this.getTableTypelist();
|
|
|
this.getDataTypelist();
|
|
|
this.getOwnerTypelist();
|
|
|
@@ -1565,9 +1565,9 @@ export default {
|
|
|
updateNode () {
|
|
|
update(this.nodeDetail).then(() => {
|
|
|
let node = this.tableData[0];
|
|
|
- node.deptName = this.nodeDetail.deptName;
|
|
|
- node.deptCategory = this.nodeDetail.deptCategory;
|
|
|
- this.curTreeData.title = this.nodeDetail.deptName;
|
|
|
+ node.nodeName = this.nodeDetail.nodeName;
|
|
|
+ node.nodeType = this.nodeDetail.nodeType;
|
|
|
+ this.curTreeData.title = this.nodeDetail.nodeName;
|
|
|
this.dialogVisible = false;
|
|
|
this.$message({
|
|
|
type: "success",
|
|
|
@@ -1647,7 +1647,7 @@ export default {
|
|
|
if (valid) {
|
|
|
this.eleForm.wbsId = this.id;
|
|
|
this.eleForm.tenantId = this.userInfo.tenant_id;
|
|
|
- this.eleForm.deptCategory = -1;
|
|
|
+ this.eleForm.nodeType = -1;
|
|
|
this.eleForm.type = 2;// '1'节点 '2'表单
|
|
|
this.eleForm.parentId = this.nodeDetail.id;
|
|
|
this.eleForm.elementList.forEach((element) => {
|
|
|
@@ -2007,7 +2007,7 @@ export default {
|
|
|
this.tableSortList = this.formData.map((form, index) => {
|
|
|
return {
|
|
|
sort: index + 1,
|
|
|
- deptName: form.tableName,
|
|
|
+ nodeName: form.tableName,
|
|
|
pkeyId: form.pkeyId,
|
|
|
}
|
|
|
})
|
|
|
@@ -2051,8 +2051,8 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
|
|
|
- getDeptCategorylist () {
|
|
|
- if (this.deptCategorylist.length > 1) {
|
|
|
+ getNodeTypelist () {
|
|
|
+ if (this.nodeTypelist.length > 1) {
|
|
|
return;
|
|
|
}
|
|
|
getDictionary({
|
|
|
@@ -2061,7 +2061,7 @@ export default {
|
|
|
res.data.data.forEach(element => {
|
|
|
element.dictKey = Number(element.dictKey)
|
|
|
});
|
|
|
- this.deptCategorylist = res.data.data;
|
|
|
+ this.nodeTypelist = res.data.data;
|
|
|
})
|
|
|
},
|
|
|
getMajorDataTypeList () {
|
|
|
@@ -2119,9 +2119,9 @@ export default {
|
|
|
},
|
|
|
|
|
|
formatCat (row, column, cellValue) {
|
|
|
- for (let i = 0; i < this.deptCategorylist.length; i++) {
|
|
|
- if (this.deptCategorylist[i].dictKey == cellValue) {
|
|
|
- return this.deptCategorylist[i].dictValue
|
|
|
+ for (let i = 0; i < this.nodeTypelist.length; i++) {
|
|
|
+ if (this.nodeTypelist[i].dictKey == cellValue) {
|
|
|
+ return this.nodeTypelist[i].dictValue
|
|
|
}
|
|
|
}
|
|
|
return cellValue;
|
|
|
@@ -2471,7 +2471,7 @@ export default {
|
|
|
} else {
|
|
|
da.push({
|
|
|
pkeyId: val.pkeyId,
|
|
|
- deptName: val.tableName,
|
|
|
+ nodeName: val.tableName,
|
|
|
tableType: val.tableType,
|
|
|
tableOwner: val.tableOwner,
|
|
|
})
|
liuyc