终审审批之后刷新

src/router/modules/final.ts

@@ -38,7 +38,7 @@ const routes: Array<RouteRecordRaw> = [
         path: 'final-detail',
         name: 'final-detail',
         meta: {
-          title: '任务终审详情',
+          title: '任务详情',
         },
         component: () => import('@/views/task/content/Content.vue'),
       },

src/views/final/comp/RepeatTaskTableModal.vue

@@ -68,6 +68,9 @@ const columns: DataTableColumns<RowData> = [
     ellipsis: {
       tooltip: true,
     },
+    render(row: any) {
+      return row.fromtaskname
+    },
   },
   {
     title: '任务名称',
@@ -356,6 +359,7 @@ function showModal() {
 function reload() {
   selectionIds.value = []
   checkedRowKeys.value = []
+  query(pagination.page, pagination.pageSize)
 }
 
 function goDetail(row) {

src/views/final/content/Content.vue

@@ -278,7 +278,7 @@ async function formatColumns() {
             'text-color': '#507AFD',
             'onClick': () => goDetail(row),
           },
-          { default: () => row.id },
+          { default: () => row.fromtaskname },
         )
       },
     }
@@ -471,7 +471,7 @@ async function query(page: number, pageSize: number, filterId?: any) {
     sortorder: 'asc',
     pageSize,
     currPage: page,
-    sortname: '',
+    sortname: 'states',
     ...params,
   })
   const { data, pageCount, totalCount } = result

src/views/message/content/List.vue

@@ -1,32 +1,32 @@
 <script lang="ts" setup>
-import { reactive, ref, toRefs } from "vue";
-import { format } from "date-fns";
-import { useRoute, useRouter } from "vue-router";
-import { getMessageList, readAllMsg, readMsg } from "@/api/message/message";
-import iconApproveActive from "@/assets/images/message/approve-active.png";
-import iconApprove from "@/assets/images/message/approve.png";
-import iconSystemActive from "@/assets/images/message/system-active.png";
-import iconSystem from "@/assets/images/message/system.png";
-import iconArrowActive from "@/assets/images/message/arrow-active.png";
-import iconArrow from "@/assets/images/message/arrow.png";
-import iconClear from "@/assets/images/message/clear.png";
-import iconArrowDown from "@/assets/images/message/arrow-down.png";
-
-const emit = defineEmits(["goDetail"]);
-const router = useRouter();
-const route = useRoute();
-const hasNextPage = ref(false);
+import { reactive, ref, toRefs } from 'vue'
+import { format } from 'date-fns'
+import { useRoute, useRouter } from 'vue-router'
+import { getMessageList, readAllMsg, readMsg } from '@/api/message/message'
+import iconApproveActive from '@/assets/images/message/approve-active.png'
+import iconApprove from '@/assets/images/message/approve.png'
+import iconSystemActive from '@/assets/images/message/system-active.png'
+import iconSystem from '@/assets/images/message/system.png'
+import iconArrowActive from '@/assets/images/message/arrow-active.png'
+import iconArrow from '@/assets/images/message/arrow.png'
+import iconClear from '@/assets/images/message/clear.png'
+import iconArrowDown from '@/assets/images/message/arrow-down.png'
+
+const emit = defineEmits(['goDetail'])
+const router = useRouter()
+const route = useRoute()
+const hasNextPage = ref(false)
 
 const state = reactive({
   tabList: [
     {
-      name: "审批通知",
+      name: '审批通知',
       icon: iconApprove,
       activeIcon: iconApproveActive,
       value: 1,
     },
     {
-      name: "系统消息",
+      name: '系统消息',
       icon: iconSystem,
       activeIcon: iconSystemActive,
       value: 2,
@@ -34,102 +34,105 @@ const state = reactive({
   ],
   list: [] as any,
   pageNo: 1,
-});
+})
 
-const { list, tabList } = toRefs(state);
+const { list, tabList } = toRefs(state)
 
-const tab = ref(1);
+const tab = ref(1)
 
-async function getList(type = "") {
+async function getList(type = '') {
   let res = await getMessageList({
     pageNo: state.pageNo,
-    pageSize: "7",
+    pageSize: '7',
     msgCategory: tab.value,
-  });
-  if (type == "more") {
+  })
+  if (type == 'more') {
     while (res.data.endRow > 0) {
-      if (res.code == "OK") {
+      if (res.code == 'OK') {
         if (tab.value === 1) {
           res.data.list.forEach((item) => {
-            item.tag = JSON.parse(item.busJson);
-          });
+            item.tag = JSON.parse(item.busJson)
+          })
         }
-        state.list = state.list.concat(res.data.list);
-        state.pageNo++;
+        state.list = state.list.concat(res.data.list)
+        state.pageNo++
         res = await getMessageList({
           pageNo: state.pageNo,
-          pageSize: "7",
+          pageSize: '7',
           msgCategory: tab.value,
-        });
+        })
       }
     }
