Merge pull request #74 from tron/lock/release-2.7.0/feat-9788

feat（KIP-9788）：临时停车，用户再开票以后查看开票详情，页面得抬头不显示，点击抬头以后，信息也没有

src/pages/parkingFee/components/base/parkingReceipt/parkingChooseHeader.vue

@@ -43,7 +43,7 @@
                     </div>
                   </div>
                 </div>
-                <div class="duty-paragraph">
+                <div class="duty-paragraph" v-if="item.invoiceTitleType === 'COMPANY'">
                   税号 {{ item.taxNo }}
                 </div>
               </div>

src/pages/parkingFee/components/base/parkingReceipt/parkingHeaderDetail.vue

@@ -2,44 +2,44 @@
   <scroll-view class="scroll-Y" scroll-y >
     <!-- <wx-points-commit ref='wxPointsCommit'></wx-points-commit> -->
     <div>
-      <div class="part" v-if="header.invoiceTitleType === 0">
-        <div class="part-item">
-          <span class="part-item-key">抬头类型</span>
-          <div class="part-item-value">单位</div>
-        </div>
-        <div class="part-item">
-          <span class="part-item-key">抬头名称</span>
-          <span class="part-item-value">{{ header.invoiceTitleName }}</span>
-        </div>
-        <div class="part-item">
-          <span class="part-item-key">公司税号</span>
-          <span class="part-item-value">{{ header.corporationTax }}</span>
-        </div>
-        <div class="part-item">
-          <span class="part-item-key">公司地址</span>
-          <span class="part-item-value">{{ header.companyAddress }}</span>
-        </div>
-        <div class="part-item">
-          <span class="part-item-key">公司电话</span>
-          <span class="part-item-value">{{ header.companyTel }}</span>
-        </div>
-        <div class="part-item">
-          <span class="part-item-key">开户银行</span>
-          <span class="part-item-value">{{ header.depositBank }}</span>
-        </div>
-        <div class="part-item">
-          <span class="part-item-key">开户账户</span>
-          <span class="part-item-value">{{ header.accountNumber }}</span>
-        </div>
+      <div class="part" v-if="header.invoiceTitleType === 'COMPANY'">
+      <div class="part-item">
+        <span class="part-item-key">抬头类型</span>
+        <div class="part-item-value">单位</div>
+      </div>
+      <div class="part-item">
+        <span class="part-item-key">抬头名称</span>
+        <span class="part-item-value">{{ header.titleName }}</span>
+      </div>
+      <div class="part-item">
+        <span class="part-item-key">公司税号</span>
+        <span class="part-item-value">{{ header.taxNo }}</span>
       </div>
+      <div class="part-item">
+        <span class="part-item-key">公司地址</span>
+        <span class="part-item-value">{{ header.companyAddress }}</span>
+      </div>
+      <div class="part-item">
+        <span class="part-item-key">公司电话</span>
+        <span class="part-item-value">{{ header.companyTel }}</span>
+      </div>
+      <div class="part-item">
+        <span class="part-item-key">开户银行</span>
+        <span class="part-item-value">{{ header.depositBank }}</span>
+      </div>
+      <div class="part-item">
+        <span class="part-item-key">开户账户</span>
+        <span class="part-item-value">{{ header.depositAccount }}</span>
+      </div>
+    </div>
       <div class="part" v-else>
         <div class="part-item">
           <span class="part-item-key">抬头类型</span>
-          <div class="part-item-value">{{ header.invoiceTitle.invoiceTitleType === 'COMPANY' ? '单位' : '个人/非企业单位'}}</div>
+          <div class="part-item-value">{{ header.invoiceTitleType === 'COMPANY' ? '单位' : '个人/非企业单位'}}</div>
         </div>
         <div class="part-item">
           <span class="part-item-key">抬头名称</span>
-          <span class="part-item-value">{{ header.invoiceTitle.titleName }}</span>
+          <span class="part-item-value">{{ header.titleName }}</span>
         </div>
       </div>
     </div>

src/pages/parkingFee/components/officeBlue/parkingReceipt/parkingChooseHeader.vue

@@ -40,7 +40,7 @@
                       </div>
                     </div>
                   </div>
