From 07723222b6eb00a3a08e95c33c9d4c347b493d05 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Thu, 14 Sep 2023 09:00:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/order/list.js | 6 + src/components/doctorModal.vue | 17 +- src/components/isOkModal.vue | 59 ++++++ src/components/patientModal.vue | 259 +++++++++++++++++++++++++ src/views/order/medince-list/index.vue | 109 +++-------- src/views/order/order-list/index.vue | 89 +++++---- 6 files changed, 403 insertions(+), 136 deletions(-) create mode 100644 src/components/isOkModal.vue create mode 100644 src/components/patientModal.vue diff --git a/src/api/order/list.js b/src/api/order/list.js index 4439fea..544fa5d 100644 --- a/src/api/order/list.js +++ b/src/api/order/list.js @@ -47,3 +47,9 @@ export function cancelProduct(id,data){//取消药品 data }) } +export function reportPrePscription(id){//上报处方 + return request({ + url:`/admin/order/report/pre/${id}`, + method: 'post' + }) +} diff --git a/src/components/doctorModal.vue b/src/components/doctorModal.vue index 9754782..72077b3 100644 --- a/src/components/doctorModal.vue +++ b/src/components/doctorModal.vue @@ -310,11 +310,6 @@ show-loader :src="item" /> - - @@ -329,10 +324,7 @@ :src="modalForm.user_doctor_info.id_card_front" /> - - + @@ -347,8 +339,7 @@ :src="modalForm.user_doctor_info.id_card_back" /> - + @@ -366,10 +357,6 @@ :src="modalForm.user_doctor_info.sign_image" /> - - diff --git a/src/components/isOkModal.vue b/src/components/isOkModal.vue new file mode 100644 index 0000000..c648c9e --- /dev/null +++ b/src/components/isOkModal.vue @@ -0,0 +1,59 @@ + + \ No newline at end of file diff --git a/src/components/patientModal.vue b/src/components/patientModal.vue new file mode 100644 index 0000000..ae9a9ef --- /dev/null +++ b/src/components/patientModal.vue @@ -0,0 +1,259 @@ + + \ No newline at end of file diff --git a/src/views/order/medince-list/index.vue b/src/views/order/medince-list/index.vue index 2edf8e2..c147f30 100644 --- a/src/views/order/medince-list/index.vue +++ b/src/views/order/medince-list/index.vue @@ -128,7 +128,6 @@ @click="handleDetail(record)" >详情 - @@ -139,13 +138,7 @@ :title="modalTitle" title-align="start" :footer="false" - @before-ok="handleSubmit" - @close=" - () => { - $refs.modalFormRef.resetFields(); - modalForm.doctor_id = null; - } - " + @close="() => {$refs.modalFormRef.resetFields();modalForm.doctor_id = null;}" >
@@ -153,7 +146,6 @@
@@ -188,26 +180,24 @@ - {{ modalForm.amount_total }} + {{ modalForm.amount_total }}元 - {{ modalForm.logistics_fee }} + {{ modalForm.logistics_fee }}元 - {{ modalForm.payment_amount_total }} + {{ modalForm.payment_amount_total }}元 - {{ - formatRefundStatus(modalForm.order_product_status) - }} + {{formatRefundStatus(modalForm.order_product_status)}} @@ -230,9 +220,7 @@ > - {{ - modalForm.order_product_refund.product_refund_no - }} + {{ modalForm.order_product_refund.product_refund_no}} @@ -244,16 +232,13 @@ - {{ modalForm.order_product_refund.refund_total }} + {{ modalForm.order_product_refund.refund_total }}元 {{ - formatRefundStatus( - modalForm.order_product_refund.product_refund_status - ) - }} + formatRefundStatus(modalForm.order_product_refund.product_refund_status)}} @@ -429,7 +414,7 @@
病情描述：
-
{{modalForm.order_inquiry_case.disease_desc}}  {{modalForm.user_doctor.department_custom_name}}
+
{{modalForm.order_inquiry_case.disease_desc}}
@@ -445,7 +430,7 @@ - 上报处方平台 @@ -464,7 +449,10 @@ - + + + + @@ -477,7 +465,7 @@ import { nextTick, watch, } from 'vue'; -import { productList, getProductDetail,cancelProduct} from '@/api/order/list'; +import { productList, getProductDetail,cancelProduct,reportPrePscription} from '@/api/order/list'; import { parseTime } from '@/utils/parseTime'; import {formatDoctorTitle,formatPrescriptionStatus,formatPharmacistStatus,formatProductCancelReason} from "@/utils/format" const IMG_URL=import.meta.env.VITE_IMG_URL; @@ -490,9 +478,14 @@ const okVisible=ref(false); const cur_product_id=ref(''); const doctorVisible = ref(false); const doctor_id = ref(''); +const isVisible=ref(false); +const order_product_id=ref(""); let express=[];//物流信息； const cur_express=ref([]); -const isExpand=ref(false) +const isExpand=ref(false); +const patientVisible=ref(false); +const patientData=reactive({ +}); const chufang_columns=reactive([ { title: '处方编号', @@ -582,10 +575,6 @@ watch(()=>queryForm.report_range_time,(value)=>{ queryForm.report_pre_time='' }; }) -// Rules -const rules = { - post_name: [{ required: true, message: '请输入岗位名称' }], -}; // Modal const modalVisible = ref(false); @@ -617,55 +606,8 @@ const columns = [ // Table Data const tableData = ref([]); -// 新增 -const handleAdd = () => { - modalVisible.value = true; - modalTitle.value = '新增岗位'; -}; -// 修改 -const handleUpdate = async (record) => { - modalVisible.value = true; - modalTitle.value = '修改岗位'; - await nextTick(); - Object.assign(modalForm, record); -}; - -// Modal ok -// 异步关闭Modal需要调用 done() -const handleSubmit = (done) => { - proxy.$refs.modalFormRef.validate(async (valid) => { - if (!valid) { - let res; - if (!modalForm.post_id) { - const { code, message } = await addPost(modalForm); - if (code == 200) { - proxy.$notification.success('新增成功'); - } else { - proxy.$notification.error(message); - } - } else { - console.log('post_id:' + modalForm.post_id); - - const { code, message } = await updatePost( - modalForm, - modalForm.post_id - ); - if (code == 200) { - proxy.$notification.success('更新成功'); - } else { - proxy.$notification.error(message); - } - } - done(); - getProductInfo(pager); - } else { - proxy.$message.error('表单校验失败'); - done(false); - } - }); -}; /** * 分页改变 @@ -721,8 +663,8 @@ const handleDetail = async (record) => { if (code == 200) { Object.assign(modalForm, data); let result=data.order_prescription; - express=data.order_product_logistics && JSON.parse(data.order_product_logistics.logistics_content); - cur_express.value=express.slice(0,1); + express=data.order_product_logistics?JSON.parse(data.order_product_logistics.logistics_content):[]; + cur_express.value=express.length>1 && express.slice(0,1); let data_arr=[{}]; if(result){ chufang_columns.forEach((item)=>{ @@ -738,7 +680,7 @@ const handleDetail = async (record) => { data_arr[0][item.dataIndex]=result[item.dataIndex] } }); - console.log(data_arr) + chufang_data=data_arr; } @@ -814,7 +756,8 @@ doctor_id.value=modalForm.doctor_id; doctorVisible.value=true; } const openPatient=()=>{ -alert('开发中') + Object.assign(patientData,modalForm.order_inquiry_case); + patientVisible.value=true; } onMounted(() => { getProductInfo(pager); diff --git a/src/views/order/order-list/index.vue b/src/views/order/order-list/index.vue index ef322c6..7c5d8f5 100644 --- a/src/views/order/order-list/index.vue +++ b/src/views/order/order-list/index.vue @@ -111,7 +111,7 @@ + @close="() => {$refs.modalFormRef.resetFields(); modalForm.doctor_id = null;}">
订单信息
@@ -145,19 +145,20 @@ - {{modalForm.amount_total}} + {{modalForm.amount_total}}元 - {{modalForm.coupon_amount_total}} + {{modalForm.coupon_amount_total}}元 + 暂无 - {{modalForm.payment_amount_total}} + {{modalForm.payment_amount_total}}元 @@ -194,7 +195,7 @@ - {{modalForm.order_inquiry_refund.refund_total}} + {{modalForm.order_inquiry_refund.refund_total}}元 @@ -266,9 +267,9 @@
确诊疾病：
{{modalForm.order_inquiry_case.disease_class_name}}  {{modalForm.user_doctor.department_custom_name}}
-
+
病情描述：
-
{{modalForm.order_inquiry_case.disease_desc}}  {{modalForm.user_doctor.department_custom_name}}
+
{{modalForm.order_inquiry_case.disease_desc}}
@@ -314,7 +315,7 @@ - 问诊记录 + 问诊记录 取消问诊 @@ -326,6 +327,10 @@ + + + + @@ -347,6 +352,9 @@ const doctorVisible=ref(false); const okVisible=ref(false); const cur_inruiry_id=ref(''); const doctor_id=ref(''); +const patientVisible=ref(false); +const patientData=reactive({ +}); // Akiraka 20230210 监听删除事件 watch(() => deleteVisible.value ,(value) => { @@ -446,35 +454,35 @@ const handleUpdate = async (record) => { // Modal ok // 异步关闭Modal需要调用 done() -const handleSubmit = (done) => { - proxy.$refs.modalFormRef.validate(async (valid) => { - if (!valid) { - let res; - if (!modalForm.post_id) { - const { code, message } = await addPost(modalForm); - if (code == 200 ) { - proxy.$notification.success('新增成功'); - } else { - proxy.$notification.error(message); - } - } else { - console.log("post_id:"+modalForm.post_id) +// const handleSubmit = (done) => { +// proxy.$refs.modalFormRef.validate(async (valid) => { +// if (!valid) { +// let res; +// if (!modalForm.post_id) { +// const { code, message } = await addPost(modalForm); +// if (code == 200 ) { +// proxy.$notification.success('新增成功'); +// } else { +// proxy.$notification.error(message); +// } +// } else { +// console.log("post_id:"+modalForm.post_id) - const { code, message } = await updatePost(modalForm, modalForm.post_id); - if (code == 200 ) { - proxy.$notification.success('更新成功'); - } else { - proxy.$notification.error(message); - } - } - done(); - getOrderInfo(pager); - } else { - proxy.$message.error('表单校验失败'); - done(false); - } - }); -}; +// const { code, message } = await updatePost(modalForm, modalForm.post_id); +// if (code == 200 ) { +// proxy.$notification.success('更新成功'); +// } else { +// proxy.$notification.error(message); +// } +// } +// done(); +// getOrderInfo(pager); +// } else { +// proxy.$message.error('表单校验失败'); +// done(false); +// } +// }); +// }; /** @@ -559,12 +567,17 @@ const handleQuery = async () => { const openDcotor=()=>{ - doctor_id.value=modalForm.doctor_id; doctorVisible.value=true; } const openPatient=()=>{ - alert('开发中') + //patientData=modalForm.order_inquiry_case; + Object.assign(patientData,modalForm.order_inquiry_case); + // console.log(patientData); + patientVisible.value=true; +} +const openInquiryRecord=()=>{ + alert("开发中"); } //关闭确认框 const handelCloseChange=(data)=>{