Merge branch 'liuin' into uat

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

@@ -640,7 +640,7 @@ export default {
       }
       vm.hlsPopup.showLoading('请稍候')
       vm.hlsHttp.post(url, param).then(function (res) {
-        // vm.hlsPopup.hideLoading()
+        vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.hlsPopup.showSuccess('提交成功')
           vm.$router.push({

src/pages/distributorSign/contract-list.vue

@@ -9,7 +9,7 @@
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
         <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
-        <span>经销商签约</span>
+        <span>合同签约</span>
       </div>
     </h-header>
     <div class="tab-style has-header">

src/pages/distributorSign/details-tab.vue

@@ -5,7 +5,7 @@
     <div :class="{'tab-content-bg':tabNum == 1}" class="tab-content" @click="tabNum = 1;sendTabNum()"><img :src="tabNum == 1?trial:untrial"><span
       :class="{'colored':tabNum == 1}">租赁信息</span></div>
     <div :class="{'tab-content-bg':tabNum == 2}" class="tab-content" @click="tabNum = 2;sendTabNum()"><img :src="tabNum == 2?sign:unsigned"><span
-      :class="{'colored':tabNum == 2}">担保协议</span></div>
+      :class="{'colored':tabNum == 2}">合同文本</span></div>
   </div>
 </template>
 <script>

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

@@ -166,22 +166,46 @@ export default {
     },
     addRows (e) {
       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
+        // 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
+        // }
+        let len = 0
+        for (let i = 0; i < e.length; i++) {
+          var c = e.charCodeAt(i)
+          // 统计字符串的字符长度
+          if ((c >= 0x0001 && c <= 0x007e) || (c >= 0xff60 && c <= 0xff9f)) {
+            len += 1
+          } else {
+            len += 2
+          }
         }
+        let addNum = Math.ceil(len / 21)
+        this.$refs.myTestarea.rows = addNum
       }
     },
     addRowsLive (e) {
       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
+        // 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
+        // }
+        let len = 0
+        for (let i = 0; i < e.length; i++) {
+          var c = e.charCodeAt(i)
+          // 统计字符串的字符长度
+          if ((c >= 0x0001 && c <= 0x007e) || (c >= 0xff60 && c <= 0xff9f)) {
+            len += 1
+          } else {
+            len += 2
+          }
         }
+        let addNum = Math.ceil(len / 21)
+        this.$refs.myTestareaLive.rows = addNum
       }
     },
     getInvoiceType () {

src/pages/userBindNew/org/baseInfo.vue

@@ -944,7 +944,7 @@ export default {
       let vm = this
       var business_num = ''
       if (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA') {
-        business_num = vm.baseInfo.agent_username
+        let business_num = vm.baseInfo.agent_username
       }
       window.localStorage.setItem('business_num', business_num)
       let url = process.env.basePath + 'bp_bind_check'
@@ -1629,8 +1629,14 @@ export default {
         vm.baseInfo.registered_capital = result.注册资本.words
         vm.baseInfo.legal_person = result.法人.words
         vm.baseInfo.registered_place = result.地址.words
-        vm.baseInfo.organization_code = result.社会信用代码.words
         vm.baseInfo.business_address = vm.baseInfo.registered_place // 经营地址默认为注册地址，支持修改
+
+        if (result.社会信用代码.words.includes('(')) {
+          let index = res.info.organization_code.indexOf('(')
+          vm.baseInfo.organization_code = (result.社会信用代码.words.substring(0, index)).trim()
+        } else {
+          vm.baseInfo.organization_code = result.社会信用代码.words
+        }
       })
     },
     load_picture (check_id, index, cdd_item) {

src/pages/userBindNew/org/invoice.vue

@@ -179,22 +179,46 @@ export default {
 
     addRows (e) {
       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
+        // 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
+        // }
+        let len = 0
+        for (let i = 0; i < e.length; i++) {
+          var c = e.charCodeAt(i)
+          // 统计字符串的字符长度
+          if ((c >= 0x0001 && c <= 0x007e) || (c >= 0xff60 && c <= 0xff9f)) {
+            len += 1
+          } else {
+            len += 2
+          }
         }
+        let addNum = Math.ceil(len / 21)
+        this.$refs.myTestarea.rows = addNum
       }
     },
     addRowsLive (e) {
       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
+        // 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
+        // }
+        let len = 0
+        for (let i = 0; i < e.length; i++) {
+          var c = e.charCodeAt(i)
+          // 统计字符串的字符长度
+          if ((c >= 0x0001 && c <= 0x007e) || (c >= 0xff60 && c <= 0xff9f)) {
+            len += 1
+          } else {
+            len += 2
+          }
         }
+        let addNum = Math.ceil(len / 21)
+        this.$refs.myTestareaLive.rows = addNum
       }
     },
     getInvoiceType () {