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

feature<master> feat:新增质量活动、质量表彰、实验室联系方式模块

This commit is contained in:
zty 2024-04-02 16:52:49 +08:00
parent f74325f26a
commit 1102b57ebc
14 changed files with 585 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
client/src/api/contacts.js Normal file
View File

@ -0,0 +1,45 @@
import request from '@/utils/request'
export function getCtAll(query) {
return request({
url: '/info/contact/',
method: 'get',
params: query
})
}
export function getCt(id) {
return request({
url: `/info/contact/${id}/`,
method: 'get'
})
}
export function updateContact(id, data) {
return request({
url: `/info/contact/${id}/`,
method: 'put',
data
})
}
export function createCt(data) {
return request({
url: `/info/contact/`,
method: 'post',
data
})
}
export function del_contact(id) {
return request({
url: `/info/contact/${id}/`,
method: 'delete'
})
}

51
client/src/api/review.js Normal file
View File

@ -0,0 +1,51 @@
import request from '@/utils/request'
export function getRsAll(query) {
return request({
url: '/info/ar/',
method: 'get',
params: query
})
}
export function getMyRs(query) {
return request({
url: '/info/ar/review_info/',
method: 'get',
params: query
})
}
export function getRs(id) {
return request({
url: `/info/ar/${id}/`,
method: 'get'
})
}
export function updateRs(id, data) {
return request({
url: `/info/ar/${id}/`,
method: 'put',
data
})
}
export function createRs(data) {
return request({
url: `/info/ar/`,
method: 'post',
data
})
}
export function delRs(id) {
return request({
url: `/info/ar/${id}/`,
method: 'delete'
})
}

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

