Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

0b897052 · 李晓兵 · 65699cfa · 2c90628c · 0b897052 · 0b897052
Commit 0b897052 authored Dec 27, 2019 by 李晓兵
4 changed files
--- a/src/pages/contractCreate/add-undertake.vue
+++ b/src/pages/contractCreate/add-undertake.vue
@@ -35,7 +35,7 @@ export default {
  data () {
    return {
      undertakeList: [], // 担保人列表
-      selectUdertake: [],
+      selectUdertake: {},
      pagenum: 1,
      keyWord: '',
      showFlag: false,
@@ -105,20 +105,7 @@ export default {
      })
    },
    addUndertake (e) {
-      if (this.selectUdertake.length === 0) {
-        this.selectUdertake.push(e)
-      } else {
-        let index = this.selectUdertake.findIndex(item => {
-          if (item.bp_name === e.bp_name) {
-            return true
-          }
-        })
-        if (index !== -1) {
-          hlsPopup.showLongCenter('您已添加了该担保人')
-        } else {
-          this.selectUdertake.push(e)
-        }
-      }
+      this.selectUdertake = e
      this.$emit('addUnder', this.selectUdertake)
      setTimeout(() => {
        this.showFlag = false
@@ -167,7 +154,7 @@ export default {
  },
 }
 </script>
-<style lang="less" scoped>
+<style lang="less">
 #add-person {
  position: absolute;
  top:0;
@@ -182,7 +169,6 @@ export default {
    width: 100%;
    height: 1.02rem;
    z-index: 100;
-    margin-bottom: 8px;
    input {
      background: url("../../assets/contractStart/search1.png") 320px no-repeat;
      background-size: 16px 16px;
@@ -211,5 +197,57 @@ export default {
      border: 2px solid #bcc6ff;
    }
  }
+   .content {
+    position: absolute;
+    top: 0;
+  }
+   .scrollContent {
+       padding-top: 1rem;
+    padding-bottom: 120px;
+  }
+  .tab-style {
+    width: 100%;
+    position: absolute;
+  }
+}
+.platform-ios {
+  #confirmList {
+    .scrollContent {
+      padding-top: 1.4rem;
+    }
+  }
+}
+@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
+  .platform-ios {
+    #person {
+      .scrollContent {
+        padding-top: 1.8rem;
+      }
+    }
+  }
+}
+// iPhoneXR适配
+@media (device-width: 414px) and (device-height: 896px) {
+  .platform-ios {
+    #person {
+      .scrollContent {
+        padding-top: 1.8rem;
+      }
+      .search {
+        input {
+          background: url("../../assets/contractStart/search1.png") 320px
+            no-repeat;
+          background-size: 16px 16px;
+          background-color: rgba(239, 239, 239, 0.55);
+          padding: 8px 12px;
+          border-radius: 4px;
+          width: 100%;
+          font-family: PingFangSC-Regular;
+          font-size: 14px;
+          color: #888c8f;
+        }
+      }
+    }
+  }
 }
 </style>
--- a/src/pages/contractCreate/creat-rent-info.vue
+++ b/src/pages/contractCreate/creat-rent-info.vue
@@ -25,7 +25,7 @@
      </div>
      <div class="userInfo">租赁产品</div>
      <list-item :item-height="44">
-        <item v-if="!isReadOnly":showArrow="true" @click.native="selectProductLine">
+        <item v-if="!isReadOnly" :showArrow="true" @click.native="selectProductLine">
          <div slot="name">产品线</div>
          <input slot="content" v-model="saveInfo.division_n" readonly placeholder="请选择" >
        </item>
@@ -43,7 +43,7 @@
        </item>
        <item>
          <div slot="name">产品数量</div>
-          <input slot="content" v-model="productInfo.product_num" placeholder="请填写产品数量" >
+          <input slot="content" v-model="productInfo.product_num" :readonly="isReadOnly" placeholder="请填写产品数量" >
        </item>
      </list-item>
      <div class="userInfo">融资信息</div>
@@ -51,67 +51,89 @@
        <img src="@/assets/contractCreate/hint.png" >提示 以下为单个设备商务政策
      </div>
      <list-item :item-height="44">
-        <item :showArrow="true" @click.native="getBusinessPolicy();showModalBusiness=true">
+        <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="请选择" >
+        </item>
+        <item v-if="isReadOnly">
          <div slot="name">商务政策</div>
          <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" 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" 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" 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" placeholder="0" @input="changeRatio" />
+          <CurrencyInput
+            slot="content" v-model="saveInfo.down_payment" :readonly="isReadOnly" placeholder="0"
+            @input="changeRatio" />
        </item>
        <item>
          <div slot="name">保证金比例</div>
-          <input slot="content" v-model="saveInfo.deposit_ratio_n" placeholder="%" >
+          <input slot="content" v-model="saveInfo.deposit_ratio_n" :readonly="isReadOnly" placeholder="%" >
        </item>
        <item>
          <div slot="name">保证金</div>
-          <CurrencyInput slot="content" v-model="saveInfo.deposit" placeholder="0" @input="changeDeposit"/>
+          <CurrencyInput
+            slot="content" v-model="saveInfo.deposit" :readonly="isReadOnly" placeholder="0"
+            @input="changeDeposit"/>
        </item>
        <item>
          <div slot="name">手续费比例</div>
