-
+
![]()
+ ![]()
- ![]()
+ ![]()
-
{{ item.name }}
-
+
{{ format(item.sendTime, "dd") }}
@@ -191,7 +171,7 @@ function getMore() {
审批节点：{{ item.tag.nodeName }}
-
+
@@ -256,6 +236,7 @@ function getMore() {
.content {
display: flex;
+
.slider {
.icon {
width: 17px;
@@ -276,6 +257,7 @@ function getMore() {
align-items: center;
justify-content: space-between;
cursor: pointer;
+
&-active {
background: rgba(80, 122, 253, 0.1);
}
@@ -291,6 +273,7 @@ function getMore() {
font-weight: 600;
color: #333333;
margin-left: 12px;
+
&-active {
color: #507afd;
}
@@ -472,5 +455,4 @@ function getMore() {
// ::v-deep(.n-divider:not(.n-divider--vertical)) {
// margin-top: 12px;
// margin-bottom: 12px;
-// }
-
+// }
diff --git a/src/views/task/aside/Aside.vue b/src/views/task/aside/Aside.vue
index 16a90f6..bcb02e0 100644
--- a/src/views/task/aside/Aside.vue
+++ b/src/views/task/aside/Aside.vue
@@ -21,8 +21,13 @@ import { getAllfieldList, getfieldList } from '@/api/home/filter'
import { useTaskStore } from '@/store/modules/task'
import emitter from '@/utils/mitt'
import { useConfig } from '@/store/modules/asideConfig'
-import { getConditionList } from "@/api/home/filter";
+import { getConditionList } from "@/api/home/filter";
import type { FilterSearchParam } from "/#/api";
+import { useRoute } from 'vue-router'
+
+
+const route = useRoute()
+const searchContent = route.query.searchContent as string;
const CustomFieldModalRef = ref(null)
const collapse = ref(false)
const taskStore = useTaskStore()
@@ -130,25 +135,25 @@ async function getshowFieldList() {
onMounted(() => {
getshowFieldList()
- window.addEventListener("keydown", handleKeydown);
- init()
+ window.addEventListener("keydown", handleKeydown);
+ init()
})
-async function init(){
+async function init() {
try {
const searchParam: FilterSearchParam = {
search_searchname: { value: "", op: "like", type: "string" },
};
- const result = await getConditionList(1, searchParam,2);
+ const result = await getConditionList(1, searchParam, 2);
const { data } = result;
- if(data[0]){
+ if (data[0]) {
AdvanceFilterRef.value.setCurrentlySelectedAdvanced(data[0].searchname);
setTimeout(() => {
- filterHandler(data[0].id)
+ filterHandler(data[0].id)
}, 1000);
- //filterHandler(data[0].id);
+ //filterHandler(data[0].id);
}
// pagination.pageNo += 1
-
+
} catch (error) {
return [];
} finally {
@@ -156,7 +161,8 @@ async function init(){
//currentlySelectedAdvanced.value="邱霞"
}
function handleKeydown(event) {
- if (event.key === "s") setShowSearch(true)}
+ if (event.key === "s") setShowSearch(true)
+}
// 滚动容器，让key对应模块处于可视区域
function scrollHandler(key: string) {
const element = document.querySelector(`#${key}`)
@@ -200,6 +206,19 @@ defineExpose({
setAsideItemName,
})
+const initSerach = () => {
+ if (searchContent) {
+ setShowSearch(true);
+ const id_param = searchContent.match(/-\d+-/);
+ if (id_param) {
+ console.log("aaaa", id_param);
+ search.value = id_param[0].slice(1, -1);
+ inputHandler(id_param[0].slice(1, -1));
+ }
+ }
+}
+initSerach();
+
const handleOk = (item: any) => {
if (item) {
AdvanceFilterRef.value.setCurrentlySelectedAdvanced(item.searchname);
@@ -212,19 +231,14 @@ const handleOk = (item: any) => {
-
审批状态：{{ getStateText(item.tag.states) }}
+
+
+
diff --git a/src/views/worksheet/aside/Aside.vue b/src/views/worksheet/aside/Aside.vue
index e151339..d93aad1 100644
--- a/src/views/worksheet/aside/Aside.vue
+++ b/src/views/worksheet/aside/Aside.vue
@@ -18,7 +18,11 @@ import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
import { useUser } from '@/store/modules/user'
import { useWorkOrder } from '@/store/modules/workOrder'
import { getViewportOffset } from '@/utils/domUtils'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const searchContent = route.query.searchContent;
+console.log(searchContent);
defineOptions({ name: 'AsideContent' })
const emit = defineEmits(['ApprovalOver'])
@@ -36,7 +40,7 @@ function collapseHandler() {
const mousetrap = inject('mousetrap') as any
mousetrap.bind('[', collapseHandler)
-const searchKeyword = ref('')
+const searchKeyword = ref(searchContent ? searchContent : '')
const asideWidth = computed(() => {
return collapse.value ? 0 : 308
@@ -157,15 +161,15 @@ const inputHandler = debounce((word) => {
function ApprovalOver(packageId) {
emit('ApprovalOver', packageId)
}
+
+if (searchContent) {
+ showSearch.value = true
+ inputHandler(searchContent)
+}
-
-
-
-
+
-
+
@@ -237,6 +218,7 @@ function ApprovalOver(packageId) {
padding: 12px 16px;
width: 100%;
overflow: hidden;
+
.warpper {
display: flex;
justify-content: space-between;
-
-
+
-