Skip to content

H
hls-xcmg-vue-app
Commit 9ffd3ff3 authored by linxin's avatar linxin
Browse files
Options

add

parent 3db0b7cb
Pipeline #4820 canceled with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 96 additions and 85 deletions
      config/dev.env.js
      View file @ 9ffd3ff3
      ......@@ -8,9 +8,9 @@ module.exports = merge(prodEnv, {
      debug: true,
      isMobilePlatform: false,
      loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
      basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_DEV&apiName="',
      basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="',
      rootPath: '"http://180.104.121.66:8088/r/api"',
      filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"',
      filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
      ocrPath: '"http://180.104.121.66:8088/r/api"',
      appId: '"com.xcmg.app.dev"',
      currentVersion: '"1.8.4"',
      ......
      config/uat.env.js
      View file @ 9ffd3ff3
      ......@@ -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.4.9"'
      currentVersion: '"1.5.0"'
      }
      src/pages/userBindNew/np/base-info.vue
      View file @ 9ffd3ff3
      ......@@ -38,11 +38,12 @@
      <span v-for="(item,index) in multiRoleList" :key="index">{{ item.bp_type_n }}</span>
      </div>
      </item>
      <item v-if="(((isPaople&&from)||(isPaople&&isSelected)))||(multipleRole==='GUTA'||multipleRole==='TENANT')||searchPeople">
      <item v-if="(((isPaople&&from)||(isPaople&&isSelected)))||(multipleRole==='GUTA'||multipleRole==='TENANT')||searchPeople" :proportion="[3,7]">
      <div slot="name" class="required">业务经办人</div>
      <!-- <input slot="content" v-model="baseInfo.agent_username" placeholder="请输入业务经办员工代码" > -->
      <div slot="content" class="add-people"><input v-model="baseInfo.agent_username"><img src="@/assets/contractCreate/add1.png" @click="inputNum=true"></div>
      <!-- -->
      <input slot="content" v-model="baseInfo.agent_username" placeholder="请输入业务经办员工代码" >
      <!-- <div slot="content" class="add-people"><input v-model="baseInfo.agent_username"><img src="@/assets/contractCreate/add1.png" @click="inputNum=true"></div> -->
      <!-- <div slot="content" class="add-people"><div class="people-list"><span v-for="(item,index) in peopleList" :key="index">{{ item }}</span></div>
      <div><img src="@/assets/contractCreate/add1.png" @click="inputNum=true"></div></div> -->
      </item>
      <item v-if="(((isLesons&&from)||(isLesons&&isSelected)))||multipleRole==='AGENT'||searchLecens">
      <div slot="name" class="required">营业执照</div>
      ......@@ -314,12 +315,12 @@
      <bottom-tab class="footer-button">
      <tab-button class="save" @click.native="verified(false)">下一步</tab-button>
      </bottom-tab>
      <InputNum
      <!-- <InputNum
      v-show="inputNum"
      ref="inputtNum"
      @roleCancle="roleCancle"
      @roleConfirm="roleConfirm"
      />
      /> -->
      </h-view>
      </template>
      <script>
      ......@@ -351,17 +352,7 @@ export default {
      bp_type_n: '',
      bp_type: '',
      },
      peopleList: [
      {
      agent_username: '1343dwsd',
      },
      {
      agent_username: '1343dwsd',
      },
      {
      agent_username: '1343dwsd',
      },
      ],
      peopleList: [],
      cityList: [],
      provinceList: [],
      upload_list: [], // 上传图片列表
      ......@@ -597,10 +588,10 @@ export default {
      this.inputNum = false
      },
      roleConfirm (e) {
      if (this.baseInfo.agent_username.indexOf(e) !== -1) {
      if (this.peopleList.includes(e)) {
      hlsPopup.showLongCenter('您已添加了该业务经办')
      } else {
      this.baseInfo.agent_username = this.baseInfo.agent_username + `,${e}`
      this.peopleList.push(e)
      }
      this.inputNum = false
      },
      ......@@ -655,6 +646,7 @@ export default {
      vm.from = true
      vm.addRows(vm.baseInfo.address_on_resident_booklit)
      vm.addRowsLive(vm.baseInfo.living_address)
      vm.peopleList = res.info.agent_username.split(',')
      } else {
      hlsPopup.showLongCenter(res.message)
      }
      ......@@ -897,35 +889,34 @@ export default {
      // 基本信息保存前校验
      bindCheck () {
      let vm = this
      // var business_num = ''
      // // if (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA') {
      // // business_num = vm.baseInfo.agent_username
      // // } else
      // if (vm.baseInfo.bp_type === 'AGENT' || vm.baseInfo.bp_type === 'FACTORY') {
      // business_num = vm.baseInfo.business_license_num
      // } else if (vm.baseInfo.bp_type === 'OFFICE') {
      // business_num = vm.baseInfo.business_license_num
      // }
      // window.localStorage.setItem('business_num', business_num)
      // let url = process.env.basePath + 'bp_bind_check'
      // let param = {
      // 'master': {
      // bp_class: 'NP',
      // bp_type: vm.baseInfo.bp_type,
      // business_num: business_num,
      // },
      // }
      // vm.hlsPopup.showLoading('正在校验数据有效性')
      // vm.hlsHttp.post(url, param).then(function (res) {
      // vm.hlsPopup.hideLoading()
      // if (res.result === 'S') {
      vm.$router.push({
      name: 'NPInvoiceInfo',
      var business_num = ''
      if (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA') {
      business_num = vm.baseInfo.agent_username
      } else if (vm.baseInfo.bp_type === 'AGENT' || vm.baseInfo.bp_type === 'FACTORY') {
      business_num = vm.baseInfo.business_license_num
      } else if (vm.baseInfo.bp_type === 'OFFICE') {
      business_num = vm.baseInfo.business_license_num
      }
      window.localStorage.setItem('business_num', business_num)
      let url = process.env.basePath + 'bp_bind_check'
      let param = {
      'master': {
      bp_class: 'NP',
      bp_type: vm.baseInfo.bp_type,
      business_num: business_num,
      },
      }
      vm.hlsPopup.showLoading('正在校验数据有效性')
      vm.hlsHttp.post(url, param).then(function (res) {
      vm.hlsPopup.hideLoading()
      if (res.result === 'S') {
      vm.$router.push({
      name: 'NPInvoiceInfo',
      })
      } else {
      hlsPopup.showError(res.message)
      }
      })
      // } else {
      // hlsPopup.showError(res.message)
      // }
      // })
      },
      async saveProtocol () {
      let vm = this
      ......@@ -1640,11 +1631,31 @@ export default {
      }
      .add-people{
      display: flex;
      justify-content: start;
      justify-content: flex-start;
      align-items: center;
      img{
      // width:23px;
      flex-shrink:0;
      margin-left:10px;
      // margin-left:10px;
      float: right;
      }
      .people-list{
      width:100%;
      display: flex;
      justify-content: flex-start;
      flex-flow: row wrap;
      }
      span {
      // display: inline-block;
      padding: 1px 5px;
      border-radius: 5px;
      text-align: center;
      line-height: 20px;
      background-color: rgba(220, 220, 221, 0.26);
      color: #666;
      margin-right: 5px;
      margin-top: 3px;
      font-size: 14px;
      }
      }
      .type-save{
      ......
      src/pages/userBindNew/org/baseInfo.vue
      View file @ 9ffd3ff3
      ......@@ -47,8 +47,8 @@
      </item>
      <item v-if="bp_type_flag">
      <div slot="name" class="required">业务经办人</div>
      <!-- <input slot="content" v-model="baseInfo.agent_username" placeholder="请输入业务经办员工代码" > -->
      <div slot="content" class="add-people"><input v-model="baseInfo.agent_username"><img src="@/assets/contractCreate/add1.png" @click="inputNum=true"></div>
      <input slot="content" v-model="baseInfo.agent_username" placeholder="请输入业务经办员工代码" >
      <!-- <div slot="content" class="add-people"><input v-model="baseInfo.agent_username"><img src="@/assets/contractCreate/add1.png" @click="inputNum=true"></div> -->
      <!-- -->
      </item>
      <!-- <item v-if="bp_type_flag">
      ......@@ -424,12 +424,12 @@
      <!-- <tab-button class="put" @click.native="handSubmit">提交</tab-button> -->
      <tab-button class="save" @click.native="verified(false)">下一步</tab-button>
      </bottom-tab>
      <InputNum
      <!-- <InputNum
      v-show="inputNum"
      ref="inputtNum"
      @roleCancle="roleCancle"
      @roleConfirm="roleConfirm"
      />
      /> -->
      </h-view>
      </template>
      ......@@ -933,35 +933,35 @@ export default {
      // 基本信息保存前校验
      bindCheck () {
      let vm = this
      // var business_num = ''
      // if (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA') {
      // business_num = vm.baseInfo.agent_username
      // }
      // window.localStorage.setItem('business_num', business_num)
      // let url = process.env.basePath + 'bp_bind_check'
      // let param = {
      // 'master': {
      // bp_class: 'ORG',
      // bp_type: vm.baseInfo.bp_type,
      // business_num: business_num,
      // },
      // }
      // vm.hlsPopup.showLoading('正在校验数据有效性')
      // vm.hlsHttp.post(url, param).then(function (res) {
      // vm.hlsPopup.hideLoading()
      // if (res.result === 'S') {
      vm.$router.push({
      name: 'Invoice',
      params: {
      bp_id: vm.bp_id,
      organization_code: vm.baseInfo.organization_code,
      from: vm.from,
      bp_name: vm.baseInfo.bp_name,
      var business_num = ''
      if (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA') {
      business_num = vm.baseInfo.agent_username
      }
      window.localStorage.setItem('business_num', business_num)
      let url = process.env.basePath + 'bp_bind_check'
      let param = {
      'master': {
      bp_class: 'ORG',
      bp_type: vm.baseInfo.bp_type,
      business_num: business_num,
      },
      // })
      // } else {
      // hlsPopup.showError(res.message)
      // }
      }
      vm.hlsPopup.showLoading('正在校验数据有效性')
      vm.hlsHttp.post(url, param).then(function (res) {
      vm.hlsPopup.hideLoading()
      if (res.result === 'S') {
      vm.$router.push({
      name: 'Invoice',
      params: {
      bp_id: vm.bp_id,
      organization_code: vm.baseInfo.organization_code,
      from: vm.from,
      bp_name: vm.baseInfo.bp_name,
      },
      })
      } else {
      hlsPopup.showError(res.message)
      }
      })
      },
      // 校验手机号
      ......
      www/index.html
      View file @ 9ffd3ff3
      <!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=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.af8a53ee9b126166bc7296ffde1bbdfb.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.6a178e8d77c32e3c385d.js></script><script type=text/javascript src=./static/js/vendor.8a1ae113e3b5262701ed.js></script><script type=text/javascript src=./static/js/app.c5ce206e65cc811322b1.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=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.cb4b414f6aa1c0c2cabfa58644824037.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.6a178e8d77c32e3c385d.js></script><script type=text/javascript src=./static/js/vendor.8a1ae113e3b5262701ed.js></script><script type=text/javascript src=./static/js/app.046abfed6be0c0834c4f.js></script></body></html>
      \ No newline at end of file
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment