heyang 2 년 전
부모
커밋
02bd879caf

+ 0 - 4
src/views/comprehensive/laboratoryManagement/accessAuthorization/applicationjinan.vue

@@ -8,10 +8,6 @@
           <p></p>
           <p></p>
         </div>
         </div>
         <div @click="titleClick(2)">
         <div @click="titleClick(2)">
-          <p>授权失败</p>
-          <p></p>
-        </div>
-        <div @click="titleClick(3)">
           <p>授权日志</p>
           <p>授权日志</p>
           <p class="bottom-p-color"></p>
           <p class="bottom-p-color"></p>
         </div>
         </div>

+ 8 - 4
src/views/comprehensive/laboratoryManagement/accessAuthorization/authorizejinan.vue

@@ -8,10 +8,6 @@
           <p class="bottom-p-color"></p>
           <p class="bottom-p-color"></p>
         </div>
         </div>
         <div @click="titleClick(2)">
         <div @click="titleClick(2)">
-          <p>授权失败</p>
-          <p></p>
-        </div>
-        <div @click="titleClick(3)">
           <p>授权日志</p>
           <p>授权日志</p>
           <p></p>
           <p></p>
         </div>
         </div>
@@ -36,6 +32,13 @@
               </el-option>
               </el-option>
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
+          <el-form-item label="分类" prop="zgType" label-width="80px">
+            <el-select v-model="queryParamsData.leadAuditStaus" placeholder="请选择" clearable size="small">
+              <el-option label="全部" value="" />
+              <el-option label="授权验证成功" value="0" />
+              <el-option label="授权验证失败" value="1" />
+            </el-select>
+          </el-form-item>
           <el-form-item>
           <el-form-item>
             <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
             <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
             <p class="reset-button-one" @click="resetQuery">重置</p>
             <p class="reset-button-one" @click="resetQuery">重置</p>
@@ -48,6 +51,7 @@
           <el-table-column label="实验室负责人" align="left" prop="adminName" />
           <el-table-column label="实验室负责人" align="left" prop="adminName" />
           <el-table-column label="门禁" align="left" prop="hardName" />
           <el-table-column label="门禁" align="left" prop="hardName" />
           <el-table-column label="授权人数" align="left" prop="available"  />
           <el-table-column label="授权人数" align="left" prop="available"  />
+          <el-table-column label="验证方式失败数" align="left" prop="available"  />
           <el-table-column label="状态" align="left" prop="operate" >
           <el-table-column label="状态" align="left" prop="operate" >
             <template slot-scope="scope" v-if="scope.row.operate">
             <template slot-scope="scope" v-if="scope.row.operate">
               <span>{{scope.row.operate.name}}</span>
               <span>{{scope.row.operate.name}}</span>

+ 1 - 5
src/views/comprehensive/laboratoryManagement/accessAuthorization/indexjinan.vue

@@ -3,22 +3,18 @@
       <!--门禁授权-->
       <!--门禁授权-->
       <authorize v-if="pageType == 1"></authorize>
       <authorize v-if="pageType == 1"></authorize>
       <!--授权日志-->
       <!--授权日志-->
-      <authorize-error v-if="pageType == 2"></authorize-error>
-      <!--授权日志-->
-      <application v-if="pageType == 3"></application>
+      <application v-if="pageType == 2"></application>
     </div>
     </div>
 </template>
 </template>
 
 
 <script>
 <script>
   import authorize from "./authorizejinan.vue";
   import authorize from "./authorizejinan.vue";
