From 891ed17ad8f8ce0d2af4d61068ab5eaa63e3dd56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=98=E6=B3=8A=E5=AE=A2?= <1059510186@qq.com>
Date: Thu, 12 Oct 2023 10:31:22 +0800
Subject: [PATCH 1/2] 123

---
 .../inspectionIndex.vue                          | 13 +++++++++++++
 .../inspectionModal.vue                          | 16 +++++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/views/qualityInspectionDistribution/inspectionIndex.vue b/src/views/qualityInspectionDistribution/inspectionIndex.vue
index 2cbb5c6..378bb13 100644
--- a/src/views/qualityInspectionDistribution/inspectionIndex.vue
+++ b/src/views/qualityInspectionDistribution/inspectionIndex.vue
@@ -94,8 +94,21 @@ const columns: ProColumns[] = [
   },
   {
     title: '客户名称',
+    width: 120,
     dataIndex: 'customName'
   },
+  {
+    title: '客户类型',
+    dataIndex: 'customType',
+    width: 80,
+    customRender: ({ record }: any) => {
+      if (record.customType == 0) {
+        return h('div', 'A型')
+      } else if (record.customType == 1) {
+        return h('div', 'B型')
+      }
+    }
+  },
   {
     title: '联系方式',
     width: 100,
diff --git a/src/views/qualityInspectionDistribution/inspectionModal.vue b/src/views/qualityInspectionDistribution/inspectionModal.vue
index 842a71d..26b3d16 100644
--- a/src/views/qualityInspectionDistribution/inspectionModal.vue
+++ b/src/views/qualityInspectionDistribution/inspectionModal.vue
@@ -9,6 +9,10 @@
     :width="650"
     @cancel="handleClose"
   >
+    <a-tabs centered>
+      <a-tab-pane v-if="formModel.customType === 0" key="1" tab="A类型客户" />
+      <a-tab-pane v-if="formModel.customType === 1" key="2" tab="B类型客户" force-render />
+    </a-tabs>
     <a-form
       :model="formModel"
       :label-col="{ sm: { span: 24 }, md: { span: 8 } }"
@@ -76,8 +80,8 @@
           @click="toExamine(0)"
           >重审</a-button
         >
-        <a-button 
-          v-if="formModel.enrollStatus == 1"
+        <a-button
+          v-if="formModel.enrollStatus == 1 && formModel.customType == 0"
           type="primary"
           html-type="submit"
           style="margin-left: 10px"
@@ -96,7 +100,7 @@ import type { FormRequestMapping } from '@/hooks/form'
 import { overrideProperties } from '@/utils/bean-utils'
 import { message } from 'ant-design-vue'
 import { updateCustomerAudit } from '@/api/geopoliticalCustomers/index'
-import { useAdminForm, useFormAction, FormAction, labelCol, wrapperCol } from '@/hooks/form'
+import { useAdminForm, useFormAction, FormAction, wrapperCol } from '@/hooks/form'
 import { useUserStore } from '@/stores/user-store'
 import { doRequest } from '@/utils/axios/request'
 import { getCustomDetails } from '@/api/geopoliticalCustomers'
@@ -330,4 +334,10 @@ defineExpose({
   right: 3px;
   font-size: 15px;
 }
+
+//a-tabs距离下面的距离
+::v-deep .ant-tabs-top > .ant-tabs-nav {
+  margin: 0 0 25px 0;
+  line-height: 0.5715;
+}
 </style>

From f191d10141028f3aa9f548f33124c4728ef0b350 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=98=E6=B3=8A=E5=AE=A2?= <1059510186@qq.com>
Date: Thu, 12 Oct 2023 11:01:37 +0800
Subject: [PATCH 2/2] 123

---
 .../inspectionModal.vue                       | 182 ++++++++++--------
 1 file changed, 97 insertions(+), 85 deletions(-)

diff --git a/src/views/qualityInspectionDistribution/inspectionModal.vue b/src/views/qualityInspectionDistribution/inspectionModal.vue
index 26b3d16..d3ce3b8 100644
--- a/src/views/qualityInspectionDistribution/inspectionModal.vue
+++ b/src/views/qualityInspectionDistribution/inspectionModal.vue
@@ -1,96 +1,103 @@
 <template>
-  <a-modal
-    :title="title"
-    :visible="visible"
-    :mask-closable="false"
-    :centered="true"
-    :body-style="{ paddingBottom: '8px' }"
-    :confirm-loading="submitLoading"
-    :width="650"
-    @cancel="handleClose"
-  >
-    <a-tabs centered>
-      <a-tab-pane v-if="formModel.customType === 0" key="1" tab="A类型客户" />
-      <a-tab-pane v-if="formModel.customType === 1" key="2" tab="B类型客户" force-render />
-    </a-tabs>
-    <a-form
-      :model="formModel"
-      :label-col="{ sm: { span: 24 }, md: { span: 8 } }"
-      :wrapper-col="wrapperCol"
+  <div ref="refModel">
+    <a-modal
+      :title="title"
+      :visible="visible"
+      :mask-closable="false"
+      :centered="true"
+      :body-style="{ paddingBottom: '8px', paddingTop: '0px' }"
+      :confirm-loading="submitLoading"
+      :width="650"
+      :get-container="() => $refs.refModel"
+      @cancel="handleClose"
     >
-      <a-row justify="start">
-        <a-col :span="12">
-          <a-form-item label="客户称呼">
-            <a-input v-model:value="formModel.customName" placeholder="请输入" readonly />
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row justify="start">
-        <a-col :span="12">
-          <a-form-item label="客户联系方式">
-            <a-input v-model:value="formModel.customNid" placeholder="请输入" readonly />
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row justify="start">
-        <a-col :span="24">
-          <a-form-item
-            label="客户地址信息"
-            :label-col="{ sm: { span: 24 }, md: { span: 4 } }"
-            :wrapper-col="{ sm: { span: 24 }, md: { span: 20 } }"
-          >
-            <a-input v-model:value="formModel.comprehensiveAddress" placeholder="请输入" readonly />
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row justify="start">
-        <a-col :span="24">
-          <a-form-item
-            label="备注"
-            :label-col="{ sm: { span: 24 }, md: { span: 4 } }"
-            :wrapper-col="{ sm: { span: 24 }, md: { span: 20 } }"
-          >
-            <a-input v-model:value="formModel.remark" readonly />
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <template v-for="item in formModel.customStoreVOList" :key="item.storeId">
+      <a-tabs centered>
+        <a-tab-pane v-if="formModel.customType === 0" key="1" tab="A类型客户" />
+        <a-tab-pane v-if="formModel.customType === 1" key="2" tab="B类型客户" force-render />
+      </a-tabs>
+      <a-form
+        :model="formModel"
+        :label-col="{ sm: { span: 24 }, md: { span: 8 } }"
+        :wrapper-col="wrapperCol"
+      >
+        <a-row justify="start">
+          <a-col :span="12">
+            <a-form-item label="客户称呼">
+              <a-input v-model:value="formModel.customName" placeholder="请输入" readonly />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row justify="start">
+          <a-col :span="12">
+            <a-form-item label="客户联系方式">
+              <a-input v-model:value="formModel.customNid" placeholder="请输入" readonly />
+            </a-form-item>
+          </a-col>
+        </a-row>
         <a-row justify="start">
-          <a-col xs="24" :sm="24" :md="12">
-            <a-form-item label="预约门店">
-              <a-input v-model:value="item.storeName" placeholder="请输入" readonly />
+          <a-col :span="24">
+            <a-form-item
+              label="客户地址信息"
+              :label-col="{ sm: { span: 24 }, md: { span: 4 } }"
+              :wrapper-col="{ sm: { span: 24 }, md: { span: 20 } }"
+            >
+              <a-input
+                v-model:value="formModel.comprehensiveAddress"
+                placeholder="请输入"
+                readonly
+              />
             </a-form-item>
           </a-col>
-          <a-col xs="24" :sm="24" :md="12">
-            <a-form-item label="预约时间">
-              <a-input v-model:value="item.reservationTime" placeholder="未选择" readonly />
+        </a-row>
+        <a-row justify="start">
+          <a-col :span="24">
+            <a-form-item
+              label="备注"
+              :label-col="{ sm: { span: 24 }, md: { span: 4 } }"
+              :wrapper-col="{ sm: { span: 24 }, md: { span: 20 } }"
+            >
+              <a-input v-model:value="formModel.remark" readonly />
             </a-form-item>
           </a-col>
         </a-row>
+        <template v-for="item in formModel.customStoreVOList" :key="item.storeId">
+          <a-row justify="start">
+            <a-col xs="24" :sm="24" :md="12">
+              <a-form-item label="预约门店">
+                <a-input v-model:value="item.storeName" placeholder="请输入" readonly />
+              </a-form-item>
+            </a-col>
+            <a-col xs="24" :sm="24" :md="12">
+              <a-form-item label="预约时间">
+                <a-input v-model:value="item.reservationTime" placeholder="未选择" readonly />
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </template>
+      </a-form>
+      <template #footer>
+        <div v-if="title !== '详情'">
+          <a-button v-if="title !== '审核'" @click="visible = false">取消</a-button>
+          <a-button
+            v-if="formModel.enrollStatus == 1 && formModel.customType == 1"
+            type="primary"
+            html-type="submit"
+            style="margin-left: 10px"
+            @click="toExamine(0)"
+            >重审</a-button
+          >
+          <a-button
+            v-if="formModel.enrollStatus == 1 && formModel.customType == 0"
+            type="primary"
+            html-type="submit"
+            style="margin-left: 10px"
+            @click="toExamine(1)"
+            >分发</a-button
+          >
+        </div>
       </template>
-    </a-form>
-    <template #footer>
-      <div v-if="title !== '详情'">
-        <a-button v-if="title !== '审核'" @click="visible = false">取消</a-button>
-        <a-button
-          v-if="formModel.enrollStatus == 1 && formModel.customType == 1"
-          type="primary"
-          html-type="submit"
-          style="margin-left: 10px"
-          @click="toExamine(0)"
-          >重审</a-button
-        >
-        <a-button
-          v-if="formModel.enrollStatus == 1 && formModel.customType == 0"
-          type="primary"
-          html-type="submit"
-          style="margin-left: 10px"
-          @click="toExamine(1)"
-          >分发</a-button
-        >
-      </div>
-    </template>
-  </a-modal>
+    </a-modal>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -106,6 +113,7 @@ import { doRequest } from '@/utils/axios/request'
 import { getCustomDetails } from '@/api/geopoliticalCustomers'
 //预约时间
 import 'dayjs/locale/zh-cn'
+import { $ref } from 'vue/macros'
 // import dayjs from 'dayjs'
 const emits = defineEmits<{
   (e: 'submit-success'): void
@@ -334,7 +342,11 @@ defineExpose({
   right: 3px;
   font-size: 15px;
 }
-
+//modal头部
+::v-deep .ant-modal-header {
+  padding: 16px 24px 0px !important;
+  border-bottom: unset !important;
+}
 //a-tabs距离下面的距离
 ::v-deep .ant-tabs-top > .ant-tabs-nav {
   margin: 0 0 25px 0;