🎨 修改细节问题

src/api/inheritor/InheritorContent.ts

@@ -17,6 +17,7 @@ export class CommonInfo<T extends DataModel> extends DataModel<T> {
       images: { clientSide: 'array', serverSide: 'array' },
       expandInfo: { serverSide: 'undefined' },
       region: { clientSide: 'number', serverSide: 'number' },
+      progress: { clientSide: 'number', serverSide: 'number' },
     };
     this._beforeSolveClient = (data) => {
       if (!data.contentId && data.id)
@@ -75,6 +76,8 @@ export class IchInfo extends CommonInfo<IchInfo> {
     };
     this._afterSolveServer = (self) => {
       self.lonlat = [ self.longitude, self.latitude ];
+      if (!self.intro && self.description)
+        self.intro = self.description;
     };
     this._afterSolveClient = (data) => {
       data.longitude = this.lonlat[0];
@@ -553,12 +556,20 @@ export class InheritorContentApi extends AppServerRequestModule<DataModel> {
     return (await this.post('/ich/inheritor/savePlans', dataModel.toServerSide(), '保存项目五年计划'));
   }
 
+  async getCollectListInfo<T extends DataModel>(dataModel: new () => T, id: number) {
+    return this.post('/ich/inheritor/collectInfo', {
+      model_id: new dataModel().modelId,
+      id,
+    }, '获取采集记录详情', undefined).then((res) => {
+      return transformDataModel(dataModel, res.data2);
+    })
+  }
   /**
    * 获取采集列表
    * @param data 
    * @returns 
    */
-  async getCollectList(data: {
+  async getCollectList<T extends DataModel>(dataModel: new () => T, data: {
     /**
      * 采集类型
      * * content 基础
@@ -599,7 +610,7 @@ export class InheritorContentApi extends AppServerRequestModule<DataModel> {
       pageSize: data.pageSize,
     }, '获取采集列表', undefined).then((res) => {
       return {
-        data: transformArrayDataModel<GetContentListItem>(GetContentListItem, transformSomeToArray(res.data2.data), 'data2'),
+        data: transformArrayDataModel<T>(dataModel, transformSomeToArray(res.data2.data), 'data2'),
         total: res.data2.total,
       }
     })

src/pages/admin.vue

@@ -188,7 +188,7 @@ async function handleCopyAccount(item: GetContentListItem) {
     return;
   }
 
-  const resultString = `传承人${item.title}的账号：\n用户名：${result.username}\n密码：${result.password}`;
+  const resultString = `传承人${item.title}的账号：\n用户名：${result.username}\n密码：${result.password}\n登录网址：https://zycj.wenlvti.net/#login`;
 
   try {
     await toClipboard(resultString);

src/pages/forms/form.vue

@@ -136,6 +136,10 @@ const props = defineProps({
     type: Object as PropType<IDynamicFormOptions>,
     default: null
   },
+  model: {
+    type: Object as PropType<new () => DataModel>,
+    required: true
+  },
   load: {
     type: Function as PropType<(id: number|undefined) => Promise<void>>,
     default: () => Promise.resolve()
@@ -249,7 +253,7 @@ async function loadData() {
   }
 }
 async function loadHistoryData(page: number, pageSize: number, dropDownValues: number[], searchText: string) {
-  const res = (await InheritorContent.getCollectList({
+  const res = (await InheritorContent.getCollectList(props.model, {
     collectType: 'content',
     modelId: 2,
     userId: authStore.userInfo?.id,
@@ -260,7 +264,7 @@ async function loadHistoryData(page: number, pageSize: number, dropDownValues: n
     page,
     total: res.total,
     data: res.data.map((p) => {
-      p.desc = DateUtils.formatDate(p.updatedAt as Date, DateUtils.FormatStrings.CommonDate);
+      p.desc = p.updatedAt;
       return p;
     }),
   };
@@ -269,8 +273,9 @@ async function loadHistoryData(page: number, pageSize: number, dropDownValues: n
 async function handleShowHistory(item: any) {
   showHistoryLoading.value = true;
   showHistory.value = true;
+  await waitTimeOut(100);
+   // showHistoryModel.value = await InheritorContent.getCollectListInfo(props.model, item.id);
   showHistoryModel.value = item;
-  await waitTimeOut(800);
   showHistoryLoading.value = false;
 }
 

src/pages/forms/ich.vue

@@ -7,6 +7,7 @@
     :formModel="formModel"
     :formOptions="formOptions"
     :load="loadData"
+    :model="IchInfo"
   />
 </template>
 

src/pages/forms/inheritor.vue

@@ -5,6 +5,7 @@
     :formModel="formModel"
     :formOptions="formOptions"
     :load="loadData"
+    :model="InheritorInfo"
   />
 </template>
 

src/pages/forms/plans.vue

@@ -4,6 +4,7 @@
     :formModel="formModel"
     :formOptions="formOptions"
     :load="loadData"
+    :model="PlanInfo"
   />
 </template>
 
@@ -46,7 +47,7 @@ const route = useRoute();
 async function loadData() {
   const id = parseFloat(route.query.id as string);
   if (id) {
-    const ichId = (await InheritorContent.getIchInfo()).id;
+    const ichId = (await InheritorContent.getIchInfo(undefined)).id;
     formModel.value = (await InheritorContent.getPlanList(ichId)).find((item) => item.id === id) || new PlanInfo();
   }
 }

src/pages/forms/seminar.vue

@@ -7,6 +7,7 @@
     :formModel="formModel"
     :formOptions="formOptions"
     :load="loadData"
+    :model="SeminarInfo"
   />
 </template>
 

src/pages/forms/works.vue

@@ -4,6 +4,7 @@
     :formModel="formModel"
     :formOptions="formOptions"
     :load="loadData"
+    :model="InheritorWorkInfo"
     basicTabText="作品/产品信息"
   />
 </template>