'问题修复'

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_DEV&apiName="',
   appId: '"com.xcmg.app.dev"',
-  currentVersion: '"1.3.0"'
+  currentVersion: '"1.3.1"'
 }

src/pages/carConfirm/confirm-detail.vue

@@ -262,7 +262,7 @@ export default {
         data_class: 'LEASE_ITEM',
       }
       vm.hlsPopup.showLoading('请稍后!')
-      let res = vm.hlsHttp.post(url, param)
+      let res = await vm.hlsHttp.post(url, param)
       vm.hlsPopup.hideLoading()
       if (res.result === 'S') {
         return true

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

@@ -534,6 +534,7 @@ export default {
           if (res.result === 'S') {
             vm.isComputed = true
             vm.calculeFlag = true
+            vm.saveTed = true
             hlsPopup.showLongCenter('计算成功')
             vm.goPlan()
           } else {
@@ -571,7 +572,6 @@ export default {
         })
       } else {
         if (vm.isComputed) {
-          vm.saveTed = true
           vm.$router.push({
             name: 'CreateEnclosureInfo',
           })

src/pages/contractSigning/contract-detail.vue

@@ -445,14 +445,14 @@ export default {
     // 签约校验
     async signCheck () {
       let vm = this
+      hlsPopup.showLoading('请稍候')
       let url = process.env.basePath + 'sign_check'
       let param = {
         confirm_id: vm.confirm_id,
         data_class: 'PRJ_PROJECT',
       }
-      vm.hlsPopup.showLoading('请稍后!')
-      let res = vm.hlsHttp.post(url, param)
-      vm.hlsPopup.hideLoading()
+      let res = await vm.hlsHttp.post(url, param)
+      hlsPopup.hideLoading()
       if (res.result === 'S') {
         return true
       } else {

src/pages/distributorSign/contract-details.vue

@@ -270,7 +270,7 @@ export default {
         data_class: 'PRJ_PROJECT',
       }
       vm.hlsPopup.showLoading('请稍后!')
-      let res = vm.hlsHttp.post(url, param)
+      let res = await vm.hlsHttp.post(url, param)
       vm.hlsPopup.hideLoading()
       if (res.result === 'S') {
         return true

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

@@ -436,7 +436,6 @@ export default {
   beforeRouteEnter (to, from, next) {
     // 绑定查询入口
     next(vm => {
-      if (from.fullPath === '/tab/my-info') {
       vm.list = {}
       vm.multiBpType = {}
       vm.upload_list = [] // 上传图片列表
@@ -465,6 +464,8 @@ export default {
       vm.idCardFrontSpEditFlag = false // 配偶身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
       vm.idCardBackSpEditFlag = false // 配偶身份证反面修改标识，为true则标识已修改，后续需要重新上传此照片
       vm.isClear = false
+      if (from.fullPath === '/tab/my-info') {
+
         vm.from = true
         vm.basicInfoQuery()
         vm.loadItemList() // 附件查询

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

@@ -210,8 +210,10 @@ export default {
         code: 'bp_type',
         object: {},
         returnItem: function (index, obj) {
-          vm.invoiceInfo.invoice_kind = obj.bp_type
-          vm.invoiceInfo.invoice_kind_n = obj.bp_type_n
+          vm.$set(vm.invoiceInfo,'invoice_kind',obj.bp_type)
+          vm.$set(vm.invoiceInfo,'invoice_kind_n',obj.bp_type_n)
+          /*vm.invoiceInfo.invoice_kind = obj.bp_type
+          vm.invoiceInfo.invoice_kind_n = obj.bp_type_n*/
         },
       })
     },
@@ -222,8 +224,10 @@ export default {
         code: 'bp_type',
         object: {},
         returnItem: function (index, obj) {
-          vm.invoiceInfo.taxpayer_type = obj.bp_type
-          vm.invoiceInfo.taxpayer_type_n = obj.bp_type_n
+          vm.$set(vm.invoiceInfo,'taxpayer_type',obj.bp_type)
+          vm.$set(vm.invoiceInfo,'taxpayer_type_n',obj.bp_type_n)
+         /* vm.invoiceInfo.taxpayer_type = obj.bp_type
+          vm.invoiceInfo.taxpayer_type_n = obj.bp_type_n*/
         },
       })
     },

src/pages/userBindNew/org/baseInfo.vue

@@ -227,7 +227,7 @@
             <div slot="name" class="font-color required">姓名</div>
             <input
               slot="content"
-              v-model="baseInfo.legal_person"
+              v-model="legal_personMsg.bp_legal_name"
               readonly
               placeholder="上传身份证自动填充"
               class="auto"
@@ -451,7 +451,7 @@ export default {
       },
       legal_personMsg: {
         id_card_no: null,
-        // legal_person: '',
+        bp_legal_name: '',
         cell_phone: window.localStorage.getItem('user_phone'),
         living_address: '',
         id_card_date_from: '', // 法定代表人身份证有效期从
@@ -567,18 +567,10 @@ export default {
   created () {},
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.getBpType()
-      vm.getProvince()
-      if (vm.$route.params.status === 'APPROVED') {
-        vm.isApproved = true
-        window.localStorage.setItem('isApproved', vm.isApproved)
-      }
-      if (from.fullPath === '/tab/my-info') { /* || from.fullPath === '/margin-first-pay' */
       vm.legal_personMsg = {}
       vm.baseInfo = {}
       vm.bank_lists = {}
       vm.authMsg = {}
-        vm.bp_id = vm.$route.params.bp_id
       vm.idCardFront = '' // 身份证正面图片
       vm.idCardBack = '' // 身份证反面图片
       vm.authidCardFront = '' // 授权人身份证正面图片
@@ -587,7 +579,6 @@ export default {
       vm.laImg = '' // 授权书图片
       vm.upload_list = [] // 上传图片列表
       vm.dowload_list = [] // 下载图片列表
-        vm.from = true
 
       vm.idCardFrontEditFlag = false // 身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
       vm.idCardBackEditFlag = false // 身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
@@ -603,6 +594,15 @@ export default {
       vm.authidCardBackUrlFlag = false // 授权人身份证反面图片，为false则用查询出来的，为true则用拍照出来的
       vm.licenseImgUrlFlag = false // 营业执照照片，为false则用查询出来的，为true则用拍照出来的
       vm.laImgUrlFlag = false // 授权书图片，为false则用查询出来的，为true则用拍照出来的
+      vm.getBpType()
+      vm.getProvince()
+      if (vm.$route.params.status === 'APPROVED') {
+        vm.isApproved = true
+        window.localStorage.setItem('isApproved', vm.isApproved)
+      }
+      if (from.fullPath === '/tab/my-info') { /* || from.fullPath === '/margin-first-pay' */
+        vm.bp_id = vm.$route.params.bp_id
+        vm.from = true
         vm.getbaseInfo()
       }
     })
@@ -794,6 +794,9 @@ export default {
               case 'living_address':
                 vm.hlsPopup.showLongCenter('联系地址未填写')
                 break
+              case 'bp_legal_name':
+                vm.hlsPopup.showLongCenter('法定代表人姓名未填写')
+                break
               case 'id_card_date_from':
                 vm.hlsPopup.showLongCenter('身份证有效期从未填写')
                 break
@@ -887,6 +890,15 @@ export default {
               case 'living_address':
                 vm.hlsPopup.showLongCenter('联系地址未填写')
                 break
+              case 'bp_legal_name':
+                vm.hlsPopup.showLongCenter('法定代表人姓名未填写')
+                break
+              case 'id_card_date_from':
+                vm.hlsPopup.showLongCenter('身份证有效期从未填写')
+                break
+              case 'id_card_date_to':
+                vm.hlsPopup.showLongCenter('身份证有效期到未填写')
+                break
               case 'auth_person_name':
                 vm.hlsPopup.showLongCenter('授权人姓名未填写')
                 break
@@ -1260,7 +1272,7 @@ export default {
         let result = res.result.words_result
         if (cardType === 'idCard') { // 法定代表人
           // 未授权 姓名，身份证号
-          vm.baseInfo.legal_person = result.姓名.words
+          vm.legal_personMsg.bp_legal_name = result.姓名.words
           vm.legal_personMsg.id_card_no = result.公民身份号码.words
           vm.legal_personMsg.living_address = result.住址.words // 联系地址默认为户籍地址，支持修改
         } else { // 授权人

src/pages/userBindNew/org/enclosure.vue

@@ -606,10 +606,11 @@ export default {
       // vm.hauseInfo.regist_date.substr(0, 10)
       console.log('regist_date', vm.hauseInfo.regist_date)
       let param = {
-        master: {
+        /*master: {
           ...vm.hauseInfo,
           regist_date: vm.hauseInfo.regist_date.substr(0, 10),
-        },
+        },*/
+        master: vm.hauseInfo,
       }
       // hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {

src/pages/userBindNew/org/invoice.vue

@@ -106,7 +106,15 @@ export default {
   watch: {},
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      if (from.name === 'EnterpriseNew') {
+      if (from.name === 'EnterpriseNew' && vm.$route.params.from) {
+        vm.invoiceInfo = {}
+        vm.invoiceInfo.invoice_title = vm.$route.params.bp_name
+        vm.invoiceInfo.organization_code = vm.$route.params.organization_code
+        vm.bp_id = vm.$route.params.bp_id
+        vm.invoiceQuery() // 开票信息查询
+      }
+
+  /*    if (from.name === 'EnterpriseNew') {
         vm.invoiceInfo = {
           invoice_kind: '',
           invoice_kind_n: '',
@@ -129,10 +137,16 @@ export default {
         }
         vm.addRows(this.invoiceInfo.invoice_adds)
         vm.addRowsLive(this.invoiceInfo.open_bank)
-      }
+      }*/
     })
   },
-  created () {},
+  created () {
+    let vm = this
+    vm.getInvoiceType()
+    vm.getTaxpayer()
+    vm.addRows(this.invoiceInfo.invoice_adds)
+    vm.addRowsLive(this.invoiceInfo.open_bank)
+  },
   methods: {
     invoiceQuery () {
       let vm = this
@@ -210,8 +224,10 @@ export default {
         code: 'bp_type',
         object: {},
         returnItem: function (index, obj) {
-          vm.invoiceInfo.taxpayer_type = obj.bp_type
-          vm.invoiceInfo.taxpayer_type_n = obj.bp_type_n
+          vm.$set(vm.invoiceInfo,'taxpayer_type',obj.bp_type)
+          vm.$set(vm.invoiceInfo,'taxpayer_type_n',obj.bp_type_n)
+          /*vm.invoiceInfo.taxpayer_type = obj.bp_type
+          vm.invoiceInfo.taxpayer_type_n = obj.bp_type_n*/
           console.log('obj', vm.invoiceInfo)
         },
       })
@@ -223,8 +239,10 @@ export default {
         code: 'bp_type',
         object: {},
         returnItem: function (index, obj) {
-          vm.invoiceInfo.invoice_kind = obj.bp_type
-          vm.invoiceInfo.invoice_kind_n = obj.bp_type_n
+          vm.$set(vm.invoiceInfo,'invoice_kind',obj.bp_type)
+          vm.$set(vm.invoiceInfo,'invoice_kind_n',obj.bp_type_n)
+         /* vm.invoiceInfo.invoice_kind = obj.bp_type
+          vm.invoiceInfo.invoice_kind_n = obj.bp_type_n*/
         },
       })
     },

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=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><title>徐工融租</title><link href=./static/css/app.e1a954234ecfa2e357323fe5dde2c88d.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.e547499500fbe65e7169.js></script><script type=text/javascript src=./static/js/app.6e623f9e401b71e7cae0.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=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><title>徐工融租</title><link href=./static/css/app.e1a954234ecfa2e357323fe5dde2c88d.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.e547499500fbe65e7169.js></script><script type=text/javascript src=./static/js/app.54672855f21e2d17bbd5.js></script></body></html>
\ No newline at end of file