Merge branch 'liuxin' into develop

src/pages/carConfirm/confirm-detail.vue

@@ -128,7 +128,37 @@
         </div>
       </div>
       <div v-show="tabNum===1">
-        1
+        <list-item :item-height="56" class="contract-text" style="background-color:rgb(250,250,250);">
+          <item :proportion="[4,1]">
+            <div slot="name" class="aguremrnt-list">
+              <img src="@/assets/constractSigning/npack.png" alt class="pics" >
+              <p class="second first">承租人确认意见</p>
+            </div>
+            <div slot="content" class="in-detail" @click="goContractContent('承租人确认意见')">
+              <img src="@/assets/constractSigning/detail.png" alt >
+            </div>
+          </item>
+          <item :proportion="[4,1]">
+            <div slot="name" class="aguremrnt-list">
+              <img src="@/assets/constractSigning/pack.png" alt class="pics" >
+              <p class="second">融资租赁合同</p>
+              <img :src="leasePic" alt class="read" >
+            </div>
+            <div slot="content" class="in-detail" @click="goContractContent('融资租赁合同')">
+              <img src="@/assets/constractSigning/detail.png" alt >
+            </div>
+          </item>
+          <item :proportion="[4,1]">
+            <div slot="name" class="aguremrnt-list">
+              <img src="@/assets/constractSigning/pack.png" alt class="pics" >
+              <p class="second">租赁物所有权转移及接收确认书</p>
+              <img :src="agentPic" alt class="read" >
+            </div>
+            <div slot="content" class="in-detail" @click="goContractContent('租赁物所有权转移及接收确认书')">
+              <img src="@/assets/constractSigning/detail.png" alt >
+            </div>
+          </item>
+        </list-item>
       </div>
     </h-content>
     <bottom-tab v-if="!flag">
@@ -160,7 +190,13 @@ export default {
       downNum: false,
       show: false,
       flag: false, // 判断是否为已确认
+      leasePic: '', // 租赁合同图片
+      agentPic: '', // 经销商担保协议图片
+      bankPic: '', // 农行代扣授权书图片
+      legalPic: '', // 法人授权书图片
       confirm_id: '',
+      readed: require('@/assets/constractSigning/read.png'), // 已读
+      unRead: require('@/assets/constractSigning/unread.png'), // 未读
       tabNum: 0,
       text: {
         first: '合同详情',
@@ -202,9 +238,13 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
+      if (from.name === 'ConfirmList') {
         vm.getDetail()
         vm.getEquipment()
+      }
       vm.confirm_id = vm.$route.params.confirm_id
+      vm.agentPic = vm.unRead
+      vm.leasePic = vm.unRead
       if (vm.$route.params.confirm_status === 'SUBMIT') {
         vm.flag = false
       } else if (vm.$route.params.confirm_status === 'APPROVED') {
@@ -394,6 +434,25 @@ export default {
         }
       })
     },
+    // 跳转合同详情
+    goContractContent (name) {
+      this.$router.push({
+        name: 'ContractContent',
+        params: {
+          name,
+          business_type: this.$route.params.business_type,
+        },
+      })
+      if (name === '经销商担保协议') {
+        setTimeout(() => {
+          this.agentPic = this.readed
+        }, 1000)
+      } else if (name === '租赁主合同') {
+        setTimeout(() => {
+          this.leasePic = this.readed
+        }, 1000)
+      }
+    },
     getEquipment () {
       let vm = this
       let url = process.env.basePath + 'car_equip_list_query'
@@ -459,6 +518,90 @@ export default {
   .trans-leave-active {
     opacity: 0;
   }
+     .aguremrnt-list {
+      display: flex;
+      flex-direction: row;
+
+      .pic {
+        margin-left: -3px;
+      }
+
+      .pics {
+        //    width: 21px;
+        height: 30px;
+      }
+
+      .read {
+        height: 16px;
+        margin-top: 8px;
+        margin-left: 6px;
+      }
+
+      .second {
+        height: 32px;
+        line-height: 32px;
+        font-family: PingFangSC-Regular;
+        font-size: 14px;
+        margin-left: 16px;
+        color: #383f45;
+        letter-spacing: 0.43px;
+      }
+
+      .first {
+        margin-left: 13px;
+      }
+    }
+
+   .contract-text {
+        .border-red {
+          border: 2px solid rgba(255, 0, 0, 0.4);
+        }
+
+        .hls-item {
+          margin-top: 8px;
+          background-color: #fff;
+        }
+
+        .contents {
+          padding: 0;
+        }
+
+        .in-detail {
+          background-color: rgba(0, 70, 156, 0.08);
+          width: 48px;
+          height: 56px;
+          text-align: center;
+          line-height: 65px;
+
+          img {
+            width: 16px;
+          }
+        }
+
+        .in-all {
+          //width: 96px;
+          display: flex;
+
+          img {
+            width: 16px;
+          }
+
+          div {
+            width: 48px;
+            height: 56px;
+            text-align: center;
+            line-height: 65px;
+          }
+
+          div:first-child {
+            background-color: rgba(252, 200, 0, 0.1);
+          }
+
+          div:nth-child(2) {
+            background-color: rgba(0, 70, 156, 0.08);
+          }
+        }
+      }
   .hide {
     display: flex;
     justify-content: flex-start;

src/pages/carConfirm/confirm-list.vue

@@ -142,6 +142,7 @@ export default {
           confirm_status: e.confirm_status,
           check_id: e.check_id,
           confirm_id: e.confirm_id,
+          business_type: e.business_type,
         },
       })
     },

