From cd79407fb224ec5785689777fd6a432fbd9a9a76 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Fri, 12 Sep 2025 16:37:50 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=8E=A5=E5=8D=95=E6=9C=88=E7=BB=93?=
=?UTF-8?q?=E5=88=87=E6=8D=A2=E5=AF=84=E4=BB=B6=E4=BA=BA=E5=9C=B0=E5=9D=80?=
=?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8F=B7=E4=B8=8D=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/emis/emisWaybill/waybillGot.vue | 32 +++++++++++++----------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/views/emis/emisWaybill/waybillGot.vue b/src/views/emis/emisWaybill/waybillGot.vue
index 3e714b86..4e8e2a39 100644
--- a/src/views/emis/emisWaybill/waybillGot.vue
+++ b/src/views/emis/emisWaybill/waybillGot.vue
@@ -1528,9 +1528,9 @@ methods: {
}
}
//企业税号重新赋值
- this.form.sender.enterpriseName=this.selectedSenderEnterpriseName;
- this.form.sender.enterpriseTaxId=this.selectedSenderEnterpriseTaxId;
- this.calcBillFee();
+ this.form.sender.enterpriseName=this.selectedSenderEnterpriseName;
+ this.form.sender.enterpriseTaxId=this.selectedSenderEnterpriseTaxId;
+ this.calcBillFee();
}
},
@@ -1705,17 +1705,17 @@ methods: {
this.startTimer();
}
- if (['2', '4', '5'].includes(this.form.paymentType)) { //月结
- this.selectedMonthUserEnterpriseName = this.form.sender.enterpriseName;
- this.selectedMonthUserEnterpriseTaxId = this.form.sender.enterpriseTaxId;
- this.selectedSenderEnterpriseName = '';
- this.selectedSenderEnterpriseTaxId = '';
- } else {
- this.selectedMonthUserEnterpriseName = '';
- this.selectedMonthUserEnterpriseTaxId = '';
- this.selectedSenderEnterpriseName = this.form.sender.enterpriseName;
- this.selectedSenderEnterpriseTaxId = this.form.sender.enterpriseTaxId;
- }
+ // if (['2', '4', '5'].includes(this.form.paymentType)) { //月结
+ // this.selectedMonthUserEnterpriseName = this.form.sender.enterpriseName;
+ // this.selectedMonthUserEnterpriseTaxId = this.form.sender.enterpriseTaxId;
+ // this.selectedSenderEnterpriseName = '';
+ // this.selectedSenderEnterpriseTaxId = '';
+ // } else {
+ // this.selectedMonthUserEnterpriseName = '';
+ // this.selectedMonthUserEnterpriseTaxId = '';
+ // this.selectedSenderEnterpriseName = this.form.sender.enterpriseName;
+ // this.selectedSenderEnterpriseTaxId = this.form.sender.enterpriseTaxId;
+ // }
// });
// 获取企业税号
if(['2', '4', '5'].includes(this.form.paymentType) || this.form.customerType == 2 || this.form.mainUserId){ // 月结单 或者 月结客户现金单 或者 月结客户子账户现金单
@@ -1736,6 +1736,8 @@ methods: {
if(res.rows.length > 0){
this.form.sender.enterpriseName = res.rows[0].enterpriseName;
this.form.sender.enterpriseTaxId = res.rows[0].enterpriseTaxId;
+ this.selectedMonthUserEnterpriseName = this.form.sender.enterpriseName;
+ this.selectedMonthUserEnterpriseTaxId = this.form.sender.enterpriseTaxId;
}
}else{ // 非月结客户下的非月结单
if (this.form.sender.id) {
@@ -1743,6 +1745,8 @@ methods: {
if (res.data) {
this.form.sender.enterpriseName = res.data.enterpriseName;
this.form.sender.enterpriseTaxId = res.data.enterpriseTaxId;
+ this.selectedSenderEnterpriseName = this.form.sender.enterpriseName;
+ this.selectedSenderEnterpriseTaxId = this.form.sender.enterpriseTaxId;
}
}
}
From be3f10fcf54b72f2900cd21e13853af75b2833d7 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Sat, 13 Sep 2025 16:57:04 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=8E=B0=E9=87=91=E5=87=BA=E8=B4=A6?=
=?UTF-8?q?=E7=A1=AE=E8=AE=A4=E8=BF=90=E8=B4=B9=E5=B7=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
index d02837f6..b5d44afd 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
@@ -326,12 +326,18 @@
+
{{scope.row.waybillDetail.freight}}
{{scope.row.waybillDetail.freight}}
-
+
+
+
+ {{ scope.row.waybillDetail.realFee-scope.row.waybillDetail.freight }}
+
+
未收款
@@ -356,7 +362,6 @@
-
From 4ac007bd63f0551f36a453cd2cf410af338106fd Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Sat, 13 Sep 2025 17:54:27 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=8F=90=E6=88=90?=
=?UTF-8?q?=E6=98=8E=E7=BB=86=EF=BC=8C=E5=AF=BC=E5=87=BA=E6=8F=90=E6=88=90?=
=?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=B2=A1=E6=98=BE=E7=A4=BA=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/emis/emisCommissionDtl/index.vue | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/views/emis/emisCommissionDtl/index.vue b/src/views/emis/emisCommissionDtl/index.vue
index b7c99eaf..e7d2018b 100644
--- a/src/views/emis/emisCommissionDtl/index.vue
+++ b/src/views/emis/emisCommissionDtl/index.vue
@@ -795,6 +795,9 @@ export default {
if (j === 'paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v['paymentType']);
}
+ if (j === 'feeType') {
+ return this.selectDictLabel(this.dict.type.emis_commission_fee_type,v['feeType']);
+ }
return v[j]
}))
},
From 82670436d2d70dc749a03c1281b5f66bbfd4ae79 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Tue, 16 Sep 2025 14:35:05 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E3=80=81=E7=8E=B0?=
=?UTF-8?q?=E9=87=91=E3=80=81=E6=9C=88=E7=BB=93=E5=87=BA=E8=B4=A6=E7=A1=AE?=
=?UTF-8?q?=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SubBillConfirmByMoneyList.vue | 22 ++++++++++++++--
.../SubBillConfirmByMonthList.vue | 26 +++++++++++++++++--
.../SubBillConfirmBySiteList.vue | 15 +++++++++++
3 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
index b5d44afd..cd76c95a 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
@@ -333,9 +333,12 @@
{{scope.row.waybillDetail.freight}}
-
+
- {{ scope.row.waybillDetail.realFee-scope.row.waybillDetail.freight }}
+
+ {{scope.row.waybillDetail.freight-scope.row.waybillDetail.realFee}}
+
+ 0
@@ -1437,6 +1440,21 @@ export default {
if (j === 'waybillDetail.paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']);
}
+ if(j === 'diffFee'){
+ if(v['waybillDetail']['freight'] != v['waybillDetail']['realFee']){
+ return v['waybillDetail']['freight'] - v['waybillDetail']['realFee'];
+ }else{
+ return 0;
+ }
+ }
+ if(j === 'blSpecialQuote'){
+ if(v['waybillDetail']['blSpecialQuote'] == '0'){
+ return '否';
+ }
+ else if(v['waybillDetail']['blSpecialQuote'] == '1'){
+ return '是';
+ }
+ }
return v[j]
}))
},
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
index 7a1616f2..6204601c 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
@@ -355,13 +355,21 @@
+
{{scope.row.waybillDetail.freight}}
{{scope.row.waybillDetail.freight}}
-
+
+
+
+ {{scope.row.waybillDetail.freight-scope.row.waybillDetail.realFee}}
+
+ 0
+
+
未收款
@@ -385,7 +393,6 @@
是
-
@@ -1552,6 +1559,21 @@ export default {
if (j === 'waybillDetail.paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']);
}
+ if(j === 'diffFee'){
+ if(v['waybillDetail']['freight'] != v['waybillDetail']['realFee']){
+ return v['waybillDetail']['freight'] - v['waybillDetail']['realFee'];
+ }else{
+ return 0;
+ }
+ }
+ if(j === 'blSpecialQuote'){
+ if(v['waybillDetail']['blSpecialQuote'] == '0'){
+ return '否';
+ }
+ else if(v['waybillDetail']['blSpecialQuote'] == '1'){
+ return '是';
+ }
+ }
return v[j]
}))
},
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
index 19791000..23d75e65 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
@@ -1598,6 +1598,21 @@ export default {
if (j === 'waybillDetail.paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']);
}
+ if(j === 'diffFee'){
+ if(v['waybillDetail']['freight'] != v['waybillDetail']['realFee']){
+ return v['waybillDetail']['freight'] - v['waybillDetail']['realFee'];
+ }else{
+ return 0;
+ }
+ }
+ if(j === 'blSpecialQuote'){
+ if(v['waybillDetail']['blSpecialQuote'] == '0'){
+ return '否';
+ }
+ else if(v['waybillDetail']['blSpecialQuote'] == '1'){
+ return '是';
+ }
+ }
return v[j]
}))
},
From 68fe9600d8f2d1019323943d0507d9d4bce1c293 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Wed, 17 Sep 2025 10:23:51 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=9C=88=E7=BB=93=E5=87=BA=E8=B4=A6?=
=?UTF-8?q?=E3=80=81=E7=8E=B0=E9=87=91=E5=87=BA=E8=B4=A6=E5=AF=BC=E5=87=BA?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SubBillConfirmByMoneyList.vue | 73 +++++++++++++++++-
.../SubBillConfirmByMonthList.vue | 76 ++++++++++++++++++-
2 files changed, 143 insertions(+), 6 deletions(-)
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
index cd76c95a..dbda6f76 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
@@ -1412,9 +1412,42 @@ export default {
}
}
+ if (j === 'paymentStatus') {
+ if(v['paymentStatus'] == 0){
+ return '未收款';
+ }
+ else if(v['paymentStatus'] == 1){
+ return '已收款';
+ }
+ else if(v['paymentStatus'] == 2){
+ return '部分收款';
+ }
+ }
-
-
+ if (j === 'openBillStatus') {
+ if(v['openBillStatus'] == 0){
+ return '未开票';
+ }
+ else if(v['openBillStatus'] == 1){
+ return '已开票';
+ }
+ else if(v['openBillStatus'] == 2){
+ return '部分开票';
+ }
+ else if(v['openBillStatus'] == 3){
+ return '不开票';
+ }
+ else if(v['openBillStatus'] == 4){
+ return '已完成';
+ }
+ }
+ if (j === 'waybillDetail.blIsQuestion') {
+ if(v['waybillDetail']['blIsQuestion'] == 1){
+ return '是';
+ }else{
+ return '否';
+ }
+ }
if (j === 'waybillDetail.blMessage') {
if(v['waybillDetail']['blMessage'] == 1){
@@ -1455,6 +1488,42 @@ export default {
return '是';
}
}
+ if (j === 'blMerge') {
+ if(v['blMerge'] == 0){
+ return '否';
+ }
+ else if(v['blMerge'] == 1){
+ return '是';
+ }
+ }
+ if (j === 'blConfirmCenter') {
+ if(v['blConfirmCenter'] == 0){
+ return '未确认';
+ }
+ else if(v['blConfirmCenter'] == 1){
+ return '已确认';
+ }
+ else if(v['blConfirmCenter'] == 2){
+ return '确认不出账';
+ }
+ else if(v['blConfirmCenter'] == 3){
+ return '账单异常';
+ }
+ }
+ if (j === 'blConfirmSite') {
+ if(v['blConfirmSite'] == 0){
+ return '未确认';
+ }
+ else if(v['blConfirmSite'] == 1){
+ return '已确认';
+ }
+ else if(v['blConfirmSite'] == 2){
+ return '确认不出账';
+ }
+ else if(v['blConfirmSite'] == 3){
+ return '账单异常';
+ }
+ }
return v[j]
}))
},
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
index 6204601c..cc040a4e 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
@@ -1531,10 +1531,42 @@ export default {
}
}
+ if (j === 'paymentStatus') {
+ if(v['paymentStatus'] == 0){
+ return '未收款';
+ }
+ else if(v['paymentStatus'] == 1){
+ return '已收款';
+ }
+ else if(v['paymentStatus'] == 2){
+ return '部分收款';
+ }
+ }
-
-
-
+ if (j === 'openBillStatus') {
+ if(v['openBillStatus'] == 0){
+ return '未开票';
+ }
+ else if(v['openBillStatus'] == 1){
+ return '已开票';
+ }
+ else if(v['openBillStatus'] == 2){
+ return '部分开票';
+ }
+ else if(v['openBillStatus'] == 3){
+ return '不开票';
+ }
+ else if(v['openBillStatus'] == 4){
+ return '已完成';
+ }
+ }
+ if (j === 'waybillDetail.blIsQuestion') {
+ if(v['waybillDetail']['blIsQuestion'] == 1){
+ return '是';
+ }else{
+ return '否';
+ }
+ }
if (j === 'waybillDetail.blMessage') {
if(v['waybillDetail']['blMessage'] == 1){
return '发送';
@@ -1547,7 +1579,7 @@ export default {
return '发送';
}else{
return '不发送';
- }
+ }
}
if (j === 'waybillDetail.blSign') {
if(v['waybillDetail']['blSign'] == 1){
@@ -1574,6 +1606,42 @@ export default {
return '是';
}
}
+ if (j === 'blMerge') {
+ if(v['blMerge'] == 0){
+ return '否';
+ }
+ else if(v['blMerge'] == 1){
+ return '是';
+ }
+ }
+ if (j === 'blConfirmCenter') {
+ if(v['blConfirmCenter'] == 0){
+ return '未确认';
+ }
+ else if(v['blConfirmCenter'] == 1){
+ return '已确认';
+ }
+ else if(v['blConfirmCenter'] == 2){
+ return '确认不出账';
+ }
+ else if(v['blConfirmCenter'] == 3){
+ return '账单异常';
+ }
+ }
+ if (j === 'blConfirmSite') {
+ if(v['blConfirmSite'] == 0){
+ return '未确认';
+ }
+ else if(v['blConfirmSite'] == 1){
+ return '已确认';
+ }
+ else if(v['blConfirmSite'] == 2){
+ return '确认不出账';
+ }
+ else if(v['blConfirmSite'] == 3){
+ return '账单异常';
+ }
+ }
return v[j]
}))
},
From eb90b98dc252942f76ec7df446fbfb84bb26bb2d Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Fri, 19 Sep 2025 14:20:00 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=BC=80=E7=A5=A8?=
=?UTF-8?q?=E4=B8=BB=E4=BD=93=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../emis/emisCustomerInvoiceInfo/index.vue | 17 ++++++++++++++---
.../emisSettleInvoiceRecordForm.vue | 19 ++++++++++++++++---
2 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/src/views/emis/emisCustomerInvoiceInfo/index.vue b/src/views/emis/emisCustomerInvoiceInfo/index.vue
index 403f8951..349591c0 100644
--- a/src/views/emis/emisCustomerInvoiceInfo/index.vue
+++ b/src/views/emis/emisCustomerInvoiceInfo/index.vue
@@ -58,7 +58,11 @@
@keyup.enter.native="handleQuery"
/>
-
+
+
+
+
+
@@ -159,6 +163,11 @@
+
+
+
+
+
@@ -233,8 +242,7 @@ import XLSX from 'xlsx'
export default {
name: "EmisCustomerInvoiceInfo",
components: { elDateSimplePicker,emisCustomerInvoiceInfoForm },
- dicts: [
- ],
+ dicts: ['customer_invoice_status'],
data() {
return {
resetRefreshId:null,
@@ -554,6 +562,9 @@ export default {
}
return statusStr;
}
+ if(j==='enableStatus'){
+ return this.selectDictLabel(this.dict.type.customer_invoice_status,v[j]);
+ }
return v[j]
}))
},
diff --git a/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue b/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
index f08a6834..83d4e55f 100644
--- a/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
@@ -284,6 +284,13 @@ export default {
components: { CustomerInvoiceInfoPicker,SettleBillPicker },
dicts: ['emis_payment_type'],
data() {
+ var checkerCompany=(rule, value, callback)=> {
+ if (this.selectCompanyEnableStatus!=1) {
+ callback(new Error('该开票抬头申请开票被限制，暂缓开票！'));
+ } else {
+ callback();
+ }
+ }
return {
emisSettleInvoiceRecordOptions: [],
// 遮罩层
@@ -305,6 +312,7 @@ export default {
isPreventReClick:false,
// 表单参数
form: {},
+ selectCompanyEnableStatus:null,
// 表单校验
rules: {
@@ -318,8 +326,8 @@ export default {
{ required: true, message: "开票类型不能为空", trigger: ["blur","change"] }
],
companyTaxNo: [
- { required: true, message: "开票税号不能为空", trigger: ["blur","change"] }
- ],
+ { required: true, message: "开票税号不能为空", trigger: ["blur","change"] },
+ { validator: checkerCompany, trigger: ['blur', 'change']}]
// remark: [
// { required: true, message: "开票备注不能为空", trigger: "blur" }
// ],
@@ -576,7 +584,11 @@ export default {
},
onCustomerInvoiceInSelect(item){
- console.log("==>onCustomerInvoiceInSelect==>",item);
+ this.selectCompanyEnableStatus=item.enableStatus;
+ // if(item.enableStatus!=1){
+ // this.$modal.msgError("该开票抬头申请开票被限制，暂缓开票！");
+ // return;
+ // }
this.form.companyTaxNo=item.companyTaxNo;
this.form.companyName=item.companyName;
this.form.companyTel=item.companyTel;
@@ -659,6 +671,7 @@ export default {
},
invoiceRelList:[],
};
+ this.selectCompanyEnableStatus=null;
this.resetForm("form");
},
/** 提交按钮 */