延期申请、开票申请、延期查询

config/dev.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_DEV&apiName="',
   appId: '"com.xcmg.app.dev"',
-  currentVersion: '"3.7.8"'
+  currentVersion: '"3.7.9"'
 }

config/uat.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.dev"',
-  currentVersion: '"3.5.9"'
+  currentVersion: '"3.5.10"'
 }

src/pages/customerAccessApply/components/BaseInfoOrg.vue

@@ -13,15 +13,11 @@
       </item>
     </div>
 
-    <div v-if="['FACTORY'].indexOf(baseInfo.bp_type)===-1">
+    <div v-if="['FACTORY'].indexOf(baseInfo.bp_type)===-1" class="baseinfo-supp">
       <div slot="name" class="section-title" style="">基本信息补录</div>
       <item v-for="(ele, i) of baseInfo_B" :key="ele.title">
-        <div slot="name" class="font-color">{{ ele.title }}</div>
-        <span v-if="ele.type === 'date'" slot="content">{{ baseInfo[ele.prop] | dateFormat }}</span>
-        <span v-else-if="ele.type === 'currency'" slot="content">{{ baseInfo[ele.prop] | currency }}</span>
-        <span v-else-if="ele.type === 'bool'" slot="content">{{ baseInfo[ele.prop] === 'Y' ? '是' : '否' }}</span>
-        <Checkbox v-else-if="ele.type === 'checkbox'" :value="baseInfo[ele.prop]==='Y'" shape="square"/>
-        <span v-else slot="content">{{ baseInfo[ele.prop] }}</span>
+        <!-- <div slot="name" class="font-color">{{ ele.title }}</div> -->
+        <Field :label="ele.title" v-model="baseInfo[ele.prop]" rows="1" autosize type="textarea" input-align="right" required placeholder="请输入"/>
       </item>
     </div>
     <div>
@@ -56,16 +52,21 @@
         <span v-else slot="content">{{ baseInfo[ele.prop] }}</span>
       </item>
     </div>
+    <div class="foot-bottom">
+      <button class="success" @click="save">保存</button>
+    </div>
   </list-item>
 </template>
 
 <script>
-import { Checkbox } from 'vant'
+import { Checkbox, Field } from 'vant'
 import 'vant/lib/checkbox/style'
