解决冲突

8dbbfcbb · linxin · 60446c13 · f3db6a2e · 8dbbfcbb · 8dbbfcbb
Commit 8dbbfcbb authored Oct 21, 2019 by linxin
12 changed files
--- a/src/assets/trial/date.png
+++ b/src/assets/trial/date.png
--- a/src/pages/contractSigning/contract-detail.vue
+++ b/src/pages/contractSigning/contract-detail.vue
+<!--
+ * @Author: your name
+ * @Date: 2019-09-29 10:02:11
+ * @LastEditTime: 2019-10-21 14:00:54
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ -->
 <template>
  <h-view id="contract-details" class="public-style">
    <div v-show="isshow" class="all">
@@ -23,51 +30,51 @@
      <list-item :item-height="44" class="second-part">
        <item>
          <div slot="name" >商务政策</div>
-          <section slot="content">零手续费产品</section>
+          <section slot="content">{{ conditionInfo.product_plan_id_n }}</section>
        </item>
        <item>
          <div slot="name" >设备总价</div>
-          <section slot="content">150,0000.00</section>
+          <section slot="content">{{ conditionInfo.equip_price | currency }}</section>
        </item>
        <item>
          <div slot="name" >融资金额</div>
-          <section slot="content">100,000.00</section>
+          <section slot="content">{{ Math.round(conditionInfo.finance_amount) | currency }}</section>
        </item>
        <item>
          <div slot="name" >首付款</div>
-          <section slot="content">100,000.00</section>
+          <section slot="content">{{ Math.round(conditionInfo.down_payment) | currency }}</section>
        </item>
        <item>
          <div slot="name" >保证金比例</div>
-          <section slot="content">10%</section>
+          <section slot="content">{{ conditionInfo.deposit_ratio_n }}</section>
        </item>
        <item>
          <div slot="name" >保证金</div>
-          <section slot="content">150,000.00</section>
+          <section slot="content">{{ Math.round(conditionInfo.deposit) | currency }}</section>
        </item>
        <item>
          <div slot="name" >手续费比例</div>
-          <section slot="content">5%</section>
+          <section slot="content">{{ conditionInfo.lease_charge_ratio_n }}</section>
        </item>
        <item>
          <div slot="name" >手续费</div>
-          <section slot="content">7,500.00</section>
+          <section slot="content">{{ Math.round(conditionInfo.lease_charge) | currency }}</section>
        </item>
        <item>
          <div slot="name" >预计付款日</div>
-          <section slot="content">2019-08-01</section>
+          <section slot="content">{{ conditionInfo.lease_start_date }}</section>
        </item>
        <item>
          <div slot="name" >还款周期</div>
-          <section slot="content">月</section>
+          <section slot="content">{{ conditionInfo.annual_pay_times_n }}</section>
        </item>
        <item>
          <div slot="name" >租赁期数</div>
-          <section slot="content">6</section>
+          <section slot="content">{{ conditionInfo.lease_times }}</section>
        </item>
        <item>
          <div slot="name" >年利率</div>
-          <section slot="content">6.5%</section>
+          <section slot="content">{{ conditionInfo.int_rate_n }}</section>
        </item>
      </list-item>
      <div class="repay-plan">
@@ -77,15 +84,15 @@
      <list-item :item-height="44" class="second-part">
        <item>
          <div slot="name" >参数项</div>
-          <section slot="content">GTZ226</section>
+          <section slot="content">{{ conditionInfo.product_code }}</section>
        </item>
        <item>
          <div slot="name" >产品线</div>
-          <section slot="content">起重机</section>
+          <section slot="content">{{ conditionInfo.product_name }}</section>
        </item>
        <item>
          <div slot="name" >产品数量</div>
-          <section slot="content">10</section>
+          <section slot="content">{{ conditionInfo.product_num }}</section>
        </item>
      </list-item>

@@ -94,8 +101,8 @@
          <img src="@/assets/constractSigning/work.png" alt="" style="width:32px">
        </div>
        <div class="center">
