Commit e5f65d687fd7e169de61e987c0fc02380c73bead

Authored by wuxw
1 parent c036402c

测试补打收据

src/App.vue
... ... @@ -553,4 +553,16 @@ h3 {
553 553 font-size: 13px;
554 554 color: #606266;
555 555 }
  556 +
  557 +.vc-table-border {
  558 + border: 1px solid #000000;
  559 +}
  560 +
  561 +.vc-table-border tr td {
  562 + border: 1px solid #000000;
  563 +}
  564 +
  565 +.vc-table-border tr th {
  566 + border: 1px solid #000000;
  567 +}
556 568 </style>
557 569 \ No newline at end of file
... ...
src/components/fee/simplifyFeeReceipt.vue
... ... @@ -57,8 +57,8 @@
57 57 </el-col>
58 58 </el-row>
59 59 <div class="margin-top">
60   - <el-table :data="simplifyFeeReceiptInfo.feeReceipts" border stripe>
61   - <el-table-column type="selection" width="55" align="center"></el-table-column>
  60 + <el-table :data="simplifyFeeReceiptInfo.feeReceipts" @selection-change="handleSelectionChange" border stripe>
  61 + <el-table-column type="selection" width="55" align="center" ></el-table-column>
62 62 <el-table-column prop="receiptCode" :label="$t('simplifyFeeReceipt.receiptCode')"
63 63 align="center"></el-table-column>
64 64 <el-table-column :label="$t('simplifyFeeReceipt.feeType')" align="center">
... ... @@ -353,6 +353,9 @@ export default {
353 353 },
354 354 dateFormat(date) {
355 355 return dateFormat(date)
  356 + },
  357 + handleSelectionChange(val) {
  358 + this.simplifyFeeReceiptInfo.selectReceipts = val.map(item => item.receiptId)
356 359 }
357 360 }
358 361 }
... ...
src/views/fee/printPayFeeList.vue
1 1 <template>
2 2 <div class="print-pay-fee-container">
3   - <el-card class="box-card">
4   - <div class="text-center">
5   - <div style="color:#000;font-size:26px">{{ printPayFeeInfo.communityName }}
6   - <span v-if="printPayFeeInfo.apply === 'Y'">{{ $t('printPayFee.apply') }}</span>
7   - <span v-if="printPayFeeInfo.apply === 'N'">{{ $t('printPayFee.receipt') }}</span>
8   - <span v-if="printPayFeeInfo.apply === 'R'">{{ $t('printPayFee.refund') }}</span>
9   - </div>
  3 + <div class="text-center">
  4 + <div style="color:#000;font-size:26px">{{printPayFeeInfo.communityName}}
  5 + <span v-if="printPayFeeInfo.apply === 'Y'">{{ $t('printPayFee.apply') }}</span>
  6 + <span v-if="printPayFeeInfo.apply === 'N'">{{ $t('printPayFee.receipt') }}</span>
  7 + <span v-if="printPayFeeInfo.apply === 'R'">{{ $t('printPayFee.refund') }}</span>
10 8 </div>
11   - <div style="color:#000;font-size:18px;margin-left:20px">
12   - <div class="float-left">
13   - {{ $t('printPayFee.owner') }}:{{ printPayFeeInfo.payObjName }}
14   - </div>
15   - <div class="float-right text-right">
16   - <span>{{ $t('printPayFee.receiptNum') }}{{ printPayFeeInfo.receiptNum }}</span>
17   - <br />
18   - <span>{{ $t('printPayFee.payTime') }}:{{ printPayFeeInfo.feeTime }}</span>
19   - </div>
  9 + </div>
  10 + <div style="color:#000;font-size:18px;margin-left:20px">
  11 + <div class="float-left">
  12 + <span></span>
  13 + <br />
  14 + {{ $t('printPayFee.owner') }}:{{printPayFeeInfo.payObjName}}
