{{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 @@
+
+
+
+
+
+
-
+
+
+
+
+ {{ modalForm.order_product_no }}
+
+
+
+
+ {{
+ modalForm.order_prescription.prescription_code
+ }}
+ 暂无
+
+
+
+
+
+
+ {{ modalForm.created_at }}
+
+
+
+
+ {{
+ parseTime(modalForm.pay_time)
+ }}
+ -
+
+
+
+
+
+
+ {{ modalForm.amount_total }}元
+
+
+
+
+ {{ modalForm.logistics_fee }}元
+
+
+
+
+
+
+ {{ modalForm.payment_amount_total }}元
+
+
+
+
+ {{
+ formatProductStatus(modalForm.order_product_status)
+ }}
+
+
+
+
+
+
+ {{
+ formatProductCancelReason(modalForm.cancel_reason)
+ }}
+
+
+
+
+
+
+ {{ modalForm.order_product_refund.product_refund_no }}
+
+
+
+
+ {{ modalForm.order_product_refund.refund_id }}
+
+
+
+
+
+
+ {{ modalForm.order_product_refund.refund_total }}元
+
+
+
+
+ {{
+ formatRefundStatus(
+ modalForm.order_product_refund.product_refund_status
+ )
+ }}
+
+
+
+
+
+
+ {{ modalForm.order_product_refund.success_time }}
+ -
+
+
+
+
+
+
+ {{ modalForm.order_product_refund.refund_reason }}
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ modalForm.consignee_name_mask }}
+ {{ AddressData.consignee_name }}
+
+
+
+
+
+ {{ modalForm.consignee_tel_mask }}
+ {{ AddressData.consignee_tel }}
+
+
+
+
+
+
+ {{ modalForm.address_mask }}
+ {{ AddressData.address }}
+
+
+
+
+ 物流单号：{{ modalForm.order_product_logistics.logistics_no }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ modalForm.order_inquiry_case.name }} （{{
+ modalForm.order_inquiry_case.sex == 1 ? '男' : '女'
+ }} {{ modalForm.order_inquiry_case.age }}岁）
+
+
+
+
+
+
+ {{ modalForm.order_inquiry_case.disease_desc }}
+
+
+
+
+
+
+ {{
+ modalForm.order_inquiry_case.disease_class_name
+ }} {{
+ modalForm.user_doctor.department_custom_name
+ }}
+
+
+
+
+
+
+ {{ fromatReportStatus(modalForm.report_pre_status) }}
+
+
+
+
+
+
+
+ {{ modalForm.report_pre_time }}
+ -
+
+
+
+
+
+
+ {{ modalForm.report_pre_fail_reason }}
+
+
+
+
+
+
+
+
+
+ 上报处方平台
+
+
+
+ 取消药品订单
+
+
+
+
+
+
+ 会员
疑难会诊
附赠沟通
+ 健康包服务
+ 服务包服务
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 08/58] =?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 @@
+
+
+
+ 提示
+
+ {{ title }}
+
+
+
+
+
\ 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 @@
+
+
取消订单
@@ -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 });
From 72ce2b0f0756c4fecb34bd9e0b5946517e946bb2 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 3 Jun 2024 17:12:31 +0800
Subject: [PATCH 09/58] =?UTF-8?q?=E9=80=80=E6=AC=BE=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/medinceOrderModal.vue | 2 ++
src/views/order/medince-list/index.vue | 1 +
2 files changed, 3 insertions(+)
diff --git a/src/components/medinceOrderModal.vue b/src/components/medinceOrderModal.vue
index fff7653..267f7e4 100644
--- a/src/components/medinceOrderModal.vue
+++ b/src/components/medinceOrderModal.vue
@@ -502,6 +502,8 @@
:okVisible="okVisible"
:api="cancelProduct"
:dealType="'order_inquiry_id'"
+ :payment_amount_total="modalForm.payment_amount_total
+"
:id="cur_product_id"
@closeChange="closeChange"
>
diff --git a/src/views/order/medince-list/index.vue b/src/views/order/medince-list/index.vue
index 17bdc5e..b2a2117 100644
--- a/src/views/order/medince-list/index.vue
+++ b/src/views/order/medince-list/index.vue
@@ -773,6 +773,7 @@
:okVisible="okVisible"
:api="cancelProduct"
:dealType="'order_inquiry_id'"
+ :payment_amount_total="modalForm.payment_amount_total"
:id="cur_product_id"
@closeChange="closeChange"
>
From 23a4074709a6ec1818aa65cd869f5c26eb1d42d4 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 3 Jun 2024 17:17:14 +0800
Subject: [PATCH 10/58] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/order/service-list/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/order/service-list/index.vue b/src/views/order/service-list/index.vue
index ad0f462..e8ec6d1 100644
--- a/src/views/order/service-list/index.vue
+++ b/src/views/order/service-list/index.vue
@@ -1039,7 +1039,7 @@
-
+
+
+
+
+
+
+
+
+
+ 小程序
+
+
+
+
+
+
+
+
+
+ 全场通用
+ 问诊
+ 按品牌适用
+ 按类别适用
+ 单品使用
+ 全品类药品
+
+
+
+
+
+
+
+ 无门槛
+ 满减
+ 数量
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 绝对时效
+ 相对时效
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加
+
+
+
+ 保存
+
+
+
+
+
+
+
@@ -273,6 +272,7 @@ const isVisible=ref(false);
}
})
}
+
//关闭启用弹框
const closeChangeOk = () => {
isVisible.value = false;
@@ -286,47 +286,6 @@ const showCoupon=(value,record)=>{
isVisible.value=true;
cur_coupon_id.value=record.coupon_id;
};
- //改变用户状态
-const handleChangeStatus=async(status)=>{
-
-
- if(status==0){
- cur_coupon_id.value=modalForm.coupon_id;
- //okVisible.value=true;
- isVisible.value=true
- }else{
- //okVisible.value=true;
- isVisible.value=true
- // switchStatus(modalForm.coupon_id,{
- // status:1
- // })
- }
- // await updateCouponStatus(cur_coupon_id,{
- // coupon_status:!status?1:2
- // })
-
- // if(record.status==0){
- // okVisible.value=true;
- // }else{
- // switchStatus(record.coupon_id,{
- // status:1
- // })
- }
- //就诊人详情
- const familyVisible=ref(false);
- const familyForm=reactive({
- user:{},
- avatar: 'https://img.applets.igandanyiyuan.com/basic/file/patient_avatar.png',
- });
- const handleFamilyDetail = async (family_id) => {
- const { code, data} = await getFamilyDetail(family_id);
- if (code == 200) {
- Object.assign(familyForm, data);
- familyVisible.value = true;
- }
- };
-
-
/**
* 分页改变
* @param {Number} [page]
@@ -373,7 +332,10 @@ const handleChangeStatus=async(status)=>{
proxy.$refs.queryFormRef.resetFields();
getInfo(queryForm);
}
-
+ const closeCouponDetail=()=>{
+ modalVisible.value=false;
+ getInfo({ ...pager, ...queryForm });
+}
onMounted(() => {
getInfo(pager);
});
From 6f02a10ed3266154dadab587ddcb7a37b10ce067 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 5 Jun 2024 16:59:33 +0800
Subject: [PATCH 16/58] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8D=B76.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components.d.ts | 1 +
src/api/coupon/list.js | 25 +-
src/components/couponDetail.vue | 226 ++++++++++++------
src/components/giveCouponModal.vue | 134 +++++++++++
src/views/coupon/coupon-list/index.vue | 65 +++--
src/views/coupon/userCoupon-list/index.vue | 265 +++++++++++++++++++++
src/views/order/service-list/index.vue | 4 +-
7 files changed, 631 insertions(+), 89 deletions(-)
create mode 100644 src/components/giveCouponModal.vue
create mode 100644 src/views/coupon/userCoupon-list/index.vue
diff --git a/components.d.ts b/components.d.ts
index ef2e1cc..aac7bc1 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -21,6 +21,7 @@ declare module '@vue/runtime-core' {
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
FamilyModal: typeof import('./src/components/familyModal.vue')['default']
+ GiveCouponModal: typeof import('./src/components/giveCouponModal.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']
diff --git a/src/api/coupon/list.js b/src/api/coupon/list.js
index 7866f75..a85473e 100644
--- a/src/api/coupon/list.js
+++ b/src/api/coupon/list.js
@@ -14,7 +14,7 @@ export function getCouponDetail(id){
}
export function addCoupon(data){//系统-新增系统优惠卷
return request({
- url:'/admin/coupon/system/',
+ url:'/admin/coupon/system',
method: 'post',
data
})
@@ -33,13 +33,21 @@ export function getCouponDetail(id){
data
})
}
- export function getUserCouponList(data){
+ export function getUserCouponList(data){//用户优惠卷列表
return request({
url:'/admin/coupon/user/page',
method: 'post',
data
})
}
+ export function getPatientList(params){
+ return request({
+ url:'/admin/patient/list',
+ method:'get',
+ params
+ })
+ }
+
export function giveCoupon(id,data){//系统-发放系统优惠卷
return request({
url:'/admin/coupon/system/grant/'+id,
@@ -47,9 +55,18 @@ export function getCouponDetail(id){
data
})
}
- export function getProduct(){//系统-发放系统优惠卷
+ export function getProduct(params){//系统-发放系统优惠卷
return request({
url:'admin/product/list',
- method: 'post'
+ method: 'get',
+ params
})
}
+ export function exportService(data){//导出
+ return request({
+ url:'/admin/export/order/service',
+ method: 'post',
+ data
+ })
+ }
+
diff --git a/src/components/couponDetail.vue b/src/components/couponDetail.vue
index cfaeada..4f0d446 100644
--- a/src/components/couponDetail.vue
+++ b/src/components/couponDetail.vue
@@ -156,14 +156,17 @@
-
+
@@ -207,7 +210,7 @@
-
+
-
-
+
+
{{ item.product_name }}
@@ -310,7 +314,7 @@
添加
@@ -319,7 +323,7 @@
修改
\ No newline at end of file
diff --git a/src/views/order/service-list/index.vue b/src/views/order/service-list/index.vue
index 233956a..1ac167a 100644
--- a/src/views/order/service-list/index.vue
+++ b/src/views/order/service-list/index.vue
@@ -1072,7 +1072,7 @@ import {
watch,
} from 'vue';
import {
- exportInquiry,
+ exportService,
getServiceList,
serviceDetail,
serviceRightDetail,
@@ -1578,7 +1578,7 @@ const handlExport = async (type) => {
type,
};
}
- const { code, data } = await exportInquiry(fromData);
+ const { code, data } = await exportService(fromData);
if (code == 200) {
downloadFile(data, '问诊订单');
}
From f37e9d0d1adc70cb5a50b17edaad2ab7fb5b6211 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 5 Jun 2024 17:48:01 +0800
Subject: [PATCH 17/58] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/couponDetail.vue | 5 ++-
src/views/coupon/coupon-list/index.vue | 53 +++++++++++++++++++++-----
2 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/src/components/couponDetail.vue b/src/components/couponDetail.vue
index 4f0d446..6506fc4 100644
--- a/src/components/couponDetail.vue
+++ b/src/components/couponDetail.vue
@@ -115,6 +115,7 @@
@@ -260,7 +261,7 @@
-
+
-
+
+
@@ -39,6 +41,16 @@
+
+
+
+ 专家问诊
+ 快速问诊
+ 公益问诊
+ 问诊购药
+ 糖组检测
+
+
-
From 6ec7e32a2e4a06b995289d5698587e3f8bf7dafe Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 6 Jun 2024 09:48:26 +0800
Subject: [PATCH 20/58] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=9C=8D=E5=8A=A1?=
=?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/order/list.js | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/api/order/list.js b/src/api/order/list.js
index 5dd1870..9b6e759 100644
--- a/src/api/order/list.js
+++ b/src/api/order/list.js
@@ -115,3 +115,10 @@ export function cancelService(id,data){//取消服务包-取消订单
data
})
}
+export function exportService(data){//导出服务包
+ return request({
+ url:'/admin/export/order/service',
+ method: 'post',
+ data
+ })
+}
\ No newline at end of file
From 7ad31f9b66085b65b9d14384093a6a45c28c38cb Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 6 Jun 2024 10:30:14 +0800
Subject: [PATCH 21/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/inquiry/service.js | 20 ++++++++++----------
src/components/couponDetail.vue | 26 ++++++++++++++++++--------
src/views/coupon/coupon-list/index.vue | 4 ++--
3 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/src/api/inquiry/service.js b/src/api/inquiry/service.js
index ac92e17..69f74bb 100644
--- a/src/api/inquiry/service.js
+++ b/src/api/inquiry/service.js
@@ -1,17 +1,17 @@
import request from '../../utils/request'
-export function getInquiryconfigList(params){
+export function getHealthList(data){//健康包管理-获取健康包列表-分页
return request({
- url:'/admin/inquiry/doctor',
- method: 'get',
- params
- })
-}
-
-export function addInquiryconfig(data){//添加配置
- return request({
- url:'/admin/inquiry/doctor',
+ url:'/admin/inquiry/health/page',
method: 'post',
data
})
+}
+
+export function healthDetail(id,params){//健康包管理-获取健康包详情
+ return request({
+ url:'/admin/inquiry/health/'+id,
+ method: 'post',
+ params
+ })
}
\ No newline at end of file
diff --git a/src/components/couponDetail.vue b/src/components/couponDetail.vue
index 6506fc4..bdbdef2 100644
--- a/src/components/couponDetail.vue
+++ b/src/components/couponDetail.vue
@@ -135,6 +135,7 @@
+
@@ -219,6 +222,7 @@
:style="{ width: '320px' }"
placeholder="请输入发放关联天数"
class="input-demo"
+ :step="0" :precision="0"
:min="1"
/>
@@ -270,13 +274,19 @@
-
-
-
-
+
+
+ 正常
+ 强制失效
+ 结束
+ 删除
+
diff --git a/src/views/coupon/coupon-list/index.vue b/src/views/coupon/coupon-list/index.vue
index 1f0d48d..e65f840 100644
--- a/src/views/coupon/coupon-list/index.vue
+++ b/src/views/coupon/coupon-list/index.vue
@@ -311,8 +311,8 @@ const isVisible=ref(false);
modalForm.valid_days=null;
modalForm.coupon_status=1;
modalForm.coupon_client=1;
- modalForm.is_mutex=0;
- modalForm.is_display=0;
+ modalForm.is_mutex=1;
+ modalForm.is_display=1;
modalForm.is_popup=0;
modalForm.valid_start_time='';
modalForm.valid_end_time='';
From 88e4e40c4dc6e22582e44f33dadab26b13a97494 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 6 Jun 2024 10:32:51 +0800
Subject: [PATCH 22/58] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/couponDetail.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/components/couponDetail.vue b/src/components/couponDetail.vue
index bdbdef2..0ce7729 100644
--- a/src/components/couponDetail.vue
+++ b/src/components/couponDetail.vue
@@ -270,6 +270,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.product_name }}
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/couponDetail.vue b/src/components/couponDetail.vue
index 0ce7729..749d13f 100644
--- a/src/components/couponDetail.vue
+++ b/src/components/couponDetail.vue
@@ -135,7 +135,7 @@
-
-
@@ -280,6 +280,7 @@
@@ -341,18 +342,35 @@
>修改
+
+ 强制失效
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.package_id }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.user_name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/addHealthModal.vue b/src/components/addHealthModal.vue
index 2419ea4..b702911 100644
--- a/src/components/addHealthModal.vue
+++ b/src/components/addHealthModal.vue
@@ -81,7 +81,7 @@
-
+
@@ -22,14 +20,21 @@
-
@@ -56,15 +61,13 @@
+
+
\ No newline at end of file
From 500a9d578dddf86b97e0ccd39a49fb33593a7f29 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 11 Jun 2024 17:43:12 +0800
Subject: [PATCH 29/58] =?UTF-8?q?=E5=8C=BB=E9=99=A2=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components.d.ts | 3 +-
src/api/basic/list.js | 51 ++++
src/components/hospitalDetailModal.vue | 294 ++++++++++++++++++
src/views/basic/area/index.vue | 398 ++++++++++++++++++++++++
src/views/basic/hospital/index.vue | 399 +++++++++++++++++++++++++
5 files changed, 1144 insertions(+), 1 deletion(-)
create mode 100644 src/api/basic/list.js
create mode 100644 src/components/hospitalDetailModal.vue
create mode 100644 src/views/basic/area/index.vue
create mode 100644 src/views/basic/hospital/index.vue
diff --git a/components.d.ts b/components.d.ts
index ffe92d9..3b9c75b 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -17,7 +17,7 @@ declare module '@vue/runtime-core' {
AddVisitConfigModal: typeof import('./src/components/addVisitConfigModal.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']
+ copy: typeof import('./src/components/medinceDetailModal copy.vue')['default']
CouponDetail: typeof import('./src/components/couponDetail.vue')['default']
DeleteModal: typeof import('./src/components/DeleteModal.vue')['default']
DoctorModal: typeof import('./src/components/doctorModal.vue')['default']
@@ -25,6 +25,7 @@ declare module '@vue/runtime-core' {
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
FamilyModal: typeof import('./src/components/familyModal.vue')['default']
GiveCouponModal: typeof import('./src/components/giveCouponModal.vue')['default']
+ HospitalDetailModal: typeof import('./src/components/hospitalDetailModal.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']
diff --git a/src/api/basic/list.js b/src/api/basic/list.js
new file mode 100644
index 0000000..8241f98
--- /dev/null
+++ b/src/api/basic/list.js
@@ -0,0 +1,51 @@
+import request from '../../utils/request'
+export function getHospitalList(data){
+ return request({
+ url:'/admin/basic/hospital/page',
+ method: 'post',
+ data
+ })
+ }
+ export function getHospitalDetail(id){
+ return request({
+ url:'/admin/basic/hospital/'+id,
+ method: 'get'
+ })
+ }
+ export function addHospital(data){//新增医院
+ return request({
+ url:'/admin/basic/hospital',
+ method: 'post',
+ data
+ })
+ }
+ export function updateHospital(id,data){//修改医院
+ return request({
+ url:'/admin/basic/hospital/'+id,
+ method: 'put',
+ data
+ })
+ }
+ export function getAreaList(params){
+ return request({
+ url:'/admin/basic/area',
+ method: 'get',
+ params
+ })
+ }
+
+ export function addArea(data){//新增医院
+ return request({
+ url:'/admin/basic/area',
+ method: 'post',
+ data
+ })
+ }
+ export function updateArea(id,data){//修改医院
+ return request({
+ url:'/admin/basic/area/'+id,
+ method: 'put',
+ data
+ })
+ }
+
\ No newline at end of file
diff --git a/src/components/hospitalDetailModal.vue b/src/components/hospitalDetailModal.vue
new file mode 100644
index 0000000..feb009f
--- /dev/null
+++ b/src/components/hospitalDetailModal.vue
@@ -0,0 +1,294 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 一级
+ 二级
+ 三级
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/basic/area/index.vue b/src/views/basic/area/index.vue
new file mode 100644
index 0000000..92cceed
--- /dev/null
+++ b/src/views/basic/area/index.vue
@@ -0,0 +1,398 @@
+
+
- 保存
+ 保存
diff --git a/src/components/addHealthModal.vue b/src/components/addHealthModal.vue
index b702911..b16da34 100644
--- a/src/components/addHealthModal.vue
+++ b/src/components/addHealthModal.vue
@@ -103,7 +103,7 @@
- 保存
+ 保存
diff --git a/src/components/addVisitConfigModal.vue b/src/components/addVisitConfigModal.vue
index ec0d872..66a5b05 100644
--- a/src/components/addVisitConfigModal.vue
+++ b/src/components/addVisitConfigModal.vue
@@ -146,7 +146,7 @@
保存
diff --git a/src/components/hospitalDetailModal.vue b/src/components/hospitalDetailModal.vue
index feb009f..ab35b33 100644
--- a/src/components/hospitalDetailModal.vue
+++ b/src/components/hospitalDetailModal.vue
@@ -137,7 +137,7 @@
- 保存
+ 保存
diff --git a/src/main.js b/src/main.js
index e0a7a23..57826e6 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,6 +4,7 @@ import App from './App.vue';
import ArcoVue from '@arco-design/web-vue';
import { Message, Modal, Notification } from '@arco-design/web-vue';
import '@arco-design/web-vue/dist/arco.css';
+import 'element-plus/dist/index.css'
import router from './router/';
import { parseTime } from '@/utils/parseTime';
import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
diff --git a/src/views/basic/area/index.vue b/src/views/basic/area/index.vue
index 92cceed..5d478c1 100644
--- a/src/views/basic/area/index.vue
+++ b/src/views/basic/area/index.vue
@@ -1,116 +1,85 @@
-
From 68a48230fa17dad181a8390a21a27b88a946cf40 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 14 Jun 2024 08:50:51 +0800
Subject: [PATCH 46/58] =?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/addHealthConfigModal.vue | 1 +
src/layout/components/AppMain.vue | 1 +
src/layout/components/Menu/SubMenu.vue | 5 +++--
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/components/addHealthConfigModal.vue b/src/components/addHealthConfigModal.vue
index b06d19b..5260887 100644
--- a/src/components/addHealthConfigModal.vue
+++ b/src/components/addHealthConfigModal.vue
@@ -99,6 +99,7 @@
\ No newline at end of file
diff --git a/src/layout/components/Menu/SubMenu.vue b/src/layout/components/Menu/SubMenu.vue
index 7aa7103..e81268f 100644
--- a/src/layout/components/Menu/SubMenu.vue
+++ b/src/layout/components/Menu/SubMenu.vue
@@ -39,7 +39,8 @@ const isRouteParams = computed(() => {
})
From b46fd9b9b38ce9321f56499e2dc07480d18c39d6 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 14 Jun 2024 10:17:28 +0800
Subject: [PATCH 47/58] =?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/addHealthConfigModal.vue | 28 ++++++++++++-
src/components/addVisitConfigModal.vue | 50 ++++++++++++++++++++++--
src/views/inquiry/healthconfig/index.vue | 6 ++-
3 files changed, 77 insertions(+), 7 deletions(-)
diff --git a/src/components/addHealthConfigModal.vue b/src/components/addHealthConfigModal.vue
index 5260887..165030b 100644
--- a/src/components/addHealthConfigModal.vue
+++ b/src/components/addHealthConfigModal.vue
@@ -86,7 +86,7 @@
+ :loading="loading" @search="handleGetDoctor" @change="changeDoctor">
{{ item.user_name }}
@@ -99,7 +99,7 @@
import { ref,toRefs,watch,getCurrentInstance,reactive,defineExpose} from 'vue';
import { addHealthConfig,updateHealthConfig,getDoctorList,getHealthConfigAddList} from '@/api/inquiry/service';
+ import {getInquiryconfigDetail} from "@/api/inquiry/config"
import { parseTime } from '@/utils/parseTime';
const { proxy } = getCurrentInstance();
const product_data=ref([]);
@@ -190,6 +191,28 @@ const healthConfig=async()=>{
const reset=()=>{
product_data.value=[];
};
+
+const configDetail=async()=>{
+ const {code,data}=await getInquiryconfigDetail({
+ inquiry_config_id:'',
+ inquiry_type:1,
+ inquiry_mode:1,
+ doctor_id:modalForm.doctor_id
+ });
+ if(code==200){
+ if(data.inquiry_price){
+ emits('setPrice',data.inquiry_price*0.6*5)
+ }else{
+ proxy.$message.warning('该医生需要开启图文问诊，才能开通此服务');
+ }
+ if(data.multi_point_status!=1){
+ proxy.$message.warning('本服务需开处方，该医生需要做多点执业认证');
+ }
+ }
+}
+const changeDoctor=(val)=>{
+ configDetail();
+}
const {modalVisible,id,modalForm}=toRefs(props);
const emits = defineEmits(['healthVisibleChange','freshList']);
watch(()=>props.id,(newVal,oldValval)=>{
@@ -200,6 +223,7 @@ const reset=()=>{
healthConfig();
title.value='添加健康包配置';
handleGetDoctor();
+
}
},{immediate:true})
watch(()=>props.modalForm,(newVal,oldValval)=>{
diff --git a/src/components/addVisitConfigModal.vue b/src/components/addVisitConfigModal.vue
index 66a5b05..b6d4e0e 100644
--- a/src/components/addVisitConfigModal.vue
+++ b/src/components/addVisitConfigModal.vue
@@ -28,6 +28,7 @@
allow-search
:loading="loading"
@search="handleGetDoctor"
+ @change="changeDoctor"
>
- {
return package_data.value.map(item=>item.service_period)
})
const addPackage = () => {
+ if(!modalForm.value.doctor_id){
+ proxy.$message.warning('请先选择医生');
+ return false
+ }
package_data.value.push({
service_period: null,
- service_price: 10,
+ service_price:null,
follow_package_item_id: new Date().getTime(),
});
};
@@ -229,6 +246,21 @@ const removePackage = (id) => {
const reset = () => {
package_data.value = [];
};
+const configDetail=async()=>{
+ const {code,data}=await getInquiryconfigDetail({
+ inquiry_config_id:'',
+ inquiry_type:1,
+ inquiry_mode:1,
+ doctor_id:modalForm.doctor_id
+ });
+ if(code==200){
+ if(data.inquiry_price){
+ tuwenPrice.value=data.inquiry_price;
+ }else{
+ proxy.$message.warning('该医生需要开启图文问诊，才能开通此服务');
+ }
+ }
+}
const package_columns = [
// {
// title: '服务包名称',
@@ -340,7 +372,9 @@ const handleSubmit = () => {
}
});
};
-
+const changeDoctor=()=>{
+ configDetail();
+}
const rules = {
monthly_frequency: [{ required: true, message: '请选择每月次数' }],
doctor_id: [{ required: true, message: '请选择医生' }],
@@ -364,5 +398,15 @@ defineExpose({
color:#999;
}
+ .box{
+ margin-top: 20px;
+ }
+ .box.active{
+ margin-top: 0px;
+ }
+ .tips{
+ color:red;
+ font-size: 12px;
+ }
\ No newline at end of file
diff --git a/src/views/inquiry/healthconfig/index.vue b/src/views/inquiry/healthconfig/index.vue
index 35fc177..c5421b1 100644
--- a/src/views/inquiry/healthconfig/index.vue
+++ b/src/views/inquiry/healthconfig/index.vue
@@ -79,7 +79,7 @@
-
@@ -184,7 +184,9 @@
addChild.value.reset();
};
-
+ const setPrice=(data)=>{
+ modalForm.service_price=data;
+ }
//详情
const handleDetail = async (record) => {
health_package_id.value=record.health_package_id;
From a27d58d7792d8743ec95e65f6a069dd67039e3ad Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 14 Jun 2024 10:20:17 +0800
Subject: [PATCH 48/58] =?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/addVisitConfigModal.vue | 4 +---
src/views/inquiry/visitconfig/index.vue | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/components/addVisitConfigModal.vue b/src/components/addVisitConfigModal.vue
index b6d4e0e..e0031e1 100644
--- a/src/components/addVisitConfigModal.vue
+++ b/src/components/addVisitConfigModal.vue
@@ -96,10 +96,8 @@
>
30
90
@@ -362,7 +360,7 @@ const handleSubmit = () => {
props.id
? proxy.$message.success('修改成功')
: proxy.$message.success('添加成功');
- //emits('freshList', '');
+ emits('freshList', '');
}
handleClose();
} else {
diff --git a/src/views/inquiry/visitconfig/index.vue b/src/views/inquiry/visitconfig/index.vue
index 7debea1..4c75c66 100644
--- a/src/views/inquiry/visitconfig/index.vue
+++ b/src/views/inquiry/visitconfig/index.vue
@@ -82,7 +82,7 @@
-
From 4be5d10ba95757b85bdbd532a9f9bd6bd29c2780 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 14 Jun 2024 13:44:26 +0800
Subject: [PATCH 49/58] =?UTF-8?q?=E8=8D=AF=E5=93=81=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/order/medince-list/index.vue | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/views/order/medince-list/index.vue b/src/views/order/medince-list/index.vue
index b2a2117..bdb422e 100644
--- a/src/views/order/medince-list/index.vue
+++ b/src/views/order/medince-list/index.vue
@@ -370,6 +370,18 @@
+
+
+
+ {{modalForm.order_product_coupon?modalForm.order_product_coupon.coupon_use_price:0}}元
+
+
+
+
+ {{ modalForm.discount_amount>0?'-'+modalForm.discount_amount:0 }}元
+
+
+
From 6cd48f58e0abd2f921122416ec8fb0c774fa61f3 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 14 Jun 2024 14:08:57 +0800
Subject: [PATCH 50/58] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/addHealthConfigModal.vue | 4 ++--
src/components/medinceOrderModal.vue | 2 +-
src/views/order/medince-list/index.vue | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/components/addHealthConfigModal.vue b/src/components/addHealthConfigModal.vue
index 165030b..bd12e25 100644
--- a/src/components/addHealthConfigModal.vue
+++ b/src/components/addHealthConfigModal.vue
@@ -73,7 +73,7 @@
+ :loading="loading" @search="healthConfig" :disabled="id?true:false" >
{{ item.package_id }}
@@ -86,7 +86,7 @@
+ :loading="loading" @search="handleGetDoctor" @change="changeDoctor" :disabled="id?true:false">
{{ item.user_name }}
diff --git a/src/components/medinceOrderModal.vue b/src/components/medinceOrderModal.vue
index 3a15972..ac9e636 100644
--- a/src/components/medinceOrderModal.vue
+++ b/src/components/medinceOrderModal.vue
@@ -58,7 +58,7 @@
- {{modalForm.order_product_coupon?modalForm.order_product_coupon.coupon_use_price:0}}元
+ {{modalForm.order_product_coupon?'-'+modalForm.order_product_coupon.coupon_use_price:0}}元
diff --git a/src/views/order/medince-list/index.vue b/src/views/order/medince-list/index.vue
index bdb422e..1068944 100644
--- a/src/views/order/medince-list/index.vue
+++ b/src/views/order/medince-list/index.vue
@@ -373,7 +373,7 @@
- {{modalForm.order_product_coupon?modalForm.order_product_coupon.coupon_use_price:0}}元
+ {{modalForm.order_product_coupon?'-'+modalForm.order_product_coupon.coupon_use_price:0}}元
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 51/58] =?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"
>
From d1615f86fe8f150e3b58ac52e1c84abc2295ac60 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 14 Jun 2024 17:17:48 +0800
Subject: [PATCH 52/58] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/couponDetail.vue | 20 ++++++++++----------
src/components/giveCouponModal.vue | 4 ++--
src/components/inquiryDetailMoneyModal.vue | 2 +-
src/components/medinceOrderModal.vue | 2 +-
src/views/coupon/coupon-list/index.vue | 16 ++++++++--------
src/views/coupon/userCoupon-list/index.vue | 8 ++++----
src/views/order/medince-list/index.vue | 2 +-
src/views/order/order-list/index.vue | 4 ++--
src/views/order/service-list/index.vue | 6 +++---
9 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/components/couponDetail.vue b/src/components/couponDetail.vue
index 1fcba62..8a9e770 100644
--- a/src/components/couponDetail.vue
+++ b/src/components/couponDetail.vue
@@ -3,7 +3,7 @@
-
+
@@ -187,11 +187,11 @@
-
+
-
+
- 发放优惠卷
+ 发放优惠劵
@@ -33,7 +33,7 @@
-
+
diff --git a/src/components/inquiryDetailMoneyModal.vue b/src/components/inquiryDetailMoneyModal.vue
index 5d1865b..0d20238 100644
--- a/src/components/inquiryDetailMoneyModal.vue
+++ b/src/components/inquiryDetailMoneyModal.vue
@@ -46,7 +46,7 @@
-
+
{{modalForm.coupon_amount_total}}元
无
diff --git a/src/components/medinceOrderModal.vue b/src/components/medinceOrderModal.vue
index ac9e636..9d9fad4 100644
--- a/src/components/medinceOrderModal.vue
+++ b/src/components/medinceOrderModal.vue
@@ -57,7 +57,7 @@
-
+
{{modalForm.order_product_coupon?'-'+modalForm.order_product_coupon.coupon_use_price:0}}元
diff --git a/src/views/coupon/coupon-list/index.vue b/src/views/coupon/coupon-list/index.vue
index 041d5d3..61e4e7d 100644
--- a/src/views/coupon/coupon-list/index.vue
+++ b/src/views/coupon/coupon-list/index.vue
@@ -2,11 +2,11 @@
-
-
+
-
-
+
@@ -71,7 +71,7 @@
-
@@ -214,7 +214,7 @@ const isVisible=ref(false);
dataIndex: 'code',
slotName:'code'
},{
- title: '优惠卷名称',
+ title: '优惠劵名称',
dataIndex: 'coupon_name',
},{
title: '适用平台',
@@ -247,7 +247,7 @@ const isVisible=ref(false);
dataIndex:'coupon_used_count'
},
{
- title: '优惠卷金额',
+ title: '优惠劵金额',
dataIndex:'coupon_price',
slotName:'coupon_price'
},
diff --git a/src/views/coupon/userCoupon-list/index.vue b/src/views/coupon/userCoupon-list/index.vue
index f81f5bd..a4fcd77 100644
--- a/src/views/coupon/userCoupon-list/index.vue
+++ b/src/views/coupon/userCoupon-list/index.vue
@@ -5,8 +5,8 @@
-
-
+
@@ -108,13 +108,13 @@
width:180
},
{
- title: '优惠卷名称',
+ title: '优惠劵名称',
dataIndex: 'coupon',
slotName:'coupon',
width:200
},
{
- title: '优惠卷状态',
+ title: '优惠劵状态',
dataIndex: 'user_coupon_status',
slotName:'user_coupon_status',
width:100
diff --git a/src/views/order/medince-list/index.vue b/src/views/order/medince-list/index.vue
index 1068944..2bf808b 100644
--- a/src/views/order/medince-list/index.vue
+++ b/src/views/order/medince-list/index.vue
@@ -372,7 +372,7 @@
-
+
{{modalForm.order_product_coupon?'-'+modalForm.order_product_coupon.coupon_use_price:0}}元
diff --git a/src/views/order/order-list/index.vue b/src/views/order/order-list/index.vue
index 83dd3f1..533b62b 100644
--- a/src/views/order/order-list/index.vue
+++ b/src/views/order/order-list/index.vue
@@ -193,8 +193,8 @@
-
- {{modalForm.order_inquiry_coupon.coupon_name}}({{modalForm.order_inquiry_coupon.coupon_use_price}}元)
+
+ {{modalForm.order_inquiry_coupon.coupon_use_price?'-'+modalForm.order_inquiry_coupon.coupon_use_price:0}}元
无
diff --git a/src/views/order/service-list/index.vue b/src/views/order/service-list/index.vue
index acbafed..1aed812 100644
--- a/src/views/order/service-list/index.vue
+++ b/src/views/order/service-list/index.vue
@@ -328,7 +328,7 @@
-
+
{{ modalForm.order_inquiry_coupon.coupon_name }}({{
modalForm.order_inquiry_coupon.coupon_use_price
@@ -570,7 +570,7 @@
-
+
@@ -850,7 +850,7 @@
-
+
{{modalInquiryForm.order_inquiry_coupon.coupon_name}}({{modalForm.order_inquiry_coupon.coupon_use_price}}元)
无
From 1863bdde50779bf016c2ee2bbd11017f7249e4e3 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 17 Jun 2024 10:31:22 +0800
Subject: [PATCH 53/58] 6.17
---
src/components/addHealthConfigModal.vue | 15 ++++++++++++-
src/components/addVisitConfigModal.vue | 30 +++++++++++++------------
src/components/inquiryDetailModal.vue | 2 +-
src/components/medinceOrderModal.vue | 5 ++++-
src/utils/format.js | 2 +-
src/views/medince/sys-medince/index.vue | 4 ++--
src/views/order/service-list/index.vue | 4 ++--
7 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/src/components/addHealthConfigModal.vue b/src/components/addHealthConfigModal.vue
index bd12e25..5d3005d 100644
--- a/src/components/addHealthConfigModal.vue
+++ b/src/components/addHealthConfigModal.vue
@@ -173,7 +173,8 @@ const handleGetDoctor=async(name='',id='')=>{
loading.value=true;
const {code,data}=await getDoctorList({
user_name:name,
- doctor_id:id
+ doctor_id:id,
+ multi_point_status:1
});
if(code==200){
doctorList.value=data;
@@ -192,6 +193,8 @@ const reset=()=>{
product_data.value=[];
};
+let multi_point_status=null;
+let tuwenPrice='';
const configDetail=async()=>{
const {code,data}=await getInquiryconfigDetail({
inquiry_config_id:'',
@@ -201,11 +204,13 @@ const configDetail=async()=>{
});
if(code==200){
if(data.inquiry_price){
+ tuwenPrice=data.inquiry_price;
emits('setPrice',data.inquiry_price*0.6*5)
}else{
proxy.$message.warning('该医生需要开启图文问诊，才能开通此服务');
}
if(data.multi_point_status!=1){
+ multi_point_status=data.multi_point_status;
proxy.$message.warning('本服务需开处方，该医生需要做多点执业认证');
}
}
@@ -250,6 +255,14 @@ const changeDoctor=(val)=>{
const handleSubmit=()=>{
proxy.$refs.modalFormRefConfig.validate(async (valid) => {
let data=null;
+ if(tuwenPrice ===''){
+ proxy.$message.warning('该医生需要开启图文问诊，才能开通此服务');
+ return false;
+ }
+ if(multi_point_status!=1){
+ proxy.$message.warning('本服务需开处方，该医生需要做多点执业认证');
+ return false;
+ };
let {doctor_id,package_id,service_price,is_enable}=modalForm.value;
if (!valid) {
if(props.id){
diff --git a/src/components/addVisitConfigModal.vue b/src/components/addVisitConfigModal.vue
index e0031e1..bc8eff4 100644
--- a/src/components/addVisitConfigModal.vue
+++ b/src/components/addVisitConfigModal.vue
@@ -108,7 +108,7 @@
-
+
{{ formatMode(modalForm.inquiry_mode) }}
diff --git a/src/components/medinceOrderModal.vue b/src/components/medinceOrderModal.vue
index 9d9fad4..337676d 100644
--- a/src/components/medinceOrderModal.vue
+++ b/src/components/medinceOrderModal.vue
@@ -460,6 +460,9 @@
>上报处方平台
+
-
评价信息
@@ -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 },
];
From 794a8b35ca033716807d5ae0176530ff43ecac2a Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 24 May 2024 14:53:57 +0800
Subject: [PATCH 05/58] =?UTF-8?q?5..24=E6=9B=B4=E6=96=B0=E5=B9=B3=E5=8F=B0?=
=?UTF-8?q?=E8=8D=AF=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/medince/list.js | 4 ++--
src/views/medince/sys-medince/index.vue | 31 ++++++++++++++++++++++---
2 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/src/api/medince/list.js b/src/api/medince/list.js
index f257835..aab19de 100644
--- a/src/api/medince/list.js
+++ b/src/api/medince/list.js
@@ -14,11 +14,11 @@ export function getMedinceDetail(id){//商品详情-平台
method: 'get'
})
};
- export function getSysMedinceList(params){//获取商品列表-分页-系统
+ export function getSysMedinceList(data){//获取商品列表-分页-系统
return request({
url:'/admin/product/page',
method: 'post',
- params
+ data
})
};
diff --git a/src/views/medince/sys-medince/index.vue b/src/views/medince/sys-medince/index.vue
index 5ecdc01..1b8477a 100644
--- a/src/views/medince/sys-medince/index.vue
+++ b/src/views/medince/sys-medince/index.vue
@@ -53,7 +53,7 @@
+
+
+ 订单信息
+
+
+
+ 退款信息
+
+
+
+ 药品信息
+
+
+
+
+ {{
+ lookAllAddress ? '隐藏完整地址信息' : '查看完整地址信息'
+ }}
+
+
+ 地址信息
+
+
+
+ 物流信息
+
+
+
+ {{ item.context }}
+
+
+ {{
+ isExpand ? '收起' : '展开'
+ }}
+
+ 暂无物流信息
+
+
+
+ 处方信息
+
+
+
+ 查看医生完整信息
+
+
+ 医生信息
+
+
+
+
+
+
+
+
+
+
+
+ {{ modalForm.user_doctor.user_name }} {{
+ formatDoctorTitle(modalForm.user_doctor.doctor_title)
+ }}
+
+
+ {{
+ modalForm.user_doctor.hospital.hospital_name
+ }} {{
+ modalForm.user_doctor.department_custom_name
+ }}
+
+ 暂未分配到医生
+
+
+
+ 查看就诊人完整信息
+
+
+ 就诊人信息
+
+
+
+ 处方上报状态
+
+
+
+ 操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 待支付
+ 未开始
+ 服务中
+ 服务完成
+ 服务取消
+
+
+
+
+
+ 健康包服务
+ 随访包服务
+
+
+
+
+
+
+ 未支付
+ 已支付
+ 支付中
+ 支付失败
+ 支付超时
+ 支付关闭
+ 已撤销
+
+
+
+
+
+ 无退款
+ 申请退款
+ 退款中
+ 退款成功
+ 拒绝退款
+ 退款关闭
+ 退款异常
+ 部分退款
+
+
+
+
+
+ 医生未接受服务
+ 主动取消
+ 客服取消
+ 支付超时
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ modalForm.order_service_no }}
+
+
+
+
+ {{
+ formatServiceStatus(modalForm.order_service_status)
+ }}
+
+
+
+
+
+
+ {{ modalForm.created_at }}
+
+
+
+
+ {{
+ parseTime(modalForm.pay_time)
+ }}
+ -
+
+
+
+
+
+
+ {{ modalForm.amount_total }}元
+
+
+
+
+ {{ modalForm.order_inquiry_coupon.coupon_name }}({{
+ modalForm.order_inquiry_coupon.coupon_use_price
+ }}元)
+ 无
+
+
+
+
+
+
+ {{ modalForm.payment_amount_total }}元
+
+
+
+
+ 专家问诊
+
+
+
+
+
+
+ {{
+ modalForm.order_service_type == 1 ? '健康包服务' : '随访包服务'
+ }}
+
+
+
+
+ {{ parseTime(modalForm.reception_time) }}
+
+
+
+
+
+
+ {{ parseTime(modalForm.finish_time) }}
+
+
+
+
+ {{ parseTime(modalForm.finish_time) }}
+
+
+
+
+
+
+ {{ parseTime(modalForm.cancel_time) }}
+
+
+
+
+
+
+ {{
+ formatServiceCancelReason(modalForm.cancel_reason)
+ }}
+
+
+
+
+
+
+ {{
+ modalForm.order_service_package_refund.inquiry_refund_no
+ }}
+
+
+
+
+ {{ modalForm.escrow_trade_no }}
+
+
+
+
+
+
+ {{
+ modalForm.order_service_package_refund.refund_total
+ }}元
+
+
+
+
+ {{
+ formatRefundStatus(
+ modalForm.order_service_package_refund.inquiry_refund_status
+ )
+ }}
+
+
+
+
+
+
+ {{ modalForm.order_service_package_refund.success_time }}
+ -
+
+
+
+
+
+
+ {{
+ modalForm.order_service_package_refund.refund_reason
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{(rightDetail.order_service_package_detail.service_period)/30
+}}个月内{{rightDetail.order_service_package_detail.service_count==0?'不限':(rightDetail.order_service_package_detail.service_count)}}次问诊，30盒肝爽颗粒（步长）、价值5元的全品类药品优惠劵2张、价值100元的肝胆商城优惠劵1张
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{record.coupon.coupon_name}}
+
+
+ {{formatCouponStatus(record.user_coupon_status)}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ modalForm.patient_name }} （{{
+ modalForm.patient_sex == 1 ? '男' : '女'
+ }} {{ modalForm.patient_age }}岁）
+
+
+
+
+
+
+
+ {{
+ modalForm.order_service_package_case.disease_class_name
+ }} {{
+ modalForm.user_doctor.department_custom_name
+ }}
+
+
+
+
+
+
+ {{ modalForm.order_service_package_case.disease_desc }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消订单
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ modalInquiryForm.inquiry_no }}
+
+
+
+
+ {{ formatInquiryStatus(modalInquiryForm.inquiry_status) }}
+
+
+
+
+
+
+ {{modalInquiryForm.created_at}}
+
+
+
+
+ {{parseTime(modalInquiryForm.pay_time)}}
+ -
+
+
+
+
+
+
+ {{modalInquiryForm.amount_total}}元
+
+
+
+
+ {{modalInquiryForm.order_inquiry_coupon.coupon_name}}({{modalForm.order_inquiry_coupon.coupon_use_price}}元)
+ 无
+
+
+
+
+
+
+ {{modalInquiryForm.payment_amount_total}}元
+
+
+
+
+ {{formatInquiryType(modalInquiryForm.inquiry_type)}}
+
+
+
+
+
+
+ {{formatMode(modalInquiryForm.inquiry_mode)}}
+
+
+
+
+ {{parseTime(modalInquiryForm.reception_time)}}
+
+
+
+
+
+
+ {{parseTime(modalInquiryForm.complete_time)}}
+
+
+
+
+ {{parseTime(modalInquiryForm.finish_time)}}
+
+
+
+
+
+
+
+ {{parseTime(modalInquiryForm.cancel_time)}}
+
+
+
+
+
+
+ {{ formatOrderCancelReason(modalInquiryForm.cancel_reason)}}
+
+
+
+
+
+
+ {{modalInquiryForm.order_inquiry_refund.inquiry_refund_no}}
+
+
+
+
+ {{modalInquiryForm.escrow_trade_no}}
+
+
+
+
+
+
+
+ {{modalInquiryForm.order_inquiry_refund.refund_total}}元
+
+
+
+
+ {{formatRefundStatus(modalInquiryForm.order_inquiry_refund.inquiry_refund_status)}}
+
+
+
+
+
+
+
+ {{modalForm.order_inquiry_refund.success_time}}
+ -
+
+
+
+
+
+
+ {{modalInquiryForm.order_inquiry_refund.refund_reason}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{modalInquiryForm.patient_name}} （{{modalInquiryForm.patient_sex==1?'男':'女'}} {{modalInquiryForm.patient_age}}岁）
+
+
+
+
+
+
+ {{modalInquiryForm.order_inquiry_case.disease_class_name}} {{modalInquiryForm.user_doctor.department_custom_name}}
+
+
+
+
+
+
+ {{modalInquiryForm.order_inquiry_case.disease_desc}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ comment.content }}
+
+
+
+
+
+
+
+
+
+ 问诊记录
+
+
+ 取消问诊
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From adaf02fd2fa338eca2fcfde2dd3dc550b5ab74cd Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 3 Jun 2024 08:59:43 +0800
Subject: [PATCH 07/58] =?UTF-8?q?=E5=8A=A0=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components.d.ts | 2 ++
src/views/inquiry/inquiry-list/index.vue | 2 ++
2 files changed, 4 insertions(+)
diff --git a/components.d.ts b/components.d.ts
index ae332bb..fa7d8b7 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -16,6 +16,8 @@ declare module '@vue/runtime-core' {
ConfirmModal: typeof import('./src/components/confirmModal.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']
+ ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
FamilyModal: typeof import('./src/components/familyModal.vue')['default']
InquiryDetailModal: typeof import('./src/components/inquiryDetailModal.vue')['default']
InquiryDetailMoneyModal: typeof import('./src/components/inquiryDetailMoneyModal.vue')['default']
diff --git a/src/views/inquiry/inquiry-list/index.vue b/src/views/inquiry/inquiry-list/index.vue
index b59978b..a29bc69 100644
--- a/src/views/inquiry/inquiry-list/index.vue
+++ b/src/views/inquiry/inquiry-list/index.vue
@@ -29,6 +29,8 @@
+
+
+
+
+
+ {{ rowIndex + 1 + (pager.page - 1) * pager.page_size }}
+
+
+ 小程序支付
+ 微信扫码
+ 模拟支付
+
+
+
+ 待支付
+ 未开始
+ 服务中
+ 服务完成
+ 服务取消
+
+
+ {{ record.amount_total }}元
+
+
+ {{ record.payment_amount_total }}元
+
+
+
+ {{ record.patient_name }}({{
+ record.patient_sex == 1 ? '男，' : '女，'
+ }}{{ record.patient_age }}岁)
+
+
+
+
+ {{ record.order_service_type == 1 ? '健康包服务' : '随访包服务' }}
+
+
+ {{ formatMode(record.inquiry_mode) }}
+
+
+ {{ parseTime(record.pay_time) }}
+
+
+
+
+
+
+ 订单信息
+
+
+
+ 退款信息
+
+
+
+ 服务权益
+ 接诊后生效
+ {{rightDetail.start_time}}——{{ rightDetail.finish_time }}
+
+ {{ rowIndex + 1 }}
+
+
+
+ {{ formatInquiryStatus(record.inquiry_status) }}
+
+
+
+
+ {{ rowIndex + 1 }}
+
+
+
+ {{ formatMedinceStatus(record.order_product_status) }}
+
+
+
+
+
+ 查看医生完整信息
+
+
+ 医生信息
+
+
+
+
+
+
+
+
+
+
+
+ {{ modalForm.user_doctor.user_name }} {{
+ formatDoctorTitle(modalForm.user_doctor.doctor_title)
+ }}
+
+
+ {{
+ modalForm.user_doctor.hospital.hospital_name
+ }} {{
+ modalForm.user_doctor.department_custom_name
+ }}
+
+ 暂未分配到医生
+
+
+
+ 查看就诊人完整信息
+
+
+ 就诊人信息
+
+
+
+ 操作
+
+
+
+ 订单信息
+
+
+
+ 退款信息
+
+
+
+ 查看医生完整信息
+
+
+ 医生信息
+
+
+
+
+
+
+
+
+
+
+ {{modalInquiryForm.user_doctor.user_name}} {{formatDoctorTitle(modalInquiryForm.user_doctor.doctor_title)}}
+ {{modalInquiryForm.user_doctor.hospital.hospital_name}} {{modalInquiryForm.user_doctor.department_custom_name}}
+ 暂未分配到医生
+
+
+
+ 查看就诊人完整信息
+
+
+ 就诊人信息
+
+
+
+ 评价信息
+
+
+
+ 操作
+
+
+
+
+
+
+
+
+
+ 正常
+ 强制失效
+ 结束
+ 删除
+
+
+
+
+
+ 全部用户
+ 新注册用户
+ 会员
+ 近期消费
+ 近期购药
+ 存量用户
+ 健康包服务用户
+
+
+
+
+
+ 全场通用
+ 问诊
+ 按品牌适用
+ 按类别适用
+ 单品使用
+ 全品类药品
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{modalForm.user_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 禁用
+ 正常
+ 删除
+
+
+
+
+ {{modalForm.created_at}}
+ -
+
+
+
+
+
+
+
+ {{modalForm.disable_reason}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 禁用
+ 启用
+
+
+
+
+
+
+
+
+
+
+
+ 提示
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+ {{(rowIndex+1)+(pager.page-1)*pager.page_size}}
+
+
+ 小程序
+
+
+ {{formatCouponObject(record.distribution_object)}}
+
+
+ {{formatCouponRange(record.application_scope)}}
+
+
+
+
+
+
+
+
+ 用户信息
+
+
+
+ {{modalForm.mobile}}
+
+
+
+
+ 就诊人信息
+
+
+
+ 收货地址
+
+
+
+
+
+
+ {{ item.consignee_name}}
+
+
+
+
+ {{ item.consignee_tel}}
+
+
+
+
+
+
+ {{ item.province}} {{item.city}}{{item.county}}{{item.address}}
+
+
+
+
+
+
+
+ 操作
+
+
+
+ 优惠卷信息
+
+
+
+ 操作
+
+
+
+
+
+
+
+
+
+
+ 专家问诊
+ 快速问诊
+ 公益问诊
+ 问诊购药
+
+
+
+
+
+
+
+ 图文
+ 视频
+ 语音
+ 电话
+ 会员
+ 疑难会诊
+ 附赠沟通
+ 健康包服务
+ 服务包服务
+
+
+
+
+ 关闭
+ 开启
+
+
+
+
+
+
+
+
+
+
+ 关闭
+ 开启
+
+
+
+
+
+
+
+
+
+
+
+ 提示
+
+
+
+
+
+
+
+
\ No newline at end of file
From 26556c746566a3ed64aec062697892528c0e3606 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 6 Jun 2024 09:41:25 +0800
Subject: [PATCH 19/58] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BC=98=E6=83=A0?=
=?UTF-8?q?=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/coupon/coupon-list/index.vue | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/views/coupon/coupon-list/index.vue b/src/views/coupon/coupon-list/index.vue
index 748b2a6..1f0d48d 100644
--- a/src/views/coupon/coupon-list/index.vue
+++ b/src/views/coupon/coupon-list/index.vue
@@ -77,10 +77,8 @@
+
+
+
+
+
+ {{(rowIndex+1)+(pager.page-1)*pager.page_size}}
+
+
+ {{ formatDoctorTitle(record.doctor_title) }}
+
+
+ {{ formatMultipoint(record.multi_point_status) }}
+
+
+
+ {{ formatInquiryType(record.inquiry_type) }}
+
+
+ {{ formatMode(record.inquiry_mode) }}
+
+
+ 自己
+ 后台
+
+
+ {{formatRelation(record.relation)}}
+
+
+
+ 确定保存当前信息？
+
+
+
+ 健康包信息
+
+
+
+ 操作
+
+
+
+
+
+
+
+
+
+
+
+ 提示
+
+
+
+
+
+
+
+
\ No newline at end of file
From 87bc7629168926a0d57d0275184cf35e1aed0ba7 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 7 Jun 2024 09:51:58 +0800
Subject: [PATCH 27/58] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/coupon/coupon-list/index.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/views/coupon/coupon-list/index.vue b/src/views/coupon/coupon-list/index.vue
index e9b27b0..2c0589f 100644
--- a/src/views/coupon/coupon-list/index.vue
+++ b/src/views/coupon/coupon-list/index.vue
@@ -321,6 +321,8 @@ const isVisible=ref(false);
modalForm.valid_start_time='';
modalForm.valid_end_time='';
modalForm.valid_type='';
+ modalForm.coupon_count=null;
+ modalForm.desc='';
modalForm.is_reissuable_after_expire=0;
if(couponChild.value){
couponChild.value.changeStatus();
From 994afb354929a05b81145bd04ee14f605f31ca24 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 11 Jun 2024 09:53:05 +0800
Subject: [PATCH 28/58] =?UTF-8?q?6.11=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components.d.ts | 2 +
src/api/inquiry/service.js | 47 ++-
src/components/addHealthConfigModal.vue | 270 +++++++++++++++++
src/components/addHealthModal.vue | 96 ++++--
src/components/addVisitConfigModal.vue | 368 +++++++++++++++++++++++
src/views/inquiry/health/index.vue | 5 +-
src/views/inquiry/healthconfig/index.vue | 52 ++--
src/views/inquiry/visitconfig/index.vue | 268 +++++++++++++++++
8 files changed, 1050 insertions(+), 58 deletions(-)
create mode 100644 src/components/addHealthConfigModal.vue
create mode 100644 src/components/addVisitConfigModal.vue
create mode 100644 src/views/inquiry/visitconfig/index.vue
diff --git a/components.d.ts b/components.d.ts
index 8c48da0..ffe92d9 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -10,9 +10,11 @@ export {}
declare module '@vue/runtime-core' {
export interface GlobalComponents {
AccountModal: typeof import('./src/components/accountModal.vue')['default']
+ AddHealthConfigModal: typeof import('./src/components/addHealthConfigModal.vue')['default']
AddHealthModal: typeof import('./src/components/addHealthModal.vue')['default']
AddInquiryConfigModal: typeof import('./src/components/addInquiryConfigModal.vue')['default']
AddSysconfigModal: typeof import('./src/components/addSysconfigModal.vue')['default']
+ AddVisitConfigModal: typeof import('./src/components/addVisitConfigModal.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']
diff --git a/src/api/inquiry/service.js b/src/api/inquiry/service.js
index 94c6b45..7ae43fc 100644
--- a/src/api/inquiry/service.js
+++ b/src/api/inquiry/service.js
@@ -24,7 +24,7 @@ export function addHealth(data){//健康包管理-获取健康包详情
export function updateHealth(id,data){//健康包管理-获取健康包详情
return request({
url:'/admin/inquiry/health/'+id,
- method: 'post',
+ method: 'put',
data
})
}
@@ -51,7 +51,50 @@ export function addHealth(data){//健康包管理-获取健康包详情
}
export function updateHealthConfig(id,data){//医生健康包配置-修改医生健康包配置
return request({
- url:'/admin/inquiry/doctor/health'+id,
+ url:'/admin/inquiry/doctor/health/'+id,
+ method: 'put',
+ data
+ })
+ }
+ export function getDoctorList(params){//医生列表
+ return request({
+ url:'/admin/doctor/list',
+ method: 'get',
+ params
+ })
+ }
+ export function getHealthConfigAddList(params){//健康包管理-获取健康包列表-限制条数
+ return request({
+ url:'/admin/inquiry/health/list',
+ method: 'get',
+ params
+ })
+ }
+
+
+ export function getVisitConfigList(params){//医生随访包配置-获取开启随访包服务的医生-分页
+ return request({
+ url:'/admin/inquiry/doctor/follow',
+ method: 'get',
+ params
+ })
+ }
+ export function visitConfigDetail(id){//医生随访包配置-医生随访包配置详情
+ return request({
+ url:'/admin/inquiry/doctor/follow/'+id,
+ method: 'get'
+ })
+ }
+ export function addVisitConfig(data){//医生随访包配置-新增医生随访包配置
+ return request({
+ url:'/admin/inquiry/doctor/follow',
+ method: 'post',
+ data
+ })
+ }
+ export function updateVisitConfig(id,data){//医生随访包配置-修改医生随访包配置
+ return request({
+ url:'/admin/inquiry/doctor/follow/'+id,
method: 'put',
data
})
diff --git a/src/components/addHealthConfigModal.vue b/src/components/addHealthConfigModal.vue
new file mode 100644
index 0000000..18e28e4
--- /dev/null
+++ b/src/components/addHealthConfigModal.vue
@@ -0,0 +1,270 @@
+
+
+
+
+
+
+
+
+ {{(rowIndex+1)+(pager.page-1)*pager.page_size}}
+
+
+ 健康包
+ 随访包
+
+
+
+
+
+
+ 确定保存当前信息？
+
+
+
+ 健康包配置信息
+
+
+
+ 操作
+ 健康包
随访包
-
-
-
+
+ {{record.health_package.service_rate+"%"}}
+
+
+
+ 基本信息
+
+
+ {{ item.area_name }}
+
+
+
+
+ {{ item.area_name }}
+
+
+ {{ item.area_name }}
+
+
+
+
+
+
+ 操作
+
+
+
+
+
+
+
+ 一级
+ 二级
+ 三级
+
+
+
+
+ {{ item.area_name}}
+
+
+
+
+
+ {{ item.area_name}}
+
+
+
+
+ {{ item.area_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提示
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/basic/hospital/index.vue b/src/views/basic/hospital/index.vue
new file mode 100644
index 0000000..83290a3
--- /dev/null
+++ b/src/views/basic/hospital/index.vue
@@ -0,0 +1,399 @@
+
+
+
+
+
+
+
+
+ {{(rowIndex+1)+(pager.page-1)*pager.page_size}}
+
+
+ 确定保存当前信息？
+
+
+
+
+
+
+
+ 一级
+ 二级
+ 三级
+
+
+
+
+ {{ item.area_name}}
+
+
+
+
+
+ {{ item.area_name}}
+
+
+
+
+ {{ item.area_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提示
+
+
+
+
+
+
+
+
\ No newline at end of file
From 80121827e1a2c15648eb21d00572dda40e34a8e8 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 12 Jun 2024 17:28:55 +0800
Subject: [PATCH 30/58] 6.12
---
components.d.ts | 2 +
src/components/addHealthConfigModal.vue | 2 +-
src/components/addHealthModal.vue | 2 +-
src/components/addVisitConfigModal.vue | 2 +-
src/components/hospitalDetailModal.vue | 2 +-
src/main.js | 1 +
src/views/basic/area/index.vue | 424 +++++++++--------------
src/views/basic/hospital/index.vue | 4 +-
src/views/inquiry/health/index.vue | 4 +-
src/views/inquiry/healthconfig/index.vue | 4 +-
src/views/inquiry/visitconfig/index.vue | 4 +-
11 files changed, 183 insertions(+), 268 deletions(-)
diff --git a/components.d.ts b/components.d.ts
index 3b9c75b..7029145 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -21,8 +21,10 @@ declare module '@vue/runtime-core' {
CouponDetail: typeof import('./src/components/couponDetail.vue')['default']
DeleteModal: typeof import('./src/components/DeleteModal.vue')['default']
DoctorModal: typeof import('./src/components/doctorModal.vue')['default']
+ ElButton: typeof import('element-plus/es')['ElButton']
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+ ElTree: typeof import('element-plus/es')['ElTree']
FamilyModal: typeof import('./src/components/familyModal.vue')['default']
GiveCouponModal: typeof import('./src/components/giveCouponModal.vue')['default']
HospitalDetailModal: typeof import('./src/components/hospitalDetailModal.vue')['default']
diff --git a/src/components/addHealthConfigModal.vue b/src/components/addHealthConfigModal.vue
index 18e28e4..b06d19b 100644
--- a/src/components/addHealthConfigModal.vue
+++ b/src/components/addHealthConfigModal.vue
@@ -132,7 +132,7 @@
+
+
+
+
+
+
+ {{(rowIndex+1)+(pager.page-1)*pager.page_size}}
+
+
+ 确定保存当前信息？
+
-
-
-
-
-
-
- 一级
- 二级
- 三级
-
-
-
-
- {{ item.area_name}}
-
-
-
-
-
- {{ item.area_name}}
-
-
-
-
- {{ item.area_name}}
-
-
-
-
-
-
-
-
-
-
-
+
+
+ {{ node.label }}
+
+
-
-
-
+
-
+
- 提示
+ {{ title }}
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/basic/hospital/index.vue b/src/views/basic/hospital/index.vue
index f209db5..2259dff 100644
--- a/src/views/basic/hospital/index.vue
+++ b/src/views/basic/hospital/index.vue
@@ -3,7 +3,7 @@
-
-
-
-
-
-
- {{(rowIndex+1)+(pager.page-1)*pager.page_size}}
+ 确定保存当前信息？
+
+
+ 退款理由请认真填写，会显示给患者(本单实付金额：{{payment_amount_total}}元)。 +
+
-
优惠卷信息
+ 优惠劵信息