zcdsj
/
cma_search
mirror of https://e.coding.net/ctcdevteam/cma_search.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整到报送列表

This commit is contained in:
caoqianming 2021-03-19 09:13:39 +08:00
parent 13303b884b
commit 2493758943
12 changed files with 281 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/router/index.js
View File

@ -139,14 +139,7 @@ export const asyncRoutes = [
path: 'record',
name: 'Record',
component: () => import('@/views/supervision/record.vue'),
meta: { title: '材料列表', icon: 'guide', perms: ['record_all'] }
}
,
{
path: 'report',
name: 'Report',
component: () => import('@/views/supervision/report.vue'),
meta: { title: '材料报送', icon: 'guide', perms: ['record_view'] }
meta: { title: '材料报送列表', icon: 'guide', perms: ['record_view'] }
}
,
{

30
client/src/store/modules/user.js
View File

@ -95,29 +95,15 @@ const actions = {
return new Promise((resolve, reject) => {
getInfo(state.token).then(response => {
const { data } = response
if(data){
const { perms, name, avatar } = data
// perms must be a non-empty array
if (!perms || perms.length <= 0) {
reject('没有任何权限!')
}
commit('SET_PERMS', perms)
commit('SET_NAME', name)
commit('SET_AVATAR', avatar)
resolve(data)
}else{
getInfo(state.token).then(res=>{
const { data } = response
if (!perms || perms.length <= 0) {
reject('没有任何权限!')
}
commit('SET_PERMS', perms)
commit('SET_NAME', name)
commit('SET_AVATAR', avatar)
resolve(data)
})
const { perms, name, avatar } = data
// perms must be a non-empty array
if (!perms || perms.length <= 0) {
reject('没有任何权限!')
}
commit('SET_PERMS', perms)
commit('SET_NAME', name)
commit('SET_AVATAR', avatar)
resolve(data)

2
client/src/views/ability/cma.vue
View File

@ -23,7 +23,7 @@
type="primary"
icon="el-icon-refresh-left"
@click="resetFilter"
>刷新</el-button
>重置</el-button
>
</el-col>
</el-row>

2
client/src/views/ability/cma2.vue
View File

@ -41,7 +41,7 @@
type="primary"
icon="el-icon-refresh-left"
@click="resetFilter"
>刷新</el-button
>重置</el-button
>
</el-col>
</el-row>

2
client/src/views/ability/inspection.vue
View File

@ -41,7 +41,7 @@
type="primary"
icon="el-icon-refresh-left"
@click="resetFilter"
>刷新</el-button
>重置</el-button
>
</el-col>
</el-row>

2
client/src/views/ability/qualification.vue
View File

@ -32,7 +32,7 @@
type="primary"
icon="el-icon-refresh-left"
@click="resetFilter"
>刷新</el-button>
>重置</el-button>
</el-col>
</el-row>
<div style="margin-top:10px">

2
client/src/views/ability/queryrecord.vue
View File

@ -20,7 +20,7 @@
type="primary"
icon="el-icon-refresh-left"
@click="resetFilter"
>刷新重置</el-button>
>重置</el-button>
</div>
<el-table
v-loading="listLoading"

12
client/src/views/dashboard/index.vue
View File

@ -58,7 +58,7 @@
<div slot="header" class="clearfix">
<span>待办任务提醒</span>
</div>
<div class="litem" @click="goto('toup')">
<div class="litem" @click="goRecord('待上报')" v-if="!checkPermission(['record_confirm'])">
<el-link class="desc">
您有
<span style="color:red">{{todos.toup}}</span>
@ -66,13 +66,13 @@
</el-link>
</div>
<div class="litem">
<el-link class="desc" @click="goto('tozg')">
<el-link class="desc" @click="goRecord('待整改')" v-if="!checkPermission(['record_confirm'])">
您有
<span style="color:red">{{todos.tozg}}</span>
条记录待整改
</el-link>
</div>
<div class="litem" @click="goto('uped')">
<div class="litem" @click="goRecord('已上报')">
<el-link class="desc" v-if="todos.toconfirm">
您有
<span style="color:red">{{todos.toconfirm}}</span>
@ -88,6 +88,7 @@
<script>
import { mapGetters } from 'vuex'
import { getRecordtodos } from "@/api/todos"
import checkPermission from "@/utils/permission";
export default {
name: 'Dashboard',
computed: {
@ -105,6 +106,7 @@ export default {
this.gettodos()
},
methods:{
checkPermission,
toPath(val) {
this.$router.push({path:val})
},
@ -113,8 +115,8 @@ export default {
this.todos = res.data
})
},
goto(tab){
this.$router.push({name: "Report", params: { tab: tab }, })
goRecord(state){
this.$router.push({name:'Record', params: {state:state}})
}
}
}

476
client/src/views/supervision/record.vue
View File

@ -1,186 +1,219 @@
<template>
<div class="app-container">
<el-card
style="margin-top: 10px"
>
<div>
<el-input
v-model="listQuery.content_name"
placeholder="材料名称"
style="width: 200px"
class="filter-item"
@keyup.enter.native="handleFilter"
/>
<el-select
v-model="listQuery.state"
placeholder="记录状态"
clearable
style="width:140px"
class="filter-item"
@change="handleFilter"
<el-card style="margin-top: 10px">
<div>
<el-input
v-model="listQuery.content_name"
placeholder="材料名称"
style="width: 200px"
class="filter-item"
@keyup.enter.native="handleFilter"
/>
<el-select
v-model="listQuery.state"
placeholder="记录状态"
clearable
style="width: 140px"
class="filter-item"
@change="handleFilter"
>
<el-option
v-for="item in stateOptions"
:key="item.key"
:label="item.name"
:value="item.key"
/>
</el-select>
<el-select
v-model="listQuery.belong_dept"
placeholder="上报部门"
clearable
style="width: 140px"
class="filter-item"
@change="handleFilter"
>
<el-option
v-for="item in orgData"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
<el-date-picker
v-model="listQuery.date_gt"
type="date"
value-format="yyyy-MM-dd"
placeholder="上报时间"
>
</el-date-picker>
-
<el-date-picker
v-model="listQuery.date_lt"
type="date"
value-format="yyyy-MM-dd"
@change="handleFilter"
placeholder="上报时间"
>
</el-date-picker>
<el-button
type="primary"
icon="el-icon-search"
@click="handleFilter"
>搜索</el-button
>
<el-button
class="filter-item"
type="primary"
icon="el-icon-refresh-left"
@click="resetFilter"
>重置</el-button
>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-table
v-loading="listLoading"
:data="recordList.results"
border
fit
stripe
highlight-current-row
max-height="600"
:default-sort="{ prop: 'date', order: 'descending' }"
>
<el-table-column type="index" width="50" />
<el-table-column label="任务标题">
<template slot-scope="scope" v-if="scope.row.task">{{
scope.row.task_.name
}}</template>
</el-table-column>
<el-table-column label="材料名称">
<template slot-scope="scope">{{ scope.row.content_.name }}</template>
</el-table-column>
<el-table-column sortable label="上报时间">
<template slot-scope="scope">{{ scope.row.up_date }}</template>
</el-table-column>
<el-table-column label="上报人">
<template slot-scope="scope" v-if="scope.row.up_user">{{
scope.row.up_user_.name
}}</template>
</el-table-column>
<el-table-column sortable label="截止时间">
<template slot-scope="scope">{{ scope.row.end_date }}</template>
</el-table-column>
<el-table-column label="上报备注">
<template slot-scope="scope">{{ scope.row.note }}</template>
</el-table-column>
<el-table-column label="上报说明">
<template slot-scope="scope">{{ scope.row.noteb }}</template>
</el-table-column>
<el-table-column label="上报单位">
<template slot-scope="scope">{{
scope.row.belong_dept_.name
}}</template>
</el-table-column>
<el-table-column label="记录状态">
<template slot-scope="scope">
<el-tag type="danger" v-if="scope.row.state == '待上报'">{{
scope.row.state
}}</el-tag>
<el-tag type="warning" v-else-if="scope.row.state == '待整改'">{{
scope.row.state
}}</el-tag>
<el-tag type="success" v-else-if="scope.row.state == '已确认'">{{
scope.row.state
}}</el-tag>
<el-tag v-else-if="scope.row.state == '已上报'">{{
scope.row.state
}}</el-tag>
</template>
</el-table-column>
<el-table-column label="上报文件">
<template slot-scope="scope" v-if="scope.row.files">
<el-link
v-if="scope.row.files.length > 1"
@click="handleRecord({ action: 'view', record: scope.row })"
>有
<span style="color: red">{{ scope.row.files.length }}</span>
个文件</el-link
>
<el-option
v-for="item in stateOptions"
:key="item.key"
:label="item.name"
:value="item.key"
/>
</el-select>
<el-select
v-model="listQuery.belong_dept"
placeholder="上报部门"
clearable
style="width:140px"
class="filter-item"
@change="handleFilter"
<div v-else v-for="item in scope.row.files_" v-bind:key="item.id">
<el-link :href="item.path" target="_blank" type="primary">{{
item.name
}}</el-link>
</div>
</template>
</el-table-column>
<el-table-column
align="center"
label="操作"
width="220px"
fixed="right"
>
<template slot-scope="scope">
<el-button
v-if="
scope.row.state == '待上报' &&
checkPermission(['record_update'])
"
type="primary"
size="small"
@click="handleRecord({ action: 'update', record: scope.row })"
>编辑</el-button
>
<el-option
v-for="item in orgData"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
<el-date-picker
v-model="listQuery.date_gt"
type="date"
value-format="yyyy-MM-dd"
placeholder="上报时间">
</el-date-picker>
<el-date-picker
v-model="listQuery.date_lt"
type="date"
value-format="yyyy-MM-dd"
@change="handleFilter"
placeholder="上报时间">
</el-date-picker>
</div>
</el-card>
<el-card
style="margin-top: 10px"
>
<el-table
v-loading="listLoading"
:data="recordList.results"
border
fit
stripe
highlight-current-row
max-height="600"
:default-sort = "{prop: 'date', order: 'descending'}"
>
<el-table-column type="index" width="50" />
<el-table-column label="任务标题">
<template slot-scope="scope" v-if="scope.row.task">{{ scope.row.task_.name }}</template>
</el-table-column>
<el-table-column label="材料名称">
<template slot-scope="scope" >{{ scope.row.content_.name }}</template>
</el-table-column>
<el-table-column sortable label="上报时间">
<template slot-scope="scope" >{{ scope.row.up_date }}</template>
</el-table-column>
<el-table-column label="上报人" >
<template slot-scope="scope" v-if="scope.row.up_user">{{ scope.row.up_user_.name }}</template>
</el-table-column>
<el-table-column sortable label="截止时间">
<template slot-scope="scope">{{ scope.row.end_date }}</template>
</el-table-column>
<el-table-column label="上报备注">
<template slot-scope="scope">{{ scope.row.note }}</template>
</el-table-column>
<el-table-column label="上报说明">
<template slot-scope="scope">{{ scope.row.noteb }}</template>
</el-table-column>
<el-table-column label="上报单位">
<template slot-scope="scope" >{{ scope.row.belong_dept_.name }}</template>
</el-table-column>
<el-table-column label="记录状态">
<template slot-scope="scope">
<el-tag type="danger" v-if="scope.row.state == '待上报'">{{ scope.row.state }}</el-tag>
<el-tag type="warning" v-else-if="scope.row.state == '待整改'">{{ scope.row.state }}</el-tag>
<el-tag type="success" v-else-if="scope.row.state == '已确认'">{{ scope.row.state }}</el-tag>
<el-tag v-else-if="scope.row.state == '已上报'">{{ scope.row.state }}</el-tag>
</template>
</el-table-column>
<el-table-column label="上报文件">
<template slot-scope="scope" v-if="scope.row.files">
<el-link v-if="scope.row.files.length>1" @click="handleRecord({action:'view', record:scope.row})">有
<span style="color:red">{{scope.row.files.length}}</span>
个文件</el-link>
<div v-else v-for="item in scope.row.files_" v-bind:key="item.id">
<el-link :href="item.path" target="_blank" type="primary">{{ item.name }}</el-link>
</div>
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="220px" fixed="right">
<template slot-scope="scope">
<el-button
v-if="
scope.row.state == '待上报' &&
checkPermission(['record_update'])
"
type="primary"
size="small"
@click="handleRecord({action:'update', record:scope.row})"
>编辑</el-button
>
<el-button
v-if="
(scope.row.state == '待上报' || scope.row.state == '待整改')&&
checkPermission(['record_up'])
"
type="primary"
size="small"
@click="handleRecord({action:'up', record:scope.row})"
>上报</el-button
>
<el-button
v-if="
scope.row.state == '已上报' &&
checkPermission(['record_confirm'])
"
type="primary"
size="small"
@click="handleRecord({action:'confirm', record:scope.row})"
>确认</el-button
>
<el-button
v-if="
scope.row.state == '已上报' &&
checkPermission(['record_reject'])
"
type="danger"
size="small"
@click="handleRecord({action:'reject', record:scope.row})"
>驳回</el-button
>
<el-button
v-if="checkPermission(['record_view'])"
size="small"
@click="handleRecord({action:'view', record:scope.row})"
>查看</el-button
>
</template>
</el-table-column>
</el-table>
<pagination
<el-button
v-if="
(scope.row.state == '待上报' || scope.row.state == '待整改') &&
checkPermission(['record_up'])
"
type="primary"
size="small"
@click="handleRecord({ action: 'up', record: scope.row })"
>上报</el-button
>
<el-button
v-if="
scope.row.state == '已上报' &&
checkPermission(['record_confirm'])
"
type="primary"
size="small"
@click="handleRecord({ action: 'confirm', record: scope.row })"
>确认</el-button
>
<el-button
v-if="
scope.row.state == '已上报' &&
checkPermission(['record_reject'])
"
type="danger"
size="small"
@click="handleRecord({ action: 'reject', record: scope.row })"
>驳回</el-button
>
<el-button
v-if="checkPermission(['record_view'])"
size="small"
@click="handleRecord({ action: 'view', record: scope.row })"
>查看</el-button
>
</template>
</el-table-column>
</el-table>
<pagination
v-show="recordList.count > 0"
:total="recordList.count"
:page.sync="listQuery.page"
:limit.sync="listQuery.page_size"
@pagination="getList"
/>
</el-card>
<el-drawer title="记录" :visible.sync="drawer" :with-header="false">
</el-card>
<el-drawer title="记录" :visible.sync="drawer" :with-header="false">
<recorddo
ref="recorddo"
:data="data"
@ -192,59 +225,62 @@
</template>
<script>
import { getOrgList } from "@/api/org";
import {getRecordList} from "@/api/record";
import { getRecordList } from "@/api/record";
import { genTree } from "@/utils";
import checkPermission from "@/utils/permission";
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
import recorddo from "@/views/supervision/recorddo";
const defaultrecord = {
name: ""
name: "",
};
export default {
components: { Pagination, recorddo },
data() {
return {
record: defaultrecord,
recordList: {
record: defaultrecord,
recordList: {
count: 0,
},
orgData: [],
drawer:false,
drawer: false,
stateOptions: [
{ key: "待上报", name: "待上报" },
{ key: "已上报", name: "已上报" },
{ key: "已确认", name: "已确认" },
{ key: "待整改", name: "待整改" },
],
pickerOptions2: {
shortcuts: [{
text: '最近一周',
pickerOptions2: {
shortcuts: [
{
text: "最近一周",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近一个月',
picker.$emit("pick", [start, end]);
},
},
{
text: "最近一个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近三个月',
picker.$emit("pick", [start, end]);
},
},
{
text: "最近三个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit('pick', [start, end]);
}
}]
},
value7: '',
picker.$emit("pick", [start, end]);
},
},
],
},
listQuery: {
page: 1,
page_size: 20,
@ -253,42 +289,41 @@ export default {
dialogVisible: false,
dialogType: "new",
rule1: {
name: [{ required: true, message: "请输入", trigger: "blur" }]
name: [{ required: true, message: "请输入", trigger: "blur" }],
},
};
},
computed: {},
watch: {
},
watch: {},
created() {
this.getList();
this.getState();
this.getOrgList();
},
methods: {
checkPermission,
getList(){
getRecordList(this.listQuery).then((response)=>{
this.recordList=response.data
})
}
,
getOrgList() {
getOrgList({ pid: 1 }).then((res) => {
this.orgData = genTree(res.data)
getState(){
if(this.$route.params.state){
this.listQuery.state = this.$route.params.state
}
this.getList()
},
getList() {
getRecordList(this.listQuery).then((response) => {
this.recordList = response.data;
});
},
getOrgList() {
getOrgList({ pid: 1 }).then((res) => {
this.orgData = genTree(res.data);
});
},
handleOrgClick(obj, node, vue) {
this.listQuery.page = 1;
this.listQuery.dept_id = obj.id;
this.getList();
},
handleFilter() {
handleFilter() {
this.listQuery.page = 1;
this.getList();
},
@ -296,15 +331,18 @@ export default {
this.listQuery = {
page: 1,
page_size: 20,
}
};
this.getList();
},
handleRecord(data){
handleRecord(data) {
this.data = data;
this.drawer = true;
},
handleDo(data) {
this.drawer = false;
this.getList();
},
},
};
</script>

2
client/src/views/supervision/task.vue
View File

@ -21,7 +21,7 @@
type="primary"
icon="el-icon-refresh-left"
@click="resetFilter"
>刷新重置</el-button
>重置</el-button
>
</div>
<div style="margin-top: 10px">

2
client/src/views/system/file.vue
View File

@ -35,7 +35,7 @@
type="primary"
icon="el-icon-refresh-left"
@click="resetFilter"
>刷新重置</el-button>
>重置</el-button>
</div>
<el-table
v-loading="listLoading"

2
client/src/views/system/user.vue
View File

@ -62,7 +62,7 @@
type="primary"
icon="el-icon-refresh-left"
@click="resetFilter"
>刷新重置</el-button
>重置</el-button
>
</div>
<div style="margin-top: 10px">