+import 'vant/lib/field/style'
 
 export default {
   components: {
     Checkbox,
+    Field,
   },
   props: ['baseInfo'],
   data () {
@@ -90,6 +91,53 @@ export default {
     },
   },
   methods: {
+    async save () {
+      let flag = false
+      console.log('基本信息', this.baseInfo_B);
+      let obj = {
+        'bp_id': this.baseInfo['bp_id'],
+      }
+      this.baseInfo_B.forEach(item => {
+        obj[item.prop] = this.baseInfo[item.prop]
+      })
+      console.log('保存信息', obj)
+    
+      Object.keys(obj).map(key => {
+        if (obj[key] === undefined || obj[key] === null || obj[key] === '') {
+          flag = true
+        }
+      })
+      if (flag) {
+        hlsPopup.showLongCenter('请将必填字段填写完整')
+        return
+      }
+      // 财务部联系电话校验
+      let financeContactReg = /^\d{11}$/
+      if (!financeContactReg.test(obj.finance_contact)) {
+        hlsPopup.showLongCenter('财务部联系电话错误！')
+        return
+      }
+      // 身份证校验
+      let idcardReg = /^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/;
+      if (!idcardReg.test(obj.contact_card_no)) {
+        hlsPopup.showLongCenter('联系人身份证格式错误！')
+        return
+      }
+      let url = process.env.basePath + 'bp_access_info_save'
+      let param = {
+        'master': obj,
+      }
+      console.log(param)
+
+      hlsPopup.showLoading('请稍候')
+      let res = await this.$post(url, param)
+      this.hlsPopup.hideLoading()
+      if (res.result === 'S') {
+        hlsPopup.showLongCenter('保存成功')
+      } else {
+        hlsPopup.showLongCenter('保存失败')
+      }
+    },
     factory (arr) {
       let outArr = []
       if (arr.length) {
@@ -166,7 +214,7 @@ export default {
     },
     createFormB () {
       let baseInfo_B = [// 基本信息补录 经销商
-        ['财务部联系电话', 'id_card_no', 'text'],
+        ['财务部联系电话', 'finance_contact', 'text'],
         ['联系人', 'contact_name', 'text'],
         ['联系人身份证', 'contact_card_no', 'text'],
         ['联系人手机', 'contact_tel', 'text'],
@@ -220,4 +268,9 @@ export default {
     margin-top: 12px;
     position: relative;
   }
+  .baseinfo-supp{
+    /deep/ .hls-item{
+      padding-left:5px
+    }
+  }
 </style>

src/pages/drawBillApply/components/tab.vue

+<!--
+ * @Description: In User Settings Edit
+ * @Author: your name
+ * @Date: 2019-09-25 11:10:34
+ * @LastEditTime: 2019-09-25 21:05:24
+ * @LastEditors: Please set LastEditors
+ -->
+<template>
+  <div class="tab-style">
+    <div :class="{'tab-content-bg':tabNum == 0}" class="tab-content" @click="tabNum = 0;sendTabNum()"><img :src="tabNum == 0?signed:sign"><span
+      :class="{'colored':tabNum == 0}">未提交</span></div>
+    <div :class="{'tab-content-bg':tabNum == 1}" class="tab-content" @click="tabNum = 1;sendTabNum()"><img :src="tabNum == 1?finished:finish"><span
+      :class="{'colored':tabNum == 1}">已提交</span></div>
+  </div>
+</template>
+<script>
+import signed from '@/assets/contractStart/2.png'
+import finished from '@/assets/contractStart/4.png'
+import sign from '@/assets/contractStart/1.png'
+import finish from '@/assets/contractStart/3.png'
+
+export default {
+  data () {
+    return {
+      tabNum: 0,
+      signed: signed,
+      finished: finished,
+      sign: sign,
+      finish: finish,
+    }
+  },
+  methods: {
+    sendTabNum () {
+      this.$emit('getTabNum', this.tabNum)
+    },
+  },
+}
+</script>
+<style lang="less" scoped>
+  .tab-style {
+    position: relative;
+    z-index: 50;
+    background-color: #fff;
+    display: flex;
+    justify-content: center;
+    padding-top: 12px;
+    padding-bottom: 8px;
+    align-items: center;
+    box-shadow: 0 2px 3px 0 rgba(220, 220, 221, 0.50);
+    .tab-content {
+      display: block;
+      width: 45.9%;
+      height: 32px;
+      background: rgba(220, 220, 221, 0.26);
+      border-radius: 16px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      span {
+        margin-left: 2%;
+        font-size: 14px;
+        color: #383F45;
+        font-weight: 600;
+        font-family: PingFangSC-Semibold;
+      }
+
+      .colored {
+        color: #1D3FFF
+      }
+    }
+    .tab-content-bg{
+      background: rgba(0,70,156,0.10);
+    }
+    img {
+        width:16px;
+      height: 16px;
+      // margin-right:5.7px;
+    }
+    .tab-content:nth-of-type(2) {
+      margin-left: 7px;
+    }
+  }
+</style>

src/pages/functionCenter/function-list.vue

@@ -94,6 +94,24 @@
             <img src="@/assets/functionCenter/in@2x.png" alt="">
           </div>
         </div>
+        <!-- <div class="info-content">
+          <div class="add-name">
+            <img src="@/assets/functionCenter/con-que@2x.png" alt="">
+            <div class="name-title">延期申请</div>
+          </div>
+          <div class="add-content" @click="goOvertimeApply">
+            <img src="@/assets/functionCenter/in@2x.png" alt="">
+          </div>
+        </div>
+        <div class="info-content">
+          <div class="add-name">
+            <img src="@/assets/functionCenter/con-que@2x.png" alt="">
+            <div class="name-title">开票申请</div>
+          </div>
+          <div class="add-content" @click="goDrawBillApplyList">
+            <img src="@/assets/functionCenter/in@2x.png" alt="">
+          </div>
+        </div> -->
         <!-- <div class="info-content">
           <div class="add-name">
             <img src="@/assets/functionCenter/con-sign@2x.png" alt="">
@@ -142,7 +160,7 @@
             <img src="@/assets/functionCenter/in@2x.png" alt="">
           </div>
         </div>
-        <div class="info-content">
+        <!-- <div class="info-content">
           <div class="add-name">
             <img src="@/assets/functionCenter/con-que@2x.png" alt="">
             <div class="name-title">逾期信息查询</div>
@@ -150,16 +168,8 @@
           <div class="add-content" @click="goOvertimeList">
             <img src="@/assets/functionCenter/in@2x.png" alt="">
           </div>
-        </div>
-        <div class="info-content">
-          <div class="add-name">
-            <img src="@/assets/functionCenter/con-que@2x.png" alt="">
-            <div class="name-title">延期申请</div>
-          </div>
-          <div class="add-content" @click="goOvertimeApply">
-            <img src="@/assets/functionCenter/in@2x.png" alt="">
-          </div>
-        </div>
+        </div> -->
+        
 
       </div>
     </h-content>
@@ -401,6 +411,19 @@ export default {
         hlsPopup.showLongCenter('请先进行用户绑定')
       }
     },
+    goDrawBillApplyList(e) {
+      let vm = this
+      if (this.bp_id) {
+        vm.$router.push({
+          name: 'drawBillApplyList',
+          params: {
+            bp_type: e,
+          },
+        })
+      } else {
+        hlsPopup.showLongCenter('请先进行用户绑定')
+      }
+    },
     // 进入合同签订
     goCarConfirm () {
       let vm = this
@@ -789,7 +812,7 @@ export default {
       border-radius: 0.4rem;
       width: 80%;
       margin-left: 10%;
-      // margin-top: 10.8rem;
+      // margin-top: 11.4rem;
       margin-top: 9.8rem;
       margin-bottom: 1.5rem;
       //  position: absolute;

src/pages/functionCenter/to-do-list.vue

@@ -220,7 +220,7 @@ export default {
     approvalInfo (flow, type) {
       let handler = {
         'PRJ_CREATE_REQ_WFL': 'financingApplyDetail', // 融租申请工作流
-        // 'CLIENT_REG_FLOW': 'customerAccessDetail', // 客户准入工作流
+        'CLIENT_REG_FLOW': 'customerAccessDetail', // 客户准入工作流
       }
 
       let routerName = handler[flow.workflow_code]

src/pages/overTimeApply/detail.vue

@@ -4,7 +4,7 @@
     <h-header :proportion="[5, 1, 1]" class="bar-custom">
       <div slot="left" class="h-header-btn" @click="$routeGo()">
         <img src="@/assets/userBind/arrow.png">
-        <span>合同明细</span>
+        <span>延期申请明细</span>
       </div>
     </h-header>
 

src/router/index.js

@@ -159,8 +159,15 @@ const customerAccessDetail = resolve => require.ensure([], () => { resolve(requi
 // 逾期查询
 const overTimeQueryList = resolve => require.ensure([], () => { resolve(require('@/pages/overTimeQuery/list')) }, 'overTimeQuery')
 const overTimeQueryDetail = resolve => require.ensure([], () => { resolve(require('@/pages/overTimeQuery/detail')) }, 'overTimeQuery')
+// 延期申请功能
 const overTimeApplyList = resolve => require.ensure([], () => { resolve(require('@/pages/overTimeApply/list')) }, 'overTimeApply')
 const overTimeApplyDetail = resolve => require.ensure([], () => { resolve(require('@/pages/overTimeApply/detail')) }, 'overTimeApply')
+// 延期申请工作流
+const delayApply = resolve => require.ensure([], () => { resolve(require('@/pages/delayApply/detail')) }, 'delayApply')
+// 开票申请功能
+const drawBillApplyList = resolve => require.ensure([], () => { resolve(require('@/pages/drawBillApply/list')) }, 'drawBillApply')
+const drawBillApplyDetail = resolve => require.ensure([], () => { resolve(require('@/pages/drawBillApply/detail')) }, 'drawBillApply')
+// 开票申请 工作流
 
 Vue.use(Router)
 
@@ -403,6 +410,7 @@ export default new Router({
       name: 'overTimeQueryDetail',
       meta: { keepAlive: false },
     },
+    // 延期申请功能
     {
       path: '/over-time-apply-list',
       component: overTimeApplyList,
@@ -415,6 +423,27 @@ export default new Router({
       name: 'overTimeApplyDetail',
       meta: { keepAlive: false },
     },
+    // 延期申请工作流
+    {
+      path: '/delayApply',
+      component: delayApply,
+      name: 'delayApply',
+      meta: { keepAlive: false },
+    },
+    // 开票申请功能
+    {
+      path: '/drawBillApplyList',
+      component: drawBillApplyList,
+      name: 'drawBillApplyList',
+      meta: { keepAlive: false },
+    },
+    {
+      path: '/drawBillApplyDetail',
+      component: drawBillApplyDetail,
+      name: 'drawBillApplyDetail',
+      meta: { keepAlive: false },
+    },
+
   ],
   scrollBehavior (to, from, savedPosition) {
     if (to.hash) {