From 23efa81daa45a0062cad5ac5dc50d33af1240461 Mon Sep 17 00:00:00 2001
From: lingxiao <wei.li@le-it.com.cn>
Date: Fri, 6 May 2022 16:09:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=BA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=B5=81=E6=B0=B4=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/property/pay.js            |  9 +++++++++
 src/components/receiptPrinting.vue | 11 ++++++++++-
 src/views/property/otherPay.vue    | 14 +++++++++++---
 src/views/property/pay.vue         | 17 ++++++++++++++---
 src/views/property/payCopy.vue     | 14 ++++++++++++--
 5 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/src/api/property/pay.js b/src/api/property/pay.js
index 3e38689..60fbb25 100644
--- a/src/api/property/pay.js
+++ b/src/api/property/pay.js
@@ -79,4 +79,13 @@ export function getCountMoney (params) {
 		method: 'get',
 		params: params
 	})
+}
+
+// 获取顺序号
+export function getNextsnr(params){
+  return request({
+		url: '/admin/snrtab/nextsnr',
+		method: 'get',
+		params: params
+	})
 }
\ No newline at end of file
diff --git a/src/components/receiptPrinting.vue b/src/components/receiptPrinting.vue
index 3d01d02..9b4cedb 100644
--- a/src/components/receiptPrinting.vue
+++ b/src/components/receiptPrinting.vue
@@ -2,6 +2,7 @@
   <div id="app">
     <p id="title"><e>物业费收款收据</e></p>
     <p class="serialnumber">{{ data.contracttab.serialnumber }}</p>
+    <p class="printSerialNumber">{{ printSerialNumber }}</p>
     <p id="details-wrap">
       <span style="width: 181px"><e>小区楼名称：</e>{{ data.cidName }}</span>
       <span style="width: 113px"><e>楼楼号：</e>{{ data.propertyid }}</span>