@ -407,52 +407,52 @@ export const asyncRoutes = [
] ]
}, },
//信息收集 //信息收集
// { {
// path: '/infoCollect', path: '/infoCollect',
// component: Layout, component: Layout,
// redirect: '/infoCollect/', redirect: '/infoCollect/',
// name: 'informationCollect', name: 'informationCollect',
// meta: { title: '信息收集', icon: 'PT', perms: ['infoCollect'] }, meta: { title: '信息收集', icon: 'PT', perms: ['infoCollect'] },
// alwaysShow: true, alwaysShow: true,
// children: [ children: [
// { {
// path: 'reviewStatus', path: 'reviewStatus',
// name: 'reviewStatus', name: 'reviewStatus',
// component: () => import('@/views/informatiomCollect/reviewStatus.vue'), component: () => import('@/views/informatiomCollect/reviewStatus.vue'),
// meta: { title: '评审情况', perms: ['infoCollect_RS'] } meta: { title: '评审情况', perms: ['infoCollect_RS'] }
// }, },
// { {
// path: 'qualityCommend', path: 'qualityCommend',
// name: 'qualityCommend', name: 'qualityCommend',
// component: () => import('@/views/informatiomCollect/qualityCommend.vue'), component: () => import('@/views/informatiomCollect/qualityCommend.vue'),
// meta: { title: '质量活动', perms: ['infoCollect_QC'] } meta: { title: '质量表彰', perms: ['infoCollect_QC'] }
// }, },
// { {
// path: 'qualityActive.', path: 'qualityActive.',
// name: 'qualityActive.', name: 'qualityActive.',
// component: () => import('@/views/informatiomCollect/qualityActive.vue'), component: () => import('@/views/informatiomCollect/qualityActive.vue'),
// meta: { title: '质量表彰', perms: ['infoCollect_QA'] } meta: { title: '质量活动', perms: ['infoCollect_QA'] }
// }, },
// { {
// path: 'laboratoryContact', path: 'laboratoryContact',
// name: 'laboratoryContact', name: 'laboratoryContact',
// component: () => import('@/views/informatiomCollect/laboratoryContact.vue'), component: () => import('@/views/informatiomCollect/laboratoryContact.vue'),
// meta: { title: '实验室联系方式', perms: ['infoCollect_LC'] } meta: { title: '实验室联系方式', perms: ['infoCollect_LC'] }
// }, },
// { {
// path: 'externalAuditor', path: 'externalAuditor',
// name: 'externalAuditor', name: 'externalAuditor',
// component: () => import('@/views/informatiomCollect/externalAuditor.vue'), component: () => import('@/views/informatiomCollect/externalAuditor.vue'),
// meta: { title: '外审员情况', perms: ['infoCollect_EA'] } meta: { title: '外审员情况', perms: ['infoCollect_EA'] }
// }, },
// { {
// path: 'inspectionStats', path: 'inspectionStats',
// name: 'inspectionStats', name: 'inspectionStats',
// component: () => import('@/views/informatiomCollect/inspectionStats.vue'), component: () => import('@/views/informatiomCollect/inspectionStats.vue'),
// meta: { title: '检验检测统计', perms: ['infoCollect_IS'] } meta: { title: '检验检测统计', perms: ['infoCollect_IS'] }
// }, },
// ] ]
// }, },
{ {
path: '/test', path: '/test',
component: Layout, component: Layout,

149
client/src/views/informatiomCollect/laboratoryContact.vue
View File

@ -7,27 +7,49 @@
<el-table v-loading="listLoading" :data="tableData.results" :hieght="tableHeight" border fit stripe <el-table v-loading="listLoading" :data="tableData.results" :hieght="tableHeight" border fit stripe
highlight-current-row> highlight-current-row>
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="文件名称"> <el-table-column label="姓名">
<template slot-scope="scope">{{ scope.row.name }}</template> <template slot-scope="scope">{{ scope.row.name }}</template>
</el-table-column> </el-table-column>
<el-table-column label="文件描述"> <el-table-column label="地址">
<template slot-scope="scope">{{ scope.row.description }}</template> <template slot-scope="scope">{{ scope.row.address }}</template>
</el-table-column> </el-table-column>
<el-table-column label="文件格式"> <el-table-column label="负责人">
<template slot-scope="scope">{{ scope.row.file_.mime }}</template> <template slot-scope="scope">{{ scope.row.header }}</template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="文件下载"> <el-table-column label="负责人电话">
<template slot-scope="scope">{{ scope.row.tel }}</template>
</el-table-column>
<el-table-column label="负责人邮箱">
<template slot-scope="scope">{{ scope.row.email }}</template>
</el-table-column>
<el-table-column label="技术负责人">
<template slot-scope="scope">{{ scope.row.tel_technology }}</template>
</el-table-column>
<el-table-column label="技术负责人邮箱">
<template slot-scope="scope">{{ scope.row.email_technology }}</template>
</el-table-column>
<el-table-column label="质量负责人">
<template slot-scope="scope">{{ scope.row.head_quality }}</template>
</el-table-column>
<el-table-column label="质量负责人电话">
<template slot-scope="scope">{{ scope.row.tel_quality }}</template>
</el-table-column>
<el-table-column label="质量负责人邮箱">
<template slot-scope="scope">{{ scope.row.email_quality }}</template>
</el-table-column>
<!-- <el-table-column align="center" label="文件下载">
<template slot-scope="scope" v-if="scope.row.file_.file"> <template slot-scope="scope" v-if="scope.row.file_.file">
<el-link :href="scope.row.file_.file" type="primary">下载</el-link> <el-link :href="scope.row.file_.file" type="primary">下载</el-link>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column align="center" label="操作" width="120px" fixed="right"> <el-table-column align="center" label="操作" width="120px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-link :disabled="!checkPermission(['infoCollect_RS'])" type="primary" size="small" <el-link :disabled="!checkPermission(['infoCollect_LC'])" type="primary" size="small"
@click="handleEdit(scope)">编辑</el-link> @click="handleEdit(scope)">编辑</el-link>
<el-divider direction="vertical" <el-divider direction="vertical"
v-if="checkPermission(['infoCollect_RS']) && checkPermission(['infoCollect_RS'])"></el-divider> v-if="checkPermission(['infoCollect_LC']) && checkPermission(['infoCollect_LC'])"></el-divider>
<el-link :disabled="!checkPermission(['infoCollect_RS'])" type="danger" size="small" <el-link :disabled="!checkPermission(['infoCollect_LC'])" type="danger" size="small"
@click="handleDelete(scope)">删除</el-link> @click="handleDelete(scope)">删除</el-link>
</template> </template>
</el-table-column> </el-table-column>
@ -35,13 +57,42 @@
<pagination v-show="tableData.count > 0" :total="tableData.count" :page.sync="listQuery.page" <pagination v-show="tableData.count > 0" :total="tableData.count" :page.sync="listQuery.page"
:limit.sync="listQuery.page_size" @pagination="getTableList" /> :limit.sync="listQuery.page_size" @pagination="getTableList" />
</el-card> </el-card>
<el-dialog :visible.sync="dialogVisible" :title="dialogType === 'edit' ? '编辑评审' : '新增评审'"> <el-dialog :visible.sync="dialogVisible" :title="dialogType === 'edit' ? '编辑' : '新增'">
<el-form ref="Form" :model="Content" label-width="80px" label-position="right" :rules="rule"> <el-form ref="Form" :model="Content" label-width="80px" label-position="right" :rules="rule">
<el-form-item label="评审名称" prop="name"> <el-form-item label="姓名" prop="name">
<el-input v-model="Content.name" placeholder="评审名称" /> <el-input v-model="Content.name" placeholder="" />
</el-form-item> </el-form-item>
<el-form-item label="地址" prop="address">
<el-form-item label="" prop="description"> <el-input v-model="Content.address" placeholder="" />
</el-form-item>
<el-form-item label="负责人" prop="header">
<el-input v-model="Content.header" placeholder="" />
</el-form-item>
<el-form-item label="负责人电话" prop="tel">
<el-input v-model="Content.tel" placeholder="" />
</el-form-item>
<el-form-item label="负责人邮箱" prop="email">
<el-input v-model="Content.email" placeholder="" />
</el-form-item>
<el-form-item label="技术负责人" prop="head_technology">
<el-input v-model="Content.head_technology" placeholder="" />
</el-form-item>
<el-form-item label="技术负责人电话" prop="tel_technology">
<el-input v-model="Content.tel_technology" placeholder="" />
</el-form-item>
<el-form-item label="技术负责人邮箱" prop="email_technology">
<el-input v-model="Content.email_technology" placeholder="" />
</el-form-item>
<el-form-item label="质量负责人" prop="head_quality">
<el-input v-model="Content.head_quality" placeholder="" />
</el-form-item>
<el-form-item label="质量负责人电话" prop="tel_quality">
<el-input v-model="Content.tel_quality" placeholder="" />
</el-form-item>
<el-form-item label="质量负责人邮箱" prop="email_quality">
<el-input v-model="Content.email_quality" placeholder="" />
</el-form-item>
<!-- <el-form-item label="" prop="description">
<el-input type="textarea" :rows="2" v-model="Content.description" placeholder="评审描述" /> <el-input type="textarea" :rows="2" v-model="Content.description" placeholder="评审描述" />
</el-form-item> </el-form-item>
<el-form-item label="评审文件" prop="file" v-if="dialogVisible"> <el-form-item label="评审文件" prop="file" v-if="dialogVisible">
@ -50,8 +101,7 @@
accept=".doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf"> accept=".doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf">
<el-button size="small" type="primary">上传文件</el-button> <el-button size="small" type="primary">上传文件</el-button>
</el-upload> </el-upload>
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<div style="text-align: right"> <div style="text-align: right">
<el-button type="danger" @click="dialogVisible = false">取消</el-button> <el-button type="danger" @click="dialogVisible = false">取消</el-button>
@ -66,16 +116,38 @@ import Pagination from "@/components/Pagination"; // secondary package based on
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { getDictList, getDictTypeList } from "@/api/dict"; import { getDictList, getDictTypeList } from "@/api/dict";
import {createCt, del_contact, updateContact, getCtAll, getCt } from "@/api/contacts";
import { upUrl, upHeaders } from "@/api/file"; import { upUrl, upHeaders } from "@/api/file";
const defaultContent = { const defaultContent = {
name: "", name: "",
description: "", address: "",
file: null header: "",
tel: "",
email: "",
head_technology: "",
tel_technology: "",
email_technology: "",
head_quality: "",
tel_quality: "",
email_quality: ""
}; };
export default { export default {
components: { Pagination, Treeselect }, components: { Pagination, Treeselect },
data(){ data(){
return { return {
form: {
name: "",
address: "",
header: "",
tel: "",
email: "",
head_technology: "",
tel_technology: "",
email_technology: "",
head_quality: "",
tel_quality: "",
email_quality: ""
},
upHeaders: upHeaders(), upHeaders: upHeaders(),
upUrl: upUrl(), upUrl: upUrl(),
fileList: [], fileList: [],
@ -142,9 +214,18 @@ export default {
}, },
getList() { getList() {
this.listLoading = true;
this.tableData.results =[];
this.tableData.count =0;
getCtAll(this.listQuery).then((response) => {
console.log(response);
if (response.data) {
this.tableData = response.data;
}
this.listLoading = false;
});
}, },
handleFilter() { handleFilter() {
this.listQuery.page = 1; this.listQuery.page = 1;
this.getList(); this.getList();
@ -181,9 +262,9 @@ export default {
type: "error", type: "error",
}) })
.then(async () => { .then(async () => {
// await deleteDoc(scope.row.id); await del_contact(scope.row.id);
// this.getList(); this.getList();
// this.$message.success("成功"); this.$message.success("成功");
}) })
.catch((err) => { .catch((err) => {
console.error(err); console.error(err);
@ -194,10 +275,24 @@ export default {
if (valid) { if (valid) {
const isEdit = this.dialogType === "edit"; const isEdit = this.dialogType === "edit";
if (isEdit) { if (isEdit) {
console.log(this.Content) console.log(this.Content);
updateContact(this.Content.id, this.Content).then((response) => {
if (response.data) {
this.tableData = response.data;
}
this.listLoading = false;
this.dialogVisible = false;
this.getTableList();
});
} else { } else {
createCt(this.Content).then((response) => {
if (response.data) {
this.tableData = response.data;
}
this.listLoading = false;
this.dialogVisible = false;
this.getTableList();
});
} }
} else { } else {
return false; return false;
@ -205,6 +300,8 @@ export default {
}); });
}, },
}, },
}; };
</script> </script>
<style></style> <style></style>
@/api/contacts

6
client/src/views/informatiomCollect/qualityActive.vue
View File

@ -28,11 +28,11 @@
</el-table-column> --> </el-table-column> -->
<el-table-column align="center" label="操作" width="120px" fixed="right"> <el-table-column align="center" label="操作" width="120px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-link :disabled="!checkPermission(['infoCollect_RS'])" type="primary" size="small" <el-link :disabled="!checkPermission(['infoCollect_QA'])" type="primary" size="small"
@click="handleEdit(scope)">编辑</el-link> @click="handleEdit(scope)">编辑</el-link>
<el-divider direction="vertical" <el-divider direction="vertical"
v-if="checkPermission(['infoCollect_RS']) && checkPermission(['infoCollect_RS'])"></el-divider> v-if="checkPermission(['infoCollect_QA']) && checkPermission(['infoCollect_QA'])"></el-divider>
<el-link :disabled="!checkPermission(['infoCollect_RS'])" type="danger" size="small" <el-link :disabled="!checkPermission(['infoCollect_QA'])" type="danger" size="small"
@click="handleDelete(scope)">删除</el-link> @click="handleDelete(scope)">删除</el-link>
</template> </template>
</el-table-column> </el-table-column>

14
client/src/views/informatiomCollect/qualityCommend.vue
View File

@ -26,7 +26,7 @@
<template slot-scope="scope">{{ scope.row.awarded_by }}</template> <template slot-scope="scope">{{ scope.row.awarded_by }}</template>
</el-table-column> </el-table-column>
<el-table-column label="获奖日期"> <el-table-column label="获奖日期">
<template slot-scope="scope">{{ scope.row.awarded_by }}</template> <template slot-scope="scope">{{ scope.row.awarded_date }}</template>
</el-table-column> </el-table-column>
<!-- <el-table-column align="center" label="文件下载"> <!-- <el-table-column align="center" label="文件下载">
@ -36,11 +36,11 @@
</el-table-column> --> </el-table-column> -->
<el-table-column align="center" label="操作" width="120px" fixed="right"> <el-table-column align="center" label="操作" width="120px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-link :disabled="!checkPermission(['infoCollect_RS'])" type="primary" size="small" <el-link :disabled="!checkPermission(['infoCollect_QC'])" type="primary" size="small"
@click="handleEdit(scope)">编辑</el-link> @click="handleEdit(scope)">编辑</el-link>
<el-divider direction="vertical" <el-divider direction="vertical"
v-if="checkPermission(['infoCollect_RS']) && checkPermission(['infoCollect_RS'])"></el-divider> v-if="checkPermission(['infoCollect_QC']) && checkPermission(['infoCollect_QC'])"></el-divider>
<el-link :disabled="!checkPermission(['infoCollect_RS'])" type="danger" size="small" <el-link :disabled="!checkPermission(['infoCollect_QC'])" type="danger" size="small"
@click="handleDelete(scope)">删除</el-link> @click="handleDelete(scope)">删除</el-link>
</template> </template>
</el-table-column> </el-table-column>
@ -56,10 +56,10 @@
<el-form-item label="表彰名称" prop="commendation_name"> <el-form-item label="表彰名称" prop="commendation_name">
<el-input v-model="Content.commendation_name" placeholder="表彰名称" /> <el-input v-model="Content.commendation_name" placeholder="表彰名称" />
</el-form-item> </el-form-item>
<el-form-item label="获奖等级" prop="awardee_company"> <el-form-item label="获奖单位" prop="awardee_company">
<el-input v-model="Content.awardee_company" placeholder="获奖等级" /> <el-input v-model="Content.awardee_company" placeholder="获奖等级" />
</el-form-item> </el-form-item>
<el-form-item label="获奖单位" prop="Awards_level"> <el-form-item label="获奖等级" prop="Awards_level">
<el-input v-model="Content.Awards_level" placeholder="获奖单位" /> <el-input v-model="Content.Awards_level" placeholder="获奖单位" />
</el-form-item> </el-form-item>
<el-form-item label="获奖人" prop="awardee_people"> <el-form-item label="获奖人" prop="awardee_people">
@ -70,7 +70,7 @@
</el-form-item> </el-form-item>
<el-form-item label="获奖日期" prop="awarded_date"> <el-form-item label="获奖日期" prop="awarded_date">
<el-date-picker <el-date-picker
v-model="Content.activate_time" v-model="Content.awarded_date"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"

169
client/src/views/informatiomCollect/reviewStatus.vue
View File

@ -7,20 +7,36 @@
<el-table v-loading="listLoading" :data="tableData.results" :hieght="tableHeight" border fit stripe <el-table v-loading="listLoading" :data="tableData.results" :hieght="tableHeight" border fit stripe
highlight-current-row> highlight-current-row>
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="文件名称"> <el-table-column label="公司名称">
<template slot-scope="scope">{{ scope.row.name }}</template> <template slot-scope="scope">{{ scope.row.name }}</template>
</el-table-column> </el-table-column>
<el-table-column label="文件描述"> <el-table-column label="资质名称">
<template slot-scope="scope">{{ scope.row.description }}</template> <template slot-scope="scope">{{ scope.row.qualification_name }}</template>
</el-table-column> </el-table-column>
<el-table-column label="文件格式"> <el-table-column label="评审方法">
<template slot-scope="scope">{{ scope.row.file_.mime }}</template> <template slot-scope="scope">{{ scope.row.judging_method }}</template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="文件下载"> <el-table-column label="评审类型">
<template slot-scope="scope">{{ scope.row.judging_type }}</template>
</el-table-column>
<el-table-column label="新增参数(个)">
<template slot-scope="scope">{{ scope.row.add_param }}</template>
</el-table-column>
<el-table-column label="评审日期">
<template slot-scope="scope">{{ scope.row.review_date }}</template>
</el-table-column>
<el-table-column label="现有场所数量">
<template slot-scope="scope">{{ scope.row.now_count }}</template>
</el-table-column>
<el-table-column label="新增场所数量">
<template slot-scope="scope">{{ scope.row.add_count }}</template>
</el-table-column>
<!-- <el-table-column align="center" label="文件下载">
<template slot-scope="scope" v-if="scope.row.file_.file"> <template slot-scope="scope" v-if="scope.row.file_.file">
<el-link :href="scope.row.file_.file" type="primary">下载</el-link> <el-link :href="scope.row.file_.file" type="primary">下载</el-link>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column align="center" label="操作" width="120px" fixed="right"> <el-table-column align="center" label="操作" width="120px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-link :disabled="!checkPermission(['infoCollect_RS'])" type="primary" size="small" <el-link :disabled="!checkPermission(['infoCollect_RS'])" type="primary" size="small"
@ -35,13 +51,65 @@
<pagination v-show="tableData.count > 0" :total="tableData.count" :page.sync="listQuery.page" <pagination v-show="tableData.count > 0" :total="tableData.count" :page.sync="listQuery.page"
:limit.sync="listQuery.page_size" @pagination="getTableList" /> :limit.sync="listQuery.page_size" @pagination="getTableList" />
</el-card> </el-card>
<el-dialog :visible.sync="dialogVisible" :title="dialogType === 'edit' ? '编辑评审' : '新增评审'"> <el-dialog :visible.sync="dialogVisible" :title="dialogType === 'edit' ? '编辑' : '新增'">
<el-form ref="Form" :model="Content" label-width="80px" label-position="right" :rules="rule"> <el-form ref="Form" :model="Content" label-width="80px" label-position="right" :rules="rule">
<el-form-item label="评审名称" prop="name"> <el-form-item label="公司名称" prop="name">
<el-input v-model="Content.name" placeholder="评审名称" /> <el-input v-model="Content.name" placeholder="公司名称" />
</el-form-item> </el-form-item>
<el-form-item label="资质名称" prop="qualification_name">
<el-form-item label="" prop="description"> <el-input v-model="Content.qualification_name" placeholder="资质名称" />
</el-form-item>
<el-form-item label="评审方法" prop="judging_method">
<el-select v-model="Content.judging_method" placeholder="请选择">
<el-option
v-for="item in method_options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="评审类型" prop="judging_type">
<el-select v-model="Content.judging_type" placeholder="请选择">
<el-option
v-for="item in type_options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="新增参数(个)" prop="add_param">
<el-input v-model="Content.add_param" placeholder="新增参数" />
</el-form-item>
<el-form-item label="现有场所数量" prop="now_count">
<el-input-number
v-model="Content.now_count"
:min="0"
controls-position="right"
:step="1"
step-strictly="true"
/>
</el-form-item>
<el-form-item label="新增场所数量" prop="add_count">
<el-input-number
v-model="Content.add_count"
:min="0"
controls-position="right"
:step="1"
step-strictly="true"
/>
</el-form-item>
<el-form-item label="评审日期" prop="review_date">
<el-date-picker
v-model="Content.review_date"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
style="width:50%"
></el-date-picker>
</el-form-item>
<!-- <el-form-item label="" prop="description">
<el-input type="textarea" :rows="2" v-model="Content.description" placeholder="评审描述" /> <el-input type="textarea" :rows="2" v-model="Content.description" placeholder="评审描述" />
</el-form-item> </el-form-item>
<el-form-item label="评审文件" prop="file" v-if="dialogVisible"> <el-form-item label="评审文件" prop="file" v-if="dialogVisible">
@ -50,8 +118,7 @@
accept=".doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf"> accept=".doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf">
<el-button size="small" type="primary">上传文件</el-button> <el-button size="small" type="primary">上传文件</el-button>
</el-upload> </el-upload>
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<div style="text-align: right"> <div style="text-align: right">
<el-button type="danger" @click="dialogVisible = false">取消</el-button> <el-button type="danger" @click="dialogVisible = false">取消</el-button>
@ -66,16 +133,47 @@ import Pagination from "@/components/Pagination"; // secondary package based on
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { getDictList, getDictTypeList } from "@/api/dict"; import { getDictList, getDictTypeList } from "@/api/dict";
import { createRs, delRs, updateRs, getMyRs, getRs } from "@/api/review";
import { upUrl, upHeaders } from "@/api/file"; import { upUrl, upHeaders } from "@/api/file";
const defaultContent = { const defaultContent = {
name: "", name: "",
description: "", qualification_name: "",
file: null judging_method: "",
judging_type: "",
add_param: "",
review_date: "",
now_count: "",
add_count: ""
}; };
export default { export default {
components: { Pagination, Treeselect }, components: { Pagination, Treeselect },
data(){ data(){
return { return {
form: {
name: "",
qualification_name: "",
judging_method: "",
judging_type: "",
add_param: "",
review_date: "",
now_count: "",
add_count: ""
},
method_options: [{value: 0,label: '文审'},{value: 10,label: '现场'}],
type_options: [{
value: 0,
label: '初次'},
{
value: 10,
label: '扩项'},
{
value: 20,
label: '变更'},{
value: 30,
label: '复评'},
{
value: 40,
label: '迁址'}],
upHeaders: upHeaders(), upHeaders: upHeaders(),
upUrl: upUrl(), upUrl: upUrl(),
fileList: [], fileList: [],
@ -142,9 +240,18 @@ export default {
}, },
getList() { getList() {
this.listLoading = true;
this.tableData.results =[];
this.tableData.count =0;
getMyRs(this.listQuery).then((response) => {
console.log(response);
if (response.data) {
this.tableData = response.data;
}
this.listLoading = false;
});
}, },
handleFilter() { handleFilter() {
this.listQuery.page = 1; this.listQuery.page = 1;
this.getList(); this.getList();
@ -181,9 +288,9 @@ export default {
type: "error", type: "error",
}) })
.then(async () => { .then(async () => {
// await deleteDoc(scope.row.id); await delRs(scope.row.id);
// this.getList(); this.getList();
// this.$message.success("成功"); this.$message.success("成功");
}) })
.catch((err) => { .catch((err) => {
console.error(err); console.error(err);
@ -195,9 +302,23 @@ export default {
const isEdit = this.dialogType === "edit"; const isEdit = this.dialogType === "edit";
if (isEdit) { if (isEdit) {
console.log(this.Content) console.log(this.Content)
updateRs(this.Content.id, this.Content).then((response) => {
if (response.data) {
this.tableData = response.data;
}
this.listLoading = false;
this.dialogVisible = false;
this.getTableList();
});
} else { } else {
createRs(this.Content).then((response) => {
if (response.data) {
this.tableData = response.data;
}
this.listLoading = false;
this.dialogVisible = false;
this.getTableList();
});
} }
} else { } else {
return false; return false;
@ -205,7 +326,7 @@ export default {
}); });
}, },
}, },
}; };
</script> </script>
<style> <style></style>
</style>

25
server/apps/information/migrations/0012_auto_20240402_0939.py Normal file
View File

@ -0,0 +1,25 @@
# Generated by Django 3.2.12 on 2024-04-02 01:39
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('system', '0023_alter_user_first_name'),
('information', '0011_rename_organizational_units_qualityactivities_orgunits'),
]
operations = [
migrations.AlterField(
model_name='qualityactivities',
name='department',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='system.organization', verbose_name='组织单位'),
),
migrations.AlterField(
model_name='qualitycommendation',
name='department',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='system.organization', verbose_name='所属单位'),
),
]

20
server/apps/information/migrations/0013_abilityreview_department.py Normal file
View File

@ -0,0 +1,20 @@
# Generated by Django 3.2.12 on 2024-04-02 02:23
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('system', '0023_alter_user_first_name'),
('information', '0012_auto_20240402_0939'),
]
operations = [
migrations.AddField(
model_name='abilityreview',
name='department',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='system.organization', verbose_name='所属单位'),
),
]

