add

eab5633c · linxin · ff98ef69 · eab5633c · eab5633c · eab5633c
Commit eab5633c authored Feb 13, 2020 by linxin
19 changed files
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,10 +8,10 @@ module.exports = merge(prodEnv, {
  debug: true,
  isMobilePlatform: false,
  loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
-  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_DEV&apiName="',
+  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="',
  rootPath: '"http://180.104.121.66:8088/r/api"',
-  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"',
+  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
  ocrPath: '"http://180.104.121.66:8088/r/api"',
  appId: '"com.xcmg.app.dev"',
-  currentVersion: '"1.8.4"',
+  currentVersion: '"1.8.6"',
 })
--- a/config/uat.env.js
+++ b/config/uat.env.js
@@ -11,5 +11,5 @@ module.exports = {
  ocrPath:'"http://180.104.121.66:8088/r/api"',
  fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
  appId: '"com.xcmg.app"',
-  currentVersion: '"1.5.1"'
+  currentVersion: '"1.5.2"'
 }
--- a/src/components/currencyInput.vue
+++ b/src/components/currencyInput.vue
@@ -15,6 +15,12 @@ export default {
    value: {
      default: '',
    },
+    check: {
+      default: '',
+    },
+    allCheck: {
+      default: '',
+    },
    // disable: {
    //   type: Boolean,
    //   default: true,
@@ -92,6 +98,12 @@ export default {
    },
    onBlur (event) {
      // if (this.disable) return
+      if (this.check && this.check < 1000) {
+        hlsPopup.showLongCenter('设备单价不能小于1000元!')
+      }
+      if (this.allCheck && this.allCheck < 1000) {
+        hlsPopup.showLongCenter('设备总价不能小于1000元!')
+      }
      event.target.type = 'text'
      this.focused = false
    },

--- a/src/pages/contractCreate/creat-rent-info.vue
+++ b/src/pages/contractCreate/creat-rent-info.vue
@@ -78,7 +78,8 @@
        <item v-if="!isReadOnly">
          <div slot="name" class="required">设备单价</div>
          <CurrencyInput
-            slot="content" v-model="saveInfo.equip_price"
+            slot="content"
+            :check = "saveInfo.equip_price" v-model="saveInfo.equip_price"
            placeholder="请输入设备单价"/>
        </item>
        <item v-if="isReadOnly">
@@ -96,7 +97,7 @@
        <item>
          <div slot="name" class="required">首付比例</div>
          <RateInput
-            v-if="!isReadOnly" slot="content" v-model="saveInfo.down_payment_ratio_n" :readonly="isReadOnly"
+            v-if="!isReadOnly" slot="content" v-model="saveInfo.down_payment_ratio_n"
            placeholder="%"/>
          <span v-if="isReadOnly" slot="content">{{ saveInfo.down_payment_ratio_n }}%</span>
        </item>
@@ -113,7 +114,7 @@
        <item>
          <div slot="name" class="required">保证金比例</div>
          <RateInput
-            v-if="!isReadOnly" slot="content" v-model="saveInfo.deposit_ratio_n" :readonly="isReadOnly"
+            v-if="!isReadOnly" slot="content" v-model="saveInfo.deposit_ratio_n"
            placeholder="%"/>
          <span v-if="isReadOnly" slot="content">{{ saveInfo.deposit_ratio_n }}%</span>
        </item>
@@ -130,7 +131,7 @@
        <item>
          <div slot="name" class="required">手续费比例</div>
          <RateInput
-            v-if="!isReadOnly" slot="content" v-model="saveInfo.lease_charge_ratio_n" :readonly="isReadOnly"
+            v-if="!isReadOnly" slot="content" v-model="saveInfo.lease_charge_ratio_n"
            placeholder="%"/>
          <span v-if="isReadOnly" slot="content">{{ saveInfo.lease_charge_ratio_n }}%</span>
        </item>
@@ -485,6 +486,11 @@ export default {
    })
  },
  methods: {
+    check (e) {
+      if (e < 1000) {
+        hlsPopup.showLongCenter('设备单价不能小于1000元!')
+      }
+    },
    routeGoCustomClick () {
      if (this.fromPage === 'sale') {
        this.isClick = true
@@ -513,13 +519,13 @@ export default {
      }
    },
    changeRatio () {
-      this.saveInfo.down_payment_ratio_n = `${(this.saveInfo.down_payment / this.saveInfo.equip_price).toFixed(2) * 100}%`
+      this.saveInfo.down_payment_ratio_n = `${(this.saveInfo.down_payment / this.saveInfo.equip_price).toFixed(2) * 100}`
    },
    changeDeposit () {
-      this.saveInfo.deposit_ratio_n = `${(this.saveInfo.deposit / this.saveInfo.equip_price).toFixed(2) * 100}%`
+      this.saveInfo.deposit_ratio_n = `${(this.saveInfo.deposit / this.saveInfo.equip_price).toFixed(2) * 100}`
    },
    changeLeaseCharge () {
-      this.saveInfo.lease_charge_ratio_n = `${(this.saveInfo.lease_charge / (this.saveInfo.equip_price - this.saveInfo.equip_price * this.saveInfo.down_payment_ratio_n.replace('%', '') / 100)).toFixed(2) * 100}%`
+      this.saveInfo.lease_charge_ratio_n = `${(this.saveInfo.lease_charge / (this.saveInfo.equip_price - this.saveInfo.equip_price * this.saveInfo.down_payment_ratio_n.replace('%', '') / 100)).toFixed(2) * 100}`
    },
    rentInfoQuery () { // 租赁信息查询
      let vm = this
@@ -621,6 +627,8 @@ export default {
        hlsPopup.showLongCenter('支付方式不能为空!')
      } else if (!vm.saveInfo.residual_value) {
        hlsPopup.showLongCenter('留购价不能为空!')
+      } else if (vm.saveInfo.equip_price < 1000) {
+        hlsPopup.showLongCenter('设备单价不能小于1000元!')
      } else {
        let url = process.env.basePath + 'prj_lease_info_save'
        vm.saveInfo.down_payment_ratio = (vm.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2)
@@ -836,7 +844,7 @@ export default {
          if (date >= (new Date()).format('yyyy-MM-dd')) {
            vm.saveInfo.lease_start_date = date
          } else {
-            hlsPopup.showLongCenter(`预计付款日期不能小于${(new Date()).format('yyyy-MM-dd')}`)
+            hlsPopup.showLongCenter(`预计付款日期不能小于当天${(new Date()).format('yyyy-MM-dd')}`)
          }
        },
      })

--- a/src/pages/contractCreate/sales-info.vue
+++ b/src/pages/contractCreate/sales-info.vue
@@ -255,7 +255,7 @@ export default {
            vm.salesInfo.sale_date = date
            window.localStorage.setItem('signDate', vm.salesInfo.sale_date)
          } else {
-            hlsPopup.showLongCenter(`签约日期不能小于${(new Date()).format('yyyy-MM-dd')}`)
+            hlsPopup.showLongCenter(`签约日期不能小于当天${(new Date()).format('yyyy-MM-dd')}`)
          }
        },
      })