-          <p>业务经办：张三</p>
-          <p>联系电话：17890765336</p>
+          <p>业务经办：{{ conditionInfo.bp_user_id_n }}</p>
+          <p>联系电话：{{ conditionInfo.agent_phone }}</p>
        </div>
        <div class="right">
          <img src="@/assets/constractSigning/phone.png" alt="" style="width:30px">
@@ -164,6 +171,7 @@ export default {
    return {
      isshow: false, // 提示框的显示与隐藏
      num: 1,
+      conditionInfo: {},
      check1: Check1,
      check2: Check2,
      uncheck1: unCheck1,
@@ -172,7 +180,31 @@ export default {
  },
  computed: {},
  watch: {},
+  beforeRouteEnter (to, from, next) {
+    if (from.name === 'ContractSigning') {
+      next(vm => {
+        vm.conditionQuery()
+      })
+    }
+    next()
+  },
  methods: {
+    // 合同商务条件查询
+    conditionQuery () {
+      let vm = this
+      let url = $config.basePath + 'con_business_query'
+      let param = {
+        project_id: this.$route.params.project_id,
+      }
+      vm.hlsHttp.post(url, param).then(function (res) {
+        console.log('商务条件', res)
+        if (res.result === 'S') {
+          vm.conditionInfo = res.info
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
    // 跳转合同详情
    goContractContent (name) {
      this.$router.push({
@@ -194,7 +226,7 @@ export default {
  },
 }
 </script>
-<style lang='less' >
+<style lang='less' type="text/less">
 #contract-details {
  .all{
    position: absolute;

--- a/src/pages/contractSigning/contract-signing.vue
+++ b/src/pages/contractSigning/contract-signing.vue
+<!--
+ * @Author: your name
+ * @Date: 2019-09-29 10:02:11
+ * @LastEditTime: 2019-10-21 11:09:20
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ -->
 <template>
  <h-view class="contract-signing">
    <h-header :proportion="[5,1,1]" class="bar-custom">
@@ -17,26 +24,51 @@
      </div>
    </div>

-    <h-content>
-      <div v-for="(item,index) in contractMsg" :key="index" class="contract-list">
+    <h-content v-if="num === 1">
+      <div v-for="(item,index) in submitLists" :key="index" class="contract-list">
        <div class="item">
          <img src="@/assets/constractSigning/Incoming.png" alt="" style="height:18px">
          <p class="incoming-num">进件号</p>
-          <p class="code">{{ item.code }}</p>
+          <p class="code">{{ item.project_number }}</p>
        </div>
-        <div class="details">
+        <div class="details" @click="goDetails(item.project_id)">
          <div class="option">
            <p class="name">承租人</p>
-            <p class="full-name normal">{{ item.name }}</p>
+            <p class="full-name normal">{{ item.bp_name }}</p>
          </div>
-          <div class="option" @click="goDetails(index)">
+          <div class="option">
+            <p class="name">合同租金</p>
+            <p class="normal money">{{ item.total_price | currency }}</p>
+            <img src="@/assets/distributorSign/goDetails.png" alt="">
+          </div>
+          <div class="option">
+            <p class="name">申请时间</p>
+            <p class="normal">{{ item.confirm_start_date }}</p>
+          </div>
+        </div>
+      </div>
+    </h-content>
+
+    <h-content v-if="num === 2">
+      <div v-for="(item,index) in approvedLists" :key="index" class="contract-list">
+        <div class="item">
+          <img src="@/assets/constractSigning/Incoming.png" alt="" style="height:18px">
+          <p class="incoming-num">进件号</p>
+          <p class="code">{{ item.project_number }}</p>
+        </div>
+        <div class="details" @click="goDetails(item.project_id)">
+          <div class="option">
+            <p class="name">承租人</p>
+            <p class="full-name normal">{{ item.bp_name }}</p>
+          </div>
+          <div class="option">
            <p class="name">合同租金</p>
-            <p class="normal money">{{ item.money | currency }}</p>
+            <p class="normal money">{{ item.total_price | currency }}</p>
            <img src="@/assets/distributorSign/goDetails.png" alt="">
          </div>
          <div class="option">
            <p class="name">申请时间</p>
-            <p class="normal">{{ item.date }}</p>
+            <p class="normal">{{ item.confirm_start_date }}</p>
          </div>
        </div>
      </div>
@@ -58,25 +90,47 @@ export default {
      check2: Check2,
      uncheck1: unCheck1,
      uncheck2: unCheck2,
-      contractMsg: [
-        {name: '张三', money: 90000, date: '2019-03-1', code: '201903022001'},
-        {name: '李四', money: 90000, date: '2019-03-1', code: '201903022002'},
-        {name: '王五', money: 90000, date: '2019-03-1', code: '201903022003'},
-        {name: '赵六', money: 90000, date: '2019-03-1', code: '201903022004'},
-        {name: '张三', money: 90000, date: '2019-03-1', code: '201903022001'},
-        {name: '李四', money: 90000, date: '2019-03-1', code: '201903022002'},
-        {name: '王五', money: 90000, date: '2019-03-1', code: '201903022003'},
-        {name: '赵六', money: 90000, date: '2019-03-1', code: '201903022004'},
-      ],
+      submitLists: [],
+      approvedLists: [],
    }
  },
  activated () {

+  },
+  created () {
+
+  },
+  beforeRouteEnter (to, from, next) {
+    if (from.name === 'HomePage') {
+      next(vm => {
+        vm.contractList()
+      })
+    }
+    next()
  },
  methods: {
-    goDetails (index) {
+    contractList () {
+      let vm = this
+      let url = $config.basePath + 'con_confirm_list_query'
+      let param = {
+        user_phone: window.localStorage.user_phone,
+      }
+      vm.hlsHttp.post(url, param).then(function (res) {
+        console.log(res)
+        if (res.result === 'S') {
+          vm.submitLists = res.lists.filter(item => item.confirm_status === 'SUBMIT')
+          vm.approvedLists = res.lists.filter(item => item.confirm_status === 'APPROVED')
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    goDetails (val) {
      this.$router.push({
        name: 'ContractDetail',
+        params: {
+          project_id: val,
+        },
      })
    },
  },
@@ -187,8 +241,7 @@ export default {
      height: 120px;
      // border: 1px solid #ccc;
      background: #fff;
-    margin-top: 8px;
-
+      //margin-bottom: 8px;
      .item {
        width: 100%;
        height: 34px;
@@ -218,7 +271,7 @@ export default {
          font-size: 14px;
          color: #00469C;
          margin-left: 8px;
-        font-weight: 700;
+          font-weight: bolder
        }
      }

@@ -228,17 +281,18 @@ export default {
        display: flex;
        flex-direction: column;
        justify-content: space-around;
+        padding: 6px 0;

        .option {
          width: 100%;
-        // flex: 1;
+          height: 18px;
          display: flex;
-        flex-basis: row;
+          flex-direction: row;

          .name {
            font-family: PingFangSC-Regular;
            font-size: 13px;
-          color: rgba(56,63,69,0.60);
+            color: rgba(56, 63, 69, 0.60);
            width: 80px;
            height: 18px;
            line-height: 18px;
@@ -259,7 +313,15 @@ export default {
          }

          img {
-            margin-left: 55%
+            margin-left: 47%
+          }
+
+        }
+        .option:nth-of-type(2) {
+          position: relative;
+          img{
+            position: absolute;
+            right: 10px;
          }
        }
      }

--- a/src/pages/distributorSign/contract-details.vue
+++ b/src/pages/distributorSign/contract-details.vue
@@ -152,7 +152,7 @@
          <p>业务经办：{{ baseInfo.bp_user_id_n }}</p>
          <p>联系电话：{{ baseInfo.phone }}</p>
        </div>
-        <div class="right1" @click="callUp">
+        <div class="right1" @click="callUp(baseInfo.phone)">
          <img src="@/assets/distributorSign/calls.png" alt="">
        </div>
      </div>
@@ -367,8 +367,8 @@ export default {
   dateConverse (date) {
     return date.replace(/\//g, '-')
   },
-   callUp () {
-     this.hlsPopup.showSuccess('打电话')
+   callUp (phonenumber) {
+     window.open('tel:' + phonenumber)
   },
   repayPlan () {
     this.$router.push({

--- a/src/pages/distributorSign/personal.vue
+++ b/src/pages/distributorSign/personal.vue
@@ -48,8 +48,8 @@
        <input slot="content" v-model="baseInfo.marital_status_n" readonly>
      </item>
    </list-item>
-    <div class="equipment-list">配偶信息</div>
-    <list-item :item-height="44" class="second-part">
+    <div class="equipment-list" v-if="baseInfo.marital_status == 'MARRIED'">配偶信息</div>
+    <list-item :item-height="44" class="second-part" v-if="baseInfo.marital_status == 'MARRIED'">
      <item>
        <div slot="name" class="font-color">姓名</div>
        <input slot="content" v-model="baseInfo.bp_name_sp" readonly>

--- a/src/pages/financingTrial/financing-details.vue
+++ b/src/pages/financingTrial/financing-details.vue
@@ -2,7 +2,7 @@
   * @Descrip""/>User Settings Edit
 * @Author: your name
 * @Date: 2019-09-29 20:31:00
- * @LastEditTime: 2019-10-18 16:40:49
+ * @LastEditTime: 2019-10-21 15:17:55
 * @LastEditors: Please set LastEditors
   -->
 <template>
@@ -58,7 +58,9 @@
        </item>
        <item>
          <div slot="name" class="font-color">预计付款日</div>
-          <input slot="content" placeholder="YYYY-MM-DD" >
+          <!-- <input slot="content" placeholder="YYYY-MM-DD" readonly> -->
+          <div slot="content">{{ dates }}</div>
+          <img src="@/assets/trial/date.png" alt="" class="date-pic" @click="showTime('YYYY-MM-DD')">
        </item>
        <item :showArrow="true">
          <div slot="name" class="font-color">还款周期</div>
@@ -90,6 +92,7 @@ export default {
  name: 'FinancingDetails',
  data () {
    return {
+      dates: '',
      plan_price: '',
      price_date_to: '',
    }
@@ -116,11 +119,28 @@ export default {
       name: 'FinancDetails',
     })
   },
+   showTime (format) {
+     let vm = this
+     hlsPopup.showTime({
+       nowDate: new Date().toLocaleDateString(),
+       format: format,
+       callback: (date) => {
+         // alert(date)
+         vm.dates = date
+       },
+     })
+   },
 },
 }
 </script>
 <style lang='less' scoped>
 #details1 {
+  .date-pic {
+    height: 17px;
+    width: 17px;
+    margin-top: 13px;
+    margin-left: 4px;
+  }
    .h-header-btn {
      img {
        width: 16px;

--- a/src/pages/intoApproval/intoApproval/base.vue
+++ b/src/pages/intoApproval/intoApproval/base.vue
@@ -193,7 +193,7 @@
            <p>业务经办：{{ bp_user_id_n }}</p>
            <p>联系电话：{{ cell_phone }}</p>
          </div>
-          <div class="right1" @click="callUp">
+          <div class="right1" @click="callUp(cell_phone)">
            <img src="@/assets/distributorSign/calls.png" alt="">
          </div>
        </div>
@@ -465,8 +465,8 @@ export default {
    this.isConfirm = this.$route.params.isConfirm
  },
  methods: {
-    callUp () {
-      this.hlsPopup.showSuccess('打电话')
+    callUp (phonenumber) {
+      window.open('tel:' + phonenumber)
    },
    getTabNum (i) {
      this.tabNum = i

--- a/src/pages/productQuery/product-detailed.vue
+++ b/src/pages/productQuery/product-detailed.vue
@@ -2,7 +2,7 @@
   * @Descrip: 产品明细
 * @Author: your name
 * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-10-18 15:35:42
+ * @LastEditTime: 2019-10-21 15:56:00
 * @LastEditors: Please set LastEditors
   -->
 <template>
@@ -118,14 +118,20 @@ export default {
      bgc_flag: true,
      collect_flag: false,
      src: require('@/assets/productQuery/collect.png'),
+      // collect_status: window.sessionStorage.getItem('collect_status'),
    }
  },
  computed: {},
-  watch: {},
+  watch: {
+  },
  beforeRouteEnter (to, from, next) {
    if (from.name === 'ProductList') {
      next(vm => {
        vm.product_id = vm.$route.params.product_id
+        // vm.collect_status = vm.$route.params.collect_status
+        // if (vm.$route.params.collect_status === 'Y') {
+        //   vm.src = require('@/assets/productQuery/coll-success.png')
+        // }
        vm.baseMsg()
        vm.detailMsg()
        vm.confgMsg()
@@ -134,7 +140,10 @@ export default {
    next()
  },
  created () {
-
+    console.log('collect........', window.sessionStorage.getItem('collect_status'))
+    if (window.sessionStorage.getItem('collect_status') === 'Y') {
+      this.src = require('@/assets/productQuery/coll-success.png')
+    }
  },
  methods:
 {
@@ -144,6 +153,10 @@ export default {
   },
   // 收藏
   collect () {
+     console.log('collect', window.sessionStorage.getItem('collect_status'))
+     if (window.sessionStorage.getItem('collect_status') === 'Y') {
+       hlsPopup.showLongCenter('该产品已收藏过，请勿重复收藏')
+     } else {
       this.collect_flag = true
       console.log(this.collect_flag)
       let vm = this
@@ -165,6 +178,7 @@ export default {
           hlsPopup.showLongCenter(res.message)
         }
       })
+     }
   },
   // 基本信息查询
   baseMsg () {

--- a/src/pages/productQuery/product-list.vue
+++ b/src/pages/productQuery/product-list.vue
@@ -38,7 +38,7 @@
            </div>
          </div>
          <div slot="right-icon">
-            <img class="arrow" src="@/assets/productQuery/getIn.png" alt="" @click="goDetailed(item.product_id)">
+            <img class="arrow" src="@/assets/productQuery/getIn.png" alt="" @click="goDetailed(item.product_id,item.collect_status)">
          </div>
        </item>
      </list-item>
@@ -82,11 +82,13 @@ export default {
     })
   },
   // val：产品id
-   goDetailed (val) {
+   goDetailed (val, status) {
+     window.sessionStorage.setItem('collect_status', status)
     this.$router.push({
       name: 'ProDetailed',
       params: {
         product_id: val,
+         //  collect_status: status,
       },
     })
   },
@@ -149,8 +151,11 @@ export default {
       // margin-left: 30px;
        margin-top: 16px;
    }
+    // .hls-item .contents .add-name {
+    //   flex: none!important;
+    // }
    .item-pic {
-          width: 110px;
+          width: 100px;
          //height: 110px;
          img {
              width: 100%;

--- a/src/pages/userBind/np/naturePerson.vue
+++ b/src/pages/userBind/np/naturePerson.vue
@@ -53,8 +53,8 @@
            <div v-if="idCardFront && !isApproved" @click="ocrShow('idCard', 'front')">
              <img :src="idCardFront" style="width: 100%;height: 100%;margin: 0" >
            </div>
-            <div v-if="idCardFront && isApproved">
-              <img :src="idCardFront" style="width: 100%;height: 100%;margin: 0" @click="showBigPicture(idCardFront)">
+            <div v-if="isApproved">
+              <img v-if="idCardFront" :src="idCardFront" style="width: 100%;height: 100%;margin: 0" @click="showBigPicture(idCardFront)">
            </div>
            <div v-if="!idCardBack" @click="ocrShow('idCard', 'back')">
              <img src="@/assets/userBind/back.png" >
@@ -63,8 +63,8 @@
            <div v-if="idCardBack && !isApproved" @click="ocrShow('idCard', 'back')">
              <img :src="idCardBack" style="width: 100%;height: 100%;margin: 0" >
            </div>
-            <div v-if="idCardBack && isApproved">
-              <img :src="idCardBack" style="width: 100%;height: 100%;margin: 0" @click="showBigPicture(idCardBack)">
+            <div v-if="isApproved">
+              <img v-if="idCardBack" :src="idCardBack" style="width: 100%;height: 100%;margin: 0" @click="showBigPicture(idCardBack)">
            </div>
          </div>
        </div>
@@ -260,12 +260,17 @@
            @click="ocrShow('bankCard', '')"
          >
          <img
-            v-if="bankImg && !isApproved"
+            v-if="bankImg"
            :src="bankImg"
            class="addBack"
            style="height: 38%;"
            @click="ocrShow('bankCard', '')"
          >
+          <img
+            v-if="isApproved"
+            src="@/assets/userBind/addBack.png"
+            class="addBack"
+          >
          <list-item :item-height="44" class="card-Info">
            <item>
              <div slot="name">银行卡卡号</div>
@@ -483,8 +488,13 @@ export default {
          })
          switch (cdd_item) {
            case 'NP_ID_CARD':
-              vm.idCardBack = res.lists[0].url
-              vm.idCardFront = res.lists[1].url
+              res.lists.forEach(item => {
+                if (item.file_name === 'front.jpg') {
+                  vm.idCardFront = item.url
+                } else {
+                  vm.idCardBack = item.url
+                }
+              })
              break
            default:
              vm.dowload_list.push(res.lists)
@@ -496,6 +506,7 @@ export default {
    },
    async verified () {
      this.dowload_list = [] // 保存之前将图片下载列表清空，防止出现重复的图片
+      this.upload_list = [] // 保存之前将待上传列表清空，防止出现重复的图片
      let bpId = await this.saveWord()
      this.getBankInfo()
      // 查询资料清单
@@ -522,6 +533,9 @@ export default {
            switch (item.cdd_item) {
              case 'NP_ID_CARD':
                vm.idCardCheck_id = item.check_id
+                break
+              case 'BANK_CARD':
+
                break
              default:
                vm.cddItemList.push(item)
@@ -833,7 +847,7 @@ export default {
        maxCount: 1,
      }
      let success = function (imgUrl) {
-        if (!imgUrl) {
+        if (imgUrl.length === 0) {
          hlsPopup.showLongCenter('请选择一张图片')
        } else {
          if (ocrType === 'idCard') {
@@ -1228,6 +1242,7 @@ export default {
      let vm = this
      vm.hlsPopup.showBigPicture({
        imgUrl: pic,
+        width: '100%',
      })
    },
  },

--- a/src/pages/userBind/org/enterprise.vue
+++ b/src/pages/userBind/org/enterprise.vue
@@ -49,8 +49,8 @@
            <div v-if="licenseImg && !isApproved" style="width: 100%;height: 100%" @click="ocrShow('license', '')">
              <img :src="licenseImg" style="width: 100%;height: 100%;margin: 0" >
            </div>
-            <div v-if="licenseImg && isApproved">
-              <img :src="licenseImg" style="width: 100%;height: 100%;margin: 0" @click="showBigPicture(licenseImg)">
+            <div v-if="isApproved"><!--v-if="licenseImg && isApproved"-->
+              <img v-if="licenseImg" :src="licenseImg" style="width: 100%;height: 100%;margin: 0" @click="showBigPicture(licenseImg)">
            </div>
          </div>
        </div>
@@ -196,8 +196,8 @@
            <div v-if="idCardFront && !isApproved" @click="ocrShow('idCard', 'front')">
              <img :src="idCardFront" style="width: 100%;height: 100%;margin: 0" >
            </div>
-            <div v-if="idCardFront && isApproved">
-              <img :src="idCardFront" style="width: 100%;height: 100%;margin: 0" @click="showBigPicture(idCardFront)">
+            <div v-if="isApproved">
+              <img v-if="idCardFront" :src="idCardFront" style="width: 100%;height: 100%;margin: 0" @click="showBigPicture(idCardFront)">
            </div>
            <div v-if="!idCardBack" @click="ocrShow('idCard', 'back')">
              <img src="@/assets/userBind/org/back.png" >
@@ -206,8 +206,8 @@
            <div v-if="idCardBack && !isApproved" @click="ocrShow('idCard', 'back')">
              <img :src="idCardBack" style="width: 100%;height: 100%;margin: 0" >
            </div>
-            <div v-if="idCardBack && isApproved">
-              <img :src="idCardBack" style="width: 100%;height: 100%;margin: 0" @click="showBigPicture(idCardBack)">
+            <div v-if="isApproved">
+              <img v-if="idCardBack" :src="idCardBack" style="width: 100%;height: 100%;margin: 0" @click="showBigPicture(idCardBack)">
            </div>
          </div>
        </div>
@@ -288,9 +288,15 @@
        <div v-if="!flag" class="upload-id-card">
          <span>授权书证件上传</span>
          <div class="upload-box1">
-            <!-- <div> -->
+            <div v-if="!laImg" @click="LaUpload()">
              <img src="@/assets/userBind/camera.png" >
-            <!-- </div> -->
+            </div>
+            <div v-if="laImg && !isApproved" style="width: 100%;height: 100%" @click="LaUpload('')">
+              <img :src="laImg" style="width: 100%;height: 100%;margin: 0" >
+            </div>
+            <div v-if="isApproved"><!--v-if="licenseImg && isApproved"-->
+              <img v-if="laImg" :src="laImg" style="width: 100%;height: 100%;margin: 0" @click="showBigPicture(laImg)">
+            </div>
          </div>
        </div>

@@ -358,12 +364,17 @@
            @click="ocrShow('bankCard', '')"
          >
          <img
-            v-if="bankImg && !isApproved"
+            v-if="bankImg"
            :src="bankImg"
            class="addBack"
            style="height: 38%;"
            @click="ocrShow('bankCard', '')"
          >
+          <img
+            v-if="isApproved"
+            src="@/assets/userBind/addBack.png"
+            class="addBack"
+          >
          <list-item :item-height="44" class="card-Info">
            <item>
              <div slot="name">银行卡卡号</div>
@@ -489,21 +500,25 @@ export default {
      idCardBack: '', // 身份证反面图片
      licenseImg: '', // 营业执照照片
      bankImg: '', // 银行卡图片
+      laImg: '', // 授权书图片
      upload_list: [], // 上传图片列表
      dowload_list: [], // 下载图片列表
      cddItemList: [], // 资料清单列表
      idCardCheck_id: '', // 身份证check_id
      bankCardCheck_id: '', // 银行卡check_id
      licenseCheck_id: '', // 营业执照check_id
+      laCheck_id: '', // 授权书check_id
      idCardImgList: [], // 存身份证图片列表
      bankCardImgList: [], // 存上传银行卡图片列表
      idCardEditFlag: false, // 身份证修改标识，为true则标识已修改，后续需要重新上传此照片
      licenseEditFlag: false, // 营业执照照片修改标识，为true则标识已修改，后续需要重新上传此照片
+      LaEditFlag: false, // 授权书图片修改标识，为true则标识已修改，后续需要重新上传此照片
    }
  },
  computed: {},
  watch: {
    'baseInfo.auth_flag' (newVal, oldVal) {
+      console.log('###########################################')
      if (newVal === '是') {
        this.flag = false
      } else if (newVal === '否') {
@@ -565,7 +580,7 @@ export default {
        vm.from = true
        vm.getbaseInfo()
        vm.getBankInfo()
-        vm.loadItemList()// 附件查询
+       // vm.loadItemList()// 附件查询
      })
    }
    next()
@@ -644,7 +659,7 @@ export default {
                if (res.result === 'S') {
                  vm.hlsPopup.showSuccess('提交成功')
                  vm.$router.push({
-                    name: 'Home',
+                    name: 'HomePage',
                  })
                }
              })
@@ -722,6 +737,7 @@ export default {

    verified () {
      this.dowload_list = [] // 保存之前将图片下载列表清空，防止出现重复的图片
+      this.upload_list = [] // 保存之前将待上传列表清空，防止出现重复的图片
      if (this.flag) {
        // this.flag = false
        for (let i in this.authMsg) {
@@ -954,6 +970,7 @@ export default {
      this.baseInfo.organization_code = val.organization_code
    },
    authorizeChange () {
+      console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!')
      this.flag = !this.flag
      if (this.flag) {
        this.auth_flag = '未授权'
@@ -1145,6 +1162,12 @@ export default {
          vm.legal_personMsg.cell_phone = res.info.cell_phone
          vm.legal_personMsg.living_address = res.info.living_address
          Object.assign(vm.saveInfo, res.info)
+          if (vm.baseInfo.auth_flag === '是') {
+              vm.flag = false
+            } else if (vm.baseInfo.auth_flag === '否') {
+              vm.flag = true
+            }
+          vm.loadItemList()// 附件查询
        } else {
          hlsPopup.showLongCenter(res.message)
        }
@@ -1204,7 +1227,7 @@ export default {
        maxCount: 1,
      }
      let success = function (imgUrl) {
-        if (!imgUrl) {
+        if (imgUrl.length === 0) {
          hlsPopup.showLongCenter('请选择一张图片')
        } else {
          if (ocrType === 'idCard') {
@@ -1288,12 +1311,20 @@ export default {
          })
          switch (cdd_item) {
            case 'NP_ID_CARD':
-              vm.idCardBack = res.lists[0].url
-              vm.idCardFront = res.lists[1].url
+              res.lists.forEach(item => {
+                if (item.file_name === 'front.jpg') {
+                  vm.idCardFront = item.url
+                } else {
+                  vm.idCardBack = item.url
+                }
+              })
              break
            case 'ORG_CODE':
              vm.licenseImg = res.lists[0].url
              break
+            case 'L/A':
+              vm.laImg = res.lists[0].url
+              break
            default:
              vm.dowload_list.push(res.lists)
          }
@@ -1327,6 +1358,12 @@ export default {
              case 'ORG_CODE':
                vm.licenseCheck_id = item.check_id
                break
+              case 'BANK_CARD':
+
+                break
+              case 'L/A':
+                vm.laCheck_id = item.check_id
+                break
              default:
                vm.cddItemList.push(item)
            }
@@ -1367,6 +1404,21 @@ export default {
            list.push(obj)
            vm.save_picture(list)
          }
+          if (vm.LaEditFlag) { // 授权书图片已修改，重新上传
+            var list = []
+            let obj = {
+              'pkvalue': vm.laCheck_id,
+              'source_type': 'PRJ_CDD_ITEM_CHECK',
+              'picture': '',
+              'check_id': vm.laCheck_id,
+              'filePath': vm.laImg,
+              'attachment_id': '',
+              'user_id': 1,
+              'fileName': '',
+            }
+            list.push(obj)
+            vm.save_picture(list)
+          }
        }
      })
    },
@@ -1431,6 +1483,47 @@ export default {
      }
      vm.dowload_list.sort()
    },
+    // 授权书上传入口
+    LaUpload () {
+      let vm = this
+      hlsPopup.showActionSheet({
+        titleText: '请选择照片',
+        buttonArray: ['拍照', '从相册取'],
+        callback: index => {
+          if (index === 0) {
+            vm.LaUploadOpenCamera()
+          } else {
+            vm.LaUploadTakePicture()
+          }
+        },
+      })
+    },
+  LaUploadOpenCamera () {
+      let vm = this
+      let cameraoptions = {
+        quality: 100,
+      }
+      let success = function (imgdata) {
+        vm.LaEditFlag = true
+        vm.laImg = imgdata
+      }
+      let error = function () {
+      }
+      hlsUtil.openCamera(cameraoptions, success, error)
+    },
+    LaUploadTakePicture () {
+      let vm = this
+      let cameraoptions = {
+        quality: 100,
+      }
+      let success = function (imgUrl) {
+        vm.LaEditFlag = true
+        vm.laImg = imgUrl[0]
+      }
+      let error = function () {
+      }
+      vm.hlsUtil.takePicture(cameraoptions, success, error)
+    },
    // 图片上传入口
    imgUploadShow (check_id) {
      let vm = this
@@ -1546,6 +1639,7 @@ export default {
      let vm = this
      vm.hlsPopup.showBigPicture({
        imgUrl: pic,
+        width:'100%'
      })
    },
  },

--- a/src/scripts/filter.js
+++ b/src/scripts/filter.js
+
 export default (Vue) => {
  Vue.filter('currency', function (val) {
    if (!val) return '0.00'