20 15 </div>
21   - <el-table :data="printPayFeeInfo.fees" border style="width: 100%;color:#000;font-size:20px">
22   - <el-table-column prop="index" :label="$t('printPayFee.serialNumber')" width="80" align="center">
23   - <template slot-scope="scope">
24   - {{ scope.$index + 1 }}
25   - </template>
26   - </el-table-column>
27   - <el-table-column prop="feeName" :label="$t('printPayFee.feeItem')" align="center"></el-table-column>
28   - <el-table-column prop="objName" :label="$t('printPayFee.houseCar')" align="center"></el-table-column>
29   - <el-table-column :label="$t('printPayFee.feeRange')" align="center">
30   - <template slot-scope="scope">
31   - <div v-if="scope.row.preDegrees">
32   - {{ dateFormat(scope.row.startTime) }}
  16 + <div class="float-right text-right">
  17 + <span>{{ $t('printPayFee.receiptNum') }}{{printPayFeeInfo.receiptNum}}</span>
  18 + <br />
  19 + <span>{{ $t('printPayFee.payTime') }}:{{printPayFeeInfo.feeTime}}</span>
  20 + </div>
  21 + </div>
  22 +
  23 + <table class="table vc-table-border" style="color:#000;font-size:18px;width:100%;border-collapse:collapse;">
  24 + <thead>
  25 + <tr>
  26 + <th class="text-center" width="80px">{{ $t('printPayFee.serialNumber') }}</th>
  27 + <th class="text-center">{{ $t('printPayFee.feeItem') }}</th>
  28 + <th class="text-center">{{ $t('printPayFee.houseCar') }}</th>
  29 + <th class="text-center">{{ $t('printPayFee.feeRange') }}</th>
  30 + <th class="text-center">{{ $t('printPayFee.unitPrice') }}</th>
  31 + <th class="text-center">{{ $t('printPayFee.areaUsage') }}</th>
  32 + <th class="text-center">{{ $t('printPayFee.paymentMethod') }}</th>
  33 + <th class="text-center">{{ $t('printPayFee.receivableActual') }}</th>
  34 + <th class="text-center">{{ $t('printPayFee.discountAmount') }}</th>
  35 + <th class="text-center">{{ $t('printPayFee.remark') }}</th>
  36 + </tr>
  37 + </thead>
  38 + <tbody style="color:#000;font-size:20px">
  39 + <tr v-for="(item,index) in printPayFeeInfo.fees" :key="index" class="vc-table-border">
  40 + <th scope="row" class="text-center">{{index +1}}</th>
  41 + <td class="text-center">{{item.feeName}}</td>
  42 + <td class="text-center">{{item.objName}}</td>
  43 + <td class="text-center">
  44 + <div v-if="item.preDegrees">
  45 + {{dateFormat(item.startTime)}}
33 46 <span>{{ $t('printPayFee.to') }}</span>
34   - {{ dateFormat(scope.row.endTime) }}<br />
35   - {{ scope.row.preDegrees }} {{ $t('printPayFee.to') }} {{ scope.row.curDegrees }}
  47 + {{dateFormat(item.endTime)}}<br />
  48 + {{item.preDegrees}} {{ $t('printPayFee.to') }} {{item.curDegrees}}
36 49 </div>
37   - <div v-else-if="scope.row.feeTypeCd === '888800010006'">
  50 + <div v-else-if="item.feeTypeCd === '888800010006'">
38 51 {{ $t('printPayFee.none') }}
39 52 </div>
40 53 <div v-else>
41   - {{ dateFormat(scope.row.startTime) }}{{ $t('printPayFee.to') }}{{ dateFormat(scope.row.endTime) }}
  54 + {{dateFormat(item.startTime)}}{{$t('printPayFee.to')}}{{dateFormat(item.endTime)}}
