From ff6d23c5d61d1c6bee47e5863b57a915d98f7be1 Mon Sep 17 00:00:00 2001 From: gaoluyang <2820782392@qq.com> Date: 星期五, 18 四月 2025 09:47:06 +0800 Subject: [PATCH] 1.设备使用授权页面开发、联调 --- src/views/business/materialOrder/index.vue | 72 ++++++++++++++++++++++++------------ 1 files changed, 48 insertions(+), 24 deletions(-) diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue index 7cb87e6..9c2ac08 100644 --- a/src/views/business/materialOrder/index.vue +++ b/src/views/business/materialOrder/index.vue @@ -67,7 +67,7 @@ </ul> </div> <div> - <el-button v-show="tabIndex === 3 || tabIndex === 2" :loading="outLoading" size="small" type="primary" + <el-button v-show="tabIndex === 3" :loading="outLoading" size="small" type="primary" @click="handleOut">瀵煎嚭</el-button> <el-button v-if="tabIndex === 0" size="small" type="primary" @click="copper">閾滄潗鏂欎笅鍗�</el-button> <el-button v-if="tabIndex !== 0" size="small" type="primary" @click="openPrint">鏍囩鎵撳嵃</el-button> @@ -1108,31 +1108,57 @@ let inspectorList = [] inspectorList.push(this.nickName) this.InspectInfoDialog = false - this.$router.push({ - name: "Inspection", - query: { - sonLaboratory: '鍘熸潗鏂�', - state: 3, - typeSource: this.insInfo.typeSource, - orderId: this.insInfo.enterOrderId, - inspectorList: inspectorList, - }, - }) + if (this.checkPermi(['business:inspectionView'])) { + this.$router.push({ + name: "InspectionView", + query: { + sonLaboratory: '鍘熸潗鏂�', + state: 3, + typeSource: this.insInfo.typeSource, + orderId: this.insInfo.enterOrderId, + inspectorList: inspectorList, + }, + }) + } else { + this.$router.push({ + path: "/inspectionTask/inspection", + query: { + sonLaboratory: '鍘熸潗鏂�', + state: 3, + typeSource: this.insInfo.typeSource, + orderId: this.insInfo.enterOrderId, + inspectorList: inspectorList, + }, + }) + } }, viewInsInfo1() { let inspectorList = [] inspectorList.push(this.nickName) this.InspectInfoDialog = false - this.$router.push({ - name: "Inspection", - query: { - sonLaboratory: '鍘熸潗鏂�', - state: 3, - typeSource: this.insInfo.typeSource, - orderId: this.insInfo.quarterOrderId, - inspectorList: inspectorList, - }, - }) + if (this.checkPermi(['business:inspectionView'])) { + this.$router.push({ + name: "InspectionView", + query: { + sonLaboratory: '鍘熸潗鏂�', + state: 3, + typeSource: this.insInfo.typeSource, + orderId: this.insInfo.quarterOrderId, + inspectorList: inspectorList, + }, + }) + } else { + this.$router.push({ + path: "/inspectionTask/inspection", + query: { + sonLaboratory: '鍘熸潗鏂�', + state: 3, + typeSource: this.insInfo.typeSource, + orderId: this.insInfo.quarterOrderId, + inspectorList: inspectorList, + }, + }) + } }, goback() { this.state = 0 @@ -1324,10 +1350,8 @@ }, // 瀵煎嚭 handleOut() { - let entity = this.tabIndex === 3 ? { ...this.entity, isInspect: 2 } : { ...this.entity, state: 2, orderState: 4, } - delete entity.orderBy this.outLoading = true - rawAllExport({ entity: entity }).then(res => { + rawAllExport({ ...this.entity }).then(res => { this.outLoading = false const blob = new Blob([res], { type: 'application/octet-stream' }); this.$download.saveAs(blob, '鍘熸潗鏂欐娴嬩俊鎭鍑�.xlsx'); -- Gitblit v1.9.3