Browse Source

修改

master
YF-yuan 3 years ago
parent
commit
e441f04a03
15 changed files with 25 additions and 18 deletions
  1. +2
    -1
      src/views/chain/assessmentContent.vue
  2. +1
    -1
      src/views/chain/coordinationManage/approvalCooperation.vue
  3. +1
    -1
      src/views/chain/industryClassify.vue
  4. +2
    -1
      src/views/second/coordinationManage/applyCooperation/basicTarget.vue
  5. +2
    -1
      src/views/second/coordinationManage/applyCooperation/constraint.vue
  6. +2
    -1
      src/views/second/coordinationManage/applyCooperation/reward.vue
  7. +1
    -1
      src/views/second/coordinationManage/approvalCooperation/basicTarget.vue
  8. +1
    -1
      src/views/second/coordinationManage/approvalCooperation/constraint.vue
  9. +1
    -1
      src/views/second/coordinationManage/approvalCooperation/reward.vue
  10. +1
    -1
      src/views/second/segmentation/basicTable.vue
  11. +1
    -1
      src/views/second/segmentation/constraint.vue
  12. +1
    -1
      src/views/second/segmentation/reward.vue
  13. +3
    -2
      src/views/second/taskSummary/basicTable.vue
  14. +3
    -2
      src/views/second/taskSummary/constraint.vue
  15. +3
    -2
      src/views/second/taskSummary/reward.vue

+ 2
- 1
src/views/chain/assessmentContent.vue View File

icon="el-icon-edit" icon="el-icon-edit"
type="primary" type="primary"
:underline="false" :underline="false"
:disabled="user.user.deptId == detail.leaderDept || user.user.deptId == detail.cooperateDept || user.user.deptId == detail.otherDept"
:disabled="user.user.deptId != 1 && user.user.deptId != detail.leaderDept"
>修改</el-link >修改</el-link
> >
<el-popconfirm <el-popconfirm
icon="el-icon-delete" icon="el-icon-delete"
type="danger" type="danger"
:underline="false" :underline="false"
:disabled="user.user.deptId != 1 && user.user.deptId != detail.leaderDept"
>删除</el-link >删除</el-link
> >
</el-popconfirm></span </el-popconfirm></span

+ 1
- 1
src/views/chain/coordinationManage/approvalCooperation.vue View File

<pre>{{ row.cooperateDeptList | formatList }}</pre> <pre>{{ row.cooperateDeptList | formatList }}</pre>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<el-table-column label="操作" align="center" min-width="120" fixed="right">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-link <el-link
@click="edit(row, true)" @click="edit(row, true)"

+ 1
- 1
src/views/chain/industryClassify.vue View File

align="center" align="center"
prop="createTime" prop="createTime"
></el-table-column> ></el-table-column>
<el-table-column label="操作" min-width="120" align="center">
<el-table-column label="操作" min-width="120" align="center" fixed="right">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-link <el-link
@click="edit(row)" @click="edit(row)"

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

<pre>{{ row.cooperatePrincipalList | formatList }}</pre> <pre>{{ row.cooperatePrincipalList | formatList }}</pre>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="170" align="center">
<el-table-column label="操作" width="170" align="center" fixed="right">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-link <el-link
@click="edit(row)" @click="edit(row)"
type="primary" type="primary"
:underline="false" :underline="false"
:disabled="row.isApply || !row.id" :disabled="row.isApply || !row.id"
fixed="right"
>申请成为配合部门</el-link >申请成为配合部门</el-link
> >
</template> </template>

+ 2
- 1
src/views/second/coordinationManage/applyCooperation/constraint.vue View File

<pre>{{ row.cooperatePrincipalList | formatList }}</pre> <pre>{{ row.cooperatePrincipalList | formatList }}</pre>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="170" align="center">
<el-table-column label="操作" width="170" align="center" fixed="right">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-link <el-link
@click="edit(row)" @click="edit(row)"
type="primary" type="primary"
:underline="false" :underline="false"
:disabled="row.isApply || !row.id" :disabled="row.isApply || !row.id"
fixed="right"
>申请成为配合部门</el-link >申请成为配合部门</el-link
> >
</template> </template>

+ 2
- 1
src/views/second/coordinationManage/applyCooperation/reward.vue View File

<pre>{{ row.cooperatePrincipalList | formatList }}</pre> <pre>{{ row.cooperatePrincipalList | formatList }}</pre>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="170" align="center">
<el-table-column label="操作" width="170" align="center" fixed="right">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-link <el-link
@click="edit(row)" @click="edit(row)"
type="primary" type="primary"
:underline="false" :underline="false"
:disabled="row.isApply || !row.id" :disabled="row.isApply || !row.id"
fixed="right"
>申请成为配合部门</el-link >申请成为配合部门</el-link
> >
</template> </template>

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

