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

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

@@ -55,7 +55,7 @@ import type { FormInstance } from 'ant-design-vue';
 import dayjs from 'dayjs';
 import Upload from '/@/components/Form/src/components/Upload.vue';
 
-const tableName = 'Customer'
+let tableName = 'Customer'
 const columnName = 'fileList'
 const { t } = useI18n(); 
 const isUpdate = ref(true);
@@ -78,7 +78,9 @@ const rules = {
   docTypeCode: [{ required: true, message: "该项为必填项", trigger: 'change' }],
 };
 const curData = ref()
-   
+const props = defineProps({
+  type: String
+})
 const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
   curData.value = ''
   formState.filePath = ''
@@ -119,7 +121,14 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
     console.log(val, 532, )
   }
   async function getOption() {
-    optionList = await getDocCpList({'valid': 'Y'})
+    let obj = {}
+    if (props.type == 'cuSign') {
+      obj = {'cuSign': 'Y'}
+    } else {
+      obj = {'suSign': 'Y'}
+      tableName = 'supplier'
+    }
+    optionList = await getDocCpList({'valid': 'Y',...obj })
   }
   const handleCancel = () => {
     formRef.value.resetFields();

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

@@ -289,7 +289,7 @@
       </a-form>
     </div>
   </a-spin>
-  <certificateModal @register="registerCertificate" @success="handleSuccessCertificate" />
+  <certificateModal @register="registerCertificate" @success="handleSuccessCertificate" type="cuSign" />
   <contactModal @register="registerContact" @success="handleSuccessContact" />
   <bankModal @register="registerBank" @success="handleSuccessBank"/>
 </template>
@@ -615,6 +615,19 @@
           })
           return
         }
+        let arr = []
+        dataBank.forEach(v => {
+          if (v.defaultSign == 'Y') {
+            arr.push(v)
+          }
+        })
+        if (arr.length > 1 || !arr.length) {
+          notification.warning({
+            message: 'Tip',
+            description: '默认银行有且仅有一个'
+          })
+          return
+        }
         let arrCertificate = JSON.parse(JSON.stringify(dataCertificate))
         arrCertificate.forEach(v => {
           v.dateFrom =  v.dateFrom ? dayjs(v.dateFrom ).format('YYYY-MM-DD HH:mm:ss') : '';

src/views/sales/Customer/index.vue

@@ -228,7 +228,7 @@
       });
     } else {
       router.push({
-        path: '/form/Customer/0/createFormCustomer',
+        path: '/form/Customer/0/createForm',
         query: {
           formPath: 'sales/Customer',
           formName: formName,