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

@@ -47,7 +47,7 @@
     <!-- 表格 -->
     <!-- 表格 -->
     <!-- 表格 -->
     <!-- 表格 -->
     <div class="from-clues-content">
     <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="pageData.total"
+      <lb-table :page-size="pageData.size" :current-page.sync="pageData.currentPage" :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>
@@ -74,12 +74,8 @@ export default {
         djlx: "",
         djlx: "",
         ywh: "",
         ywh: "",
       },
       },
-      pageData: {
-        current: 1,
-        size: 10,
-        total: 0,
-      },
       tableData: {
       tableData: {
+        total: 0,
         columns: datas.columns(),
         columns: datas.columns(),
         data: [],
         data: [],
       },
       },
@@ -111,7 +107,7 @@ export default {
       searchTaskToDo({ ...this.queryForm, ...this.pageData }).then(res => {
       searchTaskToDo({ ...this.queryForm, ...this.pageData }).then(res => {
         if (res.code === 200) {
         if (res.code === 200) {
           let { total, records } = res.result
           let { total, records } = res.result
-          this.pageData.total = total;
+          this.tableData.total = total;
           this.tableData.data = records
           this.tableData.data = records
         }
         }
       })
       })

@@ -13,14 +13,16 @@ class data extends filter {
       {
       {
         label: '序号',
         label: '序号',
         type: 'index',
         type: 'index',
-        width: '50'
+        width: '60'
       },
       },
       {
       {
         prop: "ywlymc",
         prop: "ywlymc",
         label: "业务来源",
         label: "业务来源",
+        width:'100'
       },
       },
       {
       {
         label: "流程状态",
         label: "流程状态",
+        width:'80',
         render: (h, scope) => {
         render: (h, scope) => {
           switch (scope.row.lczt) {
           switch (scope.row.lczt) {
             case '1':
             case '1':
@@ -35,10 +37,12 @@ class data extends filter {
       {
       {
         prop: "zbhj",
         prop: "zbhj",
         label: "在办环节",
         label: "在办环节",
+        width:'80'
       },
       },
       {
       {
         label: '业务号',
         label: '业务号',
         align: 'center',
         align: 'center',
+        width:'100',
         render: (h, scope) => {
         render: (h, scope) => {
           return <el-button type="text" onClick={() => { vm.ywhClick(scope.row) }}>{scope.row.ywh}</el-button>
           return <el-button type="text" onClick={() => { vm.ywhClick(scope.row) }}>{scope.row.ywh}</el-button>
         }
         }
@@ -46,32 +50,39 @@ class data extends filter {
       {
       {
         prop: "sqywmc",
         prop: "sqywmc",
         label: "申请业务名称",
         label: "申请业务名称",
+        width:'220'
       },
       },
       {
       {
         prop: "qlr",
         prop: "qlr",
         label: "权利人",
         label: "权利人",
+        width:'70'
       },
       },
       {
       {
         prop: "ywr",
         prop: "ywr",
         label: "义务人",
         label: "义务人",
+        width:'70'
       },
       },
       {
       {
         prop: "zl",
         prop: "zl",
         label: "坐落",
         label: "坐落",
+        width:'180'
       },
       },
       {
       {
         prop: "slsj",
         prop: "slsj",
         label: "受理时间",
         label: "受理时间",
-        sortable: 'custom'
+        sortable: 'custom',
+        width:'160'
       },
       },
       {
       {
         prop: "slry",
         prop: "slry",
         label: "受理人员",
         label: "受理人员",
+        width:'80'
       },
       },
       {
       {
         prop: "zrsj",
         prop: "zrsj",
         label: "转入时间",
         label: "转入时间",
-        sortable: 'custom'
+        sortable: 'custom',
+        width:'160'
       },
       },
       {
       {
         label: '操作',
         label: '操作',

@@ -106,22 +106,22 @@
       </el-row>
       </el-row>
       <el-row :gutter="10">
       <el-row :gutter="10">
         <el-col :span="8">
         <el-col :span="8">
-          <el-form-item label="使用权起始时间：" prop="syqqssj">
-            <el-date-picker disabled v-model="ruleForm.syqqssj" type="datetime" placeholder="选择起始时间"
+          <el-form-item label="使用权起始时间：" prop="qssj">
+            <el-date-picker disabled v-model="ruleForm.qssj" type="datetime" placeholder="选择起始时间"
               value-format="yyyy-MM-dd">
               value-format="yyyy-MM-dd">
             </el-date-picker>
             </el-date-picker>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
         <el-col :span="8">
         <el-col :span="8">
-          <el-form-item label="使用权结束时间：" prop="syqjssj">
-            <el-date-picker disabled v-model="ruleForm.syqjssj" type="datetime" placeholder="选择结束时间"
+          <el-form-item label="使用权结束时间：" prop="jssj">
+            <el-date-picker disabled v-model="ruleForm.jssj" type="datetime" placeholder="选择结束时间"
               value-format="yyyy-MM-dd">
               value-format="yyyy-MM-dd">
             </el-date-picker>
             </el-date-picker>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
         <el-col :span="8">
         <el-col :span="8">
-          <el-form-item label="使用期限：" prop="syqx">
-            <el-date-picker disabled v-model="ruleForm.syqx" type="datetime" placeholder="选择使用期限"
+          <el-form-item label="使用期限：" prop="tdsyqx">
+            <el-date-picker disabled v-model="ruleForm.tdsyqx" type="datetime" placeholder="选择使用期限"
               value-format="yyyy-MM-dd">
               value-format="yyyy-MM-dd">
             </el-date-picker>
             </el-date-picker>
           </el-form-item>
           </el-form-item>
@@ -208,9 +208,9 @@ export default {
         tdyt: "",
         tdyt: "",
         qlsdfs: "",
         qlsdfs: "",
         qdjg: "",
         qdjg: "",
-        syqqssj: "",
-        syqjssj: "",
-        syqx: "",
+        qssj: "",
+        jssj: "",
+        tdsyqx: "",
         fj: "",
         fj: "",
         djyy: "",
         djyy: "",
         gyfs: "",
         gyfs: "",

 <template>
 <template>
-  <dialogBox title="证书预览" :isReset='false' :isSave='false'   width="75%" 
+  <dialogBox title="证书预览" :isReset='false' :isSave='false'   width="865px" 
      @closeDialog="closeDialog" v-model="value">
      @closeDialog="closeDialog" v-model="value">
     <div class="from-clues">
     <div class="from-clues">
       <!-- 表单部分 -->
       <!-- 表单部分 -->
       <div class="zsyl-box">
       <div class="zsyl-box">
              <div class="zsyl-left">
              <div class="zsyl-left">
                   <div class="zsyl-title">
                   <div class="zsyl-title">
-                    <span>_________</span>
+                    <span>____</span>
                     <span>(</span>
                     <span>(</span>
                     <span>)</span>
                     <span>)</span>
-                    <span>_________________</span>
+                    <span>____________</span>
                     <span>不动产权第</span>
                     <span>不动产权第</span>
                     <span>号</span>
                     <span>号</span>
                   </div>
                   </div>
@@ -123,7 +123,7 @@ export default {
   padding: 20px;
   padding: 20px;
   background: #FAFBE5;
   background: #FAFBE5;
   .zsyl-left{
   .zsyl-left{
-    width: 45%;
+    width: 330px;
     .zsyl-title span:nth-child(3){
     .zsyl-title span:nth-child(3){
       margin-left: 75px;
       margin-left: 75px;
     }
     }
@@ -132,11 +132,11 @@ export default {
     }
     }
   }
   }
   .zsyl-right{
   .zsyl-right{
-    width: 45%;
+    width: 330px;
     .zsyl-title{
     .zsyl-title{
-      letter-spacing: 60px;
+      letter-spacing: 50px;
     text-align: center;
     text-align: center;
-    text-indent: 60px;
+    text-indent: 50px;
     }
     }
     .zsyl-text{
     .zsyl-text{
       border: 1px solid #E4EBF4;
       border: 1px solid #E4EBF4;

@@ -38,7 +38,7 @@
           <p class="splitScreen tabsList-title">材料信息</p>
           <p class="splitScreen tabsList-title">材料信息</p>
           <div class="splitScreen"></div>
           <div class="splitScreen"></div>
         </div>
         </div>
-        <el-tabs v-model="activeName">
+        <el-tabs v-model="activeName" @tab-click='activeClick'>
           <el-tab-pane :label="item.name" :name="index + 1 + ''" v-for="(item, index) in tabList" :key="index">
           <el-tab-pane :label="item.name" :name="index + 1 + ''" v-for="(item, index) in tabList" :key="index">
             <div class="splitScreen-con" v-if='index == 0'>
             <div class="splitScreen-con" v-if='index == 0'>
               <component ref='slxx' :is="editItem" :flag="flag" :key="key" />
               <component ref='slxx' :is="editItem" :flag="flag" :key="key" />
@@ -152,7 +152,6 @@ export default {
         console.log(newName, 'newName');
         console.log(newName, 'newName');
         let itemObj = { '1': 'slxx', '2': 'clxx', '3': 'spyj' }
         let itemObj = { '1': 'slxx', '2': 'clxx', '3': 'spyj' }
         this.editItem = this.loadView(itemObj[newName])
         this.editItem = this.loadView(itemObj[newName])
-        this.list(this.id)
       },
       },
       immediate: true
       immediate: true
     }
     }
@@ -187,6 +186,11 @@ export default {
         }
         }
       })
       })
     },
     },
+    activeClick(tab,event){
+      if(tab.name=='1'){
+        this.list(this.id)
+      }
+    },
     //  左侧列表点击调用接口
     //  左侧列表点击调用接口
     unitClick (item) {
     unitClick (item) {
       this.taskId = item.taskId
       this.taskId = item.taskId