Merge branch 'liuxin' into develop

src/pages/contractCreate/contract-create-list.vue

@@ -122,9 +122,21 @@ export default {
       })
     },
     changePage () {
-      this.$router.push({
+      let vm = this
+      let url = process.env.basePath + 'get_project_id'
+      let param = {}
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          window.localStorage.setItem('project_id', res.info.project_id)
+          vm.$router.push({
             name: 'CreateBaseInfo',
           })
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
     },
     loadMore () {},
   },

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

@@ -27,15 +27,15 @@
       <list-item :item-height="44">
         <item :showArrow="true" @click.native="selectProductLine">
           <div slot="name">产品线</div>
-          <input slot="content" v-model="saveInfo.division_n" readonly placeholder="暂无信息" >
+          <input slot="content" v-model="saveInfo.division_n" readonly placeholder="请选择" >
         </item>
         <item :showArrow="true" @click.native="getProduct">
           <div slot="name">产品型号</div>
-          <input slot="content" readonly placeholder="暂无信息" >
+          <input slot="content" v-model="saveInfo.product_id_n" readonly placeholder="请选择" >
         </item>
         <item>
           <div slot="name">产品数量</div>
-          <input slot="content" readonly placeholder="暂无信息" >
+          <input slot="content" v-model="saveInfo.product_num" placeholder="请填写产品数量" >
         </item>
       </list-item>
       <div class="userInfo">融资信息</div>
@@ -43,77 +43,77 @@
         <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">
           <div slot="name">商务政策</div>
-          <input slot="content" readonly placeholder="暂无信息" >
+          <input slot="content" v-model="saveInfo.product_plan_name" readonly placeholder="请选择" >
         </item>
         <item>
           <div slot="name">设备单价</div>
-          <CurrencyInput slot="content" readonly placeholder="暂无信息" />
+          <CurrencyInput slot="content" v-model="saveInfo.equip_price" placeholder="暂无信息" />
         </item>
         <item>
           <div slot="name">融资金额</div>
-          <CurrencyInput slot="content" readonly placeholder="暂无信息" />
+          <CurrencyInput slot="content" v-model="saveInfo.finance_amount" placeholder="暂无信息" />
         </item>
         <item>
           <div slot="name">首付比例</div>
-          <input slot="content" readonly placeholder="暂无信息" >
+          <input slot="content" v-model="saveInfo.down_payment_ratio_n" placeholder="暂无信息" >
         </item>
         <item>
           <div slot="name">首付款</div>
-          <CurrencyInput slot="content" readonly placeholder="暂无信息" />
+          <CurrencyInput slot="content" v-model="saveInfo.down_payment" placeholder="暂无信息" />
         </item>
         <item>
           <div slot="name">保证金比例</div>
-          <input slot="content" readonly placeholder="暂无信息" >
+          <input slot="content" v-model="saveInfo.deposit_ratio_n" placeholder="暂无信息" >
         </item>
         <item>
           <div slot="name">保证金</div>
-          <CurrencyInput slot="content" readonly placeholder="暂无信息" />
+          <CurrencyInput slot="content" v-model="saveInfo.deposit" placeholder="暂无信息" />
         </item>
         <item>
           <div slot="name">手续费比例</div>
-          <input slot="content" readonly placeholder="暂无信息" >
+          <input slot="content" v-model="saveInfo.lease_charge_ratio_n" placeholder="暂无信息" >
         </item>
         <item>
           <div slot="name">手续费</div>
-          <CurrencyInput slot="content" readonly placeholder="暂无信息" />
+          <CurrencyInput slot="content" v-model="saveInfo.lease_charge" placeholder="暂无信息" />
         </item>
         <item>
           <div slot="name">GPS费用</div>
-          <CurrencyInput slot="content" readonly placeholder="暂无信息" />
+          <CurrencyInput slot="content" v-model="saveInfo.gps_fee" placeholder="暂无信息" />
         </item>
         <item>
           <div slot="name">保险押金</div>
-          <CurrencyInput slot="content" readonly placeholder="暂无信息" />
+          <CurrencyInput slot="content" v-model="saveInfo.insurance_fee" placeholder="暂无信息" />
         </item>
-        <item class="date-check">
+        <item class="date-check" @click.native="showTime('YYYY-MM-DD')">
           <div slot="name">预计付款日</div>
-          <input slot="content" readonly placeholder="暂无信息" >
+          <input slot="content" v-model="saveInfo.lease_start_date" readonly placeholder="请选择日期 " >
         </item>
-        <item :showArrow="true">
+        <item :showArrow="true" @click.native = "periodPull">
           <div slot="name">还款周期</div>
-          <input slot="content" readonly placeholder="暂无信息" >
+          <input slot="content" v-model="saveInfo.annual_pay_times_n" readonly placeholder="请选择" >
         </item>
         <item>
           <div slot="name">租赁期数</div>
-          <input slot="content" readonly placeholder="暂无信息" >
+          <input slot="content" v-model="saveInfo.lease_times" placeholder="请填写租赁期数" >
         </item>
         <item>
           <div slot="name">年利率</div>
-          <input slot="content" readonly placeholder="暂无信息" >
+          <input slot="content" v-model="saveInfo.int_rate_n" readonly placeholder="暂无信息" >
         </item>
-        <item :showArrow="true">
+        <item :showArrow="true" @click.native="selectPayWay">
           <div slot="name">支付方式</div>
-          <input slot="content" readonly placeholder="暂无信息" >
+          <input slot="content" v-model="saveInfo.pay_type_n" readonly placeholder="请选择" >
         </item>
         <item>
           <div slot="name">逾期日利率</div>
-          <input slot="content" readonly placeholder="暂无信息" >
+          <input slot="content" v-model="saveInfo.penalty_rate_n" readonly placeholder="暂无信息" >
         </item>
         <item>
           <div slot="name">留购价</div>
-          <CurrencyInput slot="content" readonly placeholder="暂无信息" />
+          <CurrencyInput slot="content" v-model="saveInfo.residual_value" placeholder="请填写留购价" />
         </item>
         <item :showArrow="true" @click.native="goPlan">
           <div slot="name">查看还款计划</div>
@@ -123,7 +123,7 @@
     </h-content>
     <bottom-tab class="add-box">
       <tab-button class="before">计算</tab-button>
-      <tab-button class="next" @click.native="goRent">下一步</tab-button>
+      <tab-button class="next" @click.native="save">下一步</tab-button>
     </bottom-tab>
     <h-modal ref="modal" v-model="showModalValue" class="flow" position="bottom">
       <h-view id="product-list">
@@ -140,15 +140,14 @@
               <list-item v-for="(item,index) in divisionLists" :key="index">
                 <item
                   :proportion="[1,4]"
-                  @click.native="goDetailed(item.product_id,item.collect_status,item.bp_id)"
+                  @click.native="selectProduct(item)"
                 >
                   <div slot="name" class="item-pic">
-                    <img :src="item.url" alt >
+                    <img :src="item.url">
                   </div>
                   <div slot="content" class="item-content">
                     <div class="pro-name">
                       <p>{{ item.product_name }}</p>
-                      <img class="arrow" src="@/assets/productQuery/getIn.png" alt >
                     </div>
                     <div class="centers">
                       <p class="firsts1">{{ item.bp_type_n }}</p>
@@ -173,13 +172,14 @@
         </h-header>
         <h-content>
           <div class="search has-header">
-            <input v-model="keyWord" placeholder="请输入商务政策名称" >
+            <input v-model="policyKeyWord" placeholder="请输入商务政策名称" >
           </div>
           <div class="division-box">
-            <section v-for="(item,index) in businessLists" :key="index">
-              <div class="descript" @click="goDetails(item.product_plan_id)">
+            <scroll ref="scroll" :updateData="[businessLists]" :pullUp="true" @pullingUp="getBusinessPolicy">
+              <section v-for="(item,index) in businessLists" :key="index" @click="selectBusinessPolicy(item)">
+                <div class="descript">
                   <img src="@/assets/trial/product.png" alt >
-                <p class="produc">{{ item.product_plan_id_n }}</p>
+                  <p class="produc">{{ item.product_plan_name }}</p>
                 </div>
                 <div class="tario">
                   <div class="wrap">
@@ -204,7 +204,7 @@
                   </div>
                 </div>
               </section>
-          </div>
+          </scroll></div>
         </h-content>
       </h-view>
     </h-modal>
@@ -222,76 +222,66 @@ export default {
       showModalBusiness: false,
       keyWordProduct: '',
       keyWord: '',
+      policyKeyWord: '',
       pagenum: 1,
-      businessLists: [
-        {
-          lease_times: '12',
-          deposit_ratio_n: '  16.00%',
-          lease_charge_ratio_n: '   4.00%',
-          product_plan_id: '69',
-          lease_charge_ratio: '0.04',
-          int_rate_n: '   6.00%',
-          int_rate: '0.06',
-          deposit_ratio: '0.16',
-          product_plan_id_n: '等额本息-按月-12期',
-        },
-        {
-          lease_times: '4',
-          deposit_ratio_n: '  10.00%',
-          lease_charge_ratio_n: '   5.00%',
-          product_plan_id: '70',
-          lease_charge_ratio: '0.05',
-          int_rate_n: '   6.00%',
-          int_rate: '0.06',
-          deposit_ratio: '0.1',
-          product_plan_id_n: '等额本息-按季-4期',
-        },
-        {
-          lease_times: '12',
-          deposit_ratio_n: '  25.00%',
-          lease_charge_ratio_n: '   5.00%',
-          product_plan_id: '109',
-          lease_charge_ratio: '0.05',
-          int_rate_n: '   7.50%',
-          int_rate: '0.075',
-          deposit_ratio: '0.25',
-          product_plan_id_n: '等额本金-双月-12期',
+      pagenumPolicy: 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: '',
       },
       {
-          lease_times: '24',
-          deposit_ratio_n: '  15.00%',
-          lease_charge_ratio_n: '  15.00%',
-          product_plan_id: '132',
-          lease_charge_ratio: '0.15',
-          int_rate_n: '   7.00%',
-          int_rate: '0.07',
-          deposit_ratio: '0.15',
-          product_plan_id_n: '等额本息-按月-24期',
-        },
-      ],
-      divisionLists: [],
+        '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: '',
+      }],
       productLine: [], // 产品线
       saveInfo: {
-        project_id: '',
+        project_id: window.localStorage.project_id,
         product_plan_id: '',
+        product_plan_name: '',
         product_id: '',
+        product_id_n: '',
         product_num: '',
         equip_price: '',
         int_rate: '',
+        int_rate_n: '',
+        penalty_rate_n: '',
         annual_pay_times: '',
+        annual_pay_times_n: '',
         lease_times: '',
         down_payment_ratio: '',
+        down_payment_ratio_n: '',
         down_payment: '',
         deposit_ratio: '',
+        deposit_ratio_n: '',
         deposit: '',
         lease_charge_ratio: '',
+        lease_charge_ratio_n: '',
         lease_charge: '',
         lease_start_date: '',
         gps_fee: '',
         insurance_fee: '',
         pay_type: '',
+        pay_type_n: '',
         residual_value: '',
         division_n: '',
+        finance_amount: '',
       },
     }
   },
