diff --git a/components.d.ts b/components.d.ts index 514bb9b..ae332bb 100644 --- a/components.d.ts +++ b/components.d.ts @@ -23,6 +23,7 @@ declare module '@vue/runtime-core' { Loading: typeof import('./src/components/loading/loading.vue')['default'] MedinceDetailModal: typeof import('./src/components/medinceDetailModal.vue')['default'] MedinceModal: typeof import('./src/components/medinceModal.vue')['default'] + MedinceOrderModal: typeof import('./src/components/medinceOrderModal.vue')['default'] NumberModal: typeof import('./src/components/numberModal.vue')['default'] PatientModal: typeof import('./src/components/patientModal.vue')['default'] Prescription: typeof import('./src/components/prescription.vue')['default'] diff --git a/src/api/order/list.js b/src/api/order/list.js index 9cb8008..f7d9ed4 100644 --- a/src/api/order/list.js +++ b/src/api/order/list.js @@ -88,4 +88,22 @@ export function exportProduct(data){//导出药品订单 }) } - +export function getServiceList(data){//服务列表 + return request({ + url:'/admin/order/service/page', + method: 'post', + data + }) +} +export function serviceDetail(id){//服务包详情 + return request({ + url:`/admin/order/service/${id}`, + method: 'get' + }) +} +export function serviceRightDetail(id){//服务包权益详情 + return request({ + url:`/admin/order/service/detail/${id}`, + method: 'get' + }) +} \ No newline at end of file diff --git a/src/components/confirmModal.vue b/src/components/confirmModal.vue index 8e9639b..310c728 100644 --- a/src/components/confirmModal.vue +++ b/src/components/confirmModal.vue @@ -38,8 +38,7 @@ const props = defineProps({ default:'', }, payment_amount_total:{ - type:Number, - default:'' + type:Number }, dealType:{ type: String, @@ -62,7 +61,7 @@ const handleClose = () => { // alert(flag) } watch(()=>props.payment_amount_total,(newVal,oldVal)=>{ - form.refund_amount=newVal; + form.refund_amount=Number(newVal); },{immediate:true}) // Akiraka 20230210 删除数据校验 const rules = reactive({ diff --git a/src/components/medinceOrderModal.vue b/src/components/medinceOrderModal.vue new file mode 100644 index 0000000..fff7653 --- /dev/null +++ b/src/components/medinceOrderModal.vue @@ -0,0 +1,790 @@ + + + + diff --git a/src/utils/format.js b/src/utils/format.js index bba579e..a465f18 100644 --- a/src/utils/format.js +++ b/src/utils/format.js @@ -52,6 +52,15 @@ export const formatDoctorTitle=(val)=>{ return '' } } + export const formatServiceCancelReason=(val)=>{ + //1医生未接受服务 2:主动取消 4:客服取消 5:支付超时 + let data={1:'医生未接受服务', 2:'主动取消',4:'客服取消',5:'支付超时'} + if(val){ + return data[val] + }else{ + return '' + } + } export const fromatReportStatus=(val)=>{ //上报处方平台状态（0:未上报 1:已上报 2:上报失败）） let data={0:'未上报', 1:'已上报', 2:'上报失败'} @@ -89,6 +98,16 @@ export const formatRelation=(val)=>{ return '' } }; + export const formatMedinceStatus=(val)=>{ + // 1:待支付 2:待发货 3:已发货 4:已签收 5:已取消 + let data={1:'待支付', 2:'待发货', 3:'已发货', 4:'已签收',5:'已取消'} + if(val){ + return data[val] + }else{ + return '' + } + }; + export const formatMultipoint=(val)=>{ //医生多点执业认证状态（0:未认证 1:认证通过 2:审核中 3:认证失败） let data={0:'未认证',1:'认证通过', 2:'审核中', 3:'认证失败'} @@ -101,7 +120,7 @@ export const formatRelation=(val)=>{ export const formatMode=(val)=>{ //1:图文 2:视频 3:语音 4:电话 5:会员 - let data={1:'图文',2:'视频', 3:'语音', 4:'电话',5:'会员',6:'疑难会诊',7:'附赠沟通'} + let data={1:'图文',2:'视频', 3:'语音', 4:'电话',5:'会员',6:'疑难会诊',7:'附赠沟通',8:'健康包',9:'服务包'} if(val){ return data[val] }else{ @@ -135,4 +154,13 @@ export const formatRelation=(val)=>{ }else{ return '' } - }; \ No newline at end of file + }; + export const formatCouponStatus=(val)=>{ + //-1:'注册即发放',0:'未使用', 1:'已使用',2:'已过期' + let data={'-1':'注册即发放',0:'未使用',1:'已使用', 2:'已过期'} + if(val || val==0){ + return data[val] + }else{ + return '' + } + }; diff --git a/src/views/order/service-list/index.vue b/src/views/order/service-list/index.vue new file mode 100644 index 0000000..3728664 --- /dev/null +++ b/src/views/order/service-list/index.vue @@ -0,0 +1,1595 @@ + + + + +