Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

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'

src/views/baseinfo/infoclient/TenantAuditStepModal.vue

@@ -867,15 +867,17 @@
       }
       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 = ''
+          let SaleData: any = ''
+          if (rowId.value) {
+            const clientRes = await getCodeGoodsTypeInfo({ id: unref(rowId) })
             if (clientRes.data.clientTag) {
               values.clientTag = {}
               let ClientTag = await getDictOption('infoclient-ArrclientTag')
@@ -887,8 +889,6 @@
                 })
               })
             }
-
-          let SaleData: any = ''
             if (clientRes.data.saleId) {
               const UserRes = await getUser({ id: clientRes.data.saleId })
               SaleData = h('div', { class: 'UserRes' }, [
@@ -919,6 +919,7 @@
                 ),
               ])
             }
+          }
 
           Modal.confirm({
             title: '客户已存在',