diff --git a/src/views/system/goofish/erpGoofishOrder/index.vue b/src/views/system/goofish/erpGoofishOrder/index.vue
index d7ff704..bc72796 100644
--- a/src/views/system/goofish/erpGoofishOrder/index.vue
+++ b/src/views/system/goofish/erpGoofishOrder/index.vue
@@ -19,6 +19,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
搜索
重置
@@ -333,13 +379,25 @@ export default {
showSearch: true,
total: 0,
list: [],
+ modifyTimeRange: null,
queryParams: {
pageNum: 1,
pageSize: 10,
appKey: undefined,
orderNo: undefined,
orderStatus: undefined,
- shipStatus: undefined
+ refundStatus: undefined,
+ shipStatus: undefined,
+ buyerNick: undefined,
+ goodsTitle: undefined,
+ waybillKeyword: undefined,
+ jdRemark: undefined,
+ jdThirdPartyOrderNo: undefined,
+ userName: undefined,
+ receiverMobile: undefined,
+ jdLinkFilter: undefined,
+ modifyTimeBegin: undefined,
+ modifyTimeEnd: undefined
},
orderStatusOptions: [
{ v: 11, l: '待付款' },
@@ -366,6 +424,13 @@ export default {
}
},
computed: {
+ /** 退款状态下拉（与开放平台 refund_status 一致） */
+ refundStatusFilterOptions() {
+ return Object.keys(GOOFISH_REFUND_STATUS).map(k => ({
+ v: Number(k),
+ l: GOOFISH_REFUND_STATUS[k]
+ }))
+ },
refreshLogisticsCompareRows() {
const b = this.refreshLogisticsBefore
const a = this.refreshLogisticsAfter
@@ -667,7 +732,20 @@ export default {
this.queryParams.pageNum = 1
this.getList()
},
+ /** 开放平台 modify_time 为秒级；日期控件为毫秒时间戳 */
+ onModifyTimeRangeChange(val) {
+ if (val && val.length === 2) {
+ this.queryParams.modifyTimeBegin = Math.floor(val[0] / 1000)
+ this.queryParams.modifyTimeEnd = Math.floor(val[1] / 1000)
+ } else {
+ this.queryParams.modifyTimeBegin = undefined
+ this.queryParams.modifyTimeEnd = undefined
+ }
+ },
resetQuery() {
+ this.modifyTimeRange = null
+ this.queryParams.modifyTimeBegin = undefined
+ this.queryParams.modifyTimeEnd = undefined
this.resetForm('queryForm')
this.handleQuery()
},
diff --git a/src/views/system/jdorder/orderList.vue b/src/views/system/jdorder/orderList.vue
index 308fae7..adab65f 100644
--- a/src/views/system/jdorder/orderList.vue
+++ b/src/views/system/jdorder/orderList.vue
@@ -66,6 +66,9 @@
+
+
+
@@ -1265,6 +1268,7 @@ export default {
orderSearch: undefined,
distributionMark: undefined,
modelNumber: undefined,
+ modelNumberExclude: undefined,
link: undefined,
buyer: undefined,
address: undefined,
@@ -1837,6 +1841,7 @@ export default {
orderSearch: undefined,
distributionMark: undefined,
modelNumber: undefined,
+ modelNumberExclude: undefined,
link: undefined,
buyer: undefined,
address: undefined,