Merge branch 'liuxin' into develop

src/pages/carConfirm/confirm-detail.vue

@@ -41,7 +41,7 @@
                   v-model="rentInfo.vehicle_model"
                   readonly
                   class="write"
-                  placeholder="请输入厂商型号"
+                  placeholder="暂无数据"
                 >
               </item>
               <item>
@@ -50,7 +50,7 @@
                   slot="content"
                   v-model="rentInfo.certificate_number"
                   readonly
-                  placeholder="请输入车牌号"
+                  placeholder="暂无数据"
                 >
               </item>
               <item>
@@ -59,7 +59,16 @@
                   slot="content"
                   v-model="rentInfo.departure_date"
                   readonly
-                  placeholder="请输入发车日期"
+                  placeholder="暂无数据"
+                >
+              </item>
+              <item>
+                <div slot="name">开票日期</div>
+                <input
+                  slot="content"
+                  v-model="rentInfo.invoice_date"
+                  readonly
+                  placeholder="暂无数据"
                 >
               </item>
             </list-item>
@@ -161,6 +170,7 @@ export default {
         vehicle_model: '',
         certificate_number: '',
         departure_date: '',
+        invoice_date: '',
       },
       products: [],
       equip: [
@@ -302,7 +312,7 @@ export default {
     .down {
       position: relative;
       width: 314px;
-      height: 506px;
+      height: 526px;
       background-size: 301px 24.7px;
       background-color: #fff;
     }

src/pages/contractStart/add-car.vue

@@ -48,6 +48,12 @@
                   slot="content" v-model="info.departure_date" readonly placeholder="请输入发车日期"
                   @click="showTime('YYYY-MM-DD')">
               </item>
+              <item>
+                <div slot="name">开票日期</div>
+                <input
+                  slot="content" v-model="info.invoice_date" readonly placeholder="请输入开票日期"
+                  @click="showTimeInvoice('YYYY-MM-DD')">
+              </item>
               <!-- <item :showArrow="true" @click.native="showModalValue=true">
                 <div slot="name">产品参数</div>
                 <input slot="content" v-model="info.bank_branch_name" placeholder="请选择产品参数" @click="changeHeight">
@@ -290,6 +296,7 @@ export default {
         vehicle_model: '',
         certificate_number: '',
         departure_date: '',
+        invoice_date: '',
       },
       detail: {
         product_num: '',
@@ -306,11 +313,6 @@ export default {
         bp_id: '',
       },
       equip: [],
-      // {
-      //   product_id: '3',
-      //   product_code: 'GTC389',
-      //   contract_id: '231',
-      // },
     }
   },
   computed: {
@@ -361,6 +363,15 @@ export default {
         },
       })
     },
+    showTimeInvoice (format) {
+      this.hlsPopup.showTime({
+        nowDate: `${this.carDate}`,
+        format: format,
+        callback: (date) => {
+          this.info.invoice_date = date
+        },
+      })
+    },
     save () {
       let vm = this
       let url = process.env.basePath + 'leases_info_save'
@@ -662,7 +673,7 @@ export default {
     .down {
       position: relative;
       width: 314px;
-      height: 586px;
+      height: 616px;
       background-size: 301px 24.7px;
       background-color: #fff;
     }