From ab13d5242ad9c131535d5624a4973d42f8702469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Fri, 25 Oct 2024 16:33:48 +0800
Subject: [PATCH] =?UTF-8?q?10/25=20=E9=83=A8=E5=88=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SellCtn/TenantAuditStepModal.vue          |  3 +
 .../infoclient/TenantAuditStepModal.vue       | 87 ++++++++++---------
 2 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue
index 3006c9b1..c9846b48 100644
--- a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue
@@ -219,6 +219,9 @@
       </a-button>
     </template>
   </BasicModal>
+  <a-modal v-model:visible="visible" title="驳回" width="40%" @ok="handleOk">
+    <BasicForm @register="modalRegisterForml" />
+  </a-modal>
 </template>
 <script lang="ts" setup>
   import { ref, computed, unref, watchEffect, watch } from 'vue'
diff --git a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
index fa362f34..9a657e25 100644
--- a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
@@ -867,57 +867,58 @@
       }
       IsAvailable({
         ...values,
-        ...getFieldsValue1(),
+        ...getFieldsValue(),
       })
         .then((res) => {
           IsAvailableDisabled.value = true
           notification.success({ message: '校验成功', duration: 3 })
         })
         .catch(async (err) => {
-          const clientRes = await getCodeGoodsTypeInfo({ id: unref(rowId) })
           let clientTagData: any = ''
-          if (clientRes.data.clientTag) {
-            values.clientTag = {}
-            let ClientTag = await getDictOption('infoclient-ArrclientTag')
-            Object.keys(clientRes.data.clientTag).forEach((item, index) => {
-              ClientTag.forEach((e) => {
-                if (item == e.value && clientRes.data.clientTag[item]) {
-                  clientTagData = clientTagData == '' ? e.name : `${clientTagData},${e.name}`
-                }
-              })
-            })
-          }
-
           let SaleData: any = ''
-          if (clientRes.data.saleId) {
-            const UserRes = await getUser({ id: clientRes.data.saleId })
-            SaleData = h('div', { class: 'UserRes' }, [
-              h(
-                'span',
-                { style: { width: '50%', display: 'inline-block' } },
-                `销售名称：${UserRes.data.userName ? UserRes.data.userName : '-'}  `,
-              ),
-              h(
-                'span',
-                { style: { width: '50%', display: 'inline-block' } },
-                ` 英文名称：${UserRes.data.userEnName ? UserRes.data.userEnName : '-'}`,
-              ),
-              h(
-                'span',
-                { style: { width: '50%', display: 'inline-block' } },
-                `联系方式：${UserRes.data.officePhone ? UserRes.data.officePhone : '-'} `,
-              ),
-              h(
-                'span',
-                { style: { width: '50%', display: 'inline-block' } },
-                `QQ：${UserRes.data.QQ ? UserRes.data.QQ : '-'}`,
-              ),
-              h(
-                'span',
-                { style: { width: '50%', display: 'inline-block' } },
-                `邮箱：${UserRes.data.email ? UserRes.data.email : '-'}`,
-              ),
-            ])
+          if (rowId.value) {
+            const clientRes = await getCodeGoodsTypeInfo({ id: unref(rowId) })
+            if (clientRes.data.clientTag) {
+              values.clientTag = {}
+              let ClientTag = await getDictOption('infoclient-ArrclientTag')
+              Object.keys(clientRes.data.clientTag).forEach((item, index) => {
+                ClientTag.forEach((e) => {
+                  if (item == e.value && clientRes.data.clientTag[item]) {
+                    clientTagData = clientTagData == '' ? e.name : `${clientTagData},${e.name}`
+                  }
+                })
+              })
+            }
+            if (clientRes.data.saleId) {
+              const UserRes = await getUser({ id: clientRes.data.saleId })
+              SaleData = h('div', { class: 'UserRes' }, [
+                h(
+                  'span',
+                  { style: { width: '50%', display: 'inline-block' } },
+                  `销售名称：${UserRes.data.userName ? UserRes.data.userName : '-'}  `,
+                ),
+                h(
+                  'span',
+                  { style: { width: '50%', display: 'inline-block' } },
+                  ` 英文名称：${UserRes.data.userEnName ? UserRes.data.userEnName : '-'}`,
+                ),
+                h(
+                  'span',
+                  { style: { width: '50%', display: 'inline-block' } },
+                  `联系方式：${UserRes.data.officePhone ? UserRes.data.officePhone : '-'} `,
+                ),
+                h(
+                  'span',
+                  { style: { width: '50%', display: 'inline-block' } },
+                  `QQ：${UserRes.data.QQ ? UserRes.data.QQ : '-'}`,
+                ),
+                h(
+                  'span',
+                  { style: { width: '50%', display: 'inline-block' } },
+                  `邮箱：${UserRes.data.email ? UserRes.data.email : '-'}`,
+                ),
+              ])
+            }
           }
 
           Modal.confirm({