Merge branch 'al'

# Conflicts:
#	src/views/worksheet/aside/WorkSheetList.vue

src/api/home/filter.ts

@@ -164,11 +164,11 @@ export async function sort(searchid: string, reorder: number): Promise<void> {
  * 
  * @returns
  */
- export async function savefield(reviewType: number,userId:string,userField:string): Promise<void> {
+ export async function savefield(reviewType: number,userId:string,userFieldFixed:string,userFieldUnFixed:string=''): Promise<void> {
   return http.request({
     url: `/ocr/user/field/saveOrUpdate`,
     method: 'POST',
-    params: { reviewType,userId,userField},
+    params: { reviewType,userId,userFieldFixed,userFieldUnFixed},
   })
 }
 

src/views/final/comp/CustomTabelModal.vue

@@ -31,7 +31,6 @@ onMounted(async()=>{
   const allList = res.data;
   res = await getfieldList(props.reviewType, userInfo.id); //当前用户选择的项目
   const useList = res.data;
-  console.log(allList,useList,'useList')
   /**
    * name 标题
    * id 键值

src/views/home/aside/comp/modals/CustomFilterModal.vue

@@ -251,11 +251,9 @@ const rightInputHandler = debounce((keyword) => {
 async function getfield(){
   let res;
   res = await getAllfieldList(3)
-  console.log(res,'getAllfieldList')
   const userStore = useUser();
   const userInfo = userStore.getUserInfo;
   res = await getfieldList(3,userInfo.id)
-  console.log(res,'res')
 }
 
 onMounted(()=>{

src/views/task/aside/Aside.vue

@@ -2,6 +2,9 @@
 import { useTaskStore } from '@/store/modules/task';
 import { debounce } from 'lodash-es';
 import { computed, ref, unref, watch } from 'vue';
+import CustomFieldModal from '../../worksheet/modal/CustomFieldModal.vue';
+
+
 import TaskList from './TaskList.vue';
 
 const CustomFieldModalRef = ref(null)
@@ -84,7 +87,7 @@ const inputHandler = debounce((word) => {
       </div>
     </div>
     <TaskList ref="taskListRef" style="height: calc(100vh - 146px);" class="work-sheet-list" />
-    <CustomFieldModal ref="CustomFieldModalRef" :reviewType="2"/>
+    <CustomFieldModal ref="CustomFieldModalRef" :reviewType="2" />
   </div>
 </template>
 

src/views/task/aside/ListItem.vue

@@ -1,5 +1,6 @@
 <script lang="ts" setup>
-import { computed } from 'vue'
+import { format } from 'date-fns';
+import { computed } from 'vue';
 
 defineOptions({ name: 'ListItem' })
 
@@ -25,15 +26,17 @@ const svgName = computed(() => {
       <div style="display: flex;">
         <SvgIcon :name="svgName" size="28" />
         <span class="list-item-header-name" :class="{ 'list-item-header-selected': selected }">
-          任务ID:{{ listItem.formid }}
+          任务ID:{{ listItem.fromtaskname }}
         </span>
       </div>
       <SvgIcon v-show="selected" size="14" name="more-ver" />
     </div>
     <ul class="list-item-detail">
-      <li>审批状态：<span class="list-item-status">{{ listItem.states }}</span></li>
+      <li>审批状态：<span class="list-item-status">{{ listItem.statshis }}</span></li>
-      <li>审批节点：{{ listItem.createdate }}</li>
+      <li>审批节点：{{ listItem.taskname }}</li>
-      <li>提交时间：{{ listItem.createdate }}</li>
+      <li>提交时间：{{ format(new Date(), 'yyyy-MM-dd HH:mm:ss') }}</li>
+      <li>提报人：{{ listItem.fromuserid }}</li>
+
     </ul>
     <div class="list-item-divider" />
   </div>

src/views/task/aside/TaskList.vue

@@ -1,9 +1,9 @@
 <script lang="ts" setup>
-import { onMounted, onUnmounted, reactive, ref, watch } from 'vue'
-import { useInfiniteScroll } from '@vueuse/core'
-import ListItem from './ListItem.vue'
 import { useTaskStore } from '@/store/modules/task'
 import emitter from '@/utils/mitt'
+import { useInfiniteScroll } from '@vueuse/core'
+import { onMounted, onUnmounted, reactive, ref, watch } from 'vue'
+import ListItem from './ListItem.vue'
 
 const taskStore = useTaskStore()
 const data = ref<any[]>([])

src/views/task/content/PictureTable.vue

@@ -16,14 +16,14 @@ defineProps({
       </td>
       <th>图片格式</th>
       <td class="blue">
-        ???
+        
       </td>
     </tr>
     <tr>
       <th>图片大小</th>
-      <td> ???</td>
+      <td></td>
       <th>图片尺寸</th>
-      <td> ???</td>
+      <td></td>
     </tr>
     <tr>
       <th>上传时间</th>
@@ -33,7 +33,7 @@ defineProps({
     </tr>
     <tr>
       <th>标记时间</th>
-      <td> ???</td>
+      <td> </td>
       <th>色彩空间</th>
       <td>{{ data?.ocrPicture?.space }}</td>
     </tr>

src/views/task/content/TaskTable.vue

@@ -35,20 +35,20 @@ defineProps({
       <th>科室名称</th>
       <td> {{ data?.ocrPicture?.field7 }}</td>
       <th>病例号</th>
-      <td>？</td>
+      <td></td>
     </tr>
     <tr>
       <th>拜访级别</th>
       <td> {{ data?.ocrPicture?.field6 }}</td>
       <th>下阶段计划</th>
-      <td>?</td>
+      <td></td>
     </tr>
     <tr>
       <th>是否为重复图片</th>
       <td> {{ data?.ocrPicture?.field14 }}</td>
       <th>附件信息</th>
       <td>
-        <a href="data?.fileannex" download>????</a>
+        <a href="data?.fileannex" download></a>
       </td>
     </tr>
   </table>

src/views/task/modal/CustomFieldModal.vue

@@ -1,8 +1,8 @@
 <script lang="ts" setup>
-import { computed, ref, watch } from 'vue'
+import { workPackageMap } from '@/config/workorder';
-import { difference } from 'lodash-es'
+import { difference } from 'lodash-es';
-import { VueDraggable } from 'vue-draggable-plus'
+import { computed, ref, watch } from 'vue';
-import { workPackageMap } from '@/config/workorder'
+import { VueDraggable } from 'vue-draggable-plus';
 
 // 左侧隐藏列表
 const offList = ref<any[]>([])

src/views/worksheet/aside/WorkSheetList.vue

@@ -1,10 +1,10 @@
 <script lang="ts" setup>
-import type { PackageListItem } from '/#/workorder'
-import ListItem from './ListItem.vue'
 import { useWorkOrder } from '@/store/modules/workOrder'
-import { reactive, ref, watch } from 'vue'
-import { useInfiniteScroll } from '@vueuse/core'
 import { isEmpty } from '@/utils'
+import { useInfiniteScroll } from '@vueuse/core'
+import { reactive, ref, watch } from 'vue'
+import ListItem from './ListItem.vue'
+import type { PackageListItem } from '/#/workorder'
 
 const workStore = useWorkOrder()
 const data = ref<PackageListItem[]>([])