-                  <div class="duty-paragraph">
+                  <div class="duty-paragraph" v-if="item.invoiceTitleType === 'COMPANY'">
                     税号 {{ item.taxNo }}
                   </div>
                 </div>

src/pages/parkingFee/components/officeBlue/parkingReceipt/parkingHeaderDetail.vue

@@ -1,17 +1,17 @@
 <template>
   <scroll-view class="scroll-Y" scroll-y>
-    <div class="part" v-if="header.invoiceTitleType === 0">
+    <div class="part" v-if="header.invoiceTitleType === 'COMPANY'">
       <div class="part-item">
         <span class="part-item-key">抬头类型</span>
         <div class="part-item-value">单位</div>
       </div>
       <div class="part-item">
         <span class="part-item-key">抬头名称</span>
-        <span class="part-item-value">{{ header.invoiceTitleName }}</span>
+        <span class="part-item-value">{{ header.titleName }}</span>
       </div>
       <div class="part-item">
         <span class="part-item-key">公司税号</span>
-        <span class="part-item-value">{{ header.corporationTax }}</span>
+        <span class="part-item-value">{{ header.taxNo }}</span>
       </div>
       <div class="part-item">
         <span class="part-item-key">公司地址</span>
@@ -27,7 +27,7 @@
       </div>
       <div class="part-item">
         <span class="part-item-key">开户账户</span>
-        <span class="part-item-value">{{ header.accountNumber }}</span>
+        <span class="part-item-value">{{ header.depositAccount }}</span>
       </div>
     </div>
     <div class="part" v-else>
@@ -37,7 +37,7 @@
       </div>
       <div class="part-item">
         <span class="part-item-key">抬头名称</span>
-        <span class="part-item-value">{{ header.invoiceTitleName }}</span>
+        <span class="part-item-value">{{ header.titleName }}</span>
       </div>
     </div>
   </scroll-view>

src/pages/parkingFee/components/officeBlue/parkingReceipt/parkingReceipt.vue

@@ -129,7 +129,7 @@
       <div class="priceBtn">
         <div>
           开票金额
-          <span class="price">{{ (totalNum / 100).toFixed(2) }} 元</span>
+          <span class="price">{{ totalNum }} 元</span>
         </div>
         <div
           :class="{

src/pages/parkingFee/mixins/parkingReceipt/parkingChangeHeader.js

@@ -78,7 +78,7 @@ export default {
         title: '发票抬头',
       });
     }, 300);