20
server/apps/information/migrations/0014_contact_department.py Normal file
View File

@ -0,0 +1,20 @@
# Generated by Django 3.2.12 on 2024-04-02 06:55
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('system', '0023_alter_user_first_name'),
('information', '0013_abilityreview_department'),
]
operations = [
migrations.AddField(
model_name='contact',
name='department',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='system.organization', verbose_name='组织单位'),
),
]

17
server/apps/information/migrations/0015_remove_contact_department.py Normal file
View File

@ -0,0 +1,17 @@
# Generated by Django 3.2.12 on 2024-04-02 06:59
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('information', '0014_contact_department'),
]
operations = [
migrations.RemoveField(
model_name='contact',
name='department',
),
]

28
server/apps/information/migrations/0016_auto_20240402_1558.py Normal file
View File

@ -0,0 +1,28 @@
# Generated by Django 3.2.12 on 2024-04-02 07:58
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('information', '0015_remove_contact_department'),
]
operations = [
migrations.AlterField(
model_name='contact',
name='email',
field=models.CharField(blank=True, max_length=50, null=True, verbose_name='负责人邮箱'),
),
migrations.AlterField(
model_name='contact',
name='email_quality',
field=models.CharField(blank=True, max_length=50, null=True, verbose_name='质量负责人邮箱'),
),
migrations.AlterField(
model_name='contact',
name='email_technology',
field=models.CharField(blank=True, max_length=50, null=True, verbose_name='技术负责人邮箱'),
),
]

