Browse Source

添加其他牵头部门

master
YF-yuan 3 years ago
parent
commit
136218fe59
5 changed files with 125 additions and 107 deletions
  1. +10
    -3
      src/api/second/coordinationManage/approvalCooperation.js
  2. +0
    -1
      src/views/second/coordinationManage/applyCooperation/basicTarget.vue
  3. +6
    -6
      src/views/second/taskSummary/basicTable.vue
  4. +57
    -51
      src/views/second/taskSummary/constraint.vue
  5. +52
    -46
      src/views/second/taskSummary/reward.vue

+ 10
- 3
src/api/second/coordinationManage/approvalCooperation.js View File

@@ -1,6 +1,13 @@
import axios from "@/config/axios"
export default {
getDataList(params) {
return axios.post('', params)
}
getBasicDataList(params) {
return axios.post('/cooperateapply/getBasicTaskCheckApplyList', params)
},
getRewardDataList(params) {
return axios.post('/cooperateapply/getSpecialPowerCheckApplyList', params)
},
getConstraintDataList(params) {
return axios.post('/cooperateapply/getRigidityConstraintCheckApplyList', params)
},

}

+ 0
- 1
src/views/second/coordinationManage/applyCooperation/basicTarget.vue View File

@@ -187,7 +187,6 @@ export default {
},
methods: {
judge(row) {
console.log(row);
let arr = [].concat(
row.cooperateDept.split(",").map((item) => parseInt(item)),
row.leaderDept.split(",").map((item) => parseInt(item))

+ 6
- 6
src/views/second/taskSummary/basicTable.vue View File

@@ -58,7 +58,7 @@
align="center"
prop="leaderUnit"
></el-table-column>
<el-table-column label="第一牵头部门" width="120" align="center">
<el-table-column label="牵头部门" width="130" align="center">
<template slot-scope="{ row }">
<pre>{{ row.leaderDeptList | formatList }}</pre>
</template>
@@ -68,14 +68,14 @@
<pre>{{ row.leaderPrincipalList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="牵头部门" width="100" align="center">
<el-table-column label="其他牵头部门" width="130" align="center">
<template slot-scope="{ row }">
<pre>{{ row.leaderDeptList | formatList }}</pre>
<pre>{{ row.otherDeptList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="责任领导" width="80" align="center">
<template slot-scope="{ row }">
<pre>{{ row.leaderPrincipalList | formatList }}</pre>
<pre>{{ row.otherPrincipalList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column
@@ -195,7 +195,7 @@
<el-col :span="4" class="title"> 其他牵头部门: </el-col>
<el-col :span="7">
<treeselect
v-model="form.leaderDept"
v-model="form.otherDept"
:flat="true"
:options="formatDep"
placeholder="请选择其他牵头部门"
@@ -217,7 +217,7 @@
<el-col :span="4" class="title"> 责任领导: </el-col>
<el-col :span="7">
<treeselect
v-model="form.leaderPrincipal"
v-model="form.otherPrincipal"
:options="principalList"
placeholder="请选择其他牵头部门责任领导"
:defaultExpandLevel="1"

+ 57
- 51
src/views/second/taskSummary/constraint.vue View File

@@ -52,7 +52,7 @@
align="center"
prop="leaderUnit"
></el-table-column>
<el-table-column label="第一牵头部门" width="120" align="center">
<el-table-column label="牵头部门" width="130" align="center">
<template slot-scope="{ row }">
<pre>{{ row.leaderDeptList | formatList }}</pre>
</template>
@@ -62,14 +62,14 @@
<pre>{{ row.leaderPrincipalList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="牵头部门" width="100" align="center">
<el-table-column label="其他牵头部门" width="130" align="center">
<template slot-scope="{ row }">
<pre>{{ row.leaderDeptList | formatList }}</pre>
<pre>{{ row.otherDeptList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="责任领导" width="80" align="center">
<template slot-scope="{ row }">
<pre>{{ row.leaderPrincipalList | formatList }}</pre>
<pre>{{ row.otherPrincipalList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column
@@ -182,53 +182,56 @@
/>
</el-col>
</el-row>
<div class="leader">
<span class="el-icon-circle-plus-outline add"></span>
<el-row>
<el-col :span="4" class="title"> 其他牵头部门: </el-col>
<el-col :span="7">
<treeselect
v-model="form.leaderDept"
:flat="true"
:options="formatDep"
placeholder="请选择其他牵头部门"
:defaultExpandLevel="2"
:normalizer="
(d) => {
return {
id: d.id,
label: d.name,
children:
d.children && d.children.length > 0
? d.children
: undefined,
};
}
"
/>
</el-col>
<el-col :span="4" class="title"> 责任领导: </el-col>
<el-col :span="7">
<treeselect
v-model="form.leaderPrincipal"
:options="principalList"
placeholder="请选择其他牵头部门责任领导"
:defaultExpandLevel="1"
:normalizer="
(d) => {
return {
id: d.id,
label: d.realname,
children:
d.children && d.children.length > 0
? d.children
: undefined,
};
}
"
/>
</el-col>
</el-row>
<div class="leader">
<span class="el-icon-circle-plus-outline add" @click="addOtherleader"></span>
<div style="position:relative;">
<span class="el-icon-remove-outline delete"></span>
<el-row>
<el-col :span="4" class="title"> 其他牵头部门: </el-col>
<el-col :span="7">
<treeselect
v-model="form.otherDept"
:flat="true"
:options="formatDep"
placeholder="请选择其他牵头部门"
:defaultExpandLevel="2"
:normalizer="
(d) => {
return {
id: d.id,
label: d.name,
children:
d.children && d.children.length > 0
? d.children
: undefined,
};
}
"
/>
</el-col>
<el-col :span="4" class="title"> 责任领导: </el-col>
<el-col :span="7">
<treeselect
v-model="form.otherPrincipal"
:options="principalList"
placeholder="请选择其他牵头部门责任领导"
:defaultExpandLevel="1"
:normalizer="
(d) => {
return {
id: d.id,
label: d.realname,
children:
d.children && d.children.length > 0
? d.children
: undefined,
};
}
"
/>
</el-col>
</el-row>
</div>
</div>
<div class="cooperate">
<span class="el-icon-circle-plus-outline add"></span>
@@ -341,6 +344,9 @@ export default {
},
},
methods: {
addOtherleader() {
console.log(this.form);
},
updateParams(data) {
this.searchParams = data;
this.resetCurrentPage();

+ 52
- 46
src/views/second/taskSummary/reward.vue View File

@@ -188,52 +188,55 @@
</el-col>
</el-row>
<div class="leader">
<span class="el-icon-circle-plus-outline add"></span>
<el-row>
<el-col :span="4" class="title"> 其他牵头部门: </el-col>
<el-col :span="7">
<treeselect
v-model="form.leaderDept"
:flat="true"
:options="formatDep"
placeholder="请选择其他牵头部门"
:defaultExpandLevel="2"
:normalizer="
(d) => {
return {
id: d.id,
label: d.name,
children:
d.children && d.children.length > 0
? d.children
: undefined,
};
}
"
/>
</el-col>
<el-col :span="4" class="title"> 责任领导: </el-col>
<el-col :span="7">
<treeselect
v-model="form.leaderPrincipal"
:options="principalList"
placeholder="请选择其他牵头部门责任领导"
:defaultExpandLevel="1"
:normalizer="
(d) => {
return {
id: d.id,
label: d.realname,
children:
d.children && d.children.length > 0
? d.children
: undefined,
};
}
"
/>
</el-col>
</el-row>
<span class="el-icon-circle-plus-outline add" @click="addOtherleader"></span>
<div style="position:relative;">
<span class="el-icon-remove-outline delete"></span>
<el-row>
<el-col :span="4" class="title"> 其他牵头部门: </el-col>
<el-col :span="7">
<treeselect
v-model="form.otherDept"
:flat="true"
:options="formatDep"
placeholder="请选择其他牵头部门"
:defaultExpandLevel="2"
:normalizer="
(d) => {
return {
id: d.id,
label: d.name,
children:
d.children && d.children.length > 0
? d.children
: undefined,
};
}
"
/>
</el-col>
<el-col :span="4" class="title"> 责任领导: </el-col>
<el-col :span="7">
<treeselect
v-model="form.otherPrincipal"
:options="principalList"
placeholder="请选择其他牵头部门责任领导"
:defaultExpandLevel="1"
:normalizer="
(d) => {
return {
id: d.id,
label: d.realname,
children:
d.children && d.children.length > 0
? d.children
: undefined,
};
}
"
/>
</el-col>
</el-row>
</div>
</div>
<div class="cooperate">
<span class="el-icon-circle-plus-outline add"></span>
@@ -348,6 +351,9 @@ export default {
},
},
methods: {
addOtherleader() {
console.log(this.form);
},
updateParams(data) {
this.searchParams = data;
this.resetCurrentPage();

Loading…
Cancel
Save