Kaynağa Gözat

⚙️ 修改采集管理员页问题

快乐的梦鱼 2 gün önce
ebeveyn
işleme
9c9d238fbe

+ 11 - 0
src/api/auth/UserApi.ts

@@ -26,6 +26,17 @@ export class LoginResult extends DataModel<LoginResult> {
         } 
       },
     }
+    this._nameMapperServer = {
+      userinfo: 'mainBodyUserInfo',
+    }
+    this._beforeSolveServer = (self) => {
+      if (!self.auth && self.userinfo) {
+        self.auth = {
+          ...(self.userinfo as any),
+        }
+      }
+      return self;
+    }
   }
   auth !: {
     id: number,

+ 2 - 4
src/components/form/FormContext.ts

@@ -161,12 +161,10 @@ export function useFieldChildValueInjector<T>(
   const shadowRefValue = ref(getInitialValue()) as Ref<T>;
 
   function getInitialValue() {
-    if (propsModelValue.value) {
-      console.log('getInitialValue1 ', propsModelValue.value);
+    if (typeof propsModelValue.value !== 'undefined') {
       return propsModelValue.value;
     }
-    if (context?.getFormModelValue()) {
-      console.log('getInitialValue2 context.getFormModelValue()', context.getFormModelValue());
+    if (typeof context?.getFormModelValue() !== 'undefined') {
       return context.getFormModelValue();
     };
     return initialValue;

+ 7 - 4
src/pages/collect/assessment/argeement-sign-list.vue

@@ -1,20 +1,23 @@
 <template>
-  <FlexCol padding="space.lg">
+  <FlexCol padding="space.lg" gap="gap.md">
     <SearchBar v-model="search" @search="loader.reload()" placeholder="输入关键词搜索"  />
     <SimplePageContentLoader :loader="loader">
       <template v-if="loader.isFinished.value">
-        <FlexRow 
+        <Touchable 
           v-for="item in loader.list.value" :key="item.id"
           direction="row"
           justify="space-between"
-          @click="navTo('assessment/argeement-sign', { id: item.id })"
+          backgroundColor="white"
+          padding="space.md"
+          radius="radius.md"
+          @click="navTo('./argeement-sign', { id: item.id })"
         >
           <FlexCol>
             <Text :text="item.inheritor ?? '?'" />
             <Text :text="item.mobile || item.unit || '?'" />
           </FlexCol>
           <Icon name="arrow-right-bold" />
-        </FlexRow>
+        </Touchable>
       </template>
     </SimplePageContentLoader>
     <XBarSpace />

+ 5 - 2
src/pages/collect/assessment/evaluation-list.vue

@@ -1,13 +1,16 @@
 <template>
-  <FlexCol padding="space.lg">
+  <FlexCol padding="space.lg" gap="gap.md">
     <SearchBar v-model="search" @search="loader.reload()" placeholder="输入关键词搜索"  />
     <SimplePageContentLoader :loader="loader">
       <template v-if="loader.isFinished.value">
         <Touchable 
           v-for="item in loader.list.value" :key="item.id"
           direction="row"
+          backgroundColor="white"
+          padding="space.md"
+          radius="radius.md"
           justify="space-between"
-          @click="navTo('assessment/evaluation-form', { id: item.id })"
+          @click="navTo('./evaluation-form', { id: item.id })"
         >
           <FlexCol>
             <Text :text="item.inheritor ?? '?'" />