YF-yuan 3 роки тому
джерело
коміт
e441f04a03
15 змінених файлів з 25 додано та 18 видалено
  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 Переглянути файл

@@ -89,7 +89,7 @@
icon="el-icon-edit"
type="primary"
: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-popconfirm
@@ -102,6 +102,7 @@
icon="el-icon-delete"
type="danger"
:underline="false"
:disabled="user.user.deptId != 1 && user.user.deptId != detail.leaderDept"
>删除</el-link
>
</el-popconfirm></span

+ 1
- 1
src/views/chain/coordinationManage/approvalCooperation.vue Переглянути файл

@@ -91,7 +91,7 @@
<pre>{{ row.cooperateDeptList | formatList }}</pre>
</template>
</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 }">
<el-link
@click="edit(row, true)"

+ 1
- 1
src/views/chain/industryClassify.vue Переглянути файл

@@ -66,7 +66,7 @@
align="center"
prop="createTime"
></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 }">
<el-link
@click="edit(row)"

+ 2
- 1
src/views/second/coordinationManage/applyCooperation/basicTarget.vue Переглянути файл

@@ -95,7 +95,7 @@
<pre>{{ row.cooperatePrincipalList | formatList }}</pre>
</template>
</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 }">
<el-link
@click="edit(row)"
@@ -103,6 +103,7 @@
type="primary"
:underline="false"
:disabled="row.isApply || !row.id"
fixed="right"
>申请成为配合部门</el-link
>
</template>

+ 2
- 1
src/views/second/coordinationManage/applyCooperation/constraint.vue Переглянути файл

@@ -83,7 +83,7 @@
<pre>{{ row.cooperatePrincipalList | formatList }}</pre>
</template>
</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 }">
<el-link
@click="edit(row)"
@@ -91,6 +91,7 @@
type="primary"
:underline="false"
:disabled="row.isApply || !row.id"
fixed="right"
>申请成为配合部门</el-link
>
</template>

+ 2
- 1
src/views/second/coordinationManage/applyCooperation/reward.vue Переглянути файл

@@ -95,7 +95,7 @@
<pre>{{ row.cooperatePrincipalList | formatList }}</pre>
</template>
</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 }">
<el-link
@click="edit(row)"
@@ -103,6 +103,7 @@
type="primary"
:underline="false"
:disabled="row.isApply || !row.id"
fixed="right"
>申请成为配合部门</el-link
>
</template>

+ 1
- 1
src/views/second/coordinationManage/approvalCooperation/basicTarget.vue Переглянути файл

@@ -113,7 +113,7 @@
<pre>{{ row.cooperatePrincipalList | formatList }}</pre>
</template>
</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 }">
<el-link
@click="edit(row, true)"

+ 1
- 1
src/views/second/coordinationManage/approvalCooperation/constraint.vue Переглянути файл

@@ -100,7 +100,7 @@
<pre>{{ row.cooperatePrincipalList | formatList }}</pre>
</template>
</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 }">
<el-link
@click="edit(row, true)"

+ 1
- 1
src/views/second/coordinationManage/approvalCooperation/reward.vue Переглянути файл

@@ -113,7 +113,7 @@
<pre>{{ row.cooperatePrincipalList | formatList }}</pre>
</template>
</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 }">
<el-link
@click="edit(row, true)"

+ 1
- 1
src/views/second/segmentation/basicTable.vue Переглянути файл

@@ -111,7 +111,7 @@
<pre>{{ row.cooperatePrincipalList | formatList }}</pre>
</template>
</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 }">
<!-- <router-link
:to="{ name: 'segmentation', params: { id:row.basicTaskId, type: 1 } }"

+ 1
- 1
src/views/second/segmentation/constraint.vue Переглянути файл

@@ -100,7 +100,7 @@
<pre>{{ row.cooperatePrincipalList | formatList }}</pre>
</template>
</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 }">
<!-- <router-link
:to="{

+ 1
- 1
src/views/second/segmentation/reward.vue Переглянути файл

@@ -111,7 +111,7 @@
<pre>{{ row.cooperatePrincipalList | formatList }}</pre>
</template>
</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 }">
<!-- <router-link
:to="{

+ 3
- 2
src/views/second/taskSummary/basicTable.vue Переглянути файл

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

+ 3
- 2
src/views/second/taskSummary/constraint.vue Переглянути файл

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

+ 3
- 2
src/views/second/taskSummary/reward.vue Переглянути файл

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

Завантаження…
Відмінити
Зберегти