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

components.d.ts

@@ -20,7 +20,7 @@ declare module 'vue' {
     CtPagination: typeof import('./src/components/CtPagination/index.vue')['default']
     CtSearch: typeof import('./src/components/CtSearch/index.vue')['default']
     CtTextField: typeof import('./src/components/CtVuetify/CtTextField/index.vue')['default']
-    DatePicker: typeof import('./src/components/FormUI/datePicker/index.vue')['default']
+    DatePicker: typeof import('./src/components/DatePicker/index.vue')['default']
     Details: typeof import('./src/components/Enterprise/details.vue')['default']
     Empty: typeof import('./src/components/Empty/index.vue')['default']
     HeadSearch: typeof import('./src/components/headSearch/index.vue')['default']

src/layout/personal/navBar.vue

@@ -91,7 +91,7 @@
       <div class="mb-3 text-center" style="color: #999;">
         <div class="mb-5">您还未加入或注册企业, 请选择您要操作的类型！</div>
         <v-btn class="half-button" size="small" color="primary" variant="tonal" @click="handleChange(0)">加入企业</v-btn>
-        <v-btn class="half-button ml-5" size="small" color="primary" variant="tonal" @click="handleChange(1)">注册新企业</v-btn>
+        <v-btn class="half-button ml-5" size="small" color="primary" variant="tonal" @click="handleChange(1)">{{ $t('enterprise.registeringNewEnterprise') }}</v-btn>
       </div>
     </Dialog> -->
   </div>

src/locales/en.js

@@ -7,6 +7,7 @@ export default {
     save: 'Save',
     add: 'Add',
     change: 'Change',
+    complete: 'Complete',
     saveMsg: 'Save successful',
     addMsg: 'New successfully added',
     delMsg: 'Delete successful',
@@ -77,6 +78,8 @@ export default {
   },
   enterprise: {
     moreBtn: 'View More Enterprises',
+    joiningEnterprise: 'Joining Enterprise',
+    registeringNewEnterprise: 'Registering A New Enterprise',
     infoSetting: { // 企业信息设置
       basicInfo: 'Basic Information',
       enterpriseLogo: 'Enterprise LOGO',

src/locales/zh-CN.js

@@ -7,6 +7,7 @@ export default {
     save: '保存',
     add: '新增',
     change: '更改',
+    complete: '完成',
     saveMsg: '保存成功',
     addMsg: '新增成功',
     delMsg: '删除成功',
@@ -77,6 +78,8 @@ export default {
   },
   enterprise: {
     moreBtn: '查看更多企业',
+    joiningEnterprise: '加入已有企业',
+    registeringNewEnterprise: '注册新企业',
     infoSetting: { // 企业信息设置
       basicInfo: '基本信息',
       enterpriseLogo: '企业LOGO',

src/router/modules/personal.js

@@ -87,8 +87,8 @@ const personal = [
         },
       },
       {
-        path: '/enterprise/binding',
-        component: () => import('@/views/enterprise/components/binding'),
+        path: '/enterprise/joiningEnterprise',
+        component: () => import('@/views/enterprise/components/joiningEnterprise'),
         meta: {
           title: '加入企业'
         },

src/views/enterprise/components/binding.vue → src/views/enterprise/components/JoiningEnterprise.vue

@@ -3,7 +3,7 @@
     <v-card class="default-width pa-5">
       <!-- 标题 -->
       <div class="resume-header">
-        <div class="resume-title">加入已有企业</div>
+        <div class="resume-title">{{ $t('enterprise.joiningEnterprise') }}</div>
       </div>
       <!-- 表单 -->
       <div class="CtFormClass" style="width: 600px;">
@@ -16,12 +16,12 @@
           color="primary" class="white--text mt-8" min-width="350"
           to="/enterprise/talentPool"
         >
-          完成
+        {{ $t('common.complete') }}
         </v-btn>
       </div>
       <!-- 底部 -->
       <div class="text-center mt-5">
-        <v-btn color="primary" variant="text" to="/enterprise/register">注册新企业</v-btn>
+        <v-btn color="primary" variant="text" @click="router.push({ path: '/enterprise/register' })">{{ $t('enterprise.registeringNewEnterprise') }}</v-btn>
       </div>
     </v-card>
   </div>
@@ -30,9 +30,11 @@
 <script setup>
 import CtForm from '@/components/CtForm'
 import { enterpriseSearchByName } from '@/api/resume'
+import { useRouter } from 'vue-router'
 import { ref } from 'vue'
 
-defineOptions({name: 'enterprise-enterpriseRegister-binding'})
+defineOptions({name: 'enterprise-enterpriseRegister-joiningEnterprise'})
+const router = useRouter()
 const loginLoading = ref(false)
 
 // 企业名称下拉列表

src/views/enterprise/components/register.vue

@@ -3,7 +3,7 @@
     <v-card class="default-width pa-5">
       <!-- 标题 -->
       <div class="resume-header">
-        <div class="resume-title">注册新企业</div>
+        <div class="resume-title">{{ $t('enterprise.registeringNewEnterprise') }}</div>
       </div>
       <!-- 表单 -->
       <div class="CtFormClass" style="width: 600px;">
@@ -45,12 +45,12 @@
           color="primary" class="white--text mt-8" min-width="350"
           to="/enterprise/talentPool"
         >
-          完成
+        {{ $t('common.complete') }}
         </v-btn>
       </div>
       <!-- 底部 -->
       <div class="text-center mt-5">
-        <v-btn color="primary" variant="text" to="/enterprise/binding">加入已有企业</v-btn>
+        <v-btn color="primary" variant="text" to="/enterprise/joiningEnterprise">{{ $t('enterprise.joiningEnterprise') }}</v-btn>
       </div>
     </v-card>
   </div>
@@ -76,6 +76,13 @@ const formItems = ref({
       counter: 50,
       rules: [v => !!v || '请输入企业名称']
     },
+    {
+      type: 'text',
+      key: 'code',
+      value: '',
+      label: '企业统一社会信用代码 *',
+      rules: [v => !!v || '请输入企业统一社会信用代码']
+    },
     {
       type: 'text',
       key: 'phone',

src/views/enterprise/systemManagement/informationSettings.vue

@@ -1,11 +1,63 @@
+<!-- 企业信息设置 -->
 <template>
-  <div>企业信息设置</div>
+  <div>
+    <v-card class="card-box pa-5">
+      <div>
+        <v-tabs v-model="tab" align-tabs="start" color="primary" bg-color="#fff">
+          <v-tab :value="1">{{ $t('enterprise.infoSetting.basicInfo') }}</v-tab>
+          <v-tab :value="2">{{ $t('enterprise.infoSetting.enterpriseLogo') }}</v-tab>
+          <v-tab :value="3">{{ $t('enterprise.infoSetting.enterpriseAlbum') }}</v-tab>
+          <v-tab :value="4">{{ $t('enterprise.infoSetting.welfareLabel') }}</v-tab>
+          <v-tab :value="5">{{ $t('enterprise.infoSetting.enterpriseVideo') }}</v-tab>
+          <v-tab :value="6">{{ $t('enterprise.infoSetting.recruitmentQRCode') }}</v-tab>
+        </v-tabs>
+        <v-window v-model="tab" class="mt-3">
+          <v-window-item :value="1">
+            <basicInfo></basicInfo>
+          </v-window-item>
+          <v-window-item :value="2">
+            <enterpriseLogo></enterpriseLogo>
+          </v-window-item>
+          <v-window-item :value="3">
+            <enterpriseAlbum></enterpriseAlbum>
+          </v-window-item>
+          <v-window-item :value="4">
+            <welfareLabel></welfareLabel>
+          </v-window-item>
+          <v-window-item :value="5">
+            <enterpriseVideo></enterpriseVideo>
+          </v-window-item>
+          <v-window-item :value="6">
+            <recruitmentQRCode></recruitmentQRCode>
+          </v-window-item>
+        </v-window>
+      </div>
+    </v-card>
+  </div>
 </template>
 
 <script setup>
+import basicInfo from './informationSettingsComponents/basicInfo.vue'
+import enterpriseLogo from './informationSettingsComponents/enterpriseLogo.vue'
+import enterpriseAlbum from './informationSettingsComponents/enterpriseAlbum.vue'
+import welfareLabel from './informationSettingsComponents/welfareLabel.vue'
+import enterpriseVideo from './informationSettingsComponents/enterpriseVideo.vue'
+import recruitmentQRCode from './informationSettingsComponents/recruitmentQRCode.vue'
+import { provide, ref } from 'vue'
 defineOptions({ name: 'enterprise-system-management-information-settings'})
+
+const tab = ref(1)
+
+const infoData = {
+  name: '苏州工业园区娄葑镇香草叶咖啡店'
+}
+provide('infoData', JSON.stringify(infoData))
 </script>
 
 <style scoped lang="scss">
-
+.card-box {
+  width: 100%;
+  height: 100%;
+  min-height: 500px;
+}
 </style>

src/views/enterprise/systemManagement/informationSettingsComponents/basicInfo.vue

@@ -0,0 +1,15 @@
+<template>
+  <div>
+    <div>{{ infoData?.name }}</div>
+  </div>
+</template>
+
+<script setup>
+import { inject } from 'vue';
+
+defineOptions({name: 'informationSettingsComponents-basicInfo'})
+const infoData = JSON.parse(inject('infoData'))
+
+</script>
+<style lang="scss" scoped>
+</style>

src/views/enterprise/systemManagement/informationSettingsComponents/enterpriseAlbum.vue

@@ -0,0 +1,9 @@
+<template>
+  <div>enterpriseAlbum</div>
+</template>
+
+<script setup>
+defineOptions({name: 'informationSettingsComponents-enterpriseAlbum'})
+</script>
+<style lang="scss" scoped>
+</style>

src/views/enterprise/systemManagement/informationSettingsComponents/enterpriseLogo.vue

@@ -0,0 +1,10 @@
+<template>
+  <div>enterpriseLogo</div>
+</template>
+
+<script setup>
+defineOptions({name: 'informationSettingsComponents-enterpriseLogo'})
+
+</script>
+<style lang="scss" scoped>
+</style>

src/views/enterprise/systemManagement/informationSettingsComponents/enterpriseVideo.vue

@@ -0,0 +1,9 @@
+<template>
+  <div>enterpriseVideo</div>
+</template>
+
+<script setup>
+defineOptions({name: 'informationSettingsComponents-enterpriseVideo'})
+</script>
+<style lang="scss" scoped>
+</style>

src/views/enterprise/systemManagement/informationSettingsComponents/recruitmentQRCode.vue

@@ -0,0 +1,9 @@
+<template>
+  <div>recruitmentQRCode</div>
+</template>
+
+<script setup>
+defineOptions({name: 'informationSettingsComponents-recruitmentQRCode'})
+</script>
+<style lang="scss" scoped>
+</style>

src/views/enterprise/systemManagement/informationSettingsComponents/welfareLabel.vue

@@ -0,0 +1,9 @@
+<template>
+  <div>welfareLabel</div>
+</template>
+
+<script setup>
+defineOptions({name: 'informationSettingsComponents-welfareLabel'})
+</script>
+<style lang="scss" scoped>
+</style>