Merge branch 'develop' into uat

config/prod.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.0.0"'
+  currentVersion: '"1.0.1"'
 }

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.2.8"'
+  currentVersion: '"1.2.9"'
 }

src/pages/carConfirm/confirm-detail.vue

@@ -253,16 +253,37 @@ export default {
     })
   },
   methods: {
+    // 签约校验
+    async signCheck () {
+      let vm = this
+      let url = process.env.basePath + 'sign_check'
+      let param = {
+        confirm_id: vm.confirm_id,
+        data_class: 'LEASE_ITEM',
+      }
+      vm.hlsPopup.showLoading('请稍后!')
+      let res = vm.hlsHttp.post(url, param)
+      vm.hlsPopup.hideLoading()
+      if (res.result === 'S') {
+        return true
+      } else {
+        // vm.hlsPopup.showLongCenter(res.message)
+      }
+    },
     getTabNum (i) {
       this.tabNum = i
     },
     takePhonto () {
       let vm = this
-      hlsPopup.showPopup({
+      hlsPopup.showConfirm({
         title: '提示',
-        content: `请自拍一张`,
-        onConfirm: () => {
-          vm.takePhontoOpenCamera()
+        content: '请自拍一张',
+        onConfirm: function (index) {
+          if (index === 1) {
+            vm.takePhontoOpenCamera()
+          } else {
+
+          }
         },
       })
     },
@@ -398,16 +419,20 @@ export default {
         hlsPopup.hideLoading()
       }
     },
-    isConfirm () {
-      this.hlsPopup.showConfirm({
-        title: '提示',
-        content: '您确定同意发车吗？',
-        onConfirm: data => {
-          if (data === 1) {
-            this.confirm()
-          }
-        },
-      })
+    async isConfirm () {
+      let vm = this
+      let flag = await this.signCheck()
+      if (flag) { // 只有认证通过后方可进行签约操作
+        this.hlsPopup.showConfirm({
+          title: '提示',
+          content: '您确定同意发车吗？',
+          onConfirm: data => {
+            if (data === 1) {
+              this.confirm()
+            }
+          },
+        })
+      }
     },
     confirm () {
       let vm = this

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

@@ -406,6 +406,7 @@ export default {
         })
         vm.selectUdertake = []
         setTimeout(() => {
+          vm.getSaveInfo()
           vm.getBaseInfo()
         }, 0)
       } else if (from.name === 'ContractCreateList' && vm.status === 'false') {
@@ -445,7 +446,7 @@ export default {
             }
           },
         })
-      } else{
+      } else {
         vm.$routeGo()
       }
     },
@@ -460,6 +461,7 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           Object.assign(vm.saveInfo, res.info)
+          vm.selectUdertake = res.lists
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -531,9 +533,17 @@ export default {
           name: 'CreateRentInfo',
           params: {
             bp_agent_id: vm.bp_agent_id,
-            salesEnter: vm.salesEnter
+            salesEnter: vm.salesEnter,
           },
         })
