Procházet zdrojové kódy

财务管理付费打印(注销)

wangzhuo před 2 roky
rodič
revize
b8df7b0582
2 změnil soubory, kde provedl 116 přidání a 54 odebrání
  1. 17 0
      src/api/finance/payment.js
  2. 99 54
      src/views/finance/payment/index.vue

+ 17 - 0
src/api/finance/payment.js

@@ -223,4 +223,21 @@ export function revoke(data) {
     method: 'post',
     data: data
   })
+}
+
+// 打印数据查询
+export function printTFeeB(fId) {
+  return request({
+    url: '/finance/payment/print/' + fId,
+    method: 'get'
+  })
+}
+
+// 确认打印
+export function setPrintTime(data) {
+  return request({
+    url: '/finance/payment/setPrintTime',
+    method: 'post',
+    data: data
+  })
 }

+ 99 - 54
src/views/finance/payment/index.vue

@@ -602,19 +602,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="付费日期" prop="fAccbilldate">
-          <el-date-picker
-            clearable
-            size="small"
-            style="width: 200px"
-            v-model="queryParams.fAccbilldate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择账单日期"
-          >
-          </el-date-picker>
-
-        </el-form-item>
         <el-form-item label="账务日期起" prop="fBsdateStart">
           <el-date-picker
             clearable
@@ -649,6 +636,20 @@
             </el-option>
           </el-select>
         </el-form-item>
+
+        <el-form-item label="付费日期" prop="fAccbilldate">
+          <el-date-picker
+            clearable
+            size="small"
+            style="width: 200px"
+            v-model="queryParams.fAccbilldate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择账单日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+
         <el-form-item label="付款银行" prop="bank">
           <el-input
             v-model="queryParams.bank"
@@ -680,15 +681,7 @@
             :disabled="notChange"
           />
         </el-form-item>
-        <el-form-item label="付费金额" prop="fAmtcr">
-          <el-input
-            v-model="queryParams.fAmtcr"
-            placeholder="请输入付款金额"
-            size="small"
-            style="width: 200px"
-            :disabled="true"
-          />
-        </el-form-item>
+
         <el-form-item label="备注" prop="fRemarks">
           <el-input
             v-model="queryParams.fRemarks"
@@ -701,6 +694,16 @@
           />
         </el-form-item>
 
+        <el-form-item label="付费金额" prop="fAmtcr">
+          <el-input
+            v-model="queryParams.fAmtcr"
+            placeholder="请输入付款金额"
+            size="small"
+            style="width: 200px"
+            :disabled="true"
+          />
+        </el-form-item>
+
         <el-form-item label="系统编号" prop="fBillno">
           <el-input
             v-model="queryParams.fBillno"
@@ -819,7 +822,7 @@
 
           <el-button type="danger" @click="approvalRevocation":disabled="isApproved" size="mini">撤销审核</el-button>
 
-          <!-- <el-button type="warning" size="mini" @click="printFunction">打印</el-button> -->
+<!--          <el-button type="warning" size="mini" :disabled="isApproved" v-hasPermi="['finance:payment:printTFeeB']" @click="printFunction">打印</el-button>-->
 <!--          <el-button type="primary" @click="addPage" size="mini">新 增</el-button>-->
         </div>
         <div style="margin: 0 12px">
@@ -2469,48 +2472,64 @@
         <table class="table table-striped table-bordered" align="center" valign="center">
 
 
-          
+
           <tr>
-            <td colspan="8"></td>
-            <td>打印次数:{{ printSlipData.fNumberPrint + 1 }}</td>
-            <td colspan="2">打印日期:{{ printSlipData.fPrintTime }}</td>
+            <td colspan="6"></td>
+            <td colspan="2">打印次数:{{ printSlipData.fNumberPrint + 1 }}</td>
+            <td colspan="3">打印日期:{{ printSlipData.fPrintTime }}</td>
           </tr>
           <tr>
-            <td style="font-size: 24px;font-weight:bold" class="column" colspan="11">货款</td>
+            <td style="font-size: 24px;font-weight:bold" class="column" colspan="11">货款单据</td>
           </tr>
           <tr>
-            <td class="column" style="width: 6%;">供应商</td>
+            <td class="column" style="width: 9%;">供应商</td>
             <td class="column" colspan="2" style="width: 19%;">{{ printSlipData.fCorpName }}</td>
-            <td class="column" style="width: 9%;">付费日期</td>
+            <td class="column" style="width: 8%;">付费日期</td>
             <td class="column" style="width: 9%;">{{ printSlipData.fAccbilldate }}</td>
-            <td class="column" style="width: 9.5%;">账务日期起</td>
+            <td class="column" style="width: 9%;">账务日期起</td>
             <td class="column" style="width: 9.5%;">{{ printSlipData.fBsdateStart }}</td>
-            <td class="column" style="width: 9.5%;">账务日期止</td>
+            <td class="column" style="width: 9%;">账务日期止</td>
             <td class="column" style="width: 9.5%;">{{ printSlipData.fBsdateEnd }}</td>
             <td class="column" style="width: 9.5%;">系统编号</td>
