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

components.d.ts

@@ -17,7 +17,6 @@ declare module 'vue' {
     Combobox: typeof import('./src/components/FormUI/combobox/index.vue')['default']
     ComboboxZhAndEn: typeof import('./src/components/FormUI/comboboxZhAndEn/index.vue')['default']
     ConfirmPaymentDialog: typeof import('./src/components/pay/confirmPaymentDialog.vue')['default']
-    copy: typeof import('./src/components/CtForm/index copy.vue')['default']
     CtBtn: typeof import('./src/components/CtVuetify/CtBtn/index.vue')['default']
     CtDialog: typeof import('./src/components/CtDialog/index.vue')['default']
     CtForm: typeof import('./src/components/CtForm/index.vue')['default']
@@ -30,9 +29,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/api/recruit/enterprise/position/index.js

@@ -13,3 +13,10 @@ export const getRecruitPositionDetails = async (id) => {
     url: `/app-api/menduner/system/recruit/position/get?id=${id}`
   })
 }
+
+// 获取企业发布职位类型权限
+export const getEnterprisePubJobTypePermission = async () => {
+  return await request.get({
+    url: '/app-api/menduner/system/recruit/enterprise/get/pub-job-type-perm'
+  })
+}

src/components/personalRecharge/initPay.vue

@@ -28,11 +28,11 @@
             </v-chip>
           </v-chip-group>
         </div>
-        <div class="font-size-14 color-666 mt-3 cursor-pointer">
+        <!-- <div class="font-size-14 color-666 mt-3 cursor-pointer">
           服务协议
           <span class="septal-line"></span>
           充值协议
-        </div>
+        </div> -->
       </div>
     </div>
     <div

src/views/mall/purchasePackage/components/packageList.vue

@@ -30,21 +30,21 @@
     </div>
   </div>
   
-  <!-- <CtDialog :visible="open" :widthType="1" :footer="false" titleClass="text-h6" title="开通会员" @close="open = false">
+  <CtDialog :visible="open" :widthType="1" :footer="false" titleClass="text-h6" title="开通会员" @close="open = false">
     <initPay
       v-if="itemInfo"
       :info="itemInfo"
       @stopInterval="null"
       @paySuccess="null"
     ></initPay>
-  </CtDialog> -->
+  </CtDialog>
 </template>
 
 <script setup>
 import { packData } from './packageList.js'
 import { ref } from 'vue'
-import Snackbar from '@/plugins/snackbar'
-// import initPay from './initPay.vue'
+// import Snackbar from '@/plugins/snackbar'
+import initPay from '@/components/personalRecharge/initPay.vue'
 defineOptions({name: 'purchasePackage-packageList'})
 
 const active = ref(2)
@@ -52,11 +52,13 @@ const handleClickItem = (val, i) => {
   active.value = i
 }
 
-// const open = ref(false)
+const open = ref(false)
+
+const itemInfo = ref(null)
+
 // 开通会员
-const handleOpenMembership = (val) => {
-  console.log(1, val)
-  Snackbar.success('还未开放此功能，敬请期待！')
+const handleOpenMembership = () => {
+  open.value = true
 }
 </script>
 <style lang="scss" scoped>

src/views/recruit/enterprise/positionManagement/components/item.vue

@@ -82,6 +82,7 @@ import { ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import { timesTampChange } from '@/utils/date'
 import { useI18n } from '@/hooks/web/useI18n'
+import { getEnterprisePubJobTypePermission } from '@/api/recruit/enterprise/position'
 import { closeJobAdvertised, enableJobAdvertised, refreshJobAdvertised, topJobAdvertised, updatePositionExpireTime, topJobAdvertisedCancel } from '@/api/position'
 import Snackbar from '@/plugins/snackbar'
 
@@ -192,8 +193,10 @@ const handleSubmit = async () => {
 
 const router = useRouter()
 // 职位编辑
-const handleEdit = (val) => {
+const handleEdit = async (val) => {
   if (props.tab !== 1) return
+  const data = await getEnterprisePubJobTypePermission()
+  if (!data || !data.length) return Snackbar.warning('没有该操作权限，请联系平台管理员升级后再试')
   router.push(`/recruit/enterprise/position/edit?id=${val.id}`)
 }
 </script>

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

@@ -48,6 +48,7 @@ import { getJobAdvertisedList, getJobAdvertisedExport, jobAdvertisedTemplateDown
 import { dealDictArrayData } from '@/utils/position'
 import { useI18n } from '@/hooks/web/useI18n'
 import { useUserStore } from '@/store/user'
+import { getEnterprisePubJobTypePermission } from '@/api/recruit/enterprise/position'
 import download from '@/utils/download'
 import Snackbar from '@/plugins/snackbar'
 import Confirm from '@/plugins/confirm'
@@ -88,6 +89,8 @@ const textItem = ref({
 })
 
 const handleAdd = async () => {
+  const data = await getEnterprisePubJobTypePermission()
+  if (!data || !data.length) return Snackbar.warning('没有该操作权限，请联系平台管理员升级后再试')
   router.push('/recruit/enterprise/position/add')
   await store.getEnterpriseUserAccountInfo()
 }