From f6082c04ca8c98c1f130d88585d8e7cf67175279 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 05 三月 2025 17:41:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/business/productOrder/index.vue | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/views/business/productOrder/index.vue b/src/views/business/productOrder/index.vue
index f7e3f8c..61af313 100644
--- a/src/views/business/productOrder/index.vue
+++ b/src/views/business/productOrder/index.vue
@@ -316,6 +316,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 +737,9 @@
}
}
},
+ computed: {
+ ...mapGetters(["nickName"]),
+ },
mounted() {
this.refreshTable()
this.getAuthorizedPerson()
@@ -869,8 +873,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);
})
@@ -1183,15 +1187,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