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,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) {
+          if (rowId.value) {
-            const UserRes = await getUser({ id: clientRes.data.saleId })
+            const clientRes = await getCodeGoodsTypeInfo({ id: unref(rowId) })
-            SaleData = h('div', { class: 'UserRes' }, [
+            if (clientRes.data.clientTag) {
-              h(
+              values.clientTag = {}
-                'span',
+              let ClientTag = await getDictOption('infoclient-ArrclientTag')
-                { style: { width: '50%', display: 'inline-block' } },
+              Object.keys(clientRes.data.clientTag).forEach((item, index) => {
-                `销售名称：${UserRes.data.userName ? UserRes.data.userName : '-'}  `,
+                ClientTag.forEach((e) => {
-              ),
+                  if (item == e.value && clientRes.data.clientTag[item]) {
-              h(
+                    clientTagData = clientTagData == '' ? e.name : `${clientTagData},${e.name}`
-                'span',
+                  }
-                { style: { width: '50%', display: 'inline-block' } },
+                })
-                ` 英文名称：${UserRes.data.userEnName ? UserRes.data.userEnName : '-'}`,
+              })
-              ),
+            }
-              h(
+            if (clientRes.data.saleId) {
-                'span',
+              const UserRes = await getUser({ id: clientRes.data.saleId })
-                { style: { width: '50%', display: 'inline-block' } },
+              SaleData = h('div', { class: 'UserRes' }, [
-                `联系方式：${UserRes.data.officePhone ? UserRes.data.officePhone : '-'} `,
+                h(
-              ),
+                  'span',
-              h(
+                  { style: { width: '50%', display: 'inline-block' } },
-                'span',
+                  `销售名称：${UserRes.data.userName ? UserRes.data.userName : '-'}  `,
-                { style: { width: '50%', display: 'inline-block' } },
+                ),
-                `QQ：${UserRes.data.QQ ? UserRes.data.QQ : '-'}`,
+                h(
-              ),
+                  'span',
-              h(
+                  { style: { width: '50%', display: 'inline-block' } },
-                'span',
+                  ` 英文名称：${UserRes.data.userEnName ? UserRes.data.userEnName : '-'}`,
-                { style: { width: '50%', display: 'inline-block' } },
+                ),
-                `邮箱：${UserRes.data.email ? UserRes.data.email : '-'}`,
+                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({