Merge commit 'aa887c8a' into dev

杨炀
Showing 2 changed files with 7 additions and 1 deletions
src/viewsPc/booking/addInvoice.vue
src/viewsPc/booking/invoiceDetail.vue
--- a/src/viewsPc/booking/addInvoice.vue
View file @e638132
+++ b/src/viewsPc/booking/addInvoice.vue
View file @e638132
@@ -117,6 +117,9 @@
                <el-form-item :label="`邮箱`" v-if="form.invoiceForm=='1'" required prop="invoiceEmail">
                  <el-input v-model="form.invoiceEmail"/>
                </el-form-item>
+                <el-form-item label="备注" v-if="form.invoiceForm=='1'" prop="remarks">
+                  <el-input  type="textarea" v-model="form.remarks"/>
+                </el-form-item>
                <div v-if="form.invoiceForm=='3'&&form.invoiceType=='0'">
                  <el-form-item :label="`地址`" required prop="invoiceAddress">
                    <el-input v-model="form.invoiceAddress"/>
--- a/src/viewsPc/booking/invoiceDetail.vue
View file @e638132
+++ b/src/viewsPc/booking/invoiceDetail.vue
View file @e638132
@@ -95,7 +95,10 @@
                <el-form-item :label="`邮箱`" v-if="form.invoiceForm=='1'" required prop="invoiceEmail">
                  {{form.invoiceEmail}}
                </el-form-item>
-                <el-form-item :label="`邮寄地址`" v-else required>
+                <el-form-item label="备注"   prop="remarks">
+                  {{form.remarks}}
+                </el-form-item>
+                <el-form-item v-if="!form.invoiceForm=='1'" :label="`邮寄地址`" required>
                  <div class="flexCenter">
                    <div>
                      <div class="bigSize">{{nowAddress.contact}} {{nowAddress.phone}}</div>