From 1d2862c40532fc57a3c9579387f6eaa34fbd0bfc Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Mon, 1 Apr 2024 09:36:48 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=9B=B8=E4=BC=BC?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=9F=A5=E8=AF=A2id=E4=B8=BA=E4=B8=BB?= =?UTF-8?q?=E5=9B=BEid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/worksheet/content/Content.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue index fd77b4f..a4065f5 100644 --- a/src/views/worksheet/content/Content.vue +++ b/src/views/worksheet/content/Content.vue @@ -136,7 +136,7 @@ async function featchList() { try { taskpagination.pageNo += 1; const { data, total, pageCount } = await getTaskDetailPictureList( - { ...taskpagination, ...sortBy, checkDuplicateId: workStore.activeId, pictureId: taskDetailInfo.value.pictureid } + { ...taskpagination, ...sortBy, checkDuplicateId: workStore.activeId, pictureId: taskDetailInfo.value.id } ); totalCount.value = total; From 75c4fcc396363426301fb4734a5409f1bf87e25e Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Mon, 1 Apr 2024 09:41:41 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/worksheet/content/Content.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue index a4065f5..c292b2c 100644 --- a/src/views/worksheet/content/Content.vue +++ b/src/views/worksheet/content/Content.vue @@ -239,7 +239,7 @@ async function handleSelect(item: any) { async function sortHandler(orderby: "similarityScore" | "createdate") { selectedSortName.value = orderby; sortBy.orderName = orderby; - sortBy.orderType = sortBy.orderType === "desc" ? "desc" : "asc"; + sortBy.orderType = sortBy.orderType === "asc" ? "desc" : "asc"; refreshHandler(); } From baab33cd3125de3a765990db645f21d280902a4b Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Mon, 1 Apr 2024 09:44:14 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feat:=20=E5=B7=B2=E5=AE=A1=E6=89=B9=20?= =?UTF-8?q?=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/worksheet/content/Content.vue | 36 +++++++++++++++---------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue index c292b2c..2f2d2ed 100644 --- a/src/views/worksheet/content/Content.vue +++ b/src/views/worksheet/content/Content.vue @@ -223,10 +223,8 @@ async function queryDetail(checkDuplicateId: any) { refreshHandler(); } async function handleSelect(item: any) { - taskDetailInfo.value = await getTaskDetailInfo(workStore.activeId); - + taskDetailInfo.value = await getTaskDetailInfo(item.id) const packageid = workStore.getActiveId; - if (isEmpty(packageid)) { listData.value.length = 0; totalCount.value = 0; @@ -488,15 +486,21 @@ function reloadList() { 任务ID：{{ taskDetailInfo.taskname }}
-
{{ TASK_STATUS_OBJ[taskDetailInfo.historyStates] + +
待审批
+
已审批
+
{{ TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}
+
{{ + TASK_STATUS_OBJ[taskDetailInfo.historyStates] + }}
@@ -909,17 +913,21 @@ function reloadList() { line-height: 16px; } + .tag-submited { + color: #507AFD; + border: 1px solid #507AFD; + } .tag-submiting { - color: #feaf2d; - border: 1px solid #feaf2d; + color: #FFB800; + border: 1px solid #FFB800; } - .tag-approve { - color: #398ade; - border: 1px solid #398ade; + .tag-passed { + color: #02C984; + border: 1px solid #02C984; } - .tag-passed { + .tag-not-passed { color: #ff7575; border: 1px solid #ff7575; } From d2d4e9cf9089460e1222691e9d46c8fb4cf55670 Mon Sep 17 00:00:00 2001 From: liushilong <2224574157@qq.com> Date: Mon, 1 Apr 2024 15:27:50 +0800 Subject: [PATCH 4/8] =?UTF-8?q?feat:=20=E5=B7=A5=E5=8D=95=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E5=BC=B9=E7=AA=97=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/worksheet/aside/WorkSheetList.vue | 7 +- src/views/worksheet/modal/ApprovalModal.vue | 90 ++++-- src/views/worksheet/modal/ApprovalModal2.vue | 2 +- .../worksheet/modal/ApprovalModal_bak.vue | 260 ++++++++++++++++++ 4 files changed, 325 insertions(+), 34 deletions(-) create mode 100644 src/views/worksheet/modal/ApprovalModal_bak.vue diff --git a/src/views/worksheet/aside/WorkSheetList.vue b/src/views/worksheet/aside/WorkSheetList.vue index f797a21..330b045 100644 --- a/src/views/worksheet/aside/WorkSheetList.vue +++ b/src/views/worksheet/aside/WorkSheetList.vue @@ -33,7 +33,7 @@ const pagination = reactive({ pageSize: 10, }) -const approvalModalRef = ref(null) +const approvalModalRef: any = ref(null) const notPassedRef: any = ref(null) const overTask = ref(null); @@ -94,8 +94,9 @@ watch( (newVal) => { if (isEmpty(newVal)) return - - activeId.value = newVal + activeId.value = newVal; + approvalModalRef.value.showModal(activeId.value) + }, ) diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue index eac9608..e075306 100644 --- a/src/views/worksheet/modal/ApprovalModal.vue +++ b/src/views/worksheet/modal/ApprovalModal.vue @@ -2,9 +2,10 @@ import { onMounted, reactive, ref, toRefs } from "vue"; import { format } from "date-fns"; import { NButton, NDataTable, useDialog, useMessage } from "naive-ui"; -import { aiApprovaltools, aiApprovaltoolsClearmark } from "@/api/work/work"; +import { aiApprovaltools, aiApprovaltoolsClearmark, setTF } from "@/api/work/work"; import { getToolsCount } from "@/api/home/main"; - +import { storage } from "@/utils/Storage"; +import { CURRENT_USER } from "@/store/mutation-types"; const emit = defineEmits<{ (e: "reject", params: any); (e: "notPass", params: any); @@ -14,7 +15,7 @@ const dialog = useDialog(); const state: any = reactive({ detail: {}, - taskId: "", + packageid: "", }); const { detail } = toRefs(state); const cardStyle = { @@ -26,23 +27,34 @@ const cardStyle = { const show = ref(false); function showModal(id) { - console.log(id); - state.taskId = id; + state.packageid = id; getDetail(id); } async function getDetail(id) { + // const userInfo = storage.get(CURRENT_USER); + // const nodeType = userInfo.nodeType; + id = "264626184091111068"; const res = await aiApprovaltools({ taskid: id }); if (res.code === "OK") { state.detail = res.data; show.value = true; } - console.log(res); + console.log(res, "getDetail"); } +const handleReject = async () => { + const res = await setTF({ + taskchildpictureids: state.detail.taskIdList.join(","), + packageid: state.packageid, + iztrueorfalse: 0, + }); + console.log(res, "handleReject"); +}; + async function clearMark() { - const res = await aiApprovaltoolsClearmark({ taskid: state.taskId }); + const res = await aiApprovaltoolsClearmark({ taskid: state.packageid }); if (res.code === "OK") closeModal(); } @@ -69,7 +81,7 @@ async function reject() { async function viewRepeat(e: MouseEvent) { emit("notPass", { - id: state.taskId, + id: state.packageid, detail: state.detail, }); e.preventDefault(); @@ -78,7 +90,7 @@ async function viewRepeat(e: MouseEvent) { async function getShowStatus() { const res = await getToolsCount(); - if (res.code == 'OK') { + if (res.code == "OK") { show.value = true; } } @@ -92,7 +104,7 @@ defineExpose({