Explorar el Código

修改

master
yangzhou-cyber hace 3 años
padre
commit
990759f66a
Se han modificado 9 ficheros con 181 adiciones y 154 borrados
  1. +2
    -2
      src/views/second/coordinationManage/applyCooperation/basicTarget.vue
  2. +2
    -2
      src/views/second/coordinationManage/applyCooperation/constraint.vue
  3. +2
    -2
      src/views/second/coordinationManage/applyCooperation/reward.vue
  4. +3
    -4
      src/views/second/segmentation/basicTable.vue
  5. +3
    -3
      src/views/second/segmentation/constraint.vue
  6. +3
    -4
      src/views/second/segmentation/reward.vue
  7. +34
    -24
      src/views/second/taskSummary/basicTable.vue
  8. +32
    -24
      src/views/second/taskSummary/constraint.vue
  9. +100
    -89
      src/views/second/taskSummary/reward.vue

+ 2
- 2
src/views/second/coordinationManage/applyCooperation/basicTarget.vue Ver fichero

@@ -28,13 +28,13 @@
<el-table-column
label="考核内容和计分细则"
align="center"
min-width="80"
min-width="250"
prop="content"
></el-table-column>
<el-table-column
label="小条内容"
align="center"
min-width="220"
min-width="320"
prop="content"
></el-table-column>
<el-table-column

+ 2
- 2
src/views/second/coordinationManage/applyCooperation/constraint.vue Ver fichero

@@ -22,13 +22,13 @@
<el-table-column
label="考核内容和计分细则"
align="center"
min-width="200"
min-width="250"
prop="content"
></el-table-column>
<el-table-column
label="小条内容"
align="center"
min-width="100"
min-width="400"
prop="itemContent"
></el-table-column>
<el-table-column

+ 2
- 2
src/views/second/coordinationManage/applyCooperation/reward.vue Ver fichero

@@ -28,13 +28,13 @@
<el-table-column
label="考核内容和计分细则"
align="center"
min-width="100"
min-width="250"
prop="content"
></el-table-column>
<el-table-column
label="小条内容"
align="center"
min-width="150"
min-width="320"
prop="content"
></el-table-column>
<el-table-column

+ 3
- 4
src/views/second/segmentation/basicTable.vue Ver fichero

@@ -25,20 +25,19 @@
></el-table-column>
<el-table-column
label="一级指标"
min-width="100"
min-width="80"
align="center"
prop="quota1"
></el-table-column>
<el-table-column
label="二级指标"
min-width="100"
min-width="80"
align="center"
prop="quota2"
></el-table-column>
<el-table-column
label="考核内容和计分细则"
min-width="80"
max-width="300"
min-width="250"
align="center"
prop="content"
></el-table-column>

+ 3
- 3
src/views/second/segmentation/constraint.vue Ver fichero

@@ -25,19 +25,19 @@
></el-table-column>
<el-table-column
label="考核指标"
min-width="100"
min-width="80"
align="center"
prop="quota"
></el-table-column>
<el-table-column
label="考核内容和计分细则"
min-width="150"
min-width="250"
align="center"
prop="content"
></el-table-column>
<el-table-column
label="小条内容"
min-width="150"
min-width="400"
align="center"
prop="itemContent"
></el-table-column>

+ 3
- 4
src/views/second/segmentation/reward.vue Ver fichero

@@ -25,20 +25,19 @@
></el-table-column>
<el-table-column
label="一级指标"
min-width="100"
min-width="80"
align="center"
prop="quota1"
></el-table-column>
<el-table-column
label="二级指标"
min-width="100"
min-width="80"
align="center"
prop="quota2"
></el-table-column>
<el-table-column
label="考核内容和计分细则"
min-width="80"
max-width="300"
min-width="250"
align="center"
prop="content"
></el-table-column>

+ 34
- 24
src/views/second/taskSummary/basicTable.vue Ver fichero

