feat(组件): 修改bug

src/api/staff/list.ts

@@ -7,6 +7,7 @@ enum Api {
   pageList = '/service/manage/sysUser/list',
   sysUserAdd = '/service/manage/sysUser/add',
   updatePassword = '/service/manage/sysUser/rePassword',
+  reMyselfPassword = '/service/manage/sysUser/reMyselfPassword',
   preDel = '/service/manage/sysUser/delete',
   roleList = '/zfb-api/zfb/shop/sys/user/roleList',
   getRoleListByParam = '/service/manage/sysRole/allList',
@@ -39,6 +40,13 @@ export function updatePasswordApi(params) {
       // { errorMessageMode: 'none' },
     );
 } 
+
+export function reMyselfPassword(params) {
+  return defHttp.post<Result>(
+    { url: Api.updatePassword, params },
+    // { errorMessageMode: 'none' },
+  );
+} 
 export const staffListApi = (params: PageParams) =>
   defHttp.post<ListGetResultModel>({
     url: Api.pageList,

src/components/Tinymce/src/Editor.vue

@@ -81,6 +81,10 @@
     value: {
       type: String,
     },
+    maxlength: {
+      type: Number,
+      default: 100000,
+    },
 
     toolbar: {
       type: Array as PropType<string[]>,
@@ -146,6 +150,7 @@
 
       const initOptions = computed((): RawEditorSettings => {
         const { height, options, toolbar, plugins } = props;
+        console.log('maxlength',props)
         const publicPath = import.meta.env.VITE_PUBLIC_PATH || '/';
         return {
           selector: `#${unref(tinymceId)}`,

src/layouts/default/header/components/user-dropdown/setpaswordModal.vue

@@ -18,7 +18,7 @@
   import { defineComponent, nextTick, ref } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
-  import { updatePasswordApi } from '/@/api/staff/list';
+  import { reMyselfPassword } from '/@/api/staff/list';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useUserStore } from '/@/store/modules/user';
 
@@ -132,7 +132,7 @@
         console.log('getUserInfo',getUserInfo)
         const { id } = getUserInfo
         const { password,oldPassword } = await validate();
-        await updatePasswordApi({ 
+        await reMyselfPassword({ 
           id, 
           newPassword: encodeStr(window.btoa(password)),
           oldPassword: encodeStr(window.btoa(oldPassword)),

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

@@ -138,6 +138,24 @@
           colProps: {
             span: 22,
           },
+          rules: [
+            {
+              required: true,
+              // @ts-ignore
+              validator: async (rule, value) => {
+                console.log('validator',value)
+                if (!value) {
+                  return Promise.reject('请输入新闻内容');
+                }
+                if (value.length > 10000) {
+                  /* eslint-disable-next-line */
+                  return Promise.reject('新闻内容不能超过10000');
+                }
+                return Promise.resolve();
+              },
+              trigger: 'change',
+            },
+          ],
           render: ({ model, field }) => {
             return h(Tinymce, {
               value: model[field],

src/views/staff/adddetailsModal.vue

@@ -0,0 +1,228 @@
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    @cancel="resetFields"
+    @register="register"
+    :title="title"
+    :min-height="350"
+    height="500"
+    @ok="handleOk"
+  >
+    <BasicForm @register="registerForm" />
+  </BasicModal>
+</template>
+<script lang="ts">
+  import { defineComponent, ref, computed } from 'vue';
+  import { checkUserApi, saveApi, updateApi, getRoleListByParam } from '/@/api/staff/list'; //roleLIstApi
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { useUserStore } from '/@/store/modules/user';
+  const { t } = useI18n();
+  export default defineComponent({
+    components: { BasicModal, BasicForm },
+    props: {
+      userData: { type: Object },
+    },
+    emits: ['ok'],
+    setup(_, context) {
+      const modelRef = ref({});
+      const userStore = useUserStore();
+      const userinfo = computed(() => userStore.getUserInfo);
+      const preventAutoFill = ref(true);
+      const { companyId } = userinfo.value;
+      const schemas: FormSchema[] = [
+        {
+          field: 'nickName',
+          component: 'Input',
+          label: '姓名',
+          colProps: {
+            span: 20,
+          },
+          componentProps: {
+            maxLength: 15,
+          },
+          rules: [
+            {
+              required: true,
+              // @ts-ignore
+              validator: async (rule, value) => {
+                var reg_tel = /^[a-zA-Z\u4e00-\u9fa5]+$/;
+                // var reg = /\S+@\S+\.\S+/;
+                if (!value) {
+                  return Promise.reject('请输入姓名');
+                }
+                if (!reg_tel.test(value)) {
+                  /* eslint-disable-next-line */
+                  return Promise.reject('请输入正确的姓名');
+                }
+                return Promise.resolve();
+              },
+              trigger: 'change',
+            },
+          ],
+        },
+        {
+          field: 'roleId',
+          component: 'ApiSelect',
+          label: '角色',
+          required: true,
+          itemProps: {
+            validateTrigger: 'blur',
+          },
+          colProps: {
+            span: 20,
+          },
+          defaultValue: '',
+          componentProps: {
+            api: getRoleListByParam,
+            labelField: 'roleName',
+            valueField: 'id',
+            params: {
+              type: 1,
+            },
+          },
+        },
+        {
+          field: 'userName',
+          component: 'Input',
+          label: '账号',
+          required: true,
+          colProps: {
+            span: 20,
+          },
+          componentProps:{
+            placeholder:"请输入字母或数字组合",
+            autoComplete:'off',
+            maxLength: 15,
+            readonly:preventAutoFill.value
+          },
+          rules: [
+            {
+              required: true,
+              // @ts-ignore
+              validator: async (rule, value) => {
+                console.log('value',value)
+                const regPos = /^[\da-z]+$/i; // 非中文
+                if (!value) {
+                  return Promise.reject('请输入字母或数字组合');
+                }
+                if (!regPos.test(value)) {
+                  /* eslint-disable-next-line */
+                  return Promise.reject('请输入字母或数字组合');
+                }
+                return Promise.resolve();
+              },
+              trigger: 'change',
+            },
+          ],
+        },
+        {
+          field: 'password',
+          component: 'StrengthMeter',
+          label: '密码',
+          required: true,
+          colProps: {
+            span: 20,
+          },
+          rules: [
+            {
+              required: true,
+              // @ts-ignore
+              validator: async (rule, value) => {
+                console.log('value',value)
+                const regPos = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/; // 非中文
+                if (!value) {
+                  return Promise.reject('请输入8-16位数字、字母大小写组合');
+                }
+                if (!regPos.test(value)) {
+                  /* eslint-disable-next-line */
+                  return Promise.reject('请输入8-16位数字、字母大小写组合');
+                }
+                return Promise.resolve();
+              },
+              trigger: 'change',
+            },
+          ],
+          componentProps:{
+            placeholder:"请输入8-16位数字、字母大小写组合",
+            maxLength: 16,
+            readonly:preventAutoFill.value,
+            minLength: 8,
+            autoComplete:'off',
+          }
+        },
+        {
+          field: 'id',
+          component: 'Input',
+          label: 'id',
+          show: false,
+        },
+      ];
+      const title = ref('编辑账号');
+      const { createMessage } = useMessage();
+      const [registerForm, { setFieldsValue, validate, updateSchema, resetFields }] = useForm({
+        labelWidth: 120,
+        schemas,
+        showActionButtonGroup: false,
+        actionColOptions: {
+          span: 24,
+        },
+      });
+
+      const [register, { closeModal }] = useModalInner((data) => {
+        data && onDataReceive(data);
+      });
+      function onDataReceive(data) {
+        // 方式1;
+        setTimeout(()=>{
+          // updateSchema(setSchema);
+        },500)
+      }
+      function companyIdChange(companyId) {
+        // resetFields(['permList'])
+        updateSchema([
+          {
+            field: 'permList',
+            componentProps: {
+              params: {
+                companyId: companyId,
+              },
+            },
+          },
+        ]);
+        setFieldsValue({
+          permList: [],
+        });
+      }
+      async function handleOk() {
+        let data = await validate();
+        const requestApi = data.id ? updateApi : saveApi;
+        let res = await requestApi({
+          ...data,
+          // userName: data.phone,
+          phone: data.phone,
+          nickName: data.nickName,
+          roleId: data.roleId,
+          id: data.id,
+        });
+        context && context.emit('ok', res);
+        createMessage.success(t('common.optSuccess'));
+        closeModal();
+        resetFields();
+      }
+
+      return {
+        register,
+        title,
+        preventAutoFill,
+        schemas,
+        registerForm,
+        modelRef,
+        handleOk,
+        resetFields,
+      };
+    },
+  });
+</script>

src/views/staff/detailsModal.vue

@@ -4,7 +4,7 @@
     @cancel="resetFields"
     @register="register"
     :title="title"
-    :min-height="300"
+    :min-height="200"
     height="500"
     @ok="handleOk"
   >
@@ -87,85 +87,14 @@
           colProps: {
             span: 20,
           },
-          defaultValue: 8,
           componentProps: {
-            options: [
-              {
-                label: '公司员工',
-                value: 8,
-                key: 8,
-              },
-            ],
-          },
-        },
-        {
-          field: 'userName',
-          component: 'Input',
-          label: '账号',
-          required: true,
-          colProps: {
-            span: 20,
-          },
-          componentProps:{
-            placeholder:"请输入字母或数字组合",
-            autoComplete:'off',
-            maxLength: 15,
-            readonly:preventAutoFill.value
-          },
-          rules: [
-            {
-              required: true,
-              // @ts-ignore
-              validator: async (rule, value) => {
-                console.log('value',value)
-                const regPos = /^[\da-z]+$/i; // 非中文
-                if (!value) {
-                  return Promise.reject('请输入字母或数字组合');
-                }
-                if (!regPos.test(value)) {
-                  /* eslint-disable-next-line */
-                  return Promise.reject('请输入字母或数字组合');
-                }
-                return Promise.resolve();
-              },
-              trigger: 'change',
-            },
-          ],
-        },
-        {
-          field: 'password',
-          component: 'StrengthMeter',
-          label: '密码',
-          required: true,
-          colProps: {
-            span: 20,
-          },
-          rules: [
-            {
-              required: true,
-              // @ts-ignore
-              validator: async (rule, value) => {
-                console.log('value',value)
-                const regPos = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/; // 非中文
-                if (!value) {
-                  return Promise.reject('请输入8-16位数字、字母大小写组合');
-                }
-                if (!regPos.test(value)) {
-                  /* eslint-disable-next-line */
-                  return Promise.reject('请输入8-16位数字、字母大小写组合');
-                }
-                return Promise.resolve();
+            api: getRoleListByParam,
+              labelField: 'roleName',
+              valueField: 'id',
+              params: {
+                type: 1,
               },
-              trigger: 'change',
-            },
-          ],
-          componentProps:{
-            placeholder:"请输入8-16位数字、字母大小写组合",
-            maxLength: 16,
-            readonly:preventAutoFill.value,
-            minLength: 8,
-            autoComplete:'off',
-          }
+            }
         },
         {
           field: 'id',
@@ -201,69 +130,6 @@
             roleId: data.roleId != 2 ? data.roleId : '',
           });
         },200)
-        let setSchema = [
-          {
-            field: 'roleId',
-            component: 'ApiSelect',
-            componentProps: {
-              // disabled: data.roleId == 2 ? false : data.id ? true : false,
-              api: getRoleListByParam,
-              labelField: 'roleName',
-              valueField: 'id',
-              params: {
-                type: data.roleId ? 1 : 0,
-                roleId: data.roleId,
-              },
-            },
-          },
-          {
-            field: 'phone',
-            componentProps: {
-              // disabled: getCheckRole('plat_admin') ? false : data.id ? true : false,
-            },
-          },
-          {
-            field: 'userName',
-            ifShow:data.id ? false:true,
-            componentProps: {
-              placeholder:"请输入字母或数字组合",
-              autoComplete:'off',
-              readonly:false,
-              maxLength: 15,
-            },
-          },
-          {
-            field: 'password',
-            ifShow:data.id ? false:true,
-            componentProps:{
-              disabled: data.id ? (data.roleId != 2 ? true : false) : false,
-              placeholder:"请输入8-16位数字、字母大小写组合",
-              maxLength: 16,
-              minLength: 8,
-              readonly:false,
-              autoComplete:'off',
-            }
-          },
-          {
-            field: 'companyId',
-            componentProps: {
-              disabled: data.id ? (data.roleId != 2 ? true : false) : false,
-            },
-          },
-          {
-            field: 'permList',
-            componentProps: {
-              disabled: data.roleId == 2 ? false : data.id ? true : false,
-              params: {
-                companyId: data.companyId || companyId,
-              },
-            },
-          },
-        ];
-        title.value = data.id ? '编辑账号' : '新增账号';
-        setTimeout(()=>{
-          updateSchema(setSchema);
-        },500)
       }
       function companyIdChange(companyId) {
         // resetFields(['permList'])

src/views/staff/list.vue

@@ -47,7 +47,7 @@
     </BasicTable>
     <DetailsModal @register="registerDetail" @ok="reload" />
     <SetpaswordModal @register="register" @reload="reload" />
-    <!--<DelListModal @register="registerDelList" @reload="reload" /> -->
+    <addDetailsModal @register="registerAddDetail" @ok="reload" />
   </div>
 </template>
 <script lang="ts">
@@ -58,7 +58,8 @@
   import { uploadApi } from '/@/api/sys/upload';
   import SetpaswordModal from './setpaswordModal.vue';
   import DetailsModal from './detailsModal.vue';
-import { Switch } from 'ant-design-vue';
+  import addDetailsModal from './adddetailsModal.vue';
+  import { Switch } from 'ant-design-vue';
   // import DelListModal from './delListModal.vue';
   import { Alert } from 'ant-design-vue';
   // import { h } from 'vue';
@@ -78,7 +79,7 @@ import { Switch } from 'ant-design-vue';
       Time,
       SetpaswordModal,
       DetailsModal,
-      // DelListModal,
+      addDetailsModal,
       Alert,
     },
     setup() {
@@ -88,6 +89,7 @@ import { Switch } from 'ant-design-vue';
         shotNum: 0,
       });
       const [registerDetail, { openModal: openDetaileModal }] = useModal();
+      const [registerAddDetail, { openModal: openAddDetaileModal }] = useModal();
       const [registerDelList, { openModal: openDelListeModal }] = useModal();
       const { createConfirm, createMessage } = useMessage();
       const userStore = useUserStore();
@@ -280,14 +282,7 @@ import { Switch } from 'ant-design-vue';
         openModal(true, record);
       }
       function handleCreate() {
-        // if (
-        //   getCheckRole([RoleEnum.COMPANY_ADMIN]) &&
-        //   surplusSubNum.value.lookNum == 0 &&
-        //   surplusSubNum.value.shotNum == 0
-        // ) {
-        //   return createMessage.error('新增失败，可添加员工数量为0个');
-        // }
-        openDetaileModal(true, {});
+        openAddDetaileModal(true,{});
       }
       function handleEdit(record: Recordable) {
         openDetaileModal(true, {
@@ -328,6 +323,7 @@ import { Switch } from 'ant-design-vue';
         registerTable,
         registerDetail,
         registerDelList,
+        registerAddDetail,
         openDelListeModal,
         createMessage,
         handDelconfirm,

src/views/staff/setpaswordModal.vue

@@ -4,11 +4,13 @@
     @register="register"
     @ok="handSubmit"
     :title="t('routes.staff.updateBtn')"
+    :min-height="100"
     @visible-change="handleVisibleChange"
     @cancel="resetFields"
   >
     <div class="pt-3px pr-3px">
       <BasicForm @register="registerForm" />
+      <span style="margin-left:100px;color:#9f9c9c">请设置新密码，设置后，管理员可使用新密码登录。</span>
     </div>
   </BasicModal>
 </template>
@@ -42,7 +44,7 @@
           field: 'password',
           component: 'StrengthMeter',
           label: t('routes.staff.password'),
-          labelWidth: 120,
+          labelWidth: 100,
           required: true,
           rules: [
             {