From cf8d1c500cce2691ec40ee593af61caf5ef32ecd Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 14 Jun 2024 16:00:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/confirmModal.vue | 17 ++++---
src/components/couponDetail.vue | 63 ++++++++++++++++----------
src/views/coupon/coupon-list/index.vue | 2 +-
src/views/order/service-list/index.vue | 17 +++++--
4 files changed, 65 insertions(+), 34 deletions(-)
diff --git a/src/components/confirmModal.vue b/src/components/confirmModal.vue
index 977a341..6373078 100644
--- a/src/components/confirmModal.vue
+++ b/src/components/confirmModal.vue
@@ -4,16 +4,20 @@
提示
-
-
+
+
-
+
-
- 温馨提示：退款金额不可大于实际付款金额，请谨慎填写；\n
- 退款理由请认真填写，会显示给患者(本单实付金额金额：{{payment_amount_total}}元)。
+
+ 温馨提示：退款金额不可大于实际付款金额，请谨慎填写；
+ 退款理由请认真填写，会显示给患者(本单实付金额：{{payment_amount_total}}元)。
+
+
+ 当前订单已超过3个月，无法在线上进行自动退款，请线下联系患者进行退款。沟通后，也要填写退款金额和理由。
+
@@ -41,6 +45,7 @@ const props = defineProps({
type: String,
default:'',
},
+
id:{
type: String,
default:'',
diff --git a/src/components/couponDetail.vue b/src/components/couponDetail.vue
index e9fb60f..1fcba62 100644
--- a/src/components/couponDetail.vue
+++ b/src/components/couponDetail.vue
@@ -68,7 +68,7 @@
@@ -223,8 +223,10 @@
@@ -448,7 +450,7 @@
修改 {
}
loading.value = false;
};
-const changeType = (val) => {
+const changeType = (val,flag=true) => {
showManjian.value = false;
- emits('changeValue','with_amount');
showMinNumber.value = false;
- emits('changeValue','min_usable_number');
+ if(flag){
+ emits('changeValue','with_amount');
+ emits('changeValue','min_usable_number');
+ }
+
if (val == 2) {
showManjian.value = true;
} else if (val == 3) {
showMinNumber.value = true;
}
};
-const changeValidType = (val) => {
+const changeValidType = (val,flag=true) => {
showTimeRange.value = false;
- clearDate();
+
showValidDay.value = false;
- emits('changeValue','valid_days');
+ if(flag){
+ clearDate();
+ emits('changeValue','valid_days');
+ }
if (val == 1) {
showTimeRange.value = true;
if (modalForm.value.valid_start_time) {
@@ -613,15 +621,21 @@ const changeValidType = (val) => {
showValidDay.value = true;
}
};
-const changeScope = (val) => {
+const changeScope = (val,flag=true) => {
showConnectType.value = false;
- emits('changeValue','inquiry_type');
+
showProduct.value = false;
- emits('changeValue','product_id');
+
showManjian.value = false;
- emits('changeValue','with_amount');
+
showMinNumber.value = false;
- emits('changeValue','min_usable_number');
+
+ if(flag){
+ emits('changeValue','inquiry_type');
+ emits('changeValue','product_id');
+ emits('changeValue','with_amount');
+ emits('changeValue','min_usable_number');
+ }
if (val == 1) {
modalForm.coupon_type == 2 && (showManjian.value = true);
modalForm.coupon_type == 3 && (showMinNumber.value = true);
@@ -632,9 +646,12 @@ const changeScope = (val) => {
handleGetProduct('', modalForm.value.product_id);
}
};
-const changeObject = (val) => {
+const changeObject = (val,flag=true) => {
showDistributionDay.value = false;
- emits('changeValue','distribution_with_day');
+ if(flag){
+ emits('changeValue','distribution_with_day');
+ }
+
if (val == 4) {
showDistributionDay.value = true;
}
@@ -645,10 +662,10 @@ watch(
() => {
//console.log(props.modalForm);
if (props.modalForm.coupon_id) {
- changeType(props.modalForm.coupon_type);
- changeScope(props.modalForm.application_scope);
- changeObject(props.modalForm.distribution_object);
- changeValidType(props.modalForm.valid_type);
+ changeType(props.modalForm.coupon_type,false);
+ changeScope(props.modalForm.application_scope,false);
+ changeObject(props.modalForm.distribution_object,false);
+ changeValidType(props.modalForm.valid_type,false);
if (props.modalForm.valid_start_time && props.modalForm.valid_end_time) {
defaultValue.value = [
props.modalForm.valid_start_time,
diff --git a/src/views/coupon/coupon-list/index.vue b/src/views/coupon/coupon-list/index.vue
index 70d9074..041d5d3 100644
--- a/src/views/coupon/coupon-list/index.vue
+++ b/src/views/coupon/coupon-list/index.vue
@@ -291,7 +291,7 @@ const isVisible=ref(false);
const { code, data, message } = await getCouponDetail(record.coupon_id);
if (code == 200) {
- Object.assign(modalForm, data);
+ Object.assign(modalForm,data);
family_data.value=data.patient_family;
}
};
diff --git a/src/views/order/service-list/index.vue b/src/views/order/service-list/index.vue
index 78e9162..acbafed 100644
--- a/src/views/order/service-list/index.vue
+++ b/src/views/order/service-list/index.vue
@@ -434,7 +434,8 @@
{{
formatRefundStatus(
- modalForm.order_service_package_refund.inquiry_refund_status
+ modalForm.order_service_package_refund.refund_status
+
)
}}
@@ -479,14 +480,21 @@
-
+
-
+
+ {{rightDetail.current_month_start_date}}-{{rightDetail.current_month_finish_date}}
+
+
+
+
+
+
{{rightDetail.order_service_package_detail.service_count==0?'不限':rightDetail.remaining_inquiry_count}}
-
+
{{rightDetail.order_service_package_detail.remaining_quantity}}
@@ -785,6 +793,7 @@
:api="cancleType=='inquiry'?cancelInquiry:cancelService"
:title="'确定取消此订单吗？'"
:dealType="'order_inquiry_id'"
+ :type="cancleType=='inquiry'?'':'service'"
:id="cur_inruiry_id"
@closeChange="handelCloseChange"
>