From c146c0ae4e57b26e798157fe453426e9fc26db34 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 09 八月 2024 09:04:47 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b1-inspection-order.vue | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 442b29e..9dc3b69 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -339,7 +339,7 @@
</el-dialog>
</div>
<div style="width: 100%;height: 100%;" v-if="active >0">
- <Add :active="active" :currentId="currentId" v-if="active<4" />
+ <Add :active="active" :currentId="currentId" v-if="active<4" :examine = "examine" />
</div>
<el-dialog title="鏍囩鎵撳嵃" :visible.sync="printDialogVisible" width="40%" top="5vh">
<div style="width:100%;height: 400px;overflow-y: auto;" v-loading="loadPint">
@@ -460,6 +460,7 @@
data() {
return {
deleteTilte:'鎾ら攢',
+ examine: null,
deleteList:[],
loadPint:false,
checkAll: false,
@@ -951,6 +952,7 @@
// this.verifyDialogVisible = true;
this.active = 3;
this.currentId = row.id
+ this.examine = 1
},
// 鎾ら攢
handlEquash(row) {
@@ -1111,6 +1113,7 @@
// 涓嬪崟
playOrder(num) {
this.active = num
+ this.examine = 0
this.refreshTable('page')
},
handleTab(m, i) {
--
Gitblit v1.9.3