Merge branch 'ren' into develop

src/pages/distributorSign/contract-list.vue

@@ -68,6 +68,21 @@ export default {
       ],
     }
   },
+  created () {
+    // let url = $config.basePath + 'bp_org_bind_save'
+    //     let param = {
+    //       'master': vm.saveInfo,
+    //     }
+    //     vm.hlsHttp.post(url, param).then(function (res) {
+    let vm = this
+    let url = $config.basePath + 'prj_confirm_list_query'
+    let param = {
+      user_phone: '18945220871',
+    }
+    vm.hlsHttp.post(url, param).then(function (res) {
+      console.log(res.result)
+    })
+  },
   methods: {
     getTabNum (i) {
       this.tabNum = i

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 19:25:20
+ * @LastEditTime: 2019-09-29 09:25:38
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -202,7 +202,7 @@
       </div>
       <!-- <BankInfo v-show="tabNum==1" :bp_id="bp_id" @getInfo="getInfo" /> -->
       <BankInfo v-show="tabNum==1" :getBankList="getBankList" @getInfo="getInfo"/>
-      <InvoiceInfo v-show="tabNum==2" @getinvoiceList="getinvoiceList"/>
+      <InvoiceInfo v-show="tabNum==2" :orgCode="baseInfo.organization_code" @getinvoiceList="getinvoiceList"/>
     </h-content>
     <bottom-tab class="footer-button">
       <tab-button class="put" @click.native="handSubmit">提交</tab-button>
@@ -677,6 +677,7 @@ export default {
     getinvoiceList (val) {
       console.log(val)
       this.invoiceInfo = val
+      this.baseInfo.organization_code = val.organization_code
     },
     authorizeChange () {
       this.flag = !this.flag

src/pages/userBind/org/invoiceInfo.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-20 09:35:11
- * @LastEditTime: 2019-09-20 10:41:24
+ * @LastEditTime: 2019-09-29 09:25:50
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -50,14 +50,21 @@
       <div slot="name" class="font-color">纳税人识别号</div>
       <input
         slot="content"
-        v-model="invoiceInfo.organization_code" type="text" placeholder="请输入纳税人识别号"
+        v-model="invoiceInfo.organization_code" :placeholder="orgCode" type="text"
       >
     </item>
+    <!-- <p>{{ organization_code }}</p> -->
   </list-item>
 </template>
 <script>
 export default {
   name: 'InvoiceInfo',
+  props: {
+    'orgCode': {
+      type: String,
+      default: '',
+    },
+  },
   data () {
     return {
       invoicList: [],
@@ -68,13 +75,19 @@ export default {
         invoice_kind: '',
         taxpayer_type: '',
         invoice_title: '',
-        organization_code: '',
+        organization_code: this.orgCode,
         invoice_bp_bank_account: '',
         invoice_bp_address_phone_num: '',
       },
     }
   },
+  watch: {
+    orgCode () {
+      this.invoiceInfo.organization_code = this.orgCode
+    },
+  },
   created () {
+    console.log('orgCode', this.orgCode)
     this.getInvoiceType()
     this.getTaxpayer()
   },