Sfoglia il codice sorgente

修改字段名称

master
YF-yuan 3 anni fa
parent
commit
11dccfd527
5 ha cambiato i file con 9 aggiunte e 10 eliminazioni
  1. +2
    -3
      src/views/second/coordinationManage/applyCooperation/basicTarget.vue
  2. +1
    -1
      src/views/second/coordinationManage/cooperateList/basicTarget.vue
  3. +1
    -1
      src/views/second/coordinationManage/cooperateList/constraint.vue
  4. +1
    -1
      src/views/second/coordinationManage/cooperateList/reward.vue
  5. +4
    -4
      src/views/second/taskSummary/reward.vue

+ 2
- 3
src/views/second/coordinationManage/applyCooperation/basicTarget.vue Vedi File

@@ -187,9 +187,8 @@ export default {
methods: {
judge(row) {
let arr = [].concat(
row.leaderDept,
row.cooperateDept.split(",").map((item) => parseInt(item)),
row.otherDept.split(",").map((item) => parseInt(item))
row.cooperateDept?row.cooperateDept.split(",").map((item) => parseInt(item)):[],
row.leaderDept?row.leaderDept.split(",").map((item) => parseInt(item)):[]
);
let bool = arr.includes(this.user.user.deptId) || row.status == 1;
return bool;

+ 1
- 1
src/views/second/coordinationManage/cooperateList/basicTarget.vue Vedi File

@@ -163,7 +163,7 @@ export default {
this.page = page;
},
getDataList() {
this.searchParams.leaderDept = this.user.user.deptId
// this.searchParams.leaderDept = this.user.user.deptId
api.getBasicDataList(Object.assign({}, this.page, this.searchParams)).then((res)=>{
let data = res.data.data;
this.count = data.total;

+ 1
- 1
src/views/second/coordinationManage/cooperateList/constraint.vue Vedi File

@@ -156,7 +156,7 @@ export default {
this.page = page;
},
getDataList() {
this.searchParams.leaderDept = this.user.user.deptId
// this.searchParams.leaderDept = this.user.user.deptId
api.getConstraintDataList(Object.assign({}, this.page, this.searchParams)).then((res)=>{
let data = res.data.data;
this.count = data.total;

+ 1
- 1
src/views/second/coordinationManage/cooperateList/reward.vue Vedi File

@@ -163,7 +163,7 @@ export default {
this.page = page;
},
getDataList() {
this.searchParams.leaderDept = this.user.user.deptId
// this.searchParams.leaderDept = this.user.user.deptId
api.getRewardDataList(Object.assign({}, this.page, this.searchParams)).then((res)=>{
let data = res.data.data;
this.count = data.total;

+ 4
- 4
src/views/second/taskSummary/reward.vue Vedi File

@@ -55,7 +55,7 @@
align="center"
prop="leaderUnit"
></el-table-column>
<el-table-column label="第一牵头部门" width="120" align="center">
<el-table-column label="牵头部门" width="120" align="center">
<template slot-scope="{ row }">
<pre>{{ row.leaderDeptList | formatList }}</pre>
</template>
@@ -65,14 +65,14 @@
<pre>{{ row.leaderPrincipalList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="牵头部门" width="100" align="center">
<el-table-column label="其他牵头部门" width="120" 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

Loading…
Annulla
Salva