diff --git a/client/src/api/eaduitors.js b/client/src/api/eaduitors.js index e6f060a..324e7cc 100644 --- a/client/src/api/eaduitors.js +++ b/client/src/api/eaduitors.js @@ -2,7 +2,7 @@ import request from '@/utils/request' -export function getEa(query) { +export function getMyEas(query) { return request({ url: '/info/ea/', method: 'get', @@ -10,13 +10,6 @@ export function getEa(query) { }) } -export function getMyEas(query) { - return request({ - url: '/info/ea/activate_info/', - method: 'get', - params: query - }) -} export function getOneEa(id) { return request({ diff --git a/client/src/api/qa.js b/client/src/api/qa.js index 125f08d..652bff6 100644 --- a/client/src/api/qa.js +++ b/client/src/api/qa.js @@ -2,21 +2,14 @@ import request from '@/utils/request' -export function getRcs(query) { +export function getgetMyRcsRcs(query) { return request({ url: '/info/qa/', method: 'get', params: query }) } - -export function getMyRcs(query) { - return request({ - url: '/info/qa/activate_info/', - method: 'get', - params: query - }) -} + export function getRc(id) { return request({ diff --git a/client/src/api/qc.js b/client/src/api/qc.js index 9a9db2f..15274a3 100644 --- a/client/src/api/qc.js +++ b/client/src/api/qc.js @@ -1,18 +1,8 @@ import request from '@/utils/request' - - - -export function getRcs(query) { - return request({ - url: '/info/qc/', - method: 'get', - params: query - }) - } export function getMyRcs(query) { return request({ - url: '/info/qc/commentdation_info/', + url: '/info/qc/', method: 'get', params: query }) diff --git a/client/src/api/qualificationInfo.js b/client/src/api/qualificationInfo.js new file mode 100644 index 0000000..c9799b3 --- /dev/null +++ b/client/src/api/qualificationInfo.js @@ -0,0 +1,59 @@ +import request from '@/utils/request' + + +export function getMyQi(query) { + return request({ + url: '/info/faq/', + method: 'get', + params: query + }) +} + +export function getQi(id) { + return request({ + url: `/info/faq/${id}/`, + method: 'get' + }) +} + + +export function updateQi(id, data) { + return request({ + url: `/info/faq/${id}/`, + method: 'patch', + data + }) +} + +export function createQi(data) { + return request({ + url: `/info/faq/`, + method: 'post', + data + }) +} + + +export function delQi(id) { + return request({ + url: `/info/faq/${id}/`, + method: 'delete' + }) +} + +export function exportData(data) { + return request({ + url: `/info/faq/filter_by_date/`, + method: 'post', + data + }) +} + + +export function getChangeInfo(query) { + return request({ + url: `/info/faqch/`, + method: 'get', + params: query + }) +} diff --git a/client/src/api/review.js b/client/src/api/review.js index c10ac2c..8e4b551 100644 --- a/client/src/api/review.js +++ b/client/src/api/review.js @@ -2,7 +2,7 @@ import request from '@/utils/request' -export function getRsAll(query) { +export function getMyRs(query) { return request({ url: '/info/ar/', method: 'get', @@ -10,14 +10,8 @@ export function getRsAll(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}/`, diff --git a/client/src/api/task.js b/client/src/api/task.js index 697b760..af4e021 100644 --- a/client/src/api/task.js +++ b/client/src/api/task.js @@ -501,4 +501,45 @@ export function taskAnalyse(data) { method: 'post', data }) +} + +export function delPts(data) { + return request({ + url: '/supervision/pt/bulk_delete/', + method: 'delete', + data + }) +} + +export function delRcs(data) { + return request({ + url: '/supervision/rc/bulk_delete/', + method: 'delete', + data + }) +} + + +export function delRicks(data) { + return request({ + url: '/supervision/risk/bulk_delete/', + method: 'delete', + data + }) +} + +export function delComplaints(data) { + return request({ + url: '/supervision/complaint/bulk_delete/', + method: 'delete', + data + }) +} + +export function delOinspects(data) { + return request({ + url: '/supervision/oinspect/bulk_delete/', + method: 'delete', + data + }) } \ No newline at end of file diff --git a/client/src/router/index.js b/client/src/router/index.js index f520003..244f128 100644 --- a/client/src/router/index.js +++ b/client/src/router/index.js @@ -415,6 +415,18 @@ export const asyncRoutes = [ meta: { title: '信息收集', icon: 'PT', perms: ['infoCollect'] }, alwaysShow: true, children: [ + { + path: 'qualificInfo', + name: 'qualificInfo', + component: () => import('@/views/informatiomCollect/qualificInfo.vue'), + meta: { title: '资质情况', perms: ['infoCollect_QIN'] } + }, + { + path: 'qualiChange', + name: 'qualiChange', + component: () => import('@/views/informatiomCollect/qualiChange.vue'), + meta: { title: '资质变更情况', perms: ['infoCollect_QICH'] } + }, { path: 'reviewStatus', name: 'reviewStatus', diff --git a/client/src/views/informatiomCollect/laboratoryContact.vue b/client/src/views/informatiomCollect/laboratoryContact.vue index b3e3b4a..24adbc1 100644 --- a/client/src/views/informatiomCollect/laboratoryContact.vue +++ b/client/src/views/informatiomCollect/laboratoryContact.vue @@ -46,11 +46,11 @@ --> @@ -141,6 +141,7 @@ export default { tel_quality: "", email_quality: "" }, + currentDept: this.$store.state.user.dept, upHeaders: upHeaders(), upUrl: upUrl(), fileList: [], @@ -247,6 +248,8 @@ export default { this.Content = Object.assign({}, scope.row); // copy obj this.dialogType = "edit"; this.dialogVisible = true; + console.log(this.Content); + console.log(this.currentDept) if (this.Content.file) { this.fileList = [ { diff --git a/client/src/views/informatiomCollect/qualiChange.vue b/client/src/views/informatiomCollect/qualiChange.vue new file mode 100644 index 0000000..a5e9794 --- /dev/null +++ b/client/src/views/informatiomCollect/qualiChange.vue @@ -0,0 +1,86 @@ + + + \ No newline at end of file diff --git a/client/src/views/informatiomCollect/qualificInfo.vue b/client/src/views/informatiomCollect/qualificInfo.vue new file mode 100644 index 0000000..fd68e03 --- /dev/null +++ b/client/src/views/informatiomCollect/qualificInfo.vue @@ -0,0 +1,392 @@ + + + \ No newline at end of file diff --git a/client/src/views/informatiomCollect/reviewStatus.vue b/client/src/views/informatiomCollect/reviewStatus.vue index 4a28202..e41e060 100644 --- a/client/src/views/informatiomCollect/reviewStatus.vue +++ b/client/src/views/informatiomCollect/reviewStatus.vue @@ -7,20 +7,22 @@ - - + - + - + @@ -54,8 +56,17 @@ - - + + @@ -149,12 +160,14 @@ import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import { getDictList, getDictTypeList } from "@/api/dict"; import { createRs, delRs, updateRs, getMyRs, getRs, exportData } from "@/api/review"; +import { getMyQi} from "@/api/qualificationInfo"; import { upUrl, upHeaders } from "@/api/file"; import { saveAs } from 'file-saver'; import XLSX from 'xlsx'; const defaultContent = { name: "", qualification_name: "", + quali:"", judging_method: "", judging_type: "", add_param: "", @@ -175,9 +188,24 @@ export default { add_param: "", review_date: "", now_count: "", - add_count: "" + add_count: "", + quali:"" }, method_options: [{value: 0,label: '文审'},{value: 10,label: '现场'}], + cateOptions: { + 0:'文审', + 10:'现场' + }, + typesOp: { + 0:'初次', + 10:'扩项', + 20:'变更', + 30:'复评', + 40:'迁址' + }, + selectedValue: '', + options: [], + isoading: false, //是否正在加载数据 type_options: [{ value: 0, label: '初次'}, @@ -253,12 +281,10 @@ export default { this.Content.file = null; }, checkPermission, - filterNode(value, data) { if (!value) return true; return data.label.indexOf(value) !== -1; }, - getList() { this.listLoading = true; this.tableData.results =[]; @@ -380,6 +406,32 @@ export default { } }); }, + async handleVisibleChange(val) { + if (val) { + // 当下拉框变为可见时，调用接口获取数据 + if (!this.isLoading) { + this.isLoading = true; // 设置加载状态，防止重复请求 + try { + const response = await this.fetchOptions(); + console.log(response,"ceshi"); + + } catch (error) { + // 处理错误 + console.error(error); + } finally { + this.isLoading = false; // 无论成功还是失败，都重置加载状态 + } + } + } + }, + fetchOptions() { + getMyQi().then((response) => { + console.log(response); + if (response.data) { + this.options = response.data.results; + } + }); + } }, }; diff --git a/client/src/views/supervisionNew/mytask.vue b/client/src/views/supervisionNew/mytask.vue index c58f4e3..de155f1 100644 --- a/client/src/views/supervisionNew/mytask.vue +++ b/client/src/views/supervisionNew/mytask.vue @@ -244,6 +244,7 @@ 导入 导出 + 批量删除 + row-key="id" + @selection-change="handleSelectionChange"> + - - + 导入 导出 + 批量删除 + @@ -389,6 +375,7 @@ 导入 导出 + 批量删除 + @@ -439,6 +429,7 @@ id="rc2" style="display: none;" > + @@ -464,6 +455,7 @@ 导入 导出 + 批量删除 + @@ -576,6 +571,7 @@ 导入 导出 + 批量删除 + @@ -624,6 +622,7 @@ id="complaint" style="display: none;" > + @@ -655,6 +654,7 @@ 导入 导出 + 批量删除 + @@ -775,7 +777,7 @@ import { getMyTask2Do,getPgoalDeptList,createPgoalDept,updatePgoalDept,noNum, deletePgoalDept,saveNum,getPtList,deletePt,getRcList,deleteRc,getRiskList, deleteRisk,getComplaintList,deleteComplaint,getOinspectList,deleteOinspect, - impPt,impRc,impOverdue,impRisk,impComplaint,impOinspect,getPgoalList} from "@/api/task"; + impPt,impRc,impOverdue,impRisk,impComplaint,impOinspect,getPgoalList, delPts,delOinspects, delComplaints, delRcs, delRicks} from "@/api/task"; import { getOrgList, getSubOrgList } from "@/api/org"; import checkPermission from "@/utils/permission"; import Pagination from "@/components/Pagination"; @@ -808,6 +810,7 @@ orgData:[], subData:[], fileList:[], + sels:[], task2do:'', taskYear:'', deptName:'', @@ -927,6 +930,53 @@ return wbout }, checkPermission, + handleSelectionChange(sels) { + this.sels = sels; + console.log("选中的值",sels.map((item) => item.id)); + }, + batchDelete(type) { + if (this.sels.length === 0) { + this.$message({ + message: '请选择要删除的项', + type: 'warning' + }); + return; + }else{ + // 删除前的提示 + this.$confirm("确认删除记录吗?", "提示", { + type: "warning", + }).then(() => { + let ids = this.sels.map((item) => item.id); + console.log("ids",ids); + this.deleteItems(type, ids); + this.getList()}); + } + }, + deleteItems(type, ids){ + let item = {ids:ids} + if(type=='rc'){ + delRcs(item).then(res=>{ + this.getRcList(); + }) + }else if(type=='pt'){ + console.log("删除的值",item); + delPts(item).then(res=>{ + this.getPtList(); + }) + }else if(type=='risk'){ + delRicks(item).then(res=>{ + this.getRiskList(); + }) + }else if(type=='complaint'){ + delComplaints(item).then(res=>{ + this.getComplaintList(); + }) + }else if(type=='oinspect'){ + delOinspects(item).then(res=>{ + this.getOinspectList(); + }) + } + }, getOrgList() { let that = this; if (that.checkPermission(["record_confirm"])) { diff --git a/client/src/views/supervisionNew/oinspect_form.vue b/client/src/views/supervisionNew/oinspect_form.vue index 73054bf..f4b98c3 100644 --- a/client/src/views/supervisionNew/oinspect_form.vue +++ b/client/src/views/supervisionNew/oinspect_form.vue @@ -65,10 +65,6 @@ accept=".doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip"> 上传文件 -
- 取消 - 确认 -