Merge branch 'liuxin' into develop

src/pages/carConfirm/confirm-detail.vue

@@ -34,25 +34,6 @@
                 <div slot="name">合格证编号 </div>
                 <input slot="content" v-model="rentInfo.certificate_number" readonly placeholder="自动识别合格证编号" >
               </item>
-              <!-- <item>
-                <div slot="name">厂商型号</div>
-                <input
-                  slot="content"
-                  v-model="rentInfo.vehicle_model"
-                  readonly
-                  class="write"
-                  placeholder="暂无数据"
-                >
-              </item>
-              <item>
-                <div slot="name">车牌号</div>
-                <input
-                  slot="content"
-                  v-model="rentInfo.certificate_number"
-                  readonly
-                  placeholder="暂无数据"
-                >
-              </item> -->
               <item>
                 <div slot="name">发车日期</div>
                 <input
@@ -128,7 +109,7 @@
         </div>
         <div class="center">
           <span>租赁物信息</span>
-          <span class="status">已维护</span>
+          <span :class="['status',item.lease_status === 'Y'?'unMantain':'mantain']">{{ item.lease_status === 'Y'?'已维护':'待维护' }}</span>
           <p>
             参数项
             <span>{{ item.product_code }}</span>
@@ -139,7 +120,7 @@
         </div>
       </div>
     </h-content>
-    <bottom-tab>
+    <bottom-tab v-if="!flag">
       <tab-button class="approve" @click.native="isConfirm">确定</tab-button>
     </bottom-tab>
   </h-view>
