重点工程优化
parent
89cbc27c62
commit
e6b0c53c36
|
@ -32,7 +32,7 @@
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="施工相关方">
|
<el-form-item label="施工相关方">
|
||||||
<el-select v-model="UNITS_ID" placeholder="请选择施工相关方" style="width: 100%">
|
<el-select v-model="UNITS_ID" filterable placeholder="请选择施工相关方" style="width: 100%">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in unitsList"
|
v-for="item in unitsList"
|
||||||
:key="item.UNITS_ID"
|
:key="item.UNITS_ID"
|
||||||
|
@ -492,9 +492,12 @@ export default {
|
||||||
// 合并
|
// 合并
|
||||||
return new Promise((resolve) => {
|
return new Promise((resolve) => {
|
||||||
requestFN(
|
requestFN(
|
||||||
'/corpDepartment/listTreeManageAndCorp1',
|
'/department/listTreeCorpInfo',
|
||||||
|
{
|
||||||
|
CORPINFO_ID: this.CORPINFO_ID
|
||||||
|
}
|
||||||
).then((data) => {
|
).then((data) => {
|
||||||
this.treeDeptOptions = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
|
// this.treeDeptOptions = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
|
||||||
this.treeDataInspectDept = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
|
this.treeDataInspectDept = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
|
||||||
resolve()
|
resolve()
|
||||||
}).catch((e) => {
|
}).catch((e) => {
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="施工相关方">
|
<el-form-item label="施工相关方">
|
||||||
<el-select v-model="UNITS_ID" placeholder="请选择施工相关方" style="width: 100%">
|
<el-select v-model="UNITS_ID" filterable placeholder="请选择施工相关方" style="width: 100%">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in unitsList"
|
v-for="item in unitsList"
|
||||||
:key="item.UNITS_ID"
|
:key="item.UNITS_ID"
|
||||||
|
@ -174,6 +174,7 @@ export default {
|
||||||
directives: { waves },
|
directives: { waves },
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
CORPINFO_ID: '',
|
||||||
listLoading: true,
|
listLoading: true,
|
||||||
listQuery: {
|
listQuery: {
|
||||||
page: 1,
|
page: 1,
|
||||||
|
@ -212,6 +213,7 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
this.CORPINFO_ID = this.$parent.CORPINFO_ID
|
||||||
this.getList()
|
this.getList()
|
||||||
this.getUnitsList()
|
this.getUnitsList()
|
||||||
this.getCorpList()
|
this.getCorpList()
|
||||||
|
@ -243,9 +245,12 @@ export default {
|
||||||
// 合并
|
// 合并
|
||||||
return new Promise((resolve) => {
|
return new Promise((resolve) => {
|
||||||
requestFN(
|
requestFN(
|
||||||
'/corpDepartment/listTreeManageAndCorp1',
|
'department/listTreeCorpInfo',
|
||||||
|
{
|
||||||
|
CORPINFO_ID: this.CORPINFO_ID
|
||||||
|
}
|
||||||
).then((data) => {
|
).then((data) => {
|
||||||
this.treeDeptOptions = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
|
// this.treeDeptOptions = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
|
||||||
this.treeDataInspectDept = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
|
this.treeDataInspectDept = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
|
||||||
resolve()
|
resolve()
|
||||||
}).catch((e) => {
|
}).catch((e) => {
|
||||||
|
@ -305,7 +310,7 @@ export default {
|
||||||
COMPETENT_DEPT_ID: this.COMPETENT_DEPT_ID,
|
COMPETENT_DEPT_ID: this.COMPETENT_DEPT_ID,
|
||||||
GROUP_UNIT: this.GROUP_UNIT,
|
GROUP_UNIT: this.GROUP_UNIT,
|
||||||
CORP_NAME: this.CORP_NAME,
|
CORP_NAME: this.CORP_NAME,
|
||||||
CORPINFO_ID: this.$parent.CORPINFO_ID
|
CORPINFO_ID: this.CORPINFO_ID
|
||||||
}
|
}
|
||||||
).then((data) => {
|
).then((data) => {
|
||||||
this.listLoading = false
|
this.listLoading = false
|
||||||
|
|
Loading…
Reference in New Issue