src/pages/carConfirm/tab.vue

@@ -22,7 +22,7 @@ import finish from '@/assets/contractStart/confirmN.png'
 export default {
   props: {
     title: {
-      type: Function,
+      type: Object,
       default: function () {
         return {}
       },

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

@@ -43,7 +43,7 @@
         <img src="@/assets/contractCreate/hint.png" >提示 以下为单个设备商务政策
       </div>
       <list-item :item-height="44">
-        <item :showArrow="true" @click.native="showModalBusiness=true">
+        <item :showArrow="true" @click.native="getBusinessPolicy();showModalBusiness=true">
           <div slot="name">商务政策</div>
           <input slot="content" v-model="saveInfo.product_plan_name" readonly placeholder="请选择" >
         </item>
@@ -136,7 +136,7 @@
             <input v-model="keyWordProduct" placeholder="请输入产品名称" >
           </div>
           <div class="division-box">
-            <scroll ref="scroll" :updateData="[divisionLists]" :pullUp="true" @pullingUp="getProduct">
+            <scroll ref="scroll" :updateData="[divisionLists]" :pullUp="true" @pullingUp="loadMoreProduct">
               <list-item v-for="(item,index) in divisionLists" :key="index">
                 <item
                   :proportion="[1,4]"
@@ -174,7 +174,7 @@
           <div class="search has-header">
             <input v-model="policyKeyWord" placeholder="请输入商务政策名称" >
           </div>
-          <scroll ref="scroll" :updateData="[businessLists]" :pullUp="true" @pullingUp="getBusinessPolicy">
+          <scroll ref="scroll" :updateData="[businessLists]" :pullUp="true" @pullingUp="loadMorePolicy">
 
             <div class="division-box">
               <section v-for="(item,index) in businessLists" :key="index" @click="selectBusinessPolicy(item)">
@@ -223,35 +223,15 @@ export default {
       showModalBusiness: false,
       isComputed: false,
       keyWordProduct: '',
-      keyWord: '',
       policyKeyWord: '',
-      pagenum: 1,
-      pagenumPolicy: 1,
+      pagenum: 1, // 产品型号页码
+      pagenumSearch: 1, // 产品型号查询时的页码
+      pagenumPolicy: 1, // 商务政策没有查询时的页码
+      pagenumSearchPolicy: 1, // 商务政策查询时的页码
       businessLists: [], // 商务政策
       periodLists: [], // 还款周期
       paywayLists: [], // 支付方式
-      divisionLists: [{
-        'bp_name': '上海汉得信息技术股份有限公司',
-        'bp_id': '7781',
-        'product_id': '5',
-        'product_attachment_id': '88039',
-        'product_code': 'QAY130',
-        'product_name': '全地面起重机QAY130',
-        'bp_type_n': '经销商',
-        'collect_status': 'N',
-        url: '',
-      },
-      {
-        'bp_name': '广州市易推信息商务科技有限公司',
-        'bp_id': '8143',
-        'product_id': '5',
-        'product_attachment_id': '88039',
-        'product_code': 'QAY130',
-        'product_name': '全地面起重机QAY130',
-        'bp_type_n': '经销商',
-        'collect_status': 'Y',
-        url: '',
-      }],
+      divisionLists: [],
       productLine: [], // 产品线
       productInfo: {
         project_id: window.localStorage.project_id,
@@ -292,13 +272,19 @@ export default {
   },
   watch: {
     policyKeyWord (newVal, oldVal) {
-      this.getBusinessPolicy()
+      this.searchBusinessPolicy()
+    },
+    keyWordProduct (newVal, oldVal) {
+      this.searchProduct()
     },
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.showModalBusiness = false
       vm.showModalValue = false
+      vm.pagenumSearch = 1
+      vm.pagenumSearchPolicy = 1
+      vm.policyKeyWord = ''
       if (from.name === 'CreateBaseInfo') {
         vm.businessLists = []
         vm.pagenum = 1
@@ -307,7 +293,6 @@ export default {
         vm.getProductLine() // 产品线查询
         vm.repayPeriod()// 还款周期查询
         vm.getPayWay()// 支付方式查询
-        vm.getBusinessPolicy()// 获取商务政策
       }
     })
   },
@@ -441,6 +426,13 @@ export default {
         },
       })
     },
+    loadMorePolicy () {
+      if (this.policyKeyWord) {
+        this.searchBusinessPolicy()
+      } else {
+        this.getBusinessPolicy()
+      }
+    },
     searchBusinessPolicy () {
       let vm = this
       let randomString = Math.floor(Math.random() * 21)
@@ -452,7 +444,7 @@ export default {
       let param = {
         bp_agent_id: vm.$route.params.bp_agent_id,
         pagesize: 10,
-        pagenumPolicy: vm.pagenumPolicy,
+        pagenum: vm.pagenumSearchPolicy,
         searchInput: vm.policyKeyWord,
       }
       hlsPopup.showLoading('请稍候')
@@ -462,18 +454,16 @@ export default {
           let returnData = []
           returnData = res.lists
           if (returnData.length === 0) {
+            vm.businessLists = returnData
             vm.$refs.scroll.update(true)
           } else if (returnData.length > 0 && returnData.length < 10) {
-            vum.forEach(returnData, function (data, index, array) {
-              vm.businessLists.push(array[index])
-            })
-            vm.pagenumPolicy++
+            vm.businessLists = returnData
             vm.$refs.scroll.update(true)
           } else if (returnData.length === 10) {
             vum.forEach(returnData, function (data, index, array) {
               vm.businessLists.push(array[index])
             })
-            vm.pagenumPolicy++
+            vm.pagenumSearchPolicy++
             vm.$refs.scroll.update(false)
           }
         } else {
@@ -492,7 +482,7 @@ export default {
       let param = {
         bp_agent_id: vm.$route.params.bp_agent_id,
         pagesize: 10,
-        pagenumPolicy: vm.pagenumPolicy,
+        pagenum: vm.pagenumPolicy,
         searchInput: vm.policyKeyWord,
       }
       hlsPopup.showLoading('请稍候')
@@ -529,6 +519,53 @@ export default {
         vm.showModalValue = false
       }, 100)
     },
+    loadMoreProduct () {
+      if (this.keyWordProduct) {
+        this.searchProduct()
+      } else {
+        this.getProduct()
+      }
+    },
+    searchProduct () {
+      let vm = this
+      let randomString = Math.floor(Math.random() * 21)
+      let url =
+        process.env.basePath +
+        'prd_product_list' +
+        '&index' +
+        `'${randomString}'`
+      let param = {
+        user_phone: window.localStorage.getItem('user_phone'),
+        pagesize: 10,
+        pagenum: vm.pagenumSearch,
+        searchInput: vm.keyWordProduct,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          let returnData = []
+          returnData = res.lists
+          if (returnData.length === 0) {
+            vm.divisionLists = returnData
+          } else if (returnData.length > 0 && returnData.length < 10) {
+            vm.divisionLists = returnData
+            vm.$refs.scroll.update(true)
+          } else if (returnData.length === 10) {
+            vum.forEach(returnData, function (data, index, array) {
+              vm.divisionLists.push(array[index])
+            })
+            vm.pagenumSearch++
+            vm.$refs.scroll.update(false)
+          }
+          vm.divisionLists.forEach(item => {
+            item['url'] = process.env.filePath + 'attachment_id=' + item.product_attachment_id + '&access_token=' + window.localStorage.access_token
+          })
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     getProduct () {
       let vm = this
       vm.showModalValue = true
@@ -542,7 +579,7 @@ export default {
         user_phone: window.localStorage.getItem('user_phone'),
         pagesize: 10,
         pagenum: vm.pagenum,
-        searchInput: vm.keyWord,
+        searchInput: vm.keyWordProduct,
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {

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

@@ -249,7 +249,7 @@
           <div class="search has-header">
             <input v-model="keyWord" placeholder="请输入担保人名称/证件号码" >
           </div>
-          <scroll ref="scroll" :updateData="[undertakeList]" :pullUp="true" @pullingUp="getUndertake">
+          <scroll ref="scroll" :updateData="[undertakeList]" :pullUp="true" @pullingUp="loadMore">
             <list-item :item-height="68" class="item">
               <item v-for="(item,index) in undertakeList" :key="index" @click.native="addUndertake(item)">
                 <img slot="left-icon" src="@/assets/contractCreate/name.png" class="left-icon" >
@@ -280,22 +280,14 @@ export default {
       keyWord: '',
       bp_agent_id: '',
       pageNum: 1,
+      pageNumSearch: 1,
       BussinessSituationList: [], // 行业情况
       jobSituationList: [], // 职业情况
       houseInfonList: [], // 房产信息
       equipInfonList: [], // 设备信息
       engeList: [], // 工程合同查询
       nativeList: [], // 企业性质查询
-      undertakeList: [ {
-        'id_card_no': '152104199103074114',
-        'bp_name': '程磊',
-        'bp_id': '8464',
-      },
-      {
-        'id_card_no': '91320000665795725L',
-        'bp_name': '江苏徐工工程机械租赁有限公司',
-        'bp_id': '8465',
-      }], // 担保人列表
+      undertakeList: [], // 担保人列表
       selectUdertake: [], // 已选择的担保人列表
       NPBaseInfo: {}, // 自然人基本信息
       ORGBaseInfo: {}, // 企业基本信息
@@ -343,11 +335,15 @@ export default {
       },
       immediate: true,
     },
+    keyWord (newVal, oldVal) {
+      this.searchUndertake()
+    },
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.showModalValue = false
       vm.pageNum = 1
+      vm.pageNumSearch = 1
       vm.bp_class = window.localStorage.bp_class
       if (from.name === 'ContractCreateList') {
         vm.getBaseInfo()
@@ -439,6 +435,53 @@ export default {
         this.getORGnative()
       }
     },
+    loadMore () {
+      if (this.keyWord) {
+        this.searchUndertake()
+      } else {
+        this.getUndertake()
+      }
+    },
+    searchUndertake () {
+      let vm = this
+      let randomString = Math.floor(Math.random() * 21)
+      let url =
+        process.env.basePath +
+        'car_confirm_list_query' +
+        '&index' +
+        `'${randomString}'`
+      let param = {
+        bp_agent_id: vm.bp_agent_id,
+        pagesize: 10,
+        pagenum: vm.pageNumSearch,
+        searchInput: vm.keyWord,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          let returnData = []
+          returnData = res.lists
+          if (returnData.length === 0) {
+            vm.undertakeList = returnData
+            vm.$refs.scroll.update(true)
+          } else if (returnData.length > 0 && returnData.length < 10) {
+            vum.forEach(returnData, function (data, index, array) {
+              vm.undertakeList = returnData
+            })
+            vm.$refs.scroll.update(true)
+          } else if (returnData.length === 10) {
+            vum.forEach(returnData, function (data, index, array) {
+              vm.undertakeList.push(array[index])
+            })
+            vm.pageNumSearch++
+            vm.$refs.scroll.update(false)
+          }
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     getUndertake () { // 担保人查询
       let vm = this
       let randomString = Math.floor(Math.random() * 21)

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

@@ -254,7 +254,7 @@ export default {
         if (res.info.code === 0) {
           vm.authUrl = res.info.data.authUrl
         } else {
-          vm.errorMsg = res.info.msg
+          hlsPopup.showLongCenter(res.info.msg)
         }
       })
     },