From 15c6e8cdd58305719865e5bdab5df5b6a149b0df Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Wed, 30 Jul 2025 14:03:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=EF=BC=8C=E4=B8=8B=E5=8D=95=E6=97=B6=E9=97=B4=E5=92=8C=E9=A2=84?=
=?UTF-8?q?=E8=AE=A1=E5=85=A5=E4=BB=93=E6=97=B6=E9=97=B4=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/emis/emisWaybill/UserOrderList.vue | 24 +++++++++++++-------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/views/emis/emisWaybill/UserOrderList.vue b/src/views/emis/emisWaybill/UserOrderList.vue
index 1ef799df..aabfd1a7 100644
--- a/src/views/emis/emisWaybill/UserOrderList.vue
+++ b/src/views/emis/emisWaybill/UserOrderList.vue
@@ -26,6 +26,12 @@
+
+
+ 下单时间
+ 预计入仓时间
+
+
@@ -160,11 +166,6 @@
-
-
-
-
-
@@ -776,7 +777,8 @@ export default {
dataFrom:null,
params:{
queryOrderType:1,
- queryOrderDateType:1
+ queryOrderDateType:1,
+ queryDateType:'1',
}
},
};
@@ -834,8 +836,14 @@ export default {
this.queryParams.orderSn= null;
this.queryParams.intoWarehouseBillCode=this.queryParams.queryKey;
}
- let qParam = this.addDateRange(this.queryParams, this.dateTimeRange,"orderDate");
- qParam = this.addDateRange(qParam, this.beginPickRange,"PickStartDate");
+ let qParam ={...this.queryParams};
+ if(this.queryParams.params.queryDateType=='1'){
+ qParam = this.addDateRange(this.queryParams, this.dateTimeRange,"orderDate");
+ qParam = this.addDateRange(this.queryParams,[],'PickStartDate')
+ }else{
+ qParam = this.addDateRange(qParam, this.dateTimeRange,"PickStartDate");
+ qParam = this.addDateRange(qParam, [],"orderDate");
+ }
listEmisOrder(qParam).then(response => {
this.emisWaybillList = response.rows;
this.total = response.total;
From 11b3f9122616abfb91e36fea7de4dd1ebd9127ae Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Wed, 30 Jul 2025 14:20:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86-?=
=?UTF-8?q?=E8=BF=9B=E4=BB=93=E5=AF=B9=E8=B4=A7-=E7=95=8C=E9=9D=A2?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../panel/WarehouseInPanel.vue | 39 +++++++++++++++++--
1 file changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue b/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
index 24d73415..c42b1224 100644
--- a/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
+++ b/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
@@ -1,6 +1,6 @@
-
+
@@ -107,6 +107,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -221,6 +234,17 @@
+
+
+ {{scope.row.waybillDetail.transLineTypeName}}
+
+
+
+
+ {{scope.row.waybillDetail.productTypeName}}
+
+
+
未确认
@@ -301,11 +325,14 @@ import emisWarehouseInForm from '@/views/emis/emisWarehouseIn/emisWarehouseInFor
import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
-
+import CountryPicker0 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+import TransLineAllPicker from '@/views/emis/EmisBaseTools/TransLineAllPicker.vue'
+import TransProductAllPicker from '@/views/emis/EmisBaseTools/TransProductAllPicker.vue'
export default {
name: "emisWarehouseIn",
- components: { elDateSimplePicker,elDateAdvPicker,emisWarehouseInForm,EmpNamePicker1,EmisSiteSimplePicker1 },
+ components: { elDateSimplePicker,elDateAdvPicker,emisWarehouseInForm,EmpNamePicker1,EmisSiteSimplePicker1,CountryPicker0,CountryPicker1,TransLineAllPicker,TransProductAllPicker },
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear','emis_order_status',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
@@ -376,7 +403,11 @@ export default {
orderStatus:null,
sendSiteCode:null,
blUploadGoodsPic:null,
- intoWarehouseCode:null
+ intoWarehouseCode:null,
+ receiveCountry:null,
+ sendCountry:null,
+ transLineType:null,
+ productType:null,
}
},
};