diff --git a/src/views/order/medince-list/index.vue b/src/views/order/medince-list/index.vue
index 31caa37..a786690 100644
--- a/src/views/order/medince-list/index.vue
+++ b/src/views/order/medince-list/index.vue
@@ -50,8 +50,17 @@
已取消
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -538,16 +547,40 @@ const modalForm = reactive({
user_doctor: null,
order_prescription: null,
});
-watch(()=>queryForm.range_time,(value)=>{
+
+watch(()=>queryForm.delivery_range_time,(value)=>{
if(value){
let[startTime,endTime]=value
- queryForm.finish_time=startTime+"%26"+endTime;
-
+ queryForm.delivery_time=startTime+"&"+endTime;
}else{
- queryForm.finish_time=''
+ queryForm.delivery_time=''
};
console.log(queryForm.finish_time)
})
+watch(()=>queryForm.pay_range_time,(value)=>{
+ if(value){
+ let[startTime,endTime]=value
+ queryForm.pay_time=startTime+"&"+endTime;
+ }else{
+ queryForm.pay_time=''
+ };
+})
+watch(()=>queryForm.cancel_range_time,(value)=>{
+ if(value){
+ let[startTime,endTime]=value
+ queryForm.cancel_time=startTime+"&"+endTime;
+ }else{
+ queryForm.cancel_time=''
+ };
+})
+watch(()=>queryForm.report_range_time,(value)=>{
+ if(value){
+ let[startTime,endTime]=value
+ queryForm.report_pre_time=startTime+"&"+endTime;
+ }else{
+ queryForm.report_pre_time=''
+ };
+})
// Rules
const rules = {
post_name: [{ required: true, message: '请输入岗位名称' }],
diff --git a/src/views/order/order-list/index.vue b/src/views/order/order-list/index.vue
index 9f32b92..aeff6bb 100644
--- a/src/views/order/order-list/index.vue
+++ b/src/views/order/order-list/index.vue
@@ -34,10 +34,15 @@
已取消
-
-
+
+
+
+
+
+
+
+
-
搜索
@@ -51,7 +56,7 @@
deleteVisible.value ,(value) => {
getOrderInfo(pager);
}
})
-
const { proxy } = getCurrentInstance();
const currentPage = ref(1);
@@ -369,16 +373,31 @@ const modalForm = reactive({
order_evaluation:null
});
-watch(()=>queryForm.range_time,(value)=>{
+watch(()=>queryForm.end_range_time,(value)=>{
if(value){
let[startTime,endTime]=value
- queryForm.finish_time=startTime+"%26"+endTime;
-
+ queryForm.finish_time=startTime+"&"+endTime;
}else{
queryForm.finish_time=''
};
console.log(queryForm.finish_time)
})
+watch(()=>queryForm.pay_range_time,(value)=>{
+ if(value){
+ let[startTime,endTime]=value
+ queryForm.pay_time=startTime+"&"+endTime;
+ }else{
+ queryForm.pay_time=''
+ };
+})
+watch(()=>queryForm.complete_range_time,(value)=>{
+ if(value){
+ let[startTime,endTime]=value
+ queryForm.complete_time=startTime+"&"+endTime;
+ }else{
+ queryForm.complete_time=''
+ };
+})
// Rules
const rules = {
post_name: [{ required: true, message: '请输入岗位名称' }]