From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 09:54:47 +0800
Subject: [PATCH] conflict
---
src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue b/src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue
index 3248b66..a54d140 100644
--- a/src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue
+++ b/src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue
@@ -87,6 +87,7 @@
});
//打开模态框
const openRFIDDialog = (type: string, value: object) => {
+ state.fileList = [];
state.isShowRFIDDialog = true;
setTimeout(() => {
RFIDFormRef.value.clearValidate();
@@ -98,10 +99,8 @@
rfidName: '',
rfidImage: ''
};
- state.fileList = [];
} else {
state.title = '修改RFID';
- state.fileList = [];
state.RFIDForm = JSON.parse(JSON.stringify(value));
if (state.RFIDForm.rfidImage === null) return;
state.fileList = [{ url: state.RFIDForm.rfidImage }];
--
Gitblit v1.9.2