'uat'

2c687c82 · 李晓兵 · 1d581af5 · 5cf3b1c6 · 2c687c82 · 2c687c82
Commit 2c687c82 authored Jan 02, 2020 by 李晓兵
11 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.2"'
+  currentVersion: '"1.3.3"'
 }
--- a/src/pages/contractCreate/creat-rent-info.vue
+++ b/src/pages/contractCreate/creat-rent-info.vue
@@ -37,7 +37,7 @@
          <div slot="name">产品型号</div>
          <input slot="content" v-model="saveInfo.product_id_n" readonly placeholder="请选择">
        </item>
-        <item v-if="isReadOnly" :showArrow="true">
+        <item v-if="isReadOnly">
          <div slot="name">产品型号</div>
          <input slot="content" v-model="saveInfo.product_id_n" readonly>
        </item>

--- a/src/pages/contractCreate/create-base-info.vue
+++ b/src/pages/contractCreate/create-base-info.vue
@@ -524,7 +524,7 @@ export default {
    makeData () {
      let obj = {}
      this.selectUdertake.forEach((i, index, arr) => {
-        obj[`bp_id_guta_${index + 1}`] = i.bp_id
+        obj[`bp_id_guta_${index + 1}`] = i.bp_guta_id
      })
      return obj
    },
@@ -562,6 +562,34 @@ export default {
        }
      })
    },
+    hasEmpty () {
+      let vm = this
+      if (vm.bp_class === 'NP') {
+        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 {
+          return true
+        }
+      } else if (vm.bp_class === 'ORG') {
+        if (!vm.saveInfo.equip_num_n) {
+          hlsPopup.showLongCenter('设备保有量不能为空!')
+        } else if (!vm.saveInfo.engineer_con_n) {
+          hlsPopup.showLongCenter('工程合同不能为空!')
+        } else if (!vm.saveInfo.enterpriese_nature_n) {
+          hlsPopup.showLongCenter('企业性质不能为空!')
+        } else if (!vm.saveInfo.equip_value) {
+          hlsPopup.showLongCenter('设备价值不能为空!')
+        } else {
+          return true
+        }
+      }
+    },
    save () {
      let vm = this
      if (vm.fromPutted) {
@@ -572,36 +600,31 @@ export default {
            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 isEmpty = vm.hasEmpty()
        let param = {
          master: {...vm.saveInfo, ...vm.makeData()},
        }
-        hlsPopup.showLoading('请稍候')
-        vm.$post(url, param).then(function (res) {
-          vm.hlsPopup.hideLoading()
-          if (res.result === 'S') {
-            vm.saveTed = true
-            vm.$router.push({
-              name: 'CreateRentInfo',
-              params: {
-                bp_agent_id: vm.bp_agent_id,
-                bp_name: vm.NPBaseInfo.bp_name,
-                salesEnter: vm.salesEnter,
-              },
-            })
-          } else {
-            hlsPopup.showLongCenter(res.message)
-          }
-        })
+        if (isEmpty) {
+          hlsPopup.showLoading('请稍候')
+          vm.$post(url, param).then(function (res) {
+            vm.hlsPopup.hideLoading()
+            if (res.result === 'S') {
+              vm.saveTed = true
+              vm.$router.push({
+                name: 'CreateRentInfo',
+                params: {
+                  bp_agent_id: vm.bp_agent_id,
+                  bp_name: vm.NPBaseInfo.bp_name,
+                  salesEnter: vm.salesEnter,
+                },
+              })
+            } else {
+              hlsPopup.showLongCenter(res.message)
+            }
+          })
+        }
      }
    },
    getBaseInfo () {

--- a/src/pages/contractCreate/sales-info.vue
+++ b/src/pages/contractCreate/sales-info.vue
@@ -86,7 +86,7 @@
        </item>
        <item @click.native="showTime('YYYY-MM-DD')">
          <div slot="name" class="font-color">签约日期</div>
-          <input slot="content" v-model="salesInfo.dates" readonly>
+          <input slot="content" v-model="salesInfo.sale_date" readonly>
          <img src="@/assets/contractCreate/date.png" alt="" class="date-pic">
        </item>
      </list-item>
@@ -163,7 +163,7 @@ export default {
        office_id: '', // 办事处id
        factory: '', // 主机厂id
        manu_manager: '', // 办事处业务员
-        dates: '请选择',
+        sale_date: '请选择',
        project_id: '',
      },
    }
@@ -211,7 +211,7 @@ export default {
          office_id: '', // 办事处id
          factory: '', // 主机厂id
          manu_manager: '', // 办事处业务员
-          dates: '请选择',
+          sale_date: '请选择',
          bp_type: window.localStorage.bp_type,
          project_id: '',
        }
@@ -231,7 +231,7 @@ export default {
        nowDate: (new Date()).format('yyyy-MM-dd'),
        format: format,
        callback: (date) => {
-          vm.salesInfo.dates = date
+          vm.salesInfo.sale_date = date
        },
      })
    },
