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

src/views/menduner/system/enterprise/message/SetVip.vue

@@ -3,7 +3,7 @@
 		<el-descriptions class="mb-50px" title="企业当前权益" :column="2" border>
 			<el-descriptions-item label="是否开启人才地图">{{ info.personMap ? '是' : '否' }}</el-descriptions-item>
 			<el-descriptions-item label="是否允许发布众聘职位">{{ info.hireJob ? '是' : '否' }}</el-descriptions-item>
-			<el-descriptions-item label="是否开启新任命">{{ info.newAppointment ? '是' : '否' }}</el-descriptions-item>
+			<!-- <el-descriptions-item label="是否开启新任命">{{ info.newAppointment ? '是' : '否' }}</el-descriptions-item> -->
 			<el-descriptions-item label="剩余发布职位数量">{{ info.publishJobCount || 0 }}个</el-descriptions-item>
 			<el-descriptions-item label="剩余搜索人才数量">{{ info.searchCount || 0 }}次</el-descriptions-item>
 			<el-descriptions-item label="剩余查看简历数量">{{ info.lookCvCount || 0 }}次</el-descriptions-item>
@@ -43,9 +43,9 @@
       <el-form-item label="允许发布众聘职位" prop="entitlement.hireJob" :rules="[{ required: true, message: '请设置是否允许发布众聘职位', trigger: 'change' }]">
         <el-switch v-model="formData.entitlement.hireJob" />
       </el-form-item>
-      <el-form-item label="开启新任命" prop="entitlement.newAppointment" :rules="[{ required: true, message: '请设置是否开启新任命', trigger: 'change' }]">
+      <!-- <el-form-item label="开启新任命" prop="entitlement.newAppointment" :rules="[{ required: true, message: '请设置是否开启新任命', trigger: 'change' }]">
         <el-switch v-model="formData.entitlement.newAppointment" />
-      </el-form-item>
+      </el-form-item> -->
     </el-form>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@@ -72,7 +72,7 @@ const formData = ref({
     lookCvCount: 0,
     personMap: false,
     hireJob: false,
-    newAppointment: false
+    // newAppointment: false
   }
 })
 const formRef = ref()
@@ -172,7 +172,7 @@ const resetForm = () => {
       lookCvCount: 0,
       personMap: false,
       hireJob: false,
-      newAppointment: false
+      // newAppointment: false
     }
   }
 }

src/views/menduner/system/web/WebContentForm.vue

@@ -36,6 +36,9 @@
       <el-form-item label="标题" prop="title">
         <el-input v-model="formData.title" placeholder="请填写" />
       </el-form-item>
+      <el-form-item label="排序" prop="sort">
+        <el-input v-model="formData.sort" placeholder="请填写" />
+      </el-form-item>
       <el-form-item label="状态" prop="status" required>
         <el-radio-group v-model="formData.status">
           <el-radio value="0">激活</el-radio>
@@ -65,7 +68,7 @@ const formData = ref({
   link: '',
   title: '',
   status: '0',
-  // sort: 0,
+  sort: 0,
   url: ''
 })
 const maxWidth = ref(0)
@@ -125,8 +128,8 @@ const open = async (type: string, key: string, title: string, mark?: string) =>
     // 编辑
     if (mark) {
       editId.value = mark
-      const { img: url, link, title, status } = query.value[key].find(e => e.mark === mark)
-      formData.value = { url, link, title, status }
+      const { img: url, link, title, status, sort } = query.value[key].find(e => e.mark === mark)
+      formData.value = { url, link, title, status, sort }
     }
   } finally {
     formLoading.value = false
@@ -145,7 +148,7 @@ const submitForm = async () => {
   await formRef.value.validate()
   
   const mark = new Date().getTime().toString()
-  const obj = { img: formData.value.url, link: formData.value.link, mark, title: formData.value.title, status: formData.value.status }
+  const obj = { img: formData.value.url, link: formData.value.link, mark, title: formData.value.title, status: formData.value.status, sort: formData.value.sort }
   if (formType.value === 'add') {
     query.value[currentKey.value] = query.value[currentKey.value] ? [...query.value[currentKey.value], obj] : [obj]
   } else {
@@ -190,7 +193,7 @@ const resetForm = () => {
     title: '',
     status: '0',
     url: '',
-    // sort: 0
+    sort: 0
   }
   formRef.value?.resetFields()
 }

src/views/menduner/system/web/index.vue

@@ -18,8 +18,9 @@
     </div>
 
     <el-table v-if="tab !== 9" v-loading="loading" :data="info[tabList[tab].key]" :stripe="true">
+      <el-table-column label="排序" align="center" prop="sort" />
       <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="图片" align="center" prop="img">
+      <el-table-column label="图片" align="center" prop="img" width="200">
         <template #default="scope">
           <el-image v-if="scope.row.img" class="h-150px w-200px" :initial-index="info[tabList[tab].key].findIndex(e => e.mark === scope.row.mark)" :src="scope.row.img" lazy preview-teleported :preview-src-list="info[tabList[tab].key].map(e => e.img)" fit="scale-down" />
         </template>