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;
},
}, },
}; };

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

@ -1,125 +1,143 @@
<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-button type="primary" @click="centerDialogVisible = true" plain
<el-row> >主动上报</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 >
v-model="contents" <el-transfer
:data="contentOptions" v-model="contents"
:titles="['材料清单', '选择的清单']" :data="contentOptions"
:props="{ key : 'id' , label: 'name' }" :titles="['材料清单', '选择的清单']"
/> :props="{ key: 'id', label: 'name' }"
<span slot="footer" class="dialog-footer"> />
<el-button type="primary" @click="contentup()">确认</el-button> <span slot="footer" class="dialog-footer">
<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-col :span="24">
<el-row> <el-tabs v-model="activeName" @tab-click="handleClick">
<el-col :span="24"> <el-tab-pane label="待上报" name="toup" lazy> </el-tab-pane>
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tab-pane label="已上报" name="uped" lazy> </el-tab-pane>
<el-tab-pane label="待上报" name="toup" 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="uped" lazy> </el-tabs>
</el-tab-pane> </el-col>
<el-tab-pane label="待整改" name="tozg" lazy> </el-row>
</el-tab-pane> <el-table
<el-tab-pane label="已确认" name="confirmed" lazy> v-loading="listLoading"
</el-tab-pane> :data="recordList"
border
fit
stripe
</el-tabs> highlight-current-row
max-height="600px"
</el-col> >
<el-table-column label="序号" type="index" align="center" />
</el-row> <el-table-column label="任务标题">
<el-table <template slot-scope="scope" v-if="scope.row.task">{{
v-loading="listLoading" scope.row.task_.name
:data="recordList" }}</template>
border </el-table-column>
fit <el-table-column label="材料">
stripe <template slot-scope="scope">{{ scope.row.content_.name }}</template>
highlight-current-row </el-table-column>
max-height="600px" <el-table-column label="状态">
> <template slot-scope="scope">
<el-table-column label="序号" type="index" align="center" /> <el-tag type="danger" v-if="scope.row.state == '待上报'">{{
<el-table-column label="任务标题"> scope.row.state
<template slot-scope="scope" v-if="scope.row.task">{{ }}</el-tag>
scope.row.task_.name <el-tag type="warning" v-else-if="scope.row.state == '待整改'">{{
}}</template> scope.row.state
</el-table-column> }}</el-tag>
<el-table-column label="材料"> <el-tag type="success" v-else-if="scope.row.state == '已确认'">{{
<template slot-scope="scope">{{ scope.row.state
scope.row.content_.name }}</el-tag>
}}</template> <el-tag v-else-if="scope.row.state == '已上报'">{{
</el-table-column> scope.row.state
<el-table-column label="状态"> }}</el-tag>
<template slot-scope="scope"> </template>
<el-tag type="danger" v-if="scope.row.state == '待上报'">{{ scope.row.state }}</el-tag> </el-table-column>
<el-tag type="warning" v-else-if="scope.row.state == '待整改'">{{ scope.row.state }}</el-tag> <el-table-column label="上报情况">
<el-tag type="success" v-else-if="scope.row.state == '已确认'">{{ scope.row.state }}</el-tag> <template slot-scope="scope" v-if="scope.row.up_user_"
<el-tag v-else-if="scope.row.state == '已上报'">{{ scope.row.state }}</el-tag> >{{ scope.row.up_user_.name }}/{{ scope.row.up_date }}</template
</template> >
</el-table-column> </el-table-column>
<el-table-column label="上报情况"> <el-table-column label="上报文件">
<template slot-scope="scope"
v-if="scope.row.up_user_">{{ scope.row.up_user_.name }}/{{ scope.row.up_date }}</template <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})">有
</el-table-column> <span style="color:red">{{scope.row.files.length}}</span>
<el-table-column align="center" label="操作"> 个文件</el-link>
<template slot-scope="scope"> <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="操作">
<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>
<el-drawer title="记录" :visible.sync="drawer" :with-header="false"> <el-drawer title="记录" :visible.sync="drawer" :with-header="false">
<recorddo <recorddo
ref="recorddo" ref="recorddo"
@ -131,7 +149,7 @@
</div> </div>
</template> </template>
<script> <script>
import { getRecordList,createself } from "@/api/record"; import { getRecordList, createself } from "@/api/record";
import { getContentList } from "@/api/content"; import { getContentList } from "@/api/content";
import Pagination from "@/components/Pagination"; import Pagination from "@/components/Pagination";
@ -142,11 +160,11 @@ export default {
components: { Pagination, taskinit, recorddo }, components: { Pagination, taskinit, recorddo },
data() { data() {
return { return {
centerDialogVisible: false, centerDialogVisible: false,
dialogVisible: false, dialogVisible: false,
activeName: "toup", activeName: "toup",
state:"待上报", state: "待上报",
can_doself:true, can_doself: true,
contents: [], contents: [],
contentOptions: [], contentOptions: [],
contents: [], contents: [],
@ -163,46 +181,45 @@ export default {
this.getRecordList(); this.getRecordList();
}, },
methods: { methods: {
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) {
switch (tab.name) { switch (tab.name) {
case "toup": case "toup":
this.state="待上报"; this.state = "待上报";
this.getRecordList(); this.getRecordList();
break; break;
case "uped": case "uped":
this.state="已上报"; this.state = "已上报";
this.getRecordList(); this.getRecordList();
break; break;
case "tozg": case "tozg":
this.state="待整改"; this.state = "待整改";
this.getRecordList(); this.getRecordList();
break; break;
case "confirmed": case "confirmed":
this.state="已确认"; this.state = "已确认";
this.getRecordList(); this.getRecordList();
break; break;
} }
}, },
handleUpdate(scope) { handleUpdate(scope) {
this.data = { this.data = {
action: "update", action: "update",
@ -210,7 +227,7 @@ export default {
}; };
this.drawer = true; this.drawer = true;
}, },
chooseComplete(data) { chooseComplete(data) {
this.dialogVisible = false; this.dialogVisible = false;
const rLoading = this.openLoading("正在初始化任务,请稍等..."); const rLoading = this.openLoading("正在初始化任务,请稍等...");
inittask(this.task.id, data).then((res) => { inittask(this.task.id, data).then((res) => {
@ -230,38 +247,18 @@ 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; this.drawer = true;
}, },
handleReject(scope) { contentup() {
this.data = { if (this.contents.length > 0) {
action: "reject", createself({ contents: this.contents }).then((res) => {
record: scope.row, this.centerDialogVisible = false;
};
this.drawer = true;
},
handleConfirm(scope) {
this.data = {
action: "reject",
record: scope.row,
};
this.drawer = true;
},
contentup(){
console.log(this.contents)
if(this.contents.length>0){
createself({contents:this.contents}
).then((res) => {
this.centerDialogVisible = false
}); });
}else{ } else {
this.$message.error('请选择清单!') this.$message.error("请选择清单!");
} }
}, },
}, },
}; };