aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-08-08 12:17:20 +08:00
parent 53d5728eab
commit ae2d90339c
3 changed files with 100 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue
View File

@ -173,7 +173,7 @@
</XdTable> </XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="70%" :destroy-on-close="true" v-dialogDrag append-to-body> <el-dialog :title="titleForm" :visible.sync="openForm" width="70%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisSettleInvoiceRecordForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSettleInvoiceRecordForm> <emisSettleInvoiceRecordForm :id="currentId" :billList="selectBillList" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSettleInvoiceRecordForm>
</el-dialog> </el-dialog>
@ -189,6 +189,7 @@ import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue'; import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue'; import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue'; import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import emisSettleInvoiceRecordForm from '@/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm';
export default { export default {
name: "SiteConfimPanel", name: "SiteConfimPanel",
@ -197,7 +198,7 @@ export default {
type:[String,Number] type:[String,Number]
} }
}, },
components: { MergeBillForm,elDateSimplePicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker }, components: { MergeBillForm,elDateSimplePicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker,emisSettleInvoiceRecordForm },
dicts: [ dicts: [
], ],
data() { data() {
@ -227,6 +228,8 @@ export default {
// 结算子账单表格数据 // 结算子账单表格数据
emisSettleSubBillList: [], emisSettleSubBillList: [],
selectBillList:[],
currentSettleBillNo:null, currentSettleBillNo:null,
queryOrderType:null, queryOrderType:null,
@ -342,7 +345,7 @@ export default {
// 申请开票 // 申请开票
handleApplyOpenBill(){ handleApplyOpenBill(){
this.currentId=null; this.currentId=null;
this.openForm= true; this.openForm=true;
this.titleForm = "新增开票申请"; this.titleForm = "新增开票申请";
}, },
handleSendDbClick(row){ handleSendDbClick(row){
@ -476,6 +479,8 @@ export default {
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.selectBillList=selection;
this.ids = selection.map(item => item.id) this.ids = selection.map(item => item.id)
this.single = selection.length!==1 this.single = selection.length!==1
this.multiple = !selection.length this.multiple = !selection.length

166
src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
View File

@ -2,60 +2,34 @@
<div > <div >
<el-form ref="form" :model="form" size="mini" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" size="mini" :rules="rules" label-width="80px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;"> <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<!-- <el-col :span="8"> <el-col :span="24">
<el-form-item label="申请序号" prop="applySeqNo"> <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-input v-model="form.applySeqNo" placeholder="请输入申请序号" disabled/> <el-col :span="12">
<el-form-item label="开票抬头" prop="companyTaxNo">
<span slot="label">
<span style="color: red">开票抬头</span>
</span>
<CustomerInvoiceInfoPicker v-model="form.companyTaxNo" placeholder="开票抬头" @onChange="onCustomerInvoiceInSelect" > </CustomerInvoiceInfoPicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="24" v-if="form.companyTaxNo">
<el-form-item label="申请时间" prop="applyDate"> <div style="padding: 10px;
<el-input v-model="form.applyDate" placeholder="请输入申请序号" disabled/> color: #6f6f6f;
</el-form-item> font-size: 14px;
</el-col> --> font-weight: 600;
<!-- border: 1px solid #eff0f4;
border-radius: 5px;">
<div> <span style="color: blue">开票抬头:</span>{{ form.companyTaxNo }} {{ form.companyName }}</div>
<div> <span style="color: blue">开票地址:</span>{{ form.companyAddress }} {{ form.companyTel }} </div>
<div> <span style="color: blue">开票银行:</span>{{ form.bankName }} {{ form.bankAccNo }}</div>
</div>
</el-col>
</el-row>
</el-col>
<el-form-item label="申请时间" prop="applyDate">
<el-date-picker clearable
v-model="form.applyDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择申请时间">
</el-date-picker>
</el-form-item>
</el-col> -->
<!-- <el-col :span="8"> <!-- <el-col :span="8">
<el-form-item label="审核人" prop="applyManCode">
<el-input v-model="form.applyManCode" placeholder="请输入审核人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="审核站点" prop="applySiteCode">
<el-input v-model="form.applySiteCode" placeholder="请输入审核站点" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="客户编码" prop="customerCode">
<el-input v-model="form.customerCode" placeholder="请输入客户编码" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="客户名称" prop="customerName">
<el-input v-model="form.customerName" placeholder="请输入客户名称" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="账单号编号" prop="settleBillNo">
<el-input v-model="form.settleBillNo" placeholder="请输入账单号编号" />
</el-form-item>
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="账单名称" prop="settleBillName">
<el-input v-model="form.settleBillName" placeholder="请输入账单名称" />
</el-form-item>
</el-col> -->
<!-- <el-col :span="8">
</el-col> -->
<el-col :span="8">
<el-form-item label="开票抬头" prop="companyTaxNo"> <el-form-item label="开票抬头" prop="companyTaxNo">
<span slot="label"> <span slot="label">
<span style="color: red">开票抬头</span> <span style="color: red">开票抬头</span>
@ -78,7 +52,7 @@
<el-form-item label="开户账号" prop="bankAccNo"> <el-form-item label="开户账号" prop="bankAccNo">
<el-input v-model="form.bankAccNo" placeholder="开户账号" disabled/> <el-input v-model="form.bankAccNo" placeholder="开户账号" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<!-- <el-col :span="6"> <!-- <el-col :span="6">
<el-form-item label="开票电话" prop="companyTel"> <el-form-item label="开票电话" prop="companyTel">
@ -91,7 +65,7 @@
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<el-col :span="8"> <!-- <el-col :span="8">
<el-form-item label="联系人" prop="contact"> <el-form-item label="联系人" prop="contact">
<el-input v-model="form.contact" placeholder="联系人" disabled/> <el-input v-model="form.contact" placeholder="联系人" disabled/>
</el-form-item> </el-form-item>
@ -110,32 +84,35 @@
<el-form-item label="邮寄地址" prop="recieveAddress"> <el-form-item label="邮寄地址" prop="recieveAddress">
<el-input v-model="form.recieveAddress" type="textarea" rows="1" placeholder="纸质发票邮寄地址" disabled/> <el-input v-model="form.recieveAddress" type="textarea" rows="1" placeholder="纸质发票邮寄地址" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="8"> <el-col :span="24">
<el-form-item label="账单名称" prop="settleBillNo"> <el-form-item label="开票账单" prop="settleBillNo">
<span slot="label"> <span slot="label">
<span style="color: red">账单名称</span> <span style="color: red">开票账单</span>
</span> </span>
<SettleBillPicker v-model="form.settleBillNo" @onChange="onSelectBill"> </SettleBillPicker> <!-- <el-input v-model="form.settleBillNo" rows="2" type="textarea" placeholder="" disabled /> -->
<el-input v-model="form.settleBillName" rows="2" type="textarea" placeholder="" disabled />
<!-- <SettleBillPicker v-model="form.settleBillNo" @onChange="onSelectBill"> </SettleBillPicker> -->
<!-- <el-input v-model="form.settleBillNo" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" > <!-- <el-input v-model="form.settleBillNo" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" >
<i slot="suffix" class="iconfont">&#xe656;</i> <i slot="suffix" class="iconfont">&#xe656;</i>
</el-input> --> </el-input> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <!-- <el-col :span="8">
<el-form-item label="开票上限" prop="openMoneyMax"> <el-form-item label="开票上限" prop="openMoneyMax">
<el-input v-model="form.openMoneyMax" placeholder="" disabled/> <el-input v-model="form.openMoneyMax" placeholder="" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
</el-col> -->
</el-col> <!-- <el-col :span="24">
<el-col :span="24">
<el-form-item label="运单号" prop="params.billCodeStr" > <el-form-item label="运单号" prop="params.billCodeStr" >
<el-input v-model="form.params.billCodeStr" rows="2" type="textarea" placeholder="部分开票请填写单号,多单请使用逗号隔开" /> <el-input v-model="form.params.billCodeStr" rows="2" type="textarea" placeholder="部分开票请填写单号,多单请使用逗号隔开" />
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="8"> <el-col :span="8">
<el-form-item label="发票类型" prop="invoiceType"> <el-form-item label="发票类型" prop="invoiceType">
@ -152,15 +129,20 @@
<el-col :span="12"> <el-col :span="12">
</el-col> </el-col>
<el-col :span="8"> <el-col :span="12">
<el-form-item label="开票金额" prop="applyMoney"> <el-form-item label="开票金额" prop="applyMoney">
<span slot="label"> <span slot="label">
<span style="color: red">开票金额</span> <span style="color: red">开票金额</span>
</span> </span>
<el-input-number v-model="form.applyMoney" size="mini" placeholder="开票金额" :min="0.00" :controls="false" :precision="2"></el-input-number> <el-input-number v-model="form.applyMoney" size="mini" placeholder="开票金额" :min="0.00" :controls="false" :precision="2"></el-input-number>
<span style="color:red">(开票上限:{{ form.openMoneyMax }})</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12">
<span>开票上限:{{ form.openMoneyMax }}</span>
</el-col> -->
<el-col :span="24"> <el-col :span="24">
<el-form-item label="开票备注" prop="remark"> <el-form-item label="开票备注" prop="remark">
<el-input v-model="form.remark" rows="2" type="textarea" placeholder="请输入备注" /> <el-input v-model="form.remark" rows="2" type="textarea" placeholder="请输入备注" />
@ -189,6 +171,9 @@ export default {
props:{ props:{
id:{ id:{
type:Number type:Number
},
billList:{
type:Array
} }
}, },
components: { CustomerInvoiceInfoPicker,SettleBillPicker }, components: { CustomerInvoiceInfoPicker,SettleBillPicker },
@ -224,13 +209,21 @@ export default {
}; };
}, },
watch: { watch: {
"id": { // "id": {
// handler (newValue, oldValue) {
// this.id = newValue;
// this.initData();
// },
// deep: true
// },
"billList": {
handler (newValue, oldValue) { handler (newValue, oldValue) {
this.id = newValue;
this.initData(); this.initData();
}, },
deep: true deep: true
} }
}, },
created() { created() {
this.initData(); this.initData();
@ -239,19 +232,32 @@ export default {
methods: { methods: {
initData() { initData() {
if(this.id !=null) {
this.loading = true;
getEmisSettleInvoiceRecord(this.id).then(response => {
this.form = response.data;
this.loading = false;
});
}else{
this.reset(); this.reset();
this.form.applySeqNo=genJsSeqNo(); console.log("===>billList==>",this.billList);
this.form.applyDate = parseTime(new Date()); console.log("===>this.form==>",this.form);
let maxFee=0;
if(this.billList){
this.form.settleBillNo="";
this.billList.forEach(item=>{
console.log("===>this.item==>",item);
this.form.settleBillNo=this.form.settleBillNo+item.settleBillNo+",";
this.form.settleBillName= this.form.settleBillName+item.settleBillName+",";
this.form.openMoneyMax=this.form.openMoneyMax+item.recMoney;
this.form.applyMoney=this.form.applyMoney+item.recMoney;
});
} }
// if(this.id !=null) {
// this.loading = true;
// getEmisSettleInvoiceRecord(this.id).then(response => {
// this.form = response.data;
// this.loading = false;
// });
// }else{
// this.reset();
// this.form.applySeqNo=genJsSeqNo();
// this.form.applyDate = parseTime(new Date());
// }
}, },
onSelectBill(item){ onSelectBill(item){
this.form.settleBillName=item.settleBillName; this.form.settleBillName=item.settleBillName;
@ -338,11 +344,13 @@ export default {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
updateEmisSettleInvoiceRecord(this.form).then(response => { // updateEmisSettleInvoiceRecord(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); // this.$modal.msgSuccess("修改成功");
this.$emit("on-changed"); // this.$emit("on-changed");
}); // });
} else { } else {
this.form.applySeqNo=genJsSeqNo();
this.form.applyDate = parseTime(new Date());
addEmisSettleInvoiceRecord(this.form).then(response => { addEmisSettleInvoiceRecord(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.$emit("on-changed"); this.$emit("on-changed");

4
src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
View File

@ -374,7 +374,7 @@
@click="handleDownPDF" @click="handleDownPDF"
>下载发票PDF</el-button> >下载发票PDF</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="danger" type="danger"
plain plain
@ -384,7 +384,7 @@
@click="handleDelete" @click="handleDelete"
v-hasPermi="['emis:emisSettleInvoiceRecord:remove']" v-hasPermi="['emis:emisSettleInvoiceRecord:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col> -->
<!-- <el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"