Merge branch 'ren' into develop

src/pages/contractCreate/creat-rent-info.vue

@@ -407,6 +407,9 @@ export default {
     },
     next () {
       let vm = this
+      vm.$router.push({
+        name: 'CreateEnclosureInfo',
+      })
       if (vm.isComputed) {
         let url = process.env.basePath + 'prj_product_info_save'
         let param = {

src/pages/contractCreate/create-enclosure-info.vue

@@ -73,14 +73,29 @@
       <div class="userInfo">补充资料</div>
       <div class="house">
         <p class="titles">特批申请书</p>
-        <div v-if="!applicationImg" class="card-upload" @click="ocrShow('特批申请书', checkId)">
-          <img src="@/assets/userBind/camera.png" class="upload-btn" >
+        <!--待上传图片列表-->
+        <div
+          v-for="(item, index) in upload_list"
+          v-if="item.check_id==list.check_id"
+          :key="index"
+          class="card-upload"
+        >
+          <img :src="item.picture" @click="showBigPicture(item.picture)" >
+          <div class="close" @click="remove_pic(item.attachment_id,index)">
+            <img src="@/assets/userBind/deleteIcon.png" >
+          </div>
+        </div>
+        <!--从服务器上下载的图片-->
+        <div v-for="(pic, index) in dowload_list" :key="index">
+          <div v-if="pic.check_id==list.check_id" :key="index" class="card-upload">
+            <img :src="pic.url" @click="showBigPicture(pic.url)" >
+            <div class="close" @click="delete_pic(pic.attachment_id)">
+              <img src="@/assets/userBind/deleteIcon.png" >
+            </div>
           </div>
-        <div v-if="applicationImg && status !== 'APPROVED'" class="card-upload">
-          <img :src="applicationImg" @click="ocrShow('特批申请书', checkId)">
         </div>
-        <div v-if="applicationImg && status === 'APPROVED'" class="card-upload">
-          <img :src="applicationImg" @click="showBigPicture(applicationImg)">
+        <div class="card-upload plus" @click="ocrShow(list.description,list.check_id)">
+          <img src="@/assets/userBind/camera.png" class="upload-btn" >
         </div>
       </div>
     </h-content>
@@ -94,7 +109,10 @@
 export default {
   data () {
     return {
+      checkId: '', // 特批申请书id
       cddItemList: [],
+      upload_list: [],
+      dowload_list: [], // 下载图片列表
       idCardFrontCheck_id: '', // 承租人身份证正面
       idCardBackCheck_id: '', // 承租人身份证背面
       idCardFrontUrlFlag: false,
@@ -122,6 +140,8 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       if (from.name === 'CreateRentInfo') {
+        vm.upload_list = []
+        vm.dowload_list = []
         vm.bpClass = window.localStorage.bp_class
         vm.status = window.localStorage.user_bp_status
         vm.loadItemList()
@@ -247,9 +267,62 @@ export default {
         hlsPopup.hideLoading()
       }
     },
+    // 移除图片
+    remove_pic (attachment_id, index) {
+      let vm = this
+      var delete_list = []
+      let obj = {'attachment_id': attachment_id}
+      delete_list.push(obj)
+      let url = process.env.basePath + 'app_delete_attment' // 附件删除
+      let param = {
+        'picturelist': delete_list,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          hlsPopup.showLongCenter('删除成功!')
+          vm.remove_upload_list(attachment_id, index)
+        } else if (res.result === 'E') {
+          hlsPopup.showShortCenter(res.message)
+        }
+      })
+    },
+    remove_upload_list (attachment_id, index) {
+      let vm = this
+      vm.upload_list.remove(index)
+      vm.upload_list.sort()
+    },
+    // 删除图片
+    delete_pic (attachment_id) {
+      let vm = this
+      var delete_list = []
+      let obj = {'attachment_id': attachment_id}
+      delete_list.push(obj)
+      let url = process.env.basePath + 'app_delete_attment' // 附件删除
+      let param = {
+        'picturelist': delete_list,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          hlsPopup.showLongCenter('删除成功!')
+          vm.remove_dowload_list(attachment_id)
+        } else if (res.result === 'E') {
+          hlsPopup.showShortCenter(res.message)
+        }
+      })
+    },
+    remove_dowload_list (attachment_id) {
+      console.log('attachment_id', attachment_id)
+      let vm = this
+      vm.dowload_list = vm.dowload_list.filter(item => {
+        return item.attachment_id !== attachment_id
+      })
+    },
     loadItemList () {
       let vm = this
-      vm.dowload_list = []
       let bpId = window.localStorage.getItem('bp_id')
       let url = process.env.basePath + 'prj_cdd_check_list'
       let group = ''
@@ -330,25 +403,25 @@ export default {
               if (!vm.idCardFrontUrlFlag) {
                 vm.idCardFront = res.lists[0].url
               }
-              vm.idCardFrontAttachmentId = res.lists[0].attachment_id
+              // vm.idCardFrontAttachmentId = res.lists[0].attachment_id
               break
             case 'LEGAL_ID_CARD_F': // 身份证正面
               if (!vm.idCardFrontUrlFlag) {
                 vm.idCardFront = res.lists[0].url
               }
-              vm.idCardFrontAttachmentId = res.lists[0].attachment_id
+              // vm.idCardFrontAttachmentId = res.lists[0].attachment_id
               break
             case 'NP_ID_CARD_B': // 承租人身份证背面
               if (!vm.idCardBackUrlFlag) {
                 vm.idCardBack = res.lists[0].url
               }
-              vm.idCardBackAttachmentId = res.lists[0].attachment_id
+              // vm.idCardBackAttachmentId = res.lists[0].attachment_id
               break
             case 'LEGAL_ID_CARD_B': // 承租人身份证背面
               if (!vm.idCardBackUrlFlag) {
                 vm.idCardBack = res.lists[0].url
               }
-              vm.idCardBackAttachmentId = res.lists[0].attachment_id
+              // vm.idCardBackAttachmentId = res.lists[0].attachment_id
               break
             case 'HOUSE_CARD': // 房产证
               if (!vm.houseFlag) {
@@ -368,8 +441,10 @@ export default {
               }
               // vm.house_id = res.lists[0].attachment_id
               break
+            case 'XXX': // 特批申请书
+              vm.dowload_list = [...res.lists]
+              break
             default:
-              vm.dowload_list.push(res.lists)
           }
         } else {
           hlsPopup.showLongCenter(res.message)
@@ -525,6 +600,11 @@ export default {
     background: #fff;
     margin-top: 10px;
     padding-bottom: 10px;
+    .plus {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
     .card-upload {
           position: relative;
           width: 80px;

src/pages/distributorSign/contract-list.vue

@@ -77,6 +77,7 @@ export default {
     'num': {
       handler (newVal, oldVal) {
         this.$refs.scroll.update(false)
+        this.$refs.scroll.scrollToTop()
         if (newVal === 2) {
           if (!this.approvedFlag) {
             this.getLists()
@@ -113,7 +114,7 @@ export default {
         vm.approvedFlag = false
         vm.submitLists = []
         vm.approvedLists = []
-        vm.$refs.scroll.update(false)
+        // vm.$refs.scroll.update(false)
         vm.$refs.scroll.scrollToTop()
         vm.getLists()
       } else if (from.name === 'ContractDetails') {
@@ -185,6 +186,7 @@ export default {
       }
     },
     loadMore () {
+      // debugger
       let vm = this
       if (vm.num === 1) {
         vm.submitPagenum++

src/pages/help/feedback.vue

@@ -29,9 +29,6 @@
                 <img src="@/assets/userBind/deleteIcon.png" >
               </div>
             </div>
-            <!-- <div class="file">
-              <img src="@/assets/help/1.jpg" >
-            </div> -->
             <div class="file" @click="imgUploadShow(question_id)">
               <img class="photo" src="@/assets/help/photo.png" >
             </div>
@@ -83,13 +80,11 @@ export default {
         if (res.result === 'S') {
           vm.hlsPopup.showSuccess('提交成功')
         }
-        console.log(',,,,,', res)
       })
     },
     // 图片上传入口
     imgUploadShow (check_id) {
       let vm = this
-      // vm.upload_list = []
       hlsPopup.showActionSheet({
         titleText: '请选择照片',
         buttonArray: ['拍照', '从相册取'],
@@ -123,7 +118,6 @@ export default {
         // vm.faceListUpload.push(obj)
         let list = []
         list.push(obj)
-        // vm.upload_list.push(obj)
         // 拍完一张立马执行保存图片逻辑
         vm.save_picture(list)
       }

src/pages/userBindNew/org/enclosure.vue

@@ -2,7 +2,7 @@
  * @Description: 附件信息
  * @Author: your name
  * @Date: 2019-09-20 09:35:11
- * @LastEditTime : 2019-12-23 19:17:03
+ * @LastEditTime : 2019-12-26 14:42:49
  * @LastEditors  : Please set LastEditors
  -->
 <template>
@@ -890,7 +890,7 @@ export default {
               }
               vm.carAttachmentId = res.lists[0].attachment_id
               break
-            case 'REAL_EST_CERTIFICATE': // 行驶证
+            case 'REAL_EST_CERTIFICATE': // 不动产
               if (!vm.propertyFlag) {
                 vm.propertyImg = res.lists[0].url
               }
@@ -901,8 +901,6 @@ export default {
               vm.dowload_list = [...res.lists]
               break
             default:
-              // vm.dowload_list.push(res.lists[0])
-              // console.log('dowload_list.............', vm.dowload_list)
           }
         } else {
           hlsPopup.showLongCenter(res.message)
@@ -1013,8 +1011,6 @@ export default {
     remove_upload_list (attachment_id, index) {
       let vm = this
       vm.upload_list = vm.upload_list.filter(item => { return item.attachment_id !== attachment_id })
-      // vm.upload_list.remove(index)
-      // vm.upload_list.sort()
     },
     // 删除图片
     delete_pic (attachment_id) {