16ca57dd by lihua

Merge branch 'develop' into release-test

2 parents 7d57ce8e 53538f6b
...@@ -20,7 +20,6 @@ import { ...@@ -20,7 +20,6 @@ import {
20 changeNum, 20 changeNum,
21 } from "@/utils/common"; 21 } from "@/utils/common";
22 import { passFlowData, rejectFlowData, revokeFlowData } from "@/api/modules/workFlowService"; 22 import { passFlowData, rejectFlowData, revokeFlowData } from "@/api/modules/workFlowService";
23 import { content } from "html2canvas/dist/types/css/property-descriptors/content";
24 23
25 const { proxy } = getCurrentInstance() as any; 24 const { proxy } = getCurrentInstance() as any;
26 const router = useRouter(); 25 const router = useRouter();
...@@ -216,6 +215,7 @@ const toSearch = (val: any, clear: boolean = false) => { ...@@ -216,6 +215,7 @@ const toSearch = (val: any, clear: boolean = false) => {
216 if (clear) { 215 if (clear) {
217 searchItemList.value.map((item) => (item.default = "")); 216 searchItemList.value.map((item) => (item.default = ""));
218 searchItemValue.value = {}; 217 searchItemValue.value = {};
218 currExchangeGuid.value = '';
219 } else { 219 } else {
220 searchItemValue.value = Object.keys(val).length ? { ...val } : {}; 220 searchItemValue.value = Object.keys(val).length ? { ...val } : {};
221 } 221 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!