Merge branch 'dev'

@@ -13,6 +13,14 @@ class data extends filter {
       {
         prop: 'qszt',
         label: '权属状态',
+        render: (h, scope) => {
+          if (scope.row.qszt == '1') {
+            return <div>现势</div>
+          }
+          else{
+            return <div>历史</div>
+          }
+        }
       },
       {
         prop: 'bdcqzh',
@@ -32,11 +40,20 @@ class data extends filter {
         label: '网签时间',
       },
       {
+        prop: 'qdjgmc',
+        label: '取得价格',
+      },
+      {
         prop: 'bdcdyh',
         width: 150,
         label: '不动产单元号',
       },
       {
+        prop: 'zl',
+        width: 120,
+        label: '房地坐落',
+      },
+      {
         prop: 'gyfs',
         label: '共有方式',
       },
@@ -50,33 +67,42 @@ class data extends filter {
         width: 120,
       },
       {
-        prop: 'fdzl',
+        prop: 'qlxzmc',
         width: 120,
-        label: '房地坐落',
+        label: '性质',
       },
       {
-        prop: 'fwmj',
+        prop: 'qlmjmc',
         width: 120,
-        label: '建筑面积（㎡）',
+        label: '面积',
       },
       {
-        prop: 'fwyt',
-        label: '房屋用途',
+        prop: 'qlytmc',
+        label: '用途',
       },
       {
-
-        label: '登记状态',
+        label: '是否抵押',
         align: 'center',
         fixed: 'right',
         render: (h, scope) => {
-          if (scope.row.dyzt != '0' && scope.row.cfzt != '0') {
-            return <div>抵押、查封</div>
+          if (scope.row.dyzt == '0') {
+            return <div>否</div>
+          }
+          else{
+            return <div>是</div>
           }
-          if (scope.row.dyzt != '0') {
-            return <div>抵押</div>
+        }
+      },
+      {
+        label: '是否查封',
+        align: 'center',
+        fixed: 'right',
+        render: (h, scope) => {
+          if (scope.row.cfzt == '0') {
+            return <div>否</div>
           }
-          if (scope.row.cfzt != '0') {
-            return <div>查封</div>
+          else{
+            return <div>是</div>
           }
         }
       }

@@ -7,7 +7,7 @@
   <div class="printView" style="width:100%;padding:20px">
     <h1 style="color: red;
       text-align: center;
-      font-size: 38px;">城固县不动产登记交易服务中心</h1>
+      font-size: 38px;">{{form.djSqcxDO.ssqy}}不动产登记交易服务中心</h1>
     <p style="width:100%;border-bottom: 1px solid red;margin-top: 20px;
       margin-bottom: 10px;"></p>
     <h2 style="font-size: 36px;
@@ -28,6 +28,8 @@
       <thead>
         <tr>
           <th style="background-color: #f2f2f2;
+      text-align: center;height:36px">不动产权证号</th>
+          <th style="background-color: #f2f2f2;
       text-align: center;height:36px">权利人</th>
           <th style="background-color: #f2f2f2;
       text-align: center;height:36px">证号</th>
@@ -36,9 +38,9 @@
           <th style="background-color: #f2f2f2;
       text-align: center;height:36px">面积</th>
           <th style="background-color: #f2f2f2;
-      text-align: center;height:36px">共有人</th>
+      text-align: center;height:36px">是否抵押</th>
           <th style="background-color: #f2f2f2;
-      text-align: center;height:36px">状态</th>
+      text-align: center;height:36px">是否查封</th>
         </tr>
       </thead>
       <tbody>
@@ -46,35 +48,31 @@
           <td style="border: 1px solid #ccc;
             text-align: center;
             padding: 8px;
-            text-align: left;">{{ item.qlrmc }}</td>
-          <td style="border: 1px solid #ccc;
-            text-align: center;
-            padding: 8px;
-            text-align: left;">{{ item.zjhm }}</td>
+            text-align: left;">{{ item.bdcqzh }}</td>
           <td style="border: 1px solid #ccc;
             text-align: center;
             padding: 8px;
-            text-align: left;">{{ item.fdzl }}</td>
+            text-align: left;">{{ item.qlrmc }}</td>
           <td style="border: 1px solid #ccc;
             text-align: center;
             padding: 8px;
-            text-align: left;">{{ item.fwmj }}</td>
+            text-align: left;">{{ item.zjhm }}</td>
           <td style="border: 1px solid #ccc;
             text-align: center;
             padding: 8px;
-            text-align: left;">{{ item.gyr }}</td>
+            text-align: left;">{{ item.zl }}</td>
           <td style="border: 1px solid #ccc;
             text-align: center;
             padding: 8px;
-            text-align: left;" v-if="item.dyzt != '0' && item.cfzt != '0'">抵押、查封</td>
+            text-align: left;">{{ item.fwmj }}</td>
           <td style="border: 1px solid #ccc;
             text-align: center;
             padding: 8px;
-            text-align: left;" v-if="item.dyzt != '0'">抵押</td>
+            text-align: left;">{{ item.dyzt=='0'?"否":"是" }}</td>
           <td style="border: 1px solid #ccc;
             text-align: center;
             padding: 8px;
-            text-align: left;" v-if="item.cfzt != '0'">查封</td>
+            text-align: left;">{{ item.cfzt=='0'?"否":"是" }}</td>
         </tr>
       </tbody>
     </table>
@@ -87,7 +85,7 @@
     <ul style="text-align: right;
       line-height: 36px;
       font-size: 18px;">
-      <li style="list-style: none;">城固县不动产登记交易服务中心</li>
+      <li style="list-style: none;">{{form.djSqcxDO.ssqy}}不动产登记交易服务中心</li>
       <li style="list-style: none;">{{newDate}}</li>
     </ul>
     <ol style="margin-left: 20px;