From 66df6f71812e3a86c470bb71a818f6e6c41e3054 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 05 三月 2025 11:27:13 +0800
Subject: [PATCH] 添加检验项页面接口修改
---
src/views/business/productOrder/index.vue | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/views/business/productOrder/index.vue b/src/views/business/productOrder/index.vue
index f26f4dd..f24e85a 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: {
@@ -334,7 +335,7 @@
tableData: [],
tableLoading: false,
column: [
- { label: '濮旀墭缂栧彿', prop: 'entrustCode' },
+ { label: '濮旀墭缂栧彿', prop: 'entrustCode', width: '160px' },
{ label: '濮旀墭鍗曚綅', prop: 'company' },
{ label: '鏍峰搧鍚嶇О', prop: 'sampleName' },
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
@@ -550,7 +551,7 @@
current: 1
},
tableDataLookColumn: [
- { label: '鏍峰搧缂栧彿', prop: 'sampleCode' },
+ { label: '鏍峰搧缂栧彿', prop: 'sampleCode', width: '160px' },
{ label: '鏍峰搧鍚嶇О', prop: 'sample' },
{ label: '妫�楠岄」鍒嗙被', prop: 'inspectionItemClass' },
{ label: '妫�楠岄」', prop: 'inspectionItem' },
@@ -660,7 +661,7 @@
componentDataDelete: [],
tableLoadingDelete: false,
columnDelete: [
- { label: '鏍峰搧缂栧彿', prop: 'sampleCode' },
+ { label: '鏍峰搧缂栧彿', prop: 'sampleCode', width: '160px' },
{ label: '妫�楠岄」鍒嗙被', prop: 'inspectionItemClass' },
{ label: '妫�楠岄」', prop: 'inspectionItem' },
{ label: '妫�楠岄」瀛愮被', prop: 'inspectionItemSubclass' },
@@ -735,6 +736,9 @@
this.isIndeterminate = true;
}
}
+ },
+ computed: {
+ ...mapGetters(["nickName"]),
},
mounted() {
this.refreshTable()
@@ -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