From 4c36596e7cca2a0867671048cc69d6e34a69734b Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Mon, 3 Jun 2024 16:56:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 2 + src/api/coupon/list.js | 51 +++ src/api/doctor/list.js | 2 +- src/api/order/list.js | 10 +- src/components/isOkCouponModal.vue | 56 +++ src/utils/format.js | 29 ++ src/views/coupon/coupon-list/index.vue | 573 +++++++++++++++++++++++++ src/views/order/order-list/index.vue | 5 +- src/views/order/service-list/index.vue | 34 +- 9 files changed, 746 insertions(+), 16 deletions(-) create mode 100644 src/api/coupon/list.js create mode 100644 src/components/isOkCouponModal.vue create mode 100644 src/views/coupon/coupon-list/index.vue diff --git a/components.d.ts b/components.d.ts index fa7d8b7..6dcfec9 100644 --- a/components.d.ts +++ b/components.d.ts @@ -14,6 +14,7 @@ declare module '@vue/runtime-core' { AddSysconfigModal: typeof import('./src/components/addSysconfigModal.vue')['default'] ChatRecord: typeof import('./src/components/chatRecord.vue')['default'] ConfirmModal: typeof import('./src/components/confirmModal.vue')['default'] + copy: typeof import('./src/components/isOkModal copy.vue')['default'] DeleteModal: typeof import('./src/components/DeleteModal.vue')['default'] DoctorModal: typeof import('./src/components/doctorModal.vue')['default'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] @@ -21,6 +22,7 @@ declare module '@vue/runtime-core' { FamilyModal: typeof import('./src/components/familyModal.vue')['default'] InquiryDetailModal: typeof import('./src/components/inquiryDetailModal.vue')['default'] InquiryDetailMoneyModal: typeof import('./src/components/inquiryDetailMoneyModal.vue')['default'] + IsOkCouponModal: typeof import('./src/components/isOkCouponModal.vue')['default'] IsOkModal: typeof import('./src/components/isOkModal.vue')['default'] Loading: typeof import('./src/components/loading/loading.vue')['default'] MedinceDetailModal: typeof import('./src/components/medinceDetailModal.vue')['default'] diff --git a/src/api/coupon/list.js b/src/api/coupon/list.js new file mode 100644 index 0000000..3494119 --- /dev/null +++ b/src/api/coupon/list.js @@ -0,0 +1,51 @@ +import request from '../../utils/request' +export function getSystemCouponList(data){ + return request({ + url:'/admin/coupon/system/page', + method: 'post', + data + }) +} +export function getCouponDetail(id){ + return request({ + url:'/admin/coupon/system/'+id, + method: 'get' + }) + } + export function addCoupon(data){//系统-新增系统优惠卷 + return request({ + url:'/admin/coupon/system/'+id, + method: 'post', + data + }) + } + export function updateCoupon(id,data){//系统-修改系统优惠卷 + return request({ + url:'/admin/coupon/system/'+id, + method: 'put', + data + }) + } + export function updateCouponStatus(id,data){//系统-修改系统优惠卷 + return request({ + url:'/admin/coupon/system/status/'+id, + method: 'put', + data + }) + } + export function getUserCouponList(data){ + return request({ + url:'/admin/coupon/user/page', + method: 'post', + data + }) + } + export function giveCoupon(id,data){//系统-发放系统优惠卷 + return request({ + url:'/admin/coupon/system/grant/'+id, + method: 'post', + data + }) + } + + \ No newline at end of file diff --git a/src/api/doctor/list.js b/src/api/doctor/list.js index 62d5279..b417794 100644 --- a/src/api/doctor/list.js +++ b/src/api/doctor/list.js @@ -81,7 +81,7 @@ export function getDoctorDetail(id){ } export function areaList(params){ //获取银行列表 return request({ - url:'/basic/area/list', + url:'/admin/basic/area', method: 'get', params }) diff --git a/src/api/order/list.js b/src/api/order/list.js index f7d9ed4..5dd1870 100644 --- a/src/api/order/list.js +++ b/src/api/order/list.js @@ -106,4 +106,12 @@ export function serviceRightDetail(id){//服务包权益详情 url:`/admin/order/service/detail/${id}`, method: 'get' }) -} \ No newline at end of file +} + +export function cancelService(id,data){//取消服务包-取消订单 + return request({ + url:`/admin/order/service/cancel/${id}`, + method: 'put', + data + }) +} diff --git a/src/components/isOkCouponModal.vue b/src/components/isOkCouponModal.vue new file mode 100644 index 0000000..da4c369 --- /dev/null +++ b/src/components/isOkCouponModal.vue @@ -0,0 +1,56 @@ + + \ No newline at end of file diff --git a/src/utils/format.js b/src/utils/format.js index a465f18..2d5d669 100644 --- a/src/utils/format.js +++ b/src/utils/format.js @@ -164,3 +164,32 @@ export const formatRelation=(val)=>{ return '' } }; + + export const formatCouponType=(val)=>{ + //1:无门槛 2:满减 3:数量 + let data={1:'无门槛', 2:'满减',3:'数量'} + if(val ){ + return data[val] + }else{ + return '' + } + }; + export const formatCouponObject=(val)=>{ //发放对象 + //1:全部用户 2:新注册用户 3:会员 4:近期消费 5:近期购药 6:存量用户 7:健康包服务用户 + let data={1:'全部用户', 2:'新注册用户',3:'会员',4:'近期消费',5:'近期购药',6:'存量用户',7:'健康包服务用户'} + if(val){ + return data[val] + }else{ + return '' + } + }; + + export const formatCouponRange=(val)=>{ //适用范围 + //1:全场通用 2:问诊 3:按品牌适用 4:按类别适用 5:单品使用 6:全品类药品 + let data={1:'全场通用', 2:'问诊',3:'按品牌适用',4:'按类别适用',5:'单品使用',6:'全品类药品'} + if(val){ + return data[val] + }else{ + return '' + } + }; \ No newline at end of file diff --git a/src/views/coupon/coupon-list/index.vue b/src/views/coupon/coupon-list/index.vue new file mode 100644 index 0000000..9cf9dff --- /dev/null +++ b/src/views/coupon/coupon-list/index.vue @@ -0,0 +1,573 @@ + + + + + \ No newline at end of file diff --git a/src/views/order/order-list/index.vue b/src/views/order/order-list/index.vue index fe4f14a..56e8010 100644 --- a/src/views/order/order-list/index.vue +++ b/src/views/order/order-list/index.vue @@ -768,7 +768,10 @@ const openInquiryRecord=()=>{ const handelCloseChange=(data)=>{ cur_inruiry_id.value=""; okVisible.value=false; - console.log(data) + console.log(data); + if(cancleType.value=="service"){ + modalForm.status=5; + } if(data){ modalVisible.value=false; getOrderInfo({ ...pager, ...queryForm }); diff --git a/src/views/order/service-list/index.vue b/src/views/order/service-list/index.vue index 3728664..ad0f462 100644 --- a/src/views/order/service-list/index.vue +++ b/src/views/order/service-list/index.vue @@ -710,20 +710,15 @@ 取消订单 @@ -758,7 +753,7 @@ 问诊记录 - 取消问诊 + 取消问诊 @@ -1066,6 +1061,7 @@ import { inquiryCase, getOrderDetail, getProductDetail, + cancelService } from '@/api/order/list'; import { parseTime } from '@/utils/parseTime'; import { @@ -1082,7 +1078,7 @@ import { downloadFile } from '@/utils/downloadFile'; const deleteData = ref([]); // Akiraka 20230210 删除对话框 const deleteVisible = ref(false); - +const cancleType=ref('service'); const doctorVisible = ref(false); const okVisible = ref(false); const cur_inruiry_id = ref(''); @@ -1297,7 +1293,17 @@ const juancolumns = [ // Table Data const tableData = ref([]); - +const cancleOrder=(type)=>{ + cancleType.value=type; + if(type=="inquiry"){ + okVisible.value=true; + cur_inruiry_id.value=modalInquiryForm.order_inquiry_id; + }else{ + okVisible.value = true; + cur_inruiry_id.value= modalForm.order_service_id; + } + +} /** * 分页改变 * @param {Number} [page] @@ -1495,7 +1501,9 @@ const openInquiryRecord = () => { const handelCloseChange = (data) => { cur_inruiry_id.value = ''; okVisible.value = false; - console.log(data); + if(cancleType.value=="service"){ + modalForm.order_service_status=5; + } if (data) { modalVisible.value = false; getOrderInfo({ ...pager, ...queryForm });