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

nenglishangchuan

This commit is contained in:
shilixia 2021-08-20 14:41:53 +08:00
parent d08e75cdb8
commit 39581b6724
5 changed files with 776 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,6 +113,13 @@ export const asyncRoutes = [
name: 'correct',
component: () => import('@/views/ability/correct'),
meta: { title: '校准/检定能力', perms: ['correct_view'] }
}
,
{
path: 'record',
name: 'Record',
component: () => import('@/views/ability/record.vue'),
meta: { title: '资质能力报送任务', perms: ['record_view'] }
},
]

506
client/src/views/ability/record.vue Normal file
View File

@ -0,0 +1,506 @@
<template>
<div class="app-container">
<el-card>
<div>
<el-input
v-model="listQuery.search"
placeholder="任务名/材料名"
style="width: 140px"
@keyup.enter.native="handleFilter"
/>
<!-- <el-select
v-model="listQuery.is_self"
placeholder="是否主动报送"
clearable
style="width: 140px"
@change="handleFilter"
>
<el-option
v-for="item in isOptions"
:key="item.key"
:label="item.name"
:value="item.key"
/>
</el-select>-->
<el-select
v-model="listQuery.state"
placeholder="记录状态"
clearable
style="width: 140px"
@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
@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="报送时间"
style="width: 140px"
>
</el-date-picker>
-
<el-date-picker
v-model="listQuery.date_lt"
type="date"
value-format="yyyy-MM-dd"
@change="handleFilter"
style="width: 140px"
placeholder="报送时间"
>
</el-date-picker>
<el-button type="primary" icon="el-icon-search" @click="handleFilter"
>搜索</el-button
>
<el-button
type="primary"
icon="el-icon-refresh-left"
@click="resetFilter"
>重置</el-button
>
</div>
<div style="margin-top: 10px">
<el-button
type="primary"
@click="centerDialogVisible = true"
style="margin-left: 4px"
>主动报送</el-button
>
<el-dialog
title="主动报送"
:visible.sync="centerDialogVisible"
width="70%"
center
>
<el-transfer
v-model="contents"
:data="contentOptions"
:titles="['材料清单', '选择的清单']"
:props="{ key: 'id', label: 'name' }"
/>
<div slot="footer" style="text-align: right">
<el-button type="primary" @click="contentup()">确认</el-button>
</div>
</el-dialog>
</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"
@sort-change="changeTableSort"
:span-method="objectSpanMethod"
>
<el-table-column type="index" width="50" />
<el-table-column
width="150px"
label="任务标题"
prop="task"
sortable="custom"
>
<template slot-scope="scope">
<span v-if="scope.row.task">{{ scope.row.task_.name }}</span>
<el-tag type="warning" effect="plain" v-else> 主动报送 </el-tag>
</template>
</el-table-column>
<el-table-column
label="材料名称"
sortable="custom"
prop="content__sortnum"
>
<template slot-scope="scope">{{ scope.row.content_name }}</template>
</el-table-column>
<el-table-column label="是否适用">
<template slot-scope="scope">
<el-tag v-if="scope.row.is_yes" effect="plain">是</el-tag>
<el-tag type="danger" effect="plain" v-else>否</el-tag>
</template>
</el-table-column>
<el-table-column label="报送情况">
<template slot-scope="scope" v-if="scope.row.up_user_"
>{{ 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.noteb">{{ scope.row.noteb }}</template>
</el-table-column>
<el-table-column
label="报送单位"
sortable="custom"
prop="belong_dept__sort"
>
<template slot-scope="scope" v-if="scope.row.belong_dept_">{{
scope.row.belong_dept_.name
}}</template>
</el-table-column>
<el-table-column label="记录状态">
<template slot-scope="scope" v-if="scope.row.state">
<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 == '待发布'
"
>{{ 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="操作" fixed="right">
<template slot-scope="scope">
<el-link
v-if="
(scope.row.state == '待报送' || scope.row.state == '待发布') &&
checkPermission(['record_update'])
"
type="warning"
size="small"
@click="handleRecord({ action: 'update', record: scope.row })"
>编辑</el-link
>
<el-link
v-if="
scope.row.state == '待报送' &&
checkPermission(['record_up'])
"
type="primary"
size="small"
@click="handleRecord({ action: 'up', record: scope.row })"
>报送</el-link
>
<el-link
v-if="
(scope.row.state == '已报送' || scope.row.state == '待整改') &&
checkPermission(['record_up'])
"
type="primary"
size="small"
@click="handleRecord({ action: 'up', record: scope.row })"
>重报</el-link
>
<el-link
v-if="
scope.row.state == '已报送' &&
checkPermission(['record_confirm'])
"
type="success"
size="small"
@click="handleRecord({ action: 'confirm', record: scope.row })"
>确认</el-link
>
<el-link
v-if="
scope.row.state == '已报送' &&
checkPermission(['record_reject']) &&
scope.row.belong_dept != $store.state.user.dept
"
type="danger"
size="small"
@click="handleRecord({ action: 'reject', record: scope.row })"
>驳回</el-link
>
<el-link
v-if="checkPermission(['record_view'])"
size="small"
@click="handleRecord({ action: 'view', record: scope.row })"
>查看</el-link
>
<el-link
v-if="checkPermission(['record_delete'])"
type="danger"
size="small"
@click="handleRecord({ action: 'delete', record: scope.row })"
>删除</el-link
>
</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"
size="40%"
>
<recorddos
ref="recorddos"
:data="data"
@handleDo="handleDo"
v-if="drawer"
></recorddos>
</el-drawer>
</div>
</template>
<style lang="scss">
.el-transfer-panel {
width: 470px;
}
.el-transfer__buttons {
padding: 0 2px;
.el-button {
display: block;
}
}
</style>
<script>
import { getOrgList, getSubOrgList } from "@/api/org";
import { getRecordList, createself } from "@/api/record";
import { genTree } from "@/utils";
import { getContentList } from "@/api/content";
import checkPermission from "@/utils/permission";
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
import recorddos from "@/views/ability/recorddos";
const defaultrecord = {
};
export default {
components: { Pagination, recorddos },
data() {
return {
record: defaultrecord,
recordList: {
count: 0,
},
can_doself: true,
contentOptions: [],
contents: [],
centerDialogVisible: false,
orgData: [],
drawer: false,
stateOptions: [
{ key: "待报送", name: "待报送" },
{ key: "已报送", name: "已报送" },
{ key: "已确认", name: "已确认" },
{ key: "待整改", name: "待整改" },
],
isOptions: [
{ key: "true", name: "是" },
{ key: "false", name: "否" },
],
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: "最近一个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
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]);
},
},
],
},
listQuery: {
page: 1,
page_size: 20,
belong_dept: this.$store.state.user.dept
},
listLoading: false,
dialogVisible: false,
dialogType: "new",
rule1: {
name: [{ required: true, message: "请输入", trigger: "blur" }],
},
};
},
computed: {},
watch: {},
created() {
this.getState();
this.getOrgList();
this.getContentsList();
},
methods: {
checkPermission,
getState() {
if(this.checkPermission(["record_confirm"])){
this.listQuery = {
page:1,
page_size:20
}
}
if (this.$route.params.state) {
this.listQuery.state = this.$route.params.state;
}
this.getList();
},
getList() {
this.listQuery.is_self=true;
getRecordList(this.listQuery).then((response) => {
this.recordList = response.data;
});
},
getOrgList() {
if (this.checkPermission(["record_confirm"])) {
getOrgList({ can_supervision: true }).then((res) => {
this.orgData = res.data;
});
}else{
getSubOrgList().then(res=>{
this.orgData = res.data;
})
}
},
handleOrgClick(obj, node, vue) {
this.listQuery.page = 1;
this.listQuery.dept_id = obj.id;
this.getList();
},
handleFilter() {
this.listQuery.page = 1;
this.getList();
},
resetFilter() {
this.listQuery = {
page: 1,
page_size: 20,
belong_dept: this.$store.state.user.dept
};
this.getList();
},
handleRecord(data) {
this.data = data;
this.drawer = true;
},
handleDo(data) {
this.drawer = false;
this.getList();
},
getContentsList() {
getContentList({ can_doself: this.can_doself }).then((res) => {
this.contentOptions = res.data;
});
},
changeTableSort(val) {
if (val.order == "ascending") {
this.listQuery.ordering = val.prop;
} else {
this.listQuery.ordering = "-" + val.prop;
}
this.getList();
},
contentup() {
console.log(this.contents);
if (this.contents.length > 0) {
createself({ contents: this.contents }).then((res) => {
this.centerDialogVisible = false;
this.listQuery = {
page: 1,
page_size: 20,
state: "待报送",
is_self: true,
};
this.getList();
});
} else {
this.$message.error("请选择清单!");
}
},
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
// if (columnIndex === 1 || columnIndex === 0) {
// // 当 当前行与上一行内容相同时 返回0 0 意味消除
// if(rowIndex > 0 && row[column.property] === this.recordList[rowIndex - 1][column.property]){
// return {
// rowspan: 0,
// colspan: 0
// };
// }else{
// let rows = 1;
// // 反之 查询相同的内容有多少行 进行合并
// for(let i = rowIndex; i < this.recordList.length - 1; i++){
// if (row[column.property] === this.recordList[i + 1][column.property]) {
// rows++;
// }
// }
// // 返回相同内容的行数
// return {
// rowspan: rows,
// colspan: 1
// };
// }
// }
},
},
};
</script>

