From 7947badd22902ff66eea3f025b01e1eaa0fffbfc Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Wed, 10 Sep 2025 16:21:10 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E6=9D=83=E9=87=8D?=
=?UTF-8?q?=E6=94=B9=E6=88=90=E5=BD=93=E5=89=8D=E9=A1=B5=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/emis/emisSpecialCalcWeight/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/emis/emisSpecialCalcWeight/index.vue b/src/views/emis/emisSpecialCalcWeight/index.vue
index 3e3d5f29..e0b21728 100644
--- a/src/views/emis/emisSpecialCalcWeight/index.vue
+++ b/src/views/emis/emisSpecialCalcWeight/index.vue
@@ -61,7 +61,7 @@
:total="total"
@queryTable="getList"
@selection-change="handleSelectionChange"
- @sort-change="handleSortChange"
+
>
From 433becb2d24fbceeee896deb10a2f745e9a5d57a Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Thu, 11 Sep 2025 14:31:58 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=89=B9=E4=BF=97=E6=9D=83=E9=87=8D?=
=?UTF-8?q?=EF=BC=8C=E6=97=B6=E6=95=88=E6=97=B6=E9=97=B4=E6=98=AF=E5=BC=80?=
=?UTF-8?q?=E5=A7=8B=E6=97=B6=E9=97=B4=E7=9A=845=E5=B9=B4=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../emisSpecialCalcWeight/emisSpecialCalcWeightForm.vue | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/views/emis/emisSpecialCalcWeight/emisSpecialCalcWeightForm.vue b/src/views/emis/emisSpecialCalcWeight/emisSpecialCalcWeightForm.vue
index 547818f5..8f1843db 100644
--- a/src/views/emis/emisSpecialCalcWeight/emisSpecialCalcWeightForm.vue
+++ b/src/views/emis/emisSpecialCalcWeight/emisSpecialCalcWeightForm.vue
@@ -96,7 +96,7 @@ import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vu
-import {addDateTimeByDay,dateToStr} from '@/utils/custom'
+import {addDateTimeByDay,dateToStr, parseTime} from '@/utils/custom'
export default {
name: "emisSpecialCalcWeightForm",
@@ -171,7 +171,9 @@ export default {
}
},
onStartDateChange(){
- this.form.endDate=dateToStr(addDateTimeByDay(this.form.beginDate,365));
+ // 时效时间 延迟5年
+ const date = new Date(this.form.beginDate)
+ this.form.endDate = parseTime(date.setFullYear(date.getFullYear() + 5), '{y}-{m}-{d} {h}:{i}:{s}')
},
onProdChange(item){
console.log(item)
From 12a843e49a0f7eec960d22dd643ad27a8460933f Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Fri, 12 Sep 2025 10:07:11 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=BD=95=E5=8D=95=E5=92=8C=E7=AD=BE?=
=?UTF-8?q?=E6=94=B6=E5=9B=BE=E7=89=87=E7=AE=A1=E7=90=86=E4=B8=8A=E4=BC=A0?=
=?UTF-8?q?=E7=BD=91=E7=82=B9=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue b/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
index 3a6fdece..ec01e490 100644
--- a/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
+++ b/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
@@ -335,7 +335,7 @@ export default {
this.form.countryCode=item.code;
},
onScanSiteSelect(item){
- this.queryParams.createSite=item && item.siteName;
+ // this.queryParams.createSite=item && item.siteName;
// this.queryParams.createSiteCode=item && item.siteCode;
},
onPreOrNextSiteSelect(item){
From e809bba7ada3a99a63f97ecb4b6307aab037f4e4 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Fri, 12 Sep 2025 13:50:30 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8?=
=?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8F=B7=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../emis/emisWaybillAjustApply/adjustPanel.vue | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
index ea6bf8b0..eb8a0e6f 100644
--- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
+++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
@@ -1523,6 +1523,19 @@ export default {
oldValue: {
handler (newValue, oldValue) {
this.billDetail = this.oldValue;
+ if (['2', '4', '5'].includes(this.billDetail.paymentType)) { //月结
+ this.selectedMonthUserEnterpriseName = this.billDetail.sender.enterpriseName;
+ this.selectedMonthUserEnterpriseTaxId = this.billDetail.sender.enterpriseTaxId;
+ this.selectedSenderEnterpriseName = '';
+ this.selectedSenderEnterpriseTaxId = '';
+ } else {
+ this.selectedMonthUserEnterpriseName = '';
+ this.selectedMonthUserEnterpriseTaxId = '';
+ this.selectedSenderEnterpriseName = this.billDetail.sender.enterpriseName;
+ this.selectedSenderEnterpriseTaxId = this.billDetail.sender.enterpriseTaxId;
+ }
+ this.senderCountryCode = this.billDetail.sender.country;
+ this.recieverCountryCode = this.billDetail.reciever.country;
},
deep: true
},
@@ -1541,7 +1554,7 @@ export default {
this.form.blSpecialQuote='0';
}
},
- deep: true
+ deep: true
},
applyType: {
handler (newVa, oldValue) {
@@ -1667,8 +1680,6 @@ export default {
console.log("====>this.oldValue==>",this.oldValue);
console.log("====>this.form==>",this.form);
this.billDetail=this.oldValue;
- this.senderCountryCode = this.form.sender.country;
- this.recieverCountryCode = this.form.reciever.country;
},
getJsonData(){
if(this.form.packType&&this.form.packType.length>0){