@@ -151,6 +132,7 @@ export default {
       num: null,
       downNum: false,
       show: false,
+      flag: false, // 判断是否为已确认
       info: {
         product_plan_id: '',
         product_num: '',
@@ -188,6 +170,11 @@ export default {
     next(vm => {
       vm.getDetail()
       vm.getEquipment()
+      if (vm.$route.params.confirm_status === 'SUBMIT') {
+        vm.flag = false
+      } else if (vm.$route.params.confirm_status === 'APPROVED') {
+        vm.flag = true
+      }
     })
   },
   methods: {
@@ -415,7 +402,7 @@ export default {
         margin-left: 10px;
         margin-top: 12px;
       }
-      .status {
+     .status {
         display: inline-block;
         width: 46px;
         height: 16px;
@@ -425,10 +412,17 @@ export default {
         font-size: 12px;
         color: #ffffff;
         letter-spacing: 0;
-        background-color: #1d3fff;
         margin-left: 21px;
         margin-top: 12px;
       }
+      .unMantain{
+        background-color: #1d3fff;
+      }
+      .mantain{
+        background-color: #FFF;
+        border:1px solid #1d3fff;
+        color: #1d3fff;
+      }
       p {
         font-family: PingFangSC-Regular;
         font-size: 13px;

src/pages/carConfirm/confirm-list.vue

@@ -80,9 +80,7 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      if (from.name === 'MyInfo') {
-        vm.getList()
-      }
+      vm.getList()
     })
   },
   methods: {
@@ -108,6 +106,7 @@ export default {
         name: 'ConfirmDetail',
         params: {
           project_id: e.project_id,
+          confirm_status: e.confirm_status,
         },
       })
     },

src/pages/contractRepayment/refund.vue

@@ -129,6 +129,22 @@ export default {
     selectYear (e) {
       return e.substring(0, 4)
     },
+    insertRank () { // 插入排序法，根据期数升序排序
+      let vm = this
+      let len = vm.lists.length
+      // 从第二个元素开始比较
+      for (let i = 1; i < len; i++) {
+        let tempTime = parseInt(vm.lists[i].times)
+        let temp = vm.lists[i]
+        let j = i - 1
+        // 若后面的元素小于前面的元素，进入while循环，直到后面元素大于前面元素，跳出循环
+        while (j >= 0 && parseInt(vm.lists[j].times) > tempTime) {
+          vm.lists[j + 1] = vm.lists[j]
+          j--
+        }
+        vm.lists[j + 1] = temp
+      }
+    },
     getRefund () {
       let vm = this
       let url = process.env.basePath + 'con_equip_repayment_plan'
@@ -140,6 +156,7 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.lists = res.lists
+          vm.insertRank()
         } else {
           hlsPopup.showLongCenter(res.message)
         }

src/pages/contractStart/add-car.vue

@@ -15,52 +15,51 @@
             <list-item :item-height="44">
               <item>
                 <div slot="name">车架号</div>
-                <input slot="content" v-model="info.frame_number" placeholder="自动识别车架号" >
+                <input slot="content" v-model="info.frame_number" :readonly="flag" placeholder="自动识别车架号" >
               </item>
               <item>
                 <div slot="name">发动机号</div>
-                <input slot="content" v-model="info.engine" placeholder="自动识别发动机号" >
+                <input slot="content" v-model="info.engine" :readonly="flag" placeholder="自动识别发动机号" >
               </item>
               <item>
                 <div slot="name">车辆型号 </div>
-                <input slot="content" v-model="info.vehicle_model" placeholder="自动识别车辆型号" >
+                <input slot="content" v-model="info.vehicle_model" :readonly="flag" placeholder="自动识别车辆型号" >
               </item>
               <item>
                 <div slot="name">合格证编号 </div>
-                <input slot="content" v-model="info.certificate_number" placeholder="自动识别合格证编号" >
+                <input slot="content" v-model="info.certificate_number" :readonly="flag" placeholder="自动识别合格证编号" >
               </item>
-              <!-- <item>
-                <div slot="name">厂商型号</div>
+              <item v-if="!flag">
+                <div slot="name">发车日期</div>
                 <input
-                  slot="content"
-                  v-model="info.manufacturer"
-                  class="write"
-                  placeholder="请输入厂商型号"
-                >
+                  slot="content" v-model="info.departure_date" readonly placeholder="请输入发车日期"
+                  @click="showTime('YYYY-MM-DD')">
               </item>
-              <item>
-                <div slot="name">车牌号</div>
-                <input slot="content" v-model="info.license_plate_number" placeholder="请输入车牌号" >
-              </item> -->
-              <item>
+              <item v-if="flag">
                 <div slot="name">发车日期</div>
                 <input
                   slot="content" v-model="info.departure_date" readonly placeholder="请输入发车日期"
-                  @click="showTime('YYYY-MM-DD')">
+                >
               </item>
-              <item>
+              <item v-if="!flag">
                 <div slot="name">开票日期</div>
                 <input
                   slot="content" v-model="info.invoice_date" readonly placeholder="请输入开票日期"
                   @click="showTimeInvoice('YYYY-MM-DD')">
               </item>
+              <item v-if="flag">
+                <div slot="name">开票日期</div>
+                <input
+                  slot="content" v-model="info.invoice_date" readonly placeholder="请输入开票日期"
+                >
+              </item>
               <!-- <item :showArrow="true" @click.native="showModalValue=true">
                 <div slot="name">产品参数</div>
                 <input slot="content" v-model="info.bank_branch_name" placeholder="请选择产品参数" @click="changeHeight">
               </item>-->
             </list-item>
           </div>
-          <button @click="isSave">保存</button>
+          <button v-if="!flag" @click="isSave">保存</button>
         </div>
       </div>
     </transition>
@@ -127,7 +126,7 @@
             slot="content"
             v-model="detail.total_price"
             :placeholder="read?'暂无数据':'请输入合同金额'"
-            readonly="read"
+            :readonly="read"
           >
         </item>
         <item v-if="!read" :showArrow="true">
@@ -145,7 +144,7 @@
         </item>
         <item>
           <div slot="name">租赁物数量</div>
-          <input slot="content" v-model="detail.product_num " readonly="read" placeholder="请输入租赁物数量" >
+          <input slot="content" v-model="detail.product_num " :readonly="read" placeholder="请输入租赁物数量" >
         </item>
       </list-item>
       <div class="userInfo">设备清单</div>
@@ -173,8 +172,8 @@
         </div>
       </div>
     </h-content>
-    <bottom-tab>
-      <tab-button class="approve" @click.native="isApprove">发车申请</tab-button>
+    <bottom-tab v-if="!flag">
+      <tab-button class="approve" @click.native="checkStatus">发车申请</tab-button>
     </bottom-tab>
     <div class="bottom-pop">
       <div class="bottom-content">
@@ -231,6 +230,7 @@ export default {
       show: false,
       read: false, // 表示只读
       showDate: '',
+      flag: false,
       productLine: [
         {
           code: '5',
@@ -350,6 +350,11 @@ export default {
         vm.read = true
         vm.getDetail()
         vm.getEquipment()
+        if (vm.$route.params.car_start_status === 'REJECTED' || vm.$route.params.car_start_status === 'NEW') {
+          vm.flag = false
+        } else {
+          vm.flag = true
+        }
       }
     })
   },
@@ -403,6 +408,16 @@ export default {
         },
       })
     },
