'1.4'

fd107659 · 李晓兵 · e5799e19 · fd107659 · fd107659 · fd107659
Commit fd107659 authored Jan 04, 2020 by 李晓兵
7 changed files
--- 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_DEV&apiName="',
  appId: '"com.xcmg.app.dev"',
-  currentVersion: '"1.3.5"'
+  currentVersion: '"1.3.6"'
 }
--- a/src/pages/contractCreate/create-enclosure-info.vue
+++ b/src/pages/contractCreate/create-enclosure-info.vue
@@ -94,14 +94,15 @@
            </div>
          </div>
        </div>
-        <div class="card-upload plus" @click="ocrShow('特批申请书',checkId)">
+        <div class="card-upload plus" v-if="!isReadOnly" @click="ocrShow('特批申请书',checkId)">
          <img src="@/assets/userBind/camera.png" class="upload-btn" >
        </div>
      </div>
    </h-content>
    <bottom-tab class="add-box">
-      <tab-button class="before" @click.native="handSave">保存</tab-button>
-      <tab-button class="next" @click.native="isSubmit">提交</tab-button>
+      <tab-button v-if="!isReadOnly" class="before" @click.native="handSave">保存</tab-button>
+      <tab-button v-if="!isReadOnly" class="next" @click.native="isSubmit">提交</tab-button>
+      <tab-button v-if="isReadOnly" class="before" @click.native="$routeGo()">上一步</tab-button>
    </bottom-tab>
  </h-view>
 </template>
@@ -131,6 +132,8 @@ export default {
      license_id: '',
      status: '', // 审批状态
      bpClass: '',
+      isReadOnly: false, // 是否只读
+      fromPage: window.localStorage.fromPage,
    }
  },
  watch: {
@@ -152,6 +155,15 @@ export default {
        vm.status = window.localStorage.user_bp_status
        vm.loadItemList()
        vm.queryCheckId()
+        if (vm.fromPage === 'sale') {
+          vm.isReadOnly = false
+        } else if (vm.fromPage === 'list') {
+          if (window.localStorage.contractReadonly === 'true') {
+            vm.isReadOnly = true
+          } else {
+            vm.isReadOnly = false
+          }
+        }
      }
    })
  },

