From 6791f7427cd364bb621b24cb033d315edcfad40e Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期二, 10 九月 2024 08:18:37 +0800
Subject: [PATCH] 解决冲突
---
Web/src/views/device/sortPallet/index.vue | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/Web/src/views/device/sortPallet/index.vue b/Web/src/views/device/sortPallet/index.vue
index 1612713..9e7f4ad 100644
--- a/Web/src/views/device/sortPallet/index.vue
+++ b/Web/src/views/device/sortPallet/index.vue
@@ -39,6 +39,9 @@
<el-form-item label="鐗╂枡鍚嶇О">
<el-input v-model="deviceInfo.skuName" readonly></el-input>
</el-form-item>
+ <el-form-item label="鍒嗘嫞绾跨紪鍙�">
+ <el-input v-model="deviceInfo.lineNO" readonly></el-input>
+ </el-form-item>
<el-form-item label="缁戝畾鐘舵��">
<el-input :value="deviceInfo.status === '0' ? '鏈粦瀹�' : '宸茬粦瀹�'" readonly></el-input>
</el-form-item>
@@ -59,7 +62,7 @@
</el-form-item>
</el-form>
</div>
- <div class="otherButtonfix">
+ <div v-if="!deviceInfo.text.includes('鎷嗗灈')" class="otherButtonfix">
<el-form label-position="left">
<el-form-item>
<el-button type="primary" @click="openBindDialog(deviceInfo.id)">缁戝畾</el-button>
@@ -274,5 +277,8 @@
justify-content: flex-end;
margin-top: 20px;
}
+ .divDisplay{
+ display:none
+ }
</style>
\ No newline at end of file
--
Gitblit v1.8.0