diff --git a/src/views/order/medince-list/index.vue b/src/views/order/medince-list/index.vue
index bcb6b0b..a4d6b8b 100644
--- a/src/views/order/medince-list/index.vue
+++ b/src/views/order/medince-list/index.vue
@@ -50,30 +50,38 @@
已取消
-
+
+
+
+
+
+
@@ -83,6 +91,7 @@
重置
+
@@ -560,8 +569,7 @@
style="margin-right: 8px"
v-if="
(modalForm.order_product_status == 2 && modalForm.pay_status==2
- && (modalForm.order_product_refund &&
- (modalForm.order_product_refund.product_refund_status == 4 || modalForm.order_product_refund.product_refund_status == 5) ) &&
+ && (modalForm.refund_status==4 || modalForm.refund_status==5 || modalForm.refund_status==0) &&
modalForm.report_pre_status != 1 )
"
>
@@ -764,6 +772,15 @@ watch(
}
}
);
+watch(()=>queryForm.create_range_time,(value)=>{
+ if(value){
+ let[startTime,endTime]=value
+ queryForm.created_at=startTime+"&"+endTime;
+ }else{
+ queryForm.created_at=''
+ };
+})
+
// Modal
const modalVisible = ref(false);
diff --git a/src/views/order/order-list/index.vue b/src/views/order/order-list/index.vue
index d424658..4960e31 100644
--- a/src/views/order/order-list/index.vue
+++ b/src/views/order/order-list/index.vue
@@ -34,14 +34,33 @@
已取消
-
-
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
@@ -49,6 +68,7 @@
重置
+
@@ -429,6 +449,30 @@ watch(()=>queryForm.complete_range_time,(value)=>{
queryForm.complete_time=''
};
})
+watch(()=>queryForm.cancel_range_time,(value)=>{
+ if(value){
+ let[startTime,endTime]=value
+ queryForm.cancel_time=startTime+"&"+endTime;
+ }else{
+ queryForm.cancel_time=''
+ };
+})
+watch(()=>queryForm.reception_range_time,(value)=>{
+ if(value){
+ let[startTime,endTime]=value
+ queryForm.reception_time=startTime+"&"+endTime;
+ }else{
+ queryForm.reception_time=''
+ };
+})
+watch(()=>queryForm.create_range_time,(value)=>{
+ if(value){
+ let[startTime,endTime]=value
+ queryForm.created_at=startTime+"&"+endTime;
+ }else{
+ queryForm.created_at=''
+ };
+})
// Rules
const rules = {
post_name: [{ required: true, message: '请输入岗位名称' }]