asd26269546 1 tahun lalu
induk
melakukan
42e621e116

TEMPAT SAMPAH
src/assets/images/iconm_xiangyzk.png


+ 23 - 0
src/components/byTable/demo.vue

@@ -26,12 +26,34 @@
 					},
 				]"
 				@get-list="getList"
+				@moreSearch="retrievalModal = true"
 			>
 				<template #slotName="{ item }">
 					{{ item.createTime }}
 				</template>
 			</byTable>
 		</div>
+		<el-drawer v-model="retrievalModal" direction="rtl">
+			<template #header>
+				<h4>高级检索</h4>
+			</template>
+			<template #default>
+				<div>
+				<el-radio v-model="radio1" label="Option 1" size="large"
+					>Option 1</el-radio
+				>
+				<el-radio v-model="radio1" label="Option 2" size="large"
+					>Option 2</el-radio
+				>
+				</div>
+			</template>
+			<template #footer>
+				<div style="flex: auto">
+				<el-button @click="cancelClick">取消</el-button>
+				<el-button type="primary" @click="confirmClick">确认</el-button>
+				</div>
+			</template>
+		</el-drawer>
 		<el-dialog
 			:title="modalType == 'add' ? '新增' : '编辑'"
 			v-model="dialogVisible"
@@ -64,6 +86,7 @@ import byTable from '@/components/byTable/index'
 import byForm from '@/components/byForm/index'
 import { computed, defineComponent, ref } from 'vue'
 const loading = ref(false)
+const retrievalModal = ref(false)
 const fixedRight = ref('right')
 const align = ref('center')
 const tableHeight = ref(null)

+ 10 - 5
src/components/byTable/index.vue

@@ -79,7 +79,7 @@
           >搜索</el-button
         >
 
-        <div class="more-icon" @click="retrievalModal = true"><i class="iconfont icon-icomx_woddd"></i></div>
+        <div class="more-icon" @click="retrievalModalFn"><img src="@/assets/images/iconm_xiangyzk.png" alt=""></div>
         
       </div>
     </div>
@@ -382,6 +382,12 @@ export default defineComponent({
         "getList",
         Object.assign(props.filterParams, { [props.searchKey]: props.pagination.keyword })
       );
+    }
+    const retrievalModalFn = () => {
+      proxy.$emit(
+        "moreSearch",
+        ''
+      );
     };
     const handlePageChange = (val) => {
       proxy.$emit(
@@ -464,7 +470,8 @@ export default defineComponent({
       searchItemSelct,
       selectConfigCopy,
       isSelectable,
-      retrievalModal
+      retrievalModal,
+      retrievalModalFn
     };
   },
 });
@@ -495,10 +502,8 @@ export default defineComponent({
   justify-content: space-between;
   margin-bottom: 10px;
   .more-icon{
+    float: right;
     cursor: pointer;
-    line-height: 30px;
-    width: 30px;
-    text-align: center;
   }
 }
 .by-dropdown {

+ 2 - 1
src/layout/components/TagsView/index.vue

@@ -134,7 +134,8 @@ function initTags() {
   affixTags.value = res;
   for (const tag of res) {
     // Must have tag name
-    if (tag.name) {
+    if (tag.name && tag.name != 'processApproval') {
+      
        useTagsViewStore().addVisitedView(tag)
     }
   }

+ 1 - 1
src/views/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="app-container home">
-		<!-- <byTableDemo></byTableDemo> -->
+		<byTableDemo></byTableDemo>
 		
 		
 	</div>