--- a/src/pages/contractInquire/contract-records.vue
+++ b/src/pages/contractInquire/contract-records.vue
-<<<<<<< HEAD
 <!--
 * @Author: your name
 * @Date: 2019-10-31 09:49:57
@@ -493,7 +492,9 @@ export default {
 </script>
 <style lang='less' >
 #contract-records {
-
+  .null{
+    height:100%;
+  }
  .tab {
    display: flex;
    background-color: #fff;
@@ -704,10 +705,12 @@ export default {
  }

 .display {
+  width:100%;
+  height:100%;
    img {
      width: 100%;
      height: 100%;
-      margin-top: -70px;
+      // margin-top: -70px;
    }
  }
  .wrap {

--- a/src/pages/contractSigning/contract-detail.vue
+++ b/src/pages/contractSigning/contract-detail.vue
@@ -31,27 +31,7 @@
      class="myModal"
    >
      <div class="box">
-        <span class="title-box">征信授权书</span>
-        <div class="content-box">
-          <div>江苏徐工工程机械租赁有限公司：</div>
-          <p>本人/本单位拟向贵公司办理融资租赁业务，贵公司需要了解本人/本单位、本人配偶/本单位法定代表人以及担保人的信用记录，用于审核融资租赁申请条件、贷后管理及风险控制，因此，相关人员特做出以下授权并清楚理解其含义：</p>
-          <p>（一）同意授权贵公司通过中国人民银行或者第三方机构查询、打印、保存、使用征信信息；</p>
-          <p>（二）同意授权贵公司向中国人民银行或者第三方机构提供、报送、上传因本业务产生的全部信息；</p>
-          <p>（三）同意授权中国人民银行或者第三方机构向有关机构采集的个人信息，可依法整理、保存、加工、使用、提供，并出具信用报告；</p>
-          <p>（四）以上授权的期限为作出本授权承诺之日起至在贵公司办理或涉及的所有业务或事项终结之日止，且在业务存续期间可多次查询。若在贵公司处办理或涉及的业务未获批准，同意贵公司继续保留此查询授权书原件和身份证件复印件或影印件。</p>
-          <p>特别提示：</p>
-          <p>为了保障您的合法权益，您应当阅读并遵守本授权书。请您务必审慎阅读，并充分理解本授权书的全部内容，特别是以加粗形式提示您注意的。若您不接受本授权书的任何条款，请您立即停止授权。</p>
-          <p>特别声明：</p>
-          <p>本授权书经接受后即时生效，且效力具有独立性，不因相关业务合同或条款无效或被撤销而无效或失效，本授权一经做出，便不可撤销。</p>
-          <p>授权人已知悉本授权书全部内容（特别是加粗字体内容）的含义及因此产生的法律效力，自愿作出以上授权。本授权书是授权人真实意思表示，授权人同意承担由此带来的一切法律后果。</p>
-          <div>授权人(承租人)：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;身份证号：&nbsp;&nbsp;&nbsp;&nbsp;日期：</div>
-          <div>法定代表人/负责人：&nbsp;&nbsp;&nbsp;&nbsp;身份证号：&nbsp;&nbsp;&nbsp;日期：</div>
-          <div>授权人(承租人配偶)：&nbsp;&nbsp;&nbsp;&nbsp;身份证号：&nbsp;&nbsp;&nbsp;日期：</div>
-          <div>授权人(担保人)：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;身份证号：&nbsp;&nbsp;&nbsp;&nbsp;日期：</div>
-          <div>法定代表人/负责人：&nbsp;&nbsp;&nbsp;&nbsp;身份证号：&nbsp;&nbsp;&nbsp;日期：</div>
-          <p class="font-blod">注：1.承租人、担保人为法人或者其他机构的，法定代表人或负责人需签名</p>
-          <p class="font-blod sec">2.承租人为自然人且已婚的，配偶双方共同签名</p>
-        </div>
+        <canvas v-for="page in pages" :id="'the-canvas'+page" :key="page"/>
        <div class="confirm">
          <input type="checkbox" @click="select" >
          <span>我本人已阅读本协议，并同意授权xxxx</span>
@@ -300,6 +280,7 @@ import unCheck3 from '@/assets/constractSigning/unLease.png'
 import LegalPerson from '@/pages/distributorSign/legal-person'
 import Personal from '@/pages/distributorSign/personal'
 import bodyCheck from './body-check'
+import PDFJS from 'pdfjs-dist'
 import axios from 'axios'
 export default {
  name: 'ContractDetail',
@@ -310,6 +291,8 @@ export default {
  },
  data () {
    return {
+      pages: 0,
+      pdfDoc: null,
      isshow: false, // 提示框的显示与隐藏
      bp_flag: false, // 判断自然人和法人
      num: 0,
@@ -410,6 +393,7 @@ export default {
        // vm.getContractLists() // 合同列表
        // 合同文本附件查询
        vm.getAttachment()
+        // 征信授权书查询
      } else if (from.name === 'EntryInfo') {
        vm.bankCardQuery()
      }
@@ -494,6 +478,7 @@ export default {
        hlsPopup.hideLoading()
        if (res.result === 'S') {
          vm.attachArray = res.attachments
+          vm.getbook()
        } else {
          vm.hlsPopup.showLongCenter(res.message)
        }
@@ -517,6 +502,62 @@ export default {
        }
      })
    },
+    // 征信授权书查询
+    getbook () {
+      let vm = this
+      let url = process.env.basePath + 'get_content_app'
+      let param = {
+        confirm_id: vm.confirm_id,
+        data_class: 'PRJ_CONFIRM',
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(res => {
+        hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm._loadFile(res.attachments[0].attachment_file_path)
+        } else {
+          vm.hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    _renderPage (num) {
+      this.pdfDoc.getPage(num).then((page) => {
+        let canvas = document.getElementById('the-canvas' + num)
+        let ctx = canvas.getContext('2d')
+        let dpr = window.devicePixelRatio || 1
+        let bsr = ctx.webkitBackingStorePixelRatio ||
+                  ctx.mozBackingStorePixelRatio ||
+                  ctx.msBackingStorePixelRatio ||
+                  ctx.oBackingStorePixelRatio ||
+                  ctx.backingStorePixelRatio || 1
+        let ratio = dpr / bsr
+        let viewport = page.getViewport(screen.availWidth / page.getViewport(1).width)
+        canvas.width = viewport.width * ratio
+        canvas.height = viewport.height * ratio
+        canvas.style.width = viewport.width + 'px'
+        canvas.style.height = viewport.height + 'px'
+        ctx.setTransform(ratio, 0, 0, ratio, 0, 0)
+        let renderContext = {
+          canvasContext: ctx,
+          viewport: viewport,
+        }
+        page.render(renderContext)
+        if (this.pages > num) {
+          this._renderPage(num + 1)
+        }
+      })
+    },
+    _loadFile (url) {
+      console.log('URL ==== ' + url)
+      PDFJS.getDocument(url).then((pdf) => {
+        this.pdfDoc = pdf
+        console.log('pdf ==== ' + pdf)
+        this.pages = this.pdfDoc.numPages
+        this.$nextTick(() => {
+          this._renderPage(1)
+        })
+      })
+    },
    goBodyCheck (confirm_id) {
      // 活体检测
      this.$refs.body.show()
@@ -1432,6 +1473,7 @@ export default {
    align-items: center;
    .box {
      position: relative;
+      top:-62px;
      width: 301px;
      height: 467px;
      background: url("../../assets/intoApproval/top.png") no-repeat;

--- a/src/pages/financingTrial/financing-details.vue
+++ b/src/pages/financingTrial/financing-details.vue
@@ -21,7 +21,7 @@
        </item>
        <item>
          <div slot="name" class="font-color">设备总价</div>
-          <CurrencyInput slot="content" v-model="equip_price" placeholder="请输入设备总价" />
+          <CurrencyInput slot="content" v-model="equip_price" :allCheck="equip_price" placeholder="请输入设备总价" />
        </item>
        <item>
          <div slot="name" class="font-color">融资金额</div>
@@ -263,6 +263,8 @@ export default {
          hlsPopup.showLongCenter('请输入GPS费用')
        } else if (!this.insurance_fee) {
          hlsPopup.showLongCenter('请输入保险押金费用')
+        } else if (this.equip_price < 1000) {
+          hlsPopup.showLongCenter('设备总价不能小于1000元!')
        } else {
          let vm = this
          let url = $config.basePath + 'prd_calculation_save'

--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -128,7 +128,7 @@ export default {
      let vm = this
      let url = process.env.loginPath + 'appadmin'
      let param = {}
-      // vm.hlsPopup.showLoading('请稍等')
+      vm.hlsPopup.showLoading('请稍等')
      let res = await vm.$post(url, param)
      //  vm.hlsPopup.hideLoading()
      if (res) {

--- a/src/pages/messageCenter/message-list.vue
+++ b/src/pages/messageCenter/message-list.vue
@@ -55,7 +55,7 @@
      </section>
      <!-- </h-content> -->
    </scroll>
-    <div v-if="list.length===0">
+    <div v-if="list.length===0" style="height:100%">
      <div class="display">
        <img src="@/assets/messageCenter/noMsg.png" alt="">
      </div>
@@ -205,6 +205,7 @@ export default {
  .display {
    position: fixed;
    top: 0;
+    height:100%;
    img {
      width: 100%;
      height: 100%;

--- a/src/pages/pwd-forgotten.vue
+++ b/src/pages/pwd-forgotten.vue
@@ -190,8 +190,8 @@ export default {
    },
    getVerifiedCode () {
      let vm = this
-      hlsPopup.showLongCenter('测试验证码为123456')
-      /* let url = process.env.basePath + 'sms_verify_post'
+      // hlsPopup.showLongCenter('测试验证码为123456')
+      let url = process.env.basePath + 'sms_verify_post'
      let signcode = ('000000' + Math.floor(Math.random() * 999999)).slice(-6)
      vm.captchaKey = signcode
      let param = {
@@ -206,7 +206,7 @@ export default {
        } else {
          vm.hlsPopup.showLongCenter(res.message)
        }
-      }) */
+      })
    },
  },
 }

--- a/src/pages/regiester2.vue
+++ b/src/pages/regiester2.vue
@@ -226,8 +226,8 @@ export default {
    },
    getVerifiedCode () {
      let vm = this
-      hlsPopup.showLongCenter('测试验证码为123456')
-      /* let url = process.env.basePath + 'sms_verify_post'
+      // hlsPopup.showLongCenter('测试验证码为123456')
+      let url = process.env.basePath + 'sms_verify_post'
      let signcode = ('000000' + Math.floor(Math.random() * 999999)).slice(-6)
      vm.captchaKey = signcode
      let param = {
@@ -242,7 +242,7 @@ export default {
        } else {
          vm.hlsPopup.showLongCenter(res.message)
        }
-      }) */
+      })
    },
  },
 }

--- a/src/pages/userBindNew/np/accessory-info.vue
+++ b/src/pages/userBindNew/np/accessory-info.vue
@@ -60,7 +60,9 @@
              </item>
              <item>
                <div slot="name">房屋坐落</div>
-                <input slot="content" v-model="hauseInfo.house_located" placeholder="识别房产证自动填充" >
+                <textarea
+                  slot="content" v-model="hauseInfo.house_located" cols="22" rows="1"
+                  placeholder="识别房产证自动填充" @input="addRow(hauseInfo.house_located,$event)" />
              </item>
              <item>
                <div slot="name">登记时间</div>
@@ -131,7 +133,9 @@
              </item>
              <item>
                <div slot="name">住址</div>
-                <input slot="content" v-model="carInfo.address" placeholder="识别行驶证自动填充" >
+                <textarea
+                  slot="content" v-model="carInfo.address" cols="22" rows="1"
+                  placeholder="识别行驶证自动填充" @input="addRow(carInfo.address,$event)" />
              </item>
              <item>
                <div slot="name">品牌型号</div>
@@ -199,53 +203,53 @@
              <item>
                <div slot="name">坐落</div>
                <textarea
-                  slot="content" v-model="propertyInfo.house_located" cols="25" rows="2"
+                  slot="content" v-model="propertyInfo.house_located" cols="22" rows="1"
                  contenteditable="true"
                  placeholder="识别不动产权证自动填充"
-                  @input="addRow" />
+                  @input="addRow(propertyInfo.house_located,$event)" />
              </item>
              <item>
                <div slot="name">不动产单元号</div>
                <textarea
-                  slot="content" v-model="propertyInfo.real_unit_number" cols="25" rows="2"
+                  slot="content" v-model="propertyInfo.real_unit_number" cols="22" rows="1"
                  placeholder="识别不动产权证自动填充"
-                  @input="addRow"/>
+                  @input="addRow(propertyInfo.real_unit_number,$event)"/>
              </item>
              <item>
                <div slot="name">权利类型</div>
                <textarea
-                  slot="content" v-model="propertyInfo.right_type" cols="25" rows="2"
-                  placeholder="识别不动产权证自动填充" @input="addRow"/>
+                  slot="content" v-model="propertyInfo.right_type" cols="22" rows="1"
+                  placeholder="识别不动产权证自动填充" @input="addRow(propertyInfo.right_type,$event)"/>
              </item>
              <item>
                <div slot="name">权利性质</div>
                <textarea
-                  slot="content" v-model="propertyInfo.right_property" cols="25" rows="2"
-                  placeholder="识别不动产权证自动填充" @input="addRow"/>
+                  slot="content" v-model="propertyInfo.right_property" cols="22" rows="1"
+                  placeholder="识别不动产权证自动填充" @input="addRow(propertyInfo.right_property,$event)"/>
              </item>
              <item>
                <div slot="name">用途</div>
                <textarea
-                  slot="content" v-model="propertyInfo.house_purpose" cols="25" rows="2"
-                  placeholder="识别不动产权证自动填充" @input="addRow"/>
+                  slot="content" v-model="propertyInfo.house_purpose" cols="22" rows="1"
+                  placeholder="识别不动产权证自动填充" @input="addRow(propertyInfo.house_purpose,$event)"/>
              </item>
              <item>
                <div slot="name">面积</div>
                <textarea
-                  slot="content" v-model="propertyInfo.house_area" cols="25" rows="2"
-                  placeholder="识别不动产权证自动填充" @input="addRow"/>
+                  slot="content" v-model="propertyInfo.house_area" cols="22" rows="1"
+                  placeholder="识别不动产权证自动填充" @input="addRow(propertyInfo.house_area,$event)"/>
              </item>
              <item>
                <div slot="name">使用期限</div>
                <textarea
-                  slot="content" v-model="propertyInfo.land_use_limit" cols="25" rows="2"
-                  placeholder="识别不动产权证自动填充" @input="addRow"/>
+                  slot="content" v-model="propertyInfo.land_use_limit" cols="22" rows="1"
+                  placeholder="识别不动产权证自动填充" @input="addRow(propertyInfo.land_use_limit,$event)"/>
              </item>
              <item>
                <div slot="name">权利其他状况</div>
                <textarea
-                  slot="content" v-model="propertyInfo.right_others" cols="25" rows="2"
-                  placeholder="识别不动产权证自动填充" @input="addRow"/>
+                  slot="content" v-model="propertyInfo.right_others" cols="22" rows="1"
+                  placeholder="识别不动产权证自动填充" @input="addRow(propertyInfo.right_others,$event)"/>
              </item>
            </list-item>
          </div>
@@ -456,17 +460,25 @@ export default {
  updated () {
    let myArea = document.querySelectorAll('textarea')
    myArea.forEach(i => {
-      let num = Math.round((i.scrollHeight - 42) / 20)
+      let num = Math.ceil((i.scrollHeight - 42) / 20)
      if (num > 0) {
        i.rows = num + 2
      }
    })
  },
  methods: {
-    addRow (el) {
-      let num = Math.round((el.target.scrollHeight - 42) / 20)
-      if (num > 0) {
-        el.target.rows = num + 2
+    addRow (e, event) {
+      // let num = Math.ceil((el.target.scrollHeight - 42) / 20)
+      // if (num > 0) {
+      //   el.target.rows = num + 2
+      // }
+      if (e) {
+        let addNum = Math.ceil(e.length / 16)
+        if (addNum === 0) {
+          event.target.rows = 1
+        } else if (addNum >= addNum - 1 && addNum < addNum + 1) {
+          event.target.rows = addNum + 1
+        }
      }
    },
    async saveEstateInfo () {
@@ -1078,6 +1090,13 @@ export default {
 </script>
 <style lang="less">
 #accessory {
+  textarea{
+    color: #666;
+    resize: none;
+  }
+    textarea::placeholder{
+    text-align: right;
+  }
  .userInfo {
    height: 45px;
    line-height: 45px;

--- a/src/pages/userBindNew/np/base-info.vue
+++ b/src/pages/userBindNew/np/base-info.vue
@@ -1338,20 +1338,24 @@ export default {
      })
    },
    addRows (e) {
-      let addNum = parseInt(e.length / 16)
+      if (e) {
+        let addNum = Math.ceil(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 (e) {
+        let addNum = Math.ceil(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
        }
+      }
    },
    selectIdType () {
      let vm = this
@@ -1628,6 +1632,7 @@ export default {
  textarea {
    text-align: right;
    color: #666;
+    resize: none;
  }
  .add-people{
    display: flex;

--- a/src/pages/userBindNew/np/invoice-info.vue
+++ b/src/pages/userBindNew/np/invoice-info.vue
@@ -120,8 +120,6 @@ export default {
  created () {
    this.getInvoiceType()
    this.getTaxpayer()
-    this.addRows(this.invoiceInfo.invoice_adds)
-    this.addRowsLive(this.invoiceInfo.open_bank)
  },
  methods: {
    getInvoice () {
@@ -135,10 +133,11 @@ export default {
        vm.hlsPopup.hideLoading()
        if (res.result === 'S') {
          vm.invoiceInfo = res.info
-          console.log(111111111111111111, res.info.invoice_title)
          if (res.info.invoice_title == '' || res.info.invoice_title == null || res.info.invoice_title == undefined) {
            vm.invoiceInfo.invoice_title = window.localStorage.bp_name
          }
+          vm.addRows(vm.invoiceInfo.invoice_adds)
+          vm.addRowsLive(vm.invoiceInfo.open_bank)
        } else {
          hlsPopup.showLongCenter(res.message)
        }
@@ -166,20 +165,24 @@ export default {
      })
    },
    addRows (e) {
-      let addNum = parseInt(e.length / 16)
+      if (e) {
+        let addNum = Math.ceil(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 (e) {
+        let addNum = Math.ceil(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
@@ -256,6 +259,7 @@ input::placeholder{
  textarea {
    text-align: right;
    color:#666;
+    resize: none;
  }
  .save {
    color: #fff;

--- a/src/pages/userBindNew/org/baseInfo.vue
+++ b/src/pages/userBindNew/org/baseInfo.vue
@@ -874,28 +874,34 @@ export default {
    //   })
    // },
    addRows (e) {
-      let addNum = parseInt(e.length / 16)
+      if (e) {
+        let addNum = Math.ceil(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 (e) {
+        let addNum = Math.ceil(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
        }
+      }
    },
    addAddressRows (e) {
-      let addNum = parseInt(e.length / 16)
+      if (e) {
+        let addNum = Math.ceil(e.length / 16)
        if (addNum === 0) {
          this.$refs.address.rows = 1
        } else if (addNum >= addNum - 1 && addNum < addNum + 1) {
          this.$refs.address.rows = addNum + 1
        }
+      }
    },
    handSubmit () {
      let bp_id = this.from ? this.$route.params.bp_id : this.bp_id
@@ -1459,8 +1465,9 @@ export default {
          vm.legal_personMsg.id_card_date_from = res.info.id_card_date_from
          vm.legal_personMsg.id_card_date_to = res.info.id_card_date_to
          Object.assign(vm.saveInfo, res.info)
-          vm.addRows(vm.baseInfo.registered_place)
-          vm.addRowsLive(vm.baseInfo.business_address)
+          vm.addRows(res.info.registered_place)
+          vm.addRowsLive(res.info.business_address)
+          vm.addAddressRows(res.info.living_address)
          if (vm.baseInfo.auth_flag === '是') {
            vm.flag = false
          } else if (vm.baseInfo.auth_flag === '否') {
@@ -1977,6 +1984,7 @@ export default {
      // height: 28px;
      text-align: right;
      color: #666;
+      resize: none;
      // padding-top:16px;
    }
    .add-people{

--- a/src/pages/userBindNew/org/enclosure.vue
+++ b/src/pages/userBindNew/org/enclosure.vue
@@ -51,11 +51,13 @@
              </item>
              <item>
                <div slot="name">房屋坐落</div>
-                <input
+                <textarea
                  slot="content"
                  v-model="hauseInfo.house_located"
+                  cols="22" rows="1"
                  placeholder="识别房产证自动填充"
-                >
+                  @input="addRow(hauseInfo.house_located,$enent)"
+                />
              </item>
              <item>
                <div slot="name">登记时间</div>
@@ -170,53 +172,53 @@
              <item>
                <div slot="name">坐落</div>
                <textarea
-                  slot="content" v-model="propertyInfo.house_located" cols="25" rows="2"
+                  slot="content" v-model="propertyInfo.house_located" cols="22" rows="1"
                  contenteditable="true"
                  placeholder="识别不动产权证自动填充"
-                  @input="addRow" />
+                  @input="addRow(propertyInfo.house_located,$event)" />
              </item>
              <item>
                <div slot="name">不动产单元号</div>
                <textarea
-                  slot="content" v-model="propertyInfo.real_unit_number" cols="25" rows="2"
+                  slot="content" v-model="propertyInfo.real_unit_number" cols="22" rows="1"
                  placeholder="识别不动产权证自动填充"
-                  @input="addRow"/>
+                  @input="addRow(propertyInfo.real_unit_number,$event)"/>
              </item>
              <item>
                <div slot="name">权利类型</div>
                <textarea
-                  slot="content" v-model="propertyInfo.right_type" cols="25" rows="2"
-                  placeholder="识别不动产权证自动填充" @input="addRow"/>
+                  slot="content" v-model="propertyInfo.right_type" cols="22" rows="1"
+                  placeholder="识别不动产权证自动填充" @input="addRow(propertyInfo.right_type,$event)"/>
              </item>
              <item>
                <div slot="name">权利性质</div>
                <textarea
-                  slot="content" v-model="propertyInfo.right_property" cols="25" rows="2"
-                  placeholder="识别不动产权证自动填充" @input="addRow"/>
+                  slot="content" v-model="propertyInfo.right_property" cols="22" rows="1"
+                  placeholder="识别不动产权证自动填充" @input="addRow(propertyInfo.right_property,$event)"/>
              </item>
              <item>
                <div slot="name">用途</div>
                <textarea
-                  slot="content" v-model="propertyInfo.house_purpose" cols="25" rows="2"
-                  placeholder="识别不动产权证自动填充" @input="addRow"/>
+                  slot="content" v-model="propertyInfo.house_purpose" cols="22" rows="2"
+                  placeholder="识别不动产权证自动填充" @input="addRow(propertyInfo.house_purpose,$event)"/>
              </item>
              <item>
                <div slot="name">面积</div>
                <textarea
-                  slot="content" v-model="propertyInfo.house_area" cols="25" rows="2"
-                  placeholder="识别不动产权证自动填充" @input="addRow"/>
+                  slot="content" v-model="propertyInfo.house_area" cols="22" rows="2"
+                  placeholder="识别不动产权证自动填充" @input="addRow(propertyInfo.house_area,$event)"/>
              </item>
              <item>
                <div slot="name">使用期限</div>
                <textarea
-                  slot="content" v-model="propertyInfo.land_use_limit" cols="25" rows="2"
-                  placeholder="识别不动产权证自动填充" @input="addRow"/>
+                  slot="content" v-model="propertyInfo.land_use_limit" cols="22" rows="2"
+                  placeholder="识别不动产权证自动填充" @input="addRow(propertyInfo.land_use_limit,$event)"/>
              </item>
              <item>
                <div slot="name">权利其他状况</div>
                <textarea
-                  slot="content" v-model="propertyInfo.right_others" cols="25" rows="2"
-                  placeholder="识别不动产权证自动填充" @input="addRow"/>
+                  slot="content" v-model="propertyInfo.right_others" cols="22" rows="2"
+                  placeholder="识别不动产权证自动填充" @input="addRow(propertyInfo.right_others,$event)"/>
              </item>
            </list-item>
          </div>
@@ -246,7 +248,9 @@
              </item>
              <item>
                <div slot="name">住址</div>
-                <input slot="content" v-model="carInfo.address" placeholder="识别行驶证自动填充" >
+                <textarea
+                  slot="content" v-model="carInfo.address" cols="22" rows="2"
+                  placeholder="识别行驶证自动填充" @input="addRow(carInfo.address,$event)" />
              </item>
              <item>
                <div slot="name">品牌型号</div>
@@ -542,7 +546,7 @@ export default {
  updated () {
    let myArea = document.querySelectorAll('textarea')
    myArea.forEach(i => {
-      let num = Math.round((i.scrollHeight - 42) / 20)
+      let num = Math.ceil((i.scrollHeight - 42) / 20)
      if (num > 0) {
        i.rows = num + 2
      }
@@ -566,10 +570,18 @@ export default {
        }
      })
    },
-    addRow (el) {
-      let num = Math.round((el.target.scrollHeight - 42) / 20)
-      if (num > 0) {
-        el.target.rows = num + 2
+    addRow (e, event) {
+      // let num = Math.ceil((el.target.scrollHeight - 42) / 20)
+      // if (num > 0) {
+      //   el.target.rows = num + 2
+      // }
+      if (e) {
+        let addNum = Math.ceil(e.length / 16)
+        if (addNum === 0) {
+          event.target.rows = 1
+        } else if (addNum >= addNum - 1 && addNum < addNum + 1) {
+          event.target.rows = addNum + 1
+        }
      }
    },
    // 房产证信息查询
@@ -1204,7 +1216,13 @@ export default {
 </script>
 <style lang='less'>
 #enclosure {
-
+  textarea{
+    color:#666;
+    resize: none;
+  }
+  textarea::placeholder{
+    text-align: right;
+  }
    .footer-button {
      padding-top: 15px;
      padding-bottom: 15px;

--- a/src/pages/userBindNew/org/invoice.vue
+++ b/src/pages/userBindNew/org/invoice.vue
@@ -53,7 +53,7 @@
      </item>
      <item>
        <div slot="name" class="font-color">发票开户行</div>
-        <input
+        <textarea
          slot="content"
          ref="myTestareaLive"
          v-model="invoiceInfo.open_bank"
@@ -62,7 +62,7 @@
          type="text"
          placeholder="请输入发票开户行"
          @input="addRowsLive(invoiceInfo.open_bank)"
-        >
+        />
      </item>
      <item>
        <div slot="name" class="font-color">开户行账号</div>
@@ -155,8 +155,6 @@ export default {
    let vm = this
    vm.getInvoiceType()
    vm.getTaxpayer()
-    vm.addRows(this.invoiceInfo.invoice_adds)
-    vm.addRowsLive(this.invoiceInfo.open_bank)
  },
  methods: {
    invoiceQuery () {
@@ -173,25 +171,31 @@ export default {
          vm.invoiceInfo = res.info
          vm.invoiceInfo.invoice_title = vm.$route.params.bp_name
          // Object.assign(vm.invoiceInfo, res.info)
+          vm.addRows(vm.invoiceInfo.invoice_adds)
+          vm.addRowsLive(vm.invoiceInfo.open_bank)
        }
      })
    },

    addRows (e) {
-      let addNum = parseInt(e.length / 16)
+      if (e) {
+        let addNum = Math.ceil(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 (e) {
+        let addNum = Math.ceil(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
@@ -305,6 +309,7 @@ export default {
  textarea {
    text-align: right;
    color:#666;
+    resize: none;
  }
  .footer-button {
      padding-top: 15px;

--- a/www/index.html
+++ b/www/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.707f96ae4ea85f70381b52114df09627.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.6a178e8d77c32e3c385d.js></script><script type=text/javascript src=./static/js/vendor.8a1ae113e3b5262701ed.js></script><script type=text/javascript src=./static/js/app.14524008c8e0d22e959f.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.d5a3f8bf114c9ae887d402e363f38c92.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.6a178e8d77c32e3c385d.js></script><script type=text/javascript src=./static/js/vendor.ea346998502d0674468b.js></script><script type=text/javascript src=./static/js/app.cae4d8c70148fb844d09.js></script></body></html>
\ No newline at end of file