默认提交

@@ -110,7 +110,7 @@ npm run sandbox
 #### z-index 权重划分
 
 - 遮罩蒙层:5000
-- 导航栏:3000
+- 导航栏:1000
 - element-ui:2000+
 - 自定义交互组件 如 date-picker: 800-900
 - 一般业务级:小于 100

 /**
  * 组件描述:过滤组件
- * PC端样式为左图标右文案
- * 主要用于错误提示
+ * 日期根据保单列表中已有月份进行筛选
+ *
  */
 
+
 export default {
 	props: {
 		// 是否显示组件
@@ -16,34 +17,44 @@ export default {
 			type: Function,
 			default: null
 		},
+		// 确认文案
+		confirmText: {
+			type: String,
+			default: "確認",
+		},
+		// 取消文案
+		cancelText: {
+			type: String,
+			default: "取消",
+		},
+		// 确定按钮回调方法
+		confirm: {
+			type: Function,
+			default: null
+		},
+		// 取消按钮回调方法
+		cancel: {
+			type: Function,
+			default: null
+		},
 		// 点击蒙层回调方法
 		overlay: {
 			type: Function,
 			default: null
 		},
+
 		// 传入数据
 		items: {
 			type: Array,
 			default: () => [
-				"复选框 A",
-				"复选框 B",
-				"复选框 C",
-				"复选框 D",
-				"复选框 E",
-				"复选框 F",
-				"复选框 G",
-				"复选框 H",
-				"复选框 I",
-				"复选框 J",
-				"复选框 K",
-				"复选框 L",
+
 			]
 		}
 	},
 	data() {
 		return {
-			key: 'value',
-			checkList: []
+			checkList: [],
+			value2: ""
 		}
 	},
 	components: {},
@@ -59,15 +70,22 @@ export default {
 				this.close();
 			}
 		},
+		// 点击取消
+		onCancelHandler() {
+			if (this.close) {
+				this.close();
+			}
+		},
 		// 点击蒙层
 		onOverLayHandler() {
 			if (this.overlay) {
 				this.overlay();
 			}
 		},
