From 573265f7d79341298ba4287be38f00ddbc66e7ec Mon Sep 17 00:00:00 2001 From: gaoluyang <2820782392@qq.com> Date: 星期五, 07 三月 2025 12:00:51 +0800 Subject: [PATCH] 标准查新bug --- src/views/business/productOrder/index.vue | 63 +++++++++++++++---------------- 1 files changed, 30 insertions(+), 33 deletions(-) diff --git a/src/views/business/productOrder/index.vue b/src/views/business/productOrder/index.vue index f7e3f8c..0d97704 100644 --- a/src/views/business/productOrder/index.vue +++ b/src/views/business/productOrder/index.vue @@ -46,8 +46,13 @@ <div class="table-tab"> <div> <ul class="tab"> - <li v-for="(m, i) in tabList" :key="i + 'afgh'" :class="{ active: i == tabIndex }" @click="handleTab(m, i)">{{ m.label }} - </li> + <li :class="{ active: tabIndex === 0 }" v-if="checkPermi(['get:insOrder:reviewed'])" @click="handleTab(0)">寰呭鏍�</li> + <li :class="{ active: tabIndex === 1 }" v-if="checkPermi(['get:insOrder:checkout'])" @click="handleTab(1)">妫�楠屼腑</li> + <li :class="{ active: tabIndex === 2 }" v-if="checkPermi(['get:insOrder:customerOrdered'])" @click="handleTab(2)">濮旀墭宸叉</li> + <li :class="{ active: tabIndex === 3 }" v-if="checkPermi(['get:insOrder:spotCheck'])" @click="handleTab(3)">鎶芥牱宸叉</li> + <li :class="{ active: tabIndex === 4 }" v-if="checkPermi(['get:insOrder:sendBack'])" @click="handleTab(4)">閫�鍥�</li> + <li :class="{ active: tabIndex === 5 }" v-if="checkPermi(['get:insOrder:revocation'])" @click="handleTab(5)">鎾ら攢</li> + <li :class="{ active: tabIndex === 6 }" v-if="checkPermi(['get:insOrder:all'])" @click="handleTab(6)">鍏ㄩ儴</li> </ul> </div> <div> @@ -55,7 +60,7 @@ @click="downLoad">瀵煎嚭</el-button> <el-button v-if="tabIndex === 1" size="small" type="primary" @click="openAddIns">娣诲姞妫�楠岄」</el-button> <el-button size="small" type="primary" @click="openPrint">鏍囩鎵撳嵃</el-button> - <el-button size="small" type="primary" @click="playOrder(1)">涓嬪崟</el-button> + <el-button v-if="checkPermi(['add:insOrder'])" size="small" type="primary" @click="playOrder(1)">涓嬪崟</el-button> </div> </div> <div class="table"> @@ -168,8 +173,7 @@ <span slot="footer" class="dialog-footer"> <el-row> <el-button @click="handleNo">{{ deleteTilte == '鎾ら攢' ? '鍙� 娑�' : '涓嶉�氳繃' }}</el-button> - <el-button :loading="printLoading" type="primary" @click="submitDelete">{{ deleteTilte == '鎾ら攢' ? '纭� 瀹�' : '閫� - 杩�'}}</el-button> + <el-button :loading="printLoading" type="primary" @click="submitDelete">{{ deleteTilte == '鎾ら攢' ? '纭� 瀹�' : '閫氳繃'}}</el-button> </el-row> </span> </el-dialog> @@ -316,6 +320,7 @@ } from "@/api/business/productOrder"; import { selectUserCondition } from "@/api/performance/class"; import { downFile, getFileList, selectSampleAndProductByOrderId } from "@/api/business/rawMaterialOrder"; +import {mapGetters} from "vuex"; // import Inspection from "../do/b1-inspect-order-plan/Inspection.vue"; export default { components: { @@ -736,6 +741,9 @@ } } }, + computed: { + ...mapGetters(["nickName"]), + }, mounted() { this.refreshTable() this.getAuthorizedPerson() @@ -869,8 +877,8 @@ // 瀵煎嚭璁板綍 downLoad() { rawAllInsOrderExport({ ...this.entity }).then(res => { - let url = this.javaApi + '/word/' + res.data - this.$download.saveAs(url, '濮旀墭妫�娴嬩俊鎭鍑�.xlsx'); + const blob = new Blob([res], { type: 'application/octet-stream' }); + this.$download.saveAs(blob, '濮旀墭妫�娴嬩俊鎭鍑�.xlsx'); }).catch(err => { console.log('err---', err); }) @@ -978,25 +986,16 @@ downFile({ id: row.id, }).then(res => { - if (res.code === 200) { - let url = ''; - if (res.data.type == 1) { - url = this.javaApi + '/img/' + res.data.fileUrl - this.$download.saveAs(url, row.fileName); - } else { - url = this.javaApi + '/word/' + res.data.fileUrl - this.$download.saveAs(url, row.fileName); - } - } + this.$download.downloadFileFromUrl(res.data.fileUrl, row.fileName); }).catch(error => { }) }, // 涓嬭浇鎶ュ憡 download(row) { - let url = this.javaApi + '/word/' + row.urlS ? row.urlS : row.url; + let url = row.urlS ? row.urlS : row.url; if (url) { - this.$download.saveAs(url, this.downLoadInfo.fileName); + this.$download.downloadFileFromUrl(url, this.downLoadInfo.fileName); } }, // 鎾ら攢 @@ -1123,10 +1122,6 @@ userId: this.distributeData.userId, sonLaboratory: this.distributeData.sonLaboratory, }).then(res => { - if (res.code === 201) { - this.upLoad = false - return - } this.$message.success('淇敼鎴愬姛') this.upLoad = false this.issuedDialogVisible = false @@ -1172,7 +1167,7 @@ handleVerify(row) { this.$router.push({ path: "/productOrder/add", query: { examine: 1, active: 3, currentId: row.id } }); }, - handleTab(m, i) { + handleTab(i) { this.tabIndex = i; this.refreshTable() }, @@ -1183,15 +1178,17 @@ if (row.userName) { inspectorList = row.userName.split(',') } - let user = JSON.parse(localStorage.getItem('user')) - if (user) { - inspectorList.push(user.name) - } - this.inspectorList = inspectorList - this.sonLaboratory = row.sonLaboratory - this.state = 3; - this.typeSource = row.typeSource - this.orderId = row.id + inspectorList.push(this.nickName) + this.$router.push({ + path: "/inspectionTask/inspection", + query: { + sonLaboratory: row.sonLaboratory, + state: 3, + typeSource: row.typeSource, + orderId: row.id, + inspectorList: inspectorList, + }, + }) }, goback() { this.state = 0 -- Gitblit v1.9.3