abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善开票管理

Browse Source
This commit is contained in:
ryoeiken 2021-01-22 17:18:50 +08:00
parent 711856a329
commit b757912963
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtInvoiceDaoController.java
View File

@ -128,6 +128,8 @@ public class FtInvoiceDaoController extends BaseController {
String taxId = params.getString("taxId"); String taxId = params.getString("taxId");
// 开票类型 // 开票类型
Integer invoiceType = params.getInteger("invoiceType"); Integer invoiceType = params.getInteger("invoiceType");
// 开票金额
BigDecimal invoiceAmount = params.getBigDecimal("invoiceAmount");
FtInvoiceDao invoiceDao = new FtInvoiceDao(); FtInvoiceDao invoiceDao = new FtInvoiceDao();
Date today = new Date(); Date today = new Date();
@ -139,7 +141,7 @@ public class FtInvoiceDaoController extends BaseController {
invoiceDao.setInvoiceName(invoiceName); invoiceDao.setInvoiceName(invoiceName);
invoiceDao.setTaxId(taxId); invoiceDao.setTaxId(taxId);
invoiceDao.setInvoiceType(invoiceType); invoiceDao.setInvoiceType(invoiceType);
invoiceDao.setInvoiceAmount(receipts); invoiceDao.setInvoiceAmount(invoiceAmount);
iFtInvoiceDaoService.save(invoiceDao); iFtInvoiceDaoService.save(invoiceDao);
FtSettlementDao settlementDao = new FtSettlementDao(); FtSettlementDao settlementDao = new FtSettlementDao();

14
ruoyi-ui/src/views/fantang/settlement/index.vue
View File

@ -105,8 +105,8 @@
<el-form-item label="实收" prop="receipts"> <el-form-item label="实收" prop="receipts">
<el-input v-model="form.receipts" placeholder="请输入实收" :disabled="true"/> <el-input v-model="form.receipts" placeholder="请输入实收" :disabled="true"/>
</el-form-item> </el-form-item>
<el-form-item label="结算类型" prop="type"> <el-form-item label="收款方式" prop="type">
<el-input v-model="form.type" placeholder="请输入结算类型" :disabled="true"/> <el-input v-model="form.type" placeholder="请输入收款方式" :disabled="true"/>
</el-form-item> </el-form-item>
<el-form-item label="开票金额" prop="invoiceAmount"> <el-form-item label="开票金额" prop="invoiceAmount">
<el-input v-model="form.invoiceAmount" placeholder="请输入开票金额"/> <el-input v-model="form.invoiceAmount" placeholder="请输入开票金额"/>
@ -146,6 +146,16 @@
<el-form-item label="实收" prop="receipts"> <el-form-item label="实收" prop="receipts">
<el-input v-model="form.receipts" placeholder="请输入实收" :disabled="true"/> <el-input v-model="form.receipts" placeholder="请输入实收" :disabled="true"/>
</el-form-item> </el-form-item>
<el-form-item label="收款方式" prop="type">
<el-select v-model="form.type" placeholder="请选择收款方式">
<el-option
v-for="item in typeOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="开票金额" prop="invoiceAmount"> <el-form-item label="开票金额" prop="invoiceAmount">
<el-input v-model="form.invoiceAmount" placeholder="请输入开票金额"/> <el-input v-model="form.invoiceAmount" placeholder="请输入开票金额"/>
</el-form-item> </el-form-item>