'问题修复'

cf158cce · 李晓兵 · ed6810c4 · cf158cce · cf158cce · cf158cce
Commit cf158cce authored Dec 31, 2019 by 李晓兵
14 changed files
--- a/config/prod.env.js
+++ b/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"'
 }
--- a/src/pages/carConfirm/confirm-detail.vue
+++ b/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: () => {
+        content: '请自拍一张',
+        onConfirm: function (index) {
+          if (index === 1) {
            vm.takePhontoOpenCamera()
+          } else {
+
+          }
        },
      })
    },
@@ -398,7 +419,10 @@ export default {
        hlsPopup.hideLoading()
      }
    },
-    isConfirm () {
+    async isConfirm () {
+      let vm = this
+      let flag = await this.signCheck()
+      if (flag) { // 只有认证通过后方可进行签约操作
        this.hlsPopup.showConfirm({
          title: '提示',
          content: '您确定同意发车吗？',
@@ -408,6 +432,7 @@ export default {
            }
          },
        })
+      }
    },
    confirm () {
      let vm = this

--- a/src/pages/contractCreate/creat-rent-info.vue
+++ b/src/pages/contractCreate/creat-rent-info.vue
@@ -2,22 +2,22 @@
  <h-view id="create-rent-info">
    <h-header :proportion="[5,1,1]" class="bar-custom">
      <div slot="left" class="h-header-btn">
-        <img src="@/assets/userBind/arrow.png" @click="routeGoCustom()" >
+        <img src="@/assets/userBind/arrow.png" @click="routeGoCustom()">
        <span>租赁信息</span>
      </div>
    </h-header>
    <h-content>
      <div class="top">
        <div class="item">
-          <img src="@/assets/contractCreate/finished.png" >
+          <img src="@/assets/contractCreate/finished.png">
          <p>基本信息</p>
        </div>
-        <span class="line" />
+        <span class="line"/>
        <div class="item">
          <span>2</span>
          <p style="color: #383F45;">租赁信息</p>
        </div>
-        <span class="line" />
+        <span class="line"/>
        <div class="item">
          <span>3</span>
          <p>附件信息</p>
@@ -27,7 +27,7 @@
      <list-item :item-height="44">
        <item v-if="!isReadOnly" :showArrow="true" @click.native="selectProductLine">
          <div slot="name">产品线</div>
-          <input slot="content" v-model="saveInfo.division_n" readonly placeholder="请选择" >
+          <input slot="content" v-model="saveInfo.division_n" readonly placeholder="请选择">
        </item>
        <item v-if="isReadOnly">
          <div slot="name">产品线</div>
@@ -35,51 +35,51 @@
        </item>
        <item v-if="!isReadOnly" :showArrow="true" @click.native="getProduct">
          <div slot="name">产品型号</div>
-          <input slot="content" v-model="productInfo.product_id_n" readonly placeholder="请选择" >
+          <input slot="content" v-model="saveInfo.product_id_n" readonly placeholder="请选择">
        </item>
        <item v-if="isReadOnly" :showArrow="true">
          <div slot="name">产品型号</div>
-          <input slot="content" v-model="productInfo.product_id_n" readonly >
+          <input slot="content" v-model="saveInfo.product_id_n" readonly>
        </item>
        <item>
          <div slot="name">产品数量</div>
-          <input slot="content" v-model="productInfo.product_num" :readonly="isReadOnly" placeholder="请填写产品数量" >
+          <input slot="content" v-model="saveInfo.product_num" :readonly="isReadOnly" placeholder="请填写产品数量">
        </item>
      </list-item>
      <div class="userInfo">融资信息</div>
      <div class="hint-info">
-        <img src="@/assets/contractCreate/hint.png" >提示 以下为单个设备商务政策
+        <img src="@/assets/contractCreate/hint.png">提示 以下为单个设备商务政策
      </div>
      <list-item :item-height="44">
        <item v-if="!isReadOnly" :showArrow="true" @click.native="getBusinessPolicy();showModalBusiness=true">
          <div slot="name">商务政策</div>
-          <input slot="content" v-model="saveInfo.product_plan_name" readonly placeholder="请选择" >
+          <input slot="content" v-model="saveInfo.product_plan_name" readonly placeholder="请选择">
        </item>
        <item v-if="isReadOnly">
          <div slot="name">商务政策</div>
-          <input slot="content" v-model="saveInfo.product_plan_name" readonly placeholder="请选择" >
+          <input slot="content" v-model="saveInfo.product_plan_name" readonly placeholder="请选择">
        </item>
        <item>
          <div slot="name">设备单价</div>
-          <CurrencyInput slot="content" v-model="saveInfo.equip_price" :readonly="isReadOnly" placeholder="0" />
+          <CurrencyInput slot="content" v-model="saveInfo.equip_price" :readonly="isReadOnly" placeholder="0"/>
        </item>
        <item>
          <div slot="name">融资金额</div>
-          <CurrencyInput slot="content" v-model="finance_amount" :readonly="isReadOnly" placeholder="0" />
+          <CurrencyInput slot="content" v-model="finance_amount" :readonly="isReadOnly" placeholder="0"/>
        </item>
        <item>
          <div slot="name">首付比例</div>
-          <input slot="content" v-model="saveInfo.down_payment_ratio_n" :readonly="isReadOnly" placeholder="%" >
+          <input slot="content" v-model="saveInfo.down_payment_ratio_n" :readonly="isReadOnly" placeholder="%">
        </item>
        <item>
          <div slot="name">首付款</div>
          <CurrencyInput
            slot="content" v-model="saveInfo.down_payment" :readonly="isReadOnly" placeholder="0"
-            @input="changeRatio" />
+            @input="changeRatio"/>
        </item>
        <item>
          <div slot="name">保证金比例</div>
-          <input slot="content" v-model="saveInfo.deposit_ratio_n" :readonly="isReadOnly" placeholder="%" >
+          <input slot="content" v-model="saveInfo.deposit_ratio_n" :readonly="isReadOnly" placeholder="%">
        </item>
        <item>
          <div slot="name">保证金</div>
@@ -89,7 +89,7 @@
        </item>
        <item>
          <div slot="name">手续费比例</div>
-          <input slot="content" v-model="saveInfo.lease_charge_ratio_n" :readonly="isReadOnly" placeholder="%" >
+          <input slot="content" v-model="saveInfo.lease_charge_ratio_n" :readonly="isReadOnly" placeholder="%">
        </item>
        <item>
          <div slot="name">手续费</div>
@@ -99,55 +99,55 @@
        </item>
        <item>
          <div slot="name">GPS费用</div>
-          <CurrencyInput slot="content" v-model="saveInfo.gps_fee" :readonly="isReadOnly" placeholder="0" />
+          <CurrencyInput slot="content" v-model="saveInfo.gps_fee" :readonly="isReadOnly" placeholder="0"/>
        </item>
        <item>
          <div slot="name">保险押金</div>
-          <CurrencyInput slot="content" v-model="saveInfo.insurance_fee" :readonly="isReadOnly" placeholder="0" />
+          <CurrencyInput slot="content" v-model="saveInfo.insurance_fee" :readonly="isReadOnly" placeholder="0"/>
        </item>
        <item v-if="!isReadOnly" class="date-check" @click.native="showTime('YYYY-MM-DD')">
          <div slot="name">预计付款日</div>
-          <input slot="content" v-model="saveInfo.lease_start_date" readonly placeholder="请选择日期 " >
+          <input slot="content" v-model="saveInfo.lease_start_date" readonly placeholder="请选择日期 ">
        </item>
        <item v-if="isReadOnly" class="date-check">
          <div slot="name">预计付款日</div>
          <input slot="content" v-model="saveInfo.lease_start_date" readonly>
        </item>
-        <item v-if="!isReadOnly" :showArrow="true" @click.native = "periodPull">
+        <item v-if="!isReadOnly" :showArrow="true" @click.native="periodPull">
          <div slot="name">还款周期</div>
-          <input slot="content" v-model="saveInfo.annual_pay_times_n" readonly placeholder="请选择" >
+          <input slot="content" v-model="saveInfo.annual_pay_times_n" readonly placeholder="请选择">
        </item>
        <item v-if="isReadOnly">
          <div slot="name">还款周期</div>
-          <input slot="content" v-model="saveInfo.annual_pay_times_n" readonly placeholder="请选择" >
+          <input slot="content" v-model="saveInfo.annual_pay_times_n" readonly placeholder="请选择">
        </item>
        <item>
          <div slot="name">租赁期数</div>
-          <input slot="content" v-model="saveInfo.lease_times" :readonly="isReadOnly" placeholder="请填写租赁期数" >
+          <input slot="content" v-model="saveInfo.lease_times" :readonly="isReadOnly" placeholder="请填写租赁期数">
        </item>
        <item>
          <div slot="name">年利率</div>
-          <input slot="content" v-model="saveInfo.int_rate_n" readonly placeholder="%" >
+          <input slot="content" v-model="saveInfo.int_rate_n" readonly placeholder="%">
        </item>
        <item v-if="!isReadOnly" :showArrow="true" @click.native="selectPayWay">
          <div slot="name">支付方式</div>
-          <input slot="content" v-model="saveInfo.pay_type_n" readonly placeholder="请选择" >
+          <input slot="content" v-model="saveInfo.pay_type_n" readonly placeholder="请选择">
        </item>
        <item v-if="isReadOnly">
          <div slot="name">支付方式</div>
-          <input slot="content" v-model="saveInfo.pay_type_n" readonly placeholder="请选择" >
+          <input slot="content" v-model="saveInfo.pay_type_n" readonly placeholder="请选择">
        </item>
        <item>
          <div slot="name">逾期日利率</div>
-          <input slot="content" v-model="saveInfo.penalty_rate_n" readonly placeholder="%" >
+          <input slot="content" v-model="saveInfo.penalty_rate_n" readonly placeholder="%">
        </item>
        <item>
          <div slot="name">留购价</div>
-          <CurrencyInput slot="content" v-model="saveInfo.residual_value" :readonly="isReadOnly" placeholder="请填写留购价" />
+          <CurrencyInput slot="content" v-model="saveInfo.residual_value" :readonly="isReadOnly" placeholder="请填写留购价"/>
        </item>
        <item :showArrow="true" @click.native="goPlan">
          <div slot="name">查看还款计划</div>
-          <input slot="content" readonly >
+          <input slot="content" readonly>
        </item>
      </list-item>
    </h-content>
@@ -164,7 +164,7 @@
        </h-header>
        <h-content>
          <div class="search has-header">
-            <input v-model="keyWordProduct" placeholder="请输入产品名称" >
+            <input v-model="keyWordProduct" placeholder="请输入产品名称">
          </div>
          <div class="division-box">
            <scroll ref="scroll" :updateData="[divisionLists]" :pullUp="true" @pullingUp="loadMoreProduct">
@@ -191,7 +191,8 @@
                  </div>
                </item>
              </list-item>
-          </scroll></div>
+            </scroll>
+          </div>
        </h-content>
      </h-view>
    </h-modal>
@@ -203,14 +204,14 @@
        </h-header>
        <h-content>
          <div class="search has-header">
-            <input v-model="policyKeyWord" placeholder="请输入商务政策名称" >
+            <input v-model="policyKeyWord" placeholder="请输入商务政策名称">
          </div>
          <scroll ref="scroll" :updateData="[businessLists]" :pullUp="true" @pullingUp="loadMorePolicy">

            <div class="division-box">
              <section v-for="(item,index) in businessLists" :key="index" @click="selectBusinessPolicy(item)">
                <div class="descript">
-                  <img src="@/assets/trial/product.png" alt >
+                  <img src="@/assets/trial/product.png" alt>
                  <p class="produc">{{ item.product_plan_name }}</p>
                </div>
                <div class="tario">
@@ -236,7 +237,8 @@
                  </div>
                </div>
              </section>
-          </div></scroll>
+            </div>
+          </scroll>
        </h-content>
      </h-view>
    </h-modal>
@@ -244,6 +246,7 @@
 </template>
 <script>
 import CurrencyInput from '../../components/currencyInput'
+
 export default {
  components: {
    CurrencyInput,
@@ -270,14 +273,17 @@ export default {
      paywayLists: [], // 支付方式
      divisionLists: [],
      productLine: [], // 产品线
-      productInfo: {
+      /* productInfo: {
           project_id: window.localStorage.project_id,
           product_id: '',
           product_id_n: '',
           product_num: '',
-      },
+         }, */
      saveInfo: {
        project_id: window.localStorage.project_id,
+        product_id: '',
+        product_id_n: '',
+        product_num: '',
        product_plan_id: '',
        product_plan_name: '',
        equip_price: '',
@@ -355,11 +361,12 @@ export default {
      vm.pagenum = 1
      vm.pagenumPolicy = 1
      vm.saveInfo['project_id'] = window.localStorage.project_id // 重新赋值，防止缓存
-      vm.productInfo['project_id'] = window.localStorage.project_id // 重新赋值，防止缓存
+      // vm.productInfo['project_id'] = window.localStorage.project_id // 重新赋值，防止缓存
      if (from.name === 'CreateBaseInfo') {
        vm.isComputed = false
        vm.calculeFlag = false
        vm.salesEnter = vm.$route.params.salesEnter
+        vm.bp_agent_id = vm.$route.params.bp_agent_id
        vm.saveTed = false
        if (vm.fromPage === 'sale') {
          vm.fromList = false
@@ -367,18 +374,17 @@ export default {
          vm.fromList = true
          vm.rentInfoQuery()
        }
-        console.log('****************** '+JSON.stringify(vm.saveInfo))
        Object.keys(vm.saveInfo).forEach(i => { // 置空saveInfo
          if (i !== 'project_id') {
            vm.saveInfo[i] = ''
          }
        })
-        console.log('@@@@@@@@@@@@@@@@@@'+JSON.stringify(vm.saveInfo))
+        /* console.log('@@@@@@@@@@@@@@@@@@'+JSON.stringify(vm.saveInfo))
           Object.keys(vm.productInfo).forEach(i => { // 置空productInfo
             if (i !== 'project_id') {
               vm.productInfo[i] = ''
             }
-        })
+           }) */
        setTimeout(() => {
          vm.getProductLine() // 产品线查询
          vm.repayPeriod()// 还款周期查询
@@ -427,9 +433,9 @@ export default {
        vm.hlsPopup.hideLoading()
        if (res.result === 'S') {
          Object.assign(vm.saveInfo, res.info)
-          vm.productInfo.product_num = res.info.product_num
+          /*  vm.productInfo.product_num = res.info.product_num
              vm.productInfo.product_id = res.info.product_id
-          vm.productInfo.product_id_n = res.info.product_id_n
+              vm.productInfo.product_id_n = res.info.product_id_n */
          vm.saveInfo.product_plan_name = res.info.product_plan_id_n
          vm.saveInfo.division_n = res.info.product_name
        } else {
@@ -456,7 +462,7 @@ export default {
        vm.showModalBusiness = false
      }, 100)
    },
-    calculateBack(){
+    calculateBack () {
      let vm = this
      let url = process.env.basePath + 'prj_lease_info_save'
      vm.saveInfo.down_payment_ratio = (vm.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2)
@@ -477,6 +483,43 @@ export default {
    },
    save () {
      let vm = this
+      if (!vm.saveInfo.division_n) {
+        hlsPopup.showLongCenter('产品线不能为空!')
+      } else if (!vm.saveInfo.product_id_n) {
+        hlsPopup.showLongCenter('产品型号不能为空!')
+      } else if (!vm.saveInfo.product_num) {
+        hlsPopup.showLongCenter('产品数量不能为空!')
+      } else if (!vm.saveInfo.product_plan_name) {
+        hlsPopup.showLongCenter('商务政策不能为空!')
+      } else if (!vm.saveInfo.equip_price) {
+        hlsPopup.showLongCenter('设备单价不能为空!')
+      } else if (!vm.saveInfo.down_payment_ratio_n) {
+        hlsPopup.showLongCenter('首付比例不能为空!')
+      } else if (!vm.saveInfo.down_payment) {
+        hlsPopup.showLongCenter('首付款不能为空!')
+      } else if (!vm.saveInfo.deposit_ratio_n) {
+        hlsPopup.showLongCenter('保证金比例不能为空!')
+      } else if (!vm.saveInfo.deposit) {
+        hlsPopup.showLongCenter('保证金不能为空!')
+      } else if (!vm.saveInfo.lease_charge_ratio_n) {
+        hlsPopup.showLongCenter('手续费比例不能为空!')
+      } else if (!vm.saveInfo.lease_charge) {
+        hlsPopup.showLongCenter('手续费不能为空!')
+      } else if (!vm.saveInfo.gps_fee) {
+        hlsPopup.showLongCenter('GPS费用不能为空!')
+      } else if (!vm.saveInfo.insurance_fee) {
+        hlsPopup.showLongCenter('保险押金不能为空!')
+      } else if (!vm.saveInfo.lease_start_date) {
+        hlsPopup.showLongCenter('预计付款日不能为空!')
+      } else if (!vm.saveInfo.annual_pay_times_n) {
+        hlsPopup.showLongCenter('还款周期不能为空!')
+      } else if (!vm.saveInfo.lease_times) {
+        hlsPopup.showLongCenter('租赁期数不能为空!')
+      } else if (!vm.saveInfo.pay_type_n) {
+        hlsPopup.showLongCenter('支付方式不能为空!')
+      } else if (!vm.saveInfo.residual_value) {
+        hlsPopup.showLongCenter('留购价不能为空!')
+      } else {
        let url = process.env.basePath + 'prj_lease_info_save'
        vm.saveInfo.down_payment_ratio = (vm.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2)
        vm.saveInfo.lease_charge_ratio = (vm.saveInfo.lease_charge_ratio_n.replace('%', '') / 100).toFixed(2)
@@ -497,17 +540,17 @@ export default {
            hlsPopup.showLongCenter(res.message)
          }
        })
+      }
    },
    saveBack () {
      let vm = this
-      vm.calculateBack() // 保存融资信息
-      let url = process.env.basePath + 'prj_product_info_save'
+      let url = process.env.basePath + 'prj_lease_info_save'
+      vm.saveInfo.down_payment_ratio = (vm.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2)
+      vm.saveInfo.lease_charge_ratio = (vm.saveInfo.lease_charge_ratio_n.replace('%', '') / 100).toFixed(2)
+      vm.saveInfo.deposit_ratio = (vm.saveInfo.deposit_ratio_n.replace('%', '') / 100).toFixed(2)
+      vm.saveInfo.finance_amount = vm.finance_amount
      let param = {
-        master: {
-          division_n: vm.saveInfo.division_n,
-          bp_name: vm.$route.params.bp_name,
-          ...vm.productInfo,
-        },
+        master: vm.saveInfo,
      }
      hlsPopup.showLoading('请稍候')
      vm.$post(url, param).then(function (res) {
@@ -521,6 +564,59 @@ export default {
      })
    },
    next () {
+      let vm = this
+      if (vm.isReadOnly) {
+        vm.$router.push({
+          name: 'CreateEnclosureInfo',
+        })
+      } else {
+        if (vm.isComputed) {
+          vm.saveTed = true
+          vm.$router.push({
+            name: 'CreateEnclosureInfo',
+          })
+        } else {
+          hlsPopup.showLongCenter('请先进行计算')
+        }
+      }
+    },
+    // next () {
+    //         let vm = this
+    //         if (vm.isReadOnly) {
+    //           vm.$router.push({
+    //             name: 'CreateEnclosureInfo',
+    //             // vm.$router.push({
+    //             //   name: 'CreateEnclosureInfo',
+    //             // })
+    //           })
+    //         } else {
+    //           if (vm.isComputed) {
+    //             let url = process.env.basePath + 'prj_product_info_save'
+    //             let param = {
+    //               master: {
+    //                 division_n: vm.saveInfo.division_n,
+    //                 bp_name: vm.$route.params.bp_name,
+    //                 ...vm.productInfo,
+    //               },
+    //             }
+    //             hlsPopup.showLoading('请稍候')
+    //             vm.$post(url, param).then(function (res) {
+    //               vm.hlsPopup.hideLoading()
+    //               if (res.result === 'S') {
+    //                 vm.saveTed = true
+    //                 vm.$router.push({
+    //                   name: 'CreateEnclosureInfo',
+    //                 })
+    //               } else {
+    //                 hlsPopup.showLongCenter(res.message)
+    //               }
+    //             })
+    //           } else {
+    //             hlsPopup.showLongCenter('请先进行计算')
+    //           }
+    //         }
+    //       },
+    /* next () {
             let vm = this
             if (vm.isReadOnly) {
               vm.$router.push({
@@ -555,7 +651,7 @@ export default {
                 hlsPopup.showLongCenter('请先进行计算')
               }
             }
-    },
+           }, */
    showTime (format) { // 预计付款日
      let vm = this
      hlsPopup.showTime({
@@ -648,7 +744,7 @@ export default {
          '&index' +
          `'${randomString}'`
      let param = {
-        bp_agent_id: vm.$route.params.bp_agent_id,
+        bp_agent_id: vm.bp_agent_id,
        pagesize: 10,
        pagenum: vm.pagenumSearchPolicy,
        searchInput: vm.policyKeyWord,
@@ -688,7 +784,7 @@ export default {
          '&index' +
          `'${randomString}'`
      let param = {
-        bp_agent_id: vm.$route.params.bp_agent_id,
+        bp_agent_id: vm.bp_agent_id,
        pagesize: 10,
        pagenum: vm.pagenumPolicy,
        searchInput: vm.policyKeyWord,
@@ -721,8 +817,8 @@ export default {
    },
    selectProduct (e) {
      let vm = this
-      this.productInfo.product_id_n = e.product_name
-      this.productInfo.product_id = e.product_id
+      this.saveInfo.product_id_n = e.product_name
+      this.saveInfo.product_id = e.product_id
      setTimeout(() => {
        vm.showModalValue = false
      }, 100)
@@ -788,7 +884,7 @@ export default {
          'prd_product_list' +
          '&index' +
          `'${randomString}'`
-      console.log('++++++++++++++++++++ '+vm.saveInfo.division)
+      console.log('++++++++++++++++++++ ' + vm.saveInfo.division)
      let param = {
        division: vm.saveInfo.division,
        user_phone: window.localStorage.getItem('user_phone'),
@@ -827,8 +923,8 @@ export default {
    },
    selectProductLine (e) {
      let vm = this
-      vm.productInfo.product_id = ''
-      vm.productInfo.product_id_n = ''
+      vm.saveInfo.product_id = ''
+      vm.saveInfo.product_id_n = ''
      vm.hlsPopup.selectList({
        list: vm.productLine,
        code: 'bp_type',
@@ -843,7 +939,7 @@ export default {
      let vm = this
      let url = process.env.basePath + 'prj_product_division'
      let param = {
-        bp_agent_id: vm.$route.params.bp_agent_id,
+        bp_agent_id: vm.bp_agent_id,
      }
      vm.hlsPopup.showLoading('请稍候')
      vm.hlsHttp.post(url, param).then(function (res) {
@@ -862,7 +958,7 @@ export default {
      this.$router.push({
        name: 'ContractRepayPlan',
        params: {
-          product_num: this.productInfo.product_num,
+          product_num: this.saveInfo.product_num,
          project_id: window.localStorage.project_id,
        },
      })
@@ -872,27 +968,33 @@ export default {
        name: 'CreateEnclosureInfo',
      })
    },
-  },
+  }
+  ,
 }
 </script>
 <style lang="less">
-#create-rent-info {
-  input{
-    color:#333;
+  #create-rent-info {
+    input {
+      color: #333;
    }
-  input::placeholder{
+
+    input::placeholder {
      color: #666;
    }
+
    .flow {
      z-index: 999;
    }
+
    .hls-list-item {
      margin-bottom: 0px !important;
    }
+
    .h-header-right {
      display: flex;
      align-items: center;
    }
+
    #businuss-list {
      .search {
        background-color: #fff;
@@ -901,9 +1003,9 @@ export default {
        height: 1.02rem;
        z-index: 100;
        margin-bottom: 8px;
+
        input {
-        background: url("../../assets/contractStart/search1.png") 320px
-          no-repeat;
+          background: url("../../assets/contractStart/search1.png") 320px no-repeat;
          background-size: 16px 16px;
          background-color: rgba(239, 239, 239, 0.55);
          padding-left: 12px;
@@ -924,13 +1026,13 @@ export default {
        }

        input:focus {
-        background: url("../../assets/contractStart/search2.png") 320px
-          no-repeat;
+          background: url("../../assets/contractStart/search2.png") 320px no-repeat;
          background-size: 16px 16px;
          background-color: rgba(239, 239, 239, 0.55);
          border: 2px solid #bcc6ff;
        }
      }
+
      .descript {
        width: 100%;
        height: 44px;
@@ -968,6 +1070,7 @@ export default {
          border-bottom: 1px solid #f3f3f7;
        }
      }
+
      .tario {
        width: 100%;
        height: 60px;
@@ -1000,10 +1103,12 @@ export default {
        }
      }
    }
+
    #product-list {
      .hls-list-item {
        border-radius: 4px;
      }
+
      .item-pic {
        width: 100px;
        //height: 110px;
@@ -1012,14 +1117,17 @@ export default {
          height: 100%;
        }
      }
+
      .item-content {
        width: 100%;
        margin-left: 20px;
+
        .pro-name {
          height: 42px;
          width: 100%;
          position: relative;
          border-bottom: 1px solid #f3f3f7;
+
          .arrow {
            position: absolute;
            width: 16px;
@@ -1027,6 +1135,7 @@ export default {
            right: 0;
            top: 13px;
          }
+
          p {
            height: 42px;
            line-height: 42px;
@@ -1046,6 +1155,7 @@ export default {
          display: flex;
          flex-direction: row;
          margin-top: 8px;
+
          .firsts1 {
            width: 60px;
            height: 17px;
@@ -1053,6 +1163,7 @@ export default {
            font-size: 13px;
            color: rgba(56, 63, 69, 0.6);
          }
+
          .seconds1 {
            width: 70%;
            margin-left: 16px;
@@ -1063,10 +1174,12 @@ export default {
          }
        }
      }
+
      .item {
        width: 359px;
        margin: 0 auto;
      }
+
      .search {
        background-color: #fff;
        padding: 8px 12px;
@@ -1074,9 +1187,9 @@ export default {
        height: 1.02rem;
        z-index: 100;
        margin-bottom: 8px;
+
        input {
-        background: url("../../assets/contractStart/search1.png") 320px
-          no-repeat;
+          background: url("../../assets/contractStart/search1.png") 320px no-repeat;
          background-size: 16px 16px;
          background-color: rgba(239, 239, 239, 0.55);
          padding-left: 12px;
@@ -1097,19 +1210,20 @@ export default {
        }

        input:focus {
-        background: url("../../assets/contractStart/search2.png") 320px
-          no-repeat;
+          background: url("../../assets/contractStart/search2.png") 320px no-repeat;
          background-size: 16px 16px;
          background-color: rgba(239, 239, 239, 0.55);
          border: 2px solid #bcc6ff;
        }
      }
    }
+
    .date-check {
      background: url("../../assets/trial/date.png") 350px no-repeat;
      background-size: 16px 16px;
      padding-right: 15px;
    }
+
    .hint-info {
      width: 100%;
      height: 36px;
@@ -1120,6 +1234,7 @@ export default {
      background-color: #faf5e0;
      display: flex;
      align-items: center;
+
      img {
        width: 16px;
        height: 16px;
@@ -1127,21 +1242,25 @@ export default {
        margin-right: 17px;
      }
    }
+
    .add-box {
      .before {
        border: 1px solid #fdb62f;
        border-radius: 4px;
        color: #fdb62f;
      }
+
      .next {
        background: #1d3fff;
        border-radius: 4px;
        color: #fff;
      }
    }
+
    .userInfo：first-of-type {
      margin-top: 10px;
    }
+
    .userInfo {
      height: 40px;
      line-height: 40px;
@@ -1151,6 +1270,7 @@ export default {
      margin-left: 16px;
      position: relative;
    }
+
    .userInfo::before {
      content: "";
      display: block;
@@ -1161,6 +1281,7 @@ export default {
      left: -15px;
      top: 12px;
    }
+
    .top {
      width: 100%;
      height: 81px;
@@ -1168,15 +1289,18 @@ export default {
      display: flex;
      justify-content: center;
      align-items: center;
+
      .line {
        display: inline-block;
        width: 78px;
        border-top: 1px solid #a4a4a4;
        margin-bottom: 18px;
      }
+
      .line:nth-of-type(1) {
        border-top: 1px solid #ffa000;
      }
+
      .item {
        display: flex;
        justify-content: center;
@@ -1186,9 +1310,11 @@ export default {
        font-size: 12px;
        color: rgba(56, 63, 69, 0.5);
        letter-spacing: 0.43px;
+
        img {
          width: 18px;
        }
+
        span {
          display: block;
          text-align: center;
@@ -1199,19 +1325,22 @@ export default {
          color: #fff;
          background: #a4a4a4;
        }
+
        p {
          margin-top: 10px;
        }
      }
+
      .item:not(:nth-of-type(3)) {
        font-family: PingFangSC-Semibold;
        font-size: 12px;
        color: rgba(56, 63, 69, 0.5);
        letter-spacing: 0.43px;
+
        span {
          background-color: #ffa000;
        }
      }
    }
-}
+  }
 </style>
--- a/src/pages/contractCreate/create-base-info.vue
+++ b/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 {

--- a/src/pages/contractCreate/create-enclosure-info.vue
+++ b/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) {

--- a/src/pages/contractCreate/sales-info.vue
+++ b/src/pages/contractCreate/sales-info.vue
@@ -442,14 +442,26 @@ export default {
    // 销售信息保存
    confirmCreate () {
      let vm = this
+      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,
        }
-      if (!this.lessee) {
-        hlsPopup.showLongCenter('请选择承租人')
-      } else {
        vm.hlsPopup.showLoading('请稍候')
        vm.hlsHttp.post(url, param).then(function (res) {
          vm.hlsPopup.hideLoading()

--- a/src/pages/contractRepayment/contract-repayment.vue
+++ b/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="">

--- a/src/pages/contractSigning/contract-detail.vue
+++ b/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.hlsHttp.post(url, param).then(function (res) {
-        if (res.result === 'E') {
-          vm.signCheckFlag = false
+      vm.hlsPopup.showLoading('请稍后!')
+      let res = vm.hlsHttp.post(url, param)
+      vm.hlsPopup.hideLoading()
+      if (res.result === 'S') {
+        return true
      } else {
-          vm.signCheckFlag = true
+       // vm.hlsPopup.showLongCenter(res.message)
      }
-      })
    },
    // 征信查询
    creditCheck () {
@@ -484,7 +485,7 @@ export default {
          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: () => {
+        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('请先进行认证')
      }
    },


--- a/src/pages/distributorSign/contract-details.vue
+++ b/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.hlsHttp.post(url, param).then(function (res) {
-        if (res.result === 'E') {
-          vm.signCheckFlag = false
+      vm.hlsPopup.showLoading('请稍后!')
+      let res = vm.hlsHttp.post(url, param)
+      vm.hlsPopup.hideLoading()
+      if (res.result === 'S') {
+        return true
      } else {
-          vm.signCheckFlag = true
+        // vm.hlsPopup.showLongCenter(res.message)
      }
-      })
    },
    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: () => {
+        content: '请自拍一张',
+        onConfirm: function (index) {
+          if (index === 1) {
            vm.takePhontoOpenCamera()
+          } else {
+
+          }
        },
      })
    },

--- a/src/pages/pay/firstPay/contract-record.vue
+++ b/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">

--- a/src/pages/pay/payment/contract-record.vue
+++ b/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;">

--- a/src/pages/pay/payment/new-list.vue
+++ b/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;">

--- a/src/pages/userBindNew/np/base-info.vue
+++ b/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
      ) {

--- 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.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.f077e854a2ebf290d10566b0c484f558.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.4208bb23106267f01494.js></script></body></html>
\ No newline at end of file