Browse Source

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

Xiao_123 11 months ago
parent
commit
15b7e2d773

+ 8 - 24
src/components/FormUI/nestedListGroup/components/listGroup.vue

@@ -1,49 +1,33 @@
 <template>
 <template>
   <v-list class="side-box" color="primary">
   <v-list class="side-box" color="primary">
-    <template v-for="(val, index) in item.items" :key="item?.itemValue? val[item.itemValue] : index">
+    <template v-for="(val, index) in list" :key="option?.itemValue? val[option.itemValue] : index">
       <template v-if="!val.children?.length">
       <template v-if="!val.children?.length">
         <v-list-item
         <v-list-item
           active-class="active"
           active-class="active"
           color="primary"
           color="primary"
-          :title="val[item.itemText || 'label']"
+          :title="val[option.itemText || 'label']"
         >
         >
         </v-list-item>
         </v-list-item>
       </template>
       </template>
       <v-list-group
       <v-list-group
         v-else
         v-else
         color="primary"
         color="primary"
-        :prepend-icon="val.icon"
       >
       >
         <template v-slot:activator="{ props }">
         <template v-slot:activator="{ props }">
-          <v-list-item v-bind="props" :title="val[item.itemText || 'label']"></v-list-item>
+          <v-list-item v-bind="props" :title="val[option.itemText || 'label']"></v-list-item>
         </template>
         </template>
-        <template v-for="(k, i) in val.children" :key="item?.itemValue? k[item.itemValue] : i">
-          <v-list-item
-            v-if="!k.children?.length"
-            active-class="active"
-            color="primary"
-            :title="k[item.itemText || 'label']"
-          ></v-list-item>
-          <listGroup v-else :item="k"></listGroup>
-        </template>
-        <!-- <v-list-item
-          v-for="(k, i) in val.children"
-          :key="`k_${i}`"
-          color="primary"
-          style="padding-left: 40px;"
-          :title="k[item.itemText || 'label']"
-          :value="k[item.itemValue || 'value']"
-        ></v-list-item> -->
+        <listGroup :list="val.children" :option="option"></listGroup>
       </v-list-group>
       </v-list-group>
     </template>
     </template>
   </v-list>
   </v-list>
 </template>
 </template>
 
 
 <script setup>
 <script setup>
-import listGroup from './listGroup'
+// import listGroup from './listGroup'
 defineOptions({ name:'nestedListGroup-listGroup'})
 defineOptions({ name:'nestedListGroup-listGroup'})
-const propsData = defineProps({item: Object})
-const item = propsData.item
+const propsData = defineProps({list: Array, option: Object})
+const list = propsData.list
+const option = propsData.option
 </script>
 </script>
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 </style>
 </style>

+ 2 - 30
src/components/FormUI/nestedListGroup/index.vue

@@ -30,36 +30,7 @@
           @update:modelValue="modelValueUpDate"
           @update:modelValue="modelValueUpDate"
         ></v-text-field>
         ></v-text-field>
       </template>
       </template>
-      <listGroup :item="item"></listGroup>
-      <!-- <v-list class="side-box" color="primary">
-        <template v-for="(val, index) in item.items" :key="item?.itemValue? val[item.itemValue] : index">
-          <template v-if="!val.children?.length">
-            <v-list-item
-              active-class="active"
-              color="primary"
-              :title="val[item.itemText || 'label']"
-            >
-            </v-list-item>
-          </template>
-          <v-list-group
-            v-else
-            color="primary"
-            :prepend-icon="val.icon"
-          >
-            <template v-slot:activator="{ props }">
-              <v-list-item v-bind="props" :title="val[item.itemText || 'label']"></v-list-item>
-            </template>
-            <v-list-item
-              v-for="(k, i) in val.children"
-              :key="`k_${i}`"
-              color="primary"
-              style="padding-left: 40px;"
-              :title="k[item.itemText || 'label']"
-              :value="k[item.itemValue || 'value']"
-            ></v-list-item>
-          </v-list-group>
-        </template>
-      </v-list> -->
+      <listGroup :list="item.items" :option="option"></listGroup>
     </v-menu>
     </v-menu>
   </div>
   </div>
 </template>
 </template>
@@ -70,6 +41,7 @@ import { defineEmits, ref } from 'vue';
 defineOptions({ name:'FormUI-nestedListGroup'})
 defineOptions({ name:'FormUI-nestedListGroup'})
 const propsData = defineProps({item: Object, modelValue: [String, Number]})
 const propsData = defineProps({item: Object, modelValue: [String, Number]})
 const item = propsData.item
 const item = propsData.item
+const option = { ...item, items: [] }
 const value = ref(propsData.modelValue)
 const value = ref(propsData.modelValue)
 const emit = defineEmits(['update:modelValue', 'change'])
 const emit = defineEmits(['update:modelValue', 'change'])
 const modelValueUpDate = (val) => {
 const modelValueUpDate = (val) => {

+ 1 - 0
src/locales/en.js

@@ -152,6 +152,7 @@ export default {
       enterpriseLogo: 'Enterprise LOGO',
       enterpriseLogo: 'Enterprise LOGO',
       enterpriseAlbum: 'Enterprise Album',
       enterpriseAlbum: 'Enterprise Album',
       welfareLabel: 'Welfare Label',
       welfareLabel: 'Welfare Label',
+      businessInformation: 'Business Information',
       enterpriseVideo: 'Enterprise Video',
       enterpriseVideo: 'Enterprise Video',
       recruitmentQRCode: 'Recruitment QR Code',
       recruitmentQRCode: 'Recruitment QR Code',
     },
     },

+ 1 - 0
src/locales/zh-CN.js

@@ -152,6 +152,7 @@ export default {
       enterpriseLogo: '企业LOGO',
       enterpriseLogo: '企业LOGO',
       enterpriseAlbum: '企业相册',
       enterpriseAlbum: '企业相册',
       welfareLabel: '福利标签',
       welfareLabel: '福利标签',
+      businessInformation: '工商信息',
       enterpriseVideo: '企业视频',
       enterpriseVideo: '企业视频',
       recruitmentQRCode: '招聘二维码',
       recruitmentQRCode: '招聘二维码',
     },
     },

+ 5 - 0
src/views/enterprise/informationManagement/informationSettings.vue

@@ -8,6 +8,7 @@
           <v-tab :value="2">{{ $t('enterprise.infoSetting.enterpriseLogo') }}</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="3">{{ $t('enterprise.infoSetting.enterpriseAlbum') }}</v-tab>
           <v-tab :value="4">{{ $t('enterprise.infoSetting.welfareLabel') }}</v-tab>
           <v-tab :value="4">{{ $t('enterprise.infoSetting.welfareLabel') }}</v-tab>
+          <v-tab :value="5">{{ $t('enterprise.infoSetting.businessInformation') }}</v-tab>
           <!-- <v-tab :value="5">{{ $t('enterprise.infoSetting.enterpriseVideo') }}</v-tab>
           <!-- <v-tab :value="5">{{ $t('enterprise.infoSetting.enterpriseVideo') }}</v-tab>
           <v-tab :value="6">{{ $t('enterprise.infoSetting.recruitmentQRCode') }}</v-tab> -->
           <v-tab :value="6">{{ $t('enterprise.infoSetting.recruitmentQRCode') }}</v-tab> -->
         </v-tabs>
         </v-tabs>
@@ -24,6 +25,9 @@
           <v-window-item :value="4">
           <v-window-item :value="4">
             <welfareLabel></welfareLabel>
             <welfareLabel></welfareLabel>
           </v-window-item>
           </v-window-item>
+          <v-window-item :value="5">
+            <businessInformation></businessInformation>
+          </v-window-item>
           <!-- <v-window-item :value="5">
           <!-- <v-window-item :value="5">
             <enterpriseVideo></enterpriseVideo>
             <enterpriseVideo></enterpriseVideo>
           </v-window-item>
           </v-window-item>
