Merge branch 'liuxin' into develop

src/pages/userBindNew/np/accessory-info.vue

@@ -12,7 +12,9 @@
         <span style="color:#1D3FFF">{{ list.description }}</span>
         <div class="img-content">
           <!--待上传图片列表-->
-          <div v-if="list.cdd_item==='ASSETS_CARD'">
+          <div
+            v-if="list.cdd_item==='ASSETS_CARD'||list.cdd_item==='MARITAL STATUS'||list.cdd_item==='FAMILY_REGISTER'"
+          >
             <div
               v-for="(item, index) in upload_list"
               v-if="item.check_id==list.check_id"
@@ -37,21 +39,6 @@
               <img src="@/assets/userBind/camera.png" class="upload-btn" >
             </div>
           </div>
-          <div v-if="list.cdd_item==='CAR_CARD'">
-            <div v-if="!carImg" class="card-upload plus" @click="ocrShow(list.cdd_item, '')">
-              <img src="@/assets/userBind/camera.png" class="upload-btn" >
-            </div>
-            <div
-              v-if="carImg&&!isApproved"
-              class="card-upload plus"
-              @click="ocrShow(list.cdd_item, '')"
-            >
-              <img :src="carImg" style="width:100%;height:100%" >
-            </div>
-            <div v-if="carImg&&isApproved" class="card-upload plus" @click="showBigPicture(carImg)">
-              <img :src="carImg" style="width:100%;height:100%" >
-            </div>
-          </div>
           <div v-if="list.cdd_item==='HOUSE_CARD'">
             <div v-if="!houseImg" class="card-upload plus" @click="ocrShow(list.cdd_item, '')">
               <img src="@/assets/userBind/camera.png" class="upload-btn" >
@@ -70,80 +57,42 @@
             >
               <img :src="houseImg" style="width:100%;height:100%" >
             </div>
-          </div>
-          <div v-if="list.cdd_item==='HOUSE_CARD'">
             <list-item :item-height="44" class="card-Info">
               <item>
                 <div slot="name">房屋所有权人</div>
-                <input
-                  slot="content"
-                  v-model="hauseInfo.house_owner"
-                  placeholder="识别房产证自动填充"
-                >
+                <input slot="content" v-model="hauseInfo.house_owner" placeholder="识别房产证自动填充" >
               </item>
               <item>
                 <div slot="name">共有情况</div>
-                <input
-                  slot="content"
-                  v-model="hauseInfo.public_situation"
-                  placeholder="识别房产证自动填充"
-                >
+                <input slot="content" v-model="hauseInfo.public_situation" placeholder="识别房产证自动填充" >
               </item>
               <item>
                 <div slot="name">房屋坐落</div>
-                <input
-                  slot="content"
-                  v-model="hauseInfo.house_located"
-                  placeholder="识别房产证自动填充"
-                >
+                <input slot="content" v-model="hauseInfo.house_located" placeholder="识别房产证自动填充" >
               </item>
               <item>
                 <div slot="name">登记时间</div>
-                <input
-                  slot="content"
-                  v-model="hauseInfo.regist_date"
-                  placeholder="识别房产证自动填充"
-                >
+                <input slot="content" v-model="hauseInfo.regist_date" placeholder="识别房产证自动填充" >
               </item>
               <item>
                 <div slot="name">房屋性质</div>
-                <input
-                  slot="content"
-                  v-model="hauseInfo.house_property"
-                  placeholder="识别房产证自动填充"
-                >
+                <input slot="content" v-model="hauseInfo.house_property" placeholder="识别房产证自动填充" >
               </item>
               <item>
                 <div slot="name">规划用途</div>
-                <input
-                  slot="content"
-                  v-model="hauseInfo.plan_purpose"
-                  placeholder="识别房产证自动填充"
-                >
+                <input slot="content" v-model="hauseInfo.plan_purpose" placeholder="识别房产证自动填充" >
               </item>
               <item>
                 <div slot="name">总层数</div>
-                <input
-                  slot="content"
-                  v-model="hauseInfo.house_layers"
-                  placeholder="识别房产证自动填充"
-                >
+                <input slot="content" v-model="hauseInfo.house_layers" placeholder="识别房产证自动填充" >
               </item>
               <item>
                 <div slot="name">建筑面积</div>
