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

src/api/menduner/system/position/index.ts

@@ -8,7 +8,7 @@ export interface PositionVO {
   parentId: number // 上级id
   level: boolean // 层级
   requirement: string // 默认职位要求
-  describe: string // 默认职位描述内容
+  content: string // 默认职位描述内容
 }
 
 // 职位信息 API

src/components/Editor/src/Editor.vue

@@ -59,6 +59,10 @@ const handleCreated = (editor: IDomEditor) => {
   editorRef.value = editor
 }
 
+// 编辑器配置
+import { getExcludeKeys } from './util/toolbarConfig'
+const toolbarConfig = reactive({ excludeKeys: getExcludeKeys() })
+
 // 编辑器配置
 const editorConfig = computed((): IEditorConfig => {
   return Object.assign(
@@ -185,6 +189,7 @@ defineExpose({
     <Toolbar
       :editor="editorRef"
       :editorId="editorId"
+      :defaultConfig="toolbarConfig"
       class="border-0 b-b-1 border-solid border-[var(--tags-view-border-color)]"
     />
     <!-- 编辑器 -->

src/components/Editor/src/util/toolbarConfig.js

@@ -0,0 +1,43 @@
+// 排除掉某些菜单 // getAllMenuKeys查看所有菜单
+export const getExcludeKeys = () => {
+  // 排除
+  const excludeKeys = [
+    'fontFamily',
+    'emotion',
+    'insertLink',
+    'editLink',
+    'unLink',
+    'viewLink',
+    'fullScreen',
+    'todo',
+    // 表格
+    'insertTable',
+    'deleteTable',
+    'insertTableRow',
+    'deleteTableRow',
+    'insertTableCol',
+    'deleteTableCol',
+    'tableHeader',
+    'tableFullWidth',
+    // 图片
+    'group-image',
+    'insertImage',
+    'deleteImage',
+    'editImage',
+    'viewImageLink',
+    'imageWidth30',
+    'imageWidth50',
+    'imageWidth100',
+    'uploadImage',
+    // 视频
+    'group-video',
+    'insertVideo',
+    'uploadVideo',
+    'editVideoSize',
+    // 代码
+    'code',
+    'codeBlock',
+    'codeSelectLang',
+  ]
+  return excludeKeys
+}

src/views/mall/promotion/coupon/template/CouponTemplateForm.vue

@@ -57,6 +57,7 @@
           :precision="2"
           class="mr-2 !w-400px"
           placeholder="请输入优惠金额，单位：元"
+          @change="discountLimitPriceChange"
         />
         元
       </el-form-item>
@@ -90,12 +91,19 @@
         元
       </el-form-item>
       <el-form-item label="满多少元可以使用" prop="usePrice">
-        <el-input-number
+        <!-- <el-input-number
           v-model="formData.usePrice"
           :min="0"
           :precision="2"
           class="mr-2 !w-400px"
           placeholder="无门槛请设为 0"
+        /> -->
+        <el-input-number
+          v-model="formData.usePrice"
+          :min="usePriceMin || 0"
+          :precision="2"
+          class="mr-2 !w-400px"
+          placeholder="不得少于优惠券面额"
         />
         元
       </el-form-item>
@@ -383,6 +391,15 @@ function setProductScopeValues(data: CouponTemplateApi.CouponTemplateVO) {
       break
   }
 }
+
+// 优惠卷金额
+const usePriceMin = ref(null)
+const discountLimitPriceChange = (val) => {
+  const usePrice = formData.value.usePrice
+  if (val && (!usePrice || (val >= usePrice))) {
+    formData.value.usePrice = val + 0.01
+  }
+}
 </script>
 
 <style lang="scss" scoped></style>

src/views/menduner/system/position/PositionForm.vue

@@ -29,10 +29,10 @@
         </el-radio-group>
       </el-form-item> -->
       <el-form-item label="默认职位要求" prop="requirement">
-        <el-input v-model="formData.requirement" placeholder="请输入默认职位要求" />
+        <Editor v-model="formData.requirement" height="150px" />
       </el-form-item>
-      <el-form-item label="默认职位描述内容" prop="describe">
-        <el-input v-model="formData.describe" placeholder="请输入默认职位描述内容" />
+      <el-form-item label="默认职位描述内容" prop="content">
+        <Editor v-model="formData.content" height="150px" />
       </el-form-item>
       <el-form-item label="行业排序" prop="sort">
         <el-input-number v-model="formData.sort" :min="0" placeholder="请输入行业排序" />
@@ -66,7 +66,7 @@ const formData = ref({
   level: 1,
   sort: 0,
   requirement: undefined,
-  describe: undefined
+  content: undefined
 })
 const formRules = reactive({
 })
@@ -84,7 +84,12 @@ const open = async (type: string, id?: number, level?: number) => {
   if (id && !level) {
     formLoading.value = true
     try {
-      formData.value = await PositionApi.getPosition(id)
+      const res = await PositionApi.getPosition(id)
+      if (!res) return
+      // 富文本不能为null
+      if (res.requirement === null) res.requirement = undefined
+      if (res.content === null) res.content = undefined
+      formData.value = res
     } finally {
       formLoading.value = false
     }
@@ -132,7 +137,7 @@ const resetForm = () => {
     level: 1,
     sort: 0,
     requirement: undefined,
-    describe: undefined
+    content: undefined
   }
   // disabled.value = false
   formRef.value?.resetFields()

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

@@ -101,7 +101,7 @@
       <el-table-column label="层级" align="center" prop="level" />
       <el-table-column label="排序" align="center" prop="sort" />
       <el-table-column label="默认职位要求" align="center" prop="requirement" />
-      <el-table-column label="默认职位描述内容" align="center" prop="describe" />
+      <el-table-column label="默认职位描述内容" align="center" prop="content" />
       <el-table-column
         label="创建时间"
         align="center"