Merge remote-tracking branch 'origin/master' into dev

src/components/HouseGuarantyForm/fixedAssetsCertificate.vue

@@ -4,72 +4,78 @@
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="不动产权证书号:" class="form-item">
-                    <el-input v-model="fixedAssetsCertificate.certificateNo" clearable />
+                    <el-input v-model="fixedAssetsCertificate.certificateNo"  />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="权利人:" class="form-item">
-                    <el-input v-model="fixedAssetsCertificate.ownShipUser" clearable />
+                    <el-input v-model="fixedAssetsCertificate.ownShipUser"  />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="共有情况:" class="form-item">
-                    <el-input v-model="fixedAssetsCertificate.ownShipInfo" clearable />
+                    <el-select class="select" v-model="fixedAssetsCertificate.ownShipInfo" >
+                        <el-option value="单独所有">单独所有</el-option >
+                        <el-option  value="共同所有">共同所有</el-option>
+                    </el-select>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="房屋坐落:" class="form-item">
-                    <el-input v-model="fixedAssetsCertificate.location" clearable />
+                    <el-input v-model="fixedAssetsCertificate.location"  />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="不动产单元号:" class="form-item">
-                    <el-input v-model="fixedAssetsCertificate.unitNo" clearable />
+                    <el-input v-model="fixedAssetsCertificate.unitNo"  />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="权利类型:" class="form-item">
-                    <el-input v-model="fixedAssetsCertificate.ownShipType" clearable />
+                    <el-input v-model="fixedAssetsCertificate.ownShipType"  />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="权利性质:" class="form-item">
-                    <el-input v-model="fixedAssetsCertificate.ownShipNature" clearable />
+                    <el-input v-model="fixedAssetsCertificate.ownShipNature"  />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="用途:" class="form-item">
-                    <el-input v-model="fixedAssetsCertificate.useTo" clearable />
+                    <el-select v-model="fixedAssetsCertificate.useTo" >
+                        <el-option value="住宅">住宅</el-option>
+                        <el-option value="商业">商业</el-option>
+                    </el-select>
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="面积描述:" class="form-item">
-                    <el-input v-model="fixedAssetsCertificate.acreageDesc" clearable />
+                    <el-input v-model="fixedAssetsCertificate.acreageDesc"  />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="使用期限描述:" class="form-item">
-                    <el-input v-model="fixedAssetsCertificate.expireDateDesc" clearable />
+                    <el-input v-model="fixedAssetsCertificate.expireDateDesc"  />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="权利其他状况:" class="form-item">
-                    <el-input v-model="fixedAssetsCertificate.ownShipOtherInfo" clearable />
+                    <el-input v-model="fixedAssetsCertificate.ownShipOtherInfo"  />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="附记:" class="form-item">
-                    <el-input v-model="fixedAssetsCertificate.attachInfo" clearable />
+                    <el-input v-model="fixedAssetsCertificate.attachInfo"  />
                 </el-form-item>
             </el-col>
         </el-row>
