update: 需求优化内容，能力推荐交互优化

src/bg-ui/bg-permission-option.vue

@@ -11,8 +11,9 @@
         :indeterminate="option.isIndeterminate"
         @change="changeSelf"
       >
-        <span :title="option.name">
+        <span :title="option.name + (option.remark ? `(${option.remark})` : '')">
           {{ option.name }}
+          {{option.remark ? `(${option.remark})` : ""}}
         </span>
       </el-checkbox>
     </div>

src/bg-ui/bg-permission.vue

@@ -98,6 +98,7 @@ export default {
         name: nameProp,
         value: valueProp,
         children: childrenProp,
+        remark: remarkProp,
       } = this.props;
       let permissionData = [];
       let traverseOptions = (item) => {
@@ -107,9 +108,11 @@ export default {
         let children = item[childrenProp];
         let isSelected = this.values.indexOf(value) > -1;
         let isIndeterminate = false;
+        let remark = item[remarkProp];
 
         result.name = name;
         result.value = value;
+        result.remark = remark;
 
         if (children && children.length > 0) {
           

src/bg-ui/index.scss

@@ -2565,7 +2565,7 @@ a {
       text-overflow: ellipsis;
       word-break: break-all;
       white-space: nowrap;
-      width: 8em;
+      width: 10em;
       display: inline-block;
       vertical-align: middle;
       line-height: 16px;

src/components/ability-card.vue

 <template>
-  <div class="item_card">
+  <div class="item_card" :style="{'height':props.flag ? '242px' : '206px'}">
     <div class="action_box" v-if="props.flag">
       <div class="can_click_text" @click="deleteItem(props.item)">删除</div>
       <div class="can_click_text" @click="move(1)" :class="props.item.canDown ? '' : 'disabled'">下移</div>
       <div class="can_click_text" @click="move(2)" :class="props.item.canUp ? '' : 'disabled'">上移</div>
     </div>
-    <div class="top_info">
+    <div class="top_info" :style="{'padding-left': !props.flag ? '8px' : '24px'}">
       <el-checkbox
+        v-if="!props.flag"
         class="select_box"
         v-model="props.item.checked"
         @change="change_check"
@@ -54,7 +55,7 @@
         </div>
       </div>
     </div>
-    <div class="bottom_info">
+    <div class="bottom_info" :style="{'height':props.flag ? 'calc(100% - 128px)' : 'calc(100% - 92px)'}">
       <div class="desc" :title="props.item.synopsis">
         {{props.item.synopsis}}
       </div>
@@ -112,8 +113,8 @@ const move = (type) => {
 <style lang="scss" scoped>
 
 .item_card {
-  width: 100%;
-  margin-right: 16px;
+  width: 384px;
+  // margin-right: 16px;
   margin-bottom: 16px;
   height: 206px;
   background-color: #ffffff;
@@ -129,6 +130,8 @@ const move = (type) => {
     display: flex;
     line-height: 36px;
     flex-direction: row-reverse;
+    border-radius: 6px 6px 0 0;
+    font-size: 14px;
     .can_click_text {
       margin-right: 16px;
     }

src/components/ability-list.vue

 <template>
   <div class="card_list">
-    <div v-for="(e,i) in props.list" :key="'card' + i" class="item" style="width: calc((100% - 32px) / 3)">
+    <div v-for="(e,i) in props.list" :key="'card' + i" class="item">
       <ability-card v-if="e.id" :item="e" @change_check="changeCheck" :flag="props.flag" @deleteItem="deleteItem" @move="move"/>
       <div v-else class="empty_card" @click="open">
         <span>+</span>
@@ -39,12 +39,15 @@ const move = (temp) => {
 
 <style lang="scss" scoped>
 .card_list {
+  width: 100%;
   display: flex;
   flex-wrap: wrap;
-  justify-content: space-between;
-  // .item {
-  //   width: calc(100% - 32px);
-  // }
+  // transform: translateX(-16px);
+  // justify-content: space-between;
+  .item {
+    // width: calc((100% - 32px) / 3);
+    margin-left: 16px;
+  }
   .empty_card {
     cursor: pointer;
     width: 384px;

src/page/main/config/dict/index.vue

@@ -102,7 +102,7 @@
       >
         <el-form-item label="名称" prop="name">
           <el-input
-            v-model="formData.name"
+            v-model.trim="formData.name"
             show-word-limit
             :maxlength="
               nodeClassifyId == 'eb9c7d70-c123-42b7-8e61-dde1b022b669' 

src/page/main/develop/account/detail/index.vue

@@ -26,7 +26,7 @@
             </div>
             <div>
                 <div class="title">
-                    <div><span  class="icon_box"></span> 基础信息</div>
+                    <div><span  class="icon_box"></span> 联系人信息</div>
                     <div class="dashed_line">
                     </div>
                 </div>

src/page/main/develop/menu/menu-form.vue

@@ -9,7 +9,7 @@
     class="menu_form"
   >
     <el-form-item label="菜单名称" prop="menu_name">
-      <el-input v-model="menuForm.menu_name" show-word-limit maxlength="8" placeholder="请输入菜单名称" />
+      <el-input v-model.trim="menuForm.menu_name" show-word-limit maxlength="8" placeholder="请输入菜单名称" />
     </el-form-item>
     <el-form-item label="类型" prop="menu_type" v-if="!topLevel">
       <el-radio-group v-model="menuForm.menu_type" :disabled="radioDisabled">
@@ -56,6 +56,7 @@
         inline-prompt
         active-text="是"
         inactive-text="否"
+        :disabled="disabledSwitch"
       />
     </el-form-item>
     <el-form-item label="菜单路径" :prop="topLevel ? '' : 'menu_url'">
@@ -174,6 +175,7 @@ const state = reactive({
   topLevel: false,
   typeDisFlag: null,
   groupFlag: true,
+  disabledSwitch: false, // 内置菜单built_in为1-不可禁用 0或不存在-可禁用
 })
 
 const getGroupList = () => {
@@ -244,6 +246,7 @@ const setForm = (data) => {
   }else {
     state.radioDisabled = false
   }
+  state.disabledSwitch = data.built_in && data.built_in == 1 ? true : false
   state.menuForm = Object.assign(state.menuForm, data);
 } // 表单赋值
 
@@ -281,6 +284,7 @@ const {
   typeDisFlag,
   groupFlag,
   systemGroupList,
+  disabledSwitch,
 } = toRefs(state)
 
 defineExpose({ setForm , menuForm, menuRef })

src/page/main/home-config/recommend/edit/type-form.vue

@@ -6,8 +6,8 @@
     style="max-width: 1048px"
     class="form"
   >
-    <el-form-item label="能力类型" prop="type">
-      <el-select v-model="formData.type" placeholder="请选择能力类型" style="width: 100%" @change="changeType">
+    <el-form-item label="能力类型" prop="business_type_id">
+      <el-select v-model="formData.business_type_id" placeholder="请选择能力类型" style="width: 100%" @change="changeType">
         <el-option
           v-for="item in TypeList"
           :key="item.dict_id"
@@ -16,8 +16,8 @@
         />
       </el-select>
     </el-form-item>
-    <el-form-item label="上传图标" prop="icon">
-       <bg-upload-image v-model="formData.icon" :fileSize="500" :fileSizeUnit="'KB'" :showTips="true" customTips="请选择图片上传：大小36 * 36像素支持jpg、png等格式，图片需小于500KB" :limit="1" listType="picture-card" :accept="['.jpg','.jpeg','.png']"></bg-upload-image>
+    <el-form-item label="上传图标" prop="logo">
+       <bg-upload-image v-model="formData.logo" :fileSize="500" :fileSizeUnit="'KB'" :showTips="true" customTips="请选择图片上传：大小36 * 36像素支持jpg、png等格式，图片需小于500KB" :limit="1" listType="picture-card" :accept="['.jpg','.jpeg','.png']"></bg-upload-image>
     </el-form-item>
   </el-form>
 </template>
@@ -32,14 +32,14 @@ const route = useRoute()
 const form = ref(null)
 const state = reactive({
   formData: {
-    type: "",
-    icon: [],
+    business_type_id: "",
+    logo: [],
   },
   formRules: {
-    type: [
+    business_type_id: [
       { required: true, message: '请选择业务类型', trigger: 'change' },
     ],
-    icon: [
+    logo: [
       { required: true, message: '请上传图标', trigger: 'change' },
     ],
   },

src/page/main/system/role/add/role_form.vue

@@ -17,7 +17,7 @@
           class="role_form"
         >
           <el-form-item prop="role_name" label="角色名称">
-            <el-input v-model="formData.role_name" maxlength="50" show-word-limit :disabled="rowType != 0" />
+            <el-input v-model.trim="formData.role_name" maxlength="50" show-word-limit :disabled="rowType != 0" />
           </el-form-item>
           <el-form-item prop="role_desc" label="描述">
             <el-input
@@ -117,6 +117,7 @@ const roleState = reactive({
     name: 'menu_name',
     value: 'id',
     children: 'Child',
+    remark: 'remark',
   }, // 菜单框默认配置
   permissionData: [], // 菜单数据
   rowType: 0,