Przeglądaj źródła

Merge branch 'master' of git.taauav.net:gitadmin/jndz_admin_web

master
yangzhou-cyber 3 lat temu
rodzic
commit
5a73f24ccd
6 zmienionych plików z 521 dodań i 101 usunięć
  1. +0
    -0
      src/api/chain/industryClassify.js
  2. +1
    -0
      src/views/basicTable/conventional.vue
  3. +321
    -0
      src/views/chain/industryClassify.vue
  4. +67
    -34
      src/views/second/coordinationManage/cooperateList/basicTarget.vue
  5. +67
    -34
      src/views/second/coordinationManage/cooperateList/constraint.vue
  6. +65
    -33
      src/views/second/coordinationManage/cooperateList/reward.vue

+ 0
- 0
src/api/chain/industryClassify.js Wyświetl plik


+ 1
- 0
src/views/basicTable/conventional.vue Wyświetl plik

@@ -163,6 +163,7 @@ export default {
])],
data() {
return {
loading: false,
dataList: [],
count: 0,
page: {

+ 321
- 0
src/views/chain/industryClassify.vue Wyświetl plik

@@ -0,0 +1,321 @@
<template>
<div class="category ele-body">
<el-card shadow="never">
<search @search="updateParams($event)" />
<div class="operating">
<el-button size="small" type="warning" @click="add">新增</el-button>
<el-button size="small" type="default" @click="remove()"
>批量删除</el-button
>
<!-- <el-button size="small" type="default">批量导入</el-button> -->
</div>
<el-table
highlight-current-row
:data="dataList"
border
:height="tableHeight"
@selection-change="selectionChange"
v-loading="loading"
>
<el-table-column
type="selection"
width="50"
align="center"
></el-table-column>
<el-table-column
type="index"
width="50"
align="center"
label="序号"
></el-table-column>
<el-table-column
label="考核年度"
min-width="80"
align="center"
prop="year"
></el-table-column>
<el-table-column
label="表编号"
min-width="80"
align="center"
prop="code"
></el-table-column>
<el-table-column
label="表格名称"
min-width="100"
align="center"
prop="name"
></el-table-column>
<el-table-column
label="备注"
min-width="100"
align="center"
prop="note"
></el-table-column>
<el-table-column
label="创建时间"
min-width="100"
align="center"
prop="createTime"
></el-table-column>
<el-table-column label="操作" min-width="120" align="center">
<template slot-scope="{ row }">
<el-link
@click="edit(row)"
icon="el-icon-edit"
type="primary"
:underline="false"
>修改</el-link
>
<el-popconfirm
title="确定要删除此表格?"
@confirm="remove(row)"
class="ele-action"
>
<el-link
slot="reference"
icon="el-icon-delete"
type="danger"
:underline="false"
>删除</el-link
>
</el-popconfirm>
</template>
</el-table-column>
</el-table>
<el-pagination
:current-page.sync="page.page"
:page-size="page.limit"
:total="count"
:background="true"
layout="total, prev, pager, next, jumper"
:pager-count="5"
class="ele-pagination-circle"
@current-change="getDataList()"
/>
</el-card>
<el-dialog
:title="dialogTitle"
:visible.sync="showAdd"
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"
:rules="rules"
>
<el-form-item label="考核年度:" prop="year">
<el-date-picker
:disabled='ischecked=="look"'
type="year"
placeholder="选择考核年度"
style="width: 100%"
v-model="form.year"
format="yyyy"
value-format="yyyy"
>
</el-date-picker>
</el-form-item>
<el-form-item label="表格名称:" prop="name">
<el-input
:disabled='ischecked=="look"'
placeholder="请输入如表格名称"
clearable
v-model="form.name"
></el-input>
</el-form-item>
<el-form-item label="表编号:" prop="code">
<el-input
:disabled='ischecked=="look"'
placeholder="请输入表编号"
clearable
v-model="form.code"
></el-input>
</el-form-item>
<el-form-item label="备注:">
<el-input :disabled='ischecked=="look"' type="textarea" :rows="4" v-model="form.note"></el-input>
</el-form-item>
</el-form>
<div slot="footer">
<el-button @click="showAdd = false">取消</el-button>&nbsp;
<el-button type="primary" @click="save" v-if="ischecked !== 'look'">保存</el-button>
</div>
</el-dialog>
</div>
</template>

<script>
import search from "./search";
import api from "@/api/basicTable/category.js";
export default {
components: {
search,
},
data() {
return {
// searchParams: {},
loading: false,
dataList: [],
count: 0,
dialogTitle:'添加表',
ischecked: 'edit',
page: {
page: 1,
limit: Math.floor(
(document.documentElement.clientHeight - 308 - 45) / 45
),
},
showAdd: false,
form: {},
multipleSelection: [],
tableHeight: document.documentElement.clientHeight - 308,
rules: {
code: [{ required: true, message: "表编号", trigger: "blur" }],
name: [{ required: true, message: "请输入表格名称", trigger: "blur" }],
year: [{ required: true, message: "请输入考核年度", trigger: "blur" }],
},
searchParams: {
year: "",
code: "",
name: "",
},
};
},
created() {
this.getDataList();
this.$store.dispatch("base/getQuota1List", 1);
},
methods: {
updateParams(data){
this.searchParams=data;
this.resetCurrentPage();
this.getDataList();
},
resetCurrentPage() {
let page = this.page;
page.page = 1;
this.page = page;
},
selectionChange(rows) {
this.multipleSelection = rows;
},
getDataList() {
this.loading = true;
api
.getList(Object.assign({},this.searchParams,this.page))
.then((res) => {
this.loading = false;
let data = res.data.data.records;
data = data.map((item) => {
item.year = item.year + "";
return item;
});
this.dataList = data;
this.count = res.data.data.total;
})
.catch(() => {
this.loading = false;
this.dataList = [];
this.count = 0;
});
},
add() {
this.dialogTitle = '添加表'
this.form = { code: "", name: "", note: "", year: "" };
this.showAdd = true;
this.ischecked = 'add'
},
look(row) {
this.form = Object.assign({}, row)
this.dialogTitle = '查看表'
this.showAdd = true
this.ischecked = 'look'
},
edit(row) {
this.form = Object.assign({}, row)
this.showAdd = true;
this.dialogTitle = '编辑表'
this.ischecked = 'edit'
},
remove(row) {
if (!row) {
// 批量删除
if (this.multipleSelection.length === 0)
return this.$message.error("请至少选择一条数据");
let ids = this.multipleSelection.map((d) => d.id);
ids.join(",");
this.$confirm("确定要删除选中表格?", "提示", { type: "warning" })
.then(() => {
this.loading = true;
api
.delete(ids)
.then(() => {
this.loading = false;
this.$message({ type: "success", message: "删除成功" });
})
.catch(() => {
this.loading = fa;
se;
this.$message.error("删失败");
}).finally(()=>{
this.getDataList();
});
})
.catch(() => 0);
} else {
// 单个删除
this.loading = true;
api
.delete(row.id)
.then(() => {
this.loading = false;
this.$message({ type: "success", message: "删除成功" });
})
.catch(() => {
this.loading = false;
this.$message.error("删除失败");
}).finally(()=>{
this.getDataList();
});
}
},
save() {
this.$refs["editForm"].validate((valid) => {
if (valid) {
this.loading = true;
let action = this.form.id ? "edit" : "add";
api[action](this.form)
.then(() => {
this.loading = false;
this.$message({
type: "success",
message: this.form.id ? "修改成功" : "添加成功",
});
this.getDataList();
})
.catch(() => {
this.loading = false;
this.$message.error(this.form.id ? "修改失败" : "添加失败");
})
.finally(() => {
this.showAdd = false;
});
} else {
return false;
}
});
},
},
};
</script>

<style lang="css" scoped>
</style>

+ 67
- 34
src/views/second/coordinationManage/cooperateList/basicTarget.vue Wyświetl plik

@@ -8,33 +8,36 @@
:height="tableHeight"
ref="table"
>
<el-table-column type="index" label="序号" align="center" width="50">
<el-table-column type="index" label="序号" align="center" width="50">
</el-table-column>
<el-table-column
label="申请部门"
align="center"
min-width="150"
width="150"
prop="applyDeptName"
></el-table-column
><el-table-column
label="申请时间"
align="center"
min-width="150"
width="120"
prop="createTime"
></el-table-column
><el-table-column
label="申请理由"
align="center"
min-width="150"
width="100"
prop="note"
></el-table-column>
<el-table-column
label="一级指标"
min-width="80"
width="100"
align="center"
prop="quota1"
></el-table-column>

<el-table-column
label="二级指标"
min-width="80"
width="120"
align="center"
prop="quota2"
></el-table-column>
@@ -42,14 +45,14 @@
<el-table-column
label="考核内容和计分细则"
align="center"
min-width="400"
width="400"
prop="content"
></el-table-column>
<el-table-column
label="小条内容"
align="center"
min-width="150"
prop="content"
width="220"
prop="itemContent"
></el-table-column>
<el-table-column
label="分值"
@@ -64,40 +67,44 @@
align="center"
prop="leaderUnit"
></el-table-column>
<el-table-column label="第一牵头部门" width="120" align="center">
<template slot-scope="{ row }">
<pre>{{ row.leaderDeptList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="责任领导" width="80" align="center">
<template slot-scope="{ row }">
<pre>{{ row.leaderPrincipalList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="牵头部门" min-width="80" align="center">
<el-table-column label="牵头部门" width="120" align="center" prop="leaderDeptList">
<template slot-scope="{ row }">
<pre>{{ row.leaderDeptList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="责任领导" width="80" align="center" prop="leaderPrincipalList">
<template slot-scope="{ row }">
<pre>{{ row.leaderPrincipalList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="其他牵头部门" width="120" align="center" prop="otherDeptList">
<template slot-scope="{ row }">
<span><pre>{{ row.leaderDeptList | formatList }}</pre></span>
<span><pre>{{ row.otherDeptList | formatList }}</pre></span>
</template>
</el-table-column>

<el-table-column label="责任领导" min-width="80" align="center">
<el-table-column label="责任领导" width="80" align="center" prop="otherPrincipalList">
<template slot-scope="{ row }">
<pre>{{ row.leaderPrincipalList | formatList }}</pre>
<pre>{{ row.otherPrincipalList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="配合部门" min-width="80" align="center">
<el-table-column label="配合部门" width="100" align="center" prop="cooperateDeptList">
<template slot-scope="{ row }">
<span><pre>{{ row.leaderDeptList | formatList }}</pre></span>
<span><pre>{{ row.cooperateDeptList | formatList }}</pre></span>
</template>
</el-table-column>

<el-table-column label="责任领导" min-width="80" align="center">
<el-table-column label="责任领导" width="80" align="center" prop="cooperatePrincipalList">
<template slot-scope="{ row }">
<pre>{{ row.leaderPrincipalList | formatList }}</pre>
<pre>{{ row.cooperatePrincipalList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="状态" width="85" align="center">
<template slot-scope="{ row }">
<el-link type="primary" v-if="row.status == 0">审核中</el-link>
<el-link type="primary" v-if="row.status == 1">审核通过</el-link>
<el-link type="primary" v-if="row.status == 2">已驳回</el-link>
</template>
</el-table-column>
</el-table>
<el-pagination
@@ -116,13 +123,16 @@

<script>
import search from "../../search";
import { mapGetters } from "vuex";
import api from '@/api/second/coordinationManage/approvalCooperation'
export default {
components: {
search,
},
data() {
return {
dataList: [[]],
searchParams: {},
dataList: [],
tableHeight: document.documentElement.clientHeight - 305,
page: {
page: 1,
@@ -135,13 +145,36 @@ export default {
loading: false,
};
},
computed: {
...mapGetters(['formatDep','user']),
},
created() {
this.getDataList()
},
methods: {
getDataList() {},
edit(flag) {
this.showEdit = true;
updateParams(data) {
this.searchParams = data;
this.resetCurrentPage();
this.getDataList();
},
resetCurrentPage() {
let page = this.page;
page.page = 1;
this.page = page;
},
save() {},
getDataList() {
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;
this.dataList = data.records;
}).catch((e)=>{
this.dataList = [];
this.count = 0;
}).finally(()=>{
this.loading = false
})
}
},
filters: {
formatList(val) {

+ 67
- 34
src/views/second/coordinationManage/cooperateList/constraint.vue Wyświetl plik

@@ -13,37 +13,39 @@
<el-table-column
label="申请部门"
align="center"
min-width="150"
width="150"
prop="applyDeptName"
></el-table-column
><el-table-column
label="申请时间"
align="center"
min-width="150"
width="120"
prop="createTime"
></el-table-column
><el-table-column
label="申请理由"
align="center"
min-width="150"
width="100"
prop="note"
></el-table-column>
<el-table-column
label="考核指标"
min-width="80"
width="100"
align="center"
prop="quota"
></el-table-column>


<el-table-column
label="考核内容和计分细则"
align="center"
min-width="400"
width="400"
prop="content"
></el-table-column>
<el-table-column
label="小条内容"
align="center"
min-width="150"
prop="content"
width="220"
prop="itemContent"
></el-table-column>
<el-table-column
label="分值"
@@ -58,40 +60,44 @@
align="center"
prop="leaderUnit"
></el-table-column>
<el-table-column label="第一牵头部门" width="120" align="center">
<template slot-scope="{ row }">
<pre>{{ row.leaderDeptList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="责任领导" width="80" align="center">
<template slot-scope="{ row }">
<pre>{{ row.leaderPrincipalList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="牵头部门" min-width="80" align="center">
<el-table-column label="牵头部门" width="120" align="center" prop="leaderDeptList">
<template slot-scope="{ row }">
<pre>{{ row.leaderDeptList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="责任领导" width="80" align="center" prop="leaderPrincipalList">
<template slot-scope="{ row }">
<pre>{{ row.leaderPrincipalList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="其他牵头部门" width="120" align="center" prop="otherDeptList">
<template slot-scope="{ row }">
<span><pre>{{ row.leaderDeptList | formatList }}</pre></span>
<span><pre>{{ row.otherDeptList | formatList }}</pre></span>
</template>
</el-table-column>

<el-table-column label="责任领导" min-width="80" align="center">
<el-table-column label="责任领导" width="80" align="center" prop="otherPrincipalList">
<template slot-scope="{ row }">
<pre>{{ row.leaderPrincipalList | formatList }}</pre>
<pre>{{ row.otherPrincipalList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="配合部门" min-width="80" align="center">
<el-table-column label="配合部门" width="100" align="center" prop="cooperateDeptList">
<template slot-scope="{ row }">
<span><pre>{{ row.leaderDeptList | formatList }}</pre></span>
<span><pre>{{ row.cooperateDeptList | formatList }}</pre></span>
</template>
</el-table-column>

<el-table-column label="责任领导" min-width="80" align="center">
<el-table-column label="责任领导" width="80" align="center" prop="cooperatePrincipalList">
<template slot-scope="{ row }">
<pre>{{ row.leaderPrincipalList | formatList }}</pre>
<pre>{{ row.cooperatePrincipalList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="状态" width="85" align="center">
<template slot-scope="{ row }">
<el-link type="primary" v-if="row.status == 0">审核中</el-link>
<el-link type="primary" v-if="row.status == 1">审核通过</el-link>
<el-link type="primary" v-if="row.status == 2">已驳回</el-link>
</template>
</el-table-column>
</el-table>
<el-pagination
@@ -109,14 +115,17 @@
</template>

<script>
import search from "../../search";
import search from "../../search"
import { mapGetters } from "vuex";
import api from '@/api/second/coordinationManage/approvalCooperation'
export default {
components: {
search,
},
data() {
return {
dataList: [[]],
searchParams: {},
dataList: [],
tableHeight: document.documentElement.clientHeight - 305,
page: {
page: 1,
@@ -129,13 +138,37 @@ export default {
loading: false,
};
},
computed: {
...mapGetters(['formatDep','user']),
},
created() {
this.getDataList()
},
methods: {
getDataList() {},
edit(flag) {
this.showEdit = true;
updateParams(data) {
this.searchParams = data;
this.resetCurrentPage();
this.getDataList();
},
resetCurrentPage() {
let page = this.page;
page.page = 1;
this.page = page;
},
getDataList() {
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;
this.dataList = data.records;
}).catch((e)=>{
this.dataList = [];
this.count = 0;
}).finally(()=>{
this.loading = false
})
},
save() {},
},
filters: {
formatList(val) {

+ 65
- 33
src/views/second/coordinationManage/cooperateList/reward.vue Wyświetl plik

@@ -13,28 +13,31 @@
<el-table-column
label="申请部门"
align="center"
min-width="150"
width="150"
prop="applyDeptName"
></el-table-column
><el-table-column
label="申请时间"
align="center"
min-width="150"
width="120"
prop="createTime"
></el-table-column
><el-table-column
label="申请理由"
align="center"
min-width="150"
width="100"
prop="note"
></el-table-column>
<el-table-column
label="一级指标"
min-width="80"
width="100"
align="center"
prop="quota1"
></el-table-column>

<el-table-column
label="二级指标"
min-width="80"
width="120"
align="center"
prop="quota2"
></el-table-column>
@@ -42,14 +45,14 @@
<el-table-column
label="考核内容和计分细则"
align="center"
min-width="400"
width="400"
prop="content"
></el-table-column>
<el-table-column
label="小条内容"
align="center"
min-width="150"
prop="content"
width="220"
prop="itemContent"
></el-table-column>
<el-table-column
label="分值"
@@ -64,40 +67,44 @@
align="center"
prop="leaderUnit"
></el-table-column>
<el-table-column label="第一牵头部门" width="120" align="center">
<template slot-scope="{ row }">
<pre>{{ row.leaderDeptList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="责任领导" width="80" align="center">
<template slot-scope="{ row }">
<pre>{{ row.leaderPrincipalList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="牵头部门" min-width="80" align="center">
<el-table-column label="牵头部门" width="120" align="center" prop="leaderDeptList">
<template slot-scope="{ row }">
<pre>{{ row.leaderDeptList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="责任领导" width="80" align="center" prop="leaderPrincipalList">
<template slot-scope="{ row }">
<pre>{{ row.leaderPrincipalList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="其他牵头部门" width="120" align="center" prop="otherDeptList">
<template slot-scope="{ row }">
<span><pre>{{ row.leaderDeptList | formatList }}</pre></span>
<span><pre>{{ row.otherDeptList | formatList }}</pre></span>
</template>
</el-table-column>

<el-table-column label="责任领导" min-width="80" align="center">
<el-table-column label="责任领导" width="80" align="center" prop="otherPrincipalList">
<template slot-scope="{ row }">
<pre>{{ row.leaderPrincipalList | formatList }}</pre>
<pre>{{ row.otherPrincipalList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="配合部门" min-width="80" align="center">
<el-table-column label="配合部门" width="100" align="center" prop="cooperateDeptList">
<template slot-scope="{ row }">
<span><pre>{{ row.leaderDeptList | formatList }}</pre></span>
<span><pre>{{ row.cooperateDeptList | formatList }}</pre></span>
</template>
</el-table-column>

<el-table-column label="责任领导" min-width="80" align="center">
<el-table-column label="责任领导" width="80" align="center" prop="cooperatePrincipalList">
<template slot-scope="{ row }">
<pre>{{ row.leaderPrincipalList | formatList }}</pre>
<pre>{{ row.cooperatePrincipalList | formatList }}</pre>
</template>
</el-table-column>
<el-table-column label="状态" width="85" align="center">
<template slot-scope="{ row }">
<el-link type="primary" v-if="row.status == 0">审核中</el-link>
<el-link type="primary" v-if="row.status == 1">审核通过</el-link>
<el-link type="primary" v-if="row.status == 2">已驳回</el-link>
</template>
</el-table-column>
</el-table>
<el-pagination
@@ -115,7 +122,9 @@
</template>

<script>
import search from "../../search";
import search from "../../search"
import { mapGetters } from "vuex";
import api from '@/api/second/coordinationManage/approvalCooperation'
export default {
components: {
search,
@@ -135,13 +144,36 @@ export default {
loading: false,
};
},
computed: {
...mapGetters(['formatDep','user']),
},
created() {
this.getDataList()
},
methods: {
getDataList() {},
edit(flag) {
this.showEdit = true;
updateParams(data) {
this.searchParams = data;
this.resetCurrentPage();
this.getDataList();
},
resetCurrentPage() {
let page = this.page;
page.page = 1;
this.page = page;
},
getDataList() {
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;
this.dataList = data.records;
}).catch((e)=>{
this.dataList = [];
this.count = 0;
}).finally(()=>{
this.loading = false
})
},
save() {},
},
filters: {
formatList(val) {

Ładowanie…
Anuluj
Zapisz