Merge remote-tracking branch 'origin/develop' into develop

src/views/base/distributor/components/DistrEdit.vue

@@ -61,6 +61,13 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="开票抬头" prop="invoiceHeader">
+            <el-input v-model="form.invoiceHeader" placeholder="请输入详细地址" />
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-form-item label="备注" prop="remark">
         <el-input
           v-model="form.remark"
@@ -92,6 +99,7 @@
         form: {
           dist: [],
           belongSale: '',
+          invoiceHeader: '',
         },
         dist: {
           distName: [{ required: true, trigger: 'blur', message: '请输入名称' }],

src/views/customer/components/Edit.vue

@@ -100,6 +100,11 @@
               value-format="yyyy-MM-dd HH:mm" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="开票抬头" prop="invoiceHeader">
+            <el-input v-model="editForm.invoiceHeader" placeholder="请输入详细地址" />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-form-item label="备注" prop="remark">
         <el-input
@@ -151,6 +156,7 @@
           abbrName: '', // 助记名
           custLocation: '', // 所在地区
           custAddress: '', // 详细地址
+          invoiceHeader: '', // 开票抬头
           custStatus: '', // 客户状态(10正常20)
           followUpDate: '', // 最后跟进时间
           custIndustry: '', // 客户类型  (没数据)
@@ -284,6 +290,7 @@
           abbrName: '', // 助记名
           custLocation: '', // 所在地区
           custAddress: '', // 详细地址
+          invoiceHeader: '', // 开票抬头
           custStatus: '', // 客户状态(10正常20)
           followUpDate: '', // 最后跟进时间
           custIndustry: '', // 客户类型  (没数据)