From 1ea1ad2c56e95e71e1756cfca73e7183f9795ac9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 16 四月 2025 15:23:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_test
---
src/views/business/reportPreparation/index.vue | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index 61584a6..db8311e 100644
--- a/src/views/business/reportPreparation/index.vue
+++ b/src/views/business/reportPreparation/index.vue
@@ -22,11 +22,13 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button size="mini" @click="refresh()">閲嶇疆</el-button>
<el-button size="mini" type="primary" @click="refreshTable()">鏌ヨ</el-button>
- <el-button :loading="outLoading" size="mini" type="primary" @click="handleDowns">鎵归噺涓嬭浇</el-button>
+ <el-button size="mini" @click="refresh()">閲嶇疆</el-button>
</el-form-item>
</el-form>
+ </div>
+ <div style="text-align: right;margin-bottom: 10px">
+ <el-button :loading="outLoading" size="mini" type="primary" @click="handleDowns">鎵归噺涓嬭浇</el-button>
</div>
<div>
<lims-table :tableData="valueTableData" :column="column" :page="page" :tableLoading="tableLoading"
@@ -662,7 +664,7 @@
case 0:
// 鍘熸潗鏂�
this.$router.push({
- path: "/materialOrder/customsInspection", query: {
+ path: "/materialOrder/customsInspectionView", query: {
customsInspection: row,
active: this.activeFace,
currentId: row.insOrderId,
@@ -673,7 +675,7 @@
case null:
// 鎴愬搧
this.$router.push({
- path: "/productOrder/add", query: {
+ path: "/productOrder/addView", query: {
examine: this.examine,
active: this.activeFace,
currentId: row.insOrderId
@@ -683,7 +685,7 @@
case 1:
// 閾滄潗
this.$router.push({
- path: "/materialOrder/copperOrder", query: {
+ path: "/materialOrder/CopperView", query: {
active: this.activeFace,
currentId: row.insOrderId
}
--
Gitblit v1.9.3