@@ -24,20 +24,19 @@
></el-table-column>
<el-table-column
label="一级指标"
min-width="100"
min-width="80"
align="center"
prop="quota1"
></el-table-column>
<el-table-column
label="二级指标"
min-width="100"
min-width="80"
align="center"
prop="quota2"
></el-table-column>
<el-table-column
label="考核内容和计分细则"
min-width="80"
max-width="300"
min-width="250"
align="center"
prop="content"
></el-table-column>
@@ -59,35 +58,40 @@
align="center"
prop="leaderUnit"
></el-table-column>
<el-table-column
label="牵头部门"
width="100"
align="center"
prop="leaderDeptList"
></el-table-column>
<el-table-column
label="责任领导"
width="80"
align="center"
prop="leaderPrincipalList"
></el-table-column>
<el-table-column label="牵头部门" width="100" align="center">
<template slot-scope="{ row }">
{{ row.leaderDeptList | formatList }}
</template>
</el-table-column>
<el-table-column label="责任领导" width="80" align="center">
<template slot-scope="{ row }">
{{ row.leaderPrincipalList | formatList }}
</template>
</el-table-column>
<el-table-column
label="配合部门"
width="100"
align="center"
prop="cooperateDeptList"
></el-table-column>
prop="cooperateDept"
>
<template slot-scope="{ row }">
{{ row.cooperateDeptList | formatList }}
</template>
</el-table-column>
<el-table-column
label="责任领导"
width="80"
align="center"
prop="cooperatePrincipalList"
></el-table-column>
prop="cooperateDeptList"
>
<template slot-scope="{ row }">
{{ row.cooperatePrincipalList | formatList }}
</template>
</el-table-column>
<el-table-column
label="操作"
width="80"
align="center"
:key="Math.random()"
>
<template slot-scope="{ row }">
<el-link
@@ -235,6 +239,13 @@ export default {
computed: {
...mapGetters(["formatDep"]),
},
filters: {
formatList(val) {
if (val) {
return val.join(",");
}
},
},
methods: {
updateParams(data) {
this.searchParams = data;
@@ -252,12 +263,12 @@ export default {
.getBasicTableList(Object.assign({}, this.page, this.searchParams))
.then((res) => {
let data = res.data.data;
this.count=data.total
this.count = data.total;
this.dataList = this.reduceData(data.records);
})
.catch((e) => {
this.dataList = [];
this.count=0
this.count = 0;
})
.finally(() => {
this.loading = false;
@@ -265,7 +276,6 @@ export default {
},
edit(row) {
this.showEdit = true;
},
save() {
this.showEdit = false;

+ 32
- 24
src/views/second/taskSummary/constraint.vue Ver fichero

@@ -24,19 +24,19 @@
></el-table-column>
<el-table-column
label="考核指标"
min-width="100"
min-width="80"
align="center"
prop="quota"
></el-table-column>
<el-table-column
label="考核内容和计分细则"
min-width="200"
min-width="250"
align="center"
prop="content"
></el-table-column>
<el-table-column
label="小条内容"
min-width="320"
min-width="400"
align="center"
prop="itemContent"
></el-table-column>
@@ -52,36 +52,37 @@
align="center"
prop="leaderUnit"
></el-table-column>
<el-table-column
label="牵头部门"
width="100"
align="center"
prop="leaderDeptList"
></el-table-column>
<el-table-column
label="责任领导"
width="80"
align="center"
prop="leaderPrincipalList"
></el-table-column>
<el-table-column label="牵头部门" width="100" align="center">
<template slot-scope="{ row }">
{{ row.leaderDeptList | formatList }}
</template>
</el-table-column>
<el-table-column label="责任领导" width="80" align="center">
<template slot-scope="{ row }">
{{ row.leaderPrincipalList | formatList }}
</template>
</el-table-column>
<el-table-column
label="配合部门"
width="100"
align="center"
prop="cooperateDeptList"
></el-table-column>
prop="cooperateDept"
>
<template slot-scope="{ row }">
{{ row.cooperateDeptList | formatList }}
</template>
</el-table-column>
<el-table-column
label="责任领导"
width="80"
align="center"
prop="cooperatePrincipalList"
></el-table-column>
<el-table-column
label="操作"
width="80"
align="center"
:key="Math.random()"
prop="cooperateDeptList"
>
<template slot-scope="{ row }">
{{ row.cooperatePrincipalList | formatList }}
</template>
</el-table-column>
<el-table-column label="操作" width="80" align="center">
<template slot-scope="{ row }">
<el-link
slot="reference"
@@ -226,6 +227,13 @@ export default {
computed: {
...mapGetters(["formatDep"]),
},
filters: {
formatList(val) {
if (val) {
return val.join(",");
}
},
},
methods: {
updateParams(data) {
this.searchParams = data;

+ 100
- 89
src/views/second/taskSummary/reward.vue Ver fichero

@@ -1,11 +1,15 @@
<template>
<div class="assessing-content ele-body">
<el-card shadow="never" v-loading="loading" element-loading-background="rgba(255, 255, 255, 1)">
<search :type="2" @search:task="updateParams($event)" />
<div class="operating">
<el-card
shadow="never"
v-loading="loading"
element-loading-background="rgba(255, 255, 255, 1)"
>
<search :type="2" @search:task="updateParams($event)" />
<div class="operating">
<el-button size="small" type="primary">导出</el-button>
</div>
<el-table
</div>
<el-table
highlight-current-row
:data="dataList"
:height="tableHeight"
@@ -20,20 +24,19 @@
></el-table-column>
<el-table-column
label="一级指标"
min-width="100"
min-width="80"
align="center"
prop="quota1"
></el-table-column>
<el-table-column
label="二级指标"
min-width="100"
min-width="80"
align="center"
prop="quota2"
></el-table-column>
<el-table-column
label="考核内容和计分细则"
min-width="80"
max-width="300"
min-width="250"
align="center"
prop="content"
></el-table-column>
@@ -55,36 +58,37 @@
align="center"
prop="leaderUnit"
></el-table-column>
<el-table-column
label="牵头部门"
width="100"
align="center"
prop="leaderDeptList"
></el-table-column>
<el-table-column
label="责任领导"
width="80"
align="center"
prop="leaderPrincipalList"
></el-table-column>
<el-table-column label="牵头部门" width="100" align="center">
<template slot-scope="{ row }">
{{ row.leaderDeptList | formatList }}
</template>
</el-table-column>
<el-table-column label="责任领导" width="80" align="center">
<template slot-scope="{ row }">
{{ row.leaderPrincipalList | formatList }}
</template>
</el-table-column>
<el-table-column
label="配合部门"
width="100"
align="center"
prop="cooperateDeptList"
></el-table-column>
prop="cooperateDept"
>
<template slot-scope="{ row }">
{{ row.cooperateDeptList | formatList }}
</template>
</el-table-column>
<el-table-column
label="责任领导"
width="80"
align="center"
prop="cooperatePrincipalList"
></el-table-column>
<el-table-column
label="操作"
width="80"
align="center"
:key="Math.random()"
prop="cooperateDeptList"
>
<template slot-scope="{ row }">
{{ row.cooperatePrincipalList | formatList }}
</template>
</el-table-column>
<el-table-column label="操作" width="80" align="center">
<template slot-scope="{ row }">
<el-link
slot="reference"
@@ -97,7 +101,7 @@
</el-table-column>
</el-table>

<el-pagination
<el-pagination
:current-page.sync="page.page"
:page-size="page.limit"
:total="count"
@@ -109,53 +113,53 @@
@current-change="getDataList()"
/>
<el-dialog
title="编辑考核内容"
:visible.sync="showEdit"
width="400px"
custom-class="ele-dialog-form"
:lock-scroll="false"
:destroy-on-close="true"
@closed="form = {}"
>
<el-form
:model="form"
label-width="82px"
custom-class="editForm"
@keyup.enter.native="save"
@submit.native.prevent
ref="editForm"
title="编辑考核内容"
:visible.sync="showEdit"
width="400px"
custom-class="ele-dialog-form"
:lock-scroll="false"
:destroy-on-close="true"
@closed="form = {}"
>
<el-form-item label="小条内容:" prop="">
<el-input
type="textarea"
:rows="5"
placeholder="请输入考核内容"
></el-input>
</el-form-item>
<el-form-item label="分值:" prop="">
<el-input placeholder="请输入分值"></el-input>
</el-form-item>
<el-form
:model="form"
label-width="82px"
custom-class="editForm"
@keyup.enter.native="save"
@submit.native.prevent
ref="editForm"
>
<el-form-item label="小条内容:" prop="">
<el-input
type="textarea"
:rows="5"
placeholder="请输入考核内容"
></el-input>
</el-form-item>
<el-form-item label="分值:" prop="">
<el-input placeholder="请输入分值"></el-input>
</el-form-item>

<el-form-item label="牵头部门:" prop="">
<treeselect
:flat="true"
:options="formatDep"
:multiple="true"
placeholder="请选择牵头部门"
:defaultExpandLevel="2"
:normalizer="
(d) => {
return {
id: d.id,
label: d.name,
children:
d.children && d.children.length > 0
? d.children
: undefined,
};
}
"
/>
<el-form-item label="牵头部门:" prop="">
<treeselect
:flat="true"
:options="formatDep"
:multiple="true"
placeholder="请选择牵头部门"
:defaultExpandLevel="2"
:normalizer="
(d) => {
return {
id: d.id,
label: d.name,
children:
d.children && d.children.length > 0
? d.children
: undefined,
};
}
"
/>
</el-form-item>
<el-form-item label="配合部门:" prop="">
<treeselect
@@ -178,12 +182,12 @@
"
/>
</el-form-item>
</el-form>
<div slot="footer">
<el-button type="primary" @click="save">确定</el-button>
<el-button @click="showEdit = false">取消</el-button>&nbsp;
</div>
</el-dialog>
</el-form>
<div slot="footer">
<el-button type="primary" @click="save">确定</el-button>
<el-button @click="showEdit = false">取消</el-button>&nbsp;
</div>
</el-dialog>
</el-card>
</div>
</template>
@@ -198,7 +202,7 @@ import { mergeSpan } from "@/utils/mixin";
export default {
components: {
search,
Treeselect
Treeselect,
},
mixins: [
mergeSpan([
@@ -230,6 +234,13 @@ export default {
computed: {
...mapGetters(["formatDep"]),
},
filters: {
formatList(val) {
if (val) {
return val.join(",");
}
},
},
methods: {
updateParams(data) {
this.searchParams = data;
@@ -246,24 +257,24 @@ export default {
.getRewardList(Object.assign({}, this.page, this.searchParams))
.then((res) => {
let data = res.data.data;
this.count = data.total
this.count = data.total;
this.dataList = this.reduceData(data.records);
})
.catch((e) => {
this.dataList = [];
this.count=0
this.count = 0;
})
.finally(() => {
this.loading = false;
});
},
edit(row) {
this.showEdit = true
this.showEdit = true;
},
save() {
this.showEdit = false
}
}
this.showEdit = false;
},
},
};
</script>


Cargando…
Cancelar
Guardar