'修改测试问题'

src/pages/distributorSign/contract-details.vue

@@ -2,7 +2,7 @@
  * @Description: 合同详情
  * @Author: your name
  * @Date: 2019-09-25 15:38:21
- * @LastEditTime: 2019-10-09 09:29:19
+ * @LastEditTime: 2019-10-09 15:12:47
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -10,7 +10,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 @click="topsh">合同详情</span>
       </div>
     </h-header>
     <Tab @getTabNum="getTabNum" />
@@ -24,7 +24,7 @@
       <Personal v-if="!bp_flag" :baseInfo="baseInfo"/>
 
       <div class="equipment-list">担保人信息<span v-if="guarantorInfo.length === 0">(无)</span></div>
-      <list-item v-if="guarantorInfo[0].bp_class === 'NP'" :item-height="76">
+      <list-item v-if="guarantorInfo.length && guarantorInfo[0].bp_class === 'NP'" :item-height="76">
         <item v-for="(item,index) in guarantorInfo" :key="index">
           <div slot="name">
             <span class="name-box">{{ index+1 }}</span>
@@ -40,7 +40,7 @@
         </item>
       </list-item>
 
-      <list-item v-if="guarantorInfo[0].bp_class === 'ORG'" :item-height="76">
+      <list-item v-if="guarantorInfo.length && guarantorInfo[0].bp_class === 'ORG'" :item-height="76">
         <item v-for="(item,index) in guarantorInfo" :key="index">
           <div slot="name">
             <span class="name-box">{{ index+1 }}</span>
@@ -62,7 +62,7 @@
           <img src="@/assets/distributorSign/call.png" alt="">
         </div>
         <div class="center">
-          <p>业务经办：{{ baseInfo.bp_id_user_n }}</p>
+          <p>业务经办：{{ baseInfo.bp_user_id_n }}</p>
           <p>联系电话：{{ baseInfo.phone }}</p>
         </div>
         <div class="right1" @click="callUp">
@@ -145,7 +145,7 @@
           <img src="@/assets/distributorSign/call.png" alt="">
         </div>
         <div class="center">
-          <p>业务经办：{{ baseInfo.bp_id_user_n }}</p>
+          <p>业务经办：{{ baseInfo.bp_user_id_n }}</p>
           <p>联系电话：{{ baseInfo.phone }}</p>
         </div>
         <div class="right1" @click="callUp">
@@ -261,6 +261,20 @@ export default {
   },
   methods:
  {
+   topsh () {
+     console.log('tops')
+     //  confirm('tops')
+     this.hlsPopup.showConfirm({
+       title: '提示',
+       content: '您确认吗？',
+       onConfirm: (data) => {
+         console.log(data)
+         if (data) {
+
+         }
+       },
+     })
+   },
    // 基本信息
    getBseMsg () {
      let vm = this

src/pages/distributorSign/contract-list.vue

@@ -19,8 +19,33 @@
         <img src="@/assets/distributorSign/search.png" alt="">
       </div>
     </div>
-    <h-content>
-      <div v-for="(item,index) in lists" :key="index" class="contract-list">
+    <h-content v-if="tabNum === 0">
+      <div v-for="(item,index) in submitLists" :key="index" class="contract-list">
+        <div class="item">
+          <img src="@/assets/distributorSign/icon-进件合同.png" alt="">
+          <p class="incoming-num">进件号</p>
+          <p class="code">{{ item.project_number }}</p>
+        </div>
+        <div class="details" @click="goDetails(item)">
+          <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.finance_amount|NumFormat }}</p>
+            <img src="@/assets/distributorSign/goDetails.png" alt="">
+          </div>
+          <div class="option">
+            <p class="name">申请时间</p>
+            <p class="normal">{{ dateConverse(item.confirm_start_date) }}</p>
+          </div>
+        </div>
+      </div>
+    </h-content>
+
+    <h-content v-if="tabNum === 1">
+      <div v-for="(item,index) in approvedLists" :key="index" class="contract-list">
         <div class="item">
           <img src="@/assets/distributorSign/icon-进件合同.png" alt="">
           <p class="incoming-num">进件号</p>
