Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/utils/validate.js

@@ -66,4 +66,23 @@ export const checkEmail = (email) => {
 const USCIReg = /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/;  
 export const checkUSCI = (code) => {  
   return USCIReg.test(code)
-}
+}
+
+// 效验银行卡号
+const BankNoReg = /^\d{16,19}$/;  
+export const checkBankNo = (code) => {  
+  return BankNoReg.test(code)
+}
+
+// 效验开户银行名称
+const BankNameReg = /^[A-Za-z\u4e00-\u9fa5]+$/;  
+export const checkBankName = (value) => {  
+  return BankNameReg.test(value)
+}
+
+// 效验有效位置地址
+const AddressReg = /[\u4e00-\u9fa5]/g;  
+export const checkAddress = (value) => {
+  const bool = value ? (value.match(AddressReg)?.length || 0) >= 12 : false // 校验12个中文字符
+  return bool
+}

src/views/mall/exchange.vue

@@ -35,6 +35,8 @@ import Dialog from '@/components/CtDialog'
 import Snackbar from '@/plugins/snackbar'
 import { redeemSubmit } from '@/api/mall'
 import { useUserStore } from '@/store/user'
+import { checkAddress } from '@/utils/validate'
+
 
 const emit = defineEmits(['login', 'toTaskCenter'])
 defineProps({
@@ -69,7 +71,13 @@ const formItems = ref({
       value: '先烈中路100号大院203室',
       hide: false,
       label: '收获详细地址 *',
-      rules: [v => !!v || '请填写收获详细地址']
+      rules: [
+        v => !!v || '请填写收获详细地址',
+        value => {
+          if (!value || (value && checkAddress(value))) return true
+          return '请输入正确的注册地址'
+        }
+      ]
     }
   ]
 })

src/views/recruit/enterprise/invoiceManagement/index.vue

@@ -47,7 +47,7 @@ import { getInvoiceTitlePage, createInvoiceTitle, updateInvoiceTitle, deleteInvo
 import Snackbar from '@/plugins/snackbar'
 import Confirm from '@/plugins/confirm'
 import { useI18n } from '@/hooks/web/useI18n'
-import { checkPhone, checkUSCI } from '@/utils/validate'
+import { checkUSCI, checkBankNo, checkBankName, checkAddress } from '@/utils/validate'
 
 const { t } = useI18n()
 const total = ref(0)
@@ -108,10 +108,7 @@ const handleChangeType = (isVerified) => {
     if (e.key === 'title') e.disabled = isVerified
     if (e.rulesBaseLabel) {
       e.label = isVerified ? `${e.rulesBaseLabel} *` : e.rulesBaseLabel
-      e.rules = isVerified ? [v => !!v || `请输入${e.rulesBaseLabel}`] : []
-      if (e.key === 'title') {
-        e.rules = [...e.rules, v => {if (v && checkPhone(v)) return true; return '企业注册电话'}]
-      }
+      e.rules = isVerified ? [v => !!v || `请输入${e.rulesBaseLabel}`, ...e.rules] : []
     }
   })
 }
@@ -169,7 +166,13 @@ const optionsBase = {
     label: '基本开户银行',
     placeholder: '请填写开户许可证上的开户银行',
     rulesBaseLabel: '基本开户银行',
-    outlined: true
+    outlined: true,
+    rules: [
+      value => {
+        if (!value || (value && checkBankName(value))) return true
+        return '请输入正确的开户银行'
+      }
+    ]
   },
   enterpriseBankNo: {
     type: 'number',
@@ -178,7 +181,13 @@ const optionsBase = {
     label: '基本银行账号',
     placeholder: '请填写开户许可证上的银行账号',
     rulesBaseLabel: '基本银行账号',
-    outlined: true
+    outlined: true,
+    rules: [
+      value => {
+        if (!value || (value && checkBankNo(value))) return true
+        return '请输入正确的银行账号'
+      }
+    ]
   },
   enterpriseAddress:  {
     type: 'text',
@@ -187,7 +196,13 @@ const optionsBase = {
     label: '企业注册地址',
     placeholder: '请填写开户许可证上的企业注册地址',
     rulesBaseLabel: '企业注册地址',
-    outlined: true
+    outlined: true,
+    rules: [
+      value => {
+        if (!value || (value && checkAddress(value))) return true
+        return '请输入正确的注册地址'
+      }
+    ]
   },
   enterprisePhone: {
     type: 'phoneNumber',
@@ -196,7 +211,7 @@ const optionsBase = {
     label: '企业注册电话',
     placeholder: '请填写开户许可证上的企业注册电话',
     rulesBaseLabel: '企业注册电话',
-    outlined: true
+    outlined: true,
   },
   certificationTip: {
     slotName: 'certificationTip',
@@ -225,7 +240,7 @@ const business = ref({})
 const getEnterpriseBusinessInfo = async () => {
   const data = await getEnterpriseBusiness()
   if (!data || !Object.keys(data).length) return
-  console.log(1, 'business', data)
+  // console.log(1, 'business', data)
   business.value = {
     title: data.name,
     code: data.code,
@@ -239,8 +254,6 @@ const handleAdd = () => {
   // 初始化表单
   handleChangeCategory(0)
   handleChangeType(0)
-  // 赋值
-  // setEntPersonBaseInfo()
   show.value = true
   editId.value = null
 }