Merge branch 'al'

src/views/task/aside/ListItem.vue

@@ -1,8 +1,8 @@
 <script lang="ts" setup>
-import { format } from 'date-fns';
+import { format } from "date-fns";
-import { computed } from 'vue';
+import { computed } from "vue";
 
-defineOptions({ name: 'ListItem' })
+defineOptions({ name: "ListItem" });
 
 const props = defineProps({
   selected: {
@@ -13,30 +13,38 @@ const props = defineProps({
     type: Object as PropType<any>,
     required: true,
   },
-})
+});
 
 const svgName = computed(() => {
-  return props.selected ? 'task-select' : 'task'
+  return props.selected ? "task-select" : "task";
-})
+});
 </script>
 
 <template>
   <div class="list-item" :class="{ 'list-item-selected': selected }">
     <div class="list-item-header">
-      <div style="display: flex;">
+      <div style="display: flex">
         <SvgIcon :name="svgName" size="28" />
-        <span class="list-item-header-name" :class="{ 'list-item-header-selected': selected }">
+        <span
+          class="list-item-header-name"
+          :class="{ 'list-item-header-selected': selected }"
+        >
           任务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.statshisText }}</span></li>
+      <li>
+        审批状态：<span class="list-item-status">{{
+          listItem.statshisText
+        }}</span>
+      </li>
       <li>审批节点：{{ listItem.tasknamehis }}</li>
-      <li>提交时间：{{ format(new Date(), 'yyyy-MM-dd HH:mm:ss') }}</li>
+      <li>
+        提交时间：{{ format(listItem.createdate, "yyyy-MM-dd HH:mm:ss") }}
+      </li>
       <li>提报人：{{ listItem.fromUserName }}</li>
-
     </ul>
     <div class="list-item-divider" />
   </div>
@@ -60,7 +68,7 @@ const svgName = computed(() => {
     }
 
     &-selected {
-      color: #507AFD;
+      color: #507afd;
     }
   }
 
@@ -74,7 +82,7 @@ const svgName = computed(() => {
     align-items: center;
 
     &:before {
-      content: '';
+      content: "";
       width: 6px;
       height: 6px;
       background: #fe9800;
@@ -104,7 +112,6 @@ const svgName = computed(() => {
     position: absolute;
     bottom: 0px;
   }
-
 }
 </style>
 ../types

src/views/task/content/Content.vue

@@ -199,17 +199,9 @@ function backHandler() {
   taskStore.back();
 }
 
-watch(
+async function getTableData(){
-  () => [taskStore.activeId],
+  const useInfo = userStore.getUserInfo;
-  async (newValue, oldValue) => {
-    const packageid = taskStore.getPackageid
-    const taskId = taskStore.getActiveId
-
-    if (isEmpty(taskId)) return;
-    const useInfo = userStore.getUserInfo;
-
     let listData = [];
-    taskDetailInfo.value = await getTaskDetailInfo(taskId, packageid);
     const reviewType = 3; //类型
     let res = await getAllfieldList(reviewType);
     let fieldList = (res as any)?.data;
@@ -226,6 +218,18 @@ watch(
         listData.push(item);
       }
     });
+    taskTableData.value = _.chunk(listData, 2);
+}
+
+watch(
+  () => [taskStore.activeId],
+  async (newValue, oldValue) => {
+    const packageid = taskStore.getPackageid
+    const taskId = taskStore.getActiveId
+
+    if (isEmpty(taskId)) return;
+    taskDetailInfo.value = await getTaskDetailInfo(taskId, packageid);
+    getTableData();
     // TODO mock备份 确认逻辑无误后删除
     // let showFieldData = taskDetailInfo.value.ocrPicture;
     // let showFieldKeys = Object.keys(showFieldData);
@@ -246,7 +250,6 @@ watch(
     //     }
     //   }
     // }
-    taskTableData.value = _.chunk(listData, 2);
     if (!isEmpty(packageid)) {
       const { data, total } = await getTaskDetailPictureList(
         packageid,
@@ -516,7 +519,7 @@ function getPercent(pictureid: string) {
       @reject="rejectHandler"
       @approval="approvalHandler"
     />
-    <CustomSettingModal ref="CustomSettingModalRef" :review-type="3" />
+    <CustomSettingModal ref="CustomSettingModalRef" :review-type="3" @onOk="getTableData"/>
   </div>
 </template>
 

src/views/task/modal/CustomSettingModal.vue

@@ -2,7 +2,7 @@
 import { getAllfieldList, getfieldList, savefield } from "@/api/home/filter";
 import { ReportInfoConfig } from "@/config/workorder";
 import { useUser } from "@/store/modules/user";
-import { defineProps, onMounted, ref } from "vue";
+import { defineEmits, defineProps, onMounted, ref } from "vue";
 
 const props = defineProps({
   reviewType: {
@@ -95,6 +95,7 @@ function showModal() {
 function closeModal() {
   show.value = false;
 }
+const emit = defineEmits(['onOk'])
 
 async function handleSumbit(e: MouseEvent) {
   const userStore = useUser();
@@ -109,9 +110,8 @@ async function handleSumbit(e: MouseEvent) {
   savefield(props.reviewType, userInfo.id, userField);
   e.preventDefault();
   closeModal();
-  setTimeout(()=>{
+  emit('onOk')
-    window.location.reload();
+
-  },3000)
 }
 
 defineExpose({