+      } else if (!vm.saveInfo.np_industry_exp_n) {
+        hlsPopup.showLongCenter('行业情况不能为空!')
+      } else if (!vm.saveInfo.np_occupation_n) {
+        hlsPopup.showLongCenter('职业情况不能为空!')
+      } else if (!vm.saveInfo.house_type_n) {
+        hlsPopup.showLongCenter('房产信息不能为空!')
+      } else if (!vm.saveInfo.equip_value) {
+        hlsPopup.showLongCenter('设备价值不能为空!')
       } else {
         let url = process.env.basePath + 'prj_base_info_save'
         let param = {
@@ -549,7 +559,7 @@ export default {
               params: {
                 bp_agent_id: vm.bp_agent_id,
                 bp_name: vm.NPBaseInfo.bp_name,
-                salesEnter: vm.salesEnter
+                salesEnter: vm.salesEnter,
               },
             })
           } else {

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

@@ -506,6 +506,7 @@ export default {
       let url = process.env.basePath + 'prj_project_submit'
       let param = {
         project_id: window.localStorage.project_id,
+        phone:window.localStorage.getItem('user_phone'),
       }
       vm.hlsPopup.showLoading('请稍候')
       vm.hlsHttp.post(url, param).then(function (res) {

src/pages/contractCreate/sales-info.vue

@@ -442,14 +442,26 @@ export default {
     // 销售信息保存
     confirmCreate () {
       let vm = this
-      let url = process.env.basePath + 'prj_sales_info_save'
-      window.localStorage.setItem('bp_id_tenant', this.salesInfo.bp_id_tenant)
-      let param = {
-        master: vm.salesInfo,
-      }
-      if (!this.lessee) {
-        hlsPopup.showLongCenter('请选择承租人')
+      if (!vm.lessee) {
+        hlsPopup.showLongCenter('请选择承租人!')
+      } else if (!vm.business) {
+        hlsPopup.showLongCenter('业务类型不能为空!')
+      } else if (!vm.sales) {
+        hlsPopup.showLongCenter('销售人员不能为空!')
+      } else if (!vm.office_name) {
+        hlsPopup.showLongCenter('办事处不能为空!')
+      } else if (!vm.factory_name) {
+        hlsPopup.showLongCenter('主机厂不能为空!')
+      } else if (!vm.manu_manager) {
+        hlsPopup.showLongCenter('主机厂业务员不能为空!')
+      } else if (!vm.salesInfo.dates) {
+        hlsPopup.showLongCenter('签约日期不能为空!')
       } else {
+        let url = process.env.basePath + 'prj_sales_info_save'
+        window.localStorage.setItem('bp_id_tenant', this.salesInfo.bp_id_tenant)
+        let param = {
+          master: vm.salesInfo,
+        }
         vm.hlsPopup.showLoading('请稍候')
         vm.hlsHttp.post(url, param).then(function (res) {
           vm.hlsPopup.hideLoading()

src/pages/contractRepayment/contract-repayment.vue

@@ -19,7 +19,7 @@
         </div>
         <div class="center">
           <div><span>合同金额</span><p>{{ item.total_price|currency }}</p></div>
-          <div><span>已还金额</span><p class="bold">{{ item.recivied_amount|currency }}</p></div>
+          <div><span>已还金额</span><p class="bold">{{ item.received_amount|currency }}</p></div>
           <span v-if="item.overdue_status==='已逾期'" class="red">已逾期</span>
           <section @click="toRepayDetails(item)">
             <img src="@/assets/contractRepayment/view.png" alt="">

src/pages/contractSigning/contract-detail.vue

@@ -302,7 +302,7 @@
       </h-view>
     </h-modal>
     <!--活体检测-->
-    <body-check ref="body" :check_id="$route.params.check_id" :confirm_id="confirm_id"></body-check>
+    <body-check ref="body" :check_id="$route.params.check_id" :confirm_id="confirm_id"/>
   </h-view>
 </template>
 
@@ -418,7 +418,6 @@ export default {
         vm.getLease()
         vm.getGuarantor()
         vm.getContractLists() // 合同列表
-        vm.signCheck() // 签约校验
       } else if (from.name === 'EntryInfo') {
         vm.bankCardQuery()
       }
@@ -444,19 +443,21 @@ export default {
   }, */
   methods: {
     // 签约校验
-    signCheck () {
+    async signCheck () {
       let vm = this
       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()
+      if (res.result === 'S') {
+        return true
+      } else {
+       // vm.hlsPopup.showLongCenter(res.message)
       }
-      vm.hlsHttp.post(url, param).then(function (res) {
-        if (res.result === 'E') {
-          vm.signCheckFlag = false
-        } else {
-          vm.signCheckFlag = true
-        }
-      })
     },
     // 征信查询
     creditCheck () {
@@ -478,13 +479,13 @@ export default {
     },
     goBodyCheck (confirm_id) { // 活体检测
       this.$refs.body.show()
-     /* this.$router.push({
+      /* this.$router.push({
         name: 'BodyCheck',
         params: {
           check_id: this.$route.params.check_id,
           confirm_id: confirm_id,
         },
-      })*/
+      }) */
     },
     /* goElectronicSign () { // 电子签
        let vm = this
@@ -524,11 +525,15 @@ export default {
     },
     takePhonto () {
       let vm = this
-      hlsPopup.showPopup({
+      hlsPopup.showConfirm({
         title: '提示',
-        content: `请自拍一张`,
-        onConfirm: () => {
-          vm.takePhontoOpenCamera()
+        content: '请自拍一张',
+        onConfirm: function (index) {
+          if (index === 1) {
+            vm.takePhontoOpenCamera()
+          } else {
+
+          }
         },
       })
     },
@@ -629,7 +634,7 @@ export default {
           // 进入活体检测页面
           vm.goBodyCheck(vm.confirm_id)
         },
-      })*/
+      }) */
     },
     // 确认签约逻辑
     doConfirm (status) {
@@ -852,15 +857,14 @@ export default {
         },
       })
     },
-    inSure () {
-      if (this.signCheckFlag) { // 只有认证通过后方可进行签约操作
+    async inSure () {
+      let flag = await this.signCheck()
+      if (flag) { // 只有认证通过后方可进行签约操作
         if (!this.bank_flag && this.abc_deduction_flag === 'Y') {
           this.isshow = true // 未查到农行卡给出提示且勾选农行代扣
         } else {
           this.showModalValue = true // 审批内容框显示
         }
-      } else {
-        hlsPopup.showLongCenter('请先进行认证')
       }
     },
 

src/pages/distributorSign/contract-details.vue

@@ -253,7 +253,6 @@ export default {
           vm.getGuarantor()
         }
         vm.getLease()
-        vm.signCheck() // 签约校验
       } else if (from.name === 'ContractContent') {
         vm.tabNum = 2
         vm.agentPic = vm.readed
@@ -263,19 +262,21 @@ export default {
   created () {},
   methods: {
     // 签约校验
-    signCheck () {
+    async signCheck () {
       let vm = this
       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()
+      if (res.result === 'S') {
+        return true
+      } else {
+        // vm.hlsPopup.showLongCenter(res.message)
       }
-      vm.hlsHttp.post(url, param).then(function (res) {
-        if (res.result === 'E') {
-          vm.signCheckFlag = false
-        } else {
-          vm.signCheckFlag = true
-        }
-      })
     },
     goBodyCheck (confirm_id) { // 活体检测
       this.$refs.body.show()
@@ -310,9 +311,10 @@ export default {
      })
    }, */
     // 签约确认
-    contractConfirm () {
+    async contractConfirm () {
       let vm = this
-      if (this.signCheckFlag) { // 只有认证通过后方可进行签约操作
+      let flag = await this.signCheck()
+      if (flag) { // 只有认证通过后方可进行签约操作
         this.hlsPopup.showConfirm({
           title: '提示',
           content: '您确认签约吗？',
@@ -322,18 +324,20 @@ export default {
             }
           },
         })
-      } else {
-        hlsPopup.showLongCenter('请先进行认证')
       }
     },
 
     takePhonto () {
       let vm = this
-      hlsPopup.showPopup({
+      hlsPopup.showConfirm({
         title: '提示',
-        content: `请自拍一张`,
-        onConfirm: () => {
-          vm.takePhontoOpenCamera()
+        content: '请自拍一张',
+        onConfirm: function (index) {
+          if (index === 1) {
+            vm.takePhontoOpenCamera()
+          } else {
+
+          }
         },
       })
     },

src/pages/pay/firstPay/contract-record.vue

@@ -3,7 +3,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="my-content" style="margin-top:-1px">

src/pages/pay/marginPay/first-pay.vue

@@ -81,7 +81,7 @@ export default {
 
     toPayEntry (money) {
       this.$router.push({
-        name: 'PayEntry',
+        name: 'MarginPayEntry',
         params: {
           money,
         },

src/pages/pay/payment/contract-record.vue

@@ -3,7 +3,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 style="margin-top:-1px;">

src/pages/pay/payment/new-list.vue

@@ -3,7 +3,7 @@
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
         <img src="@/assets/userBind/arrow.png" @click="goHome" >
-        <span>还款明细</span>
+        <span>租金还款</span>
       </div>
     </h-header>
     <h-content style="margin-top:-1px;">

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

@@ -729,12 +729,12 @@ export default {
     },
     async saveWord () {
       let vm = this
+      debugger
       if (!vm.baseInfo.bp_type) {
         vm.hlsPopup.showLongCenter('客户类型不能为空！')
-      } else if (vm.isSelected && vm.isPaople && !vm.baseInfo.agent_username) {
+      } else if (vm.isPaople && !vm.baseInfo.agent_username) {
         vm.hlsPopup.showLongCenter('业务经办员工代码不能为空！')
       } else if (
-        vm.isSelected &&
         !vm.isPaople &&
         !vm.baseInfo.business_license_num
       ) {

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.891dc19da1733fc7db7071712cea81e0.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.2ea5061d831d7ce89173.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.6d59020107b128a9483bf33b65590e69.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.4211b99a04aaf2efdd3c.js></script></body></html>
\ No newline at end of file