-  import authorizeError from "./authorizaErrorjinan";
   import application from "./applicationjinan.vue";
   import application from "./applicationjinan.vue";
   export default {
   export default {
     name: "index",
     name: "index",
     components: {
     components: {
       authorize,
       authorize,
       application,
       application,
-      authorizeError
     },
     },
     data(){
     data(){
       return{
       return{

+ 133 - 54
src/views/comprehensive/laboratoryManagement/accessAuthorization/lookImpower.vue

@@ -6,58 +6,74 @@
       <p class="button-p reset-button-one" @click="backPage">返回</p>
       <p class="button-p reset-button-one" @click="backPage">返回</p>
     </div>
     </div>
     <div class="supplier-page">
     <div class="supplier-page">
-      <el-form :model="queryParams" ref="queryForm" style="margin-top:20px;" :inline="true" label-width="120">
-        <el-form-item label="关键字" prop="name">
-          <el-input
-            v-model="queryParams.searchValue"
-            placeholder="请输入姓名/工号/学号"
-            clearable
-            maxLength="30"
-            size="small"
-          />
-        </el-form-item>
-        <el-form-item label="类别" prop="zgType" label-width="80px">
-          <el-select v-model="queryParams.userType" placeholder="请选择" clearable size="small">
-            <el-option label="学生" value="22" />
-            <el-option label="教师" value="11" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="授权时间段" prop="dateRange" style="margin-left:10px;">
-          <el-date-picker
-            :clearable="false"
-            v-model="dateRange"
-            size="small"
-            style="width: 240px"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-
-        <el-form-item>
-          <p class="inquire-button-one" @click="handleQuery">查询</p>
-          <p class="reset-button-one" @click="resetQuery">重置</p>
-        </el-form-item>
-        <el-form-item label="" prop="title" style="float: right">
-          <p class="inquire-button-one"
-             style="width: 120px;margin-left: 10px;"
-             v-if="!admittance"
-             @click="handleClick('','','addStudent')"
-          ><i class="el-icon-plus"></i>新增学生授权</p>
-          <p class="inquire-button-one"
-             style="width: 120px;margin-left: 10px;"
-             v-if="!whiteList"
-             @click="handleClick('','','addTeacher')"
-          ><i class="el-icon-plus"></i>新增教职工授权</p>
+<!--      <el-form :model="queryParams" ref="queryForm" style="margin-top:20px;" :inline="true" label-width="120">-->
+<!--        <el-form-item label="关键字" prop="name">-->
+<!--          <el-input-->
+<!--            v-model="queryParams.searchValue"-->
+<!--            placeholder="请输入姓名/工号/学号"-->
+<!--            clearable-->
+<!--            maxLength="30"-->
+<!--            size="small"-->
+<!--          />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="类别" prop="zgType" label-width="80px">-->
+<!--          <el-select v-model="queryParams.userType" placeholder="请选择" clearable size="small">-->
+<!--            <el-option label="学生" value="22" />-->
+<!--            <el-option label="教师" value="11" />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="授权时间段" prop="dateRange" style="margin-left:10px;">-->
+<!--          <el-date-picker-->
+<!--            :clearable="false"-->
+<!--            v-model="dateRange"-->
+<!--            size="small"-->
+<!--            style="width: 240px"-->
+<!--            value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--            type="daterange"-->
+<!--            range-separator="-"-->
+<!--            start-placeholder="开始日期"-->
+<!--            end-placeholder="结束日期"-->
+<!--          ></el-date-picker>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="分类" prop="zgType" label-width="80px">-->
+<!--          <el-select v-model="queryParams.leadAuditStaus" placeholder="请选择" clearable size="small">-->
+<!--            <el-option label="全部" value="" />-->
+<!--            <el-option label="授权验证成功" value="0" />-->
+<!--            <el-option label="授权验证失败" value="1" />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item>-->
+<!--          <p class="inquire-button-one" @click="handleQuery">查询</p>-->
+<!--          <p class="reset-button-one" @click="resetQuery">重置</p>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="" prop="title" style="float: right">-->
+<!--          <p class="inquire-button-one"-->
+<!--             style="width: 120px;margin-left: 10px;"-->
+<!--             v-if="!admittance"-->
+<!--             @click="handleClick('','','addStudent')"-->
+<!--          ><i class="el-icon-plus"></i>新增学生授权</p>-->
+<!--          <p class="inquire-button-one"-->
+<!--             style="width: 120px;margin-left: 10px;"-->
+<!--             v-if="!whiteList"-->
+<!--             @click="handleClick('','','addTeacher')"-->
+<!--          ><i class="el-icon-plus"></i>新增教职工授权</p>-->
 
 
-        </el-form-item>
-      </el-form>
+<!--        </el-form-item>-->
+<!--      </el-form>-->
+      <advanced-search :searchData="searchData"></advanced-search>
       <el-table border v-loading="loading" :data="tableData">
       <el-table border v-loading="loading" :data="tableData">
         <el-table-column label="所属单位" align="left" prop="deptName"/>
         <el-table-column label="所属单位" align="left" prop="deptName"/>
         <el-table-column label="姓名" align="left" prop="nickName"></el-table-column>
         <el-table-column label="姓名" align="left" prop="nickName"></el-table-column>
-        <el-table-column label="验证方式" align="left" prop="verifyMode"></el-table-column>
+        <el-table-column  align="left" prop="verifyMode">
+          <template slot-scope="scope" slot="header">
+            <span>验证方式
+              <el-tooltip class="item" effect="dark" placement="top-start">
+                <i class= 'el-icon-question' style="color:#E6A23C; margin-left:5px;font-size: 16px;'"></i>
+                <div style="width: 200px;" slot="content">红色:表示此验证方式失败<br/>绿色表示此验证方式成功</div>
+              </el-tooltip>
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column label="类别" align="left" prop="userType"></el-table-column>
         <el-table-column label="类别" align="left" prop="userType"></el-table-column>
         <el-table-column label="授权时间" align="left" prop="verifyTime"></el-table-column>
         <el-table-column label="授权时间" align="left" prop="verifyTime"></el-table-column>
         <el-table-column label="授权人" align="left" prop="verifyUser"></el-table-column>
         <el-table-column label="授权人" align="left" prop="verifyUser"></el-table-column>
@@ -80,8 +96,9 @@
                  v-if="(scope.row.userType=='学生' && !admittance) || (scope.row.userType=='教师' && !whiteList)"
                  v-if="(scope.row.userType=='学生' && !admittance) || (scope.row.userType=='教师' && !whiteList)"
                  @click="handleClick('',scope.row,'delete')"
                  @click="handleClick('',scope.row,'delete')"
               >删除</p>
               >删除</p>
-              <p class="table-min-button" style="color: #333;cursor: text" v-if="scope.row.userType=='学生' && admittance">安全准入</p>
-              <p class="table-min-button" style="color: #333;cursor: text" v-if="scope.row.userType=='教师' && whiteList">白名单</p>
+              <p class="table-min-button"  style="color: #333;cursor: text" @click="handleClick('',scope.row,'again')">手动<i style="color: #0045AF;cursor: pointer;font-style: normal;text-decoration:underline">重试</i></p>
+              <p class="table-min-button"  style="color: #333;cursor: text" @click="handleClick('',scope.row,'again')"  v-if="scope.row.userType=='学生' && admittance">安全准入<i style="color: #0045AF;cursor: pointer;font-style: normal;text-decoration:underline">重试</i></p>
+              <p class="table-min-button"  style="color: #333;cursor: text" @click="handleClick('',scope.row,'again')" v-if="scope.row.userType=='教师' && whiteList">白名单<i style="color: #0045AF;cursor: pointer;font-style: normal;text-decoration:underline">重试</i></p>
             </div>
             </div>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
@@ -208,6 +225,7 @@
 <script>
 <script>
 import { listStudentUser, listTeacherUser } from '@/api/system/user_student'
 import { listStudentUser, listTeacherUser } from '@/api/system/user_student'
 import { listDepartments } from '@/api/system/dept'
 import { listDepartments } from '@/api/system/dept'
+import advancedSearch from "@/components/ZDcomponents/advancedSearch.vue"
 import {
 import {
   AddImpowerHaikang,
   AddImpowerHaikang,
   delUserHaikang,
   delUserHaikang,
@@ -218,8 +236,9 @@ import {
 
 
 export default {
 export default {
   name: "Approval",
   name: "Approval",
-  components: {
 
 
+  components: {
+    advancedSearch
   },
   },
   props:{
   props:{
     pageData:{},
     pageData:{},
@@ -239,7 +258,6 @@ export default {
       },
       },
       total:0,
       total:0,
       tableData:[],
       tableData:[],
-      oldTableData:[],
       dateRange:[],
       dateRange:[],
       dialogForm:{
       dialogForm:{
         pageNum: 1,
         pageNum: 1,
@@ -270,6 +288,68 @@ export default {
       },
       },
       admittance:false,//智能门禁有没有勾选安全准入
       admittance:false,//智能门禁有没有勾选安全准入
       whiteList:false,//智能门禁有没有勾选白名单
       whiteList:false,//智能门禁有没有勾选白名单
+      searchData:{
+        buttonList:[//按钮数组没有则为空
+          {
+            name:"新增教职工授权",//按钮名称 只有再状态 1 时需要
+            type:"1", //按钮类型 1.按钮 2.导入 3.导出
+            parameter:"add",//按钮字符用于返回方法时的判断
+            hasPermi:['chemical:hxpStock:detailExport'] // 权限字段 如果没有则传空字符 hasPermi:"",
+          },
+          {
+            name:"新增学生授权",//按钮名称 只有再状态 1 时需要
+            type:"1", //按钮类型 1.按钮 2.导入 3.导出
+            parameter:"add",//按钮字符用于返回方法时的判断
+            hasPermi:['chemical:hxpStock:detailExport'] // 权限字段 如果没有则传空字符 hasPermi:"",
+          },
+
+        ],
+        searchList:[//搜索数组
+          {
+            name:"关键字",//描述名称
+            key:"searchValue",//键名 用于返回数据
+            value:"",//内容 用于组件内绑定数据
+            placeholder:"请输入姓名/工号/学号",//输入提示
+            level:"1",//1.普通搜索 2.高级搜索  普通搜索默认会在高级搜索时显示
+            type:"1",//类型 1.input 2.select 3.TimePicker
+            universal:'20',//通用参数 input时为最大长度 //TimePicker时可不传
+            width:'260',//el-form-item 长度 可传可不传 不传时input/select默认180长度 TimePicker默认240长度
+          },
+          {
+            name:"类别",//描述名称
+            key:"userType",//键名 用于返回数据
+            value:"",//内容 用于组件内绑定数据
+            placeholder:"请选择类别",//输入提示
+            level:"1",//1.普通搜索 2.高级搜索  普通搜索默认会在高级搜索时显示
+            type:"2",//类型 1.input 2.select 3.TimePicker
+            universal:[ //通用参数 select时为列表数据 //TimePicker时可不传
+              {label:"学生",value:"22"},{label:"教师",value:"11"},
+            ],
+            width:'175',//el-form-item 长度 可传可不传 不传时input/select默认180长度 TimePicker默认240长度
+          },
+          {
+            name:"授权时间段",//描述名称
+            key:"dateRange",//键名 用于返回数据
+            value:"",//内容 用于组件内绑定数据
+            placeholder:"请选择",//输入提示
+            level:"2",//1.普通搜索 2.高级搜索  普通搜索默认会在高级搜索时显示
+            type:"3",//类型 1.input 2.select 3.TimePicker
+            width:'260',//el-form-item 长度 可传可不传 不传时input/select默认180长度 TimePicker默认240长度
+          },
+          {
+            name:"分类",//描述名称
+            key:"userType",//键名 用于返回数据
+            value:"",//内容 用于组件内绑定数据
+            placeholder:"请选择分类",//输入提示
+            level:"2",//1.普通搜索 2.高级搜索  普通搜索默认会在高级搜索时显示
+            type:"2",//类型 1.input 2.select 3.TimePicker
+            universal:[ //通用参数 select时为列表数据 //TimePicker时可不传
+              {label:"全部",value:""},{label:"授权验证成功",value:"0"},{label:"授权验证失败",value:"1"},
+            ],
+            width:'175',//el-form-item 长度 可传可不传 不传时input/select默认180长度 TimePicker默认240长度
+          },
+        ],
+      },
     };
     };
 
 
 
 
@@ -464,8 +544,7 @@ export default {
         }
         }
         getHaikangUserList(_this.queryParams).then( response => {
         getHaikangUserList(_this.queryParams).then( response => {
           let res=response.rows;
           let res=response.rows;
-          _this.tableData=res;
-          _this.oldTableData=res;
+          _this.tableData=[{}];
           _this.total=response.total;
           _this.total=response.total;
         });
         });
       },
       },

+ 305 - 0
src/views/comprehensive/laboratoryManagement/accessAuthorization/lookImpowerSearch.vue

@@ -0,0 +1,305 @@
+<!--
+=========================示例说明=========================
+<advanced-search :searchData="searchData"></advanced-search>
+import advancedSearch from "@/components/ZDcomponents/advancedSearch.vue"
+components: {
+  addPage,
+  advancedSearch
+},
+=========================必要参数=========================
+searchData:{
+  buttonList:[//按钮数组没有则为空
+    {
+      name:"新增",//按钮名称 只有再状态 1 时需要
+      type:"1", //按钮类型 1.按钮 2.导入 3.导出
+      parameter:"add",//按钮字符用于返回方法时的判断
+      hasPermi:['laboratory:gradeManage:add'] // 权限字段 如果没有则传空字符 hasPermi:"",
+    },
+    {
+      name:"导入",//按钮名称 只有再状态 1 时需要
+      type:"2", //按钮类型 1.按钮 2.导入 3.导出
+      parameter:"import",//按钮字符用于返回方法时的判断
+      hasPermi:['laboratory:gradeManage:import'] // 权限字段 如果没有则传空字符 hasPermi:"",
+    },
+    {
+      name:"导出",//按钮名称 只有再状态 1 时需要
+      type:"3", //按钮类型 1.按钮 2.导入 3.导出
+      parameter:"export",//按钮字符用于返回方法时的判断
+      hasPermi:['laboratory:gradeManage:export'] // 权限字段 如果没有则传空字符 hasPermi:"",
+    }
+  ],
+  searchList:[//搜索数组
+    {
+      name:"名称",//描述名称
+      key:"name",//键名 用于返回数据
+      value:"",//内容 用于组件内绑定数据
+      placeholder:"请输入名称",//输入提示
+      level:"1",//1.普通搜索 2.高级搜索  普通搜索默认会在高级搜索时显示
+      type:"1",//类型 1.input 2.select 3.TimePicker
+      universal:'10',//通用参数 input时为最大长度 //TimePicker时可不传
+      universal:[ //通用参数 select时为列表数据 //TimePicker时可不传
+        {label:"全部",value:""},{label:"开启",value:"1"},{label:"关闭",value:"0"},
+      ],
+      labelWidth:'100px',//label-width宽度  可传可不传 不传时为默认宽度
+      width:'200',//el-form-item 长度 可传可不传 不传时input/select默认180长度 TimePicker默认240长度
+    }
+  ]
+}
+=========================必要方法=========================
+//父组件必要此方法用于接收参数
+searchClick(type,data){
+  if(type == 1){ //type  1.查询
+    this.queryParams = JSON.parse(JSON.stringify(data));
+    this.queryParams.pageNum = 1;
+    this.queryParams.pageSize = 20;
+    this.getList();
+  }else if(type == 2){ //type  1.重置
+    this.queryParams = {
+      pageNum : 1,
+      pageSize:20,
+    };
+    this.getList();
+  }else if(type == 'add'){ //type  其他 自定义按钮
+    this.clickPageType(2);
+  }else if(type == 'import'){ //如果按钮类型是2或者3 这里data也会返回数据
+    console.log('data',data)
+  }else if(type == 'export'){ //如果按钮类型是2或者3 这里data也会返回数据
+    console.log('data',data)
+  }
+},
+-->
+
+<template>
+  <div class="advancedSearchMaxBigBox">
+    <el-form ref="queryForm" :inline="true" v-if="!searchState">
+      <el-form-item :label="item.name" :label-width="item.labelWidth?item.labelWidth:'px'" prop="searchValue" v-for="item in searchData.searchList" v-if="item.level == 1">
+        <el-input v-if="item.type == 1" v-model="item.value" :maxlength="item.universal" :placeholder="item.placeholder" clearable
+                  :style="item.width?'width:'+item.width+'px;':'width: 180px;'"/>
+        <el-select v-if="item.type == 2" v-model="item.value" :placeholder="item.placeholder" clearable
+                   :style="item.width?'width:'+item.width+'px;':'width: 180px;'">
+          <el-option :key="minItem.value" :label="minItem.label" :value="minItem.value" v-for="minItem in item.universal"></el-option>
+        </el-select>
+        <el-date-picker v-if="item.type == 3" v-model="item.value" :clearable="false" value-format="yyyy-MM-dd"
+                        :style="item.width?'width:'+item.width+'px;':'width: 240px;'"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <p class="inquire-button-one" @click="buttonClick(1)">查询</p>
+        <p class="reset-button-one" @click="buttonClick(2)">重置</p>
+      </el-form-item>
+      <el-form-item>
+        <p class="advanced-button" @click="stateSwitch">高级搜索</p>
+      </el-form-item>
+      <el-form-item style="float: right" v-for="item in searchData.buttonList" >
+        <p v-if="item.type == 1" class="inquire-button-one" v-hasPermi="item.hasPermi" style="width:120px;" @click="buttonClick(item.parameter)">{{item.name}}</p>
+        <div style="float: right;" v-if="item.type == 2">
+          <el-dropdown @command="commandButton" v-hasPermi="item.hasPermi">
+            <div class="form-dropdown-box">
+              <img src="@/assets/ZDimages/personnelManagement/icon_jzgxx_dr.png">
+              <p>导入</p>
+              <img src="@/assets/ZDimages/personnelManagement/icon_jzggl_xljt.png">
+            </div>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item style="border-bottom:1px solid #E0E0E0;margin:0 10px;color:#333;" :command="{item:item,command:1}">下载模板</el-dropdown-item>
+              <el-dropdown-item style="margin:0 10px;color:#666;" :command="{item:item,command:2}">导入数据</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </div>
+        <div style="float: right; "  v-if="item.type == 3">
+          <el-dropdown @command="commandButton" v-hasPermi="item.hasPermi">
+            <div class="form-dropdown-box">
+              <img src="@/assets/ZDimages/personnelManagement/icon_jzgxx_sc.png">
+              <p>导出</p>
+              <img src="@/assets/ZDimages/personnelManagement/icon_jzggl_xljt.png">
+            </div>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item style="border-bottom:1px solid #E0E0E0;margin:0 10px;color:#333;" :command="{item:item,command:1}">导出全部数据</el-dropdown-item>
+              <el-dropdown-item style="margin:0 10px;color:#666;" :command="{item:item,command:2}">导出选中数据</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </div>
+      </el-form-item>
+    </el-form>
+    <el-form ref="queryForm" :inline="true" v-if="searchState">
+      <el-form-item :label="item.name" :label-width="item.labelWidth?item.labelWidth:'px'" prop="searchValue" v-for="item in searchData.searchList" >
+        <el-input v-if="item.type == 1" v-model="item.value" :maxlength="item.universal" :placeholder="item.placeholder" clearable
+                  :style="item.width?'width:'+item.width+'px;':'width: 180px;'"/>
+        <el-select v-if="item.type == 2" v-model="item.value" :placeholder="item.placeholder" clearable
+                   :style="item.width?'width:'+item.width+'px;':'width: 180px;'">
+          <el-option :key="minItem.value" :label="minItem.label" :value="minItem.value" v-for="minItem in item.universal"></el-option>
+        </el-select>
+        <el-date-picker v-if="item.type == 3" v-model="item.value" :clearable="false" value-format="yyyy-MM-dd"
+                        :style="item.width?'width:'+item.width+'px;':'width: 240px;'"
+                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+    </el-form>
+    <div class="advanced-max-big-box" v-if="searchState">
+      <div class="left-advanced-box"></div>
+      <div class="center-advanced-box">
+        <p class="inquire-button-one" @click="buttonClick(1)">查询</p>
+        <p class="reset-button-one" @click="buttonClick(2)">重置</p>
+      </div>
+      <div class="right-advanced-box">
+        <span class="ordinary-button" @click="stateSwitch">普通搜索</span>
+      </div>
+      <div v-for="item in searchData.buttonList">
+        <p v-if="item.type == 1" class="inquire-button-one"
+           v-hasPermi="item.hasPermi" style="width:120px;float: right;" @click="buttonClick(item.parameter)">{{item.name}}</p>
+        <div style="float: right;" v-if="item.type == 2">
+          <el-dropdown @command="commandButton" v-hasPermi="item.hasPermi">
+            <div class="form-dropdown-box">
+              <img src="@/assets/ZDimages/personnelManagement/icon_jzgxx_dr.png">
+              <p>导入</p>
+              <img src="@/assets/ZDimages/personnelManagement/icon_jzggl_xljt.png">
+            </div>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item style="border-bottom:1px solid #E0E0E0;margin:0 10px;color:#333;" :command="{item:item,command:1}">下载模板</el-dropdown-item>
+              <el-dropdown-item style="margin:0 10px;color:#666;" :command="{item:item,command:2}">导入数据</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </div>
+        <div style="float: right; "  v-if="item.type == 3">
+          <el-dropdown @command="commandButton" v-hasPermi="item.hasPermi">
+            <div class="form-dropdown-box">
+              <img src="@/assets/ZDimages/personnelManagement/icon_jzgxx_sc.png">
+              <p>导出</p>
+              <img src="@/assets/ZDimages/personnelManagement/icon_jzggl_xljt.png">
+            </div>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item style="border-bottom:1px solid #E0E0E0;margin:0 10px;color:#333;" :command="{item:item,command:1}">导出全部数据</el-dropdown-item>
+              <el-dropdown-item style="margin:0 10px;color:#666;" :command="{item:item,command:2}">导出选中数据</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "advancedSearch",
+    props:{
+      searchData:{}
+    },
+    data() {
+      return {
+        searchState:false,
+      }
+    },
+    created() {
+
+    },
+    mounted(){
+
+    },
+    methods: {
+      //普通/高级状态切换
+      stateSwitch(){
+        this.searchState = !this.searchState;
+      },
+      //导出/导入按钮
+      commandButton(data){
+        this.$parent.searchClick(data.item.parameter,data.command);
+      },
+      //按钮方法
+      buttonClick(type){
+        let self = this;
+        if(type == '1'){
+          //查找
+          let obj = {};
+          for(let i=0;i<self.searchData.searchList.length;i++){
+            if(self.searchState){
+              //高级搜索
+              obj[self.searchData.searchList[i].key] = self.searchData.searchList[i].value;
+            }else{
+              //普通搜索
+              if(self.searchData.searchList[i].level == '1'){
+                obj[self.searchData.searchList[i].key] = self.searchData.searchList[i].value;
+              }
+            }
+          }
+          self.$parent.searchClick(type,obj);
+        }else if(type == '2'){
+          //返回
+          for(let i=0;i<self.searchData.searchList.length;i++){
+            self.searchData.searchList[i].value = '';
+          }
+          self.$parent.searchClick(type);
+        }else{
+          self.$parent.searchClick(type);
+        }
+      },
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .advancedSearchMaxBigBox{
+    margin:0 20px;
+    .advanced-button{
+      margin:0 20px;
+      cursor: pointer;
+      line-height:40px;
+      font-weight:500;
+      font-size:14px;
+      color:#0183FA;
+    }
+    .advanced-max-big-box{
+      display: flex;
+      padding-bottom:20px;
+      padding-right:10px;
+      font-size:14px;
+      .left-advanced-box{
+        flex:1;
+      }
+      .center-advanced-box{
+
+      }
+      .right-advanced-box{
+        flex:1;
+        .ordinary-button{
+          margin:0 20px;
+          cursor: pointer;
+          line-height:40px;
+          font-weight:500;
+          font-size:14px;
+          color:#0183FA;
+        }
+      }
+    }
+    .form-dropdown-box{
+      display: flex;
+      margin:0;
+      padding:0 10px;
+      cursor: pointer;
+      height:40px;
+      img:nth-child(1){
+        width:16px;
+        height:16px;
+        margin-top:12px;
+      }
+      p{
+        width:47px;
+        text-align: center;
+        font-size:14px;
+        margin:0;
+        line-height:40px;
+      }
+      img:nth-child(3){
+        width:10px;
+        height:6px;
+        margin-top:17px;
+      }
+    }
+  }
+</style>
+<style lang="scss">
+  .advancedSearchMaxBigBox{
+    .el-range-editor--medium.el-input__inner{
+      height:40px;
+    }
+  }
+</style>