42 55 </div>
43   - </template>
44   - </el-table-column>
45   - <el-table-column :label="$t('printPayFee.unitPrice')" align="center">
46   - <template slot-scope="scope">
47   - {{ scope.row.squarePrice }}<br />{{ scope.row.units }}
48   - </template>
49   - </el-table-column>
50   - <el-table-column prop="area" :label="$t('printPayFee.areaUsage')" align="center"></el-table-column>
51   - <el-table-column prop="primeRate" :label="$t('printPayFee.paymentMethod')" align="center"></el-table-column>
52   - <el-table-column :label="$t('printPayFee.receivableActual')" align="center">
53   - <template slot-scope="scope">
54   - {{ scope.row.receivableAmount }}/{{ scope.row.amount }}{{ $t('printPayFee.yuan') }}
55   - <span v-if="scope.row.amount < 0">({{ $t('printPayFee.refund') }})</span>
56   - </template>
57   - </el-table-column>
58   - <el-table-column prop="discountPrice" :label="$t('printPayFee.discountAmount')" align="center">
59   - <template slot-scope="scope">
60   - {{ scope.row.discountPrice || 0 }}
61   - </template>
62   - </el-table-column>
63   - <el-table-column prop="remark" :label="$t('printPayFee.remark')" width="200" align="center"></el-table-column>
64   - </el-table>
65   -
66   - <el-row>
67   - <el-col :span="3" class="text-center">{{ $t('printPayFee.capitalRMB') }}</el-col>
68   - <el-col :span="2" class="text-center">{{ changeNumMoneyToChinese(printPayFeeInfo.amount) }}</el-col>
69   - <el-col :span="1" class="text-center">{{ printPayFeeInfo.amount }}</el-col>
70   - <el-col :span="2" class="text-center">{{ $t('printPayFee.accountDeduction') }}</el-col>
71   - <el-col :span="2" class="text-center">{{ printPayFeeInfo.acctAmount }}</el-col>
72   - </el-row>
  56 + </td>
  57 + <td class="text-center">{{item.squarePrice}}<br />{{item.units}}</td>
  58 + <td class="text-center">{{item.area}}</td>
  59 + <td class="text-center">{{item.primeRate}}</td>
  60 + <td class="text-center">
  61 + {{item.receivableAmount}}/{{item.amount}}{{$t('printPayFee.yuan')}}
  62 + <span v-if="item.amount < 0">({{ $t('printPayFee.refund') }})</span>
  63 + </td>
  64 + <td class="text-center">{{item.discountPrice || 0}}</td>
  65 + <td class="text-center" width="200px">{{item.remark}}</td>
  66 + </tr>
  67 + <tr>
  68 + <td colspan="3" class="text-center">{{ $t('printPayFee.capitalRMB') }}</td>
  69 + <td colspan="2" class="text-center">{{changeNumMoneyToChinese(printPayFeeInfo.amount)}}</td>
  70 + <td colspan="1" class="text-center">{{printPayFeeInfo.amount}}</td>
  71 + <td colspan="2" class="text-center">{{ $t('printPayFee.accountDeduction') }}</td>
  72 + <td colspan="2" class="text-center">{{printPayFeeInfo.acctAmount}}</td>
  73 + </tr>
  74 + <tr v-if="printPayFeeInfo.content || printPayFeeInfo.qrImg">
  75 + <td colspan="6">
  76 + <div style="max-width: 600px;" v-html="printPayFeeInfo.content"></div>
  77 + </td>
  78 + <td colspan="4">
  79 + <img v-if="printPayFeeInfo.qrImg" :src="printPayFeeInfo.qrImg" width="100px" height="100px">
  80 + </td>
  81 + </tr>
  82 + </tbody>
  83 + </table>
73 84  
74   - <el-row v-if="printPayFeeInfo.content || printPayFeeInfo.qrImg">
75   - <el-col :span="6">
76   - <div style="max-width: 600px;" v-html="printPayFeeInfo.content"></div>
77   - </el-col>
78   - <el-col :span="4">
79   - <img v-if="printPayFeeInfo.qrImg" :src="printPayFeeInfo.qrImg" width="100px" height="100px">
80   - </el-col>
81   - </el-row>
  85 + <el-row style="color:#000;font-size:18px;margin-left: 10px;" class="flex justify-between">
  86 + <el-col :span="6">{{ $t('printPayFee.departmentHead') }}</el-col>
  87 + <el-col :span="6">{{ $t('printPayFee.operator') }}:{{userInfo.name}}</el-col>
  88 + <el-col :span="6">{{ $t('printPayFee.financeReceipt') }}</el-col>
  89 + <el-col :span="6">{{ $t('printPayFee.customerConfirm') }}</el-col>
  90 + </el-row>
