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

@@ -59,7 +59,7 @@ export default {
     },
     },
     heightNum: {
     heightNum: {
       type: Number,
       type: Number,
-      default: 260,
+      default: 275,
     },
     },
     maxHeight: {
     maxHeight: {
       type: Number,
       type: Number,

@@ -116,8 +116,8 @@ export default {
   padding-left: 5px;
   padding-left: 5px;
 }
 }
 .ls-title{
 .ls-title{
-  padding: 20px;
-  background: #1E9FFF;
+  padding: 16px;
+  background: linear-gradient(2deg, #00CCFF, transparent);
   color: #ffffff;
   color: #ffffff;
   
   
 }
 }
@@ -134,20 +134,20 @@ export default {
 
 
 .ls-mask-footer {
 .ls-mask-footer {
   height: 65px;
   height: 65px;
-  border-top: 1px solid #f0f0f0;
   display: flex;
   display: flex;
   justify-content: center;
   justify-content: center;
   position: absolute;
   position: absolute;
   width: 100%;
   width: 100%;
   bottom: 0px;
   bottom: 0px;
   right: 0px;
   right: 0px;
-  background: #f3f3f3;
+  box-shadow: 0px 0px 2px 0px;
+    border-radius: 0 0 10px 10px;
 }
 }
 
 
 
 
 /deep/.closeStyle{
 /deep/.closeStyle{
   position: absolute;
   position: absolute;
-  top: 20px;
+  top: 17px;
   right: 12px;
   right: 12px;
   font-size: 20px;
   font-size: 20px;
   cursor: pointer;
   cursor: pointer;
@@ -158,6 +158,7 @@ export default {
 }
 }
 /deep/.el-button{
 /deep/.el-button{
   margin: 15px 10px;
   margin: 15px 10px;
+  width: 75px;
 }
 }
 </style>
 </style>
   
   
\ No newline at end of file

@@ -7,7 +7,7 @@
 
 
     &-header {
     &-header {
         width: 100%;
         width: 100%;
-        padding: 10px 10px 3px 10px;
+        padding: 10px;
         box-sizing: border-box;
         box-sizing: border-box;
         background: #FFFFFF;
         background: #FFFFFF;
         border-radius: 2px;
         border-radius: 2px;

@@ -12,6 +12,10 @@ const service = axios.create({
     headers: {
     headers: {
         'Content-Type': 'application/json; charset=utf-8',
         'Content-Type': 'application/json; charset=utf-8',
         'Authorization': 'bearer AT-16-oqkOHiUSsDdFA-eAZ49k2rJQDTzQpClO'
         'Authorization': 'bearer AT-16-oqkOHiUSsDdFA-eAZ49k2rJQDTzQpClO'
+        //token列表
+        //admin:bearer AT-16-oqkOHiUSsDdFA-eAZ49k2rJQDTzQpClO
+        //renc:bearer AT-30-KHB4LXc8-CZXwBEyaFJa9lRmMTc5sHVI
+        //tianh:bearer AT-33-3zFTGkhQ4eUv4nXvzAmbgN5RPZppzEY6
     },
     },
     timeout: 15000
     timeout: 15000
 })
 })

@@ -59,7 +59,8 @@ export default {
       myValue: this.value,
       myValue: this.value,
       ruleForm: {
       ruleForm: {
         cxyt: '',
         cxyt: '',
-        ycyrgx: 1
+        ycyrgx: 1,
+        cxlx: '1' //查询类型 1：房产查询 2：登记簿查询
       },
       },
       dataList: [{
       dataList: [{
         sqrxm: '',
         sqrxm: '',

@@ -23,8 +23,15 @@ class data extends filter {
         }
         }
       },
       },
       {
       {
-        prop: "cxlx",
         label: "查询类型",
         label: "查询类型",
+        render: (h, scope) => {
+          switch (scope.row.cxlx) {
+            case '1':
+              return <div>家庭房产</div>
+            case '2':
+              return <div>登记簿</div>
+          }
+        }
       },
       },
       {
       {
         prop: "cxbh",
         prop: "cxbh",
@@ -35,19 +42,28 @@ class data extends filter {
         label: "查询时间",
         label: "查询时间",
       },
       },
       {
       {
-        prop: "slry",
+        prop: "cxr",
         label: "受理人员",
         label: "受理人员",
       },
       },
       {
       {
-        prop: "sqr",
+        prop: "sqrxm",
         label: "申请人",
         label: "申请人",
       },
       },
       {
       {
-        prop: "yqlrgx",
         label: "与权利人的关系",
         label: "与权利人的关系",
+        render: (h, scope) => {
+          switch (scope.row.ycyrgx) {
+            case '1':
+              return <div>权利人</div>
+            case '2':
+              return <div>产权利害关系人</div>
+            case '3':
+              return <div>委托人</div>
+          }
+        }
       },
       },
       {
       {
-        prop: "qlr",
+        prop: "qlrxm",
         label: "权利人",
         label: "权利人",
       },
       },
       {
       {

@@ -258,6 +258,7 @@ export default {
             completeTask({
             completeTask({
               bsmSlsq: this.bsmSlsq,
               bsmSlsq: this.bsmSlsq,
               shyj: "this.bestepid",
               shyj: "this.bestepid",
+              stepform: JSON.stringify(this.tabList)
             }).then((res) => {
             }).then((res) => {
               if (res.code === 200) {
               if (res.code === 200) {
                 instance.confirmButtonLoading = false;
                 instance.confirmButtonLoading = false;