245
client/src/views/ability/recorddos.vue Normal file
View File

@ -0,0 +1,245 @@
<template>
<div class="app-container" >
<div class="ma">报送记录</div>
<el-form label-width="100px" label-position="left">
<el-form-item label="材料内容" v-if="record.content_name">
{{ record.content_name }}
</el-form-item>
<el-form-item label="材料详情" v-if="record.content_desc">
{{ record.content_desc }}
</el-form-item>
<el-form-item label="报送状态" v-if="record.state">
{{ record.state }}
<el-tag v-if="record.is_self" style="margin-left: 2px" effect="plain">主动报送</el-tag>
</el-form-item>
<el-form-item label="所属任务" v-if="record.task_">
{{ record.task_.name }}/{{ record.task_.end_date }}
</el-form-item>
<el-form-item label="清单模板" v-if="record.content_.template">
<el-link :href="record.content_.template" type="primary">模板下载</el-link>
</el-form-item>
<el-form-item label="执行组织" v-if="record.belong_dept_">
{{ record.belong_dept_.name }}
</el-form-item>
<el-form-item label="报送人" v-if="record.up_user_">
{{ record.up_user_.name }}/{{ record.up_date }}
</el-form-item>
<el-form-item label="报送说明">
<span v-if="data.action != 'up'">{{ record.noteb }}</span>
<el-input v-model="record.noteb" placeholder="" type="textarea" v-else >
</el-input>
</el-form-item>
<el-form-item label="是否适用">
<el-switch
v-model="record.is_yes"
:disabled="data.action != 'up'"
@change="yeschange"
inactive-color="red"
></el-switch>
</el-form-item>
<el-form-item label="修改意见" v-if="record.opinion || data.action=='reject'">
<span v-if="data.action != 'reject'">{{record.opinion}}</span>
<el-input
v-model="record.opinion"
placeholder=""
type="textarea"
v-else
/>
</el-form-item>
<el-form-item label="文件列表">
<el-upload
v-if="data.action == 'up' && record.is_yes"
ref="upload"
:action="upUrl"
:before-upload="beforeUpload"
:on-success="handleUpSuccess"
:headers="upHeaders"
multiple
accept="image/*,.ppt,.pdf,.doc,.docx,.xls,.xlsx"
>
<el-button size="small" type="primary">上传文件</el-button>
<span class="el-upload__tip">
可上传多个pdf,word,ppt,excel,图片文件,单文件大小不超过50M
</span>
</el-upload>
</el-form-item>
<div
v-for="(item, index) in fileList"
v-bind:key="item.id"
style="margin-top: 2px;"
>
<i
class="el-icon-delete"
@click="deleteFile(index)"
style="color: red"
v-if="data.action == 'up'"
></i>
<el-link :href="item.path" target="_blank" type="primary">{{
item.name
}}</el-link>
</div>
</el-form>
<el-divider></el-divider>
<div style="text-align: right">
<el-button
@click="confirm()"
type="danger"
v-if="this.data.action == 'reject'"
>驳回</el-button
>
<el-button
type="danger"
@click="confirm()"
v-else-if="this.data.action == 'delete'"
>删除</el-button
>
<el-button type="primary" @click="confirm()" v-else>确认</el-button>
</div>
</div>
</template>
<style scoped>
.ma {
margin-bottom: 10px;
font-size: 20px;
}
.el-form-item {
margin-bottom: 0px;
}
/* .term {
color: rgba(0, 0, 0, 0.85);
font-weight: bold;
font-size: 16px;
}
.desc {
color: rgba(0, 0, 0, 0.65);
font-weight: bold;
font-size: 16px;
} */
.litem {
margin-left: 2px;
cursor: pointer;
color: #409eff;
}
</style>
<script>
import { upUrl, upHeaders } from "@/api/file";
import {
updateRecord,
upRecord,
rejectRecord,
confirmRecord,
deleteRecord,
} from "@/api/record";
export default {
name: "recorddos",
props: ["data"],
data() {
return {
upHeaders: upHeaders(),
upUrl: upUrl(),
record: null,
fileList: [],
};
},
created() {
this.initRecord();
},
mounted() {
this.initList();
},
methods: {
initRecord() {
this.record = Object.assign({}, this.data.record);
console.log(this.data.record)
},
initList() {
for (var i = 0; i < this.record.files_.length; i++) {
this.fileList.push({
id: this.record.files_[i].id,
name: this.record.files_[i].name,
path: this.record.files_[i].path,
});
}
},
handleUpSuccess(res, file, filelist) {
this.fileList.push({
id: res.data.id,
name: res.data.name,
path: res.data.path,
});
this.handleRemove(file);
},
handleRemove(file) {
// 实现删除文件
let fileList = this.$refs.upload.uploadFiles;
let index = fileList.findIndex((fileItem) => {
return fileItem.uid === file.uid;
});
fileList.splice(index, 1);
},
beforeUpload(file) {
const isLt2M = file.size / 1024 / 1024 < 50;
if (!isLt2M) {
this.$message.error("单文件不能超过50MB!");
}
return isLt2M;
},
deleteFile(index) {
this.$confirm("确定删除该文件, 是否继续?", { type: "error" })
.then(() => {
this.fileList.splice(index, 1);
})
.catch((e) => {});
},
yeschange(val) {
if (!val) {
this.fileList = [];
}
},
confirm() {
if (this.data.action == "update") {
updateRecord(this.record.id, this.record).then((res) => {
this.$message.success("成功");
this.$emit("handleDo",true);
});
} else if (this.data.action == "up") {
var files = [];
for (var i = 0; i < this.fileList.length; i++) {
files.push(this.fileList[i].id);
}
this.record.files = files;
upRecord(this.record.id, this.record).then((res) => {
this.$message.success("成功");
this.$emit("handleDo",true);
});
} else if (this.data.action == "reject") {
rejectRecord(this.record.id, this.record).then((res) => {
this.$message.success("成功");
this.$emit("handleDo",true);
});
} else if (this.data.action == "confirm") {
confirmRecord(this.record.id).then((res) => {
this.$message.success("成功");
this.$emit("handleDo",true);
});
} else if (this.data.action == "view") {
this.$emit("handleDo",false);
} else if (this.data.action == "delete") {
this.$confirm("确认删除?", "警告", {
type: "error",
})
.then(async () => {
await deleteRecord(this.record.id);
this.$message.success("成功");
this.$emit("handleDo",true);
})
.catch((err) => {
console.error(err);
});
}
},
},
};
</script>

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