+    checkStatus () {
+      let mantained = this.equip.filter(i => {
+        return i.lease_status === 'N'
+      })
+      if (mantained.length > 0) {
+        hlsPopup.showLongCenter('您有待维护的设备项，请完善信息后再申请发车！')
+      } else {
+        this.isApprove()
+      }
+    },
     isApprove () {
       this.hlsPopup.showConfirm({
         title: '提示',
@@ -682,7 +697,7 @@ export default {
     .down {
       position: relative;
       width: 314px;
-      height: 616px;
+      height: 516px;
       background-size: 301px 24.7px;
       background-color: #fff;
     }

src/pages/contractStart/start-list.vue

@@ -16,7 +16,7 @@
           v-for="(item,index) in showList"
           :key="index"
           class="item"
-          @click="changePage(item.project_id)"
+          @click="changePage(item)"
         >
           <div class="left">
             <span>
@@ -117,7 +117,8 @@ export default {
       this.$router.push({
         name: 'AddCar',
         params: {
-          project_id: e,
+          project_id: e.project_id,
+          car_start_status: e.car_start_status,
         },
       })
     },

src/pages/myInfo/my-info.vue

@@ -67,7 +67,11 @@
             <img src="@/assets/myInfo/unFace.png" >
             <p>待面签</p>
           </div>
-          <div @click="goCarConfirm">
+          <div class="content-wrap" @click="goCarConfirm">
+            <span
+              :class="{'content-wrap-class-width':carCount>99, 'content-wrap-class':carCount<99}"
+              style="left:30px"
+            >{{ carCount > 99 ? '99+' : carCount }}</span>
             <img src="@/assets/myInfo/carConfirm.png" >
             <p>发车确认</p>
           </div>
@@ -127,6 +131,7 @@ export default {
       confirmCount: '0',
       vedioCount: '0',
       productCount: '0',
+      carCount: '0',
       description: '',
       bp_identity: '',
       approveBtn: false,
@@ -482,6 +487,7 @@ export default {
             vm.signCount = res.info.con_sign_num
             vm.confirmCount = res.info.con_confirm_num
             vm.productCount = res.info.collect_num
+            vm.carCount = res.info.car_confirm_num
           }
         } else {
           this.hlsPopup.showLongCenter(res.message)

src/pages/userBind/np/invoiceInfo.vue

@@ -54,9 +54,11 @@
         @input="addRowsLive(invoiceInfo.open_bank)"
       />
     </item>
-    <item>
+    <item @click="keyboradShow">
       <div slot="name">开户行账号</div>
-      <input slot="content" v-model="invoiceInfo.open_account" type="text" placeholder="请输入开户行账号" >
+      <input
+        slot="content" v-model="invoiceInfo.open_account" readonly type="text"
+        placeholder="请输入开户行账号" >
     </item>
   </list-item>
 </template>
@@ -74,6 +76,7 @@ export default {
   },
   data () {
     return {
+      value: '',
       invoicList: [],
       taxpayerList: [],
       invoiceInfo: {
@@ -104,6 +107,26 @@ export default {
     this.sendList()
   },
   methods: {
+    onInput (value) {
+      this.invoiceInfo.open_account += ('' + value)
+      console.log(value)
+    },
+    onDelete () {
+      this.invoiceInfo.open_account = ''
+      console.log('delete')
+    },
+    keyboradShow () {
+      let vm = this
+      this.hlsPopup.showNumberKeyborad({
+        title: '数字键盘',
+        keyDown: (text) => {
+          vm.onInput(text)
+        },
+        keyDelete: () => {
+          vm.onDelete()
+        },
+      })
+    },
     addRows (e) {
       let addNum = parseInt(e.length / 16)
       if (addNum === 0) {

src/pages/userBind/np/naturePerson.vue

@@ -617,7 +617,7 @@ export default {
       this.dowload_list = [] // 保存之前将图片下载列表清空，防止出现重复的图片
       this.upload_list = [] // 保存之前将待上传列表清空，防止出现重复的图片
       let res = await this.saveWord()
-      if(res){
+      if (res) {
         this.getBankInfo()
         // 查询资料清单
         this.loadItemList()

src/scripts/filter.js

@@ -2,7 +2,7 @@
 export default (Vue) => {
   Vue.filter('currency', function (val) {
     if (!val) return '0.00'
-   // var intPart = Number(val).toFixed(0) // 获取整数部分
+    // var intPart = Number(val).toFixed(0) // 获取整数部分
     var intPart = val.toString().split('.')[0]
     var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断