From cf21b62b1869f38ba87f164aeb459f1ff9306a20 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Thu, 23 May 2024 13:30:54 +0800 Subject: [PATCH] =?UTF-8?q?5.23=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/medince/list.js | 13 ++- src/components/familyModal.vue | 12 +- src/views/medince/sys-medince/index.vue | 8 +- src/views/order/medince-list/index.vue | 148 +++++++++++++++++++++++- src/views/order/order-list/index.vue | 42 ++++++- src/views/patient/family-list/index.vue | 2 + 6 files changed, 214 insertions(+), 11 deletions(-) diff --git a/src/api/medince/list.js b/src/api/medince/list.js index 0bef543..f257835 100644 --- a/src/api/medince/list.js +++ b/src/api/medince/list.js @@ -16,8 +16,8 @@ export function getMedinceDetail(id){//商品详情-平台 }; export function getSysMedinceList(params){//获取商品列表-分页-系统 return request({ - url:'/admin/product', - method: 'get', + url:'/admin/product/page', + method: 'post', params }) }; @@ -55,4 +55,11 @@ export function getMedinceDetail(id){//商品详情-平台 method: 'get' }) } - \ No newline at end of file + + export function exportProduct(data){//导出 + return request({ + url:`/admin/export/product`, + method: 'post', + data + }) + } \ No newline at end of file diff --git a/src/components/familyModal.vue b/src/components/familyModal.vue index ef20ca9..dfe0448 100644 --- a/src/components/familyModal.vue +++ b/src/components/familyModal.vue @@ -27,8 +27,8 @@ - - + +
{{modalForm.mobile_mask}}
@@ -40,6 +40,14 @@
+ + +
+
{{modalForm.created_at}}
+
+ + +
diff --git a/src/views/medince/sys-medince/index.vue b/src/views/medince/sys-medince/index.vue index 683b480..5ecdc01 100644 --- a/src/views/medince/sys-medince/index.vue +++ b/src/views/medince/sys-medince/index.vue @@ -54,10 +54,10 @@
新增 - 选择数据导出 当前搜索全部导出 - 全部导出 --> + 全部导出
@@ -322,9 +322,9 @@ type } } - const {code,data}=await exportFamily(fromData); + const {code,data}=await exportProduct(fromData); if(code==200){ - downloadFile(data,'就诊人列表'); + downloadFile(data,'平台药品列表'); } proxy.$loading.hide(); } diff --git a/src/views/order/medince-list/index.vue b/src/views/order/medince-list/index.vue index 8cbbeca..17bdc5e 100644 --- a/src/views/order/medince-list/index.vue +++ b/src/views/order/medince-list/index.vue @@ -36,6 +36,79 @@ @press-enter="handleQuery" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + 已取消 + + + + 小程序支付 + 微信扫码支付 + + + + + + 未支付 + 已支付 + 支付中 + 支付失败 + 支付超时 + 支付关闭 + 已撤销 + 转入退款 + + + + + + 主动取消 + 复核失败/库存不足 + 支付超时 + 客服取消 + 支付超时 + + + + + + 无退款 + 申请退款 + 退款中 + 退款成功 + 拒绝退款 + 退款关闭 + 退款异常 + + + + + + 未上报 + 已上报 + 上报失败 + + - {{modalForm.coupon_amount_total}}元 + {{modalForm.order_inquiry_coupon.coupon_name}}({{modalForm.order_inquiry_coupon.coupon_use_price}}元) 无 @@ -217,6 +217,31 @@ {{formatMode(modalForm.inquiry_mode)}} + + + {{parseTime(modalForm.reception_time)}} + + + + + + + {{parseTime(modalForm.complete_time)}} + + + + + {{parseTime(modalForm.finish_time)}} + + + + + + + + {{parseTime(modalForm.cancel_time)}} + + @@ -327,7 +352,17 @@ + + + + + + + +
评价信息
@@ -469,6 +504,7 @@ watch(() => deleteVisible.value ,(value) => { const { proxy } = getCurrentInstance(); const currentPage = ref(1); +const diagnose_images=ref([]); // Pager const pager = { total: 0, @@ -670,6 +706,10 @@ const handleQuery = async () => { const caseInfo= await inquiryCase(data.order_inquiry_case.inquiry_case_id); Object.assign(patientData,caseInfo.data); + }; + if(data.order_inquiry_case && data.order_inquiry_case.diagnose_images +){ + diagnose_images.value=data.order_inquiry_case.diagnose_images.split(','); } if(result){ Object.assign(comment,{ diff --git a/src/views/patient/family-list/index.vue b/src/views/patient/family-list/index.vue index 744051e..7f3241c 100644 --- a/src/views/patient/family-list/index.vue +++ b/src/views/patient/family-list/index.vue @@ -176,6 +176,8 @@ { title: '账号电话', dataIndex: 'mobile_mask',width:200 }, { title: '与账号关系', dataIndex: 'relation', slotName: 'relation',width: 150 }, // { title: '启用状态', dataIndex: 'status', slotName: 'status' }, + { title: '绑定时间', dataIndex: 'created_at', width: 180 }, + { title: '操作', slotName: 'action', fixed: "right", width: 180 }, ];