--- a/src/pages/contractCreate/sales-info.vue
+++ b/src/pages/contractCreate/sales-info.vue
@@ -474,7 +474,7 @@ export default {
      } else if (!vm.salesInfo.manu_manager) {
        hlsPopup.showLongCenter('主机厂业务员不能为空!')
      } else if (!vm.salesInfo.sale_date) {
-        hlsPopup.showLongCenter('签约日期不能为空!')
+        hlsPopup.showLongCenter('请选择签约日期!')
      } else {
        let url = process.env.basePath + 'prj_sales_info_save'
        window.localStorage.setItem('bp_id_tenant', this.salesInfo.bp_id_tenant)
@@ -487,6 +487,7 @@ export default {
          if (res.result === 'S') {
            hlsPopup.showLongCenter('创建成功！')
            window.localStorage.setItem('project_id', res.project_id)
+            window.localStorage.setItem('fromPage', 'sale')
            vm.$router.push({
              name: 'CreateBaseInfo',
            })

--- a/src/pages/userBindNew/np/bank-info.vue
+++ b/src/pages/userBindNew/np/bank-info.vue
@@ -151,7 +151,7 @@ export default {
  beforeRouteEnter (to, from, next) {
    next(vm => {
      vm.getBankInfo()
-      vm.getNpCertificationUrl()
+     // vm.getNpCertificationUrl()
    })
  },
  methods: {
@@ -198,7 +198,8 @@ export default {
      let vm = this
      let bp_id = window.localStorage.getItem('bp_id')
      let isCheck = await vm.checkElectonic()
-      if (bp_id) {
+      let urlTemp = await vm.getNpCertificationUrl()
+      if (urlTemp) {
        this.hlsPopup.showConfirm({
          title: '提示',
          content: '您确认提交吗？',
@@ -241,22 +242,22 @@ export default {
        this.hlsPopup.showLongCenter('请先保存')
      }
    },
-    getNpCertificationUrl () {
+    async getNpCertificationUrl () {
      let vm = this
      let url = $config.basePath + 'auth_user_sign'
      let param = {
        phone: window.localStorage.user_phone,
      }
      hlsPopup.showLoading('请稍候')
-      vm.$post(url, param).then(function (res) {
-        hlsPopup.hideLoading()
-        console.log('获取个人认证url', res)
-        if (res.info.code === 0) {
-          vm.authUrl = res.info.data.authUrl
-        } else {
-          hlsPopup.showLongCenter(res.info.msg)
-        }
-      })
+      let res = await vm.$post(url, param)
+      hlsPopup.hideLoading()
+      if (res.info.code === 0) {
+        vm.authUrl = res.info.data.authUrl
+        return vm.authUrl
+      } else {
+        hlsPopup.showError(res.info.msg)
+        return ''
+      }
    },
    addBankInfo () {
      this.hlsPopup.showConfirm({

--- a/src/pages/userBindNew/org/bankInfo.vue
+++ b/src/pages/userBindNew/org/bankInfo.vue
@@ -160,11 +160,11 @@ export default {
        vm.certification_status = ''
        vm.getBankInfo()
        vm.electQuery()
-        if (window.localStorage.bp_identity === 'ORG_NO') {
+       /* if (window.localStorage.bp_identity === 'ORG_NO') {
          vm.getOrgCertificationUrl() // 获取企业认证url
        } else {
          vm.getNpCertificationUrl()
-        }
+        }*/
      }
    })
  },
@@ -264,82 +264,92 @@ export default {
      })
    },
    // 提交
-    handSubmit () {
-      this.hlsPopup.showConfirm({
-        title: '提示',
-        content: '您确认提交吗？',
-        onConfirm: data => {
-          if (data) {
-            let url = $config.basePath + 'bp_bind_submit'
-            let param = {
-              master: {
-                bp_id: this.$route.params.bp_id,
-                company_id: '2145',
-              },
-            }
-            let vm = this
-            vm.hlsPopup.showLoading('请稍候')
-            vm.hlsHttp.post(url, param).then(function (res) {
-              vm.hlsPopup.hideLoading()
-              if (res.result === 'S') {
-                vm.hlsPopup.showSuccess('提交成功')
-                if (vm.certification_status === 'Y') {
-                  vm.$router.push({
-                    name: 'MyInfo',
-                  })
-                } else {
-                  if (vm.authUrl) {
+    async handSubmit () {
+      let vm = this
+      if (window.localStorage.bp_identity === 'ORG_NO') {
+        var urlTemp = await vm.getOrgCertificationUrl() // 获取企业认证url
+      } else {
+        var urlTemp = await vm.getNpCertificationUrl()
+      }
+      if(urlTemp){
+        this.hlsPopup.showConfirm({
+          title: '提示',
+          content: '您确认提交吗？',
+          onConfirm: data => {
+            if (data) {
+              let url = $config.basePath + 'bp_bind_submit'
+              let param = {
+                master: {
+                  bp_id: this.$route.params.bp_id,
+                  company_id: '2145',
+                },
+              }
+              let vm = this
+              vm.hlsPopup.showLoading('请稍候')
+              vm.hlsHttp.post(url, param).then(function (res) {
+                vm.hlsPopup.hideLoading()
+                if (res.result === 'S') {
+                  vm.hlsPopup.showSuccess('提交成功')
+                  if (vm.certification_status === 'Y') {
                    vm.$router.push({
-                      name: 'Certification',
-                      params: {
-                        authUrl: vm.authUrl,
-                      },
+                      name: 'MyInfo',
                    })
                  } else {
-                    vm.hlsPopup.showSuccess(vm.errorMsg)
+                    if (vm.authUrl) {
+                      vm.$router.push({
+                        name: 'Certification',
+                        params: {
+                          authUrl: vm.authUrl,
+                        },
+                      })
+                    } else {
+                      vm.hlsPopup.showSuccess(vm.errorMsg)
+                    }
                  }
                }
-              }
-            })
-          }
-        },
-      })
+              })
+            }
+          },
+        })
+      }
    },
    // 获取个人认证url
-    getNpCertificationUrl () {
+    async getNpCertificationUrl () {
      let vm = this
      let url = $config.basePath + 'auth_user_sign'
      let param = {
        phone: window.localStorage.user_phone,
      }
      hlsPopup.showLoading('请稍候')
-      vm.$post(url, param).then(function (res) {
-        hlsPopup.hideLoading()
-        console.log('获取个人认证url', res)
-        if (res.info.code === 0) {
-          vm.authUrl = res.info.data.authUrl
-        } else {
-          vm.errorMsg = res.info.msg
-        }
-      })
+      let res = await vm.$post(url, param)
+      hlsPopup.hideLoading()
+      if (res.info.code === 0) {
+        vm.authUrl = res.info.data.authUrl
+        return vm.authUrl
+      } else {
+        hlsPopup.showError(res.info.msg)
+        //vm.errorMsg = res.info.msg
+        return ''
+      }
    },
    // 获取企业认证url
-    getOrgCertificationUrl () {
+    async getOrgCertificationUrl () {
      let vm = this
      let url = $config.basePath + 'auth_company_sign'
      let param = {
        phone: window.localStorage.user_phone,
      }
      hlsPopup.showLoading('请稍候')
-      vm.$post(url, param).then(function (res) {
-        hlsPopup.hideLoading()
-        console.log(res)
-        if (res.info.code === 0) {
-          vm.authUrl = res.info.data.authUrl
-        } else {
-          vm.errorMsg = res.info.msg
-        }
-      })
+      let res = await vm.$post(url, param)
+      hlsPopup.hideLoading()
+      if (res.info.code === 0) {
+        vm.authUrl = res.info.data.authUrl
+        return vm.authUrl
+      } else {
+        hlsPopup.showError(res.info.msg)
+        return ''
+        //vm.errorMsg = res.info.msg
+      }
    },
    // ocr识别入口
    ocrShow (ocrType, type) {

--- a/src/pages/userBindNew/org/baseInfo.vue
+++ b/src/pages/userBindNew/org/baseInfo.vue
@@ -1283,7 +1283,7 @@ export default {
          vm.authMsg.auth_cell_phone = res.info.auth_cell_phone
          // delete res.info.agent_username
          vm.legal_personMsg.id_card_no = res.info.id_card_no
-          // vm.legal_personMsg.legal_person = res.info.legal_person
+          vm.legal_personMsg.bp_legal_name = res.info.bp_legal_name
          vm.legal_personMsg.cell_phone = res.info.cell_phone
          vm.legal_personMsg.living_address = res.info.living_address
          vm.legal_personMsg.id_card_date_from = res.info.id_card_date_from

--- 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=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><title>徐工融租</title><link href=./static/css/app.caaffc6951749ad1f79385dd38e30df1.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.9bcaf3138c14643fa44a.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.0d6ce6f53f6d0be63ad82254b9c5ec69.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.47cccd495060b77a815b.js></script></body></html>
\ No newline at end of file