fix(bugs): 修改部分优化

src/locales/lang/zh-CN/routes/staff.ts

@@ -5,6 +5,7 @@ export default {
   setpaswd: '修改密码',
   mobile: '手机',
   permList: '权益',
+  userId: '帐号',
   createTime: '创建时间',
   updateTime: '修改时间',
   staffList: '员工列表',

src/views/operate/components/new/addModal.vue

@@ -2,7 +2,7 @@
   <BasicModal
     v-bind="$attrs"
     @register="register"
-    title="新增新闻"
+    :title="title"
     :width="1000"
     @visible-change="handleVisibleChange"
     @cancel="resetFields"
@@ -23,7 +23,7 @@
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { uploadApi } from '/@/api/product/index';
-  import { newAddNews, NewsDetail } from '/@/api/operate'
+  import { newAddNews, NewsDetail, newUpdateNews } from '/@/api/operate'
   import { useI18n } from '/@/hooks/web/useI18n';
   import { Tinymce } from '/@/components/Tinymce/index';
 
@@ -36,6 +36,7 @@
     emits: ['update', 'register'],
     setup(props, { emit }) {
       const modelRef = ref({});
+      const title = ref('新增新闻');
       const fileFlow = reactive({
         coverImageUrl:''
       })
@@ -154,12 +155,14 @@
           NewTypeChange(data.newType)
         }
         if(data.id){
+          title.value = '编辑新闻'
           const detail = await NewsDetail({id:data.id})
           setFieldsValue({
             ...detail,
             coverImageUrl:detail.coverImageUrl?[detail.coverImageUrl]:''
           });
         }else{
+          title.value = '新增新闻'
           setFieldsValue(data);
         }
       }
@@ -172,13 +175,14 @@
       } 
       const handleSubmit = async () => {
         const params = await validate();
+        let apiUrl = title.value == '新增新闻'?newAddNews:newUpdateNews
         const apiData = {
           ...params as any,
           coverImageUrl:params.coverImageUrl && params.coverImageUrl[0],
           content:params.newType == 1?params.newsUrl:params.content
         }
         try {
-          await newAddNews(apiData);
+          await apiUrl(apiData);
           closeModal();
           resetFields();
           createMessage.success(t('common.optSuccess'));
@@ -201,6 +205,7 @@
         handleSubmit,
         addListFunc,
         resetFields,
+        title,
         t,
       };
     },

src/views/staff/detailsModal.vue

@@ -46,53 +46,9 @@
       });
       const schemas: FormSchema[] = [
         {
-          field: 'phone',
-          component: 'Input',
-          label: '手机号',
-          colProps: {
-            span: 18,
-          },
-          // helpMessage: '手机号需在指房宝APP注册后才可新增',
-          required: false,
-          rules: [
-            {
-              required: true,
-              // @ts-ignore
-              validator: async (rule, value) => {
-                var reg_tel =
-                  /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
-                // var reg = /\S+@\S+\.\S+/;
-                if (!value) {
-                  return Promise.reject(t('common.phone'));
-                }
-                if (!reg_tel.test(value)) {
-                  /* eslint-disable-next-line */
-                  return Promise.reject(t('common.phoneError'));
-                }
-                return Promise.resolve();
-                // try {
-                //   if (title.value == '编辑') {
-                //     return Promise.resolve();
-                //   }
-                //   let res = await checkUserApi({ phone: value });
-                //   console.log('res', res, 'title', title.value);
-                //   if (res == true) {
-                //     return Promise.resolve();
-                //   } else {
-                //     return Promise.reject('手机号未在指房宝APP中进行注册');
-                //   }
-                // } catch (err) {
-                //   return Promise.reject(err);
-                // }
-              },
-              trigger: 'change',
-            },
-          ],
-        },
-        {
           field: 'nickName',
           component: 'Input',
-          label: '员工名称',
+          label: '姓名',
           colProps: {
             span: 22,
           },
@@ -119,33 +75,6 @@
             },
           ],
         },
-        // {
-        //   field: 'companyId',
-        //   label: '公司',
-        //   component: 'ApiSelect',
-        //   itemProps: {
-        //     validateTrigger: 'blur',
-        //   },
-        //   colProps: {
-        //     span: 22,
-        //   },
-        //   required: true,
-        //   ifShow: getCheckRole('plat_admin'),
-        //   componentProps: {
-        //     api: ListAllCompanyApi,
-        //     showSearch: true,
-        //     resultField: 'list',
-        //     labelField: 'name',
-        //     valueField: 'id',
-        //     immediate: true,
-        //     params: {
-        //       page: 1,
-        //       limit: 1000,
-        //     },
-        //     required: true,
-        //     onChange: companyIdChange,
-        //   },
-        // },
         {
           field: 'roleId',
           component: 'ApiSelect',
@@ -168,22 +97,28 @@
             ],
           },
         },
-        // {
-        //   field: 'status',
-        //   label: '状态',
-        //   component: 'RadioButtonGroup',
-        //   required: true,
-        //   defaultValue: 1,
-        //   itemProps: {
-        //     validateTrigger: 'blur',
-        //   },
-        //   componentProps: {
-        //     options: [
-        //       { label: '是', value: 1 },
-        //       { label: '否', value: 0 },
-        //     ],
-        //   },
-        // },
+        {
+          field: 'phone',
+          component: 'Input',
+          label: '账号',
+          required: true,
+          colProps: {
+            span: 18,
+          },
+          componentProps:{
+            autocomplete:'off',
+          }
+        },
+        {
+          field: 'password',
+          component: 'StrengthMeter',
+          label: t('routes.staff.password'),
+          required: true,
+          colProps: { span: 18 },
+          componentProps:{
+            autocomplete:'off',
+          }
+        },
         {
           field: 'id',
           component: 'Input',

src/views/staff/list.vue

@@ -101,6 +101,11 @@
           fixed: 'left',
           width: 60,
         },
+        {
+          title: t('routes.staff.userId'),
+          dataIndex: 'userName',
+          width: 150,
+        },
         // {
         //   title: t('routes.staff.deptName'),
         //   dataIndex: 'companyName',
@@ -114,7 +119,7 @@
         {
           title: t('routes.staff.userName'),
           dataIndex: 'nickName',
-          width: 160,
+          width: 120,
         },
         // {
         //   title: '手机',
@@ -124,7 +129,7 @@
         {
           title: t('common.roleName'),
           dataIndex: 'roleName',
-          width: 80,
+          width: 100,
         },
 
         {
@@ -145,7 +150,7 @@
           // ifShow: !getCheckRole('tourist'),
           slots: { customRender: 'action' },
           fixed: 'right',
-          width: 100,
+          width: 140,
         },
       ];
 

src/views/system/role/RoleDrawer.vue

@@ -57,7 +57,10 @@
         // 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
         if (unref(treeData).length === 0) {
           const tData = (await getMenuList({roleId:unref(roles)})) as any as TreeMenuNode[];
-          treeData.value = makeMenuTree(tData.list);
+          const list = tData.list.sort((a, b) => {
+            return (a.meta?.orderNo || 0) - (b.meta?.orderNo || 0);
+          });
+          treeData.value = makeMenuTree(list);
         }
         isUpdate.value = !!data?.isUpdate;
         console.log('isUpdate',!!data?.isUpdate)