@ -52,6 +52,19 @@
<!-- <count-to :start-val="0" v-bind:end-val="ret.test_count" :duration="1600" class="card-panel-num" /> -->
</div>
</div>
</el-col>
<el-col :xs="12" :sm="12" :lg="12" :xl="6" class="card-panel-col">
<div class="card-panel" @click="toPath('/share/correct')">
<div class="card-panel-icon-wrapper icon-money">
<svg-icon icon-class="table" class-name="card-panel-icon" />
</div>
<div class="card-panel-description">
<div class="card-panel-text">
校准/检定能力
</div>
<!-- <count-to :start-val="0" v-bind:end-val="ret.test_count" :duration="1600" class="card-panel-num" /> -->
</div>
</div>
</el-col>
<el-col :xs="12" :sm="12" :lg="12" :xl="6" class="card-panel-col">
<div class="card-panel" @click="toPath('/test/videolist')">

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

@ -8,20 +8,7 @@
style="width: 140px"
@keyup.enter.native="handleFilter"
/>
<el-select
v-model="listQuery.is_self"
placeholder="是否主动报送"
clearable
style="width: 140px"
@change="handleFilter"
>
<el-option
v-for="item in isOptions"
:key="item.key"
:label="item.name"
:value="item.key"
/>
</el-select>
<el-select
v-model="listQuery.state"
placeholder="记录状态"
@ -78,8 +65,8 @@
>重置</el-button
>
</div>
<div style="margin-top: 10px">
<el-button
<!--- <div style="margin-top: 10px">
<el-button
type="primary"
@click="centerDialogVisible = true"
style="margin-left: 4px"
@ -101,7 +88,7 @@
<el-button type="primary" @click="contentup()">确认</el-button>
</div>
</el-dialog>
</div>
</div>--->
</el-card>
<el-card style="margin-top: 10px">
<el-table
@ -408,6 +395,7 @@ export default {
this.getList();
},
getList() {
this.listQuery.is_self=false;
getRecordList(this.listQuery).then((response) => {
this.recordList = response.data;
});