@@ -41,6 +45,7 @@ import basicInfo from './informationSettingsComponents/basicInfo.vue'
 import enterpriseLogo from './informationSettingsComponents/enterpriseLogo.vue'
 import enterpriseLogo from './informationSettingsComponents/enterpriseLogo.vue'
 import enterpriseAlbum from './informationSettingsComponents/enterpriseAlbum.vue'
 import enterpriseAlbum from './informationSettingsComponents/enterpriseAlbum.vue'
 import welfareLabel from './informationSettingsComponents/welfareLabel.vue'
 import welfareLabel from './informationSettingsComponents/welfareLabel.vue'
+import businessInformation from './informationSettingsComponents/businessInformation.vue'
 // import enterpriseVideo from './informationSettingsComponents/enterpriseVideo.vue'
 // import enterpriseVideo from './informationSettingsComponents/enterpriseVideo.vue'
 // import recruitmentQRCode from './informationSettingsComponents/recruitmentQRCode.vue'
 // import recruitmentQRCode from './informationSettingsComponents/recruitmentQRCode.vue'
 import { provide, ref, watch } from 'vue'
 import { provide, ref, watch } from 'vue'

+ 10 - 0
src/views/enterprise/informationManagement/informationSettingsComponents/businessInformation.vue

@@ -0,0 +1,10 @@
+<!-- 工商信息 -->
+<template>
+  <div>vue3PageInit</div>
+</template>
+
+<script setup>
+defineOptions({name: 'informationSettingsComponents-businessInformation'})
+</script>
+<style lang="scss" scoped>
+</style>

+ 18 - 1
src/views/resume/components/vocationalSkills.vue

@@ -48,10 +48,27 @@ const formPageRef = ref()
 const type = ref('')
 const type = ref('')
 const editId = ref(null)
 const editId = ref(null)
 const skills = [{ label: '英语四级', value: '0' }, { label: '英语六级', value: '1' }, { label: 'office办公软件', value: '2' }]
 const skills = [{ label: '英语四级', value: '0' }, { label: '英语六级', value: '1' }, { label: 'office办公软件', value: '2' }]
+
+// const skills = [
+//   { label: '一级-1', value: '0' },
+//   { label: '财务-1', value: '1',
+//     children: [
+//       { 
+//         label: '会计-2', value: '22222',
+//         children: [
+//           { label: '注册会计师一级-3', value: '33333', },
+//           { label: '注册会计师二级-3', value: '33334', }
+//         ]
+//       },
+//       { label: '出纳-2', value: '498640' },
+//     ]
+//   },
+//   { label: '其他一级-1', value: '2' }
+// ]
 const formItems = ref({
 const formItems = ref({
   options: [
   options: [
     {
     {
-      type: 'autocomplete',
+      type: 'autocomplete', // nestedListGroup autocomplete
       key: 'skillId',
       key: 'skillId',
       value: null,
       value: null,
       default: null,
       default: null,

+ 1 - 0
src/views/resume/index.vue

@@ -46,6 +46,7 @@ import { onMounted } from 'vue';
 const scrollBox = ref()
 const scrollBox = ref()
 
 
 const comList = [
 const comList = [
+  // { path: vocationalSkills, id: 'resumeVocationalSkills', domId: 'vocationalSkills' },
   { path: basicInfo, id: 'resumeBasicInfo', domId: 'basicInfo' }, // domId与items中的id保持一致
   { path: basicInfo, id: 'resumeBasicInfo', domId: 'basicInfo' }, // domId与items中的id保持一致
   { path: selfEvaluation, id: 'resumeSelfEvaluation', domId: 'selfEvaluation' },
   { path: selfEvaluation, id: 'resumeSelfEvaluation', domId: 'selfEvaluation' },
   { path: jobIntention, id: 'resumeJobIntention', domId: 'jobIntention' },
   { path: jobIntention, id: 'resumeJobIntention', domId: 'jobIntention' },