13
server/apps/information/models.py
View File

@ -18,7 +18,7 @@ class AbilityReview(models.Model):
review_date = models.DateField(verbose_name='评审日期', null=True) review_date = models.DateField(verbose_name='评审日期', null=True)
now_count = models.IntegerField(default=0, verbose_name='现有场所数量') now_count = models.IntegerField(default=0, verbose_name='现有场所数量')
add_count = models.IntegerField(default=0, verbose_name='新增场所数量') add_count = models.IntegerField(default=0, verbose_name='新增场所数量')
department = models.ForeignKey(Organization, on_delete=models.PROTECT, null=True, verbose_name='所属单位')
class Meta: class Meta:
verbose_name = '评审情况' verbose_name = '评审情况'
db_table = 'ability_review' db_table = 'ability_review'
@ -32,7 +32,7 @@ class QualityCommendation(models.Model):
awardee_people = models.CharField(max_length=20, verbose_name='获奖人', null=True) awardee_people = models.CharField(max_length=20, verbose_name='获奖人', null=True)
awarded_by = models.CharField(max_length=20, verbose_name='颁奖单位') awarded_by = models.CharField(max_length=20, verbose_name='颁奖单位')
awarded_date = models.DateField(verbose_name='获奖日期', null=True) awarded_date = models.DateField(verbose_name='获奖日期', null=True)
department = models.ForeignKey(Organization, on_delete=models.CASCADE, null=True, verbose_name='所属单位') department = models.ForeignKey(Organization, on_delete=models.PROTECT, null=True, verbose_name='所属单位')
class Meta: class Meta:
verbose_name = '质量表彰' verbose_name = '质量表彰'
@ -49,7 +49,7 @@ class QualityActivities(models.Model):
participations = models.IntegerField(verbose_name='活动参与单位数量', null=True, blank=True) participations = models.IntegerField(verbose_name='活动参与单位数量', null=True, blank=True)
function = models.CharField(max_length=100, verbose_name='活动中发挥的作用', null=True) function = models.CharField(max_length=100, verbose_name='活动中发挥的作用', null=True)
earnings = models.FloatField(verbose_name='活动收益', null=True) earnings = models.FloatField(verbose_name='活动收益', null=True)
department = models.ForeignKey(Organization, on_delete=models.CASCADE, null=True, verbose_name='组织单位') department = models.ForeignKey(Organization, on_delete=models.PROTECT, null=True, verbose_name='组织单位')
class Meta: class Meta:
verbose_name = '质量活动' verbose_name = '质量活动'
@ -61,14 +61,13 @@ class Contact(models.Model):
address = models.CharField(max_length=100, verbose_name='地址') address = models.CharField(max_length=100, verbose_name='地址')
header = models.CharField(max_length=20, verbose_name='负责人') header = models.CharField(max_length=20, verbose_name='负责人')
tel = models.CharField(max_length=20, verbose_name='负责人电话') tel = models.CharField(max_length=20, verbose_name='负责人电话')
email = models.CharField(max_length=50, verbose_name='负责人邮箱', null=True) email = models.CharField(max_length=50, verbose_name='负责人邮箱', null=True, blank=True)
head_technology = models.CharField(max_length=50, verbose_name='技术负责人') head_technology = models.CharField(max_length=50, verbose_name='技术负责人')
tel_technology = models.CharField(max_length=20, verbose_name='技术负责人电话') tel_technology = models.CharField(max_length=20, verbose_name='技术负责人电话')
email_technology = models.CharField(max_length=50, verbose_name='技术负责人邮箱', null=True) email_technology = models.CharField(max_length=50, verbose_name='技术负责人邮箱', null=True, blank=True)
head_quality = models.CharField(max_length=50, verbose_name='质量负责人') head_quality = models.CharField(max_length=50, verbose_name='质量负责人')
tel_quality = models.CharField(max_length=20, verbose_name='质量负责人电话') tel_quality = models.CharField(max_length=20, verbose_name='质量负责人电话')
email_quality = models.CharField(max_length=50, verbose_name='质量负责人邮箱', null=True) email_quality = models.CharField(max_length=50, verbose_name='质量负责人邮箱', null=True, blank=True)
class Meta: class Meta:
verbose_name = '实验室联系方式' verbose_name = '实验室联系方式'
db_table = 'contact' db_table = 'contact'

