修改金额问题

operationSupport/src/views/payService/propertyFee/actualReceipts.vue

@@ -16,7 +16,7 @@
                     <el-tooltip class="item" effect="light" placement="bottom" content="收据作废">
                         <i
                             class="zoniot_font zoniot-icon-baofei redText"
-                            v-if="scope.row.printStatus !== 0"
+                            v-if="scope.row.cancellationStatus !== 0"
                             @click="delets(scope.row.id)"
                         ></i>
                         <i class="zoniot_font zoniot-icon-baofei ashText" v-else></i>
@@ -69,7 +69,24 @@ export default {
                 },
                 {
                     label: '付款方式',
-                    prop: 'payTypeDict'
+                    prop: 'payType',
+                    format(val) {
+                        if (val == 1) {
+                            return '微信在线';
+                        } else if (val == 2) {
+                            return '支付宝';
+                        } else if (val == 3) {
+                            return '现金';
+                        } else if (val == 4) {
+                            return '预存';
+                        } else if (val == 5) {
+                            return '其他';
+                        } else if (val == 6) {
+                            return '刷卡';
+                        } else if (val == 7) {
+                            return '微信扫码';
+                        }
+                    }
                 },
                 {
                     label: '缴费时间',
@@ -187,7 +204,7 @@ export default {
                     var LODOP; //声明为全局变量
                     LODOP = getLodop();
                     LODOP.PRINT_INIT('凤凰天誉专用收据');
-                    LODOP.ADD_PRINT_TABLE(30, 40, '90%', 200, data);
+                    LODOP.ADD_PRINT_TABLE(30, 40, '90%', 250, data);
                     //LODOP.SET_PRINT_STYLEA(0,"Top2Offset",-40); //这句可让次页起点向上移
                     LODOP.SET_PRINT_PAGESIZE(1, 2410, 1000, '');
 

operationSupport/src/views/payService/propertyFee/index.vue

@@ -11,7 +11,7 @@
                 <div class="searchText">
                     <el-input
                         clearable
-                        placeholder="输入订单号/业主/房间号"
+                        :placeholder="chargeStatus == 3 ? '输入收据号/业主/房间号' : '输入订单号/业主/房间号'"
                         v-trim
                         v-model.trim="mixins_query.name"
                         class="search-input"
@@ -159,7 +159,7 @@
 <script>
 import list from '@/utils/list.js';
 import actualReceipts from './actualReceipts.vue';
-
+import { getLodop } from '@utils/LodopFuncs.js';
 export default {
     mixins: [list],
     name: 'propertyFee',
@@ -302,7 +302,7 @@ export default {
                 this.$store.dispatch('addPopup', {
                     url: '/payService/propertyFee/stepPage/editAmount.vue',
                     width: '550px',
-                    height: '180px',
+                    height: '300px',
                     props: {
                         data: row,
                         callback: resolve
@@ -368,10 +368,31 @@ export default {
                     hideStar: hideStar,
                     title: title
                 });
-            }).then(() => {
+            }).then((ids) => {
+                if (!!ids) {
+                    this.palys(ids);
+                }
+
                 this.mixins_search();
             });
         },
+        palys(id) {
+            this.$http.post('/sc-charge/charge/receipt/print?id=' + id).then(({ data, msg, status }) => {
+                if (status == 0) {
+                    var LODOP; //声明为全局变量
+                    LODOP = getLodop();
+                    LODOP.PRINT_INIT('凤凰天誉专用收据');
+                    LODOP.ADD_PRINT_TABLE(30, 40, '90%', 250, data);
+                    //LODOP.SET_PRINT_STYLEA(0,"Top2Offset",-40); //这句可让次页起点向上移
+                    LODOP.SET_PRINT_PAGESIZE(1, 2410, 1000, '');
+
+                    //LODOP.SET_PRINT_STYLEA(0,"LinkedItem",-1);
+                    LODOP.PREVIEW();
+                } else {
+                    this.$message.error(msg);
+                }
+            });
+        },
         effectiveDateToggle(va) {
             let arr = va;
             if (!arr) {
@@ -551,7 +572,7 @@ export default {
     justify-content: space-between;
     height: inherit;
     .searchText {
-        width: calc(100% - 420px);
+        width: calc(100% - 450px);
     }
     .zz-tab-button {
         margin-right: 20px;

operationSupport/src/views/payService/propertyFee/stepPage/bulk.vue

@@ -107,10 +107,10 @@ export default {
                     var loading = this.$loading();
                     this.$http
                         .post('/sc-charge/charge/bill/payee', installData)
-                        .then(({ status, msg }) => {
+                        .then(({ status, data, msg }) => {
                             if (status == 0) {
                                 this.$message.success(msg);
-                                this.params.callback();
+                                this.params.callback(data);
                                 this.$emit('close');
                             } else {
                                 this.$message.error(msg);

operationSupport/src/views/payService/propertyFee/stepPage/detailsTable.vue

@@ -48,7 +48,24 @@ export default {
                 },
                 {
                     label: '付款方式',
-                    prop: 'payTypeDict'
+                    prop: 'payType',
+                    format(val) {
+                        if (val == 1) {
+                            return '微信在线';
+                        } else if (val == 2) {
+                            return '支付宝';
+                        } else if (val == 3) {
+                            return '现金';
+                        } else if (val == 4) {
+                            return '预存';
+                        } else if (val == 5) {
+                            return '其他';
+                        } else if (val == 6) {
+                            return '刷卡';
+                        } else if (val == 7) {
+                            return '微信扫码';
+                        }
+                    }
                 }
             ]
         };

operationSupport/src/views/payService/propertyFee/stepPage/editAmount.vue

@@ -1,8 +1,12 @@
 <template>
     <el-form ref="form" :model="formData" :rules="formRules" label-width="100px">
-        <el-form-item label="应收金额" prop="receivableAmount">
-            <el-input v-model="formData.receivableAmount" placeholder="请输入应收金额"></el-input>
+        <el-form-item label="滞纳金" prop="lateFee">
+            <el-input type="number" v-model="formData.lateFee" placeholder="请输入滞纳金" class="aaaa"></el-input>
         </el-form-item>
+        <el-form-item label="费用金额" prop="amount">
+            <el-input type="number" v-model="formData.amount" placeholder="请输入费用金额" class="aaaa"></el-input>
+        </el-form-item>
+        <el-form-item label="应收金额" required> {{ numberAmount() }}元 </el-form-item>
     </el-form>
 </template>
 <script >
@@ -11,11 +15,13 @@ export default {
     data() {
         return {
             formData: {
-                receivableAmount: '',
+                amount: '',
+                lateFee: '',
                 id: ''
             },
             formRules: {
-                receivableAmount: [this.$valid.inputRequired('应收金额')]
+                amount: [this.$valid.inputRequired('费用金额')],
+                lateFee: [this.$valid.inputRequired('滞纳金')]
             }
         };
     },
@@ -26,8 +32,9 @@ export default {
                 if (valid) {
                     var loading = this.$loading();
                     let installData = {
-                        amount: this.formData.receivableAmount,
-                        billId: this.formData.id
+                        amount: this.formData.amount,
+                        billId: this.formData.id,
+                        lateFee: this.formData.lateFee
                     };
                     this.$http
                         .get('/sc-charge/charge/bill/update/amount', installData)
@@ -46,6 +53,17 @@ export default {
                         });
                 }
             });
+        },
+        numberAmount() {
+            let a = 0,
+                b = 0;
+            if (!!this.formData.amount) {
+                a = Number(this.formData.amount);
+            }
+            if (!!this.formData.lateFee) {
+                b = Number(this.formData.lateFee);
+            }
+            return a + b;
         }
     },
     created() {
@@ -54,4 +72,11 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+/deep/ .aaaa input::-webkit-outer-spin-button,
+/deep/ .aaaa input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+}
+/deep/ .aaaa input[type='number'] {
+    -moz-appearance: textfield;
+}
 </style>

operationSupport/src/views/payService/propertyFee/stepPage/single.vue

@@ -154,10 +154,10 @@ export default {
                     };
                     this.$http
                         .post('/sc-charge/charge/bill/payee', installData)
-                        .then(({ status, msg }) => {
+                        .then(({ status, data, msg }) => {
                             if (status == 0) {
                                 this.$message.success(msg);
-                                this.params.callback();
+                                this.params.callback(data);
                                 this.$emit('close');
                             } else {
                                 this.$message.error(msg);