From 4f94a66bc8ad9a57295f161de9195d5528b1d181 Mon Sep 17 00:00:00 2001 From: spring <2396852758@qq.com> Date: 星期二, 08 四月 2025 11:55:16 +0800 Subject: [PATCH] 基础数据维护+原辅材下单修改 --- src/views/business/inspectionReview/index.vue | 116 +++++++++++++++++++++++++++++++++------------------------ 1 files changed, 67 insertions(+), 49 deletions(-) diff --git a/src/views/business/inspectionReview/index.vue b/src/views/business/inspectionReview/index.vue index 6d48595..a3d259d 100644 --- a/src/views/business/inspectionReview/index.vue +++ b/src/views/business/inspectionReview/index.vue @@ -12,8 +12,8 @@ </el-select> </el-form-item> <el-form-item> - <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button> - <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button> + <el-button type="primary" size="mini" @click="refreshTable">鏌ヨ</el-button> + <el-button size="mini" @click="refresh">閲嶇疆</el-button> </el-form-item> </el-form> <div class="page_total"> @@ -47,7 +47,6 @@ <script> import { getYearAndMonthAndDays } from "@/utils/date"; -// import ShowInfo from "../do/b1-material-ins-order/showInfo.vue"; import onlyoffice from "@/components/Onlyoffice/onlyoffice.vue"; import limsTable from "@/components/Table/lims-table.vue"; import { selectInsOrderPlanList, selectUserCondition } from "@/api/business/inspectionTask"; @@ -56,11 +55,11 @@ import filePreview from "@/components/Preview/filePreview.vue"; export default { + name: 'InspectionReview', components: { filePreview, onlyoffice, limsTable, - // ShowInfo, }, dicts: ["urgency_level", "inspection_task_state"], computed: { @@ -99,7 +98,7 @@ if (params == 0) { return "鎴愬搧涓嬪崟"; } else { - return "鍘熸潗鏂欎笅鍗�"; + return "鍘熻緟鏉愪笅鍗�"; } }, }, @@ -109,7 +108,18 @@ prop: "type", dataType: "tag", formatData: (params) => { - return this.urgencyLevel.find((m) => m.value == params).label; + if (this.urgencyLevel.find((m) => m.value == params)) { + return this.urgencyLevel.find((m) => m.value == params).label; + } else { + return null + } + }, + formatType: (params) => { + if (this.urgencyLevel.find((m) => m.value == params)) { + return this.urgencyLevel.find((m) => m.value == params).type; + } else { + return null + } }, }, { @@ -129,11 +139,18 @@ prop: "insState", dataType: "tag", formatData: (params) => { - return this.inspectionTaskState.find((m) => m.value == params) - .label; + if (this.inspectionTaskState.find((m) => m.value == params)) { + return this.inspectionTaskState.find((m) => m.value == params).label; + } else { + return null + } }, formatType: (params) => { - return this.inspectionTaskState.find((m) => m.value == params).type; + if (this.inspectionTaskState.find((m) => m.value == params)) { + return this.inspectionTaskState.find((m) => m.value == params).type; + } else { + return null + } }, }, { label: "妫�楠屼汉", prop: "userName" }, @@ -154,7 +171,7 @@ this.handleReview(row); }, disabled: (row) => { - return row.userName == null || row.userName && !row.userName.includes(this.nickName) + return row.checkName == null || (row.checkName && !row.checkName.includes(this.nickName)) } }, { @@ -220,20 +237,20 @@ sonLaboratoryList: [], typeSourceList: [ { label: '鎴愬搧涓嬪崟', value: 0 }, - { label: '鍘熸潗鏂欎笅鍗�', value: 1 }, + { label: '鍘熻緟鏉愪笅鍗�', value: 1 }, ], isCopper: null, customsInspection: {}, - typeSource: null,// 0:鎴愬搧涓嬪崟锛�1锛氬師鏉愭枡涓嬪崟 + typeSource: null,// 0:鎴愬搧涓嬪崟锛�1锛氬師杈呮潗涓嬪崟 showInfoDialog: false, // 浜т笟閾句俊鎭煡鐪� issuedVisible: false, fullscreen: false, option: null, orderTypeList: [ - { label: '濮旀墭璇曢獙', value: 'Customer-ordered test' }, - { label: '鎶芥', value: '鎶芥' }, - { label: '杩涘巶妫�楠�', value: '杩涘巶妫�楠�' }, - { label: '瀛e害妫�楠�', value: 'Quarterly inspection' }, + { label: '濮旀墭璇曢獙', value: 'Customer-ordered test', type: 'success' }, + { label: '鎶芥', value: '鎶芥', type: 'danger' }, + { label: '杩涘巶妫�楠�', value: '杩涘巶妫�楠�', type: 'info' }, + { label: '鍙潬鎬ф楠�', value: 'Quarterly inspection', type: '' }, ], urgencyLevel: [], inspectionTaskState: [], @@ -250,6 +267,9 @@ this.currentTime = getYearAndMonthAndDays() }, mounted() { + this.refreshTable() + }, + activated() { this.refreshTable() }, methods: { @@ -284,13 +304,6 @@ } return ""; }, - // 鏌ョ湅浜т笟閾句俊鎭� - // openInfoDialog (row) { - // this.showInfoDialog = true - // this.$nextTick(() => { - // this.$refs.showInfoDialog.getInfo(row.ifsInventoryId) - // }) - // }, selectAllByOne(row) { this.isCopper = row.isCopper this.customsInspection = row @@ -300,7 +313,7 @@ this.currentId = parseInt(row.id) switch (row.isCopper) { case 0: - // 鍘熸潗鏂� + // 鍘熻緟鏉� this.$router.push({ path: "/materialOrder/customsInspection", query: { customsInspection: row, @@ -345,7 +358,7 @@ }, // 涓嬭浇鎶ュ憡 download(row) { - let url = (row.urlS===null||row.urlS==='')?row.url:row.urlS + let url = (row.urlS === null || row.urlS === '') ? row.url : row.urlS const link = document.createElement('a'); link.href = this.javaApi + url; link.target = '_blank'; @@ -370,30 +383,28 @@ }, // 鏌ョ湅鎶ュ憡 handleIssued(row) { - if (!row.tempUrlPdf) return this.$message.warning('鏂囦欢鏈笂浼�') - this.currentInfo = row - this.lookDialogVisible = true - // this.currentInfo = row; - // let fileName = row.url - // let fileType = "docx" - // if (row.tempUrlPdf != null || row.tempUrlPdf === '') { - // fileName = row.tempUrlPdf - // fileType = "pdf" - // } - // fileName = fileName.replace('/word/','') - // const userName = this.nickName - // this.option = { - // url: this.javaApi + "/word/" + fileName, - // isEdit: false, - // fileType: fileType, - // title: fileName, - // lang: 'zh-CN', - // isPrint: false, - // user_id: 1, - // user_name: userName, - // editUrl: this.javaApi + "/insReport/onlyOffice/save?fileName=" + fileName - // } - // this.issuedVisible = true; + // todo: 鏌ョ湅鎶ュ憡缁勪欢 + this.currentInfo = row; + let fileName = row.url + let fileType = "docx" + if (row.tempUrlPdf != null || row.tempUrlPdf === '') { + fileName = row.tempUrlPdf + fileType = "pdf" + } + fileName = fileName.replace('/word/', '') + const userName = this.nickName + this.option = { + url: this.javaApi + "/word/" + fileName, + isEdit: false, + fileType: fileType, + title: fileName, + lang: 'zh-CN', + isPrint: false, + user_id: 1, + user_name: userName, + editUrl: this.javaApi + "/insReport/onlyOffice/save?fileName=" + fileName + } + this.issuedVisible = true; }, getAuthorizedPerson() { selectUserCondition({ type: 1 }).then((res) => { @@ -413,5 +424,12 @@ <style scoped> .page_total { margin-bottom: 10px; + display: flex; +} + +.page_total span:last-child { + color: #3a7bfa; + font-size: 23px; + font-weight: 400; } </style> -- Gitblit v1.9.3