7/17 添加公区收益

src/views/system/Sdb/SdbCashier/index.vue

@@ -218,7 +218,7 @@
           </el-form-item>
         </div>
         <el-form-item label="备注" prop="remark">
-          <el-input type="textarea" show-word-limit maxlength="100" :rows="10" v-model="inComeFrom.remark"></el-input>
+          <el-input type="textarea" show-word-limit maxlength="100" :rows="5" v-model="inComeFrom.remark"></el-input>
         </el-form-item>
         <div class="flex justify-end">
           <el-button @click="closer">取消</el-button>
@@ -234,7 +234,7 @@
         </div>
       </template>
 
-      <div class="printBox" id="printBox-Bill">
+      <div class="printBox" id="printBox-Bill" style="padding: 0; margin: 0">
         <div class="title">{{ print_form.title }}</div>
         <div class="nav gridBox">
           <div>单据日期：{{ print_form.printDate }}</div>
@@ -254,7 +254,7 @@
                 <th style="min-width: 80px">优免金额</th>
                 <th style="min-width: 80px">实收金额</th>
                 <th style="min-width: 80px">收款方式</th>
-                <th style="width: 200px">备注</th>
+                <th style="min-width: 100px">备注</th>
               </tr>
             </thead>
             <tbody>
@@ -283,7 +283,7 @@
             </tbody>
           </table>
           <p style="font-size: 10px">说明：本收据收款单位和收款具签章方为有效，本收据手写无效</p>
-          <div class="flex flex-items-center" style="font-size: 12px">
+          <div class="flex flex-items-center" style="font-size: 12px; margin-bottom: 0">
             <div class="flex-1">交款人：</div>
             <div class="flex-1 flex flex-items-center">
               <span style="white-space: nowrap">收款人： </span>
@@ -488,6 +488,7 @@ function initInComeFrom() {
     discount: 0, // 优惠金额
     residentName: '' // 缴费人
   };
+  totalDiscountAmount.value = 0;
   isMore = false;
 }
 // 改变优惠方式
@@ -598,6 +599,7 @@ function handleIncome(row: billlistType | false) {
     inComeFrom.value.allCost = row.amount;
     inComeFrom.value.billResidentId = [row];
     inComeFrom.value.residentName = row.residentName;
+    totalDiscountAmount.value = Number(row.amount);
   } else {
     if (ids.value.length <= 0) return ElMessage.warning('请选择账单');
     const set = new Set();