From 40255a6846152b2d54f4de9a2256c7066ef10d30 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 18 May 2024 16:28:55 +0800
Subject: [PATCH] 1

---
 src/views/data/supplier/audit/detail.vue   | 9 ++++++---
 src/views/data/supplier/audit/index.vue    | 7 +++----
 src/views/data/supplier/supplier/index.vue | 6 +++++-
 src/views/goods/goods/index.vue            | 6 +++++-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/views/data/supplier/audit/detail.vue b/src/views/data/supplier/audit/detail.vue
index d0592fb..4b003e0 100644
--- a/src/views/data/supplier/audit/detail.vue
+++ b/src/views/data/supplier/audit/detail.vue
@@ -138,6 +138,7 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
   id: "",
+  pid: "",
   category_id: "",
   type_id: "",
   mer_name: "",
@@ -169,6 +170,7 @@ const formData = reactive({
   financial_wechat: "",
   financial_alipay: "",
   financial_type: "",
+  supplier: {}
 });
 
 // 表单验证
@@ -200,13 +202,14 @@ const auditInfo = reactive({
 const onAudit = () => {
   if(auditInfo.status == 0 && auditInfo.mark == '') return ElMessage.error('请输入拒绝原因');
   apiSupplierStatus({
-    id: formData.id,
+    id: formData.pid,
     status: auditInfo.status,
-    apply_id: formData.id,
-    service_phone: formData.service_phone,
+    apply_id: formData.apply_id,
+    service_phone: formData.supplier.service_phone,
     mark: auditInfo.mark,
   }).then((res) => {
     popupRef.value?.close();
+    emit('success')
   });
 };
 
diff --git a/src/views/data/supplier/audit/index.vue b/src/views/data/supplier/audit/index.vue
index dd49891..dc96f4d 100644
--- a/src/views/data/supplier/audit/index.vue
+++ b/src/views/data/supplier/audit/index.vue
@@ -71,7 +71,7 @@
                     <!-- <el-table-column label="商户余额" prop="mer_money" show-overflow-tooltip /> -->
                     <el-table-column label="操作" width="170" fixed="right">
                         <template #default="{ row }">
-                            <el-button v-if="!row.status" link type="primary" @click="handleDetail(row.pid)">
+                            <el-button v-if="!row.status" link type="primary" @click="handleDetail(row)">
                                 审核
                             </el-button>
                         </template>
@@ -151,12 +151,11 @@ const handleDelete = async (id: number | any[]) => {
 }
 
 // 详情
-const handleDetail = async (id: any) => {
-    let res = await apiSupplierDetail({ id })
+const handleDetail = async (data: any) => {
     showDetail.value = true
     await nextTick()
     detailRef.value?.open('edit')
-    detailRef.value?.setFormData(res)
+    detailRef.value?.setFormData(data)
 }
 
 getLists()
diff --git a/src/views/data/supplier/supplier/index.vue b/src/views/data/supplier/supplier/index.vue
index 5643c72..f91d306 100644
--- a/src/views/data/supplier/supplier/index.vue
+++ b/src/views/data/supplier/supplier/index.vue
@@ -62,7 +62,11 @@
                     <el-table-column label="商户名称" prop="mer_name" show-overflow-tooltip />
                     <el-table-column label="结算周期(天)" prop="settle_cycle" show-overflow-tooltip />
                     <el-table-column label="利率" prop="interest_rate" show-overflow-tooltip />
-                    <el-table-column label="标签" prop="sys_labels_text" show-overflow-tooltip />
+                    <el-table-column label="标签" prop="sys_labels_arr" show-overflow-tooltip >
+                        <template #default="{ row }">
+                            <span>{{row.sys_labels_arr.map((t:any)=>t.name).join(',')}}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="商户地址" prop="mer_address" show-overflow-tooltip />
                     <el-table-column label="商户是否禁用" prop="status">
                         <template #default="{ row }">
diff --git a/src/views/goods/goods/index.vue b/src/views/goods/goods/index.vue
index 74a3173..72150b9 100644
--- a/src/views/goods/goods/index.vue
+++ b/src/views/goods/goods/index.vue
@@ -61,7 +61,11 @@
                     <el-table-column label="购货价格" prop="buy" show-overflow-tooltip />
                     <el-table-column label="销货价格" prop="sell" show-overflow-tooltip />
                     <el-table-column label="零售价格" prop="retail" show-overflow-tooltip />
-                    <el-table-column label="标签" prop="sys_labels_text" show-overflow-tooltip />
+                    <el-table-column label="标签" prop="sys_labels_text" show-overflow-tooltip >
+                        <template #default="{ row }">
+                            <span>{{ row.sys_labels_arr.map((t:any)=>t.name).join(',') }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="条形码" prop="code" show-overflow-tooltip />
                     <!-- <el-table-column label="默认仓库" prop="warehouse_name" show-overflow-tooltip /> -->
                     <!-- <el-table-column label="商品货位" prop="location" show-overflow-tooltip /> -->