64
server/apps/information/views.py
View File

@ -7,8 +7,6 @@ from django.conf import settings
from rest_framework.decorators import action from rest_framework.decorators import action
from rest_framework.views import APIView from rest_framework.views import APIView
from rest_framework.viewsets import ModelViewSet from rest_framework.viewsets import ModelViewSet
# from .models import AbilityReview, QualityCommendation, QualityActivities, Contact, ExternalAuditors
# from .serializers import AbilityReviewSerializer, QualityCommendationSerializer, QualityActivitiesSerializer,ContactSerializer, ExternalAuditorsSerializer
from utils.queryset import get_child_queryset2 from utils.queryset import get_child_queryset2
from rest_framework.response import Response from rest_framework.response import Response
from apps.system.permission import has_permission from apps.system.permission import has_permission
@ -22,18 +20,30 @@ from .serializers import *
from datetime import datetime from datetime import datetime
import os import os
class AbilityReviewViewSet( mixins.CreateModelMixin, class AbilityReviewViewSet(ModelViewSet):
mixins.ListModelMixin,
mixins.DestroyModelMixin,
mixins.UpdateModelMixin,
viewsets.GenericViewSet):
queryset = AbilityReview.objects.all() queryset = AbilityReview.objects.all()
serializer_class = AbilityReviewSerializer serializer_class = AbilityReviewSerializer
#自定义查询 # 查询子以及已经本公司的评审情况
def get_queryset(self): @action(detail=False, methods=['get'])
pass def review_info(self, request, *args, **kwargs):
father_dept = request.user.dept
child_dept = get_child_queryset2(father_dept)
query = AbilityReview.objects.filter(department__in=child_dept)
serializer = AbilityReviewSerializer(query, many=True)
data = {'count':len(serializer.data), 'results':serializer.data}
return Response(data, status = status.HTTP_200_OK)
def create(self, request):
if Organization.objects.filter(name=request.data['name']).exists():
department_id = Organization.objects.filter(name=request.data['name']).first().id
request.data['department'] = department_id
serializer = self.get_serializer(data=request.data)
if serializer.is_valid(raise_exception=True):
serializer.save()
return Response(serializer.data, status = status.HTTP_201_CREATED)
else:
raise ParseError("公司名称不存在")
class ImpMixin: class ImpMixin:
def get_queryset(self): def get_queryset(self):
mydept = self.request.user.dept mydept = self.request.user.dept
@ -91,29 +101,27 @@ class ImpMixin:
return Response({'uploaded': 'File uploaded successfully'}, status=status.HTTP_201_CREATED) return Response({'uploaded': 'File uploaded successfully'}, status=status.HTTP_201_CREATED)
class QualityCommendationViewSet(ModelViewSet):
class QualityCommendationViewSet(ImpMixin, ModelViewSet):
queryset = QualityCommendation.objects.all() queryset = QualityCommendation.objects.all()
serializer_class = QualityCommendationSerializer serializer_class = QualityCommendationSerializer
perms_map = {"get": "*", "post": "*", "put": "*", "delete": "*"}
def create(self): def create(self, request, *args, **kwargs):
if Organization.objects.filter(name=self.request.data['awardee_company']).exists(): if Organization.objects.filter(name=request.data['awardee_company']).exists():
department_id = Organization.objects.filter(name=self.request.data['awardee_company']).first().id department_id = Organization.objects.filter(name=request.data['awardee_company']).first().id
self.request.data['department'] = department_id request.data['department'] = department_id
serializer = self.get_serializer(data=self.request.data) serializer = self.get_serializer(data=request.data)
if serializer.is_valid(raise_exception=True): if serializer.is_valid(raise_exception=True):
serializer.save() serializer.save()
return Response(serializer.data, status = status.HTTP_201_CREATED) return Response(serializer.data, status = status.HTTP_201_CREATED)
# 人名存在重复 # 人名存在重复
else: else:
raise ParseError("部门不存在") raise ParseError("获奖单位不存在")
# 导入表格 # # 导入表格
@action(methods=['post'], detail=False) # @action(methods=['post'], detail=False)
@transaction.atomic # @transaction.atomic
def imp(self, request, *args, **kwargs): # def imp(self, request, *args, **kwargs):
return self.gen_imp_view(request, 5, QualityCommendationSerializer, 'qt') # return self.gen_imp_view(request, 5, QualityCommendationSerializer, 'qt')
#构造导入的数据格式 #构造导入的数据格式
def build_qt_data(self, sheet): def build_qt_data(self, sheet):
@ -160,10 +168,10 @@ class QualityActivitiesViewSet(ModelViewSet):
serializer_class = QualityActivitiesSerializer serializer_class = QualityActivitiesSerializer
def create(self, request): def create(self, request):
if Organization.objects.filter(name=self.request.data['orgunits']).exists(): if Organization.objects.filter(name=request.data['orgunits']).exists():
department_id = Organization.objects.filter(name=self.request.data['orgunits']).first().id department_id = Organization.objects.filter(name=request.data['orgunits']).first().id
self.request.data['department'] = department_id request.data['department'] = department_id
serializer = self.get_serializer(data=self.request.data) serializer = self.get_serializer(data=request.data)
if serializer.is_valid(raise_exception=True): if serializer.is_valid(raise_exception=True):
serializer.save() serializer.save()
return Response(serializer.data, status = status.HTTP_201_CREATED) return Response(serializer.data, status = status.HTTP_201_CREATED)