Merge remote-tracking branch 'origin/dev_test' into dev_test

This commit is contained in:
wxyclub
2023-11-16 10:12:53 +08:00
6 changed files with 49 additions and 7 deletions
@@ -1,7 +1,10 @@
<template>
<div class="qbzxd-jhgk">
<ProcessHeader toggle>
<template slot="proName">企标制修订计划管控{{ toggleType === '1' ? '-计划合并' : toggleType === '2' ? '-计划延期' : toggleType === '3' ? '-计划取消' : toggleType === '4' ? '-计划更名' : '-计划立项' }}</template>
<template slot="proName">
企标制修订计划管控
<span v-if="toggleType">{{ toggleType === '1' ? '-计划合并' : toggleType === '2' ? '-计划延期' : toggleType === '3' ? '-计划取消' : toggleType === '4' ? '-计划更名' : '-计划立项' }}</span>
</template>
<template slot="proNode">起草</template>
</ProcessHeader>
<div class="headerTabs">
@@ -1,7 +1,10 @@
<template>
<div class="qbzxd-jhgk">
<ProcessHeader toggle>
<template slot="proName">企标制修订计划管控{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</template>
<template slot="proName">
企标制修订计划管控
<span>{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</span>>
</template>
<template slot="proNode">批准</template>
</ProcessHeader>
<div class="headerTabs">
@@ -321,6 +324,7 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<loading :loading="isLoading">加载中...</loading>
</div>
</template>
@@ -357,6 +361,7 @@ export default {
detailData: [],
standSortOptions: [],
cbcdOptions: [],
isLoading: false,
}
},
mounted() {
@@ -412,6 +417,7 @@ export default {
})
},
getData() {
this.isLoading = true
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.$route.query.taskIds,
@@ -422,6 +428,7 @@ export default {
this.getFormFieldList(processForm)
}
}).catch(e => {
this.isLoading = false
})
})
},
@@ -434,6 +441,7 @@ export default {
this.qbfsForm = JSON.parse(JSON.stringify(item))
this.type = item.type
this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
this.isLoading = false
})
},
assemble(ids,names){
@@ -1,7 +1,10 @@
<template>
<div class="qbzxd-jhgk">
<ProcessHeader toggle>
<template slot="proName">企标制修订计划管控{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</template>
<template slot="proName">
企标制修订计划管控
<span v-if="type">{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</span>
</template>
<template slot="proNode">审核</template>
</ProcessHeader>
<div class="headerTabs">
@@ -343,6 +346,7 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<loading :loading="isLoading">加载中...</loading>
</div>
</template>
@@ -379,7 +383,7 @@ export default {
drawerTitle: '',
detailData: [],
cbcdOptions: [],
isLoading: false,
}
},
mounted() {
@@ -435,6 +439,7 @@ export default {
})
},
getData() {
this.isLoading = true
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.$route.query.taskIds,
@@ -445,6 +450,7 @@ export default {
this.getFormFieldList(processForm)
}
}).catch(e => {
this.isLoading = false
})
})
},
@@ -458,6 +464,7 @@ export default {
console.log(item.area.join(','));
this.type = item.type
this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
this.isLoading = false
})
},
assemble(ids,names){
@@ -1,7 +1,10 @@
<template>
<div class="qbzxd-jhgk">
<ProcessHeader toggle>
<template slot="proName">企标制修订计划管控{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</template>
<template slot="proName">
企标制修订计划管控
<span v-if="type">{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</span>
</template>
<template slot="proNode">会签</template>
</ProcessHeader>
<div class="headerTabs">
@@ -339,6 +342,7 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<loading :loading="isLoading">加载中...</loading>
</div>
</template>
@@ -375,6 +379,7 @@ export default {
detailData: [],
standSortOptions: [],
cbcdOptions: [],
isLoading: false,
}
},
mounted() {
@@ -430,6 +435,7 @@ export default {
})
},
getData() {
this.isLoading = true
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.$route.query.taskIds,
@@ -440,6 +446,7 @@ export default {
this.getFormFieldList(processForm)
}
}).catch(e => {
this.isLoading = false
})
})
},
@@ -452,6 +459,7 @@ export default {
this.qbfsForm = JSON.parse(JSON.stringify(item))
this.type = item.type
this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
this.isLoading = false
})
},
assemble(ids,names){
@@ -1,7 +1,10 @@
<template>
<div class="qbzxd-jhgk">
<ProcessHeader toggle>
<template slot="proName">企标制修订计划管控{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</template>
<template slot="proName">
企标制修订计划管控
<span v-if="type">{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</span>
</template>
<template slot="proNode">审定</template>
</ProcessHeader>
<div class="headerTabs">
@@ -341,6 +344,7 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<loading :loading="isLoading">加载中...</loading>
</div>
</template>
@@ -377,6 +381,7 @@ export default {
detailData: [],
standSortOptions: [],
cbcdOptions: [],
isLoading: false,
}
},
mounted() {
@@ -432,6 +437,7 @@ export default {
})
},
getData() {
this.isLoading = true
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.$route.query.taskIds,
@@ -442,6 +448,7 @@ export default {
this.getFormFieldList(processForm)
}
}).catch(e => {
this.isLoading = false
})
})
},
@@ -454,6 +461,7 @@ export default {
this.qbfsForm = JSON.parse(JSON.stringify(item))
this.type = item.type
this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
this.isLoading = false
})
},
assemble(ids,names){
@@ -1,7 +1,10 @@
<template>
<div class="qbzxd-jhgk">
<ProcessHeader toggle>
<template slot="proName">企标制修订计划管控{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</template>
<template slot="proName">
企标制修订计划管控
<span v-if="type">{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</span>
</template>
<template slot="proNode">批准</template>
</ProcessHeader>
<div class="headerTabs">
@@ -341,6 +344,7 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<loading :loading="isLoading">加载中...</loading>
</div>
</template>
@@ -377,6 +381,7 @@ export default {
detailData: [],
standSortOptions: [],
cbcdOptions: [],
isLoading: false,
}
},
mounted() {
@@ -432,6 +437,7 @@ export default {
})
},
getData() {
this.isLoading = true
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.$route.query.taskIds,
@@ -442,6 +448,7 @@ export default {
this.getFormFieldList(processForm)
}
}).catch(e => {
this.isLoading = false
})
})
},
@@ -454,6 +461,7 @@ export default {
this.qbfsForm = JSON.parse(JSON.stringify(item))
this.type = item.type
this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
this.isLoading = false
})
},
assemble(ids,names){