Merge branch 'ren' into develop

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-12-09 11:01:19
+ * @LastEditTime: 2019-12-11 13:49:08
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -810,6 +810,7 @@ export default {
       vm.hlsHttp.post(url, param).then(function (res) {
         // vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
+          console.log(res)
           console.log(res.info.bank_full_name === ' ')
           if (res.info.bank_full_name === ' ') {
             vm.bank_flag = false

src/pages/help/feedback.vue

@@ -74,7 +74,7 @@ export default {
         'master': {
           user_phone: window.localStorage.user_phone,
           question_desc: vm.question_desc,
-          question_id: vm.$route.params.question_id,
+          question_id: vm.question_id,
         },
       }
       vm.hlsPopup.showLoading('提交数据中!')

src/pages/myInfo/my-info.vue

 <!--
  * @Author: your name
  * @Date: 2019-11-07 17:48:53
- * @LastEditTime: 2019-12-07 18:21:48
+ * @LastEditTime: 2019-12-11 15:25:51
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -645,7 +645,7 @@ export default {
             })
           } else {
             this.$router.push({
-              name: 'Enterprise',
+              name: 'EnterpriseNew',
               params: {
                 bp_id: this.bp_id,
                 user_bp_name: this.user_bp_name,
@@ -667,7 +667,7 @@ export default {
             })
           } else {
             this.$router.push({
-              name: 'Enterprise',
+              name: 'EnterpriseNew',
               params: {
                 bp_id: this.bp_id,
                 user_bp_name: this.user_bp_name,

src/pages/userBind/org/enterprise.vue

@@ -1696,7 +1696,7 @@ export default {
           })
           if (vm.idCardFrontEditFlag) { // 法定代表人身份证正面图片已修改，重新上传
             vm.idCardFrontUrlFlag = true
-            vm.delete_pic_to_ocr(vm.idCardFrontAttachmentId)// 先删除之前识别的图片
+            vm.delete_pic_to_ocr(vm.idCardFrontAttachmentId)// 先删除之前识vm.delete_pic_to_ocr(vm.idCardFrontAttachmentId)// 先删除之前识别的图片
             var list = []
             let obj = {
               'pkvalue': vm.idCardFrontCheck_id,

src/pages/userBind/userBind.vue

@@ -10,7 +10,7 @@
       <div class="info">
         <div class="info-icon">
           <img src="@/assets/userBind/info.png" >
-          <span>温馨提示</span>
+          <span @click="goEnterprise">温馨提示</span>
         </div>
         <p>绑定成功后，您即可使用APP中合同查询、还款查询等功能。</p>
       </div>
@@ -56,7 +56,7 @@ export default {
         name = 'NaturePerson'
         bpClass = 'NP'
       } else if (this.flag === 1) {
-        name = 'Enterprise'
+        name = 'EnterpriseNew'
         bpClass = 'ORG'
       }
       this.$router.push({
@@ -66,6 +66,11 @@ export default {
         },
       })
     },
+    goEnterprise () {
+      this.$router.push({
+        name: 'EnterpriseNew',
+      })
+    },
   },
 }
 </script>

src/pages/userBindNew/org/invoice.vue

+<!--
+ * @Description: In User Settings Edit
+ * @Author: your name
+ * @Date: 2019-09-20 09:35:11
+ * @LastEditTime: 2019-12-11 19:17:05
+ * @LastEditors: Please set LastEditors
+ -->
+<template>
+  <h-view id="invoice" class="public-style">
+    <h-header :proportion="[5,1,1]" class="bar-custom">
+      <div slot="left" class="h-header-btn" @click="$routeGo()">
+        <img src="@/assets/userBind/arrow.png">
+        <span>开票信息</span>
+      </div>
+    </h-header>
+    <list-item :item-height="44">
+      <item :showArrow="true">
+        <div slot="name" class="font-color">纳税人类型</div>
+        <input
+          slot="content"
+          v-model="invoiceInfo.taxpayer_type_n"
+          type="text"
+          readonly
+          placeholder="请选择"
+          @click="selectTaxpayer"
+        >
+      </item>
+      <item :showArrow="true">
+        <div slot="name" class="font-color">发票类型</div>
+        <input
+          slot="content"
+          v-model="invoiceInfo.invoice_kind_n"
+          type="text"
+          readonly
+          placeholder="请选择"
+          @click="selectInvoiceType"
+        >
+      </item>
+      <item>
+        <div slot="name" class="font-color">发票抬头</div>
+        <input slot="content" v-model="invoiceInfo.invoice_title" type="text" placeholder="请输入发票抬头" >
+      </item>
+      <item>
+        <div slot="name" class="font-color">发票地址</div>
+        <textarea
+          slot="content" ref="myTestarea" v-model="invoiceInfo.invoice_adds" cols="22"
+          rows="1"
+          type="text" placeholder="请输入发票地址" @input="addRows(invoiceInfo.invoice_adds)" />
+      </item>
+      <item>
+        <div slot="name" class="font-color">开户电话</div>
+        <input slot="content" v-model="invoiceInfo.invoice_tel" type="text" placeholder="请输入开户电话" >
+      </item>
+      <item>
+        <div slot="name" class="font-color">发票开户行</div>
+        <input
+          slot="content"
+          ref="myTestareaLive"
+          v-model="invoiceInfo.open_bank"
+          cols="22"
+          rows="1"
+          type="text"
+          placeholder="请输入发票开户行"
+          @input="addRowsLive(invoiceInfo.open_bank)"
+        >
+      </item>
+      <item>
+        <div slot="name" class="font-color">开户行账号</div>
+        <input slot="content" v-model="invoiceInfo.open_account" type="text" placeholder="请输入开户行账号" >
+      </item>
+      <item>
+        <div slot="name" class="font-color">纳税人识别号</div>
+        <input
+          slot="content"
+          v-model="invoiceInfo.organization_code" placeholder="纳税人识别号" type="text" readonly
+        >
+      </item>
+    </list-item>
+    <bottom-tab class="footer-button">
+      <tab-button class="save" @click.native="verified">下一步</tab-button>
+    </bottom-tab>
+  </h-view>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      bp_id: '',
+      invoicList: [],
+      taxpayerList: [],
+      invoice_kind_n: '',
+      invoiceInfo: {
+        invoice_kind: 1,
+        invoice_kind_n: '',
+        taxpayer_type: '',
+        invoice_title: '',
+        taxpayer_type_n: '',
+        organization_code: '',
+        invoice_adds: '',
+        invoice_tel: '',
+        open_bank: '',
+        open_account: '',
+      },
+    }
+  },
+  watch: {},
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      if (from.name === 'EnterpriseNew') {
+        vm.bp_id = vm.$route.params.bp_id
+        vm.invoiceInfo.organization_code = vm.$route.params.organization_code
+        vm.getInvoiceType()
+        vm.getTaxpayer()
+        if (vm.$route.params.from) {
+          vm.invoiceQuery() // 开票信息查询
+        }
+        vm.addRows(this.invoiceInfo.invoice_adds)
+        vm.addRowsLive(this.invoiceInfo.open_bank)
+      }
+    })
+  },
+  created () {},
+  methods: {
+    invoiceQuery () {
+      let vm = this
+      let url = process.env.basePath + 'bp_invoice_query'
+      let param = {
+        bp_id: vm.bp_id,
+      }
+      vm.hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.invoiceInfo = res.info
+        }
+      })
+    },
+
+    addRows (e) {
+      let addNum = parseInt(e.length / 16)
+      if (addNum === 0) {
+        this.$refs.myTestarea.rows = 1
+      } else if (addNum >= addNum - 1 && addNum < addNum + 1) {
+        this.$refs.myTestarea.rows = addNum + 1
+      }
+    },
+    addRowsLive (e) {
+      let addNum = parseInt(e.length / 16)
+      if (addNum === 0) {
+        this.$refs.myTestareaLive.rows = 1
+      } else if (addNum >= addNum - 1 && addNum < addNum + 1) {
+        this.$refs.myTestareaLive.rows = addNum + 1
+      }
+    },
+    getInvoiceType () {
+      let vm = this
+      let url = process.env.basePath + 'bp_invoice_kind_query'
+      let param = {}
+      vm.hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.invoicList = res.lists.map(item => {
+            return {
+              code: item.invoice_kind,
+              code_name: item.invoice_kind_n,
+            }
+          })
+        }
+      })
+    },
+    getTaxpayer () {
+      let vm = this
+      let url = process.env.basePath + 'bp_taxpayer_type_query'
+      let param = {}
+      vm.hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.taxpayerList = res.lists.map(item => {
+            return {
+              code: item.taxpayer_type,
+              code_name: item.taxpayer_type_n,
+            }
+          })
+        }
+      })
+    },
+    selectInvoiceType (e) {
+      let vm = this
+      vm.hlsPopup.selectList({
+        list: vm.invoicList,
+        code: 'bp_type',
+        object: {},
+        returnItem: function (index, obj) {
+          vm.invoiceInfo.invoice_kind = obj.bp_type
+          vm.invoiceInfo.invoice_kind_n = obj.bp_type_n
+        },
+      })
+    },
+    selectTaxpayer (e) {
+      let vm = this
+      vm.hlsPopup.selectList({
+        list: vm.taxpayerList,
+        code: 'bp_type',
+        object: {},
+        returnItem: function (index, obj) {
+          vm.invoiceInfo.taxpayer_type = obj.bp_type
+          vm.invoiceInfo.taxpayer_type_n = obj.bp_type_n
+        },
+      })
+    },
+    verified () {
+      console.log('bpid', this.$route.params.bp_id)
+      this.$router.push({
+        name: 'Enclosure',
+        params: {
+          bp_id: this.bp_id,
+        },
+      })
+      // let vm = this
+      // let url = process.env.basePath + 'bp_invoice_save'
+      // let param = {
+      //   bp_id: '',
+      //   bp_class: '',
+      //   ...vm.invoiceInfo,
+      // }
+      // delete param.taxpayer_type_n
+      // delete param.invoice_kind_n
+      // vm.hlsPopup.showLoading('请稍候')
+      // vm.hlsHttp.post(url, param).then(function (res) {
+      //   vm.hlsPopup.hideLoading()
+      //   if (res.result === 'S') {
+      //     vm.$router.push({
+      //       name: 'Enclosure',
+      //     })
+      //   }
+      // })
+    },
+  },
+}
+</script>
+<style lang='less'>
+#invoice {
+ input::placeholder{
+    color: #B4B4B5;
+}
+.font-color {
+        color: #656464;
+    }
+     textarea::placeholder {
+    color: #b4b4b5;
+  }
+  textarea {
+    text-align: right;
+    color:#666;
+  }
+  .footer-button {
+      padding-top: 15px;
+      padding-bottom: 15px;
+    }
+    .save {
+      width: 100%;
+      height: 45px;
+      color: #fff;
+      border-radius: 4px;
+      background-color: @headerColor;
+    }
+}
+</style>