82 91  
83   - <el-row style="color:#000;font-size:18px;margin-left: 10px;">
84   - <el-col :span="6">
85   - {{ $t('printPayFee.departmentHead') }}
86   - </el-col>
87   - <el-col :span="6">
88   - {{ $t('printPayFee.operator') }}:{{ userInfo.name }}
89   - </el-col>
90   - <el-col :span="6">
91   - {{ $t('printPayFee.financeReceipt') }}
92   - </el-col>
93   - <el-col :span="6">
94   - {{ $t('printPayFee.customerConfirm') }}
95   - </el-col>
96   - </el-row>
97   -
98   - <el-row id="print-btn">
99   - <el-col :span="24">
100   - <el-button type="primary" class="float-right" @click="handlePrint">
101   - <i class="el-icon-printer"></i>&nbsp;{{ $t('common.print') }}
102   - </el-button>
103   - <el-button type="warning" class="float-right" style="margin-right:20px;" @click="handleClose">
104   - {{ $t('common.cancel') }}
105   - </el-button>
106   - </el-col>
107   - </el-row>
108   - </el-card>
  92 + <el-row id="print-btn">
  93 + <el-col :span="24">
  94 + <el-button type="primary" class="float-right" @click="handlePrint">
  95 + <i class="el-icon-printer"></i>&nbsp;{{ $t('common.print') }}
  96 + </el-button>
  97 + <el-button type="warning" class="float-right" style="margin-right:20px;" @click="handleClose">
  98 + {{ $t('common.cancel') }}
  99 + </el-button>
  100 + </el-col>
  101 + </el-row>
109 102 </div>
110 103 </template>
111 104  
112 105 <script>
113   -import { getCommunityId } from '@/api/community/communityApi'
  106 +import { getCommunityId, getCommunityName } from '@/api/community/communityApi'
114 107 import { queryFeeReceipt, queryFeeReceiptDetail, queryFeePrintSpec } from '@/api/fee/printPayFeeApi'
115   -import { getUserId,getUserName } from '@/api/user/userApi'
  108 +import { getUserId, getUserName } from '@/api/user/userApi'
116 109 import { dateFormat } from '@/utils/dateUtil'
117 110  
118 111 export default {
... ... @@ -155,9 +148,11 @@ export default {
155 148 this.printPayFeeInfo.receiptId = this.$route.query.receiptId
156 149 this.printPayFeeInfo.receiptIds = this.$route.query.receiptIds
157 150 this.printPayFeeInfo.detailIds = this.$route.query.detailIds
158   - this.printPayFeeInfo.apply = this.$route.query.apply
  151 + if(this.$route.query.apply){
  152 + this.printPayFeeInfo.apply = this.$route.query.apply
  153 + }
159 154 this.printPayFeeInfo.merge = this.$route.query.merge
160   - this.printPayFeeInfo.communityName = this.$route.query.communityName || ''
  155 + this.printPayFeeInfo.communityName = getCommunityName()
161 156  
162 157 this.loadReceipt()
163 158 this.loadPrintSpec()
... ...
src/views/fee/roomCreateFeeList.vue
... ... @@ -74,7 +74,7 @@
74 74 <simplify-callable v-if="roomCreateFeeInfo._currentTab === 'simplifyCallable'"
75 75 ref="simplifyCallable"></simplify-callable>
76 76 </el-tab-pane>
77   - <el-tab-pane v-if="hasPrivilege('502020092373407363')" label="补打收据" name="simplifyFeeReceipt">
  77 + <el-tab-pane label="补打收据" v-if="hasPrivilege('502020092373407363')" name="simplifyFeeReceipt" >
78 78 <simplify-fee-receipt v-if="roomCreateFeeInfo._currentTab === 'simplifyFeeReceipt'"
79 79 ref="simplifyFeeReceipt"></simplify-fee-receipt>
80 80 </el-tab-pane>
... ...