-    hasNextPage.value = res.data.hasNextPage;
-  } else {
-    if (res.code === "OK") {
-      hasNextPage.value = res.data.hasNextPage;
+    hasNextPage.value = res.data.hasNextPage
+  }
+  else {
+    if (res.code === 'OK') {
+      hasNextPage.value = res.data.hasNextPage
       if (tab.value === 1) {
         res.data.list.forEach((item) => {
-          item.tag = JSON.parse(item.busJson);
-        });
+          item.tag = JSON.parse(item.busJson)
+        })
       }
-      state.list = state.list.concat(res.data.list);
+      state.list = state.list.concat(res.data.list)
     }
   }
 }
 
-getList();
+getList()
 
 async function clearMsg() {
-  const res = await readAllMsg({ msgCategory: tab.value });
-  if (res.code === "OK") {
-    state.list = [];
-    state.pageNo = 1;
-    getList();
+  const res = await readAllMsg({ msgCategory: tab.value })
+  if (res.code === 'OK') {
+    state.list = []
+    state.pageNo = 1
+    getList()
   }
 }
 
 function switchTab(type: number) {
-  tab.value = type;
-  state.list = [];
-  state.pageNo = 1;
-  getList();
+  tab.value = type
+  state.list = []
+  state.pageNo = 1
+  getList()
 }
 
 function goFinalDetail(row) {
-  console.log(row);
+  console.log(row)
   router.push({
-    name: "final-detail",
-    query: { id: row.tag.taskId, packageid: row.packageid },
-  });
+    name: 'final-detail',
+    query: { id: row.tag.fromId, packageid: row.packageid },
+  })
 }
 
 function goDetail(item) {
   if (tab.value === 1) {
-    clearMsgOne(item.id);
-    goFinalDetail(item);
+    clearMsgOne(item.id)
+    goFinalDetail(item)
   }
   // emit('goDetail', item.id)
   else {
-    router.push({ name: "message-detail", query: { id: item.id } });
+    router.push({ name: 'message-detail', query: { id: item.id } })
   }
 }
 
 async function clearMsgOne(id) {
-  const res = await readMsg({ msgid: id });
+  const res = await readMsg({ msgid: id })
 }
 
 function getMore() {
-  state.pageNo += 1;
-  getList("more");
+  state.pageNo += 1
+  getList('more')
 }
 </script>
 
 <template>
   <div class="wrapper-message">
     <div class="flex justify-between header">
-      <div class="header-title">消息通知</div>
+      <div class="header-title">
+        消息通知
+      </div>
       <div class="clear" @click="clearMsg">
-        <img class="icon-clear" :src="iconClear" alt="" />
+        <img class="icon-clear" :src="iconClear" alt="">
         清除未读
       </div>
     </div>
@@ -147,7 +150,7 @@ function getMore() {
               class="icon"
               :src="tab === item.value ? item.activeIcon : item.icon"
               alt=""
-            />
+            >
             <div :class="{ 'text-active': tab === item.value }" class="text">
               {{ item.name }}
             </div>
@@ -156,7 +159,7 @@ function getMore() {
             class="icon-arrow"
             :src="tab === item.value ? iconArrowActive : iconArrow"
             alt=""
-          />
+          >
           <div v-if="tab === item.value" class="line" />
         </div>
       </div>
@@ -164,7 +167,7 @@ function getMore() {
         <div
           v-for="(item, index) in list"
           :key="item.id"
-          :class="{ pt0: index === 0, 'item-disabled': item.readFlag }"
+          :class="{ 'pt0': index === 0, 'item-disabled': item.readFlag }"
           class="item"
           @click="goDetail(item)"
         >
@@ -185,7 +188,9 @@ function getMore() {
               {{ item.titile }}
             </div>
             <div v-if="tab === 1" class="status">
-              <div class="tag tag-blue">审批节点：{{ item.tag.nodeName }}</div>
+              <div class="tag tag-blue">
+                审批节点：{{ item.tag.nodeName }}
+              </div>
               <div :class="item.tag.states === 5 ? 'tag-red' : 'tag-green'" class="tag">
                 审批状态：{{ item.tag.states }}
               </div>
@@ -199,11 +204,13 @@ function getMore() {
               <span class="time">{{ format(item.sendTime, "yyyy-MM-dd HH:mm:ss") }}</span>
             </div>
           </div>
-          <div class="look">查看</div>
+          <div class="look">
+            查看
+          </div>
         </div>
 
         <div v-if="hasNextPage" class="more" @click="getMore">
-          查看更多<img class="icon-more" :src="iconArrowDown" alt="" />
+          查看更多<img class="icon-more" :src="iconArrowDown" alt="">
         </div>
       </div>
     </div>

src/views/task/content/Content.vue

@@ -581,7 +581,7 @@ function switchBatch() {
                 <div
                   draggable="true"
                   class="img-wrapper"
-                  :style="{ 'background-image': `url(${item.imgUrl})` }"
+                  :style="{ 'background-image': `url(${item.serverThumbnailUrl})` }"
                   @dragend="
                     (event) => {
                       handleDragEnd(event, item);

src/views/task/modal/BatchModal.vue

@@ -543,7 +543,7 @@ defineExpose({
                           'img-full': viewMode === '3:4' || viewMode === 'verticalVersion',
                         }"
 
-                        :src="item.serverThumbnailUrl || item.imgUrl"
+                        :src="item.serverThumbnailUrl"
                       />
                       <div class="small-mark" />
                       <div class="time">