-		toTarget() {
-			if (this.target) {
-				this.$emit("targetCallbak", this.target1);
+		// 点击确认
+		onConfirmHandler() {
+			if (this.confirm) {
+				this.confirm(this.checkList);
 			}
 		},
 		initData() {}

@@ -5,7 +5,7 @@
   position: fixed;
   top: 0;
   left: 0;
-  z-index: 5000;
+  z-index: 2000;
   width: 100%;
   height: 100%;
   @extend .fcc;
@@ -38,7 +38,25 @@
 
   &-content {
     padding: 72px 60px;
-    max-height: 534px;
+    // max-height: 534px;
+    max-height: 70vh;
+    overflow-y: auto;
+  }
+
+  &-btn-wrap {
+    display: flex;
+    justify-content: center;
+
+    .btn {
+      @include btc4(144px, 42px, 16px);
+      margin: 36px 36px 36px;
+      @extend .pointer;
+    }
+
+    .disable {
+      background-image: none;
+      background-color: $cFontGray3;
+    }
   }
 
 }
@@ -74,20 +92,16 @@
   .border {
     width: 80%;
 
+
     .modal {
       .modal-content {
         flex-wrap: wrap;
         padding: 32px 16px;
-
-        .info-icon {
-          margin: 0 auto;
-          width: 32%;
-          min-width: auto;
       }
 
-        .message {
-          margin: 16px auto 0;
-          font-size: 20px;
+      .modal-btn-wrap {
+        .btn {
+          margin: 24px 12px 24px;
         }
       }
     }

@@ -6,11 +6,18 @@
 			<div class="close" @click="onCloseHandler()"><img src="@/assets/images/clarms/close.png"></div>
 			<div class="modal">
 				<div class="modal-content">
+					<div class="check-panel">
 						<el-checkbox-group v-model="checkList">
 							<el-checkbox v-for="item in items" :key="item.id" :label="item"></el-checkbox>
 						</el-checkbox-group>
 					</div>
 				</div>
+
+				<div class="modal-btn-wrap">
+					<div @click="onCancelHandler()" class="btn disable">{{cancelText}}</div>
+					<div @click="onConfirmHandler()" class="btn">{{confirmText}}</div>
+				</div>
+			</div>
 		</div>
 	</div>
 </template>

@@ -8,7 +8,7 @@ $navHeiM: 72px;
   background-color: #fff;
   color: $cFontGray;
   position: relative;
-  z-index: 3000;
+  z-index: 1000;
   font-size: $fontSize;
 
   .header-container {

@@ -4,9 +4,16 @@ import App from './App.vue';
 import router from './router';
 import store from './store/index';
 
-import Element from 'element-ui'
+import ElementUI from 'element-ui'
 import '@styles/element-variables.scss'
-Vue.use(Element)
+
+Vue.use(ElementUI)
+// import enLocale from 'element-ui/lib/locale/lang/en' // lang i18n
+// import zhLocale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n
+// import tcLocale from 'element-ui/lib/locale/lang/zh-TW' // lang i18n
+// Vue.use(ElementUI, {
+// 	tcLocale
+// })
 
 import api from '@/api/api'
 import {
@@ -18,7 +25,9 @@ import VueAwesomeSwiper from 'vue-awesome-swiper'
 import 'swiper/dist/css/swiper.css'
 Vue.use(VueAwesomeSwiper)
 
-import { Loading } from 'vant';
+import {
+	Loading
+} from 'vant';
 Vue.use(Loading);
 
 // vant
@@ -31,9 +40,6 @@ Vue.use(Collapse).use(CollapseItem);
 Vue.use(Icon);
 
 
-// import { Button } from 'element-ui';
-// Vue.use(Button)
-
 import Mock from './mock'
 Mock.bootstrap();
 

@@ -7,7 +7,7 @@
 			<e-correspondence-head-list :multiSelectable="false" @onSelect="handlePolicySelect"></e-correspondence-head-list>
 
 			<!-- 保单详情 -->
-			<template v-if="dataForm">
+			<!-- <template v-if="dataForm">
 				<div class="cell-group">
 					<div class="table-header">
 						<div class="normal-header">
@@ -264,7 +264,7 @@
 						</div>
 					</div>
 				</div>
-			</template>
+			</template> -->
 		</div>
 	</div>
 </template>

@@ -40,8 +40,8 @@ export default {
 			selectPolicyCodes: {},
 			hide: false,
 			showDownloadError: false,
-			filterVisible: true,
-			checkList:[]
+			filterVisible: false,
+			checkList: []
 		}
 	},
 	computed: {
@@ -260,10 +260,24 @@ export default {
 		},
 		// 过滤筛选
 		onFilterHandler(idx) {
+			this.checkList = []
 			switch (idx) {
 				// 保单号码
 				case 1:
-
+					this.checkList = [
+						"复选框 A",
+						"复选框 B",
+						"复选框 C",
+						"复选框 D",
+						"复选框 E",
+						"复选框 F",
+						"复选框 G",
+						"复选框 H",
+						"复选框 I",
+						"复选框 J",
+						"复选框 K",
+						"复选框 L",
+					]
 					break;
 					// 通知书类型
 				case 2:
@@ -285,6 +299,12 @@ export default {
 
 			// 显示模态窗
 			this.filterVisible = true;
+		},
+		/**
+		 * 多选确认
+		 */
+		onCheckConfirmHandler(evt) {
+			console.log("checkList evt:", evt);
 		}
 	},
 	components: {

 <template>
 	<div class="list-container">
 		<modal2-comp :visible="showDownloadError" :close="()=>{showDownloadError = false}" :content="$t('glbalTips.sysError')"></modal2-comp>
-		<filter-comp v-model="checkList" :visible="filterVisible" :close="()=>{filterVisible = false}" ></filter-comp>
+		<filter-comp :items="checkList" :confirm="onCheckConfirmHandler" :visible="filterVisible" :close="()=>{filterVisible = false}" ></filter-comp>
 		<div class="cell-group">
 			<div class="table-contaner">
 				<div class="table-header orange new">