@@ -79,6 +104,8 @@ export default {
     return {
       tabNum: 0,
       lists: [],
+      submitLists: [],
+      approvedLists: [],
     }
   },
   created () {
@@ -91,7 +118,9 @@ export default {
     vm.hlsHttp.post(url, param).then(function (res) {
       console.log(res.result)
       if (res.result === 'S') {
-        vm.lists = res.lists
+        vm.submitLists = res.lists.filter(item => item.confirm_status === 'SUBMIT')
+        vm.approvedLists = res.lists.filter(item => item.confirm_status === 'APPROVED')
+        // vm.lists = res.lists
       }
     })
   },

src/pages/distributorSign/legal-person.vue

@@ -10,7 +10,7 @@
     <list-item :item-height="44" class="second-part">
       <item>
         <div slot="name" class="font-color">业务经办</div>
-        <input slot="content" v-model="baseInfo.bp_id_user_n" readonly>
+        <input slot="content" v-model="baseInfo.bp_user_id_n" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">经销商</div>

src/pages/distributorSign/personal.vue

@@ -10,7 +10,7 @@
     <list-item :item-height="44" class="second-part">
       <item>
         <div slot="name" class="font-color">业务经办</div>
-        <input slot="content" v-model="baseInfo.bp_id_user_n" readonly>
+        <input slot="content" v-model="baseInfo.bp_user_id_n" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">经销商</div>

src/pages/intoApproval/intoApproval/base.vue

@@ -2,8 +2,8 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-25 10:20:35
- * @LastEditTime: 2019-09-25 10:20:35
- * @LastEditors: your name
+ * @LastEditTime: 2019-10-09 13:43:07
+ * @LastEditors: Please set LastEditors
  -->
 <template>
   <h-view id="approval" class="public-style" title="进件审批">
@@ -107,7 +107,7 @@
         <list-item :item-height="44">
           <item>
             <div slot="name">业务经办</div>
-            <input slot="content" v-model="personInfo.bp_id_user_n" readonly >
+            <input slot="content" v-model="personInfo.bp_user_id_n" readonly >
           </item>
           <item>
             <div slot="name">经销商</div>
@@ -205,7 +205,7 @@
         <list-item :item-height="44">
           <item>
             <div slot="name">业务经办</div>
-            <input slot="content" v-model="companyInfo.bp_id_user_n" readonly >
+            <input slot="content" v-model="companyInfo.bp_user_id_n" readonly >
           </item>
           <item>
             <div slot="name">经销商</div>
@@ -316,10 +316,10 @@
           </div>
         </h-content>
         <bottom-tab>
-          <tab-button class="reject" @click.native="showModalValue=true;confirm_status='REJECTED';charge()">
+          <tab-button class="reject" @click.native="showModalValue=true;confirm_status='REJECTED';charge('拒绝')">
             <img src="@/assets/intoApproval/reject.png" >拒绝
           </tab-button>
-          <tab-button class="same" @click.native="showModalValue=true;confirm_status='APPROVED';charge()">
+          <tab-button class="same" @click.native="showModalValue=true;confirm_status='APPROVED';charge('同意')">
             <img src="@/assets/intoApproval/approve.png" >同意
           </tab-button>
         </bottom-tab>
@@ -372,7 +372,7 @@ export default {
         working_place_sp: '',
         academic_background: '',
         bp_id_agent: '',
-        bp_id_user: '',
+        bp_user_id: '',
       },
       companyInfo: {
         business_address: '',
@@ -517,7 +517,16 @@ export default {
         }
       }, 10)
     },
-    charge () {
+    charge (val) {
+      this.hlsPopup.showConfirm({
+        title: '提示',
+        content: `您确认${val}吗？`,
+        onConfirm: (data) => {
+          console.log(data)
+          if (val === '拒绝') {
+
+          } else {
+            if (data) {
               let vm = this
               let url = process.env.basePath + 'do_confrim_bp'
               let param = {
@@ -537,6 +546,10 @@ export default {
                   })
                 }
               })
+            }
+          }
+        },
+      })
     },
   },
 }

src/pages/intoApproval/intoApproval/refund.vue

+<!--
+ * @Description: In User Settings Edit
+ * @Author: your name
+ * @Date: 2019-09-29 10:02:11
+ * @LastEditTime: 2019-09-29 10:02:11
+ * @LastEditors: your name
+ -->
 <template>
   <h-view id="refund" class="public-style" title="还款计划">
     <div class="top">

src/pages/intoApproval/intoApproval/rentInfo.vue

+<!--
+ * @Description: 修改参数项
+ * @Author: your name
+ * @Date: 2019-09-25 10:20:35
+ * @LastEditTime: 2019-10-09 09:48:48
+ * @LastEditors: Please set LastEditors
+ -->
 <template>
   <div id="rentInfo">
     <list-item :item-height="44" style="margin-bottom:0px;">
@@ -55,11 +62,11 @@
     <list-item>
       <item>
         <div slot="name">参数项</div>
