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-18 13:36:48 +08:00
parent 7d8d0bce18
commit 275d1c96e7
2 changed files with 176 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,12 +113,24 @@
<el-table-column label="上报文件"> <el-table-column label="上报文件">
<template slot-scope="scope" v-if="scope.row.files"> <template slot-scope="scope" v-if="scope.row.files">
<el-link v-if="scope.row.files.length>1">有{{scope.row.files.length}}个文件</el-link> <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"> <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> <el-link :href="item.path" target="_blank" type="primary">{{ item.name }}</el-link>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作">
<template slot-scope="scope">
<el-button
v-if="checkPermission(['record_view'])"
size="small"
@click="handleRecord({action:'view', record:scope.row})"
>查看</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="recordList.count > 0" v-show="recordList.count > 0"
@ -128,7 +140,14 @@
@pagination="getList" @pagination="getList"
/> />
</el-card> </el-card>
<el-drawer title="记录" :visible.sync="drawer" :with-header="false">
<recorddo
ref="recorddo"
:data="data"
@handleDo="handleDo"
v-if="drawer"
></recorddo>
</el-drawer>
</div> </div>
</template> </template>
<script> <script>
@ -137,11 +156,12 @@ import {getRecordList} from "@/api/record";
import { genTree } from "@/utils"; import { genTree } from "@/utils";
import checkPermission from "@/utils/permission"; import checkPermission from "@/utils/permission";
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
import recorddo from "@/views/supervision/recorddo";
const defaultrecord = { const defaultrecord = {
name: "" name: ""
}; };
export default { export default {
components: { Pagination }, components: { Pagination, recorddo },
data() { data() {
return { return {
record: defaultrecord, record: defaultrecord,
@ -150,6 +170,7 @@ export default {
}, },
orgData: [], orgData: [],
drawer:false,
stateOptions: [ stateOptions: [
{ key: "待上报", name: "待上报" }, { key: "待上报", name: "待上报" },
{ key: "已上报", name: "已上报" }, { key: "已上报", name: "已上报" },
@ -204,6 +225,7 @@ export default {
this.getOrgList(); this.getOrgList();
}, },
methods: { methods: {
checkPermission,
getList(){ getList(){
getRecordList(this.listQuery).then((response)=>{ getRecordList(this.listQuery).then((response)=>{
@ -238,7 +260,10 @@ export default {
this.getList(); this.getList();
}, },
handleRecord(data){
this.data = data;
this.drawer = true;
},
}, },
}; };

139
client/src/views/supervision/report.vue
View File

@ -1,15 +1,16 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card <el-card style="margin-top: 10px">
style="margin-top: 10px"
>
<el-row> <el-row>
<el-button type="primary" @click="centerDialogVisible = true" plain>主动上报</el-button> <el-button type="primary" @click="centerDialogVisible = true" plain
>主动上报</el-button
>
<el-dialog <el-dialog
title="提示" title="提示"
:visible.sync="centerDialogVisible" :visible.sync="centerDialogVisible"
width="50%" width="50%"
center> center
>
<el-transfer <el-transfer
v-model="contents" v-model="contents"
:data="contentOptions" :data="contentOptions"
@ -18,32 +19,20 @@
/> />
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="contentup()">确认</el-button> <el-button type="primary" @click="contentup()">确认</el-button>
</span> </span>
</el-dialog> </el-dialog>
</el-row> </el-row>
</el-card> </el-card>
<el-card <el-card style="margin-top: 10px">
style="margin-top: 10px"
>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="待上报" name="toup" lazy> <el-tab-pane label="待上报" name="toup" lazy> </el-tab-pane>
</el-tab-pane> <el-tab-pane label="已上报" name="uped" lazy> </el-tab-pane>
<el-tab-pane label="已上报" name="uped" lazy> <el-tab-pane label="待整改" name="tozg" lazy> </el-tab-pane>
</el-tab-pane> <el-tab-pane label="已确认" name="confirmed" lazy> </el-tab-pane>
<el-tab-pane label="待整改" name="tozg" lazy>
</el-tab-pane>
<el-tab-pane label="已确认" name="confirmed" lazy>
</el-tab-pane>
</el-tabs> </el-tabs>
</el-col> </el-col>
</el-row> </el-row>
<el-table <el-table
v-loading="listLoading" v-loading="listLoading"
@ -61,62 +50,91 @@
}}</template> }}</template>
</el-table-column> </el-table-column>
<el-table-column label="材料"> <el-table-column label="材料">
<template slot-scope="scope">{{ <template slot-scope="scope">{{ scope.row.content_.name }}</template>
scope.row.content_.name
}}</template>
</el-table-column> </el-table-column>
<el-table-column label="状态"> <el-table-column label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag type="danger" v-if="scope.row.state == '待上报'">{{ scope.row.state }}</el-tag> <el-tag type="danger" v-if="scope.row.state == '待上报'">{{
<el-tag type="warning" v-else-if="scope.row.state == '待整改'">{{ scope.row.state }}</el-tag> scope.row.state
<el-tag type="success" v-else-if="scope.row.state == '已确认'">{{ scope.row.state }}</el-tag> }}</el-tag>
<el-tag v-else-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> </template>
</el-table-column> </el-table-column>
<el-table-column label="上报情况"> <el-table-column label="上报情况">
<template slot-scope="scope" <template slot-scope="scope" v-if="scope.row.up_user_"
v-if="scope.row.up_user_">{{ scope.row.up_user_.name }}/{{ scope.row.up_date }}</template >{{ scope.row.up_user_.name }}/{{ scope.row.up_date }}</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>
<el-table-column align="center" label="操作"> <el-table-column align="center" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-if="scope.row.state == '待上报' && checkPermission(['record_update'])" v-if="
scope.row.state == '待上报' &&
checkPermission(['record_update'])
"
type="primary" type="primary"
size="small" size="small"
@click="handleUpdate(scope)" @click="handleRecord({action:'update', record:scope.row})"
>编辑</el-button >编辑</el-button
> >
<el-button <el-button
v-if="scope.row.state == '待上报' && checkPermission(['record_up'])" v-if="
(scope.row.state == '待上报' || scope.row.state == '待整改')
&&
checkPermission(['record_up'])
"
type="primary" type="primary"
size="small" size="small"
@click="handleUp(scope)" @click="handleRecord({action:'up', record:scope.row})"
>上报</el-button >上报</el-button
> >
<el-button <el-button
v-if="scope.row.state == '已提交' && checkPermission(['record_confirm'])" v-if="
scope.row.state == '已上报' &&
checkPermission(['record_confirm'])
"
type="primary" type="primary"
size="small" size="small"
@click="handleConfirm(scope)" @click="handleRecord({action:'confirm', record:scope.row})"
>确认</el-button >确认</el-button
> >
<el-button <el-button
v-if="scope.state == '已提交' && checkPermission(['record_reject'])" v-if="
scope.row.state == '已上报' &&
checkPermission(['record_reject'])
"
type="danger" type="danger"
size="small" size="small"
@click="handleReject(scope)" @click="handleRecord({action:'reject', record:scope.row})"
>驳回</el-button >驳回</el-button
> >
<el-button <el-button
v-if="checkPermission(['record_view'])" v-if="checkPermission(['record_view'])"
size="small" size="small"
@click="handleView(scope)" @click="handleRecord({action:'view', record:scope.row})"
>查看</el-button >查看</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
@ -166,20 +184,19 @@ export default {
checkPermission, checkPermission,
getTab() { getTab() {
if (this.$route.params.tab) { if (this.$route.params.tab) {
this.activeName = this.$route.params.tab this.activeName = this.$route.params.tab;
} }
}, },
getRecordList() { getRecordList() {
getRecordList({ state: this.state }).then((res) => { getRecordList({ state: this.state }).then((res) => {
this.listLoading = false; this.listLoading = false;
this.recordList = res.data.results; this.recordList = res.data.results;
}); });
}, },
getContentList() { getContentList() {
getContentList({can_doself:this.can_doself}).then(res=>{ getContentList({ can_doself: this.can_doself }).then((res) => {
this.contentOptions = res.data this.contentOptions = res.data;
}) });
}, },
handleClick(tab, event) { handleClick(tab, event) {
@ -230,37 +247,17 @@ export default {
this.drawer = false; this.drawer = false;
this.getRecordList(); this.getRecordList();
}, },
handleView(scope) { handleRecord(data){
this.data = { this.data = data;
action: "view",
record: scope.row,
};
this.drawer = true;
},
handleReject(scope) {
this.data = {
action: "reject",
record: scope.row,
};
this.drawer = true;
},
handleConfirm(scope) {
this.data = {
action: "reject",
record: scope.row,
};
this.drawer = true; this.drawer = true;
}, },
contentup() { contentup() {
console.log(this.contents)
if (this.contents.length > 0) { if (this.contents.length > 0) {
createself({ contents: this.contents }).then((res) => {
createself({contents:this.contents} this.centerDialogVisible = false;
).then((res) => {
this.centerDialogVisible = false
}); });
} else { } else {
this.$message.error('请选择清单!') this.$message.error("请选择清单!");
} }
}, },
}, },