-            <td class="column" style="width: 9.5%;">{{ printSlipData.fBillno }}</td>
+            <td class="column" style="width: 10%;">{{ printSlipData.fBillno }}</td>
           </tr>
           <tr>
             <td class="column">付款公司</td>
-            <td class="column" colspan="2">{{ printSlipData.fCtrlcorpName }}</td>
-            <td class="column">付款金额</td>
-            <td class="column" colspan="1">{{ printSlipData.fAmtcr }}</td>
+            <td class="column" colspan="4">{{ printSlipData.fCtrlcorpName }}</td>
+
+
+            <td class="column">制单人</td>
+            <td class="column" colspan="2">{{ printSlipData.createBy }}</td>
+            <td class="column">制单日期</td>
+            <td class="column" colspan="2">{{ printSlipData.createTime }}</td>
+          </tr>
+
+          <tr>
             <td class="column">付款银行</td>
-            <td class="column" colspan="1">{{ printSlipData.bank }}</td>
+            <td class="column" colspan="3">{{ printSlipData.bank }}</td>
             <td class="column">付款账号</td>
-            <td class="column" colspan="1">{{ printSlipData.invoiceNo }}</td>
+            <td class="column" colspan="3">{{ printSlipData.invoiceNo }}</td>
             <td class="column">流水号</td>
-            <td class="column" colspan="1">{{ printSlipData.waterBillNo }}</td>
+            <td class="column" colspan="3">{{ printSlipData.waterBillNo }}</td>
           </tr>
+
           <tr>
-            <!-- <td class="column">备注</td>
-            <td class="column" colspan="10" style="text-align: left">{{ printSlipData.fRemarks }}</td> -->
             <td class="column">备注</td>
-            <td class="column" colspan="6">{{ printSlipData.fRemarks }}</td>
-            <td class="column">制单人</td>
-            <td class="column" colspan="1">{{ printSlipData.createBy }}</td>
-            <td class="column">制单日期</td>
-            <td class="column" colspan="2">{{ printSlipData.createTime }}</td>
+            <td class="column" colspan="10">{{ printSlipData.fRemarks }}</td>
+          </tr>
+
+          <tr>
+            <td class="column">货款金额(小写):</td>
+            <td class="column" colspan="5">{{ printSlipData.fAmtdr }}</td>
+            <td class="column">货款金额(大写):</td>
+            <td class="column" colspan="5">{{ printSlipData.fAmtdrB }}</td>
+          </tr>
+
+          <tr>
+            <td class="column">付款金额(小写):</td>
+            <td class="column" colspan="5">{{ printSlipData.fAmtcr }}</td>
+            <td class="column">付款金额(大写):</td>
+            <td class="column" colspan="5">{{ printSlipData.fAmtcrB }}</td>
           </tr>
         </table>
         <table class="table table-striped table-bordered" align="center" valign="center">
@@ -2528,7 +2547,7 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="printTheDialogBox = false">取 消</el-button>
-        <el-button type="primary" @click="Printing">打印</el-button>
+        <el-button type="primary" @click="confirmPrinting">打印</el-button>
       </span>
     </el-dialog>
 
@@ -2562,7 +2581,9 @@ import {
   exportWarehousebillsitems,
   confirmPayment,
   revoke,
-  cancelAPayment
+  cancelAPayment,
+  setPrintTime,
+  printTFeeB
 } from "@/api/finance/payment";
 import { listFees } from "@/api/basicdata/fees";
 import print from "print-js";
@@ -2840,6 +2861,18 @@ export default {
           label: "fRemarks",
           name: "备注",
           checked: 0,
+        // },
+        // {
+        //   surface: "14",
+        //   label: "fNumberPrint",
+        //   name: "打印次数",
+        //   checked: 0,
+        // },
+        // {
+        //   surface: "15",
+        //   label: "fPrintTime",
+        //   name: "打印时间",
+        //   checked: 0,
         }
       ],
       setRowList: [],
@@ -5223,16 +5256,13 @@ export default {
     printFunction() {
       this.printTheDialogBox = true;
 
-
-      getCharge(this.queryParams.fId).then((res) => {
+      printTFeeB(this.queryParams.fId).then((res) => {
           console.log(res);
-          this.printSlipData = res.data.tFee;
+          this.printSlipData = res.data;
 
           let printDate = new Date();
           this.printSlipData.fPrintTime = printDate.toLocaleString();
 
-
-
           // 供货商名赋值
           for (const key in this.vendorList) {
             if (this.vendorList[key].fId == this.printSlipData.fCorpid) {
@@ -5247,7 +5277,22 @@ export default {
             }
           }
       });
-    }
+    },
+    // 确认打印
+    confirmPrinting() {
+      // 添加打印次数
+      let data = {
+        id : this.printSlipData.fId + '',
+        printDate : this.printSlipData.fPrintTime
+      };
+      setPrintTime(data).then(res => {
+        if (res.code === 200) {
+          this.$print(this.$refs.print)
+        } else {
+          this.$message.error('修改打印此处出错');
+        }
+      })
+    },
   },
 };
 </script>