fix: 111

src/views/staff/detailsModal.vue

@@ -12,7 +12,7 @@
   </BasicModal>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, computed } from 'vue';
+  import { defineComponent, ref, reactive, 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';
@@ -27,7 +27,19 @@
     },
     emits: ['ok'],
     setup(_, context) {
-      const modelRef = ref({});
+      const modelRef = reactive({
+        id: '',
+        createUserId: '',
+        createUserName: '',
+        dingAccount: '',
+        nickName: '',
+        roleId: '',
+        roleName: '',
+        userName: '',
+        status: '',
+        createTime: '',
+        pendingStatus: '',
+      });
       const userStore = useUserStore();
       const userinfo = computed(() => userStore.getUserInfo);
       const preventAutoFill = ref(true);
@@ -47,34 +59,15 @@
       });
       const schemas: FormSchema[] = [
         {
-          field: 'nickName',
+          field: 'userName',
           component: 'Input',
-          label: '姓名',
+          label: '账号',
           colProps: {
             span: 20,
           },
           componentProps: {
-            maxLength: 15,
+            disabled: true,
           },
-          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',
@@ -88,13 +81,22 @@
             span: 20,
           },
           componentProps: {
+            listHeight: 120,
             api: getRoleListByParam,
-              labelField: 'roleName',
-              valueField: 'id',
-              params: {
-                type: 1,
-              },
-            }
+            labelField: 'roleName',
+            valueField: 'id',
+            params: {
+              type: 1,
+            },
+          },
+        },
+        {
+          field: 'dingAccount',
+          component: 'Input',
+          label: '钉钉账号',
+          colProps: {
+            span: 20,
+          },
         },
         {
           field: 'id',
@@ -121,15 +123,21 @@
         // 方式1;
         console.log('useModalInner', data);
         // preventAutoFill.value = false
-        setTimeout(()=>{
-            console.log('useModalInner', data);
-            setFieldsValue({
+        modelRef.id = data.id;
+        modelRef.createTime = data.createTime;
+        modelRef.createUserId = data.createUserId;
+        modelRef.createUserName = data.createUserName;
+        modelRef.dingAccount = data.dingAccount;
+        modelRef.nickName = data.nickName;
+        modelRef.pendingStatus = data.pendingStatus;
+        modelRef.roleName = data.roleName;
+        modelRef.status = data.status;
+        modelRef.userName = data.userName;
+        setTimeout(() => {
+          setFieldsValue({
             ...data,
-            userName:'',
-            password:'',
-            roleId: data.roleId != 2 ? data.roleId : '',
           });
-        },200)
+        }, 200);
       }
       function companyIdChange(companyId) {
         // resetFields(['permList'])
@@ -149,14 +157,14 @@
       }
       async function handleOk() {
         let data = await validate();
+        console.log('modelRef', modelRef);
         const requestApi = data.id ? updateApi : saveApi;
         let res = await requestApi({
+          ...modelRef,
           ...data,
           // userName: data.phone,
           phone: data.phone,
-          nickName: data.nickName,
-          roleId: data.roleId,
-          id: data.id,
+          // nickName: data.nickName,
         });
         context && context.emit('ok', res);
         createMessage.success(t('common.optSuccess'));

src/views/staff/list.vue

@@ -23,6 +23,11 @@
         <TableAction
           :actions="[
             {
+              label: '编辑',
+              ifShow:getCheckPerm('sysuser-update'),
+              onClick:handleEdit.bind(null, record),
+            },
+            {
               label: '删除',
               color: 'error',
               ifShow:getCheckPerm('sysuser-delete'),
@@ -170,7 +175,7 @@
           // ifShow: !getCheckRole('tourist'),
           slots: { customRender: 'action' },
           fixed: 'right',
-          width: 50,
+          width: 60,
         },
       ];
 
@@ -200,7 +205,8 @@
               xl: 6,
               xxl: 6,
             },
-          },{
+          },
+          {
             field: 'roleId',
             label: '角色',
             component: 'ApiSelect',