@@ -89,12 +90,15 @@ export default {
       default: {
         contracttab: {}
       }
+    },
+    printSerialNumber:{
+      default:''
     }
   },
   watch: {
     data: {
       handler(newData) {
-        console.log(JSON.stringify(newData));
+        console.log(newData);
       },
       immediate: true,
       deep: true
@@ -180,6 +184,11 @@ span {
   top: 70px;
   left: 70px;
 }
+.printSerialNumber {
+  position: absolute;
+  top: 70px;
+  right: 70px;
+}
 #details-wrap {
   margin-top: 37px;
   margin-bottom: 5px;
diff --git a/src/views/property/otherPay.vue b/src/views/property/otherPay.vue
index 5ae7502..96b97cc 100644
--- a/src/views/property/otherPay.vue
+++ b/src/views/property/otherPay.vue
@@ -102,7 +102,7 @@
                    :disabled="!data.charge_money > 0"
                    :loading="loading"
                    @click="payEvent">缴费</el-button>
-        <el-button v-print="'#data'"
+        <el-button @click="getNextsnr" v-print="'#data'"
                    style="margin-left:80px"
                    type="primary"> 打印 </el-button>
       </div>
@@ -117,14 +117,15 @@
       </mailtable>
     </div>
     <div id="data">
-      <ReceiptPrinting :data="receiptDetails" />
+      <ReceiptPrinting :printSerialNumber="printSerialNumber" :data="receiptDetails" />
     </div>
   </div>
 </template>
 <script>
 import mailTable from '@/components/ColumnTable/tableComponent'
 import ReceiptPrinting from '@/components/receiptPrinting.vue';
-import { getCharge, addCharge } from '@/api/property/otherPay'
+import { getCharge, addCharge } from '@/api/property/otherPay';
+import { getNextsnr } from '@/api/property/pay'
 export default {
   name: 'OtherPay',
   components: {
@@ -133,6 +134,7 @@ export default {
   },
   data() {
     return {
+      printSerialNumber:'',
       receiptDetails:{},
       // 查询参数
       queryParams: {
@@ -169,8 +171,14 @@ export default {
     this.getStanderOne({ statid: 'FEE_TYPE' }).then((res) => {
       this.typeArray = res.data
     })
+    this.getNextsnr();
   },
   methods: {
+    getNextsnr(){
+      getNextsnr({snrid:'printId'}).then(({data})=>{
+        this.printSerialNumber=data;
+      })
+    },
     handleQuery() {
       getCharge(this.queryParams).then((res) => {
         this.getTableData(res.data)
diff --git a/src/views/property/pay.vue b/src/views/property/pay.vue
index 1fa7bd5..8937498 100644
--- a/src/views/property/pay.vue
+++ b/src/views/property/pay.vue
@@ -340,7 +340,7 @@
           @click="payEvent"
           >缴费</el-button
         >
-        <el-button v-print="'#data'" style="margin-left: 80px" :disabled="!receiptDetails.contracttab || !receiptDetails.contracttab.serialnumber" type="primary">
+        <el-button @click="getNextsnr" v-print="'#data'" style="margin-left: 80px" :disabled="!receiptDetails.contracttab || !receiptDetails.contracttab.serialnumber" type="primary">
           打印
         </el-button>
       </div>
@@ -369,7 +369,7 @@
       </mailTable>
     </div>
     <div id="data">
-      <ReceiptPrinting v-if="receiptDetails && receiptDetails.contracttab && receiptDetails.contracttab.serialnumber" :data="receiptDetails" />
+      <ReceiptPrinting v-if="receiptDetails && receiptDetails.contracttab && receiptDetails.contracttab.serialnumber" :printSerialNumber="printSerialNumber" :data="receiptDetails" />
     </div>
   </div>
 </template>
@@ -382,7 +382,8 @@ import {
   getAccesscardTab,
   getCarportTab,
   addContract,
-	getCountMoney
+	getCountMoney,
+  getNextsnr
 } from '@/api/property/pay'
 export default {
   name: 'Pay',
@@ -392,6 +393,7 @@ export default {
   },
   data() {
     return {
+      printSerialNumber:'',
 			fewMonths: 0, // 月数
 			fewDays: '', // 天数
 			ratesDay: '', // 收费标准-1天-1平米
@@ -489,6 +491,12 @@ export default {
     //     this.ratesDay = '' // input 框绑定的内容为空
     //   }
 		// },
+    getNextsnr(){
+      getNextsnr({snrid:'printId'}).then(({data})=>{
+        this.printSerialNumber=data;
+      })
+    },
+    
 		handleBeginChange(value) {
 			let endTime = this.createBeginDate(this.queryParams.begindate,parseInt(this.fewMonths))
 			let newEndTime = moment(endTime).add(this.fewDays,'d').format('YYYY-MM-DD')
@@ -761,6 +769,9 @@ export default {
       })
     }
   },
+  created(){
+    this.getNextsnr();
+  }
 }
 </script>
 
diff --git a/src/views/property/payCopy.vue b/src/views/property/payCopy.vue
index 634c9d6..056665a 100644
--- a/src/views/property/payCopy.vue
+++ b/src/views/property/payCopy.vue
@@ -327,7 +327,7 @@
           @click="payEvent"
           >缴费</el-button
         >
-        <el-button v-print="'#data'" style="margin-left: 80px" :disabled="!receiptDetails.contracttab || !receiptDetails.contracttab.serialnumber" type="primary">
+        <el-button  @click="getNextsnr" v-print="'#data'" style="margin-left: 80px" :disabled="!receiptDetails.contracttab || !receiptDetails.contracttab.serialnumber" type="primary">
           打印
         </el-button>
       </div>
@@ -356,13 +356,14 @@
       </mailTable>
     </div>
     <div id="data">
-      <ReceiptPrinting :data="receiptDetails" />
+      <ReceiptPrinting :printSerialNumber="printSerialNumber" :data="receiptDetails" />
     </div>
   </div>
 </template>
 <script>
 import mailTable from '@/components/ColumnTable/tableComponent';
 import ReceiptPrinting from '@/components/receiptPrinting.vue';
+import { getNextsnr } from '@/api/property/pay'
 import moment from 'moment'
 import {
   getPropertyTab,
@@ -379,6 +380,7 @@ export default {
   },
   data() {
     return {
+      printSerialNumber:'',
 			fewMonths: 0, // 月数
 			fewDays: '', // 天数
 			ratesDay: '', // 收费标准-1天-1平米
@@ -476,6 +478,11 @@ export default {
     //     this.ratesDay = '' // input 框绑定的内容为空
     //   }
 		// },
+    getNextsnr(){
+      getNextsnr({snrid:'printId'}).then(({data})=>{
+        this.printSerialNumber=data;
+      })
+    },
 		handleBeginChange(value) {
 			let endTime = this.createBeginDate(this.queryParams.begindate,parseInt(this.fewMonths))
 			let newEndTime = moment(endTime).add(this.fewDays,'d').format('YYYY-MM-DD')
@@ -724,6 +731,9 @@ export default {
       })
     }
   },
+  created(){
+    this.getNextsnr();
+  }
 }
 </script>