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

components.d.ts

@@ -30,9 +30,9 @@ declare module 'vue' {
     DatePicker: typeof import('./src/components/DatePicker/index.vue')['default']
     Details: typeof import('./src/components/Enterprise/details.vue')['default']
     Echarts: typeof import('./src/components/Echarts/index.vue')['default']
-    ElCascader: typeof import('element-plus/es')['ElCascader']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     Empty: typeof import('./src/components/Empty/index.vue')['default']
     File: typeof import('./src/components/Upload/file.vue')['default']
     HeadSearch: typeof import('./src/components/headSearch/index.vue')['default']

src/plugins/confirm/confirm.vue

@@ -5,7 +5,15 @@ defineProps({
   title: String,
   text: String,
   cancel: Function,
-  sure: Function
+  sure: Function,
+  option: {
+    type: Object,
+    default: () => {
+      return {
+        hideCancelBtn: false
+      }
+    }
+  }
 })
 
 defineOptions({ name: 'ct-confirm' })
@@ -35,7 +43,7 @@ const dialog = ref(true)
         <template v-slot:actions>
           <v-spacer></v-spacer>
 
-          <v-btn @click="cancel">
+          <v-btn v-if="hideCancelBtn" @click="cancel">
             取消
           </v-btn>
 

src/views/recruit/entRegister/register.vue

@@ -27,7 +27,7 @@
                 <Img 
                   class="mt-3" 
                   tips="上传图片" 
-                  :value="licenseUrl" 
+                  :value="licenseUrl"
                   :showSnackbar="false" 
                   @imgClick="showPreview = !showPreview" 
                   :showCursor="true" 
@@ -70,6 +70,7 @@ import { enterpriseRegisterApply } from '@/api/personal/user'
 import { onMounted, ref, computed } from 'vue';
 import { checkEmail } from '@/utils/validate'
 import { getBusinessLicenseOCR } from '@/api/common'
+import Confirm from '@/plugins/confirm'
 
 const { t } = useI18n()
 const CtFormRef = ref()
@@ -118,11 +119,12 @@ const saveRegisterInfo = () => {
   localStorage.setItem('enterpriseRegisterInfo', JSON.stringify(obj))
 }
 
+const codeLabelTet = '企业统一社会信用代码（可从上传的营业执照自动识别）'
 // 是否筹建中
 const isPrepareChange = () => {
   const code = formItems.value.options.find(e => e.key === 'code')
   if (code) {
-    code.label = prepareValue.value ? '企业统一社会信用代码' : '企业统一社会信用代码 *'
+    code.label = prepareValue.value ? codeLabelTet : codeLabelTet + ' *'
     code.rules = prepareValue.value ? [] : [v => !!v || '请输入企业统一社会信用代码']
   }
   saveRegisterInfo()
@@ -149,7 +151,7 @@ const formItems = ref({
       type: 'text',
       key: 'name',
       value: '',
-      label: '企业名称（需要与营业执照完全一致）*',
+      label: '企业名称（需要与营业执照完全一致，可从上传的营业执照自动识别）*',
       counter: 50,
       rules: [v => !!v || '请输入企业名称'],
       blur: saveRegisterInfo
@@ -159,7 +161,7 @@ const formItems = ref({
       key: 'code',
       value: '',
       counter: 18,
-      label: '企业统一社会信用代码 *',
+      label: codeLabelTet + ' *',
       rules: [v => !!v || '请输入企业统一社会信用代码'],
       blur: saveRegisterInfo
     },
@@ -266,7 +268,13 @@ const getOcr = async () => {
       formItems.value.options.find(e => e.key === 'name').value = data.name
       business.value = data
       saveRegisterInfo()
+    } else {
+      licenseUrl.value = ''
+      Confirm(t('common.confirmTitle'), '营业执照图片识别失败,请重新上传清晰合法图片', { hideCancelBtn: true })
     }
+  } catch (error) {
+    licenseUrl.value = ''
+    Confirm(t('common.confirmTitle'), error, { hideCancelBtn: true })
   } finally {
     loading.value = false
   }