-    
+    console.log(this.isCompany)
   },
   methods: {
     radioChange: function (value) {

src/pages/parkingFee/mixins/parkingReceipt/parkingHeaderDetail.js

@@ -4,11 +4,13 @@ export default {
   data() {
     return {
       header: {},
+      header2: {},
     };
   },
   created() {
     // this.header = JSON.parse(options.header);
-    this.header = JSON.parse(this.$route.query.header);
+    this.header2 = JSON.parse(this.$route.query.header);
+    this.header = this.header2.invoiceTitle
     console.log('获取的发票信息', this.header);
   },
   mounted() {

src/pages/parkingFee/mixins/parkingReceipt/parkingOrderDetail.js

@@ -94,11 +94,11 @@ export default {
     },
     getOrderItemPrice(item) {
       if (this.useParkingOrderCache) {
-        const payFee = item.serviceFee;
-        return (payFee / 100).toFixed(2);
+        const payFee = item.totalPaidAmount;
+        return payFee;
       } else {
-        const payFee = item.invoiceAmount;
-        return (payFee / 100).toFixed(2);
+        const payFee = item.totalPaidAmount;
+        return payFee;
       }
     },
   },

src/pages/parkingFee/parkingFeeDetailSuccess.vue

@@ -5,17 +5,17 @@
 <script>
 import officeBlueCom from './components/officeBlue/parkingFeeDetailSuccess.vue';
 import baseParkingFeeCom from './components/base/parkingFeeDetailSuccess.vue';
-import parkingFeeDetailSuccess from './components/purple/parkingFeeDetailSuccess.vue';
+// import parkingFeeDetailSuccess from './components/purple/parkingFeeDetailSuccess.vue';
 import baseMixins from './mixins/base'
 export default {
   mixins:[baseMixins],
   components: {
     officeBlueCom,
     baseParkingFeeCom,
-    purpleCom: parkingFeeDetailSuccess
+    // purpleCom: parkingFeeDetailSuccess
   },
     mounted() {
-    this.componentName = 'purpleCom';
+    // this.componentName = 'purpleCom';
   }
 };
 </script>

src/pages/parkingFee/parkingFeeList.vue

@@ -5,17 +5,17 @@
 <script>
 import officeBlueCom from './components/officeBlue/parkingFeeList.vue';
 import baseParkingFeeCom from './components/base/parkingFeeList.vue';
-import parkingFeeList from './components/purple/parkingFeeList.vue';
+// import parkingFeeList from './components/purple/parkingFeeList.vue';
 import baseMixins from './mixins/base'
 export default {
   mixins:[baseMixins],
   components: {
     officeBlueCom,
     baseParkingFeeCom,
-    purpleCom: parkingFeeList
+    // purpleCom: parkingFeeList
   },
   mounted() {
-    this.componentName = 'purpleCom';
+    // this.componentName = 'purpleCom';
   }
 };
 </script>

src/pages/parkingFee/parkingReceipt/parkingApplication.vue

@@ -5,17 +5,17 @@
 <script>
 import officeBlueCom from '../components/officeBlue/parkingReceipt/parkingApplication.vue';
 import baseParkingFeeCom from '../components/base/parkingReceipt/parkingApplication.vue';
-import parkingApplication from '../components/purple/parkingReceipt/parkingApplication.vue';
+// import parkingApplication from '../components/purple/parkingReceipt/parkingApplication.vue';
 import baseMixins from '../mixins/base'
 export default {
   mixins:[baseMixins],
   components: {
     officeBlueCom,
     baseParkingFeeCom,
-    purpleCom: parkingApplication
+    // purpleCom: parkingApplication
   },
     mounted() {
-    this.componentName = 'purpleCom';
+    // this.componentName = 'purpleCom';
   }
 };
 </script>

src/pages/parkingFee/parkingReceipt/parkingChangeHeader.vue

@@ -6,16 +6,16 @@
 import officeBlueCom from '../components/officeBlue/parkingReceipt/parkingChangeHeader.vue';
 import baseParkingFeeCom from '../components/base/parkingReceipt/parkingChangeHeader.vue';
 import baseMixins from '../mixins/base'
-import parkingChangeHeader from '../components/purple/parkingReceipt/parkingChangeHeader.vue';
+// import parkingChangeHeader from '../components/purple/parkingReceipt/parkingChangeHeader.vue';
 export default {
   mixins:[baseMixins],
   components: {
     officeBlueCom,
     baseParkingFeeCom,
-    purpleCom: parkingChangeHeader
+    // purpleCom: parkingChangeHeader
   },
   mounted() {
-    this.componentName = 'purpleCom';
+    // this.componentName = 'purpleCom';
   }
 };
 </script>

src/pages/parkingFee/parkingReceipt/parkingChooseHeader.vue

@@ -6,16 +6,16 @@
 import officeBlueCom from '../components/officeBlue/parkingReceipt/parkingChooseHeader.vue';
 import baseParkingFeeCom from '../components/base/parkingReceipt/parkingChooseHeader.vue';
 import baseMixins from '../mixins/base'
-import parkingChooseHeader from '../components/purple/parkingReceipt/parkingChooseHeader.vue';
+// import parkingChooseHeader from '../components/purple/parkingReceipt/parkingChooseHeader.vue';
 export default {
   mixins:[baseMixins],
   components: {
     officeBlueCom,
     baseParkingFeeCom,
-    purpleCom: parkingChooseHeader
+    // purpleCom: parkingChooseHeader
   },
   mounted() {
-    this.componentName = 'purpleCom';
+    // this.componentName = 'purpleCom';
   }
 };
 </script>

src/pages/parkingFee/parkingReceipt/parkingHeaderDetail.vue

@@ -6,16 +6,16 @@
 import officeBlueCom from '../components/officeBlue/parkingReceipt/parkingHeaderDetail.vue';
 import baseParkingFeeCom from '../components/base/parkingReceipt/parkingHeaderDetail.vue';
 import baseMixins from '../mixins/base'
-import parkingHeaderDetail from '../components/purple/parkingReceipt/parkingHeaderDetail.vue';
+// import parkingHeaderDetail from '../components/purple/parkingReceipt/parkingHeaderDetail.vue';
 export default {
   mixins:[baseMixins],
   components: {
     officeBlueCom,
     baseParkingFeeCom,
-    purpleCom: parkingHeaderDetail
+    // purpleCom: parkingHeaderDetail
   },
   mounted() {
-    this.componentName = 'purpleCom';
+    // this.componentName = 'purpleCom';
   }
 };
 </script>

src/pages/parkingFee/parkingReceipt/parkingInvoice.vue

@@ -6,16 +6,16 @@
 import officeBlueCom from '../components/officeBlue/parkingReceipt/parkingInvoice.vue';
 import baseParkingFeeCom from '../components/base/parkingReceipt/parkingInvoice.vue';
 import baseMixins from '../mixins/base'
-import parkingInvoice from '../components/purple/parkingReceipt/parkingInvoice.vue';
+// import parkingInvoice from '../components/purple/parkingReceipt/parkingInvoice.vue';
 export default {
   mixins:[baseMixins],
   components: {
     officeBlueCom,
     baseParkingFeeCom,
-    purpleCom: parkingInvoice
+    // purpleCom: parkingInvoice
   },
   mounted() {
-    this.componentName = 'purpleCom';
+    // this.componentName = 'purpleCom';
   }
 };
 </script>

src/pages/parkingFee/parkingReceipt/parkingInvoiceImage.vue

@@ -6,16 +6,16 @@
 import officeBlueCom from '../components/officeBlue/parkingReceipt/parkingInvoiceImage.vue';
 import baseParkingFeeCom from '../components/base/parkingReceipt/parkingInvoiceImage.vue';
 import baseMixins from '../mixins/base'
-import parkingInvoiceImage from '../components/purple/parkingReceipt/parkingInvoiceImage.vue';
+// import parkingInvoiceImage from '../components/purple/parkingReceipt/parkingInvoiceImage.vue';
 export default {
   mixins:[baseMixins],
   components: {
     officeBlueCom,
     baseParkingFeeCom,
-    purpleCom: parkingInvoiceImage
+    // purpleCom: parkingInvoiceImage
   },
   mounted() {
-    this.componentName = 'purpleCom';
+    // this.componentName = 'purpleCom';
   }
 };
 </script>

src/pages/parkingFee/parkingReceipt/parkingOrderDetail.vue

@@ -6,16 +6,16 @@
 import officeBlueCom from '../components/officeBlue/parkingReceipt/parkingOrderDetail.vue';
 import baseParkingFeeCom from '../components/base/parkingReceipt/parkingOrderDetail.vue';
 import baseMixins from '../mixins/base'
-import parkingOrderDetail from '../components/purple/parkingReceipt/parkingOrderDetail.vue';
+// import parkingOrderDetail from '../components/purple/parkingReceipt/parkingOrderDetail.vue';
 export default {
   mixins:[baseMixins],
   components: {
     officeBlueCom,
     baseParkingFeeCom,
-    purpleCom: parkingOrderDetail
+    // purpleCom: parkingOrderDetail
   },
   mounted() {
-    this.componentName = 'purpleCom';
+    // this.componentName = 'purpleCom';
   }
 };
 </script>

src/pages/parkingFee/parkingReceipt/parkingReceipt.vue

@@ -6,16 +6,16 @@
 import officeBlueCom from '../components/officeBlue/parkingReceipt/parkingReceipt.vue';
 import baseParkingFeeCom from '../components/base/parkingReceipt/parkingReceipt.vue';
 import baseMixins from '../mixins/base'
-import parkingReceipt from '../components/purple/parkingReceipt/parkingReceipt.vue';
+// import parkingReceipt from '../components/purple/parkingReceipt/parkingReceipt.vue';
 export default {
   mixins:[baseMixins],
   components: {
     officeBlueCom,
     baseParkingFeeCom,
-    purpleCom: parkingReceipt
+    // purpleCom: parkingReceipt
   },
   mounted() {
-    this.componentName = 'purpleCom';
+    // this.componentName = 'purpleCom';
   }
   // mounted() {
   //   // this.componentName = 'baseParkingFeeCom';