diff --git a/src/assets/icons/task_count.svg b/src/assets/icons/task_count.svg index 2e6997c..9a1d683 100644 --- a/src/assets/icons/task_count.svg +++ b/src/assets/icons/task_count.svg @@ -1,43 +1,43 @@ - + 任务总数 - + - + - + - + - - + + - - - - - + + + + + - + - + - - + + @@ -47,14 +47,14 @@ - + - + - + diff --git a/src/assets/icons/task_over.svg b/src/assets/icons/task_over.svg index 56565fe..03da445 100644 --- a/src/assets/icons/task_over.svg +++ b/src/assets/icons/task_over.svg @@ -1,65 +1,63 @@ - + 已审批 - + - + - - + + - + - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + diff --git a/src/assets/icons/task_wait.svg b/src/assets/icons/task_wait.svg index d95218e..f953201 100644 --- a/src/assets/icons/task_wait.svg +++ b/src/assets/icons/task_wait.svg @@ -1,61 +1,59 @@ - + 待审批 - + - + - + - + - + - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/config/final.ts b/src/config/final.ts index ee9dfba..69ccdc7 100644 --- a/src/config/final.ts +++ b/src/config/final.ts @@ -195,6 +195,14 @@ export const asideTaskMap: Recordable = { // component: IzProjectVue, component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/IzProject.vue")), }, + izplan: { + label: '所属计划', + defaultValue: null, + isDefaultFilter: true, + key: 'izplan', + // component: PlanVue, + component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/Plan.vue")), + }, izvisitpro: { label: '拜访省份/直辖市', defaultValue: null, diff --git a/src/views/final/aside/Aside.vue b/src/views/final/aside/Aside.vue index acad8c2..74c1cdf 100644 --- a/src/views/final/aside/Aside.vue +++ b/src/views/final/aside/Aside.vue @@ -367,6 +367,7 @@ useKeydown('s', () => setShowSearch(true)) v-show="!showSearch" ref="AdvanceFilterRef" :type="1" + :toolipvalue="'请输入任务id、任务名称、提报人'" @select="filterHandler" @update:search="setShowSearch(true)" @show-custom="showModal(customModalRef)" diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue index d11db1e..ec31cb3 100644 --- a/src/views/home/aside/Aside.vue +++ b/src/views/home/aside/Aside.vue @@ -320,6 +320,7 @@ useKeydown('s', () => setShowSearch(true)) v-show="!showSearch" ref="AdvanceFilterRef" :type="0" + :toolipvalue="'请输入提报人搜索'" @select="filterHandler" @update:search="setShowSearch(true)" @show-custom="showModal(customModalRef)" diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue index ff90a69..178c8d2 100644 --- a/src/views/home/aside/comp/AdvanceFilter.vue +++ b/src/views/home/aside/comp/AdvanceFilter.vue @@ -16,6 +16,11 @@ const props = defineProps({ default: 0, required: true, }, + toolipvalue:{ + type: String, + default: "", + required: true, + } }) const emit = defineEmits<{ (e: 'show-filter'): void @@ -406,12 +411,17 @@ defineExpose({
+ + + {{toolipvalue}} +
- +
{{ toolsData?.total || 0 }}
任务总数
- +
{{ toolsData?.treat || 0 }}
待审批
- +
{{ toolsData?.approvedCount || 0 }}
已审批
- -
{{ toolsData?.repeat }}
+ +
{{ toolsData?.repeat }}
重复图片
diff --git a/src/views/task/aside/Aside.vue b/src/views/task/aside/Aside.vue index 18eda38..f30bd5e 100644 --- a/src/views/task/aside/Aside.vue +++ b/src/views/task/aside/Aside.vue @@ -277,6 +277,7 @@ function handleOk(item: any) { v-show="!showSearch" ref="AdvanceFilterRef" :type="2" + :toolipvalue="'请输入任务id、任务名称、提报人'" @select="filterHandler" @update:search="setShowSearch(true)" @show-custom="showModal(CustomFieldModalRef)" diff --git a/src/views/worksheet/aside/Aside.vue b/src/views/worksheet/aside/Aside.vue index 6c20260..2a643a7 100644 --- a/src/views/worksheet/aside/Aside.vue +++ b/src/views/worksheet/aside/Aside.vue @@ -207,12 +207,17 @@ if (searchContent) { 所有任务包
+ + + 请输入任务包名称 +
- {{ packageName }} + #{{ packageName }}
@@ -996,7 +996,7 @@ defineExpose({ />
- + + .fullscreen-container { /* 可添加其他样式 */ width: 100vw; @@ -1115,7 +1116,7 @@ defineExpose({ .font { font-size: 20px; font-family: PingFang SC, PingFang SC-Medium; - font-weight: 500; + font-weight: 550; color: #0d0b22; } } @@ -1536,4 +1537,5 @@ defineExpose({ margin-top: 12px; margin-bottom: 12px; } + diff --git a/src/views/worksheet/index.vue b/src/views/worksheet/index.vue index 6b34b15..36e641e 100644 --- a/src/views/worksheet/index.vue +++ b/src/views/worksheet/index.vue @@ -48,5 +48,6 @@ function ApprovalOver(packageId) { } :deep(.ip_box){ z-index: 10; + bottom: 220px; } diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue index f2ff33c..b63ff61 100644 --- a/src/views/worksheet/modal/ApprovalModal.vue +++ b/src/views/worksheet/modal/ApprovalModal.vue @@ -158,11 +158,13 @@ defineExpose({
- 智能提示：{{ detail?.similarComplete || 0 }} 张图片相似度为100%重复图片，{{ +
智能提示：
+
{{ detail?.similarComplete || 0 }} 张图片相似度为100%重复图片，{{ detail?.passCount || 0 }}张审批状态为通过，剩余{{ detail?.pendingApprovaCount || 0 }}张图片建议审批为不通过！ +
立即审批 @@ -199,14 +201,16 @@ defineExpose({ } .wrapper { position: absolute; - left: calc(50% - 350px); + left: 0; + right: 0; + .closed { position: relative; top: 0px; left: 90%; } .wrapper-hearder { - margin-top: 20px; + margin-top: 10px; .wrapper-title { text-align: center; font-size: 16px; @@ -229,7 +233,7 @@ defineExpose({ .wrapper-content { flex: 1; border-radius: 8px; - margin: 24px 50px 16px 48px; + margin: 35px 50px 16px 48px; .item { display: flex; flex-flow: row nowrap; @@ -271,8 +275,11 @@ defineExpose({ margin-right: 10px; } .error { - background: rgba(255, 78, 79, 0.1); - color: #ff4e4f; + height: 20px; + width: 117px; + background: rgba(255, 78, 79, 0.1); + color: #ff4e4f; + padding: 1.5px 9px; } } .time_box { @@ -293,6 +300,7 @@ defineExpose({ color: #666666; line-height: 16px; margin-top: 16px; + display: flex; } .footer { cursor: pointer;