<pre>{{ row.cooperatePrincipalList | formatList }}</pre> <pre>{{ row.cooperatePrincipalList | formatList }}</pre>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="125" align="center">
<el-table-column label="操作" width="125" align="center" fixed="right">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-link <el-link
@click="edit(row, true)" @click="edit(row, true)"

+ 1
- 1
src/views/second/coordinationManage/approvalCooperation/constraint.vue View File

<pre>{{ row.cooperatePrincipalList | formatList }}</pre> <pre>{{ row.cooperatePrincipalList | formatList }}</pre>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="125" align="center">
<el-table-column label="操作" width="125" align="center" fixed="right">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-link <el-link
@click="edit(row, true)" @click="edit(row, true)"

+ 1
- 1
src/views/second/coordinationManage/approvalCooperation/reward.vue View File

<pre>{{ row.cooperatePrincipalList | formatList }}</pre> <pre>{{ row.cooperatePrincipalList | formatList }}</pre>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="125" align="center">
<el-table-column label="操作" width="125" align="center" fixed="right">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-link <el-link
@click="edit(row, true)" @click="edit(row, true)"

+ 1
- 1
src/views/second/segmentation/basicTable.vue View File

<pre>{{ row.cooperatePrincipalList | formatList }}</pre> <pre>{{ row.cooperatePrincipalList | formatList }}</pre>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="100" align="center">
<el-table-column label="操作" width="100" align="center" fixed="right">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!-- <router-link <!-- <router-link
:to="{ name: 'segmentation', params: { id:row.basicTaskId, type: 1 } }" :to="{ name: 'segmentation', params: { id:row.basicTaskId, type: 1 } }"

+ 1
- 1
src/views/second/segmentation/constraint.vue View File

<pre>{{ row.cooperatePrincipalList | formatList }}</pre> <pre>{{ row.cooperatePrincipalList | formatList }}</pre>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="100" align="center">
<el-table-column label="操作" width="100" align="center" fixed="right">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!-- <router-link <!-- <router-link
:to="{ :to="{

+ 1
- 1
src/views/second/segmentation/reward.vue View File

<pre>{{ row.cooperatePrincipalList | formatList }}</pre> <pre>{{ row.cooperatePrincipalList | formatList }}</pre>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="100" align="center">
<el-table-column label="操作" width="100" align="center" fixed="right">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!-- <router-link <!-- <router-link
:to="{ :to="{

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

type="primary" type="primary"
:underline="false" :underline="false"
@click="edit(row)" @click="edit(row)"
:disabled="!row.id"
:disabled="!row.id || (user.user.deptId != 1 && user.user.deptId != row.leaderDept)"
icon="el-icon-edit" icon="el-icon-edit"
fixed="right"
>编辑</el-link >编辑</el-link
> >
</template> </template>
this.$store.dispatch("base/getPrincipalList"); this.$store.dispatch("base/getPrincipalList");
}, },
computed: { computed: {
...mapGetters(["formatDep", "principalList", "department"]),
...mapGetters(["formatDep", "principalList", "department", "user"]),
}, },
filters: { filters: {
formatList(val) { formatList(val) {

+ 3
- 2
src/views/second/taskSummary/constraint.vue View File

type="primary" type="primary"
:underline="false" :underline="false"
@click="edit(row)" @click="edit(row)"
:disabled="!row.id"
:disabled="!row.id || (user.user.deptId != 1 && user.user.deptId != row.leaderDept)"
icon="el-icon-edit" icon="el-icon-edit"
fixed="right"
>编辑</el-link >编辑</el-link
> >
</template> </template>
this.$store.dispatch("base/getPrincipalList"); this.$store.dispatch("base/getPrincipalList");
}, },
computed: { computed: {
...mapGetters(["formatDep", "principalList", "department"]),
...mapGetters(["formatDep", "principalList", "department", "user"]),
}, },
filters: { filters: {
formatList(val) { formatList(val) {

+ 3
- 2
src/views/second/taskSummary/reward.vue View File

type="primary" type="primary"
:underline="false" :underline="false"
@click="edit(row)" @click="edit(row)"
:disabled="!row.id"
:disabled="!row.id || (user.user.deptId != 1 && user.user.deptId != row.leaderDept)"
icon="el-icon-edit" icon="el-icon-edit"
fixed="right"
>编辑</el-link >编辑</el-link
> >
</template> </template>
this.$store.dispatch("base/getPrincipalList"); this.$store.dispatch("base/getPrincipalList");
}, },
computed: { computed: {
...mapGetters(["formatDep", "principalList", "department"]),
...mapGetters(["formatDep", "principalList", "department", "user"]),
}, },
filters: { filters: {
formatList(val) { formatList(val) {

Loading…
Cancel
Save