From fcadf16afa65a8a5ca53a33c4b8f4bf2efe2ea03 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 16 九月 2026 09:21:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_新聚' into dev_新疆_新聚
---
src/views/CNAS/resourceDemand/device/component/files.vue | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/files.vue b/src/views/CNAS/resourceDemand/device/component/files.vue
index 3a96e5a..415275d 100644
--- a/src/views/CNAS/resourceDemand/device/component/files.vue
+++ b/src/views/CNAS/resourceDemand/device/component/files.vue
@@ -426,7 +426,7 @@
<div class="device-footer">
<div>
<vueQr class="qr-code"
- :text="'https://zttx-lims.ztt.cn:8021/lims/qr/qrScan?code=' + Mdata.managementNumber + '&type=device'"
+ :text="javaApi + '/qr/qrScan?code=' + Mdata.managementNumber + '&type=device'"
:size="200" :margin="10"></vueQr>
</div>
<div class="device-number">
@@ -491,9 +491,6 @@
rules1: {
deviceName: [
{ required: true, message: '璇疯緭鍏ヤ华鍣ㄥ悕绉�', trigger: 'blur' },
- ],
- enDeviceName: [
- { required: true, message: '璇疯緭鍏ヤ华鍣ㄥ悕绉癊N', trigger: 'blur' },
],
specificationModel: [
{ required: true, message: '璇疯緭鍏ヨ鏍煎瀷鍙�', trigger: 'blur' },
--
Gitblit v1.9.3