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-07-31 17:42:48 +08:00
parent 4833c02ea2
commit 55ef9ef078
3 changed files with 62 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/emis/emisCustomerInvoiceInfo/index.vue
View File

@ -414,7 +414,11 @@ export default {
let len=this.tmpDataList.length;
for(let i=0;i<len;i++){
let itemData=this.tmpDataList[i];
let res=await addEmisCustomerInvoiceInfo(itemData)
try {
let res=await addEmisCustomerInvoiceInfo(itemData)
} catch(e) {
console.warn(e)
}
}
this.$modal.msgSuccess("新增成功");

57
src/views/emis/emisWaybill/waybillModify.vue
View File

@ -650,7 +650,7 @@
</el-table-column>
<el-table-column prop="realFee" :label="$t('实收')" align="center" width="50">
<template slot-scope="scope">
<el-input-number v-if="form.blSpecialQuote==1" v-model="scope.row.realFee" @input="(val)=>handleCalcFeeItem(scope.row)" size="mini" placeholder="" :min="0.00" :controls="false" :precision="2"></el-input-number>
<el-input-number v-if="form.blSpecialQuote==1 && scope.row.addWeightPrice==0 && scope.row.initialWeightFee==0" v-model="scope.row.realFee" @input="(val)=>handleCalcFeeItem(scope.row)" size="mini" placeholder="" :min="0.00" :controls="false" :precision="2" ></el-input-number>
<div v-else> {{scope.row.realFee}} </div>
</template>
</el-table-column>
@ -802,11 +802,12 @@ import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
import ExchangeRatePanel from '@/views/emis/EmisBaseTools/ExchangeRatePanel.vue';
import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
// import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
import feeItemForm from './feeItemForm.vue';
import TanexPrinterPanel from '@/views/emis/EmisBaseTools/TanexPrinterPanel.vue';
@ -1213,28 +1214,29 @@ methods: {
let childOrderList=[]
let subBillArr=this.form.billCodeSub.split(',');
for(let i=0;i<subBillArr.length;i++){
let item=subBillArr[i];
if(item!=null && item!=''){
childOrderList.push(item);
// billCount=billCount+1;
// 小于50单可以预览子单
if(subBillArr.length<50){
for(let i=0;i<subBillArr.length;i++){
let item=subBillArr[i];
if(item!=null && item!=''){
childOrderList.push(item);
// billCount=billCount+1;
}
}
}
if(childOrderList&&childOrderList.length>0){
let subBillItem ={
"tplCode":"TAN-GC-130",
"printerName":this.$refs.tanexPrinter.getDefaultPrinter(),
"orderList":childOrderList.toString()
if(childOrderList&&childOrderList.length>0){
let subBillItem ={
"tplCode":"TAN-GC-130",
"printerName":this.$refs.tanexPrinter.getDefaultPrinter(),
"orderList":childOrderList.toString()
}
printDataList.push(subBillItem);
}
printDataList.push(subBillItem);
}
let billCount=2+childOrderList.length;
// 预览主子单
this.$refs.tanexPrinter.printPreviewAdv(printDataList,billCount)
}
}
else{
@ -1799,12 +1801,20 @@ methods: {
async handleCalcFeeItem(row){
if(row!=null){
// console.log("===>calcExp====>",row.calcExp);
// console.log("===>calcExp111==row==>",row);
if(row.calcExp){
let expr=row.calcExp;
expr=expr.replace("s",row.initialWeightFee);
expr=expr.replace("d",row.addWeightPrice);
expr=expr.replace("w",this.form.settlementWeight);
row.realFee=parseFloat(eval(expr)).toFixed(2);
// 如果公式包含变量，使用变量进行计算
if(expr.indexOf('s')!=-1 || expr.indexOf('d')!=-1){
expr=expr.replace("s",row.initialWeightFee);
expr=expr.replace("d",row.addWeightPrice);
expr=expr.replace("w",this.form.settlementWeight);
row.realFee=parseFloat(eval(expr)).toFixed(2);
}else{
//
}
}else{
let expr="s+w*d";
if(row.initialWeightFee>0||row.addWeightPrice>0){
@ -1814,8 +1824,15 @@ methods: {
row.realFee=parseFloat(eval(expr)).toFixed(2);
}
}
}
let feeRemark="";
let totalFee=Number(0);
if(this.form.feeItems&&this.form.feeItems.length>0){

25
src/views/emis/emisWaybill/waybillRecord.vue
View File

@ -650,7 +650,7 @@
</el-table-column>
<el-table-column prop="realFee" :label="$t('实收')" align="center" width="50">
<template slot-scope="scope">
<el-input-number v-if="form.blSpecialQuote==1" v-model="scope.row.realFee" @input="(val)=>handleCalcFeeItem(scope.row)" size="mini" placeholder="" :min="0.00" :controls="false" :precision="2"></el-input-number>
<el-input-number v-if="form.blSpecialQuote==1 && scope.row.addWeightPrice==0 && scope.row.initialWeightFee==0" v-model="scope.row.realFee" @input="(val)=>handleCalcFeeItem(scope.row)" size="mini" placeholder="" :min="0.00" :controls="false" :precision="2" ></el-input-number>
<div v-else> {{scope.row.realFee}} </div>
</template>
</el-table-column>
@ -1802,12 +1802,20 @@ methods: {
async handleCalcFeeItem(row){
if(row!=null){
// console.log("===>calcExp====>",row.calcExp);
// console.log("===>calcExp111==row==>",row);
if(row.calcExp){
let expr=row.calcExp;
expr=expr.replace("s",row.initialWeightFee);
expr=expr.replace("d",row.addWeightPrice);
expr=expr.replace("w",this.form.settlementWeight);
row.realFee=parseFloat(eval(expr)).toFixed(2);
// 如果公式包含变量，使用变量进行计算
if(expr.indexOf('s')!=-1 || expr.indexOf('d')!=-1){
expr=expr.replace("s",row.initialWeightFee);
expr=expr.replace("d",row.addWeightPrice);
expr=expr.replace("w",this.form.settlementWeight);
row.realFee=parseFloat(eval(expr)).toFixed(2);
}else{
//
}
}else{
let expr="s+w*d";
if(row.initialWeightFee>0||row.addWeightPrice>0){
@ -1817,8 +1825,15 @@ methods: {
row.realFee=parseFloat(eval(expr)).toFixed(2);
}
}
}
let feeRemark="";
let totalFee=Number(0);
if(this.form.feeItems&&this.form.feeItems.length>0){