-                <input
-                  slot="content"
-                  v-model="hauseInfo.built_area"
-                  placeholder="识别房产证自动填充"
-                >
+                <input slot="content" v-model="hauseInfo.built_area" placeholder="识别房产证自动填充" >
               </item>
               <item>
                 <div slot="name">套内建筑面积</div>
-                <input
-                  slot="content"
-                  v-model="hauseInfo.built_in_area"
-                  placeholder="识别房产证自动填充"
-                >
+                <input slot="content" v-model="hauseInfo.built_in_area" placeholder="识别房产证自动填充" >
               </item>
               <item>
                 <div slot="name">其他</div>
@@ -151,31 +100,34 @@
               </item>
               <item>
                 <div slot="name">地号</div>
-                <input
-                  slot="content"
-                  v-model="hauseInfo.land_number"
-                  placeholder="识别房产证自动填充"
-                >
+                <input slot="content" v-model="hauseInfo.land_number" placeholder="识别房产证自动填充" >
               </item>
               <item :proportion="[1,1]">
                 <div slot="name">土地使用权取得方式</div>
-                <input
-                  slot="content"
-                  v-model="hauseInfo.land_get_method"
-                  placeholder="识别房产证自动填充"
-                >
+                <input slot="content" v-model="hauseInfo.land_get_method" placeholder="识别房产证自动填充" >
               </item>
               <item>
                 <div slot="name">土地使用年限</div>
-                <input
-                  slot="content"
-                  v-model="hauseInfo.land_use_limit"
-                  placeholder="识别房产证自动填充"
-                >
+                <input slot="content" v-model="hauseInfo.land_use_limit" placeholder="识别房产证自动填充" >
               </item>
             </list-item>
           </div>
           <div v-if="list.cdd_item==='CAR_CARD'">
+            <div v-if="list.cdd_item==='CAR_CARD'">
+              <div v-if="!carImg" class="card-upload plus" @click="ocrShow(list.cdd_item, '')">
+                <img src="@/assets/userBind/camera.png" class="upload-btn" >
+              </div>
+              <div
+                v-if="carImg&&!isApproved"
+                class="card-upload plus"
+                @click="ocrShow(list.cdd_item, '')"
+              >
+                <img :src="carImg" style="width:100%;height:100%" >
+              </div>
+              <div v-if="carImg&&isApproved" class="card-upload plus" @click="showBigPicture(carImg)">
+                <img :src="carImg" style="width:100%;height:100%" >
+              </div>
+            </div>
             <list-item :item-height="44" class="card-Info">
               <item>
                 <div slot="name">车辆识别代号</div>
@@ -191,11 +143,7 @@
               </item>
               <item>
                 <div slot="name">品牌型号</div>
-                <input
-                  slot="content"
-                  v-model="carInfo.brand_model_number"
-                  placeholder="识别行驶证自动填充"
-                >
+                <input slot="content" v-model="carInfo.brand_model_number" placeholder="识别行驶证自动填充" >
               </item>
               <item>
                 <div slot="name">发证日期</div>
@@ -203,11 +151,7 @@
               </item>
               <item>
                 <div slot="name">车辆类型</div>
-                <input
-                  slot="content"
-                  v-model="carInfo.vehicle_type"
-                  placeholder="识别行驶证自动填充"
-                >
+                <input slot="content" v-model="carInfo.vehicle_type" placeholder="识别行驶证自动填充" >
               </item>
               <item>
                 <div slot="name">所有人</div>
@@ -219,30 +163,66 @@
               </item>
               <item>
                 <div slot="name">发动机号码</div>
-                <input
-                  slot="content"
-                  v-model="carInfo.engine_number"
-                  placeholder="识别行驶证自动填充"
-                >
+                <input slot="content" v-model="carInfo.engine_number" placeholder="识别行驶证自动填充" >
               </item>
               <item>
                 <div slot="name">号牌号码</div>
-                <input
-                  slot="content"
-                  v-model="carInfo.plate_number"
-                  placeholder="识别行驶证自动填充"
-                >
+                <input slot="content" v-model="carInfo.plate_number" placeholder="识别行驶证自动填充" >
               </item>
               <item>
                 <div slot="name">注册日期</div>