-          <input slot="content" v-model="saveInfo.lease_charge_ratio_n" placeholder="%" >
+          <input slot="content" v-model="saveInfo.lease_charge_ratio_n" :readonly="isReadOnly" placeholder="%" >
        </item>
        <item>
          <div slot="name">手续费</div>
-          <CurrencyInput slot="content" v-model="saveInfo.lease_charge" placeholder="0" @input="changeLeaseCharge"/>
+          <CurrencyInput
+            slot="content" v-model="saveInfo.lease_charge" :readonly="isReadOnly" placeholder="0"
+            @input="changeLeaseCharge"/>
        </item>
        <item>
          <div slot="name">GPS费用</div>
-          <CurrencyInput slot="content" v-model="saveInfo.gps_fee" 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" placeholder="0" />
+          <CurrencyInput slot="content" v-model="saveInfo.insurance_fee" :readonly="isReadOnly" placeholder="0" />
        </item>
-        <item class="date-check" @click.native="showTime('YYYY-MM-DD')">
+        <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="请选择日期 " >
        </item>
-        <item :showArrow="true" @click.native = "periodPull">
+        <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">
+          <div slot="name">还款周期</div>
+          <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="请选择" >
        </item>
        <item>
          <div slot="name">租赁期数</div>
-          <input slot="content" v-model="saveInfo.lease_times" 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="%" >
        </item>
-        <item :showArrow="true" @click.native="selectPayWay">
+        <item v-if="!isReadOnly" :showArrow="true" @click.native="selectPayWay">
+          <div slot="name">支付方式</div>
+          <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="请选择" >
        </item>
@@ -121,7 +143,7 @@
        </item>
        <item>
          <div slot="name">留购价</div>
-          <CurrencyInput slot="content" v-model="saveInfo.residual_value" placeholder="请填写留购价" />
+          <CurrencyInput slot="content" v-model="saveInfo.residual_value" :readonly="isReadOnly" placeholder="请填写留购价" />
        </item>
        <item :showArrow="true" @click.native="goPlan">
          <div slot="name">查看还款计划</div>
@@ -130,7 +152,7 @@
      </list-item>
    </h-content>
    <bottom-tab class="add-box">
-      <tab-button class="before" @click.native="save">计算</tab-button>
+      <tab-button v-if="!isReadOnly" class="before" @click.native="save">计算</tab-button>
      <tab-button class="next" @click.native="next">下一步</tab-button>
    </bottom-tab>
    <h-modal ref="modal" v-model="showModalValue" class="flow" position="bottom">
@@ -277,6 +299,7 @@ export default {
        pay_type_n: '',
        residual_value: '',
        division_n: '',
+        division: '',
        finance_amount: '',
      },
    }
@@ -432,9 +455,35 @@ export default {
    },
    next () {
      let vm = this
+      if (vm.isReadOnly) {
+        vm.$router.push({
+          name: 'CreateEnclosureInfo',
          // vm.$router.push({
          //   name: 'CreateEnclosureInfo',
          // })
+        })
+      }
+      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.$router.push({
+              name: 'CreateEnclosureInfo',
+            })
+          } else {
+            hlsPopup.showLongCenter(res.message)
+          }
+        })
+      } else {
        if (vm.isComputed) {
          let url = process.env.basePath + 'prj_product_info_save'
          let param = {
@@ -454,6 +503,7 @@ export default {
        } else {
          hlsPopup.showLongCenter('请先进行计算')
        }
+      }
    },
    showTime (format) { // 预计付款日
      let vm = this
@@ -638,6 +688,7 @@ export default {
        '&index' +
        `'${randomString}'`
      let param = {
+        division: vm.saveInfo.division,
        user_phone: window.localStorage.getItem('user_phone'),
        pagesize: 10,
        pagenum: vm.pagenumSearch,
@@ -679,6 +730,7 @@ export default {
        '&index' +
        `'${randomString}'`
      let param = {
+        division: vm.saveInfo.division,
        user_phone: window.localStorage.getItem('user_phone'),
        pagesize: 10,
        pagenum: vm.pagenum,

--- a/src/pages/contractCreate/create-base-info.vue
+++ b/src/pages/contractCreate/create-base-info.vue
@@ -383,8 +383,7 @@ export default {
      vm.pageNum = 1
      vm.pageNumSearch = 1
      vm.undertakeList = []
-      vm.bp_class = 'NP'
-      // vm.bp_class = window.localStorage.bp_class_tenant
+      vm.bp_class = window.localStorage.bp_class_tenant
      if (from.name === 'SalesInfo') {
        vm.fromPutted = false
        Object.keys(vm.saveInfo).forEach(i => {
@@ -434,7 +433,7 @@ export default {
      if (index !== -1) {
        hlsPopup.showLongCenter('您已添加了该担保人')
      } else {
-        this.selectUdertake.push(...e)
+        this.selectUdertake.push(e)
      }
    },
    addPerson () {
@@ -488,6 +487,7 @@ export default {
              name: 'CreateRentInfo',
              params: {
                bp_agent_id: vm.bp_agent_id,
+                bp_name: vm.NPBaseInfo.bp_name,
              },
            })
          } else {

--- a/src/pages/contractCreate/create-enclosure-info.vue
+++ b/src/pages/contractCreate/create-enclosure-info.vue
@@ -685,6 +685,9 @@ export default {
          }
        }
  }
+  .house:nth-of-type(2) {
+    margin-top: 0
+  }
  .house:last-child {
    margin-top: 0
  }