{
+ handleDragEnd(event, item);
+ }
+ ">
Date: Mon, 8 Apr 2024 14:33:36 +0800
Subject: [PATCH 8/9] =?UTF-8?q?fix:=E5=9B=BE=E7=89=87=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E5=8C=BA=E5=9F=9F=E5=8A=A0=E8=92=99=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/task/content/Content.vue | 555 +++++++++++++++++------------
1 file changed, 322 insertions(+), 233 deletions(-)
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index ca8cd01..7ffd82d 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -1,105 +1,110 @@
@@ -390,8 +391,18 @@ function switchBatch() {
任务ID:{{ taskDetailInfo.fromtaskname }}
-
-
+
+
@@ -426,8 +437,20 @@ function switchBatch() {
-->
-
-
+
+
@@ -442,14 +465,14 @@ function switchBatch() {
src="@/assets/images/task/btn-not-pass.png"
alt=""
@click.stop="rejectHandler(selectItems)"
- >
+ />

+ />
@@ -502,19 +525,27 @@ function switchBatch() {
class="img-status"
src="@/assets/images/task/pass.png"
alt=""
- >
+ />

+ />
-
+
-
+
@@ -524,7 +555,11 @@ function switchBatch() {
-
+
@@ -539,23 +574,47 @@ function switchBatch() {
class="icon-status"
src="@/assets/images/task/similarity.png"
alt=""
- >
+ />
- {{ totalCount }}张
+ {{ totalCount }}张
+
相似匹配
-
- {{ taskDetailInfo?.ocrPicture?.photoDateTimestamp ? formatToDateHMS(Number(taskDetailInfo.ocrPicture.photoDateTimestamp)) : '-' }}
+
+ {{
+ taskDetailInfo?.ocrPicture?.photoDateTimestamp
+ ? formatToDateHMS(
+ Number(taskDetailInfo.ocrPicture.photoDateTimestamp)
+ )
+ : "-"
+ }}
-
- {{ taskDetailInfo?.ocrPicture?.submitDateTimestamp ? formatToDateHMS(Number(taskDetailInfo.ocrPicture.submitDateTimestamp)) : '-' }}
+
+ {{
+ taskDetailInfo?.ocrPicture?.submitDateTimestamp
+ ? formatToDateHMS(
+ Number(taskDetailInfo.ocrPicture.submitDateTimestamp)
+ )
+ : "-"
+ }}
@@ -579,15 +638,23 @@ function switchBatch() {
/>
-
{
- handleDragEnd(event, item);
- }
- ">
+
{
+ handleDragEnd(event, item);
+ }
+ "
+ >
{
handleDragEnd(event, item);
@@ -609,21 +676,39 @@ function switchBatch() {
class="tag-status"
src="@/assets/images/task/tag-pass.png"
alt=""
- >
+ />

+ />
-
- {{ item.photoDateTimestamp ? formatToDateHMS(Number(item.photoDateTimestamp)) : '-' }}
+
+ {{
+ item.photoDateTimestamp
+ ? formatToDateHMS(Number(item.photoDateTimestamp))
+ : "-"
+ }}
-
- {{ item.submitDateTimestamp ? formatToDateHMS(Number(item.submitDateTimestamp)) : '-' }}
+
+ {{
+ item.submitDateTimestamp
+ ? formatToDateHMS(Number(item.submitDateTimestamp))
+ : "-"
+ }}
-
+
Date: Mon, 8 Apr 2024 15:52:11 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=A3=80=E7=B4=A2-?=
=?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=E5=8A=9F=E8=83=BD-?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=85=A8=E9=83=A8=E4=BB=BB=E5=8A=A1=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/config/final.ts | 11 ++---
src/views/final/content/Content.vue | 3 +-
src/views/home/aside/comp/items/IzShowAll.vue | 46 +++++++++++++++++++
src/views/home/aside/comp/items/index.ts | 4 +-
4 files changed, 55 insertions(+), 9 deletions(-)
create mode 100644 src/views/home/aside/comp/items/IzShowAll.vue
diff --git a/src/config/final.ts b/src/config/final.ts
index 2b6a2e5..2df2d66 100644
--- a/src/config/final.ts
+++ b/src/config/final.ts
@@ -1,5 +1,5 @@
import type { AsideEntity } from './aside'
-import { IzApprovalStatus, IzProjectVue, IzStatus, IztaskrromVue, PictureDownloadVue, PlanVue, ReportUserVue, TimeVue, IzCustomname, IzCustomtype, IzVisitcity, IzCustomlevel, IzProjecttype, IzProductVue, IzvisitproVue, IzfirmVue } from '@/views/home/aside/comp/items'
+import { IzApprovalStatus, IzCustomlevel, IzCustomname, IzCustomtype, IzProductVue, IzProjectVue, IzProjecttype, IzShowAll, IzStatus, IzVisitcity, IzfirmVue, IztaskrromVue, IzvisitproVue, PictureDownloadVue, PlanVue, ReportUserVue, TimeVue } from '@/views/home/aside/comp/items'
export interface RowData {
id: string
@@ -125,12 +125,11 @@ export const asideMap: Recordable = {
defaultValue: true,
isDefaultFilter: false,
key: 'izshowall',
- component: PictureDownloadVue,
+ component: IzShowAll,
inFilterList: false,
},
}
-
// 审批添加筛选配置 (左侧)
export const asideTaskMap: Recordable = {
izstatus: {
@@ -194,7 +193,7 @@ export const asideTaskMap: Recordable = {
defaultValue: null,
isDefaultFilter: true,
key: 'izcustomlevel',
- component: IzCustomlevel
+ component: IzCustomlevel,
},
izprojecttype: {
label: '项目类别',
@@ -223,5 +222,5 @@ export const asideTaskMap: Recordable = {
isDefaultFilter: true,
key: 'izfirm',
component: IzfirmVue,
- }
-}
\ No newline at end of file
+ },
+}
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 2eb7a2c..1ae455c 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -468,7 +468,8 @@ const finalStore = useFinal()
async function query(page: number, pageSize: number, filterId?: any, taskName?: string) {
const asideParmas = unref(finalStore.getAsideValue)
// 有过滤配置的时候优先使用过滤配置,不要使用左侧参数
- const params = filterId ? { userSearchId: filterId } : asideParmas
+ let params = filterId ? { userSearchId: filterId } : asideParmas
+ params = params.izshowall ? {} : params
const result = await getFinalList({
sortorder: sortorder.value,
pageSize,
diff --git a/src/views/home/aside/comp/items/IzShowAll.vue b/src/views/home/aside/comp/items/IzShowAll.vue
new file mode 100644
index 0000000..37908b4
--- /dev/null
+++ b/src/views/home/aside/comp/items/IzShowAll.vue
@@ -0,0 +1,46 @@
+
+
+
+
+ {{ label }}
+
+
+
+
+
diff --git a/src/views/home/aside/comp/items/index.ts b/src/views/home/aside/comp/items/index.ts
index 22655ea..7af0d65 100644
--- a/src/views/home/aside/comp/items/index.ts
+++ b/src/views/home/aside/comp/items/index.ts
@@ -20,6 +20,6 @@ import ReportUserVue from './ReportUser.vue'
import SimilarityVue from './Similarity.vue'
import TimeVue from './Time.vue'
import IzApprovalStatus from './IzApprovalStatus.vue'
+import IzShowAll from './IzShowAll.vue'
-export { IzProjecttype, IzStatus, IzVisitcity, IzCustomlevel, IzCustomtype, IzCustomname, IzfirmVue, IzProductVue, IzvisitproVue, IztaskstatusVue, IztaskrromVue, IzProjectVue, PictureDownloadVue, PictureUploadVue, PlaceHolderVue, RegionVue, SimilarityVue, ReportUserVue, PlanVue, PictureTypeVue, TimeVue, IzApprovalStatus }
-
+export { IzProjecttype, IzStatus, IzVisitcity, IzCustomlevel, IzCustomtype, IzCustomname, IzfirmVue, IzProductVue, IzvisitproVue, IztaskstatusVue, IztaskrromVue, IzProjectVue, PictureDownloadVue, PictureUploadVue, PlaceHolderVue, RegionVue, SimilarityVue, ReportUserVue, PlanVue, PictureTypeVue, TimeVue, IzApprovalStatus, IzShowAll }