📦 审核员初审状态

src/api/auth/UserApi.ts

@@ -10,6 +10,7 @@ export class LoginResult extends DataModel<LoginResult> {
       token: { clientSide: 'string', clientSideRequired: true },
     };
     this._beforeSolveServer = (data, self) => {
+      if (data.userinfo)
       data.token = (data.userinfo as any).token;
       return data;
     }

src/components/dynamicf/UploadImageFormItem.ts

@@ -146,13 +146,15 @@ export function useBeforeUploadVideoChecker(limitSizeMB = 4096) : (file: FileIte
  */
 export function stringUrlsToUploadedItems(arr: string[]) : FileItem[] {
   return arr.map((i, k) => {
+    if (!i)
+      return undefined;
     return {
       uid: k.toString(),
-      name: StringUtils.path.getFileName(i),
+      name: i ? StringUtils.path.getFileName(i) : '',
       status: 'done',
       url: i,
       size: 0,
       type: '',
     }
-  });
+  }).filter((i) => i !== undefined);
 }

src/pages/admin.vue

@@ -18,6 +18,7 @@
               :model="inheritorData"
               :showEdited="false"
               :showAdd="false"
+              :pageSize="16"
             >
               <!-- <div class="d-flex justify-content-end">
                 <a-button type="primary" @click="router.push({ name: 'FormWork' })">+ 新增</a-button>
@@ -48,6 +49,7 @@
               :model="inheritorData"
               :showEdited="false"
               :showAdd="false"
+              :pageSize="16"
             >
               <!-- <div class="d-flex justify-content-end">
                 <a-button type="primary" @click="router.push({ name: 'FormWork' })">+ 新增</a-button>
@@ -81,6 +83,7 @@ import { ref, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useAuthStore } from '@/stores/auth';
 import { useSimpleDataLoader } from '@/composeable/SimpleDataLoader';
+//import TestData from '@/assets/data/test.json';
 import useClipboard from 'vue-clipboard3';
 import EmptyToRecord from '@/components/parts/EmptyToRecord.vue';
 import CommonContent, { GetContentListParams } from '@/api/CommonContent';

src/pages/forms/ich.vue

@@ -142,10 +142,21 @@ const formOptions = ref<IDynamicFormOptions>({
         },
         { 
           label: '填报人', name: 'text3', type: 'static-text', 
+          hidden: { callback: (_, model) => authStore.loginType !== 0 },
           additionalProps: {
             text: authStore.userInfo?.nickname,
           }
         },
+        { 
+          label: '初审状态', name: 'progress', type: 'select', 
+          hidden: { callback: (_, model) => authStore.loginType !== 1 },
+          additionalProps: {
+            options: [
+              { text: '暂未审核', value: 0 },
+              { text: '初审通过', value: 1 },
+            ],
+          }
+        },
       ]
     },
     /* {
@@ -247,7 +258,8 @@ const formOptions = ref<IDynamicFormOptions>({
     image: [{ required: true, message: '请上传图片' }],
     level: [{ required: true, message: '请选择级别' }],
     ichType: [{ required: true, message: '请选择非遗类型' }],
-    batch: [{ required: true, message: '请输入批次' }]
+    batch: [{ required: true, message: '请输入批次' }],
+    progress: [{ required: true, message: '请选择初审状态' }],
   }
 });
 

src/pages/forms/inheritor.vue

@@ -134,10 +134,21 @@ const formOptions = ref<IDynamicFormOptions>({
         },
         { 
           label: '填报人', name: 'text3', type: 'static-text', 
+          hidden: { callback: (_, model) => authStore.loginType !== 0 },
           additionalProps: {
             text: authStore.userInfo?.nickname,
           }
         },
+        { 
+          label: '初审状态', name: 'progress', type: 'select', 
+          hidden: { callback: (_, model) => authStore.loginType !== 1 },
+          additionalProps: {
+            options: [
+              { text: '暂未审核', value: 0 },
+              { text: '初审通过', value: 1 },
+            ],
+          }
+        },
       ]
     },
     /* {
@@ -255,6 +266,7 @@ const formOptions = ref<IDynamicFormOptions>({
     level: [{ required: true, message: '请选择级别' }],
     batch: [{ required: true, message: '请输入批次' }],
     ichType: [{ required: true, message: '请选择非遗类型' }],
+    progress: [{ required: true, message: '请选择初审状态' }],
   }
 });
 

src/pages/login.vue

@@ -45,12 +45,12 @@ const formOptions = ref<IDynamicFormOptions>({
   },
   formItems: [
     {
-      label: '手机号',
+      label: '账号',
       name: 'mobile',
       type: 'text',
       hidden: { callback: (_, m) => (m as any).type == 1 },
       additionalProps: {
-        placeholder: '请输入手机号'
+        placeholder: '请输入账号'
       },
     },
     {
@@ -91,7 +91,7 @@ const formOptions = ref<IDynamicFormOptions>({
   ],
   formRules: {
     mobile: [
-      { required: true, message: '请输入手机号' },
+      { required: true, message: '请输入账号' },
     ],
     account: [
       { required: true, message: '请输入密码' }