'修改冲突'

src/pages/distributorSign/contract-details.vue

@@ -2,7 +2,7 @@
  * @Description: 合同详情
  * @Author: your name
  * @Date: 2019-09-25 15:38:21
- * @LastEditTime: 2019-09-27 11:13:31
+ * @LastEditTime: 2019-09-27 14:38:47
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -131,7 +131,7 @@
         </item>
       </list-item>
       <div class="repay-plan">
-        <p>查看还款计划</p>
+        <p @click="repayPlan">查看还款计划</p>
       </div>
       <div class="equipment-list">设备清单</div>
       <list-item :item-height="44" class="second-part">
@@ -224,6 +224,11 @@ export default {
    judgeBp () {
      this.bp_flag = !this.bp_flag
    },
+   repayPlan () {
+     this.$router.push({
+       name: 'FinancDetails',
+     })
+   },
  },
 }
 </script>

src/pages/distributorSign/contract-list.vue

@@ -100,12 +100,13 @@ export default {
 .hinput {
     width: 100%;
     height: 68px;
-    border-bottom:1px solid #ccc;
+    border-bottom:1px solid #cccccc70;
     display: flex;
     justify-content: center;
     align-items: center;
     margin-top: 3px;
     background: #fff;
+    margin-bottom: 9px;
     .search-box {
         width: 93.6%;
         height: 36px;
@@ -131,7 +132,7 @@ export default {
     height: 120px;
     // border: 1px solid #ccc;
     background: #fff;
-   // margin-bottom: 18px;
+    margin-bottom: 8px;
     .item {
         width: 100%;
         height: 34px;
@@ -172,7 +173,7 @@ export default {
             width: 100%;
             height: 18px;
             display: flex;
-            flex-basis: row;
+            flex-direction: row;
             .name {
                 font-family: PingFangSC-Regular;
                 font-size: 13px;

src/pages/distributorSign/financ-details.vue

+<!--
+ * @Description: 融资明细
+ * @Author: your name
+ * @Date: 2019-09-27 14:25:25
+ * @LastEditTime: 2019-09-27 14:40:18
+ * @LastEditors: Please set LastEditors
+ -->
+
+<template>
+  <h-view>
+    <h-view id="financ" class="public-style">
+      <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>
+        </div>
+      </h-header>
+    </h-view>
+</h-view></template>
+
+<script>
+export default {
+  name: 'FinancDetails',
+  data () {
+    return {
+
+    }
+  },
+  computed: {},
+  watch: {},
+  methods:
+ {
+
+ },
+}
+</script>
+<style lang='less' scoped>
+#financ {
+  .h-header-btn {
+      img {
+        width: 16px;
+        height: 16px;
+        margin-left: 4px;
+      }
+      span {
+        font-family: PingFangSC-Semibold;
+        margin-left: 16px;
+        font-size: 17px;
+        letter-spacing: 0.61px;
+        line-height: 24px;
+      }
+}
+}
+</style>

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-09-27 12:41:35
+ * @LastEditTime: 2019-09-27 18:11:48
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -30,7 +30,8 @@
           </item>
           <item v-if="bp_type_flag">
             <div slot="name">{{ typeName }}</div>
-            <input slot="content" :placeholder="type" v-model="baseInfo.agent_username">
+            <input v-if="bpClass_flag" slot="content" :placeholder="type" v-model="baseInfo.agent_username" >
+            <input v-if="!bpClass_flag" slot="content" :placeholder="type" v-model="baseInfo.business_license_num" >
           </item>
         </list-item>
         <div class="userInfo martop">企业信息</div>
@@ -60,16 +61,18 @@
             >
           </item>
           <item>
-            <div slot="name" class="font-color required">统一社会信用代码</div>
-            <input slot="content" v-model="baseInfo.organization_code" placeholder="上传营业执照自动填充">
+            <div slot="name" class="font-color">统一社会信用代码</div>
+            <input slot="content" v-model="baseInfo.organization_code" placeholder="上传营业执照自动填充" class="auto">
           </item>
           <item>
-            <div slot="name" class="font-color required">注册资本</div>
-            <input slot="content" v-model="baseInfo.registered_capital" type="number" placeholder="上传营业执照自动填充">
+            <div slot="name" class="font-color">注册资本</div>
+            <input
+              slot="content" v-model="baseInfo.registered_capital" type="number" placeholder="上传营业执照自动填充"
+              class="auto">
           </item>
           <item>
-            <div slot="name" class="font-color required">法定代表人</div>
-            <input slot="content" v-model="baseInfo.legal_person" placeholder="上传营业执照自动填充">
+            <div slot="name" class="font-color">法定代表人</div>
+            <input slot="content" v-model="baseInfo.legal_person" placeholder="上传营业执照自动填充" class="auto">
           </item>
           <item>
             <div slot="name" class="font-color required">注册地址</div>
@@ -118,6 +121,7 @@
               slot="content"
               v-model="authMsg.auth_person_name"
               placeholder="上传身份证自动填充"
+              class="auto"
             >
           </item>
           <item>
@@ -126,6 +130,7 @@
               slot="content"
               v-model="authMsg.auth_person_id_card"
               placeholder="上传身份证自动填充"
+              class="auto"
             >
           </item>
           <item>
@@ -142,12 +147,12 @@
 
         <list-item v-if="flag" :item-height="44" class="second-part">
           <item>
-            <div slot="name" class="font-color required">姓名</div>
-            <input slot="content" v-model="legal_personMsg.id_card_name" placeholder="上传身份证自动填充">
+            <div slot="name" class="font-color">姓名</div>
+            <input slot="content" v-model="legal_personMsg.id_card_name" placeholder="上传身份证自动填充" class="auto">
           </item>
           <item>
-            <div slot="name" class="font-color required">身份证号</div>
-            <input slot="content" v-model="legal_personMsg.id_card_no" placeholder="上传身份证自动填充">
+            <div slot="name" class="font-color">身份证号</div>
+            <input slot="content" v-model="legal_personMsg.id_card_no" placeholder="上传身份证自动填充" class="auto">
           </item>
           <item>
             <div slot="name" class="font-color required">手机号</div>
@@ -271,6 +276,7 @@ export default {
       tabNum: 0,
       bp_id: '',
       flag: true,
+      bpClass: '',
       img_url: {},
       typeList: [],
       backList: [],
@@ -282,9 +288,10 @@ export default {
       maritalList: [],
       getBankList: [],
       academic_bg_n: '',
+      bpClass_flag: false,
       text: '法人代表信息',
       bp_type_flag: false,
-      typeName: '业务经办',
+      typeName: '',
       marital_status_n: '',
       bank_card_flag: false,
       showModalValue: false,
@@ -300,13 +307,15 @@ export default {
         bp_name: '',
         phone: null,
         auth_flag: '',
-        business_address: '',
+        user_phone: '18507155349',
         legal_person: '',
-        enterprise_type: '',
         agent_username: '',
+        enterprise_type: '',
+        business_address: '',
         registered_place: '',
         organization_code: null,
         registered_capital: null,
+        business_license_num: '',
         bp_class: this.$route.params.bp_class,
       },
       bank_lists: {
@@ -331,16 +340,16 @@ export default {
       let vm = this
       if (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA') {
         vm.type = '请输入业务经办员工代码'
-        vm.typeName = '业务经办'
-        vm.bp_type_flag = true
+        vm.typeName = '业务经办人'
         vm.baseInfo.agent_username = 'BP003020'
       } else if (
         vm.baseInfo.bp_type === 'AGENT' ||
           vm.baseInfo.bp_type === 'OFFICE' ||
           vm.baseInfo.bp_type === 'FACTORY'
       ) {
-        vm.bp_type_flag = false
-        delete vm.baseInfo.agent_username
+        vm.typeName = '营业执照'
+        vm.type = '请输入营业执照号'
+        vm.baseInfo.agent_username = ''
       }
     },
     flag () {
@@ -350,6 +359,15 @@ export default {
         this.text = '授权信息'
       }
     },
+    typeName () {
+      if (this.typeName === '业务经办人') {
+        this.bpClass = this.baseInfo.agent_username
+        this.bpClass_flag = true
+      } else {
+        this.bpClass = this.baseInfo.business_license_num
+        this.bpClass_flag = false
+      }
+    },
     'tabNum': function (newVal, oldVal) {
       // if ((newVal === 1 && !window.sessionStorage.user_id) || (newVal === 2 && !window.sessionStorage.user_id)) {
       //   this.hlsPopup.showError('清先保存基本信息')
@@ -394,6 +412,9 @@ export default {
         console.log('企业信息提交', res)
         if (res.result === 'S') {
           vm.hlsPopup.showSuccess('提交成功')
+          vm.$router.push({
+            name: 'Home',
+          })
         }
       })
     },
@@ -470,9 +491,11 @@ export default {
       //   vm.msg_flag = true
       // }
       // 校验基本信息
+      if (this.bpClass_flag) {
+        delete this.lastInfo.business_license_num
         for (var key in vm.lastInfo) {
           if (!vm.lastInfo[key]) {
-          console.log('key', key)
+            console.log('key', key, vm.bpClass)
             switch (key) {
               case 'bp_type':
                 vm.hlsPopup.showLongCenter('客户类型未填写')
@@ -516,6 +539,75 @@ export default {
               case 'auth_person_id_card':
                 vm.hlsPopup.showLongCenter('身份证号未填写')
                 break
+              case 'user_phone':
+                vm.hlsPopup.showLongCenter('您还未登录')
+                break
+              case 'auth_person_position':
+                vm.hlsPopup.showLongCenter('公司职务未填写')
+                break
+              case 'auth_person_matter':
+                vm.hlsPopup.showLongCenter('授权事项未填写')
+                break
+            }
+            // vm.hlsPopup.showLongCenter('基本信息不完整！')
+            vm.msg_flag = false
+            return
+          } else {
+            vm.msg_flag = true
+          }
+        }
+        this.lastInfo.business_license_num = ''
+      } else {
+        delete this.lastInfo.agent_username
+        for (var key1 in vm.lastInfo) {
+          if (!vm.lastInfo[key1]) {
+            console.log('key', key1)
+            switch (key1) {
+              case 'bp_type':
+                vm.hlsPopup.showLongCenter('客户类型未填写')
+                break
+              case 'bp_name':
+                vm.hlsPopup.showLongCenter('公司名称未填写')
+                break
+              case 'enterprise_type':
+                vm.hlsPopup.showLongCenter('企业类型未填写')
+                break
+              case 'organization_code':
+                vm.hlsPopup.showLongCenter('统一社会信用代码未填写')
+                break
+              case 'registered_capital':
+                vm.hlsPopup.showLongCenter('注册资本未填写')
+                break
+              case 'legal_person':
+                vm.hlsPopup.showLongCenter('法定代表人未填写')
+                break
+              case 'registered_place':
+                vm.hlsPopup.showLongCenter('注册地址未填写')
+                break
+              case 'business_address':
+                vm.hlsPopup.showLongCenter('经营地址未填写')
+                break
+              case 'phone':
+                vm.hlsPopup.showLongCenter('固定电话未填写')
+                break
+              case 'id_card_no':
+                vm.hlsPopup.showLongCenter('身份证未填写')
+                break
+              case 'cell_phone':
+                vm.hlsPopup.showLongCenter('手机号未填写')
+                break
+              case 'living_address':
+                vm.hlsPopup.showLongCenter('居住地址未填写')
+                break
+              case 'auth_person_name':
+                vm.hlsPopup.showLongCenter('授权人姓名未填写')
+                break
+              case 'auth_person_id_card':
+                vm.hlsPopup.showLongCenter('身份证号未填写')
+                break
+              case 'user_phone':
+                vm.hlsPopup.showLongCenter('您还未登录')
+                break
               case 'auth_person_position':
                 vm.hlsPopup.showLongCenter('公司职务未填写')
                 break
@@ -530,10 +622,13 @@ export default {
             vm.msg_flag = true
           }
         }
-      if (!vm.bp_type_flag) {
+        this.lastInfo.agent_username = ''
+      }
+
+      // if (!vm.bp_type_flag) {
       // vm.baseInfo.agent_username = ''
       // vm.saveInfo.agent_username = ''
-      }
+      // }
       // 校验电话号
       let re = this.hlsUtil.phoneNumber(this.saveInfo.cell_phone)
       if (!re && this.baseInfo.auth_flag === 'N') {
@@ -600,6 +695,7 @@ export default {
         returnItem: function (index, obj) {
           vm.baseInfo.bp_type = obj.bp_type
           vm.bp_type_n = obj.bp_type_n
+          vm.bp_type_flag = true
         },
       })
     },

src/router/index.js

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-24 12:34:06
- * @LastEditTime: 2019-09-25 21:10:20
+ * @LastEditTime: 2019-09-27 14:36:20
  * @LastEditors: Please set LastEditors
  */
 import Vue from 'vue'
@@ -33,6 +33,7 @@ import IntoList from '@/pages/intoApproval/intoList'
 // 经销商签约
 import ContractList from '@/pages/distributorSign/contract-list'
 import ContractDetails from '@/pages/distributorSign/contract-details'
+import FinancDetails from '@/pages/distributorSign/financ-details'
 
 Vue.use(Router)
 
@@ -103,6 +104,7 @@ export default new Router({
     // 经销商签约
     {path: '/contract-list', component: ContractList, name: 'ContractList', meta: {keepAlive: true}},
     {path: '/contract-details', component: ContractDetails, name: 'ContractDetails', meta: {keepAlive: true}},
+    {path: '/financ-details', component: FinancDetails, name: 'FinancDetails', meta: {keepAlive: true}},
   ],
   scrollBehavior (to, from, savedPosition) {
     if (to.hash) {