@@ -472,7 +472,7 @@ export default {
        hlsPopup.showLongCenter('主机厂不能为空!')
      } else if (!vm.salesInfo.manu_manager) {
        hlsPopup.showLongCenter('主机厂业务员不能为空!')
-      } else if (!vm.salesInfo.dates) {
+      } else if (!vm.salesInfo.sale_date) {
        hlsPopup.showLongCenter('签约日期不能为空!')
      } else {
        let url = process.env.basePath + 'prj_sales_info_save'

--- a/src/pages/myInfo/my-info.vue
+++ b/src/pages/myInfo/my-info.vue
@@ -261,14 +261,14 @@ export default {
  activated () {},
  methods: {
    openTest () {
-     // cordova.InAppBrowser.open('http://www.baidu.com', '_blank', 'location=yes')
+      // cordova.InAppBrowser.open('http://www.baidu.com', '_blank', 'location=yes')
      var date = '2019.11.23'
      var times = this.dateFormat(date)
      console.log(times)
    },
-    dateFormat(str){
-     // return `${str.substring(0,4)}-${str.substring(4,6)}-${str.substring(6)}`
-      return str.replace(/\./g,'-')
+    dateFormat (str) {
+      // return `${str.substring(0,4)}-${str.substring(4,6)}-${str.substring(6)}`
+      return str.replace(/\./g, '-')
    },
    // 查询头像
    getHead () {
@@ -481,7 +481,7 @@ export default {
            window.localStorage.setItem('width', width)
            window.localStorage.setItem('height', height)
            vm.$router.push('/login')
-           // location.reload()
+            // location.reload()
          }
        },
      })
@@ -860,6 +860,12 @@ export default {

 <style lang="less" scoped>
 #my-info {
+ /* .content-wrap{
+    margin-left:40px;
+  }
+  .content-wrap:not(:nth-of-type(1)){
+    margin-left:70px;
+  }*/
  .card-top {
    width: 330px;
    margin: 0 auto;
@@ -999,15 +1005,23 @@ export default {
     // width: 295px;
      margin: 0 auto;
      display: flex;
-      justify-content: space-around;
-      align-items: center;
+      // justify-content: space-around;
+      // align-items: center;
+     // flex:1;
      text-align: center;
+      padding: 0 6%;
+      justify-content: flex-start;
      .content-wrap {
        position: relative;
+        width: 33%;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
        .content-wrap-class {
          position: absolute;
          top: -10px;
-          left: 25px;
+          left: 56px;
          font-size: 10px;
          width: 18px;
          height: 18px;

--- a/src/pages/regiester2.vue
+++ b/src/pages/regiester2.vue
@@ -34,7 +34,7 @@
              placeholder="请输入6~20位密码"
              maxlength="20"
              oninput="value=value.replace(/[\u4E00-\u9FA5]/g,'')"
-              @blur="passwordCheck"
+
            >
            <img v-if="user_password" :src="openEye" class="right-icon" @click="changeType" >
          </div>
@@ -42,7 +42,7 @@
            <img src="../assets/login/pass.png" class="left-icon" >
            <input
              v-model="confirm" :type="pwdType" oninput="value=value.replace(/[\u4E00-\u9FA5]/g,'')" placeholder="请重新输入密码"
-              @blur="confirmCheck" >
+              >
            <img v-if="confirm" :src="openEye" class="right-icon" @click="changeType" >
          </div>
          <div class="button submit" @click="submit">注册</div>
@@ -182,37 +182,42 @@ export default {
        vm.confirmPassword = true
      }
    },
-    submit () {
+   async submit () {
      let vm = this
      if (!vm.phoneNumberFlag) {
        hlsPopup.showLongCenter('请输入手机号!')
      } else if (vm.verifiedCode !== vm.captchaKey) {
        hlsPopup.showLongCenter('验证码错误!')
-      } else if (!vm.passwordFlag) {
+      } else if (!vm.user_password) {
        hlsPopup.showLongCenter('请输入密码!')
-      } else if (!vm.confirmPassword) {
+      } else if (!vm.confirm) {
        hlsPopup.showLongCenter('请确认密码!')
      } else {
-        let url = process.env.basePath + 'register'
-        let md5passwprd = CryptoJS.MD5(vm.user_password)
-          .toString()
-          .toUpperCase()
-        let params = {
-          master: {
-            phone: vm.phone_number,
-            password: md5passwprd,
-          },
-        }
-        hlsHttp.post(url, params).then(function (res) {
-          if (res.result === 'S') {
-            hlsPopup.showLongCenter('注册成功')
-            setTimeout(function () {
-              vm.$router.push('login')
-            }, 100)
-          } else {
-            hlsPopup.showLongCenter(res.message)
+        await vm.passwordCheck()
+        await vm.confirmCheck()
+        if(vm.passwordFlag && vm.confirmPassword){
+          let url = process.env.basePath + 'register'
+          let md5passwprd = CryptoJS.MD5(vm.user_password)
+            .toString()
+            .toUpperCase()
+          let params = {
+            master: {
+              phone: vm.phone_number,
+              password: md5passwprd,
+            },
          }
-        })
+          hlsHttp.post(url, params).then(function (res) {
+            if (res.result === 'S') {
+              hlsPopup.showLongCenter('注册成功')
+              setTimeout(function () {
+                vm.$router.push('login')
+              }, 100)
+            } else {
+              hlsPopup.showLongCenter(res.message)
+            }
+          })
+        }
+
      }
    },
    returnLogin () {

--- a/src/pages/userBindNew/np/base-info.vue
+++ b/src/pages/userBindNew/np/base-info.vue
@@ -436,41 +436,100 @@ export default {
  beforeRouteEnter (to, from, next) {
    // 绑定查询入口
    next(vm => {
-      vm.list = {}
-      vm.multiBpType = {}
-      vm.upload_list = [] // 上传图片列表
-      vm.dowload_list = [] // 下载图片列表
-      vm.img_url = {}
-      vm.baseInfo = {}
-      vm.idCardFront = '' // 身份证正面图片
-      vm.idCardBack = '' // 身份证反面图片
-      vm.idCardFrontSp = '' // 配偶身份证正面图片
-      vm.idCardBackSp = '' // 配偶身份证反面图片
-      vm.idCardFrontUrlFlag = false // 身份证正面图片查看标识，为false则用查询出来的，为true则用拍照出来的
-      vm.idCardBackUrlFlag = false // 身份证反面图片，为false则用查询出来的，为true则用拍照出来的
-      vm.idCardFrontSpUrlFlag = false // 配偶身份证正面图片，为false则用查询出来的，为true则用拍照出来的
-      vm.idCardBackSpUrlFlag = false // 配偶身份证反面图片，为false则用查询出来的，为true则用拍照出来的
-      vm.cddItemList = [] // 资料清单列表
-      vm.idCardFrontCheck_id = '' // 身份证正面check_id
-      vm.idCardBackCheck_id = '' // 身份证反面check_id
-      vm.idCardFrontSpCheck_id = '' // 配偶身份证正面check_id
-      vm.idCardBackSpCheck_id = '' // 配偶身份证反面check_id
-      vm.idCardFrontAttachmentId = '' // 身份证正面AttachmentId
-      vm.idCardBackAttachmentId = '' // 身份证反面AttachmentId
-      vm.idCardFrontSpAttachmentId = '' // 配偶身份证正面AttachmentId
-      vm.idCardBackSpAttachmentId = '' // 配偶身份证反面AttachmentId
-      vm.idCardFrontEditFlag = false // 身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
-      vm.idCardBackEditFlag = false // 身份证反面修改标识，为true则标识已修改，后续需要重新上传此照片
-      vm.idCardFrontSpEditFlag = false // 配偶身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
-      vm.idCardBackSpEditFlag = false // 配偶身份证反面修改标识，为true则标识已修改，后续需要重新上传此照片
-      vm.isClear = false
      if (from.fullPath === '/tab/my-info') {
-
+        vm.list = {}
+        vm.multiBpType = {}
+        vm.upload_list = [] // 上传图片列表
+        vm.dowload_list = [] // 下载图片列表
+        vm.img_url = {}
+        vm.baseInfo = {}
+        vm.idCardFront = '' // 身份证正面图片
+        vm.idCardBack = '' // 身份证反面图片
+        vm.idCardFrontSp = '' // 配偶身份证正面图片
+        vm.idCardBackSp = '' // 配偶身份证反面图片
+        vm.idCardFrontUrlFlag = false // 身份证正面图片查看标识，为false则用查询出来的，为true则用拍照出来的
+        vm.idCardBackUrlFlag = false // 身份证反面图片，为false则用查询出来的，为true则用拍照出来的
+        vm.idCardFrontSpUrlFlag = false // 配偶身份证正面图片，为false则用查询出来的，为true则用拍照出来的
+        vm.idCardBackSpUrlFlag = false // 配偶身份证反面图片，为false则用查询出来的，为true则用拍照出来的
+        vm.cddItemList = [] // 资料清单列表
+        vm.idCardFrontCheck_id = '' // 身份证正面check_id
+        vm.idCardBackCheck_id = '' // 身份证反面check_id
+        vm.idCardFrontSpCheck_id = '' // 配偶身份证正面check_id
+        vm.idCardBackSpCheck_id = '' // 配偶身份证反面check_id
+        vm.idCardFrontAttachmentId = '' // 身份证正面AttachmentId
+        vm.idCardBackAttachmentId = '' // 身份证反面AttachmentId
+        vm.idCardFrontSpAttachmentId = '' // 配偶身份证正面AttachmentId
+        vm.idCardBackSpAttachmentId = '' // 配偶身份证反面AttachmentId
+        vm.idCardFrontEditFlag = false // 身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
+        vm.idCardBackEditFlag = false // 身份证反面修改标识，为true则标识已修改，后续需要重新上传此照片
+        vm.idCardFrontSpEditFlag = false // 配偶身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
+        vm.idCardBackSpEditFlag = false // 配偶身份证反面修改标识，为true则标识已修改，后续需要重新上传此照片
+        vm.isClear = false
        vm.from = true
        vm.basicInfoQuery()
        vm.loadItemList() // 附件查询
      } else if (from.name === 'UserBind') {
-        vm.baseInfo.bp_class = vm.$route.params.bp_class
+        vm.list = {}
+        vm.multiBpType = {
+          bp_type_n: '',
+          bp_type: '',
+        }
+        vm.upload_list = [] // 上传图片列表
+        vm.dowload_list = [] // 下载图片列表
+        vm.img_url = {}
+        vm.baseInfo = {
+          bp_type_n: '',
+          academic_background_n: '',
+          marital_status_n: '',
+          bp_type: '',
+          bp_class: vm.$route.params.bp_class,
+          bp_name: '',
+          province_name: '',
+          province_id: '',
+          city_name: '',
+          city_id: '',
+          id_card_no: null,
+          id_card_date_from: '', // 身份证有效期从
+          id_card_date_to: '', // 身份证有效期到
+          cell_phone: window.localStorage.getItem('user_phone'),
+          living_address: '',
+          address_on_resident_booklit: '',
+          marital_status: '',
+          academic_background: '',
+          bp_name_sp: '',
+          id_card_no_sp: '', // 配偶身份证号
+          id_card_date_from_sp: '', // 配偶身份证有效期从
+          id_card_date_to_sp: '', // 配偶身份证有效期到
+          district_id: '',
+          district_name: '',
+          spouse_phone: '',
+          working_place_sp: '',
+          address_sp: '',
+          user_phone: window.localStorage.user_phone,
+        }
+        vm.idCardFront = '' // 身份证正面图片
+        vm.idCardBack = '' // 身份证反面图片
+        vm.idCardFrontSp = '' // 配偶身份证正面图片
+        vm.idCardBackSp = '' // 配偶身份证反面图片
+        vm.idCardFrontUrlFlag = false // 身份证正面图片查看标识，为false则用查询出来的，为true则用拍照出来的
+        vm.idCardBackUrlFlag = false // 身份证反面图片，为false则用查询出来的，为true则用拍照出来的
+        vm.idCardFrontSpUrlFlag = false // 配偶身份证正面图片，为false则用查询出来的，为true则用拍照出来的
+        vm.idCardBackSpUrlFlag = false // 配偶身份证反面图片，为false则用查询出来的，为true则用拍照出来的
+        vm.cddItemList = [] // 资料清单列表
+        vm.idCardFrontCheck_id = '' // 身份证正面check_id
+        vm.idCardBackCheck_id = '' // 身份证反面check_id
+        vm.idCardFrontSpCheck_id = '' // 配偶身份证正面check_id
+        vm.idCardBackSpCheck_id = '' // 配偶身份证反面check_id
+        vm.idCardFrontAttachmentId = '' // 身份证正面AttachmentId
+        vm.idCardBackAttachmentId = '' // 身份证反面AttachmentId
+        vm.idCardFrontSpAttachmentId = '' // 配偶身份证正面AttachmentId
+        vm.idCardBackSpAttachmentId = '' // 配偶身份证反面AttachmentId
+        vm.idCardFrontEditFlag = false // 身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
+        vm.idCardBackEditFlag = false // 身份证反面修改标识，为true则标识已修改，后续需要重新上传此照片
+        vm.idCardFrontSpEditFlag = false // 配偶身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
+        vm.idCardBackSpEditFlag = false // 配偶身份证反面修改标识，为true则标识已修改，后续需要重新上传此照片
+        vm.isClear = false
+        //vm.baseInfo.bp_class = vm.$route.params.bp_class
      }
    })
  },

--- a/src/pages/userBindNew/np/invoice-info.vue
+++ b/src/pages/userBindNew/np/invoice-info.vue
@@ -99,8 +99,20 @@ export default {
  },
  beforeRouteEnter (to, from, next) {
    next(vm => {
-      if (from.name === 'NPBaseInfo' && window.localStorage.from) {
-        vm.invoiceInfo = {}
+      if (from.name === 'NPBaseInfo') {
+        vm.invoiceInfo = {
+          bp_id: null,
+          bp_class: null,
+          taxpayer_type_n: '',
+          invoice_kind_n: '',
+          taxpayer_type: '',
+          invoice_kind: '',
+          invoice_title: '',
+          invoice_adds: '',
+          invoice_tel: '',
+          open_bank: '',
+          open_account: '',
+        }
        vm.getInvoice()
      }
    })

--- a/src/pages/userBindNew/org/baseInfo.vue
+++ b/src/pages/userBindNew/org/baseInfo.vue
--- a/src/pages/userBindNew/org/invoice.vue
+++ b/src/pages/userBindNew/org/invoice.vue
@@ -106,8 +106,19 @@ export default {
  watch: {},
  beforeRouteEnter (to, from, next) {
    next(vm => {
-      if (from.name === 'EnterpriseNew' && vm.$route.params.from) {
-        vm.invoiceInfo = {}
+      if (from.name === 'EnterpriseNew') {
+        vm.invoiceInfo = {
+          invoice_kind: '',
+          invoice_kind_n: '',
+          taxpayer_type: '',
+          invoice_title: '',
+          taxpayer_type_n: '',
+          organization_code: '',
+          invoice_adds: '',
+          invoice_tel: '',
+          open_bank: '',
+          open_account: '',
+        }
        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

--- 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.2ee696422d013dfbfbf68cbcc4d7897e.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.4bfde63fa6905bb1019a.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.2ee696422d013dfbfbf68cbcc4d7897e.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.4bfde63fa6905bb1019a.js></script></body></html>
+