From 31e1147913ecc53d0ebfda02cc609a3057401cb6 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 13 Jun 2024 13:58:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E6=94=BE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/couponDetail.vue        |  6 ++++++
 src/components/medinceOrderModal.vue   | 12 ++++++++++++
 src/utils/format.js                    |  4 ++--
 src/views/coupon/coupon-list/index.vue |  8 ++++----
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/components/couponDetail.vue b/src/components/couponDetail.vue
index 84c4f11..2309662 100644
--- a/src/components/couponDetail.vue
+++ b/src/components/couponDetail.vue
@@ -31,6 +31,7 @@
         <a-col :span="12">
           <a-form-item field="coupon_client" label="使用平台：">
             <a-select
+            disabled
               placeholder="请选择使用平台"
               v-model="modalForm.coupon_client"
             >
@@ -43,6 +44,7 @@
         <a-col :span="12">
           <a-form-item field="application_scope" label="使用范围：">
             <a-select
+            disabled
               @change="changeScope"
               placeholder="请选择使用范围"
               v-model="modalForm.application_scope"
@@ -66,6 +68,7 @@
         <a-col :span="12">
           <a-form-item field="coupon_type" label="发放类型：">
             <a-select
+              disabled
               placeholder="请选择发放类型"
               v-model="modalForm.coupon_type"
               @change="changeType"
@@ -104,6 +107,7 @@
         <a-col :span="12">
           <a-form-item field="valid_type" label="有效类型：">
             <a-select
+              disabled
               placeholder="请选择发放类型"
               v-model="modalForm.valid_type"
               @change="changeValidType"
@@ -857,6 +861,8 @@ const rules = {
   coupon_type: [{ required: true, message: '请选择发放类型' }],
   distribution_object: [{ required: true, message: '请选择发放对象' }],
   valid_type: [{ required: true, message: '请选择有效类型' }],
+  coupon_count:[{ required: true, message: '请输入发放数量' }],
+  coupon_price:[{ required: true, message: '请输入优惠卷金额' }]
 };
 defineExpose({
   changeStatus,
diff --git a/src/components/medinceOrderModal.vue b/src/components/medinceOrderModal.vue
index 3bdd145..3a15972 100644
--- a/src/components/medinceOrderModal.vue
+++ b/src/components/medinceOrderModal.vue
@@ -55,6 +55,18 @@
           </a-form-item>
         </a-col>
       </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12" >
+          <a-form-item field="amount_total" label="优惠卷：">
+            <span>{{modalForm.order_product_coupon?modalForm.order_product_coupon.coupon_use_price:0}}元</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item field="logistics_fee" label="优惠金额：">
+            <span>{{ modalForm.discount_amount>0?'-'+modalForm.discount_amount:0 }}元</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item field="payment_amount_total" label="实付金额：">
diff --git a/src/utils/format.js b/src/utils/format.js
index 2d5d669..ddabdeb 100644
--- a/src/utils/format.js
+++ b/src/utils/format.js
@@ -53,8 +53,8 @@ export const formatDoctorTitle=(val)=>{
     }
  }
  export const formatServiceCancelReason=(val)=>{
-   //1医生未接受服务 2:主动取消 4:客服取消 5:支付超时
-   let data={1:'医生未接受服务', 2:'主动取消',4:'客服取消',5:'支付超时'}
+   //1医生未接受服务 2:主动取消 3："支付超时" 4:客服取消 5:支付超时
+   let data={1:'医生未接受服务', 2:'主动取消',3:"支付超时",4:'客服取消',5:'支付超时'}
     if(val){
      return data[val]
     }else{
diff --git a/src/views/coupon/coupon-list/index.vue b/src/views/coupon/coupon-list/index.vue
index 2c0589f..1a6b1e1 100644
--- a/src/views/coupon/coupon-list/index.vue
+++ b/src/views/coupon/coupon-list/index.vue
@@ -3,7 +3,7 @@
     <a-form :model="queryForm" ref="queryFormRef" layout="inline">
 
       <a-form-item field="coupon_name" label="优惠卷名称">
-        <a-input :style="{ width: '182px' }" v-model="queryForm.coupon_name" placeholder="请输入患者名字" @press-enter="handleQuery" />
+        <a-input :style="{ width: '182px' }" v-model="queryForm.coupon_name" placeholder="请输入优惠卷名称" @press-enter="handleQuery" />
       </a-form-item>
       <a-form-item field="coupon_desc" label="优惠卷描述">
         <a-input :style="{ width: '182px' }" v-model="queryForm.coupon_desc" placeholder="请输入优惠卷描述" @press-enter="handleQuery" />
@@ -14,7 +14,7 @@
           <a-option :value="1">正常</a-option>
           <a-option :value="2">强制失效</a-option>
           <a-option :value="3">结束</a-option>
-          <a-option :value="3">删除</a-option>
+          <a-option :value="4">删除</a-option>
         </a-select>
       </a-form-item>
       <a-form-item field="distribution_object" label="发放对象">
@@ -41,8 +41,8 @@
 
         </a-select>
       </a-form-item>
-      <a-form-item field="application_scope" label="关联问诊类型">
-        <a-select  v-model="queryForm.application_scope" placeholder="请选择适用范围" :style="{ width: '182px' }">
+      <a-form-item field="inquiry_type" label="关联问诊类型">
+        <a-select  v-model="queryForm.inquiry_type" placeholder="请选择关联问诊类型" :style="{ width: '182px' }">
           <!--1:'专家问诊', 2:'快速问诊', 3:'公益问诊', 4:'问诊购药',5:'糖组检测'-->
           <a-option value="1">专家问诊</a-option>
           <a-option value="2">快速问诊</a-option>