src/router/index.js

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-24 12:34:06
- * @LastEditTime: 2019-12-05 18:21:59
+ * @LastEditTime: 2019-12-10 14:52:52
  * @LastEditors: Please set LastEditors
  */
 import Vue from 'vue'
@@ -32,6 +32,13 @@ import HlsPopup from '@/pages/hlsPopup'
 import UserBind from '@/pages/userBind/userBind'
 import NaturePerson from '@/pages/userBind/np/naturePerson'
 import Enterprise from '@/pages/userBind/org/enterprise'
+
+// 用户绑定new
+
+import EnterpriseNew from '@/pages/userBindNew/org/baseInfo'
+import Invoice from '@/pages/userBindNew/org/invoice'
+import Enclosure from '@/pages/userBindNew/org/enclosure'
+import BankInfo from '@/pages/userBindNew/org/bankInfo'
 // 进件审批
 import Base from '@/pages/intoApproval/intoApproval/base'
 import IntoList from '@/pages/intoApproval/into-list'
@@ -191,6 +198,12 @@ export default new Router({
     {path: '/user-bind', component: UserBind, name: 'UserBind', meta: {keepAlive: false}},
     {path: '/nature-person', component: NaturePerson, name: 'NaturePerson', meta: {keepAlive: false}},
     {path: '/enterprise', component: Enterprise, name: 'Enterprise', meta: {keepAlive: true}},
+
+    // 用户绑定new
+    {path: '/enterprise-new', component: EnterpriseNew, name: 'EnterpriseNew', meta: {keepAlive: true}},
+    {path: '/invoice', component: Invoice, name: 'Invoice', meta: {keepAlive: true}},
+    {path: '/enclosure', component: Enclosure, name: 'Enclosure', meta: {keepAlive: true}},
+    {path: '/bankInfo', component: BankInfo, name: 'BankInfo', meta: {keepAlive: true}},
     // 进件审批
     {path: '/base', component: Base, name: 'Base', meta: {keepAlive: false}},
     {path: '/refund', component: Refund, name: 'Refund', meta: {keepAlive: false}},