From f742459dd6e2cabf93260c641561da28aad054a0 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 21 May 2024 10:29:06 +0800
Subject: [PATCH] 1

---
 src/views/data/supplier/audit/detail.vue  | 1 +
 src/views/data/supplier/supplier/edit.vue | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/views/data/supplier/audit/detail.vue b/src/views/data/supplier/audit/detail.vue
index 67498b4..48b4d99 100644
--- a/src/views/data/supplier/audit/detail.vue
+++ b/src/views/data/supplier/audit/detail.vue
@@ -53,6 +53,7 @@
         </el-form-item>
       </el-form>
       <div style="width: 100%; display: flex; justify-content: flex-end;">
+        <el-button @click="handleClose">取消</el-button>
         <el-button @click="onAudit" type="primary">确认</el-button>
       </div>
     </popup>
diff --git a/src/views/data/supplier/supplier/edit.vue b/src/views/data/supplier/supplier/edit.vue
index c4a4e26..0eb69b5 100644
--- a/src/views/data/supplier/supplier/edit.vue
+++ b/src/views/data/supplier/supplier/edit.vue
@@ -237,6 +237,7 @@ const formData = reactive({
     financial_type: '',
     sys_labels_arr: []
 })
+const dataJSON = ref({})
 
 const customEvent = (e) => {
     e.forEach(item => {
@@ -310,6 +311,8 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
+    dataJSON.value = JSON.parse(data.data_json||'{}');
+    if(!formData.mer_address) formData.mer_address = dataJSON.value.company_address;
     await getAreaList(formData.city_id, true)
     await getTownList(formData.area_id, true)
     getVilllageList(formData.street_id)