+
+ 历史搜索
+
+
+
+
+ {{ item.historyname }}
+
+
+
+
+
+
@@ -144,4 +203,38 @@ getHistory()
:deep(.n-input .n-input-wrapper) {
margin: 8px;
}
+
+.history-list{
+ align-items: center;
+ padding-bottom: 9px;
+}
+
+.tag-wrap{
+ display: flex;
+ align-items: center;
+ flex: 1;
+ overflow-y: hidden;
+ overflow-x: auto;
+
+ .tag{
+ padding: 0 12px;
+ height: 22px;
+ border: 1px solid #e4e7ed;
+ border-radius: 12px;
+ margin-right: 12px;
+ font-size: 13px;
+ font-family: PingFang SC, PingFang SC-Regular;
+ font-weight: Regular;
+ text-align: left;
+ color: #666666;
+ }
+}
+
+.icon-delete{
+ cursor: pointer;
+}
+
+.highlight{
+ color: #507AFD;
+}
From 4e9ee6eaa6dac8ae78b9c4699edf96643455ca15 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Tue, 19 Mar 2024 09:33:04 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E5=88=B7?=
=?UTF-8?q?=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/task/aside/ListItem.vue | 35 ++++++++++++---------
src/views/task/content/Content.vue | 27 +++++++++-------
src/views/task/modal/CustomSettingModal.vue | 8 ++---
3 files changed, 40 insertions(+), 30 deletions(-)
diff --git a/src/views/task/aside/ListItem.vue b/src/views/task/aside/ListItem.vue
index 2f05272..ec51369 100644
--- a/src/views/task/aside/ListItem.vue
+++ b/src/views/task/aside/ListItem.vue
@@ -1,8 +1,8 @@
@@ -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;
}
-
}
../types
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index b5ddfa7..c30dc08 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -198,17 +198,9 @@ function backHandler() {
taskStore.back();
}
-watch(
- () => [taskStore.activeId],
- async (newValue, oldValue) => {
- const packageid = taskStore.getPackageid
- const taskId = taskStore.getActiveId
-
- if (isEmpty(taskId)) return;
- const useInfo = userStore.getUserInfo;
-
+async function getTableData(){
+ 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;
@@ -225,6 +217,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);
@@ -245,7 +249,6 @@ watch(
// }
// }
// }
- taskTableData.value = _.chunk(listData, 2);
if (!isEmpty(packageid)) {
const { data, total } = await getTaskDetailPictureList(
packageid,
@@ -503,7 +506,7 @@ function getPercent(pictureid: string) {
@reject="rejectHandler"
@approval="approvalHandler"
/>
-
+
diff --git a/src/views/task/modal/CustomSettingModal.vue b/src/views/task/modal/CustomSettingModal.vue
index fd30069..5674e08 100644
--- a/src/views/task/modal/CustomSettingModal.vue
+++ b/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(()=>{
- window.location.reload();
- },3000)
+ emit('onOk')
+
}
defineExpose({
From 5022d82e5659dbbf3b19564c3e64979484952f37 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Tue, 19 Mar 2024 09:35:48 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E5=90=88=E5=B9=B6=E5=86=B2?=
=?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/task/content/Content.vue | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index a6547d4..244bfc2 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -5,6 +5,7 @@ import { getTaskDetailInfo, getTaskDetailPictureList } from '@/api/work/work'
import { useTask } from '@/store/modules/task'
import { useUser } from '@/store/modules/user'
import { isEmpty } from '@/utils'
+import { formatToDateHMS } from '@/utils/dateUtil'
import { hideDownload } from '@/utils/image'
import emitter from '@/utils/mitt'
import _ from 'lodash'
@@ -16,16 +17,7 @@ import ConfrimModal from '../modal/ConfrimModal.vue'
import CustomSettingModal from '../modal/CustomSettingModal.vue'
import PictureTable from './PictureTable.vue'
import TaskTable from './TaskTable.vue'
-import { getAllfieldList } from '@/api/home/filter'
-import { audit } from '@/api/task/task'
-import { getTaskDetailInfo, getTaskDetailPictureList } from '@/api/work/work'
-import { useTask } from '@/store/modules/task'
-import { useUser } from '@/store/modules/user'
-import { isEmpty } from '@/utils'
-import { hideDownload } from '@/utils/image'
-import emitter from '@/utils/mitt'
import type { ApprovalParam, PictureSortParam } from '/#/api'
-import { formatToDateHMS } from '@/utils/dateUtil'
const batch = ref(false)
From 557e09ad5bbddc1fc3ed5165bbe33961ce8d80cd Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Tue, 19 Mar 2024 10:01:39 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E5=AE=A1=E6=89=B9=E7=8A=B6?=
=?UTF-8?q?=E6=80=81=E5=B1=95=E7=A4=BA=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/task/aside/ListItem.vue | 43 +++++++++++++++++++++++++++----
1 file changed, 38 insertions(+), 5 deletions(-)
diff --git a/src/views/task/aside/ListItem.vue b/src/views/task/aside/ListItem.vue
index ec51369..cf73df8 100644
--- a/src/views/task/aside/ListItem.vue
+++ b/src/views/task/aside/ListItem.vue
@@ -36,9 +36,17 @@ const svgName = computed(() => {