+                <input slot="content" v-model="carInfo.regist_date" placeholder="识别行驶证自动填充" >
+              </item>
+            </list-item>
+          </div>
+          <!-- <div v-if="list.cdd_item==='REAL_EST_CERTIFICATE'"> -->
+          <!-- <list-item :item-height="44" class="card-Info">
+              <item>
+                <div slot="name">权利人</div>
                 <input
                   slot="content"
-                  v-model="carInfo.regist_date"
-                  placeholder="识别行驶证自动填充"
+                  v-model="propertyInfo.right_person"
+                  placeholder="识别不动产权证自动填充"
                 >
               </item>
+              <item>
+                <div slot="name">共有情况</div>
+                <input slot="content" v-model="propertyInfo.public_situation" placeholder="识别不动产权证自动填充" >
+              </item>
+              <item>
+                <div slot="name">坐落</div>
+                <input slot="content" v-model="propertyInfo.house_located" placeholder="识别不动产权证自动填充" >
+              </item>
+              <item>
+                <div slot="name">不动产单元号</div>
+                <input slot="content" v-model="propertyInfo.real_unit_number" placeholder="识别不动产权证自动填充" >
+              </item>
+              <item>
+                <div slot="name">权利类型</div>
+                <input slot="content" v-model="propertyInfo.right_type" placeholder="识别不动产权证自动填充" >
+              </item>
+              <item>
+                <div slot="name">权利性质</div>
+                <input slot="content" v-model="propertyInfo.right_property" placeholder="识别不动产权证自动填充" >
+              </item>
+              <item>
+                <div slot="name">用途</div>
+                <input slot="content" v-model="propertyInfo.house_purpose" placeholder="识别不动产权证自动填充" >
+              </item>
+              <item>
+                <div slot="name">面积</div>
+                <input slot="content" v-model="propertyInfo.house_area" placeholder="识别不动产权证自动填充" >
+              </item>
+              <item>
+                <div slot="name">使用期限	</div>
+                <input slot="content" v-model="propertyInfo.land_use_limit" placeholder="识别不动产权证自动填充" >
+              </item>
+              <item>
+                <div slot="name">权利其他状况</div>
+                <input slot="content" v-model="propertyInfo.right_others" placeholder="识别不动产权证自动填充" >
+              </item>
             </list-item>
-          </div>
+          </div> -->
         </div>
       </div>
     </h-content>
@@ -267,6 +247,19 @@ export default {
       isUploadCar: false, // 行驶证修改标识
       houseAttachmentId: '',
       carAttachmentId: '',
+      propertyInfo: {
+        bp_id: window.localStorage.getItem('bp_id'),
+        right_person: '',
+        public_situation: '',
+        house_located: '',
+        real_unit_number: '',
+        right_type: '',
+        right_property: '',
+        house_purpose: '',
+        house_area: '',
+        land_use_limit: '',
+        right_others: '',
+      },
       hauseInfo: {
         bp_id: window.localStorage.getItem('bp_id'),
         house_owner: '',
@@ -872,7 +865,7 @@ export default {
         img {
           width: 14px;
           height: 14px;
-          margin-left:5px;
+          margin-left: 5px;
         }
       }
       img {

src/pages/userBindNew/np/base-info.vue

@@ -543,14 +543,13 @@ export default {
       })
     },
     async verified () {
-      // this.dowload_list = [] // 保存之前将图片下载列表清空，防止出现重复的图片
-      // this.upload_list = [] // 保存之前将待上传列表清空，防止出现重复的图片
-      // let res = await this.saveWord()
-      // if (res) {
-      //   // 查询资料清单
-      //   this.loadItemList()
-      // }
-      this.saveWord()
+      this.dowload_list = [] // 保存之前将图片下载列表清空，防止出现重复的图片
+      this.upload_list = [] // 保存之前将待上传列表清空，防止出现重复的图片
+      let res = await this.saveWord()
+      if (res) {
+        // 查询资料清单
+        this.loadItemList()
+      }
     },
     loadItemList () {
       let vm = this