Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

 export default {
 export default {
-  SERVERAPI: '/service-bdcdj9',
-  // SERVERCAI: '/service-bdcdj-Tian'
+  SERVERAPI: '/service-bdcdj-xq',
+  // SERVERCAI: '/service-bdcdj-xiaqi'
 }
 }
\ No newline at end of file

+<template>
+  <div class="my-outbox">
+    <div class="my-inbox" ref='box'>
+      <div class="my-list" :style="note" v-for="(item,index) in sendVal" :key='index' ref='list'>
+        <span class="my-uname">{{ item }}</span>
+      </div>
+    </div>
+  </div>
+</template>
+  
+<script>
+export default {
+  name: 'my-marquee-left',
+  props: {
+    sendVal: {
+      type: Array,
+      default: []
+    }
+  },
+  data () {
+    return {
+      note: {
+        backgroundSize: "20px 20px",
+        backgroundRepeat: "no-repeat",
+        backgroundPosition: "1%  50%"
+      },
+      // 定时器标识
+      nowTime: null,
+      // 每一个内容的宽度
+      disArr: []
+    }
+  },
+  mounted () {
+    // var that = this
+    var item = this.$refs.list
+    var len = this.sendVal.length
+    var arr = []
+    // 因为设置的margin值一样，所以取第一个就行。
+    var margin = this.getMargin(item[0])
+    for (var i = 0; i < len; i++) {
+      arr.push(item[i].clientWidth + margin) // 把宽度和 margin 加起来就是每一个元素需要移动的距离
+    }
+    this.disArr = arr
+    this.moveLeft()
+  },
+  beforeDestroy () {
+    // 页面关闭清除定时器
+    clearInterval(this.nowTime)
+    // 清除定时器标识
+    this.nowTime = null
+  },
+  methods: {
+    // 获取margin属性
+    getMargin (obj) {
+      var marg = window.getComputedStyle(obj, null)['margin-right']
+      marg = marg.replace('px', '')
+      return Number(marg) // 强制转化成数字
+    },
+    // 移动的方法
+    moveLeft () {
+      var that = this
+      var outbox = this.$refs.box
+      // 初始位置
+      var startDis = 0
+      //   console.log('that.disArr: ', that.disArr)
+      this.nowTime = setInterval(function () {
+        startDis -= 0.5
+        // console.log('初始化移动：', startDis)
+        if (Math.abs(startDis) > Math.abs(that.disArr[0])) {
+          // 每次移动完一个元素的距离，就把这个元素的宽度
+          that.disArr.push(that.disArr.shift())
+          // 每次移动完一个元素的距离，就把列表数据的第一项放到最后一项
+          // console.log('that.sendVal: ', that.sendVal)
+          // console.log('that.sendVal: ', that.sendVal.shift())
+          that.sendVal.push(that.sendVal.shift())
+          startDis = 0
+          // console.log('移动')
+        } else {
+          // console.log('不来不来就不来...')
+        }
+        // 每次都让盒子移动指定的距离，在我自己做的项目中，这种字符串拼接的方法并没有生效
+        // outbox.style = 'transform: translateX3d(' + startDis + 'px)' 
+        // 后面换了es6的模板字符串就可以了
+        outbox.style = `transform: translateX(${startDis}px)`
+        // outbox.style = 'transform: translateX(\' + startDis + \' px)'
+        // outbox.style.marginLeft = 'startDis'
+        // console.log('这里:', startDis)
+      }, 1000 / 60)
+    }
+  }
+}
+</script>
+  
+<style lang="scss" scoped>
+.my-outbox {
+  color: #fff;
+  overflow: hidden;
+  line-height: 28px;
+  // background: $light-blue;
+  width: 500px;
+
+  .my-inbox {
+    white-space: nowrap;
+
+    .my-list {
+      margin-right: 15px;
+      display: inline-block;
+      font-size: 14px;
+      text-indent: 30px;
+
+      .my-uname {
+        color: #fff;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file

@@ -107,7 +107,7 @@ export default {
 .ls-mask {
 .ls-mask {
   width: 100%;
   width: 100%;
   height: 100%;
   height: 100%;
-  z-index: 100000;
+  z-index: 2000;
   position: fixed;
   position: fixed;
   left: 0;
   left: 0;
   top: 0;
   top: 0;

 <template>
 <template>
-  <div class="navbar" v-theme.background="mTheme">
-    <div class="logo">
-      <img v-if="logo" :src="logo" class="header-logo">
-    </div>
-    <div class="backdrop">
-      <theme style="float: right;height: 26px;width: 26px;margin-top: 26px;" @change="themeChange" />
-    </div>
-    <div class="right-menu">
-      <el-dropdown class="avatar-container right-menu-item hover-effect" @command="handleCommand">
-        <div class="avatar-wrapper">
-          <span style="padding-right:10px">{{ name }}</span>
-          <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar" />
-        </div>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item command="a">个人中心</el-dropdown-item>
-          <el-dropdown-item command="f">退出登录</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
+  <div class="navbar-con">
+    <div class="navbar" v-theme.background="mTheme">
+      <div class="logo">
+        <img v-if="logo" :src="logo" class="header-logo">
+      </div>
+      <div class="backdrop">
+        <theme style="float: right;height: 26px;width: 26px;margin-top: 26px;" @change="themeChange" />
+      </div>
+      <div class="right-menu">
+        <el-dropdown class="avatar-container right-menu-item hover-effect" @command="handleCommand">
+          <div class="avatar-wrapper">
+            <span style="padding-right:10px">{{ name }}</span>
+            <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar" />
+          </div>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item command="a">个人中心</el-dropdown-item>
+            <el-dropdown-item command="f">退出登录</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
     </div>
     </div>
+    <NoticeBar class="NoticeBar" :sendVal="sendVal" />
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
+import NoticeBar from '@/components/NoticeBar/index'
 import { mapGetters } from 'vuex'
 import { mapGetters } from 'vuex'
 export default {
 export default {
+  components: {
+    NoticeBar
+  },
   computed: {
   computed: {
     ...mapGetters(['sidebar', 'avatar', 'name'])
     ...mapGetters(['sidebar', 'avatar', 'name'])
   },
   },
   data () {
   data () {
     return {
     return {
-      logo: require('../../image/logo.png')
+      logo: require('../../image/logo.png'),
+      sendVal: [
+        '222222222222222222222222222222222',
+        '222222233333333333333333333333'
+      ]
     }
     }
   },
   },
   methods: {
   methods: {
@@ -53,6 +64,16 @@ export default {
 }
 }
 </script>
 </script>
 <style lang="scss" scoped>
 <style lang="scss" scoped>
+.navbar-con {
+  position: relative;
+}
+
+.NoticeBar {
+  position: absolute;
+  left: 330px;
+  bottom: 0;
+}
+
 .el-dropdown-menu {
 .el-dropdown-menu {
   padding: 0 !important;
   padding: 0 !important;
   border: 1px solid #EBEEF5;
   border: 1px solid #EBEEF5;

@@ -116,23 +116,20 @@
 .title-block {
 .title-block {
   display: inline-block;
   display: inline-block;
   position: relative;
   position: relative;
-  background: #3498db;
-  color: #fff !important;
-  text-align: center;
-  padding: 0px 20px;
-  height: 30px;
-  line-height: 30px;
-  border-radius: 5px 5px 5px 0px;
-  letter-spacing: 2px;
+  text-align: left;
+  width: 100%;
+  line-height: 26px;
+  padding-left: 10px;
+  font-size: 16px;
+  border-bottom: 1px solid $borderColor;
 }
 }
 
 
-.title-block .triangle {
-  width: 0px;
-  height: 0px;
+.title-block:after {
+  content: " ";
+  width: 0;
+  height: 16px;
   position: absolute;
   position: absolute;
-  border: 5px solid transparent;
-  border-top: 5px solid #3498db;
-  border-right: 5px solid #3498db;
-  left: 0px;
-  bottom: -10px;
+  border-left: 3px solid $light-blue;
+  left: 0;
+  top: 5px;
 }
 }
\ No newline at end of file

@@ -16,7 +16,7 @@
     left: 0;
     left: 0;
     z-index: 1001;
     z-index: 1001;
     background-color: $subMenuBg;
     background-color: $subMenuBg;
-    overflow: hidden;
+    // overflow: hidden;
 
 
     .horizontal-collapse-transition {
     .horizontal-collapse-transition {
       transition: 0s width ease-in-out, 0s padding-left ease-in-out,
       transition: 0s width ease-in-out, 0s padding-left ease-in-out,
@@ -25,8 +25,9 @@
 
 
     .scrollbar-wrapper {
     .scrollbar-wrapper {
       overflow-x: hidden !important;
       overflow-x: hidden !important;
-      overflow-y: auto;
+      // overflow-y: auto;
       margin-right: 0 !important;
       margin-right: 0 !important;
+      height: 90vh;
 
 
       &::-webkit-scrollbar {
       &::-webkit-scrollbar {
         display: none;
         display: none;
@@ -52,7 +53,6 @@
       background-color: transparent !important;
       background-color: transparent !important;
       border: none;
       border: none;
       height: 100%;
       height: 100%;
-      // overflow-y: auto;
       width: 100% !important;
       width: 100% !important;
     }
     }
 
 

@@ -3,7 +3,8 @@
   作者：calliope
   作者：calliope
 -->
 -->
 <template>
 <template>
-  <lb-table  border :column="tableData.columns" :data="tableData.data" :maxHeight="200" heightNumSetting :pagination="false">
+  <lb-table border :column="tableData.columns" :data="tableData.data" :maxHeight="200" heightNumSetting
+    :pagination="false">
   </lb-table>
   </lb-table>
 </template>
 </template>
 <script>
 <script>
@@ -40,7 +41,7 @@ export default {
             }
             }
           },
           },
           {
           {
-            width: '200',
+            width: '150',
             label: '身份证读卡器',
             label: '身份证读卡器',
             render: (h, scope) => {
             render: (h, scope) => {
               return (
               return (
@@ -51,7 +52,7 @@ export default {
             }
             }
           },
           },
           {
           {
-            width: '200',
+            width: '150',
             prop: 'sqrxm',
             prop: 'sqrxm',
             label: '姓名/名称',
             label: '姓名/名称',
             render: (h, scope) => {
             render: (h, scope) => {
@@ -66,7 +67,7 @@ export default {
             label: '证件种类',
             label: '证件种类',
             render: (h, scope) => {
             render: (h, scope) => {
               return (
               return (
-                <el-select value={scope.row[scope.column.property]}
+                <el-select class="width100" value={scope.row[scope.column.property]}
                   onChange={(val) => { scope.row[scope.column.property] = val }}>
                   onChange={(val) => { scope.row[scope.column.property] = val }}>
                   {
                   {
                     this.dictData['A30'].map(option => {
                     this.dictData['A30'].map(option => {

@@ -7,6 +7,28 @@
     justify-content: space-between;
     justify-content: space-between;
   }
   }
 
 
+  .workbench {
+    flex-wrap: wrap;
+    height: 100%;
+
+    li {
+      width: 32.5%;
+      height: 118px;
+      @include flex-center;
+      flex-direction: column;
+      color: #fff;
+
+      i {
+        color: #fff;
+        font-size: 30px;
+      }
+    }
+
+    li:nth-child(1) {
+      margin-bottom: 6px;
+    }
+  }
+
   .marginZL15 {
   .marginZL15 {
     margin: 0 15px;
     margin: 0 15px;
   }
   }
@@ -36,7 +58,7 @@
     ul {
     ul {
       li {
       li {
         line-height: 36px;
         line-height: 36px;
-
+        
         p {
         p {
           white-space: nowrap;
           white-space: nowrap;
         }
         }

@@ -3,8 +3,14 @@
     <div class="home-left">
     <div class="home-left">
       <el-row :gutter="8">
       <el-row :gutter="8">
         <el-col :span="12">
         <el-col :span="12">
-          <el-card shadow="hover">
-            鼠标悬浮时显示
+          <el-card shadow="hover" :body-style="{ padding: '0' }">
+            <ul class="workbench flexst">
+              <li v-for="(item, index) in newsListData" class="pointer" :key="index"
+                :style="{ backgroundColor: item.color }">
+                <i class="el-icon-s-claim"></i>
+                {{ item.title }}
+              </li>
+            </ul>
           </el-card>
           </el-card>
         </el-col>
         </el-col>
         <el-col :span="12">
         <el-col :span="12">
@@ -14,7 +20,7 @@
               <i class="el-icon-s-unfold pointer"></i>
               <i class="el-icon-s-unfold pointer"></i>
             </div>
             </div>
             <ul>
             <ul>
-              <li v-for="(item, index) in notice" :key="index" class="flexst">
+              <li v-for="(item, index) in notice" :key="index" class="flexst pointer">
                 <p class="list-title">{{ item.title }}</p>
                 <p class="list-title">{{ item.title }}</p>
                 <p class="marginZL15">{{ item.date }}</p>
                 <p class="marginZL15">{{ item.date }}</p>
                 <p>{{ item.state }}</p>
                 <p>{{ item.state }}</p>
@@ -41,11 +47,11 @@
         <el-col :span="12">
         <el-col :span="12">
           <el-card shadow="hover">
           <el-card shadow="hover">
             <div slot="header" class="flexst">
             <div slot="header" class="flexst">
-              <h5 class="title">公司邮件</h5>
+              <h5 class="title">法律法规</h5>
               <i class="el-icon-s-unfold pointer"></i>
               <i class="el-icon-s-unfold pointer"></i>
             </div>
             </div>
             <ul>
             <ul>
-              <li v-for="(item, index) in mailList" :key="index" class="flexst">
+              <li v-for="(item, index) in mailList" @click="handleView" :key="index" class="flexst pointer">
                 <p class="right15">{{ item.date }}</p>
                 <p class="right15">{{ item.date }}</p>
                 <p class="list-title">{{ item.title }}</p>
                 <p class="list-title">{{ item.title }}</p>
               </li>
               </li>
@@ -73,6 +79,38 @@ export default {
   components: { calendar },
   components: { calendar },
   data () {
   data () {
     return {
     return {
+      newsListData: [
+        {
+          icon: '',
+          title: '任务',
+          color: '#61AEFF'
+        },
+        {
+          icon: '',
+          title: '邮件',
+          color: '#43DEB3'
+        },
+        {
+          icon: '',
+          title: '消息',
+          color: '#F3C143'
+        },
+        {
+          icon: '',
+          title: '日历',
+          color: '#F09936'
+        },
+        {
+          icon: '',
+          title: '常用功能',
+          color: '#9C92FF'
+        },
+        {
+          icon: '',
+          title: '申请',
+          color: '#589FFF'
+        }
+      ],
       chartData: [{
       chartData: [{
         year: '1991',
         year: '1991',
         value: 15468
         value: 15468
@@ -92,14 +130,11 @@ export default {
         year: '1996',
         year: '1996',
         value: 31056
         value: 31056
       }, {
       }, {
-        year: '1997',
-        value: 31982
-      }, {
-        year: '1998',
-        value: 32040
+        year: '1995',
+        value: 17000
       }, {
       }, {
-        year: '1999',
-        value: 33233
+        year: '1996',
+        value: 31056
       }],
       }],
       notice: [
       notice: [
         {
         {
@@ -168,6 +203,10 @@ export default {
     this.buildChart();
     this.buildChart();
   },
   },
   methods: {
   methods: {
+    handleView () {
+      const href = 'http://storage.xuetangx.com/public_assets/xuetangx/PDF/PlayerAPI_v1.0.6.pdf'
+      window.open(href, '_blank');
+    },
     buildChart () {
     buildChart () {
       var chart = new G2.Chart({
       var chart = new G2.Chart({
         container: 'mountNode',
         container: 'mountNode',
@@ -204,5 +243,6 @@ export default {
 }
 }
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
+@import "~@/styles/mixin.scss";
 @import "./index.scss";
 @import "./index.scss";
 </style>
 </style>
\ No newline at end of file

@@ -61,6 +61,7 @@ class data extends filter {
       },
       },
       {
       {
         label: "操作",
         label: "操作",
+        width: 100,
         render: (h, scope) => {
         render: (h, scope) => {
           return <el-button type="text" icon='el-icon-view' onClick={() => { vm.dydjbClick(scope) }}>打印登记薄</el-button>
           return <el-button type="text" icon='el-icon-view' onClick={() => { vm.dydjbClick(scope) }}>打印登记薄</el-button>
         }
         }

 <template>
 <template>
-  <dialogBox title="家庭房产查询" @closeDialog="closeDialog" width="90%" :isButton="false" v-model="myValue">
+  <dialogBox title="家庭房产查询" @closeDialog="closeDialog" isMain width="70%" :isButton="false" v-model="myValue">
     <div class="jtfccx-edit">
     <div class="jtfccx-edit">
       <div class="jtfccx-edit-con">
       <div class="jtfccx-edit-con">
         <b class="title">申请信息</b>
         <b class="title">申请信息</b>
@@ -24,21 +24,20 @@
         <personInfoTable @getInfoList="handleGetSqList" :dataList="sqdataList" />
         <personInfoTable @getInfoList="handleGetSqList" :dataList="sqdataList" />
 
 
         <b class="title">权利人</b>
         <b class="title">权利人</b>
-        <personInfoTable @getInfoList="handleGetQlList" :dataList="qldataList"  />
+        <personInfoTable @getInfoList="handleGetQlList" :dataList="qldataList" />
         <div class="submit-button">
         <div class="submit-button">
-          <el-button type="primary"  @click="queryChick()">查询</el-button>
-          <el-button  @click="resetClick()">重置</el-button>
+          <el-button type="primary" @click="queryChick">查询</el-button>
+          <el-button @click="resetClick">重置</el-button>
         </div>
         </div>
-        <b class="title">查询结果</b>
-        <!-- <p>查询编号：{{cxbh}}</p> -->
-        <lb-table :column="searchData.columns" border :data="searchData.data" :maxHeight="200" heightNumSetting
+        <b class="title" v-if="isSearch">查询结果</b>
+        <lb-table :column="searchData.columns" v-if="isSearch" :data="searchData.data" :maxHeight="200" heightNumSetting
           :pagination="false">
           :pagination="false">
         </lb-table>
         </lb-table>
       </div>
       </div>
 
 
-      <div class="submit-button" style="padding-bottom:20px">
-        <el-button type="primary">无房证明打印（1）</el-button>
-        <el-button type="primary">房产结果打印（1）</el-button>
+      <div class="submit-button" v-if="isSearch" style="padding-bottom:20px">
+        <el-button type="primary" v-if="searchData.data.length > 0">房产结果打印（1）</el-button>
+        <el-button type="primary" v-else>无房证明打印（1）</el-button>
         <el-button @click="closeDialog">关闭</el-button>
         <el-button @click="closeDialog">关闭</el-button>
       </div>
       </div>
     </div>
     </div>
@@ -57,10 +56,9 @@ export default {
   props: {
   props: {
     value: { type: Boolean, default: false },
     value: { type: Boolean, default: false },
   },
   },
-  mounted() {
+  mounted () {
     sendThis(this);
     sendThis(this);
   },
   },
-
   data () {
   data () {
     return {
     return {
       myValue: this.value,
       myValue: this.value,
@@ -69,6 +67,7 @@ export default {
         ycyrgx: 1,
         ycyrgx: 1,
         cxlx: '1' //查询类型 1：房产查询 2：登记簿查询
         cxlx: '1' //查询类型 1：房产查询 2：登记簿查询
       },
       },
+      isSearch: false,
       dataList: [{
       dataList: [{
         sqrxm: '',
         sqrxm: '',
         sqrzjlxbm: '',
         sqrzjlxbm: '',
@@ -129,16 +128,12 @@ export default {
         this.addJtfc.qlrxx = val
         this.addJtfc.qlrxx = val
       }
       }
     },
     },
-    queryChick () {      
+    queryChick () {
       this.addJtfc.djSqcxDO = { ...this.ruleForm }
       this.addJtfc.djSqcxDO = { ...this.ruleForm }
-      // this.$message({
-      //     type: 'success',
-      //     message: '删除成功!'
-      //   });
-
       addJtfcCxjgXx(this.addJtfc).then(res => {
       addJtfcCxjgXx(this.addJtfc).then(res => {
         this.searchData.data = res.result;
         this.searchData.data = res.result;
         console.log(res);
         console.log(res);
+        this.isSearch = true
       })
       })
     },
     },
     resetClick () {
     resetClick () {
@@ -148,12 +143,12 @@ export default {
     handleRead (row) { },
     handleRead (row) { },
 
 
     //抵押
     //抵押
-    dyClick(){
+    dyClick () {
 
 
     },
     },
 
 
     //查封
     //查封
-    cfClick(){
+    cfClick () {
 
 
     }
     }
   }
   }
@@ -162,6 +157,7 @@ export default {
 <style scoped lang="scss">
 <style scoped lang="scss">
 @import "~@/styles/mixin.scss";
 @import "~@/styles/mixin.scss";
 @import "~@/styles/public.scss";
 @import "~@/styles/public.scss";
+
 .title {
 .title {
   padding-bottom: 10px;
   padding-bottom: 10px;
   margin-bottom: 10px;
   margin-bottom: 10px;

@@ -61,7 +61,6 @@ class data extends filter {
       {
       {
 
 
         label: '登记状态',
         label: '登记状态',
-        width: '150',
         align: 'center',
         align: 'center',
         fixed: 'right',
         fixed: 'right',
         render: (h, scope) => {
         render: (h, scope) => {
@@ -69,9 +68,7 @@ class data extends filter {
             <div>
             <div>
               <el-button type="text" icon="el-icon-edit-outline" onClick={() => { this.dyClick(scope) }}>抵押</el-button>
               <el-button type="text" icon="el-icon-edit-outline" onClick={() => { this.dyClick(scope) }}>抵押</el-button>
               <el-button type="text" icon="el-icon-edit-outline" onClick={() => { this.cfClick(scope) }}>查封</el-button>
               <el-button type="text" icon="el-icon-edit-outline" onClick={() => { this.cfClick(scope) }}>查封</el-button>
-
             </div>
             </div>
-            
           )
           )
         }
         }
       }
       }

@@ -81,8 +81,18 @@ export default {
     handleAdd () {
     handleAdd () {
       this.isDialog = true;
       this.isDialog = true;
     },
     },
-  },
-};
+    handleViewClick (scope) {
+      var sqcxBsm = scope.row.bsmSqcx;
+      this.$popup("申请查询记录", "sqcx/sqcxjl/components/sqcxjlInfo", {
+        formData: {
+          sqcxBsm: sqcxBsm,
+        },
+        cancel: function () { }, //取消事件的回调
+        confirm: function () { },
+      });
+    }
+  }
+}
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
 @import "~@/styles/public.scss";

@@ -69,6 +69,13 @@ class data extends filter {
       {
       {
         prop: "cxyt",
         prop: "cxyt",
         label: "查询用途"
         label: "查询用途"
+      },
+      {
+        label: "操作",
+        width: 80,
+        render: (h, scope) => {
+          return <el-button type="text" icon='el-icon-view' onClick={() => { vm.handleViewClick(scope) }}>查看</el-button>
+        }
       }
       }
     ]
     ]
   }
   }

 <template>
 <template>
-  <div >
+  <div>
     <el-form :model="ruleForm" label-width="120px">
     <el-form :model="ruleForm" label-width="120px">
       <el-row>
       <el-row>
         <el-col :span="24" style="margin-bottom: 15px">
         <el-col :span="24" style="margin-bottom: 15px">
@@ -29,14 +29,8 @@
 
 
       <el-row>
       <el-row>
         <el-col>
         <el-col>
-          <lb-table
-            :column="sqrData.columns"
-            border
-            :data="sqrData.data"
-            :maxHeight="200"
-            heightNumSetting
-            :pagination="false"
-          >
+          <lb-table :column="sqrData.columns" border :data="sqrData.data" :maxHeight="200" heightNumSetting
+            :pagination="false">
           </lb-table>
           </lb-table>
         </el-col>
         </el-col>
       </el-row>
       </el-row>
@@ -51,14 +45,8 @@
       </el-row>
       </el-row>
       <el-row>
       <el-row>
         <el-col>
         <el-col>
-          <lb-table
-            :column="qlrData.columns"
-            border
-            :data="qlrData.data"
-            :maxHeight="200"
-            heightNumSetting
-            :pagination="false"
-          >
+          <lb-table :column="qlrData.columns" border :data="qlrData.data" :maxHeight="200" heightNumSetting
+            :pagination="false">
           </lb-table>
           </lb-table>
         </el-col>
         </el-col>
       </el-row>
       </el-row>
@@ -73,19 +61,13 @@
       </el-row>
       </el-row>
       <el-row>
       <el-row>
         <el-col>
         <el-col>
-          <p>查询编号：{{cxbh}}</p>
+          <p>查询编号：{{ cxbh }}</p>
         </el-col>
         </el-col>
       </el-row>
       </el-row>
       <el-row>
       <el-row>
         <el-col>
         <el-col>
-          <lb-table
-            border
-            :column="cxjgData.columns"
-            :data="cxjgData.data"
-            :maxHeight="200"
-            heightNumSetting
-            :pagination="false"
-          >
+          <lb-table :column="cxjgData.columns" :data="cxjgData.data" :maxHeight="200" heightNumSetting
+            :pagination="false">
           </lb-table>
           </lb-table>
         </el-col>
         </el-col>
       </el-row>
       </el-row>
@@ -104,12 +86,12 @@ export default {
   // },
   // },
   props: ["formData"],
   props: ["formData"],
 
 
-  created() {
+  created () {
     // debugger;
     // debugger;
     // alert(this.formData.sqcxBsm);
     // alert(this.formData.sqcxBsm);
   },
   },
 
 
-  data() {
+  data () {
     return {
     return {
       ruleForm: {
       ruleForm: {
         cxyt: "",
         cxyt: "",
@@ -134,8 +116,7 @@ export default {
     };
     };
   },
   },
 
 
-  mounted() {
-    debugger;
+  mounted () {
     sendThis(this);
     sendThis(this);
     var sqcxBsm = this.formData.sqcxBsm;
     var sqcxBsm = this.formData.sqcxBsm;
 
 
@@ -145,19 +126,17 @@ export default {
           this.sqrData.data = res.result.sqxx;
           this.sqrData.data = res.result.sqxx;
           this.qlrData.data = res.result.qlrxx;
           this.qlrData.data = res.result.qlrxx;
           this.cxjgData.data = res.result.djSqcxCxjgDOList;
           this.cxjgData.data = res.result.djSqcxCxjgDOList;
-          this.cxbh=res.result.djSqcxDO.cxbh;
+          this.cxbh = res.result.djSqcxDO.cxbh;
 
 
         }
         }
       })
       })
       .catch((error) => {
       .catch((error) => {
         console.log(error);
         console.log(error);
-      });
+      })
   },
   },
-
   methods: {},
   methods: {},
 };
 };
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
 @import "~@/styles/mixin.scss";
 @import "~@/styles/mixin.scss";
-
 </style>
 </style>

@@ -8,7 +8,7 @@ class data extends filter {
   constructor() {
   constructor() {
     super()
     super()
   }
   }
-  cxjgcolumns() {
+  cxjgcolumns () {
     return [
     return [
       {
       {
         prop: 'qszt',
         prop: 'qszt',
@@ -73,7 +73,6 @@ class data extends filter {
       {
       {
 
 
         label: '登记状态',
         label: '登记状态',
-        width: '150',
         align: 'center',
         align: 'center',
         fixed: 'right',
         fixed: 'right',
         render: (h, scope) => {
         render: (h, scope) => {
@@ -86,7 +85,7 @@ class data extends filter {
       }
       }
     ]
     ]
   }
   }
-  sqrcolumns() {
+  sqrcolumns () {
     return [
     return [
       {
       {
         prop: 'sqrxm',
         prop: 'sqrxm',
@@ -107,7 +106,7 @@ class data extends filter {
     ]
     ]
   }
   }
 
 
-  qlrcolumns() {
+  qlrcolumns () {
     return [
     return [
       {
       {
         prop: 'sqrxm',
         prop: 'sqrxm',

@@ -78,7 +78,6 @@ export default {
     handleViewClick (scope) {
     handleViewClick (scope) {
       var sqcxBsm = scope.row.bsmSqcx;
       var sqcxBsm = scope.row.bsmSqcx;
       this.$popup("申请查询记录", "sqcx/sqcxjl/components/sqcxjlInfo", {
       this.$popup("申请查询记录", "sqcx/sqcxjl/components/sqcxjlInfo", {
-        height: "800px",
         formData: {
         formData: {
           sqcxBsm: sqcxBsm,
           sqcxBsm: sqcxBsm,
         },
         },

@@ -65,10 +65,11 @@ class data extends filter {
       },
       },
       {
       {
         label: "操作",
         label: "操作",
+        width: 80,
         render: (h, scope) => {
         render: (h, scope) => {
           return <el-button type="text" icon='el-icon-view' onClick={() => { vm.handleViewClick(scope) }}>查看</el-button>
           return <el-button type="text" icon='el-icon-view' onClick={() => { vm.handleViewClick(scope) }}>查看</el-button>
         }
         }
-      },
+      }
     ]
     ]
   }
   }
 }
 }

@@ -85,6 +85,9 @@
   padding-left: 5px !important;
   padding-left: 5px !important;
 }
 }
 
 
+/deep/.el-menu {
+  border-right: none;
+}
 
 
 
 
 /deep/.el-menu-item.is-active {
 /deep/.el-menu-item.is-active {

@@ -8,11 +8,6 @@
     <el-form :model="ruleForm" ref="ruleForm" label-width="100px">
     <el-form :model="ruleForm" ref="ruleForm" label-width="100px">
       <el-row>
       <el-row>
         <el-col :span="8">
         <el-col :span="8">
-          <el-form-item label="业务来源" prop="ywlymc">
-            <el-input v-model="ruleForm.ywlymc"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="申请业务名称" prop="sqywmc">
           <el-form-item label="申请业务名称" prop="sqywmc">
             <el-input v-model="ruleForm.sqywmc"></el-input>
             <el-input v-model="ruleForm.sqywmc"></el-input>
           </el-form-item>
           </el-form-item>
@@ -22,13 +17,13 @@
             <el-input v-model="ruleForm.qlrmc"></el-input>
             <el-input v-model="ruleForm.qlrmc"></el-input>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
-      </el-row>
-      <el-row>
         <el-col :span="8">
         <el-col :span="8">
           <el-form-item label="义务人" prop="ywrmc">
           <el-form-item label="义务人" prop="ywrmc">
             <el-input v-model="ruleForm.ywrmc"></el-input>
             <el-input v-model="ruleForm.ywrmc"></el-input>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="8">
         <el-col :span="8">
           <el-form-item label="受理时间" prop="slsj">
           <el-form-item label="受理时间" prop="slsj">
             <el-date-picker v-model="ruleForm.slsj" value-format="yyyy-MM-dd" class="width100" type="date"
             <el-date-picker v-model="ruleForm.slsj" value-format="yyyy-MM-dd" class="width100" type="date"
@@ -55,7 +50,6 @@ export default {
     return {
     return {
       myValue: this.value,
       myValue: this.value,
       ruleForm: {
       ruleForm: {
-        ywlymc: '',
         sqywmc: '',
         sqywmc: '',
         qlrmc: '',
         qlrmc: '',
         ywrmc: '',
         ywrmc: '',

 <template>
 <template>
   <div class="from-clues">
   <div class="from-clues">
-    <!-- 表单部分 -->
     <div class="from-clues-header">
     <div class="from-clues-header">
       <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="80px">
       <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="80px">
         <el-row>
         <el-row>
@@ -57,7 +56,7 @@
     </div>
     </div>
     <div class="from-clues-content">
     <div class="from-clues-content">
       <lb-table :page-size="pageData.size" class="loadingtext" @sort-change="handleSort"
       <lb-table :page-size="pageData.size" class="loadingtext" @sort-change="handleSort"
-        :current-page.sync="pageData.currentPage" :heightNum="300" :total="tableData.total"
+        :current-page.sync="pageData.currentPage" :heightNum="290" :total="tableData.total"
         @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
         @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
         :data="tableData.data">
         :data="tableData.data">
       </lb-table>
       </lb-table>
@@ -98,6 +97,13 @@ export default {
     sendThis(this);
     sendThis(this);
     this.queryClick()
     this.queryClick()
   },
   },
+  watch: {
+    queryForm: {
+      handler (newName, oldName) {
+      },
+      immediate: true
+    }
+  },
   methods: {
   methods: {
     // 列表渲染接口
     // 列表渲染接口
     queryClick () {
     queryClick () {

@@ -30,7 +30,7 @@
     flex-direction: column;
     flex-direction: column;
 
 
     .item-list {
     .item-list {
-      max-height: calc(100vh - 380px);
+      max-height: calc(100vh - 360px);
       overflow-y: auto;
       overflow-y: auto;
     }
     }
 
 
@@ -146,6 +146,7 @@
           flex: 1;
           flex: 1;
           width: 100%;
           width: 100%;
           padding: 3px;
           padding: 3px;
+
         }
         }
 
 
         p:nth-child(2) {
         p:nth-child(2) {
@@ -189,7 +190,7 @@
           cursor: pointer;
           cursor: pointer;
           margin-bottom: 15px;
           margin-bottom: 15px;
 
 
-          p {
+          p:nth-child(2) {
             @include flex-center;
             @include flex-center;
           }
           }
 
 
@@ -202,6 +203,9 @@
             flex: 1;
             flex: 1;
             width: 100%;
             width: 100%;
             padding: 3px;
             padding: 3px;
+            padding-left: 30px;
+            display: flex;
+            align-items: center;
           }
           }
 
 
           p:nth-child(2) {
           p:nth-child(2) {

@@ -31,36 +31,20 @@
         </ul>
         </ul>
       </div>
       </div>
       <div class="right-situation el-card box-card is-always-shadow">
       <div class="right-situation el-card box-card is-always-shadow">
-        <div v-if="n >= 0">
-          <div class="right-title">常办业务列表</div>
-          <ul>
-            <li v-for="(item, index) in ywList" :key="index" @click="handleSelectYw(item, ywList)"
-              :class="item.cselect ? 'cactive' : ''">
-              <p>
-                {{ item.djywmc }}<br>
-                {{ item.nodename }}
-              </p>
+        <div class="right-title">{{ obj[n] }}</div>
+        <ul>
+          <li v-for="(item, index) in itemList" :key="index" @click="handleSelectYw(item, ywList)"
+            :class="item.cselect ? 'cactive' : ''">
+            <p>
+              {{ item.djywmc }}<br>
+              {{ item.nodename }}
+            </p>
 
 
-              <p v-if="item.sffqlc == 1" class="active" @click.stop="handleCollection(item)">
-                <i class="el-icon-star-off active"></i>
-              </p>
-            </li>
-          </ul>
-        </div>
-        <div v-if="n == -1">
-          <div class="right-title">登记情形</div>
-          <ul class="registration">
-            <li v-for="(item, index) in djqxList" @click="handleSelectYw(item, djqxList)"
-              :class="item.cselect ? 'cactive' : ''" :key="index">
-              <p>
-                {{ item.nodename }}
-              </p>
-              <p :class="item.userCollect == 1 ? 'active' : ''" @click.stop="handleCollection(item)">
-                <i class="el-icon-star-off" :class="item.userCollect == 1 ? 'active' : ''"></i>
-              </p>
-            </li>
-          </ul>
-        </div>
+            <p :class="item.userCollect == 1 ? 'active' : ''" @click.stop="handleCollection(item)">
+              <i class="el-icon-star-off" :class="item.userCollect == 1 ? 'active' : ''"></i>
+            </p>
+          </li>
+        </ul>
       </div>
       </div>
       <div class="submit-button">
       <div class="submit-button">
         <el-button type="primary" :disabled="btnDisabled" @click="bthSelectClick">选择不动产</el-button>
         <el-button type="primary" :disabled="btnDisabled" @click="bthSelectClick">选择不动产</el-button>
@@ -70,7 +54,6 @@
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
-import Cookies from 'js-cookie'
 import fqsqDialog from "./slectBdc.vue"
 import fqsqDialog from "./slectBdc.vue"
 import { getCollectBiz, getleftMenu, getNextNode, addCollectBiz, deleteCollectBiz } from "@/api/ywbl"
 import { getCollectBiz, getleftMenu, getNextNode, addCollectBiz, deleteCollectBiz } from "@/api/ywbl"
 export default {
 export default {
@@ -81,10 +64,17 @@ export default {
       leftList: [
       leftList: [
         '常办业务', '一并申请', '登记簿补录',
         '常办业务', '一并申请', '登记簿补录',
       ],
       ],
+      // 左侧列表
       list: [],
       list: [],
       djlxList: [],
       djlxList: [],
+
+      itemList: [],
       ywList: [],
       ywList: [],
       djqxList: [],
       djqxList: [],
+      obj: {
+        '0': '常办业务列表',
+        '-1': '登记情形'
+      },
       isDialog: false,
       isDialog: false,
       btnDisabled: true,
       btnDisabled: true,
       djywbm: '',
       djywbm: '',
@@ -104,12 +94,16 @@ export default {
   },
   },
   methods: {
   methods: {
     getDataList () {
     getDataList () {
-      getCollectBiz({ 'target': '#ywsq' }).then(res => {
+      getCollectBiz().then(res => {
         let { result } = res
         let { result } = res
         this.ywList = result
         this.ywList = result
         this.ywList.forEach(item => {
         this.ywList.forEach(item => {
           this.$set(item, 'cselect', false)
           this.$set(item, 'cselect', false)
+          item.userCollect = 1
         })
         })
+        if (this.n == 0) {
+          this.itemList = this.ywList
+        }
       })
       })
       getleftMenu().then(res => {
       getleftMenu().then(res => {
         let { result } = res
         let { result } = res
@@ -118,9 +112,14 @@ export default {
     },
     },
     handleleftTitle (index) {
     handleleftTitle (index) {
       this.n = index
       this.n = index
+      let obj = {
+        '0': this.ywList
+      }
+      this.itemList = obj[this.n]
       this.list.forEach(item => {
       this.list.forEach(item => {
         if (item.check) item.check = false
         if (item.check) item.check = false
       })
       })
+
     },
     },
     // 业务-登记情形选择
     // 业务-登记情形选择
     handleSelectYw (item, list) {
     handleSelectYw (item, list) {
@@ -135,7 +134,6 @@ export default {
         this.btnDisabled = false
         this.btnDisabled = false
         this.bsmSqyw = item.bsmSqyw
         this.bsmSqyw = item.bsmSqyw
         this.djywbm = item.djywbm
         this.djywbm = item.djywbm
-        console.log(this.djywbm, 'this.djywbm');
       }
       }
     },
     },
     handleList (list, obj) {
     handleList (list, obj) {
@@ -147,11 +145,11 @@ export default {
       this.$set(obj, 'check', true)
       this.$set(obj, 'check', true)
       this.getNextNode(obj.bsmSqyw)
       this.getNextNode(obj.bsmSqyw)
       this.djqxList = []
       this.djqxList = []
-      this.djlxList = []
+      this.itemList = []
     },
     },
     // 获取下个节点类型
     // 获取下个节点类型
-    getNextNode (bsmSqyw, type) {
-      getNextNode(bsmSqyw, { 'target': '#ywsq' }).then(res => {
+    getNextNode (bsmSqyw, type = true) {
+      getNextNode(bsmSqyw).then(res => {
         if (res.result.djqx) this.djqxList = res.result.djqx
         if (res.result.djqx) this.djqxList = res.result.djqx
         if (res.result.djlx) this.djlxList = res.result.djlx
         if (res.result.djlx) this.djlxList = res.result.djlx
         if (type) {
         if (type) {
@@ -162,6 +160,7 @@ export default {
             this.$set(item, 'cselect', false)
             this.$set(item, 'cselect', false)
           })
           })
         }
         }
+        this.itemList = this.djqxList
       })
       })
     },
     },
     handleCollection (item) {
     handleCollection (item) {
@@ -178,15 +177,26 @@ export default {
           }
           }
         })
         })
       } else {
       } else {
-        deleteCollectBiz(item.bsmSqyw).then(res => {
-          if (res.code == 200) {
-            item.userCollect = '2'
-            that.$message({
-              message: '取消收藏成功！',
-              type: 'success'
-            })
-            that.getDataList()
-          }
+        this.$confirm('此操作将取消收藏, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCollectBiz(item.bsmSqyw).then(res => {
+            if (res.code == 200) {
+              item.userCollect = '2'
+              that.$message({
+                message: '取消收藏成功！',
+                type: 'success'
+              })
+              that.getDataList()
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消收藏'
+          })
         })
         })
       }
       }
     },
     },
@@ -198,11 +208,11 @@ export default {
     },
     },
     // 登记类型
     // 登记类型
     handleDjlxSelect (item) {
     handleDjlxSelect (item) {
-      this.btnDisabled = true
       this.djlxList.forEach(item => {
       this.djlxList.forEach(item => {
-        if (item.cselect) item.cselect = false
+        item.cselect = false
       })
       })
-      this.$set(item, 'cselect', true)
+      this.btnDisabled = true
+      item.cselect = true
       if (item.sffqlc == '1') {
       if (item.sffqlc == '1') {
         this.btnDisabled = false
         this.btnDisabled = false
         this.bsmSqyw = item.bsmSqyw
         this.bsmSqyw = item.bsmSqyw
@@ -225,4 +235,12 @@ export default {
 <style scoped lang='scss'>
 <style scoped lang='scss'>
 @import "~@/styles/mixin.scss";
 @import "~@/styles/mixin.scss";
 @import './ywsq.scss';
 @import './ywsq.scss';
+
+/deep/.el-collapse-item__content {
+  padding-bottom: 0;
+}
+
+/deep/.el-collapse-item__wrap {
+  border-bottom: none;
+}
 </style>
 </style>
\ No newline at end of file

@@ -6,17 +6,26 @@
         <el-row>
         <el-row>
           <el-col :span="5">
           <el-col :span="5">
             <el-form-item label="分发编号">
             <el-form-item label="分发编号">
-              <el-input v-model="approveForm.batchno" @clear="queryClick()" clearable placeholder="分发编号"></el-input>
+              <el-input v-model="ruleForm.batchno" @clear="queryClick()" clearable placeholder="分发编号"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="领取时间">
-              <el-date-picker v-model="ruleForm.ffsj" type="daterange" range-separator="至" start-placeholder="开始日期"
-                end-placeholder="结束日期" @change="timeChange()" value-format="yyyy-MM-dd HH:mm:ss" clearable>
+
+          <el-col :span="5">
+            <el-form-item label="开始日期">
+              <el-date-picker v-model="ruleForm.ffkssj" :picker-options="pickerOptionsStart" type="date"
+                placeholder="开始日期" value-format="yyyy-MM-dd" clearable>
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="结束时间">
+              <el-date-picker v-model="ruleForm.ffjssj" :picker-options="pickerOptionsEnd" type="date"
+                placeholder="结束日期" value-format="yyyy-MM-dd" clearable>
               </el-date-picker>
               </el-date-picker>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="11" class="btnColRight">
+
+          <el-col :span="9" class="btnColRight">
             <el-form-item>
             <el-form-item>
               <el-button type="primary" native-type="submit" @click="queryClick()">查询</el-button>
               <el-button type="primary" native-type="submit" @click="queryClick()">查询</el-button>
               <el-button type="primary" @click="openDialog()">新增</el-button>
               <el-button type="primary" @click="openDialog()">新增</el-button>
@@ -55,10 +64,6 @@ export default {
       isDialog: false,
       isDialog: false,
       value: '',
       value: '',
       ruleForm: {
       ruleForm: {
-        batchno: "",
-        ffsj: ""
-      },
-      approveForm: {
         batchno: '',
         batchno: '',
         ffkssj: '',
         ffkssj: '',
         ffjssj: ''
         ffjssj: ''
@@ -68,6 +73,26 @@ export default {
         columns: datas.columns(),
         columns: datas.columns(),
         data: [],
         data: [],
       },
       },
+      // 开始结束日期限制
+      pickerOptionsStart: {
+        disabledDate: (time) => {
+          if (this.ruleForm.ffjssj) {
+            return (
+              time.getTime() >= new Date(this.ruleForm.ffjssj).getTime()
+            );
+          }
+        }
+      },
+      // 结束日期限制
+      pickerOptionsEnd: {
+        disabledDate: (time) => {
+          if (this.ruleForm.ffkssj) {
+            return (
+              time.getTime() <= new Date(this.ruleForm.ffkssj).getTime()
+            );
+          }
+        }
+      }
     }
     }
   },
   },
   methods: {
   methods: {
@@ -76,7 +101,7 @@ export default {
     },
     },
     // 列表渲染接口
     // 列表渲染接口
     fetchData () {
     fetchData () {
-      getZsglffList({ ...this.approveForm, ...this.pageData }).then(res => {
+      getZsglffList({ ...this.ruleForm, ...this.pageData }).then(res => {
         if (res.code === 200) {
         if (res.code === 200) {
           let { total, records } = res.result
           let { total, records } = res.result
           this.tableData.total = total;
           this.tableData.total = total;
@@ -100,17 +125,6 @@ export default {
     queryClick () {
     queryClick () {
       this.fetchData()
       this.fetchData()
     },
     },
-    //修改筛选时间
-    timeChange () {
-      if (this.ruleForm.ffsj != null) {
-        this.approveForm.ffkssj = this.ruleForm.ffsj[0];
-        this.approveForm.ffjssj = this.ruleForm.ffsj[1];
-      } else {
-        this.approveForm.ffkssj = ''
-        this.approveForm.ffjssj = ''
-      }
-      this.fetchData()
-    },
     //确定证书分发
     //确定证书分发
     confrimVerify (item) {
     confrimVerify (item) {
       this.$confirm('是否确定分发', '提示', {
       this.$confirm('是否确定分发', '提示', {
@@ -161,4 +175,8 @@ export default {
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
 @import "~@/styles/public.scss";
+
+/deep/.el-icon-date {
+  display: none;
+}
 </style>
 </style>

@@ -9,14 +9,21 @@
               <el-input v-model="ruleForm.batchno" @clear="queryClick()" clearable placeholder="入库编号"></el-input>
               <el-input v-model="ruleForm.batchno" @clear="queryClick()" clearable placeholder="入库编号"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="人库时间">
-              <el-date-picker v-model="ruleForm.rksj" type="datetimerange" range-separator="至" start-placeholder="开始日期"
-                end-placeholder="结束日期" @change="timeChange()" value-format="yyyy-MM-dd HH:mm:ss" clearable>
+          <el-col :span="5">
+            <el-form-item label="开始日期">
+              <el-date-picker v-model="ruleForm.rkkssj" :picker-options="pickerOptionsStart" type="date"
+                placeholder="开始日期" value-format="yyyy-MM-dd" clearable>
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="结束时间">
+              <el-date-picker v-model="ruleForm.rkjssj" :picker-options="pickerOptionsEnd" type="date"
+                placeholder="结束日期" value-format="yyyy-MM-dd" clearable>
               </el-date-picker>
               </el-date-picker>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="11" class="btnColRight">
+          <el-col :span="9" class="btnColRight">
             <el-form-item>
             <el-form-item>
               <el-button type="primary" native-type="submit" @click="queryClick()">查询</el-button>
               <el-button type="primary" native-type="submit" @click="queryClick()">查询</el-button>
               <el-button type="primary" @click="openDialog()">新增</el-button>
               <el-button type="primary" @click="openDialog()">新增</el-button>
@@ -54,7 +61,6 @@ export default {
       isDialog: false,
       isDialog: false,
       viewDialog: false,
       viewDialog: false,
       ruleForm: {
       ruleForm: {
-        rksj: '',
         batchno: '',
         batchno: '',
         rkkssj: '',
         rkkssj: '',
         rkjssj: ''
         rkjssj: ''
@@ -64,7 +70,27 @@ export default {
         columns: datas.columns(),
         columns: datas.columns(),
         data: [],
         data: [],
       },
       },
-    };
+      // 开始结束日期限制
+      pickerOptionsStart: {
+        disabledDate: (time) => {
+          if (this.ruleForm.rkjssj) {
+            return (
+              time.getTime() >= new Date(this.ruleForm.rkjssj).getTime()
+            );
+          }
+        }
+      },
+      // 结束日期限制
+      pickerOptionsEnd: {
+        disabledDate: (time) => {
+          if (this.ruleForm.rkkssj) {
+            return (
+              time.getTime() <= new Date(this.ruleForm.rkkssj).getTime()
+            );
+          }
+        }
+      }
+    }
   },
   },
   methods: {
   methods: {
     // 列表渲染接口
     // 列表渲染接口
@@ -92,17 +118,6 @@ export default {
     queryClick () {
     queryClick () {
       this.fetchData()
       this.fetchData()
     },
     },
-    //修改筛选时间
-    timeChange (val) {
-      if (this.ruleForm.rksj != null) {
-        this.ruleForm.rkkssj = this.ruleForm.rksj[0];
-        this.ruleForm.rkjssj = this.ruleForm.rksj[1];
-      } else {
-        this.ruleForm.rkkssj = ''
-        this.ruleForm.rkjssj = ''
-      }
-      this.fetchData()
-    },
     //删除证书入库数据
     //删除证书入库数据
     delZsrk (item) {
     delZsrk (item) {
       this.$confirm('确定要删除吗, 是否继续?', '提示', {
       this.$confirm('确定要删除吗, 是否继续?', '提示', {
@@ -153,4 +168,8 @@ export default {
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
 @import "~@/styles/public.scss";
+
+/deep/.el-icon-date {
+  display: none;
+}
 </style>
 </style>

 import filter from '@/utils/filter.js'
 import filter from '@/utils/filter.js'
 let vm = null
 let vm = null
-
 const sendThis = (_this) => {
 const sendThis = (_this) => {
   vm = _this
   vm = _this
 }
 }
@@ -60,7 +59,6 @@ class data extends filter {
       },
       },
       {
       {
         label: '操作',
         label: '操作',
-        width: '200',
         align: 'center',
         align: 'center',
         fixed: 'right',
         fixed: 'right',
         render: (h, scope) => {
         render: (h, scope) => {