From d6e3826610b518a97c3622c61ffa4cafc3f0cd36 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 21 二月 2025 16:08:58 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/business/materialOrder/index.vue | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index 45c4936..45fa7dc 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -273,10 +273,22 @@
tableLoading1: false,
column1: [
{ label: '鎵瑰彿', prop: 'updateBatchNo' },
- { label: '濮旀墭缂栧彿', prop: 'entrustCode' },
+ {
+ label: '濮旀墭缂栧彿',
+ prop: 'entrustCode',
+ width: "160px",
+ dataType: "link",
+ linkMethod: "changeEntrustCode",
+ },
{ label: '闆朵欢鍙�', prop: 'partNo' },
{ label: '闆朵欢鎻忚堪', prop: 'partDesc' },
- { label: '鏍峰搧鍚嶇О', prop: 'sampleName' },
+ {
+ label: '鏍峰搧鍚嶇О',
+ prop: 'sampleName',
+ width: "160px",
+ dataType: "link",
+ linkMethod: "selectAllByOne",
+ },
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
{ label: '妫�楠屼汉', prop: 'userName' },
{ label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
@@ -898,10 +910,16 @@
},
// 瀛ｅ害妫�楠屼笅鍗�
playOrderSec(row) {
- if (typeof row !== "object") {
- this.$router.push({ path: "/materialOrder/customsInspection", query: { active: row } });
+ this.$router.push({ path: "/materialOrder/customsInspection", query: { orderType: 1, customsInspection: row, active: 1 } });
+ },
+ // 鐐瑰嚮鏍峰搧鍚嶇О鏌ョ湅璇︽儏
+ selectAllByOne(row) {
+ if (row.isCopper == 1) {
+ this.currentId = row.enterOrderId
+ this.$router.push({ path: "/materialOrder/copperOrder", query: { customsInspection: row, active: 2, currentId: this.currentId } });
} else {
- this.$router.push({ path: "/materialOrder/customsInspection", query: { orderType: 1, customsInspection: row, active: 1 } });
+ this.currentId = row.insOrderId
+ this.$router.push({ path: "/materialOrder/customsInspection", query: { customsInspection: row, active: 2, currentId: this.currentId } });
}
},
// 鎵撳紑鍏嶆寮规
@@ -1007,15 +1025,6 @@
}).catch(() => { })
}
},
- // 鐐瑰嚮鏍峰搧鍚嶇О鏌ョ湅璇︽儏
- selectAllByOne(row) {
- this.currentId = row.insOrderId
- if (row.isCopper == 1) {
- this.currentId = row.enterOrderId
- }
- this.customsInspection = row
- this.active = 2;
- },
// 鏁版嵁鏌ョ湅
handleDataLook(row) {
this.dataLookInfo = row
@@ -1085,6 +1094,7 @@
this.entrustCodeVisible = false
this.$message.success('淇敼鎴愬姛')
}
+ this.refreshTable()
this.submitCodeLoading = false
})
} catch (e) {
--
Gitblit v1.9.3