-        <input slot="content" v-model="rentInfo.product_id" readonly >
+        <input slot="content" v-model="rentInfo.product_code" readonly >
       </item>
       <item>
         <div slot="name">产品线</div>
-        <input slot="content" v-model="rentInfo.division" readonly >
+        <input slot="content" v-model="rentInfo.product_name" readonly >
       </item>
       <item>
         <div slot="name">产品数量</div>

src/pages/intoApproval/intoList.vue

+<!--
+ * @Description: 修改部分样式和数据筛选
+ * @Author: your name
+ * @Date: 2019-09-27 11:23:25
+ * @LastEditTime: 2019-10-09 11:35:53
+ * @LastEditors: Please set LastEditors
+ -->
 <template>
   <h-view id="sign" class="public-style">
     <h-header :proportion="[5,1,1]" class="bar-custom">
@@ -13,8 +20,8 @@
         <img src="@/assets/distributorSign/search.png" alt="">
       </div>
     </div>
-    <h-content>
-      <div v-for="(item,index) in showList" :key="index" class="contract-list" @click="goDetails (item)">
+    <h-content v-if="tabNum === 0">
+      <div v-for="(item,index) in submitLists" :key="index" class="contract-list" @click="goDetails (item)">
         <div class="item">
           <img src="@/assets/distributorSign/icon-进件合同.png" alt="">
           <p class="incoming-num">进件号</p>
@@ -25,7 +32,32 @@
             <p class="name">承租人</p>
             <p class="full-name normal">{{ item.bp_name }}</p>
           </div>
-          <div class="option" style="margin-left:20px">
+          <div class="option">
+            <p class="name">合同租金</p>
+            <p class="normal money">{{ item.finance_amount|NumFormat }}</p>
+            <img src="@/assets/distributorSign/goDetails.png" alt="">
+          </div>
+          <div class="option">
+            <p class="name">申请时间</p>
+            <p class="normal">{{ item.confirm_start_date|timeFormat }}</p>
+          </div>
+        </div>
+      </div>
+    </h-content>
+
+    <h-content v-if="tabNum === 1">
+      <div v-for="(item,index) in approvedLists" :key="index" class="contract-list" @click="goDetails (item)">
+        <div class="item">
+          <img src="@/assets/distributorSign/icon-进件合同.png" alt="">
+          <p class="incoming-num">进件号</p>
+          <p class="code">{{ item.project_number }}</p>
+        </div>
+        <div class="details">
+          <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.finance_amount|NumFormat }}</p>
             <img src="@/assets/distributorSign/goDetails.png" alt="">
@@ -88,6 +120,8 @@ export default {
       showList: [],
       unConfirm: [],
       confirm: [],
+      submitLists: [],
+      approvedLists: [],
     }
   },
   watch: {
@@ -147,6 +181,9 @@ export default {
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
+          vm.submitLists = res.lists.filter(item => item.confirm_status === 'SUBMIT')
+          vm.approvedLists = res.lists.filter(item => item.confirm_status === 'APPROVED')
+
           vm.contractMsg = res.lists
           vm.showList = res.lists
           // vm.showList = res.lists.filter(item => {
@@ -307,6 +344,14 @@ export default {
       }
 
     }
+    .option:nth-of-type(2) {
+      position: relative;
+    //  left: 0;
+          img{
+            position: absolute;
+            right: 10px;
+          }
+    }
   }
     }
 }

src/pages/userBind/np/naturePerson.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: liuxin
  * @Date: 2019-09-19 09:18:14