@@ -128,4 +134,14 @@ export default {
 :deep(.el-button--text) {
     color: #ff6154;
 }
+
+:deep(input){
+    width: 360px;
+}
+
+
+:deep(.el-select__wrapper){
+    width: 382px;
+}
+
 </style>

src/components/HouseGuarantyForm/houseOwnNewCertificate.vue

@@ -3,67 +3,70 @@
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="房屋所有权证号:" class="form-item">
-                    <el-input v-model="houseOwnNewCertificate.certificateNo" clearable />
+                    <el-input v-model="houseOwnNewCertificate.certificateNo" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="房屋所有权人:" class="form-item">
-                    <el-input v-model="houseOwnNewCertificate.ownShipUser" clearable />
+                    <el-input v-model="houseOwnNewCertificate.ownShipUser"  />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="共有情况:" class="form-item">
-                    <el-input v-model="houseOwnNewCertificate.ownShipInfo" clearable />
+                    <el-select class="select" v-model="houseOwnNewCertificate.ownShipInfo" >
+                        <el-option value="单独所有">单独所有</el-option >
+                        <el-option  value="共同所有">共同所有</el-option>
+                    </el-select>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="房屋坐落:" class="form-item">
-                    <el-input v-model="houseOwnNewCertificate.location" clearable />
+                    <el-input v-model="houseOwnNewCertificate.location" />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="登记日期:" class="form-item">
-                    <el-input v-model="houseOwnNewCertificate.registerDate" clearable />
+                    <el-input v-model="houseOwnNewCertificate.registerDate" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="房屋性质:" class="form-item">
-                    <el-input v-model="houseOwnNewCertificate.houseNature" clearable />
+                    <el-input v-model="houseOwnNewCertificate.houseNature" />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="规划用途:" class="form-item">
-                    <el-input v-model="houseOwnNewCertificate.useTo" clearable />
+                    <el-input v-model="houseOwnNewCertificate.useTo" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="总层数:" class="form-item">
-                    <el-input v-model="houseOwnNewCertificate.allFloor" clearable />
+                    <el-input v-model="houseOwnNewCertificate.allFloor" />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="建筑面积:" class="form-item">
-                    <el-input v-model="houseOwnNewCertificate.acreage" clearable />
+                    <el-input v-model="houseOwnNewCertificate.acreage" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="套内建筑面积:" class="form-item">
-                    <el-input v-model="houseOwnNewCertificate.innerAcreage" clearable />
+                    <el-input v-model="houseOwnNewCertificate.innerAcreage" />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="附记:" class="form-item">
-                    <el-input v-model="houseOwnNewCertificate.attachInfo" clearable />
+                    <el-input v-model="houseOwnNewCertificate.attachInfo" />
                 </el-form-item>
             </el-col>
         </el-row>
@@ -110,4 +113,12 @@ export default {
 :deep(.el-button--text) {
     color: #ff6154;
 }
+
+:deep(input){
+    width: 360px;
+}
+
+:deep(.el-select__wrapper){
+    width: 382px;
+}
 </style>

src/components/HouseGuarantyForm/houseOwnOldCertificate.vue

@@ -3,79 +3,79 @@
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="房屋所有权证号:" class="form-item">
-                    <el-input v-model="houseOwnOldCertificate.certificateNo" clearable />
+                    <el-input v-model="houseOwnOldCertificate.certificateNo" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="房屋所有权人:" class="form-item">
-                    <el-input v-model="houseOwnOldCertificate.ownShipUser" clearable />
+                    <el-input v-model="houseOwnOldCertificate.ownShipUser" />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="房屋坐落:" class="form-item">
-                    <el-input v-model="houseOwnOldCertificate.location" clearable />
+                    <el-input v-model="houseOwnOldCertificate.location" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="丘（地）号:" class="form-item">
-                    <el-input v-model="houseOwnOldCertificate.areaNo" clearable />
+                    <el-input v-model="houseOwnOldCertificate.areaNo" />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="产别:" class="form-item">
-                    <el-input v-model="houseOwnOldCertificate.ownShipType" clearable />
+                    <el-input v-model="houseOwnOldCertificate.ownShipType" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="幢号:" class="form-item">
-                    <el-input v-model="houseOwnOldCertificate.buildingNo" clearable />
+                    <el-input v-model="houseOwnOldCertificate.buildingNo" />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="房号:" class="form-item">
-                    <el-input v-model="houseOwnOldCertificate.houseNo" clearable />
+                    <el-input v-model="houseOwnOldCertificate.houseNo" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="结构:" class="form-item">
-                    <el-input v-model="houseOwnOldCertificate.structure" clearable />
+                    <el-input v-model="houseOwnOldCertificate.structure" />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="房屋总层数:" class="form-item">
-                    <el-input v-model="houseOwnOldCertificate.allFloor" clearable />
+                    <el-input v-model="houseOwnOldCertificate.allFloor" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="所在楼层:" class="form-item">
-                    <el-input v-model="houseOwnOldCertificate.atFloor" clearable />
+                    <el-input v-model="houseOwnOldCertificate.atFloor" />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="建筑面积:" class="form-item">
-                    <el-input v-model="houseOwnOldCertificate.acreage" clearable />
+                    <el-input v-model="houseOwnOldCertificate.acreage" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="设计用途:" class="form-item">
-                    <el-input v-model="houseOwnOldCertificate.useTo" clearable />
+                    <el-input v-model="houseOwnOldCertificate.useTo" />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="附记:" class="form-item">
-                    <el-input v-model="houseOwnOldCertificate.attachInfo" clearable />
+                    <el-input v-model="houseOwnOldCertificate.attachInfo" />
                 </el-form-item>
             </el-col>
         </el-row>
@@ -123,4 +123,15 @@ export default {
 :deep(.el-button--text) {
     color: #ff6154;
 }
+
+:deep(input){
+    width: 360px;
+}
+
+:deep(.el-select__wrapper){
+    width: 382px;
+}
+
+
+
 </style>

src/components/HouseGuarantyForm/landUseNewCertificate.vue

@@ -2,73 +2,76 @@
     <el-form :model="landUseNewCertificate" label-width="auto" style="margin-top: 30px;">
         <el-row :gutter="20">
             <el-col :span="12">
-                <el-form-item label="不动产权证书号:" class="form-item">
-                    <el-input v-model="landUseNewCertificate.certificateNo" clearable />
+                <el-form-item label="国有土地使用证号:" class="form-item">
+                    <el-input v-model="landUseNewCertificate.certificateNo" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="土地使用权人:" class="form-item">
-                    <el-input v-model="landUseNewCertificate.landUseUser" clearable />
+                    <el-input v-model="landUseNewCertificate.landUseUser" />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="座落:" class="form-item">
-                    <el-input v-model="landUseNewCertificate.location" clearable />
+                    <el-input v-model="landUseNewCertificate.location" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="地号:" class="form-item">
-                    <el-input v-model="landUseNewCertificate.landNo" clearable />
+                    <el-input v-model="landUseNewCertificate.landNo" />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="图号:" class="form-item">
-                    <el-input v-model="landUseNewCertificate.imageNo" clearable />
+                    <el-input v-model="landUseNewCertificate.imageNo" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="地类用途:" class="form-item">
-                    <el-input v-model="landUseNewCertificate.useTo" clearable />
+                    <el-select v-model="landUseNewCertificate.useTo" >
+                        <el-option value="商业用地">商业用地</el-option>
+                        <el-option value="批发零售用地">批发零售用地</el-option>
+                    </el-select>
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="取得价格:" class="form-item">
-                    <el-input v-model="landUseNewCertificate.takePrice" clearable />
+                    <el-input v-model="landUseNewCertificate.takePrice" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="使用权类型:" class="form-item">
-                    <el-input v-model="landUseNewCertificate.useType" clearable />
+                    <el-input v-model="landUseNewCertificate.useType" />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="终止日期:" class="form-item">
-                    <el-input v-model="landUseNewCertificate.expireDate" clearable />
+                    <el-input v-model="landUseNewCertificate.expireDate" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="使用权面积:" class="form-item">
-                    <el-input v-model="landUseNewCertificate.acreage" clearable />
+                    <el-input v-model="landUseNewCertificate.acreage" />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="其中分摊面积:" class="form-item">
-                    <el-input v-model="landUseNewCertificate.outterAcreage" clearable />
+                    <el-input v-model="landUseNewCertificate.outterAcreage" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="记事:" class="form-item">
-                    <el-input v-model="landUseNewCertificate.attachInfo" clearable />
+                    <el-input v-model="landUseNewCertificate.attachInfo" />
                 </el-form-item>
             </el-col>
         </el-row>
@@ -118,4 +121,11 @@ export default {
 :deep(.el-button--text) {
     color: #ff6154;
 }
+:deep(input){
+    width: 360px;
+}
+
+:deep(.el-select__wrapper){
+    width: 382px;
+}
 </style>

src/components/HouseGuarantyForm/landUseOldCertificate.vue

@@ -3,72 +3,75 @@
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="不动产权证书号:" class="form-item">
-                    <el-input v-model="landUseOldCertificate.certificateNo" clearable />
+                    <el-input v-model="landUseOldCertificate.certificateNo" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="土地使用权人:" class="form-item">
-                    <el-input v-model="landUseOldCertificate.landUseUser" clearable />
+                    <el-input v-model="landUseOldCertificate.landUseUser" />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="座落:" class="form-item">
-                    <el-input v-model="landUseOldCertificate.location" clearable />
+                    <el-input v-model="landUseOldCertificate.location" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="地号:" class="form-item">
-                    <el-input v-model="landUseOldCertificate.landNo" clearable />
+                    <el-input v-model="landUseOldCertificate.landNo" />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="图号:" class="form-item">
-                    <el-input v-model="landUseOldCertificate.imageNo" clearable />
+                    <el-input v-model="landUseOldCertificate.imageNo" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="地类用途:" class="form-item">
-                    <el-input v-model="landUseOldCertificate.useTo" clearable />
+                    <el-select v-model="landUseOldCertificate.useTo" >
+                        <el-option value="商业用地">商业用地</el-option>
+                        <el-option value="批发零售用地">批发零售用地</el-option>
+                    </el-select>
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="土地等级:" class="form-item">
-                    <el-input v-model="landUseOldCertificate.landLevel" clearable />
+                    <el-input v-model="landUseOldCertificate.landLevel" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="使用权类型:" class="form-item">
-                    <el-input v-model="landUseOldCertificate.useType" clearable />
+                    <el-input v-model="landUseOldCertificate.useType" />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="终止日期:" class="form-item">
-                    <el-input v-model="landUseOldCertificate.expireDate" clearable />
+                    <el-input v-model="landUseOldCertificate.expireDate" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="使用权面积:" class="form-item">
-                    <el-input v-model="landUseOldCertificate.acreage" clearable />
+                    <el-input v-model="landUseOldCertificate.acreage" />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="其中分摊面积:" class="form-item">
-                    <el-input v-model="landUseOldCertificate.outterAcreage" clearable />
+                    <el-input v-model="landUseOldCertificate.outterAcreage" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="记事:" class="form-item">
-                    <el-input v-model="landUseOldCertificate.attachInfo" clearable />
+                    <el-input v-model="landUseOldCertificate.attachInfo" />
                 </el-form-item>
             </el-col>
         </el-row>
@@ -118,4 +121,11 @@ export default {
 :deep(.el-button--text) {
     color: #ff6154;
 }
+:deep(input){
+    width: 360px;
+}
+
+:deep(.el-select__wrapper){
+    width: 382px;
+}
 </style>

src/layout/index.vue

@@ -7,7 +7,6 @@ export default{
         AppMain
     },
     created(){
-      console.log("index.page")
     },
 }
 </script>

src/utils/mapRequest.js

@@ -15,7 +15,6 @@ mapService.interceptors.request.use(
   },
   error => {
     // 异常情况
-    console.log(error)
     return Promise.reject(error)
   }
 )
@@ -50,7 +49,6 @@ mapService.interceptors.response.use(
     return res;
   },
   error => {
-    console.log('err' + error)
     return Promise.reject(error)
   }
 )

src/views/house/workbench/conditions.vue

@@ -16,7 +16,7 @@
                         <el-table-column prop="location" label="坐落" show-overflow-tooltip align="center" />
                         <el-table-column label="操作" width="100" align="center">
                             <template v-slot="scope">
-                                <el-button type="text" @click="clickAdd(scope.row.tid, scope.row.tno)">添加证件</el-button>
+                                <el-button type="text" @click="clickAdd(scope.row)">添加证件</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -50,7 +50,7 @@
                 </el-tabs>
                 <span class="title-span">4.2.完善补充信息</span>
                 <div style="border: 1px #dae1eb solid; padding-left: 5px;">
-                    <el-form :model="t" label-width="250" label-position="right" style="max-width: 100%; padding: 10px;"
+                    <el-form :model="t" label-width="180" label-position="right" style="max-width: 100%; padding: 10px;"
                         :inline="true">
                         <el-divider content-position="left"><span class="divide-span">一般假设</span></el-divider>
                         <el-row :gutter="24">
@@ -265,100 +265,40 @@
                                 </el-form-item>
                             </el-col>
                         </el-row>
-                        <!-- <el-divider content-position="left"><span class="divide-span">抵押权</span></el-divider>
+
+                        <el-divider content-position="left"><span class="divide-span">用益物权</span></el-divider>
+
                         <el-row :gutter="24">
                             <el-col :span="8">
-                                <el-form-item label="是否设置抵押权:" class="form-item">
-                                    <el-radio-group v-model="t.hasPledge" clearable placeholder="请选择">
-                                        <el-radio :value="true">是</el-radio>
-                                        <el-radio :value="false">否</el-radio>
-                                    </el-radio-group>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row :gutter="24" v-if="t.hasPledge">
-                            <el-col :span="8" >
-                                <el-form-item label="抵押权人:" class="form-item">
-                                    <el-input v-model="t.pledgeUser" clearable />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="8">
-                                <el-form-item label="抵押权类型:" class="form-item">
-                                    <el-select v-model="t.pledgeType" clearable placeholder="请选择">
-                                        <el-option value="一般抵押权">一般抵押权</el-option>
-                                        <el-option value="最高额抵押权">最高额抵押权</el-option>
+                                <el-form-item label="地役权:" class="form-item">
+                                    <el-select v-model="t.hasLandUseRight">
+                                         <el-option :value="true" label="是">是</el-option>
+                                         <el-option :value="false" label="否">否</el-option>
                                     </el-select>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="8">
-                                <el-form-item label="抵押权利价值:" class="form-item">
-                                    <el-input v-model="t.pledgeValue" clearable>
-                                        <template #append>
-                                            <span>万元</span>
-                                        </template>
-                                    </el-input>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row :gutter="24" v-if="t.hasPledge">
-                            <el-col :span="8">
-                                <el-form-item label="是否是同一抵押权人续贷:" class="form-item">
-                                    <el-radio-group v-model="t.samePledgeContinue" clearable placeholder="请选择">
-                                        <el-radio :value="true">是</el-radio>
-                                        <el-radio :value="false">否</el-radio>
-                                    </el-radio-group>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="8" v-if="!t.samePledgeContinue">
-                                <el-form-item label="新抵押权利人:" class="form-item">
-                                    <el-input v-model="t.newPledgeUser" clearable />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="8" v-if="!t.samePledgeContinue">
-                                <el-form-item label="已设立最高额抵押权，抵押未到期:" class="form-item">
-                                    <el-radio-group v-model="t.highPledgeNotExpire" clearable placeholder="请选择">
-                                        <el-radio :value="true">是</el-radio>
-                                        <el-radio :value="false">否</el-radio>
-                                    </el-radio-group>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="8" v-if="t.samePledgeContinue">
-                                <el-form-item label="已设立抵押权，现拟设立最高额抵押权，同一抵押权人:" class="form-item">
-                                    <el-radio-group v-model="t.samePledgeHigh" clearable placeholder="请选择">
-                                        <el-radio :value="true">是</el-radio>
-                                        <el-radio :value="false">否</el-radio>
-                                    </el-radio-group>
+                                <el-form-item label="居住权:" class="form-item">
+                                    <el-select v-model="t.hasLivingRight">
+                                         <el-option :value="true" label="是">是</el-option>
+                                         <el-option :value="false" label="否">否</el-option>
+                                    </el-select>
                                 </el-form-item>
                             </el-col>
                         </el-row>
-                        <el-row :gutter="24" v-if="t.hasPledge">
-                            <el-col :span="8">
-                                <el-form-item label="其他法定优先受偿款:" class="form-item">
-                                    <el-input v-model="t.firstMoney" clearable>
-                                        <template #append>
-                                            <span>万元</span>
-                                        </template>
-                                    </el-input>
-                                </el-form-item>
-                            </el-col>
+
+                        <el-row :gutter="24">
                             <el-col :span="8">
-                                <el-form-item label="拖欠工程款:" class="form-item">
-                                    <el-input v-model="t.debtMoney" clearable>
-                                        <template #append>
-                                            <span>万元</span>
-                                        </template>
-                                    </el-input>
+                                <el-form-item label="供役地权利人:" class="form-item">
+                                    <el-input v-model="t.landUseRightFrom"  />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="8">
-                                <el-form-item label="是否扣除法定优先受偿款:" class="form-item">
-                                    <el-radio-group v-model="t.isTakeOutFirstMoney" clearable placeholder="请选择">
-                                        <el-radio :value="true">是</el-radio>
-                                        <el-radio :value="false">否</el-radio>
-                                    </el-radio-group>
+                                <el-form-item label="需役地权利人:" class="form-item">
+                                    <el-input v-model="t.landUseRightTo"  />
                                 </el-form-item>
                             </el-col>
-                        </el-row> -->
+                        </el-row>
                         <div style="width: 100%; text-align: right;">
                             <el-button style="margin-top: 10px; margin-right: 5px" type="text"
                                 @click="saveSupplement(t)">保存估价对象{{
@@ -370,8 +310,8 @@
                 </div>
             </el-tab-pane>
         </el-tabs>
-        <el-dialog v-model="certificateDialog" title="请添加标的物的权属证件" width="500" align-center @closed="cleanId">
-            <h2>估价对象【{{ tId }}】序号{{ tNo }}</h2>
+        <el-dialog v-model="certificateDialog" title="请添加标的物的权属证件" width="60%" align-center @closed="cleanId">
+            <h2>估价对象 {{ certificateInfo.tid }} 序号 {{ certificateInfo.tno }}</h2>
             <el-checkbox-group v-model="cers">
                 <el-checkbox label="《不动产权证书》" value="1" />
                 <el-checkbox label="《房屋所有权证》（新）" :disabled="newHouseDisable" value="2" />
@@ -470,15 +410,26 @@ export default {
             certificates: [],
             certificateActive: null,
             certificateDialog: false,
-            tId: null,
-            tNo: null,
-            cers: [],
             newHouseDisable: false,
             oldHouseDisable: false,
             newLandDisable: false,
             oldLandDisable: false,
-            collapseActive: 'certInfo'
-
+            collapseActive: 'certInfo',
+            certificateInfo:{
+                tid: null,
+                tno: null,
+                certificateNo:null,
+                ownShipUser:null,
+                location:null,
+                atFloor:null,
+                structure:null,
+                useTo:null,
+                outerAcreage:null,
+                acreage:null,
+                landCertificateNo:null,
+                landType:null
+            },
+            cers:[]
 
         }
     },
@@ -533,11 +484,7 @@ export default {
             //保存标的物的经纬度坐标
             for (let i in t.aims) {
                 let addr = null;
-                if (t.aims[i].actAddress) {
-                    addr = t.aims[i].actAddress;
-                } else {
-                    addr = t.aims[i].location;
-                }
+                addr = t.aims[i].location;
                 await amap.getLngLat(addr).then(res => {
                     if (res.status == "1") {
                         let ret = res.geocodes.filter(item => item.level == '门牌号');
@@ -591,16 +538,14 @@ export default {
             })
         },
 
-        clickAdd(id, no) {
-            this.tId = id;
-            this.tNo = no;
+        clickAdd(socpe) {
+            console.log(socpe)
+            this.certificateInfo = socpe;
             this.certificateDialog = true;
         },
 
         cleanId() {
-
             this.cers = [];
-
         },
 
         getCertificateInfoByTargetId() {
@@ -612,55 +557,77 @@ export default {
                 if (cers[i] == '1') {
                     let fixed = new Object()
                     fixed.type = "1"
-                    fixed.name = "序号" + this.tNo + "《不动产权证书》"
+                    fixed.name = "序号" + this.certificateInfo.tno + "《不动产权证书》"
                     fixed.certificate = {
                         name: fixed.name,
-                        tid: this.tId,
-                        tno: this.tNo
+                        tid: this.certificateInfo.tid,
+                        tno: this.certificateInfo.tno,
+                        certificateNo: this.certificateInfo.certificateNo,
+                        ownShipUser: this.certificateInfo.ownShipUser,
+                        location: this.certificateInfo.location,
+                        useTo:this.certificateInfo.useTo
                     };
                     this.certificates.push(fixed);
                 }
                 if (cers[i] == '2') {
                     let fixed = new Object()
                     fixed.type = "2"
-                    fixed.name = "序号" + this.tNo + "《房屋所有权证》（新）"
+                    fixed.name = "序号" + this.certificateInfo.tno + "《房屋所有权证》（新）"
                     fixed.certificate = {
                         name: fixed.name,
-                        tid: this.tId,
-                        tno: this.tNo
+                        tid: this.certificateInfo.tid,
+                        tno: this.certificateInfo.tno,
+                        certificateNo: this.certificateInfo.certificateNo,
+                        ownShipUser: this.certificateInfo.ownShipUser,
+                        location: this.certificateInfo.location,
+                        useTo:this.certificateInfo.useTo,
+                        acreage:this.certificateInfo.acreage
                     };
                     this.certificates.push(fixed);
                 }
                 if (cers[i] == '3') {
                     let fixed = new Object()
                     fixed.type = "3"
-                    fixed.name = "序号" + this.tNo + "《房屋所有权证》（旧）"
+                    fixed.name = "序号" + this.certificateInfo.tno  + "《房屋所有权证》（旧）"
                     fixed.certificate = {
                         name: fixed.name,
-                        tid: this.tId,
-                        tno: this.tNo
+                        tid: this.certificateInfo.tid,
+                        tno: this.certificateInfo.tno,
+                        certificateNo: this.certificateInfo.certificateNo,
+                        ownShipUser: this.certificateInfo.ownShipUser,
+                        location: this.certificateInfo.location,
+                        useTo:this.certificateInfo.useTo,
+                        acreage:this.certificateInfo.acreage
                     };
                     this.certificates.push(fixed);
                 }
                 if (cers[i] == '4') {
                     let fixed = new Object()
                     fixed.type = "4"
-                    fixed.name = "序号" + this.tNo + "《国有土地使用证》（新）"
+                    fixed.name = "序号" + this.certificateInfo.tno  + "《国有土地使用证》（新）"
                     fixed.certificate = {
                         name: fixed.name,
-                        tid: this.tId,
-                        tno: this.tNo
+                        tid: this.certificateInfo.tid,
+                        tno: this.certificateInfo.tno,
+                        certificateNo: this.certificateInfo.landCertificateNo,
+                        location: this.certificateInfo.location,
+                        useTo:this.certificateInfo.landType,
+                        outterAcreage:this.certificateInfo.outerAcreage,
                     };
                     this.certificates.push(fixed);
                 }
                 if (cers[i] == '5') {
                     let fixed = new Object()
                     fixed.type = "5"
-                    fixed.name = "序号" + this.tNo + "《国有土地使用证》（旧）"
+                    fixed.name = "序号" + this.certificateInfo.tno  + "《国有土地使用证》（旧）"
                     fixed.certificate = {
                         name: fixed.name,
-                        tid: this.tId,
-                        tno: this.tNo
+                        tid: this.certificateInfo.tid,
+                        tno: this.certificateInfo.tno,
+                        certificateNo: this.certificateInfo.landCertificateNo,
+                        location: this.certificateInfo.location,
+                        useTo:this.certificateInfo.landType,
+                        outterAcreage:this.certificateInfo.outerAcreage,
                     };
                     this.certificates.push(fixed);
                 }
@@ -743,7 +710,6 @@ export default {
         saveLandUse(land) {
             land.businessType = 'GUARANTY';
             land.businessId = this.docId;
-            console.log(land)
             certLandUse.save(land).then(res => {
                 if (res.code === 200 && res.data) {
                     ElMessage({

src/views/house/workbench/consignor.vue

@@ -9,7 +9,7 @@
             <img src="../../../assets/icons/form.png"
                 style="width: 26px; height: 26px; float: left; margin-top: 27px;" />
             <el-tooltip content="点击下载" effect="light" placement="top">
-                <span class="form-name" @click="downloadCollect1">估价结果一览表-表单.xlsx</span>
+                <span class="form-name" @click="downloadCollect1">估价结果一览表-模版.xlsx</span>
             </el-tooltip>
         </div>
 
@@ -249,7 +249,7 @@
 
         </el-form>
         <div style="margin-top: 30px; width: 100%; text-align: right; ">
-            <el-button type="text" @click="savePladge()">
+            <el-button type="text" @click="genarate()">
                     生成《致委托人函》
                     <el-icon style="vertical-align: -20%;">
                         <ArrowRightBold />
@@ -454,7 +454,7 @@ export default {
                 }
 
             }
-            if (result && this.processId && this.docId) {
+            if (this.processId && this.docId) {
                 await houseGuaranty.genConsignorLetter(this.processId, this.docId).then(res => {
                     if (res.code === 200) {
                         ElMessage({
@@ -500,12 +500,10 @@ export default {
         changeAppr1() {
             let apprNo = this.apprisers.filter(item => item.key == this.baseInfo.appraiser1);
             this.baseInfo.appraNo1 = apprNo[0].value;
-            console.log(this.baseInfo)
         },
         changeAppr2() {
             let apprNo = this.apprisers.filter(item => item.key == this.baseInfo.appraiser2);
             this.baseInfo.appraNo2 = apprNo[0].value;
-            console.log(this.baseInfo)
         },
         getBaseInfo() {
             if (this.docId) {

src/views/house/workbench/guarantyResult.vue

@@ -1081,7 +1081,6 @@ export default {
             this.$refs.map.collectHotal(this.redius,this.curLngLat);
         },
         refreshSpot(){
-            console.log(this.curLngLat)
             this.$refs.map.collectSpot(this.redius,this.curLngLat);
         },
         cleanLngLat(){