@@ -299,13 +289,178 @@ export default {
     next(vm => {
       vm.showModalBusiness = false
       vm.showModalValue = false
+      vm.businessLists = []
       if (from.name === 'CreateBaseInfo') {
         vm.pagenum = 1
+        vm.pagenumPolicy = 1
         vm.getProductLine() // 产品线查询
+        vm.repayPeriod()// 还款周期查询
+        vm.getPayWay()// 支付方式查询
       }
     })
   },
   methods: {
+    selectBusinessPolicy (e) {
+      let vm = this
+      vm.saveInfo.product_plan_id = e.product_plan_id
+      vm.saveInfo.product_plan_name = e.product_plan_name
+      vm.saveInfo.down_payment_ratio = e.down_payment_ratio
+      vm.saveInfo.down_payment_ratio_n = e.down_payment_ratio_n
+      vm.saveInfo.lease_charge_ratio = e.lease_charge_ratio
+      vm.saveInfo.lease_charge_ratio_n = e.lease_charge_ratio_n
+      vm.saveInfo.int_rate = e.int_rate
+      vm.saveInfo.int_rate_n = e.int_rate_n
+      vm.saveInfo.penalty_rate_n = e.penalty_rate_n
+      vm.saveInfo.deposit_ratio = e.deposit_ratio
+      vm.saveInfo.deposit_ratio_n = e.deposit_ratio_n
+      setTimeout(() => {
+        vm.showModalBusiness = false
+      }, 100)
+    },
+    save () {
+      let vm = this
+      let url = process.env.basePath + 'prj_lease_info_save'
+      let param = {
+        master: vm.saveInfo,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          // vm.$router.push({
+          //   name: 'CreateRentInfo',
+          //   params: {
+          //     bp_agent_id: vm.bp_agent_id,
+          //   },
+          // })
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    showTime (format) { // 预计付款日
+      let vm = this
+      hlsPopup.showTime({
+        nowDate: (new Date()).format('yyyy-MM-dd'),
+        format: format,
+        callback: (date) => {
+          vm.saveInfo.lease_start_date = date
+        },
+      })
+    },
+    getPayWay () { // 支付方式查询
+      let vm = this
+      let url = $config.basePath + 'prj_pay_type_query'
+      let param = {}
+      vm.hlsPopup.showLoading('数据加载中')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.paywayLists = res.lists.map(item => {
+            return {
+              code: item.pay_type,
+              code_name: item.pay_type_n,
+            }
+          })
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    // 支付方式选择
+    selectPayWay () {
+      let vm = this
+      vm.hlsPopup.selectList({
+        list: vm.paywayLists, // 下拉列表
+        code: 'bp_type',
+        object: {},
+        returnItem: function (index, obj) {
+          vm.saveInfo.pay_type_n = obj.bp_type_n
+          vm.saveInfo.pay_type = obj.bp_type
+        },
+      })
+    },
+    repayPeriod () { // 还款周期查询
+      let vm = this
+      let url = $config.basePath + 'annual_pay_times_query'
+      let param = {}
+      vm.hlsPopup.showLoading('数据加载中')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.periodLists = res.lists.map(item => {
+            return {
+              code: item.annual_pay_times,
+              code_name: item.annual_pay_times_n,
+            }
+          })
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    // 还款周期选择
+    periodPull () {
+      let vm = this
+      vm.hlsPopup.selectList({
+        list: vm.periodLists, // 下拉列表
+        code: 'bp_type',
+        object: {},
+        returnItem: function (index, obj) {
+          vm.saveInfo.annual_pay_times_n = obj.bp_type_n
+          vm.saveInfo.annual_pay_times = obj.bp_type
+        },
+      })
+    },
+    getBusinessPolicy () {
+      let vm = this
+      vm.showModalBusiness = true
+      let randomString = Math.floor(Math.random() * 21)
+      let url =
+        process.env.basePath +
+        'prj_product_plan_query' +
+        '&index' +
+        `'${randomString}'`
+      let param = {
+        bp_agent_id: vm.$route.params.bp_agent_id,
+        pagesize: 10,
+        pagenumPolicy: vm.pagenumPolicy,
+        searchInput: vm.policyKeyWord,
+      }
+      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.$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.$refs.scroll.update(true)
+          } else if (returnData.length === 10) {
+            vum.forEach(returnData, function (data, index, array) {
+              vm.businessLists.push(array[index])
+            })
+            vm.pagenumPolicy++
+            vm.$refs.scroll.update(false)
+          }
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    selectProduct (e) {
+      let vm = this
+      this.saveInfo.product_id_n = e.product_name
+      this.saveInfo.product_id = e.product_id
+      setTimeout(() => {
+        vm.showModalValue = false
+      }, 100)
+    },
     getProduct () {
       let vm = this
       vm.showModalValue = true
@@ -342,6 +497,9 @@ export default {
             vm.pagenum++
             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)
         }
@@ -397,6 +555,12 @@ export default {
 </script>
 <style lang="less">
 #create-rent-info {
+  input{
+    color:#333;
+  }
+  input::placeholder{
+    color: #666;
+  }
   .flow {
     z-index: 999;
   }

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

@@ -300,7 +300,7 @@ export default {
       NPBaseInfo: {}, // 自然人基本信息
       ORGBaseInfo: {}, // 企业基本信息
       saveInfo: {// 需要保存的信息
-        project_id: '',
+        project_id: window.localStorage.project_id,
         bp_id: window.localStorage.bp_id,
         bp_class: window.localStorage.bp_class,
         equip_num: '',
@@ -403,24 +403,24 @@ export default {
     },
     save () {
       let vm = this
-      // let url = process.env.basePath + 'prj_base_info_save'
-      // let param = {
-      //   master: {...vm.saveInfo, ...vm.makeData()},
-      // }
-      // hlsPopup.showLoading('请稍候')
-      // vm.$post(url, param).then(function (res) {
-      //   vm.hlsPopup.hideLoading()
-      //   if (res.result === 'S') {
+      let url = process.env.basePath + 'prj_base_info_save'
+      let param = {
+        master: {...vm.saveInfo, ...vm.makeData()},
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
           vm.$router.push({
             name: 'CreateRentInfo',
             params: {
               bp_agent_id: vm.bp_agent_id,
             },
           })
-      //   } else {
-      //     hlsPopup.showLongCenter(res.message)
-      //   }
-      // })
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
     },
     getBaseInfo () {
       this.getEquipInfo()

src/pages/pay/firstPay/pay-entry.vue

@@ -174,7 +174,6 @@ import zg from '@/assets/payment/zg.png'
 import zs from '@/assets/payment/zs.png'
 import zx from '@/assets/payment/zx.png'
 import bank from '@/assets/payment/bank.png'
-import yinlian from '@/assets/payment/bind.png'
 export default {
   name: 'PayEntry',
   components: {},
@@ -194,10 +193,6 @@ export default {
         bank_full_name: '',
         bank_account_num: '',
       },
-      checkPayWay: {
-        img: '',
-        pay_type_name: '',
-      },
       confirm: false,
       show: false,
       showOutside: false,
@@ -219,6 +214,13 @@ export default {
         return '确认订单'
       }
     },
+    text () {
+      if (this.checkType.bank_full_name.indexOf('农业') !== -1) {
+        return 'K码/K令支付'
+      } else if (this.checkType.bank_full_name.indexOf('农业') === -1) {
+        return '银联支付'
+      }
+    },
     serviceCharge () {
       return (this.money * (this.rate / 100)).toFixed(2)
     },
@@ -369,6 +371,7 @@ export default {
               params: {
                 url: res.paymentURL,
                 order_id: vm.$route.params.order_id,
+                text: vm.text,
               },
             })
           }

src/pages/pay/pay-page.vue

@@ -61,7 +61,7 @@
           </div>
         </div>
       </div>
-      <div>
+      <div v-if="!isSuccess||!isFaild">
         <div class="box-top">
           <img src="@/assets/payment/bank-title.png" >
         </div>
@@ -85,7 +85,7 @@
             </item>
             <item>
               <div slot="name" class="name">支付方式</div>
-              <div slot="content">K码/K令支付</div>
+              <div slot="content">{{ text }}</div>
             </item>
           </list-item>
           <div class="description">
@@ -114,6 +114,7 @@ export default {
     return {
       name: '',
       url: '',
+      text: this.$route.params.text,
       info: {
         order_number: '',
         pay_amount_name: '',
@@ -138,6 +139,7 @@ export default {
       vm.isGo = false
       vm.name = from.name
       vm.url = vm.$route.params.url
+      vm.text = vm.$route.params.text
       vm.getInfo()
     })
   },

src/pages/pay/payment/pay-entry.vue

@@ -210,6 +210,13 @@ export default {
         return '确认订单'
       }
     },
+    text () {
+      if (this.checkType.bank_full_name.indexOf('农业') !== -1) {
+        return 'K码/K令支付'
+      } else if (this.checkType.bank_full_name.indexOf('农业') === -1) {
+        return '银联支付'
+      }
+    },
     serviceCharge () {
       return (this.money * (this.rate / 100)).toFixed(2)
     },
@@ -302,6 +309,7 @@ export default {
               params: {
                 url: res.paymentURL,
                 order_id: vm.$route.params.order_id,
+                text: vm.text,
               },
             })
           }