Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-web into dev

# Conflicts:
#	src/router/routes/basic.ts

src/views/sales/Customer/components/certificateModal.vue

@@ -28,7 +28,7 @@
         </a-col>
         <a-col :span="24">
           <a-form-item label="上传附件" name="fileList" :label-col="{ span: 4 }" :wrapper-col="{ span: 24 }">
-            <Upload v-model:value="formState.filePath" @change="changeUplod" ref="uploadRef"  :multiple="true" :maxSize="200" :accept="accept"></Upload>
+            <UploadNew :file-list="formState.fileList" @change="changeUplod" :multiple="true" :maxSize="200" :accept="accept" />
             <div style="color: #ccc; font-size: 12px">{{ fileTip }}</div>
             
           </a-form-item>
@@ -41,11 +41,11 @@
 <script setup lang="ts">
 import {  ref, onMounted, computed, unref,reactive } from 'vue';
 import { BasicModal, useModalInner } from '/@/components/Modal';
-import { Form } from 'ant-design-vue';
+import { Form, message } from 'ant-design-vue';
 import { useI18n } from '/@/hooks/web/useI18n';
 import type { Rule } from 'ant-design-vue/es/form';
 import { useMessage } from '/@/hooks/web/useMessage';
-import Upload from '/@/components/Form/src/components/Upload.vue';
+import UploadNew from '/@/components/Form/src/components/UploadNew.vue';
 import { getDocCpList } from '/@/api/sales/Customer';
 import type { FormInstance } from 'ant-design-vue';
 import dayjs from 'dayjs';
@@ -65,6 +65,7 @@ let formState = reactive({
   docTypeCode: '',
   fileList: []
 });
+const list = ref()
 const rules = {
   docTypeCode: [{ required: true, message: "该项为必填项", trigger: 'change' }],
 };
@@ -74,10 +75,12 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
   setModalProps({ confirmLoading: false });
   isUpdate.value = !!data?.isUpdate;
   isDisable.value = data?.btnType == 'view' ? true : false 
+  list.value = data.list
   if (unref(isUpdate)) {
     let dateFrom = data.record?.dateFrom ? dayjs(data.record?.dateFrom) : null
     let dateTo = data.record?.dateTo ? dayjs(data.record?.dateTo) : null
     Object.assign(formState, {...data.record,dateFrom, dateTo})
+    formState.filePath = formState.fileList[0]?.xjrFileId
     }
   });
 
@@ -112,21 +115,26 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
     try {
       await formRef.value.validate();
       // 验证通过，提交表单
-      let arr = uploadRef.value.getValue() || []
       let obj = {
         ...formState,
         dateFrom: formState.dateFrom ? dayjs(formState.dateFrom).format('YYYY-MM-DD') : '',
         dateTo: formState.dateTo ? dayjs(formState.dateTo).format('YYYY-MM-DD') : '',
-        fileList: arr.map(v => {
+        fileList: formState.fileList.map(v => {
           return {
             fileOrg: v.name,
             filePath: v.url,
-            filesize: v.fileSize
+            fileSize: v.fileSize,
+            xjrFileId: v.tableId
           }
         })
       }
-      console.log(obj,543, uploadRef.value.getValue())
-      formState.filePath = ''
+      let idx =list.value.findIndex(v => v.docTypeCode == obj.docTypeCode)
+      if (idx > -1) {
+        message.warn('证书已存在')
+        formRef.value.resetFields();
+        closeModal();
+        return
+      }
       emit('success', obj);
       notification.success({
         message: t('操作'),