- * @LastEditTime: 2019-09-27 19:02:48
+ * @LastEditTime: 2019-10-09 13:11:10
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -465,6 +465,12 @@ export default {
       this.bank.bank_branch_name = ''
     },
     addBankInfo () {
+      this.hlsPopup.showConfirm({
+        title: '提示',
+        content: '您确认添加吗？',
+        onConfirm: (data) => {
+          console.log(data)
+          if (data) {
             let bpName = window.localStorage.getItem('bp_name')
             if (
               this.bank.bank_account_num === '' ||
@@ -498,8 +504,18 @@ export default {
                 }
               })
             }
+          }
+        },
+      })
     },
     putData () {
+      if (window.localStorage.getItem('user_id') && window.localStorage.getItem('user_id') !== 'undefined') {
+        this.hlsPopup.showConfirm({
+          title: '提示',
+          content: '您确认提交吗？',
+          onConfirm: (data) => {
+            console.log(data)
+            if (data) {
               let vm = this
               let url = process.env.basePath + 'bp_bind_submit'
               let param = {
@@ -518,6 +534,12 @@ export default {
                   })
                 }
               })
+            }
+          },
+        })
+      } else {
+        this.hlsPopup.showLongCenter('基本信息还未保存')
+      }
     },
     hideModal () {
       this.showModalValue = false

src/pages/userBind/npReadOnly/invoiceInfoReadOnly.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-30 15:18:52
- * @LastEditTime: 2019-10-08 17:26:46
+ * @LastEditTime: 2019-10-09 10:56:33
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -13,7 +13,7 @@
     </item>
     <item>
       <div slot="name">发票类型</div>
-      <div slot="content">{{ baseInfo.invoice_kind_n }}</div>
+      <div slot="content">{{ baseInfo.invoice_kind === '0'?'增值税专用发票':'增值税普通发票' }}</div>
     </item>
     <item>
       <div slot="name">发票抬头</div>

src/pages/userBind/npReadOnly/naturePersonReadOnly.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-30 15:18:52
- * @LastEditTime: 2019-10-08 11:05:37
+ * @LastEditTime: 2019-10-09 16:41:11
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -56,7 +56,7 @@
           <item>
             <div slot="name">手机号码</div>
             <!-- <div slot="content">{{ baseInfo.phone }}</div> -->
-            <input slot="content" v-model="baseInfo.phone" placeholder="请输入手机号码" >
+            <input slot="content" v-model="baseInfo.cell_phone" placeholder="请输入手机号码" >
           </item>
           <item>
             <div slot="name">居住地址</div>
@@ -92,7 +92,7 @@
               <input slot="content" v-model="baseInfo.spouse_phone" placeholder="请输入手机号" >
             </item>
             <item>
-              <div slot="name">工作单位工作单位</div>
+              <div slot="name">工作单位</div>
               <!-- <div slot="content">{{ baseInfo.working_place_sp }}</div> -->
               <input slot="content" v-model="baseInfo.working_place_sp" placeholder="请输入工作单位" >
             </item>
@@ -161,6 +161,9 @@
         </div>
       </h-view>
     </h-modal>
+    <bottom-tab class="footer-button">
+      <tab-button class="put1" @click.native="reSubmit">提交</tab-button>
+    </bottom-tab>
   </h-view>
 </template>
 <script>
@@ -383,6 +386,14 @@ export default {
     border: 1px solid #00469c;
     background-color: #fafafa;
   }
+  .put1 {
+      width: 100%;
+      height: 45px;
+      color: #fff;
+      border-radius: 4px;
+      // border: 1px solid #00469c;
+      background-color: #00469c;
+    }
   .save {
     width: 175px;
     height: 45px;

src/pages/userBind/org/enterprise.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-19 09:31:19
- * @LastEditTime: 2019-10-08 13:48:58
+ * @LastEditTime: 2019-10-09 13:00:51
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -401,6 +401,13 @@ export default {
       })
     },
     handSubmit () {
+      if (this.bp_id) {
+        this.hlsPopup.showConfirm({
+          title: '提示',
+          content: '您确认提交吗？',
+          onConfirm: (data) => {
+            console.log(data)
+            if (data) {
               let url = $config.basePath + 'bp_bind_submit'
               let param = {
                 master: {
@@ -419,8 +426,20 @@ export default {
                   })
                 }
               })
+            }
+          },
+        })
+      } else {
+        this.hlsPopup.showLongCenter('基本信息未保存！')
+      }
     },
     addBankInfo () {
+      this.hlsPopup.showConfirm({
+        title: '提示',
+        content: '您确认添加吗？',
+        onConfirm: (data) => {
+          console.log(data)
+          if (data) {
             for (var key in this.bank_lists) {
               if (!this.bank_lists[key]) {
                 this.bank_card_flag = false
@@ -469,6 +488,9 @@ export default {
                 }
               })
             }
+          }
+        },
+      })
     },
 
     verified () {

src/pages/userBind/orgReadOnly/invoiceInfoReadOnly.vue

+<!--
+ * @Description: In User Settings Edit
+ * @Author: your name
+ * @Date: 2019-09-30 15:18:52
+ * @LastEditTime: 2019-09-30 15:18:52
+ * @LastEditors: your name
+ -->
 
 <template>
   <list-item :item-height="44">
@@ -7,7 +14,7 @@
     </item>
     <item>
       <div slot="name" class="font-color">发票类型</div>
-      <div slot="content">{{ baseInfo.invoice_kind_n }}</div>
+      <div slot="content">{{ baseInfo.invoice_kind === '0'?'增值税专用发票':'增值税普通发票' }}</div>
     </item>
     <item>
       <div slot="name" class="font-color">发票抬头</div>