From c8fc69d754baa3eefa88ebe8b285edaf2361bd4a Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 13 Oct 2023 11:16:20 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=97=AE=E8=AF=8A?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inquiry/list.js                       |  18 +
 src/api/order/list.js                         |   8 +
 src/api/prescription/list.js                  |   6 +
 src/components/inquiryDetailModal.vue         | 468 +++++++++++++
 src/components/medinceModal.vue               | 629 ++++++++++++++++++
 src/components/patientModal.vue               |  15 +-
 src/components/prescriptionModal.vue          | 396 +++++++++++
 src/utils/format.js                           |  19 +
 src/views/admin/sys-menu/index.vue            |   3 +
 src/views/doctor/doctor-examine/index.vue     |   1 +
 src/views/doctor/doctor-list/index.vue        |   2 +-
 src/views/inquiry/inquiry-list/index.vue      | 350 ++++++++++
 src/views/order/inquiry-record/index.vue      | 392 +++++++++++
 .../prescription/prescription-list/index.vue  |  11 +-
 14 files changed, 2309 insertions(+), 9 deletions(-)
 create mode 100644 src/api/inquiry/list.js
 create mode 100644 src/components/inquiryDetailModal.vue
 create mode 100644 src/components/medinceModal.vue
 create mode 100644 src/components/prescriptionModal.vue
 create mode 100644 src/views/inquiry/inquiry-list/index.vue
 create mode 100644 src/views/order/inquiry-record/index.vue

diff --git a/src/api/inquiry/list.js b/src/api/inquiry/list.js
new file mode 100644
index 0000000..cdf9985
--- /dev/null
+++ b/src/api/inquiry/list.js
@@ -0,0 +1,18 @@
+import request from '../../utils/request'
+
+const url = '/admin/order/inquiry/record';
+
+
+export function getInquiryList(params){
+  return request({
+    url:'/admin/order/inquiry/record',
+    method: 'get',
+    params
+  })
+}
+export function getInquiryDetail(id){
+    return request({
+      url:'/admin/order/inquiry/record/'+id,
+      method: 'get'
+    })
+  }
\ No newline at end of file
diff --git a/src/api/order/list.js b/src/api/order/list.js
index 57f5020..6c8110a 100644
--- a/src/api/order/list.js
+++ b/src/api/order/list.js
@@ -65,3 +65,11 @@ export function inquiryCase(id){//病例详情
     method: 'get'
   })
 }
+export function getIm(id,params){//获取im分页
+  return request({
+    url:`/admin/order/inquiry/im/${id}`,
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/prescription/list.js b/src/api/prescription/list.js
index d1536a0..f369922 100644
--- a/src/api/prescription/list.js
+++ b/src/api/prescription/list.js
@@ -16,3 +16,9 @@ export function getPrescriptionDetail(id){
       method: 'get'
     })
   }
+  export function getCase(id){
+    return request({
+      url:'/admin/case/inquiry/'+id,
+      method: 'get'
+    })
+  }
diff --git a/src/components/inquiryDetailModal.vue b/src/components/inquiryDetailModal.vue
new file mode 100644
index 0000000..47b2d0b
--- /dev/null
+++ b/src/components/inquiryDetailModal.vue
@@ -0,0 +1,468 @@
+<template>
+  <!-- Modal -->
+  <a-modal
+    v-model:visible="modalVisible"
+    fullscreen
+    :title="'问诊详情'"
+    title-align="start"
+    :auto-label-width="true"
+    :footer="false"
+    @cancel="handleClose"
+  >
+    <div class="titlebox">
+      <div class="bar"></div>
+      <div class="name">订单信息</div>
+    </div>
+    <a-form :model="modalForm" ref="modalFormRef" :auto-label-width="true">
+      <a-row :gutter="24" style="margin-top: 35px">
+        <a-col :span="12">
+          <a-form-item field="inquiry_no" label="订单编号：">
+            <span>{{ modalForm.inquiry_no }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item field="order_product_status" label="订单状态：">
+            <span>{{ formatInquiryStatus(modalForm.inquiry_status) }}</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item field="user.created_at" label="支付时间：">
+            <span v-if="parseTime(modalForm.pay_time)">{{
+              parseTime(modalForm.pay_time)
+            }}</span>
+            <span v-else>-</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item field="reception_time" label="接诊时间：">
+            <span v-if="parseTime(modalForm.reception_time)">{{
+              parseTime(modalForm.reception_time)
+            }}</span>
+            <span v-else>-</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item field="inquiry_type" label="问诊类型：">
+            <span>{{ formatInquiryType(modalForm.inquiry_type) }}</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-divider />
+      <div class="titlebox" v-if="modalForm.user_doctor">
+        <div class="bar"></div>
+        <div class="name">医生信息</div>
+        <a-space
+          style="
+            margin-right: 8px;
+            flex: 1;
+            display: flex;
+            justify-content: flex-end;
+          "
+        >
+          <a-button type="primary" @click="openDcotor"
+            >查看医生完整信息</a-button
+          >
+        </a-space>
+      </div>
+      <a-row :gutter="24" style="margin-top: 35px">
+        <a-col :span="24">
+          <a-form-item field="license_cert" :hide-label="true">
+            <div class="doctorInfo" v-if="modalForm.user_doctor">
+              <a-space size="large">
+                <a-image
+                  width="80"
+                  height="80"
+                  class="headImg"
+                  :src="modalForm.user_doctor.avatar"
+                  v-if="modalForm.user_doctor.avatar"
+                >
+                </a-image>
+                <a-image
+                  width="80"
+                  height="80"
+                  class="headImg"
+                  src="https://img.applets.igandanyiyuan.com/basic/file/doctor_avatar.png"
+                  v-else
+                >
+                </a-image>
+              </a-space>
+              <div class="infobox">
+                <div class="name">
+                  {{ modalForm.user_doctor.user_name }}&nbsp;&nbsp;{{
+                    formatDoctorTitle(modalForm.user_doctor.doctor_title)
+                  }}
+                </div>
+                <div class="hospital">
+                  {{
+                    modalForm.user_doctor.hospital.hospital_name
+                  }}&nbsp;&nbsp;{{
+                    modalForm.user_doctor.department_custom_name
+                  }}
+                </div>
+              </div>
+            </div>
+            <div class="doctorInfo" v-else>暂未分配到医生</div>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-divider v-if="modalForm.user_doctor" />
+      <div class="titlebox">
+        <div class="bar"></div>
+        <div class="name">就诊人信息</div>
+        <a-space
+          style="
+            margin-right: 8px;
+            flex: 1;
+            display: flex;
+            justify-content: flex-end;
+          "
+        >
+          <a-button type="primary" status="warning" @click="openPatient"
+            >查看就诊人完整信息</a-button
+          >
+        </a-space>
+      </div>
+      <a-row
+        :gutter="24"
+        style="margin-top: 35px"
+        v-if="modalForm.order_inquiry_case"
+      >
+        <a-col :span="24">
+          <a-form-item label="就诊人姓名：">
+            <span
+              >{{ modalForm.order_inquiry_case.name }}&nbsp;&nbsp;（{{
+                modalForm.order_inquiry_case.sex == 1 ? '男' : '女'
+              }}&nbsp;&nbsp;{{ modalForm.order_inquiry_case.age }}岁）</span
+            >
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24" v-if="modalForm.order_inquiry_case">
+        <a-col :span="24">
+          <a-form-item field="inquiry_no" label="病情描述：">
+            <span>{{ modalForm.order_inquiry_case.disease_desc }}</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24" v-if="modalForm.order_inquiry_case">
+        <a-col :span="24">
+          <a-form-item field="inquiry_no" label="确诊疾病：">
+            <span
+              >{{
+                modalForm.order_inquiry_case.disease_class_name
+              }}&nbsp;&nbsp;{{
+                modalForm.user_doctor.department_custom_name
+              }}</span
+            >
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-divider />
+    </a-form>
+    <div class="titlebox">
+      <div class="bar"></div>
+      <div class="name">聊天记录</div>
+    </div>
+    <a-form-item field="license_cert" :hide-label="true">
+      <div class="phone">
+        <div class="phonecont">
+          <a-button class="more" v-if="showMore">点击加载更多</a-button>
+          <div class="nomore" v-else>---没有更多了---</div>
+
+          <div
+            class="msgbox"
+            :class="
+              modalForm.user_doctor.user_id == item.from_user_id
+                ? 'patientmsg'
+                : ''
+            "
+            v-for="item in chatlist"
+            :key="item.message_id"
+          >
+            <img
+              v-if="modalForm.user_doctor.user_id == item.from_user_id"
+              class="chatAvater"
+              src="https://img.applets.igandanyiyuan.com/basic/file/patient_avatar.png"
+              alt=""
+            />
+            <img
+              v-else="modalForm.user_doctor.user_id == item.from_user_id"
+              class="chatAvater"
+              :src="modalForm.user_doctor.avatar"
+              alt=""
+            />
+            <div class="msgcon">
+              <div class="msgtext" v-if="item.message_type == 'TIMTextElem'">
+                {{ JSON.parse(item.message_content).Text }}
+              </div>
+              <div
+                class="msgtext"
+                v-else-if="item.message_type == 'TIMCustomElem'"
+              >
+                <div
+                  v-if="
+                    JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 2
+                  "
+                  class="text"
+                >
+                  222
+                </div>
+              </div>
+              <div class="date">{{ item.created_at }}</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-form-item>
+    <a-divider />
+    <div class="titlebox">
+      <div class="bar"></div>
+      <div class="name">操作</div>
+    </div>
+    <a-row :gutter="24" style="margin-top: 35px">
+      <a-col :span="24">
+        <a-form-item field="" label="" no-style>
+          <a-space
+            style="margin-right: 8px"
+            v-if="
+              modalForm.report_pre_status == 2 &&
+              modalForm.refund_status != 2 &&
+              modalForm.refund_status != 3
+            "
+          >
+            <a-button
+              type="primary"
+              v-has="'admin:sysProductList:report'"
+              @click="
+                () => {
+                  isVisible = true;
+                  order_product_id = modalForm.order_product_id;
+                }
+              "
+              >上报处方平台</a-button
+            >
+          </a-space>
+          <!-- 订单状态=2退款状态=4，5支付状态=2上报状态!=1 -->
+          <a-space
+            style="margin-right: 8px"
+            v-if="
+              modalForm.order_product_status == 2 &&
+              modalForm.pay_status == 2 &&
+              (modalForm.refund_status == 4 ||
+                modalForm.refund_status == 5 ||
+                modalForm.refund_status == 0) &&
+              modalForm.report_pre_status != 1
+            "
+          >
+            <a-button
+              type="primary"
+              v-has="'admin:sysProductList:cancel'"
+              status="danger"
+              @click="
+                () => {
+                  okVisible = true;
+                  cur_product_id = modalForm.order_product_id;
+                }
+              "
+              >取消药品订单</a-button
+            >
+          </a-space>
+        </a-form-item>
+      </a-col>
+    </a-row>
+  </a-modal>
+  <!-- 医生详情弹框 -->
+  <doctorModal
+    :doctorVisible="doctorVisible"
+    :doctor_id="doctor_id"
+    @doctorVisibleChange="
+      () => {
+        doctorVisible = false;
+        doctor_id = '';
+      }
+    "
+  ></doctorModal>
+  <!-- 患者详情弹窗 -->
+  <patientModal
+    :patientVisible="patientVisible"
+    :data="patientData"
+    @patientVisibleChange="
+      () => {
+        patientVisible = false;
+      }
+    "
+  ></patientModal>
+</template>
+<script setup>
+import { ref, toRefs, reactive, watch,nextTick } from 'vue';
+import { formatDoctorTitle } from '@/utils/format';
+import { parseTime } from '@/utils/parseTime';
+import { inquiryCase, getIm } from '@/api/order/list';
+import { formatInquiryType, formatInquiryStatus } from '@/utils/format';
+const emits = defineEmits(['inquiryVisibleChange']);
+const showMore = ref(true);
+const props = defineProps({
+  // 是否显示
+  modalVisible: {
+    type: Boolean,
+    default: false,
+  },
+  modalForm: {
+    type: Object,
+  },
+});
+const firstIn=ref(false);
+const doctorVisible = ref(false);
+const doctor_id = ref('');
+const patientVisible = ref(false);
+
+const patientData = reactive({});
+const { modalVisible, modalForm } = toRefs(props);
+const openPatient = () => {
+  patientVisible.value = true;
+};
+const pager = reactive({
+  page: 1,
+  page_size: 10,
+});
+const chatlist = ref([]);
+const HandleGetIm = async (id, params = {}) => {
+  const { code, data } = await getIm(id, params);
+  if (code == 200) {
+   
+    if (chatlist.value < 10) {
+      showMore.value = false;
+    }
+    chatlist.value = data.data.reverse().concat(chatlist.value);
+    if(!firstIn.value){
+      nextTick(() => {
+      // 要放在对响应式数据修改之后
+      let ele = document.querySelector('.phonecont');
+      ele.scrollTop = ele.scrollHeight;
+    });
+    }
+
+    firstIn.value=true
+  }
+};
+
+watch(
+  () => props.modalForm,
+  () => {
+    if (
+      props.modalForm.order_inquiry_case &&
+      props.modalForm.order_inquiry_case.inquiry_case_id
+    ) {
+      let id = props.modalForm.order_inquiry_case.inquiry_case_id;
+      inquiryCase(id).then((data) => {
+        Object.assign(patientData, data.data);
+      });
+    }
+    if (props.modalForm.order_inquiry_id) {
+      let id = props.modalForm.order_inquiry_id;
+      HandleGetIm(id, { ...pager });
+    }
+  },
+  { immediate: true, deep: true }
+);
+const openDcotor = () => {
+  doctor_id.value = props.modalForm.doctor_id;
+  doctorVisible.value = true;
+};
+const handleClose = () => {
+  emits('inquiryVisibleChange', (modalVisible.value = false));
+};
+</script>
+<style scoped>
+.more {
+  display: flex;
+  margin: 20px auto 10px;
+}
+.nomore {
+  font-size: 12px;
+  color: #666;
+  text-align: center;
+  margin: 20px auto 10px;
+}
+.headImg {
+  margin-right: 20px;
+  border-radius: 50%;
+  width: 80px;
+  height: 80px;
+}
+.doctorInfo {
+  display: flex;
+  align-items: center;
+}
+.infobox {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+.phone {
+  margin-top: 35px;
+  position: relative;
+  background: #111;
+  border-radius: 55px;
+  box-shadow: 0px 0px 0px 2px #aaa;
+  width: 320px;
+  height: 480px;
+  padding: 105px 25px 60px;
+  -webkit-box-sizing: content-box;
+  box-sizing: content-box;
+}
+.phone:before {
+  content: '';
+  width: 60px;
+  height: 10px;
+  border-radius: 10px;
+  position: absolute;
+  left: 50%;
+  margin-left: -30px;
+  background: #333;
+  top: 50px;
+}
+.phonecont {
+  width: 100%;
+  height: 100%;
+  overflow: scroll;
+  background: #fff;
+}
+.chatAvater {
+  width: 40px;
+  height: 40px;
+  border-radius: 50%;
+}
+.msgbox {
+  display: flex;
+  margin: 4px 12px 12px;
+
+  flex-direction: row-reverse;
+}
+.patientmsg {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+}
+.phonecont .msgtext {
+  max-width: 80vw;
+  border-radius: 5px;
+  padding: 5px 8px;
+  background: #efefef;
+}
+.msgbox .msgcon {
+  margin-right: 6px;
+}
+.patientmsg .msgcon {
+  margin-left: 6px;
+}
+.date {
+  font-size: 12px;
+  color: #666;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/medinceModal.vue b/src/components/medinceModal.vue
new file mode 100644
index 0000000..ada14f0
--- /dev/null
+++ b/src/components/medinceModal.vue
@@ -0,0 +1,629 @@
+<template>
+     <!-- Modal -->
+     <a-modal
+      v-model:visible="medinceVisible"
+      fullscreen
+      :title="'药品详情'"
+      title-align="start"
+      :auto-label-width="true"
+      :footer="false"
+      @cancel="handleClose"
+    >
+      <div class="titlebox">
+        <div class="bar"></div>
+        <div class="name">订单信息</div>
+      </div>
+      <a-form :model="modalForm" ref="modalFormRef" :auto-label-width="true">
+        <a-row :gutter="24" style="margin-top: 35px">
+          <a-col :span="12">
+            <a-form-item field="inquiry_no" label="订单编号：">
+              <span>{{ modalForm.order_product_no }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item field="order_product_status" label="处方编号：">
+              <span v-if="modalForm.order_prescription">{{
+                modalForm.order_prescription.prescription_code
+              }}</span>
+              <span v-else>暂无</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item field="user.created_at" label="下单时间：">
+              <span>{{ modalForm.created_at }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item field="pay_time" label="支付时间：">
+              <span v-if="parseTime(modalForm.pay_time)">{{
+                parseTime(modalForm.pay_time)
+              }}</span>
+              <span v-else>-</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item field="amount_total" label="订单金额：">
+              <span>{{ modalForm.amount_total }}元</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item field="logistics_fee" label="邮费：">
+              <span>{{ modalForm.logistics_fee }}元</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item field="payment_amount_total" label="实付金额：">
+              <span>{{ modalForm.payment_amount_total }}元</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item field="order_product_status" label="订单状态：">
+              <span>{{
+                formatProductStatus(modalForm.order_product_status)
+              }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24" v-if="modalForm.cancel_reason">
+          <a-col :span="24">
+            <a-form-item field="department_custom_name" label="备   注 ：">
+              <span>{{
+                formatProductCancelReason(modalForm.cancel_reason)
+              }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-divider />
+        <div class="titlebox" v-if="modalForm.order_product_refund">
+          <div class="bar"></div>
+          <div class="name">退款信息</div>
+        </div>
+        <a-row
+          :gutter="24"
+          style="margin-top: 35px"
+          v-if="modalForm.order_product_refund"
+        >
+          <a-col :span="12">
+            <a-form-item field="inquiry_refund_no" label="退款编号：">
+              <span>{{
+                modalForm.order_product_refund.product_refund_no
+              }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item field="escrow_trade_no" label=" 第三方订单编号：">
+              <span>{{ modalForm.order_product_refund.refund_id }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24" v-if="modalForm.order_product_refund">
+          <a-col :span="12">
+            <a-form-item field="inquiry_refund_no" label="退款金额：">
+              <span>{{ modalForm.order_product_refund.refund_total }}元</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item field="escrow_trade_no" label="退款状态：">
+              <span>{{
+                formatRefundStatus(
+                  modalForm.order_product_refund.product_refund_status
+                )
+              }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24" v-if="modalForm.order_product_refund">
+          <a-col :span="24">
+            <a-form-item field="inquiry_refund_no" label="退款时间：">
+              <span v-if="parseTime(modalForm.order_product_refund.success_time)">{{ modalForm.order_product_refund.success_time }}</span>
+              <span v-else>-</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24" v-if="modalForm.order_product_refund">
+          <a-col :span="24">
+            <a-form-item field="inquiry_refund_no" label="退款原因：">
+              <span>{{ modalForm.order_product_refund.refund_reason }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-divider v-if="modalForm.order_product_refund" />
+        <div class="titlebox" v-if="modalForm.order_product_item.length > 0">
+          <div class="bar"></div>
+          <div class="name">药品信息</div>
+        </div>
+        <a-row
+          :gutter="24"
+          style="margin-top: 35px"
+          v-if="modalForm.order_product_item.length > 0"
+        >
+          <a-col :span="24">
+            <a-form-item field="license_cert" :hide-label="true">
+              <a-list>
+                <a-list-item
+                  v-for="item in modalForm.order_product_item"
+                  :key="item.product_item_id"
+                >
+                  <a-list-item-meta
+                    :title="item.product_name + item.product_spec"
+                    :description="item.manufacturer + '*' + item.amount"
+                  >
+                    <template #avatar>
+                      <a-avatar shape="square">
+                        <img
+                          alt="avatar"
+                          src="https://p1-arco.byteimg.com/tos-cn-i-uwbnlip3yd/3ee5f13fb09879ecb5185e440cef6eb9.png~tplv-uwbnlip3yd-webp.webp"
+                        />
+                      </a-avatar>
+                    </template>
+                  </a-list-item-meta>
+                </a-list-item>
+              </a-list>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-divider v-if="modalForm.order_product_item.length > 0" />
+        <div class="titlebox">
+          <div class="bar"></div>
+          <div class="name">地址信息</div>
+          <a-space
+            style="
+              margin-right: 8px;
+              flex: 1;
+              display: flex;
+              justify-content: flex-end;
+            "
+          >
+            <a-button type="primary" status="warning" @click="toggleAddress"
+              >{{lookAllAddress?'隐藏完整地址信息':'查看完整地址信息'}}</a-button
+            >
+          </a-space>
+        </div>
+       <a-row :gutter="24"  style="margin-top: 35px">
+            <a-col :span="12">
+              <a-form-item field="inquiry_no" label="收货人姓名：">
+                <span v-if="!lookAllAddress"> {{ modalForm.consignee_name_mask}}</span>
+                <span v-else>{{AddressData.consignee_name}}</span>
+              </a-form-item>
+            </a-col> 
+            <a-col :span="12">
+              <a-form-item field="inquiry_no" label="收货人电话：">
+                <span v-if="!lookAllAddress"> {{modalForm.consignee_tel_mask}}</span>
+                <span v-else>{{AddressData.consignee_tel}}</span>
+              </a-form-item>
+            </a-col> 
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="24">
+              <a-form-item field="inquiry_no" label="收货人地址：">
+                <span v-if="!lookAllAddress"> {{modalForm.address_mask }}</span>
+                <span v-else>{{AddressData.address}}</span>
+              </a-form-item>
+            </a-col> 
+      </a-row> 
+        <a-divider />
+        <div class="titlebox">
+          <div class="bar"></div>
+          <div class="name">物流信息</div>
+        </div>
+        <a-row :gutter="24" style="margin-top: 35px">
+          <a-col :span="24">
+            <a-form-item field="license_cert" :hide-label="true">
+              <div class="timeline" v-if="modalForm.order_product_logistics">
+                <a-timeline>
+                  <a-timeline-item
+                    :label="item.time"
+                    :dotColor="formatColor(item.status)"
+                    v-for="item in cur_express"
+                  >
+                    {{ item.context }}
+                  </a-timeline-item>
+                </a-timeline>
+                <a-button @click="toggleExpand" class="expand">{{
+                  isExpand ? '收起' : '展开'
+                }}</a-button>
+              </div>
+              <div v-else>暂无物流信息</div>
+            </a-form-item>
+          </a-col>
+        </a-row>
+
+        <a-divider />
+      <div class="titlebox" v-if="modalForm.order_prescription">
+        <div class="bar"></div>
+        <div class="name">处方信息</div>
+      </div>
+      <a-row
+        :gutter="24"
+        style="margin-top: 35px"
+        v-if="modalForm.order_prescription"
+      >
+        <a-col :span="24">
+          <a-form-item field="license_cert" :hide-label="true">
+            <tableUnit
+              :pagination="false"
+              :columns="modalForm.chufang_columns"
+              :data="modalForm.chufang_data"
+            ></tableUnit>
+            <!-- <prescription :data="modalForm.order_prescription"></prescription> -->
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-divider v-if="modalForm.order_prescription" />
+      <div class="titlebox" v-if="modalForm.user_doctor">
+        <div class="bar"></div>
+        <div class="name">医生信息</div>
+        <a-space
+          style="
+            margin-right: 8px;
+            flex: 1;
+            display: flex;
+            justify-content: flex-end;
+          "
+        >
+          <a-button type="primary" @click="openDcotor"
+            >查看医生完整信息</a-button
+          >
+        </a-space>
+      </div>
+      <a-row :gutter="24" style="margin-top: 35px">
+        <a-col :span="24">
+          <a-form-item field="license_cert" :hide-label="true">
+            <div class="doctorInfo" v-if="modalForm.user_doctor">
+              <a-space size="large">
+                <a-image
+                  width="80"
+                  height="80"
+                  class="headImg"
+                  :src="modalForm.user_doctor.avatar"
+                  v-if="modalForm.user_doctor.avatar"
+                >
+                </a-image>
+                <a-image
+                  width="80"
+                  height="80"
+                  class="headImg"
+                  src="https://img.applets.igandanyiyuan.com/basic/file/doctor_avatar.png"
+                  v-else
+                >
+                </a-image>
+              </a-space>
+              <div class="infobox">
+                <div class="name">
+                  {{ modalForm.user_doctor.user_name }}&nbsp;&nbsp;{{
+                    formatDoctorTitle(modalForm.user_doctor.doctor_title)
+                  }}
+                </div>
+                <div class="hospital">
+                  {{
+                    modalForm.user_doctor.hospital.hospital_name
+                  }}&nbsp;&nbsp;{{
+                    modalForm.user_doctor.department_custom_name
+                  }}
+                </div>
+              </div>
+            </div>
+            <div class="doctorInfo" v-else>暂未分配到医生</div>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-divider v-if="modalForm.user_doctor" />
+      <div class="titlebox">
+        <div class="bar"></div>
+        <div class="name">就诊人信息</div>
+        <a-space
+          style="
+            margin-right: 8px;
+            flex: 1;
+            display: flex;
+            justify-content: flex-end;
+          "
+        >
+          <a-button type="primary" status="warning" @click="openPatient"
+            >查看就诊人完整信息</a-button
+          >
+        </a-space>
+      </div>
+      <a-row :gutter="24"  style="margin-top: 35px" v-if="modalForm.order_inquiry_case">
+        <a-col :span="24">
+          <a-form-item  label="就诊人姓名：">
+            <span>{{modalForm.order_inquiry_case.name }}&nbsp;&nbsp;（{{modalForm.order_inquiry_case.sex == 1 ? '男' : '女'}}&nbsp;&nbsp;{{ modalForm.order_inquiry_case.age }}岁）</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+       <a-row :gutter="24" v-if="modalForm.order_inquiry_case">
+        <a-col :span="24">
+              <a-form-item field="inquiry_no" label="病情描述：">
+                <span>{{modalForm.order_inquiry_case.disease_desc}}</span>
+              </a-form-item>
+            </a-col> 
+      </a-row>
+      <a-row :gutter="24" v-if="modalForm.order_inquiry_case">
+        <a-col :span="24">
+              <a-form-item field="inquiry_no" label="确诊疾病：">
+                <span>{{modalForm.order_inquiry_case.disease_class_name}}&nbsp;&nbsp;{{modalForm.user_doctor.department_custom_name}}</span>
+              </a-form-item>
+            </a-col> 
+      </a-row> 
+      <a-divider />
+      <div class="titlebox">
+        <div class="bar"></div>
+        <div class="name">处方上报状态</div>
+      </div>
+      <a-row :gutter="24"  style="margin-top: 35px">
+        <a-col :span="24">
+              <a-form-item field="inquiry_no" label="上报状态：">
+                <span> {{ fromatReportStatus(modalForm.report_pre_status) }}</span>
+              </a-form-item>
+            </a-col> 
+      </a-row>
+      <a-row :gutter="24" >
+        <a-col :span="24">
+              <a-form-item field="inquiry_no" label="上报时间：">
+                <span v-if="parseTime(modalForm.report_pre_time)"> {{modalForm.report_pre_time}}</span>
+                <span v-else>-</span>
+              </a-form-item>
+            </a-col> 
+      </a-row>
+      <a-row :gutter="24" v-if="modalForm.report_pre_fail_reason">
+        <a-col :span="24" >
+              <a-form-item field="inquiry_no" label="上报失败原因：">
+                <span> {{ modalForm.report_pre_fail_reason}}</span>
+              </a-form-item>
+            </a-col> 
+      </a-row>
+      <a-divider />
+      </a-form>
+
+      <div class="titlebox">
+        <div class="bar"></div>
+        <div class="name">操作</div>
+      </div>
+      <a-row :gutter="24" style="margin-top: 35px">
+        <a-col :span="24">
+          <a-form-item field="" label="" no-style>
+            <a-space
+              style="margin-right: 8px"
+              v-if="modalForm.report_pre_status == 2 && modalForm.refund_status!=2 &&  modalForm.refund_status!=3"
+            >
+              <a-button
+                type="primary"
+                v-has="'admin:sysProductList:report'"
+                @click="
+                  () => {
+                    isVisible = true;
+                    order_product_id = modalForm.order_product_id;
+                  }
+                "
+                >上报处方平台</a-button
+              >
+            </a-space>
+            <!-- 订单状态=2退款状态=4，5支付状态=2上报状态!=1 -->
+            <a-space
+              style="margin-right: 8px"
+              v-if="
+                (modalForm.order_product_status == 2 && modalForm.pay_status==2
+                 && (modalForm.refund_status==4 || modalForm.refund_status==5 || modalForm.refund_status==0) &&
+                modalForm.report_pre_status != 1 ) 
+              "
+            >
+              <a-button
+                type="primary"
+                v-has="'admin:sysProductList:cancel'"
+                status="danger"
+                @click="
+                  () => {
+                    okVisible = true;
+                    cur_product_id = modalForm.order_product_id;
+                  }
+                "
+                >取消药品订单</a-button
+              >
+            </a-space>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-modal>
+     <!-- 医生详情弹框 -->
+     <doctorModal
+      :doctorVisible="doctorVisible"
+      :doctor_id="doctor_id"
+      @doctorVisibleChange="
+        () => {
+          doctorVisible = false;
+          doctor_id = '';
+        }
+      "
+    ></doctorModal>
+    <!-- 患者详情弹窗 -->
+    <patientModal
+      :patientVisible="patientVisible"
+      :data="modalForm.patientData"
+      @patientVisibleChange="
+        () => {
+          patientVisible = false;
+        }
+      "
+    ></patientModal>
+    <confirmModal
+      :okVisible="okVisible"
+      :api="cancelProduct"
+      :dealType="'order_inquiry_id'"
+      :id="cur_product_id"
+      @closeChange="closeChange"
+    ></confirmModal>
+    <isOkModal
+      :isVisible="isVisible"
+      :api="reportPrePscription"
+      :title="'确定上报处方吗？'"
+      :dealType="'order_product_id'"
+      :id="order_product_id"
+      @closeChangeOk="closeChangeOk"
+    ></isOkModal>
+</template>
+<script setup>
+import {reactive,ref,getCurrentInstance,watch,toRefs} from 'vue';
+import { parseTime } from '@/utils/parseTime';
+import {
+  formatDoctorTitle,
+  fromatReportStatus,
+  formatPrescriptionStatus,
+  formatPharmacistStatus,
+  formatProductCancelReason,
+} from '@/utils/format';
+import {lookAddress,cancelProduct,reportPrePscription} from '@/api/order/list';
+const IMG_URL = import.meta.env.VITE_IMG_URL;
+const emits = defineEmits(['medinceVisibleChange']);
+const AddressData=reactive({});
+const getAddress= async (order_product_id)=>{
+  const{data,code}= await lookAddress(order_product_id);
+ if(code==200){
+   Object.assign(AddressData,data)
+ }
+}
+const props = defineProps({
+  // 是否显示
+  medinceVisible: {
+    type: Boolean,
+    default: false,
+  },
+  modalTitle:{
+    type: String,
+    default:'就诊人详情'
+  },
+  modalForm: {
+    type: Object,
+    default:{
+      order_product_refund: {},
+    order_product_item: [],
+    order_product_logistics: null,
+    user_doctor: null,
+    express:[],
+    patientData:{},
+    order_prescription: null,
+   }
+  },
+});
+const cur_express=ref([]);
+
+const isExpand = ref(false);
+const lookAllAddress=ref(false);
+
+const doctorVisible = ref(false);
+const doctor_id = ref('');
+
+const patientVisible = ref(false);
+
+const okVisible = ref(false);
+const cur_product_id = ref('');
+
+const isVisible = ref(false);
+const order_product_id= ref('');
+const {medinceVisible,modalForm} = toRefs(props);
+watch(()=>props.modalForm,(newValue,oldValue)=>{
+  cur_express.value = props.modalForm.express.length > 1 && props.modalForm.express.slice(0, 1);
+  console.log(props.modalForm);
+  if(props.modalForm.order_product_id){
+    getAddress(props.modalForm.order_product_id)
+  }
+},{immediate:true,deep:true})
+const toggleExpand = () => {
+  isExpand.value = !isExpand.value;
+  if (isExpand.value) {
+    cur_express.value =props.modalForm.express.slice(0, -1);
+  } else {
+    cur_express.value = props.modalForm.express.slice(0, 1);
+  }
+};
+const toggleAddress=()=>{
+  lookAllAddress.value=!lookAllAddress.value;
+}
+
+const openPatient = () => {
+  //Object.assign(patientData, modalForm.order_inquiry_case);
+  patientVisible.value = true;
+};
+
+const openDcotor=()=>{
+  doctor_id.value=props.modalForm.user_doctor.doctor_id;
+ doctorVisible.value=true
+}
+
+//关闭确认框
+const closeChange = (data) => {
+  cur_product_id.value = '';
+  okVisible.value = false;
+};
+//关闭上传处方平台弹框
+const closeChangeOk = (data) => {
+  order_product_id.value = '';
+  isVisible.value = false;
+
+};
+
+const handleClose=()=>{
+  emits('medinceVisibleChange', (medinceVisible.value = false));
+}
+const formatProductStatus = (val) => {
+  //订单状态（<!-- 1:待支付 2:待发货 3:已发货 4:已签收 5:已取消 -->
+  let data = {
+    1: '待支付',
+    2: '待发货',
+    3: '已发货',
+    4: '已签收',
+    5: '已取消',
+  };
+  if (val) {
+    return data[val];
+  } else {
+    return '';
+  }
+};
+const formatRefundStatus = (val) => {
+  //问诊订单退款状态（0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭 6:退款异常）
+  let data = {
+    0: '无退款',
+    1: '申请退款',
+    2: '退款中',
+    3: '退款成功',
+    4: '拒绝退款',
+    5: '退款关闭',
+    6: '退款异常',
+  };
+  if (val || val == 0) {
+    return data[val];
+  } else {
+    return '';
+  }
+};
+const formatColor = (value) => {
+  if (value == '签收') {
+    return '#00B42A';
+  } else {
+    return 'var(--color-fill-4)';
+  }
+};
+</script>
+<style scoped>
+.headImg {
+    margin-right: 20px;
+    border-radius: 50%;
+    width: 80px;
+    height: 80px;
+}
+.doctorInfo {
+    display: flex;
+    align-items: center;
+}
+.infobox {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/patientModal.vue b/src/components/patientModal.vue
index ae9a9ef..2869190 100644
--- a/src/components/patientModal.vue
+++ b/src/components/patientModal.vue
@@ -127,13 +127,16 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  modalTitle:{
+    type: String,
+    default:'就诊人详情'
+  },
   data: {
     type: Object,
   },
 });
 const emits = defineEmits(['patientVisibleChange']);
-const { patientVisible, data } = toRefs(props);
-const modalTitle = ref('就诊人详情');
+const { patientVisible, data,modalTitle } = toRefs(props);
 const modalSatus = ref('detail');
 const loading = ref(false);
 
@@ -256,4 +259,10 @@ const handleClose = () => {
   patientVisible.value = false;
   //otherList.value=[];
 };
-</script>
\ No newline at end of file
+</script>
+<style scoped>
+.row{
+  display: flex;
+  line-height: 32px;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/prescriptionModal.vue b/src/components/prescriptionModal.vue
new file mode 100644
index 0000000..9285ff7
--- /dev/null
+++ b/src/components/prescriptionModal.vue
@@ -0,0 +1,396 @@
+<template>
+    <!-- Modal -->
+    <a-modal v-model:visible="modalVisible" fullscreen title="处方详情" title-align="start" :footer="false"
+          @cancel="handleClose">
+         <div class="titlebox">
+           <div class="bar"></div>
+           <div class="name">基本信息</div>
+         </div>
+         <a-form :model="modalForm"    ref="modalFormRef" :auto-label-width="true">
+           <a-row :gutter="24" style="margin-top: 35px;">
+             <a-col :span="12">
+               <a-form-item field="avatar" label="订单编号：">
+                 <span>{{modalForm.order_prescription_id}}</span>
+               </a-form-item>
+             </a-col>
+             <a-col :span="12">
+               <a-form-item field="idCard" label="处方状态：" >
+                 <div class="box" >
+                   <div class="cardNum">{{formatPrescriptionStatus(modalForm.prescription_status)}}</div>
+                 </div>
+               </a-form-item>
+             </a-col>
+           </a-row>
+           <a-row :gutter="24" >
+             <a-col :span="12">
+               <a-form-item field="idCard" label="开方医生：" >
+                 <div class="box" >{{ modalForm.doctor_name }} </div>
+               </a-form-item>
+             </a-col>
+             <a-col :span="12">
+               <a-form-item field="idCard" label="审方药师：" >
+                 <div class="box" >{{modalForm.pharmacist_name}} </div>
+               </a-form-item>
+             </a-col>
+           </a-row>
+           <a-row :gutter="24" >
+             <a-col :span="12">
+               <a-form-item field="idCard" label="就 诊  人：" >
+                 <div class="box" >{{  modalForm.patient_name}}</div>
+               </a-form-item>
+             </a-col>
+           </a-row>
+           <a-row :gutter="24" >
+             <a-col :span="12">
+               <a-form-item field="idCard" label="开方时间：" >
+                 <div class="box" > {{ modalForm.doctor_created_time }}</div>
+               </a-form-item>
+             </a-col>
+             <a-col :span="12">
+               <a-form-item field="idCard" label="审方时间：" >
+                 <div class="box" > {{ modalForm.pharmacist_verify_time }}</div>
+               </a-form-item>
+             </a-col>
+           </a-row>
+           <a-row :gutter="24" >
+             <a-col :span="12">
+               <a-form-item field="idCard" label="诊断：" >
+                 <div class="box" >{{ modalForm.order_prescription_icd }} </div>
+               </a-form-item>
+             </a-col>
+           </a-row>
+           <a-row :gutter="24" >
+             <a-col :span="12">
+               <a-form-item field="idCard" label="用法用量：" >
+                 <span class="box" v-for="item in modalForm.order_prescription_product"> {{ item.product_name
+ }}【{{item.frequency_use}}】</span>
+               </a-form-item>
+             </a-col>
+           </a-row>
+           <a-row :gutter="24" >
+             <a-col :span="12">
+               <a-form-item field="idCard" label="医嘱：" >
+                 <div class="box" >{{ modalForm.doctor_advice }}</div>
+               </a-form-item>
+             </a-col>
+           </a-row>
+           <a-divider />
+           <div class="titlebox">
+           <div class="bar"></div>
+           <div class="name">药品信息</div>
+         </div>
+           <a-row :gutter="24" style="margin-top: 35px;">
+             <a-col :span="24">
+               <a-form-item field="avatar" :hide-label="true">
+                <a-list>
+                <a-list-item
+                  v-for="item in modalForm.order_prescription_product"
+                  :key="item.product_item_id"
+                >
+                  <a-list-item-meta
+                    :title="item.product_name + item.product_spec"
+                    :description="item.manufacturer + '*' + item.prescription_product_num
+"
+                  >
+                    <template #avatar>
+                      <a-avatar shape="square">
+                        <img
+                          alt="avatar"
+                          src="https://p1-arco.byteimg.com/tos-cn-i-uwbnlip3yd/3ee5f13fb09879ecb5185e440cef6eb9.png~tplv-uwbnlip3yd-webp.webp"
+                        />
+                      </a-avatar>
+                    </template>
+                  </a-list-item-meta>
+                </a-list-item>
+              </a-list>
+               </a-form-item>
+             </a-col>
+           </a-row>
+           <a-divider />
+           <div class="titlebox">
+           <div class="bar"></div>
+           <div class="name">处方信息</div>
+         </div>
+           <a-row :gutter="24" style="margin-top: 35px;">
+             <a-col :span="24">
+                <a-form-item field="" :hide-label="true">
+            <tableUnit
+              :pagination="false"
+              :columns="chufang_columns"
+              :data="chufang_data"
+            ></tableUnit>
+            <!-- <prescription :data="modalForm.order_prescription"></prescription> -->
+          </a-form-item>
+             </a-col>
+           </a-row>
+           <a-divider />
+           <div class="titlebox">
+             <div class="bar"></div>
+             <div class="name">病例信息</div>
+             <a-space
+          style="
+            margin-right: 8px;
+            flex: 1;
+            display: flex;
+            justify-content: flex-end;
+          "
+        >
+          <a-button type="primary" status="warning" @click="openPatient"
+            >查看完整病例信息</a-button
+          >
+        </a-space>
+           </div>
+           <a-row :gutter="24"  style="margin-top: 35px" v-if="modalForm.order_inquiry_case">
+        <a-col :span="24">
+          <a-form-item  label="就诊人姓名：">
+            <span>{{modalForm.order_inquiry_case.name }}&nbsp;&nbsp;（{{modalForm.order_inquiry_case.sex == 1 ? '男' : '女'}}&nbsp;&nbsp;{{ modalForm.order_inquiry_case.age }}岁）</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+       <a-row :gutter="24" v-if="modalForm.order_inquiry_case">
+        <a-col :span="24">
+              <a-form-item field="inquiry_no" label="病情描述：">
+                <span>{{modalForm.order_inquiry_case.disease_desc}}</span>
+              </a-form-item>
+            </a-col> 
+      </a-row>
+      <!-- <a-row :gutter="24" v-if="modalForm.order_inquiry_case">
+        <a-col :span="24">
+              <a-form-item field="inquiry_no" label="确诊疾病：">
+                <span>{{modalForm.order_inquiry_case.disease_class_name}}&nbsp;&nbsp;{{modalForm.user_doctor.department_custom_name}}</span>
+              </a-form-item>
+            </a-col> 
+      </a-row>  -->
+           <a-divider />
+   
+         </a-form>
+        <div class="titlebox" >
+           <div class="bar"></div>
+           <div class="name">操作</div>
+         </div>
+         <a-row :gutter="24" style="margin-top: 35px;" >
+           <a-col :span="24">
+             <a-form-item field="" label="" no-style>
+              <!--  -->
+               <a-space style="margin-right: 8px;" v-if="modalForm.prescription_status==4">
+                 <a-button type="primary"  @click="lookMedince" v-has="'admin:sysPrescriptionList:vieworder'">查看订单</a-button>
+               </a-space>
+               <a-space >
+                 <a-button type="primary" status="danger" @click="downloadFile(downloadUrl)" v-has="'admin:sysPrescriptionList:download'" >下载</a-button>
+               </a-space>
+             </a-form-item>
+           </a-col>
+         </a-row>
+       </a-modal>
+        <!-- 患者详情弹窗 -->
+     <patientModal
+      :patientVisible="patientVisible"
+      :data="patientData"
+      :modalTitle="'病例详情'"
+      @patientVisibleChange="
+        () => {
+          patientVisible = false;
+        }
+      "
+    ></patientModal>
+    <medinceModal :medinceVisible="medinceVisible" :modalForm="medinceData" @medinceVisibleChange="()=>{medinceVisible=false}"></medinceModal>
+   </template>
+   <script setup>
+   import {ref,toRefs,reactive,watchEffect,watch} from 'vue';
+   import {getCase} from '@/api/prescription/list';
+   import { getProductDetail,inquiryCase} from '@/api/order/list';
+//    import {
+//   productList,
+//   getProductDetail,
+//   cancelProduct,
+//   reportPrePscription,
+//   lookAddress,
+//   inquiryCase
+// } from '@/api/order/list';
+   import {formatPrescriptionStatus, formatPharmacistStatus} from "@/utils/format"
+   const IMG_URL = import.meta.env.VITE_IMG_URL;
+   const props = defineProps({
+     // 是否显示
+     modalVisible: {
+       type: Boolean,
+       default: false,
+     },
+     modalForm: {
+       type: Object,
+       default:{
+        order_inquiry_case:{
+          order_prescription_id:''
+        },
+        user_doctor:{}
+       }
+     },
+   });
+   let express = []; //物流信息；
+   const cur_express = ref([]);
+   const patientVisible=ref(false);
+   const patientData=reactive({});
+   const medinceVisible=ref(false);
+   let chufang_data = ref([]);
+const chufang_columns = reactive([
+  {
+    title: '处方编号',
+    dataIndex: 'prescription_code',
+  },
+  {
+    title: '处方状态',
+    dataIndex: 'prescription_status',
+  },
+  {
+    title: '药师审核状态',
+    dataIndex: 'pharmacist_audit_status',
+  },
+  {
+    title: '医嘱',
+    dataIndex: 'doctor_advice',
+  },
+  {
+    title: '药师驳回原因',
+    dataIndex: 'pharmacist_fail_reason',
+  },
+  {
+    title: '处方链接',
+    dataIndex: 'url',
+    slotName: 'url',
+  },
+]);
+ const downloadUrl=ref('')
+   const emits = defineEmits(['familyVisibleChange']);
+   const {modalVisible,modalForm} = toRefs(props);
+   watch(modalForm.value,()=>{
+       let data_arr = [{}];
+      chufang_columns.forEach((item) => {
+        if (item.dataIndex == 'prescription_status') {
+          data_arr[0][item.dataIndex] = formatPrescriptionStatus(
+            modalForm.value[item.dataIndex]
+          );
+        } else if (item.dataIndex == 'pharmacist_audit_status') {
+          data_arr[0][item.dataIndex] = formatPharmacistStatus(
+            modalForm.value[item.dataIndex]
+          );
+        } else if (item.dataIndex == 'url') {
+          data_arr[0][item.dataIndex] =
+            IMG_URL +
+            '/applet/prescription/' +
+            modalForm.value.order_prescription_id +
+            '.pdf';
+            downloadUrl.value=data_arr[0][item.dataIndex];
+        } else if (item.dataIndex == 'pharmacist_fail_reason') {
+          data_arr[0][item.dataIndex] = modalForm.value[item.dataIndex]
+            ? modalForm.value[item.dataIndex]
+            : '暂无';
+        } else {
+          data_arr[0][item.dataIndex] =modalForm.value[item.dataIndex];
+        }
+      });
+      chufang_data.value= data_arr;
+    
+   },{immediate:true,deep:true})
+  const handleGetCase=()=>{
+    getCase(modalForm.value.order_inquiry_case.inquiry_case_id
+).then(data=>{
+  if(data.code==200){
+    Object.assign(patientData,data.data)
+    }
+    })
+  }
+   const medinceData=reactive({
+      order_product_refund: {},
+    order_product_item: [],
+    order_product_logistics: null,
+    user_doctor: null,
+    express:[],
+    order_prescription: null,
+    order_product_id:'',
+    patientData:{}
+   })
+  const lookMedince=()=>{
+    medinceVisible.value=true;
+     getDetail(modalForm.value.order_product_id);
+  };
+
+  //药品详情
+  const getDetail = async (order_product_id) => {
+  chufang_data.vlaue=[];
+  Object.assign(patientData,{});
+  const { code, data, message } = await getProductDetail(order_product_id);
+  if (code == 200) {
+    Object.assign(medinceData, data);
+    let result = data.order_prescription;
+    express = data.order_product_logistics
+      ? JSON.parse(data.order_product_logistics.logistics_content)
+      : [];
+    //cur_express.value = express.length > 1 && express.slice(0, 1);
+   
+    if(data.order_inquiry_case && data.order_inquiry_case.inquiry_case_id){
+        const caseInfo= await inquiryCase(data.order_inquiry_case.inquiry_case_id);
+        Object.assign(patientData,caseInfo.data);
+
+      }
+  }
+   medinceData.chufang_columns=chufang_columns;
+    medinceData.chufang_data=chufang_data.value;
+    medinceData.express= express;//cur_express.value;
+    medinceData.order_product_id=order_product_id;
+    medinceData.patientData=patientData;
+};
+
+   // Akiraka 20230210 关闭弹窗
+   const handleClose = () => {
+     emits('familyVisibleChange', false);
+   };
+   const openPatient=() =>{
+    handleGetCase();
+    patientVisible.value=true;
+   }
+   const downloadFile=(fileUrl)=>{
+    const request = new XMLHttpRequest()
+    request.open('GET', fileUrl)
+    request.responseType = 'blob'
+    request.onload = (res) => {
+        if (res.target.status == 200) {
+            const url = window.URL.createObjectURL(res.currentTarget.response)
+            const link = document.createElement('a')
+            link.href = url
+            link.setAttribute('download', '处方'+new Date().getTime())
+            link.click()
+        }
+    }
+    request.send()
+}
+
+   </script>
+   <style scoped>
+     .cardNum {
+       width: 150px;
+     }
+    .arco-form-item-layout-horizontal:first-child,
+     .arco-form-item-layout-horizontal:nth-child(2) {
+       align-items: center;
+     }
+     .cellbox{
+       margin-top: 35px;
+     }
+     .cellbox .cell{
+       width:50%;
+       border-bottom:1px dashed #efefef;
+       margin-bottom: 20px;
+     }
+     .cellbox .cell:first-child{
+       border: none;
+     }
+    
+     .box {
+       display: flex;
+       align-items: center;
+     }
+   
+     .cert .arco-form-item-label-col {
+       flex: 0 0 8px !important;
+     }
+   
+   </style>
\ No newline at end of file
diff --git a/src/utils/format.js b/src/utils/format.js
index b4c5fd3..badd837 100644
--- a/src/utils/format.js
+++ b/src/utils/format.js
@@ -69,4 +69,23 @@ export const formatRelation=(val)=>{
       }else{
        return ''
       }
+ }
+
+ export const formatInquiryType=(val)=>{
+   //类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药 5:检测）
+   let data={1:'专家问诊', 2:'快速问诊', 3:'公益问诊', 4:'问诊购药',5:'糖组检测'}
+      if(val){
+       return data[val]
+      }else{
+       return ''
+      }
+ }
+ export const formatInquiryStatus=(val)=>{
+   // 1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消
+   let data={1:'待支付', 2:'待分配', 3:'待接诊', 4:'已接诊',5:'已完成',6:'已结束',7:'已取消'}
+      if(val){
+       return data[val]
+      }else{
+       return ''
+      }
  }
\ No newline at end of file
diff --git a/src/views/admin/sys-menu/index.vue b/src/views/admin/sys-menu/index.vue
index 6e3f739..5c6dd05 100644
--- a/src/views/admin/sys-menu/index.vue
+++ b/src/views/admin/sys-menu/index.vue
@@ -286,6 +286,9 @@ const handleSubmit = (done) => {
         };
       if (!modalForm.menu_id) {
         console.log("dasdasd",modalForm)
+        if(modalForm.menu_type==''){
+           modalForm.menu_type=0;
+        };
         const {code,message} = await addMenu(modalForm);
         if (code==200) {
           proxy.$message.success('新增成功');
diff --git a/src/views/doctor/doctor-examine/index.vue b/src/views/doctor/doctor-examine/index.vue
index 4c51116..405a901 100644
--- a/src/views/doctor/doctor-examine/index.vue
+++ b/src/views/doctor/doctor-examine/index.vue
@@ -701,6 +701,7 @@
         const { data, code, message } = res;
         if (code == 200) {
           departmentData.value = data;
+  
         }
       });
     }
diff --git a/src/views/doctor/doctor-list/index.vue b/src/views/doctor/doctor-list/index.vue
index faa8933..542abeb 100644
--- a/src/views/doctor/doctor-list/index.vue
+++ b/src/views/doctor/doctor-list/index.vue
@@ -945,7 +945,7 @@
     { title: '多点审核状态', dataIndex: 'multi_point_status', slotName: 'multi_point_status', width: 140 },
     { title: '是否推荐', dataIndex: 'is_recommend', slotName: 'is_recommend' },
     { title: '深度合作', dataIndex: 'is_platform_deep_cooperation', slotName: 'is_platform_deep_cooperation' },
-    { title: '申请人', dataIndex: 'user_name' },
+    { title: '申请人', dataIndex: 'created_by' },
     { title: '审核状态', dataIndex: 'iden_auth_status', slotName: 'iden_auth_status' },
     { title: '实名认证', dataIndex: 'idcard_status', slotName: 'iden_auth_status' },
     
diff --git a/src/views/inquiry/inquiry-list/index.vue b/src/views/inquiry/inquiry-list/index.vue
new file mode 100644
index 0000000..c54fe7e
--- /dev/null
+++ b/src/views/inquiry/inquiry-list/index.vue
@@ -0,0 +1,350 @@
+<template>
+    <div class="app-container">
+      <a-form :model="queryForm" ref="queryFormRef" layout="inline">
+  
+        <a-form-item field="user_name" label="账号名字">
+          <a-input :style="{ width: '182px' }" v-model="queryForm.user_name" placeholder="请输入账号或者姓名" @press-enter="handleQuery" />
+        </a-form-item>
+        <a-form-item field="mobile" label="电话号码">
+          <a-input :style="{ width: '182px' }" v-model="queryForm.mobile" placeholder="请输入电话号码" @press-enter="handleQuery" />
+        </a-form-item>
+        <!-- <a-form-item field="status" label="启用状态">
+          <a-select  v-model="queryForm.status" placeholder="请选择启用状态" :style="{ width: '182px' }">
+            <a-option :value="0">禁用</a-option>
+            <a-option :value="1">正常</a-option>
+            <a-option :value="2">删除</a-option>
+          </a-select>
+        </a-form-item> -->
+        <a-form-item field="create_range_time" label="创建时间范围">
+          <a-range-picker
+            style="width: 260px"
+            v-model="queryForm.create_range_time"
+          />
+        </a-form-item>
+        <a-form-item>
+          <a-space>
+            <a-button type="primary" @click="handleQuery"><icon-search /> 搜索</a-button>
+            <a-button @click="handleResetQuery"><icon-loop /> 重置</a-button>
+          </a-space>
+        </a-form-item>
+      </a-form>
+  
+      <a-divider />
+  
+      <!-- action -->
+      <!-- <div class="action">
+        <a-space>
+          <a-button v-has="'admin:sysFamilyList:add'" type="primary" @click="handleAdd"><icon-plus /> 新增 </a-button>
+          <a-button v-has="'admin:sysFamilyList:remove'" type="primary" status="danger"><icon-delete /> 批量删除 </a-button> 
+        </a-space>
+      </div> -->
+  
+      <!-- table -->
+      <a-table :columns="columns" :data="tableData" 
+        :row-selection="{ type: 'checkbox', showCheckedAll: true }"
+        :pagination="{ 'show-total': true, 'show-jumper': true, 'show-page-size': true, total: pager.total, current: currentPage }"
+        row-key="doctor_id" @selection-change="(selection) => {deleteData = selection;console.log(selection)}"
+        @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
+        <template #doctor_id="{record,rowIndex}">
+            <span>{{pager.page}}</span>
+          <div>{{(rowIndex+1)+(pager.page-1)*10}}</div>
+        </template>
+        <template #status="{ record }">
+          <!-- 状态（0:禁用 1:正常 2:删除） -->
+          <a-tag v-if="record.status == 0" color="#ffb400">禁用</a-tag>
+          <a-tag v-else-if="record.status == 1" color="green">正常</a-tag>
+          <a-tag v-else color="red">删除</a-tag>
+        </template>
+        <template #is_platform_deep_cooperation="{ record }">
+          <a-tag v-if="record.is_platform_deep_cooperation == 0" color="gray">否</a-tag>
+          <a-tag v-else color="green">是</a-tag>
+        </template>
+    
+        <template #disable_reason="{record}">
+          <div class="reason" v-if="record.disable_reason" :title="record.disable_reason">{{ record.disable_reason }}</div>
+          <div v-else>-</div>
+        </template>
+        <template #relation="{record}">
+          <div>{{formatRelation(record.relation)}}</div>
+         
+        </template>
+        <template #action="{ record }">
+          <a-space>
+            <a-button v-has="'admin:sysFamilyList:detail'" type="text"
+              @click="handleDetail(record)"><icon-book />详情</a-button>
+            <!-- <a-button v-has="'admin:sysFamilyList:edit'" type="text" @click="handleUpdate(record)"><icon-edit />
+              修改</a-button> -->
+            <!-- <a-button v-has="'admin:sysFamilyList:remove'" type="text"
+              @click="() => { deleteVisible = true; deleteData = [record.doctor_id];  }"><icon-delete /> 删除</a-button> -->
+          </a-space>
+        </template>
+      </a-table>
+  
+      <familyModal :modalVisible="modalVisible" :modalForm="modalForm" @familyVisibleChange="()=>{modalVisible=false}"></familyModal>
+      <!-- Akiraka 20230223 删除与批量删除 开始 -->
+      <!-- <DeleteModal :data="deleteData" :visible="deleteVisible" :apiDelete="removeFamily"
+        @deleteVisibleChange="() => deleteVisible = false" /> -->
+      <!-- Akiraka 20230223 删除与批量删除 结束 -->
+      <a-modal v-model:visible="okVisible" :modal-style="{width:'320px'}" body-class="okmodal" 
+        @cancel="()=>okVisible=false">
+        <template #title>
+          提示
+        </template>
+        <div>确定保存当前信息？</div>
+      </a-modal>
+    </div>
+  </template>
+  
+  <script setup>
+    import { reactive, ref, getCurrentInstance, onMounted, nextTick, watch, computed } from 'vue';
+    import { getInquiryList,getInquiryDetail} from '@/api/inquiry/list';
+    import {formatRelation} from "@/utils/format"
+  
+    // Akiraka 20230210 删除数据
+    const deleteData = ref([])
+    // Akiraka 20230210 删除对话框
+    const deleteVisible = ref(false)
+    // Akiraka 20230210 监听删除事件
+    const okVisible = ref(false);
+  
+    watch(() => deleteVisible.value, (value) => {
+      if (value == false) {
+        getInquiryInfo(pager);
+      }
+    });
+  
+    const file = ref();
+    const { proxy } = getCurrentInstance();
+    const currentPage = ref(1);
+    const family_data=ref([]);
+    const family_columns=ref([{
+      title: '编号',
+      dataIndex: 'code',
+      slotName:'code'
+    },{
+      title: '就诊人姓名',
+      dataIndex: 'card_name_mask',
+    },{
+      title: '身份证号',
+      dataIndex: 'id_number_mask',
+    },{
+      title: '与账号关系',
+      dataIndex: 'relation',
+      slotName:'relation'
+    },{
+      title: '添加时间',
+      dataIndex: 'created_at',
+      slotName:'created_at'
+    }, { title: '操作', slotName: 'action'}])
+    // Pager
+    const pager = {
+      total: 0,
+      page: 1,
+      page_size: 10,
+    };
+    // form
+    const queryForm = reactive({
+  
+    });
+    const modalForm = reactive({
+      user:{},
+      avatar: 'https://img.applets.igandanyiyuan.com/basic/file/patient_avatar.png',
+   
+    });
+    watch(() => queryForm.create_range_time,
+    (value) => {
+      if (value) {
+        let [startTime, endTime] = value;
+        queryForm.created_at = startTime + '&' + endTime;
+      } else {
+        queryForm.created_at = '';
+      }
+    }
+  );
+    // Modal
+    const modalVisible = ref(false);
+    const modalTitle = ref('默认标题');
+   
+    // Batch Del List
+    let batchList = [];
+  
+    // Table Columns
+    const columns = [
+      { title: '编号', dataIndex: 'doctor_id', slotName: 'doctor_id', width: '90' },
+      { title: '订单编号', dataIndex: 'inquiry_no',slotName: 'inquiry_type',width:200 },
+      { title: '服务分类', dataIndex: '服务分类',slotName: 'inquiry_type', width:200 },
+      { title: '坐班时间', dataIndex:'reception_time',slotName: 'reception_time',width:200 },
+      { title: '价格范围', dataIndex: 'relation', slotName: 'relation',width: 150 },
+       { title: '问诊价格', dataIndex: 'status', slotName: 'status' },
+      { title: '操作', slotName: 'action', fixed: "right", width: 180 },
+    ];
+  
+    // Table Data
+    const tableData = ref([]);
+    //弹框状态
+    const modalSatus = ref('add');
+  
+    // 新增Satus
+    const handleAdd = () => {
+      modalVisible.value = true;
+      modalTitle.value = '新增患者';
+      modalSatus.value = 'add';
+      modalForm.patient_id = null;
+    };
+  
+    //详情
+    const handleDetail = async (record) => {
+      const { code, data, message } = await getInquiryDetail(record.family_id);
+  
+      if (code == 200) {
+          Object.assign(modalForm, data);
+          modalVisible.value = true;
+        }
+      };
+    // 批量删除
+    const handleBatchDelete = () => {
+      if (batchList.length !== 0) {
+        proxy.$modal.warning({
+          title: '提示',
+          content: '是否批量删除以下选中的数据？',
+          hideCancel: false,
+          onOk: async () => {
+            const res = await removeFamily({ ids: batchList });
+            proxy.$message.success(res.message);
+            getInquiryInfo(pager);
+          },
+          onCancel: () => {
+            proxy.$message.info('已取消批量删除数据');
+          },
+        });
+      } else {
+        proxy.$message.error('请勾选需要删除的数据！');
+      }
+    };
+  
+    /**
+     * 分页改变
+     * @param {Number} [page]
+     */
+    const handlePageChange = (page) => {
+      pager.page = page;
+  
+      // 修改当前页码
+      currentPage.value = page;
+      getInquiryInfo({ ...pager, ...queryForm });
+    };
+  
+    // 每页数据量
+    const handlepage_sizeChange = (page_size) => {
+      pager.page_size = page_size;
+      getInquiryInfo({ ...pager, ...queryForm });
+    };
+  
+    // 获取患者信息
+    const getInquiryInfo = async (params = {}) => {
+        console.log(params)
+      const { data, code, message } = await getInquiryList(params);
+      if (code == 200) {
+        tableData.value = data.data;
+        Object.assign(pager, { total: data.total, page: data.page, page_size: data.page_size });
+      }
+    };
+  
+    // 查询患者信息
+    const handleQuery = async () => {
+      pager.page = 1;
+      const params = {
+        page: pager.page,
+        page_size: pager.page_size,
+        ...queryForm,
+      };
+  
+      getInquiryInfo(params);
+    };
+  
+    // 重置搜索
+    const handleResetQuery = () => {
+      proxy.$refs.queryFormRef.resetFields();
+      getInquiryInfo(queryForm);
+    }
+    
+    
+    onMounted(() => {
+      getInquiryInfo(pager);
+    });
+  </script>
+  
+  <style lang="scss" scoped>
+    .action {
+      margin-bottom: 12px;
+    }
+  
+    .okmodal div {
+      text-align: center;
+    }
+  
+    .hospital_name {
+      width: 140px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  
+    .headImg {
+      margin-right: 20px;
+      border-radius: 50%;
+      width: 80px;
+      height: 80px;
+    }
+  
+    .arco-form-item-layout-horizontal:first-child,
+    .arco-form-item-layout-horizontal:nth-child(2) {
+      align-items: center;
+    }
+    .cellbox{
+      margin-top: 35px;
+    }
+    .cellbox .cell{
+      width:50%;
+      border-bottom:1px dashed #efefef;
+      margin-bottom: 20px;
+    }
+    .cellbox .cell:first-child{
+      border: none;
+    }
+    .cell{
+      .arco-form-item{
+        margin-bottom: 10px;
+      }
+    }
+    .box {
+      display: flex;
+      align-items: center;
+    }
+  
+    .cert .arco-form-item-label-col {
+      flex: 0 0 8px !important;
+    }
+  
+    .red {
+      display: inline-block;
+      margin-right: 5px;
+      font-size: 14px;
+      color: red;
+      margin-top: 5px;
+    }
+  
+    .cardNum {
+      width: 148px;
+    }
+    .codbox{
+      display: flex;
+      align-items: center;
+    }
+    .reason{
+      width:250px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  </style>
\ No newline at end of file
diff --git a/src/views/order/inquiry-record/index.vue b/src/views/order/inquiry-record/index.vue
new file mode 100644
index 0000000..b4cc2a7
--- /dev/null
+++ b/src/views/order/inquiry-record/index.vue
@@ -0,0 +1,392 @@
+<template>
+    <div class="app-container">
+      <a-form :model="queryForm" ref="queryFormRef" layout="inline">
+  
+        <a-form-item field="inquiry_no" label="订单编号">
+          <a-input :style="{ width: '182px' }" v-model="queryForm.inquiry_no" placeholder="请输入问诊订单号" @press-enter="handleQuery" />
+        </a-form-item>
+        <a-form-item field="doctor_name" label="医生姓名">
+          <a-input :style="{ width: '182px' }" v-model="queryForm.doctor_name" placeholder="请输入问诊订单号" @press-enter="handleQuery" />
+        </a-form-item>
+        <a-form-item field="patient_name" label="就诊人姓名">
+          <a-input :style="{ width: '182px' }" v-model="queryForm.patient_name" placeholder="请输入就诊人姓名" @press-enter="handleQuery" />
+        </a-form-item>
+        <a-form-item field="mobile" label="电话号码">
+          <a-input :style="{ width: '182px' }" v-model="queryForm.mobile" placeholder="请输入医生或者患者电话号码" @press-enter="handleQuery" />
+        </a-form-item>
+        <a-row>
+        <a-form-item field="pay_range_time" label="支付时间范围">
+        <a-range-picker style="width: 330px;" v-model="queryForm.pay_range_time" />
+      </a-form-item>
+      <a-form-item field="complete_range_time" label="完成时间范围">
+        <a-range-picker style="width: 330px;" v-model="queryForm.complete_range_time" />
+      </a-form-item>
+      <a-form-item field="end_range_time" label="结束时间范围">
+        <a-range-picker style="width: 330px;" v-model="queryForm.end_range_time" />
+      </a-form-item>
+      <a-form-item field="cancel_range_time" label="取消时间范围">
+        <a-range-picker
+          style="width: 330px"
+          v-model="queryForm.cancel_range_time"
+        />
+      </a-form-item>
+      <a-form-item field="reception_range_time" label="接诊时间范围">
+        <a-range-picker
+          style="width: 330px"
+          v-model="queryForm.reception_range_time"
+        />
+      </a-form-item>
+      <a-form-item field="create_range_time" label="创建时间范围">
+        <a-range-picker
+          style="width: 330px"
+          v-model="queryForm.create_range_time"
+        />
+      </a-form-item>
+      <a-form-item>
+        <a-space>
+          <a-button type="primary" @click="handleQuery"><icon-search /> 搜索</a-button>
+          <a-button @click="handleResetQuery"><icon-loop /> 重置</a-button>
+        </a-space>
+      </a-form-item>
+      </a-row>
+      </a-form>
+  
+      <a-divider />
+  
+      <!-- action -->
+      <!-- <div class="action">
+        <a-space>
+          <a-button v-has="'admin:sysFamilyList:add'" type="primary" @click="handleAdd"><icon-plus /> 新增 </a-button>
+          <a-button v-has="'admin:sysFamilyList:remove'" type="primary" status="danger"><icon-delete /> 批量删除 </a-button> 
+        </a-space>
+      </div> -->
+  
+      <!-- table -->
+      <a-table :columns="columns" :data="tableData" 
+      :scroll="{ x: 1400 }"
+        :row-selection="{ type: 'checkbox', showCheckedAll: true }"
+        :pagination="{ 'show-total': true, 'show-jumper': true, 'show-page-size': true, total: pager.total, current: currentPage }"
+        row-key="doctor_id" @selection-change="(selection) => {deleteData = selection;console.log(selection)}"
+        @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
+        <template #doctor_id="{record,rowIndex}">
+          <div>{{(rowIndex+1)+(pager.page-1)*10}}</div>
+        </template>
+        <template #inquiry_type="{record}">
+          <div>{{formatInquiryType(record.inquiry_type)}}</div>
+        </template>
+        <template #inquiry_status="{record}">
+          <div>{{formatInquiryStatus(record.inquiry_status)}}</div>
+        </template>
+        <template #reception_time="{record}">
+          <div>{{parseTime(record.reception_time)}}</div>
+        </template>
+        <template #action="{ record }">
+          <a-space>
+            <a-button v-has="'admin:sysFamilyList:detail'" type="text"
+              @click="handleDetail(record)"><icon-book />详情</a-button>
+            <!-- <a-button v-has="'admin:sysFamilyList:edit'" type="text" @click="handleUpdate(record)"><icon-edit />
+              修改</a-button> -->
+            <!-- <a-button v-has="'admin:sysFamilyList:remove'" type="text"
+              @click="() => { deleteVisible = true; deleteData = [record.doctor_id];  }"><icon-delete /> 删除</a-button> -->
+          </a-space>
+        </template>
+      </a-table>
+  
+      <inquiryDetailModal :modalVisible="modalVisible" :modalForm="modalForm" @inquiryVisibleChange="()=>{modalVisible=false}"></inquiryDetailModal>
+    </div>
+  </template>
+  
+  <script setup>
+    import { reactive, ref, getCurrentInstance, onMounted, nextTick, watch, computed } from 'vue';
+    import { getInquiryList,getInquiryDetail} from '@/api/inquiry/list';
+    import {formatInquiryType,formatInquiryStatus} from "@/utils/format"
+    import { parseTime } from '@/utils/parseTime';
+    // Akiraka 20230210 删除数据
+    const deleteData = ref([])
+    // Akiraka 20230210 删除对话框
+    const deleteVisible = ref(false)
+    // Akiraka 20230210 监听删除事件
+    const okVisible = ref(false);
+  
+    watch(() => deleteVisible.value, (value) => {
+      if (value == false) {
+        getInquiryInfo(pager);
+      }
+    });
+  
+    const file = ref();
+    const { proxy } = getCurrentInstance();
+    const currentPage = ref(1);
+    const family_data=ref([]);
+    const family_columns=ref([{
+      title: '编号',
+      dataIndex: 'code',
+      slotName:'code'
+    },{
+      title: '就诊人姓名',
+      dataIndex: 'card_name_mask',
+    },{
+      title: '身份证号',
+      dataIndex: 'id_number_mask',
+    },{
+      title: '与账号关系',
+      dataIndex: 'relation',
+      slotName:'relation'
+    },{
+      title: '添加时间',
+      dataIndex: 'created_at',
+      slotName:'created_at'
+    }, { title: '操作', slotName: 'action'}])
+    // Pager
+    const pager = {
+      total: 0,
+      page: 1,
+      page_size: 10,
+    };
+    // form
+    const queryForm = reactive({
+  
+    });
+    const modalForm = reactive({
+      user:{},
+      avatar: 'https://img.applets.igandanyiyuan.com/basic/file/patient_avatar.png',
+   
+    });
+    watch(()=>queryForm.end_range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.finish_time=startTime+"&"+endTime;
+  }else{
+    queryForm.finish_time=''
+  };
+  console.log(queryForm.finish_time)
+})
+watch(()=>queryForm.pay_range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.pay_time=startTime+"&"+endTime;
+  }else{
+    queryForm.pay_time=''
+  };
+})
+watch(()=>queryForm.complete_range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.complete_time=startTime+"&"+endTime;
+  }else{
+    queryForm.complete_time=''
+  };
+})
+watch(()=>queryForm.cancel_range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.cancel_time=startTime+"&"+endTime;
+  }else{
+    queryForm.cancel_time=''
+  };
+})
+watch(()=>queryForm.reception_range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.reception_time=startTime+"&"+endTime;
+  }else{
+    queryForm.reception_time=''
+  };
+})
+watch(()=>queryForm.create_range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.created_at=startTime+"&"+endTime;
+  }else{
+    queryForm.created_at=''
+  };
+})
+    // Modal
+    const modalVisible = ref(false);
+    const modalTitle = ref('默认标题');
+   
+    // Batch Del List
+    let batchList = [];
+  
+    // Table Columns
+    const columns = [
+      { title: '编号', dataIndex: 'doctor_id', slotName: 'doctor_id', width: '90' },
+      { title: '订单编号', dataIndex: 'inquiry_no',width:200 },
+      { title: '医生姓名', dataIndex: 'doctor_name',slotName: 'doctor_name', width:200 },
+      { title: '就诊人', dataIndex:'patient_name_mask',slotName: 'patient_name_mask',width:100 },
+      { title: '所属患者', dataIndex: 'user_name', slotName: 'user_name',width: 150 },
+      { title: '问诊类型', dataIndex: 'inquiry_type', slotName: 'inquiry_type' },
+      { title: '订单状态', dataIndex: 'inquiry_status', slotName: 'inquiry_status' },
+      { title: '接诊时间', dataIndex: 'reception_time', slotName: 'reception_time',width:200  },
+      { title: '操作', slotName: 'action', fixed: "right", width: 180 },
+    ];
+  
+    // Table Data
+    const tableData = ref([]);
+    //弹框状态
+    const modalSatus = ref('add');
+  
+    // 新增Satus
+    const handleAdd = () => {
+      modalVisible.value = true;
+      modalTitle.value = '新增患者';
+      modalSatus.value = 'add';
+      modalForm.patient_id = null;
+    };
+  
+    //详情
+    const handleDetail = async (record) => {
+      const { code, data, message } = await getInquiryDetail(record.order_inquiry_id);
+  
+      if (code == 200) {
+          Object.assign(modalForm, data);
+          modalVisible.value = true;
+        }
+      };
+    // 批量删除
+    const handleBatchDelete = () => {
+      if (batchList.length !== 0) {
+        proxy.$modal.warning({
+          title: '提示',
+          content: '是否批量删除以下选中的数据？',
+          hideCancel: false,
+          onOk: async () => {
+            const res = await removeFamily({ ids: batchList });
+            proxy.$message.success(res.message);
+            getInquiryInfo(pager);
+          },
+          onCancel: () => {
+            proxy.$message.info('已取消批量删除数据');
+          },
+        });
+      } else {
+        proxy.$message.error('请勾选需要删除的数据！');
+      }
+    };
+  
+    /**
+     * 分页改变
+     * @param {Number} [page]
+     */
+    const handlePageChange = (page) => {
+      pager.page = page;
+  
+      // 修改当前页码
+      currentPage.value = page;
+      getInquiryInfo({ ...pager, ...queryForm });
+    };
+  
+    // 每页数据量
+    const handlepage_sizeChange = (page_size) => {
+      pager.page_size = page_size;
+      getInquiryInfo({ ...pager, ...queryForm });
+    };
+  
+    // 获取患者信息
+    const getInquiryInfo = async (params = {}) => {
+        console.log(params)
+      const { data, code, message } = await getInquiryList(params);
+      if (code == 200) {
+        tableData.value = data.data;
+        Object.assign(pager, { total: data.total, page: data.page, page_size: data.page_size });
+      }
+    };
+  
+    // 查询患者信息
+    const handleQuery = async () => {
+      pager.page = 1;
+      const params = {
+        page: pager.page,
+        page_size: pager.page_size,
+        ...queryForm,
+      };
+  
+      getInquiryInfo(params);
+    };
+  
+    // 重置搜索
+    const handleResetQuery = () => {
+      proxy.$refs.queryFormRef.resetFields();
+      getInquiryInfo(queryForm);
+    }
+    
+    
+    onMounted(() => {
+      getInquiryInfo(pager);
+    });
+  </script>
+  
+  <style lang="scss" scoped>
+    .action {
+      margin-bottom: 12px;
+    }
+  
+    .okmodal div {
+      text-align: center;
+    }
+  
+    .hospital_name {
+      width: 140px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  
+    .headImg {
+      margin-right: 20px;
+      border-radius: 50%;
+      width: 80px;
+      height: 80px;
+    }
+  
+    .arco-form-item-layout-horizontal:first-child,
+    .arco-form-item-layout-horizontal:nth-child(2) {
+      align-items: center;
+    }
+    .cellbox{
+      margin-top: 35px;
+    }
+    .cellbox .cell{
+      width:50%;
+      border-bottom:1px dashed #efefef;
+      margin-bottom: 20px;
+    }
+    .cellbox .cell:first-child{
+      border: none;
+    }
+    .cell{
+      .arco-form-item{
+        margin-bottom: 10px;
+      }
+    }
+    .box {
+      display: flex;
+      align-items: center;
+    }
+  
+    .cert .arco-form-item-label-col {
+      flex: 0 0 8px !important;
+    }
+  
+    .red {
+      display: inline-block;
+      margin-right: 5px;
+      font-size: 14px;
+      color: red;
+      margin-top: 5px;
+    }
+  
+    .cardNum {
+      width: 148px;
+    }
+    .codbox{
+      display: flex;
+      align-items: center;
+    }
+    .reason{
+      width:250px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  </style>
\ No newline at end of file
diff --git a/src/views/prescription/prescription-list/index.vue b/src/views/prescription/prescription-list/index.vue
index 56e569c..773d79a 100644
--- a/src/views/prescription/prescription-list/index.vue
+++ b/src/views/prescription/prescription-list/index.vue
@@ -127,25 +127,26 @@
         </a-space>
       </template>
     </a-table>
-
-    <familyModal :modalVisible="modalVisible" :modalForm="modalForm" @familyVisibleChange="()=>{modalVisible=false}"></familyModal>
+    <prescriptionModal :modalVisible="modalVisible"  :modalForm="modalForm" @familyVisibleChange="()=>{modalVisible=false}"></prescriptionModal >
+    <!-- <familyModal :modalVisible="modalVisible" :modalForm="modalForm" @familyVisibleChange="()=>{modalVisible=false}"></familyModal> -->
     <!-- Akiraka 20230223 删除与批量删除 开始 -->
     <!-- <DeleteModal :data="deleteData" :visible="deleteVisible" :apiDelete="removePrescription"
       @deleteVisibleChange="() => deleteVisible = false" /> -->
     <!-- Akiraka 20230223 删除与批量删除 结束 -->
-    <a-modal v-model:visible="okVisible" :modal-style="{width:'320px'}" body-class="okmodal" 
+    <!-- <a-modal v-model:visible="okVisible" :modal-style="{width:'320px'}" body-class="okmodal" 
       @cancel="()=>okVisible=false">
       <template #title>
         提示
       </template>
       <div>确定保存当前信息？</div>
-    </a-modal>
+    </a-modal> -->
   </div>
 </template>
 
 <script setup>
   import { reactive, ref, getCurrentInstance, onMounted, nextTick, watch, computed } from 'vue';
   import { getPrescriptionList,getPrescriptionDetail} from '@/api/prescription/list';
+  
   import {formatPrescriptionStatus} from "@/utils/format"
 
   // Akiraka 20230210 删除数据
@@ -267,7 +268,7 @@ watch(() => queryForm.expired_range_time,
   const handleDetail = async (record) => {
    
 
-    const { code, data, message } = await getPrescriptionDetail(record.family_id);
+    const { code, data, message } = await getPrescriptionDetail(record.order_prescription_id);
 
     if (code == 200) {
         Object.assign(modalForm, data);

From 0e9f9ae85d1af69370ab48cc0162cf6c8fa51df4 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 13 Oct 2023 11:35:31 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/inquiryDetailModal.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/inquiryDetailModal.vue b/src/components/inquiryDetailModal.vue
index 47b2d0b..46063c1 100644
--- a/src/components/inquiryDetailModal.vue
+++ b/src/components/inquiryDetailModal.vue
@@ -365,6 +365,8 @@ watch(
     }
     if (props.modalForm.order_inquiry_id) {
       let id = props.modalForm.order_inquiry_id;
+      chatlist.value=[];
+      pager.page=1;
       HandleGetIm(id, { ...pager });
     }
   },

From e5865423c4dc797e020efb5452e0dac81929a767 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 13 Oct 2023 16:10:53 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/inquiryDetailModal.vue | 203 ++++++++++++++++++++++++--
 1 file changed, 189 insertions(+), 14 deletions(-)

diff --git a/src/components/inquiryDetailModal.vue b/src/components/inquiryDetailModal.vue
index 46063c1..c029d06 100644
--- a/src/components/inquiryDetailModal.vue
+++ b/src/components/inquiryDetailModal.vue
@@ -170,7 +170,7 @@
     <a-form-item field="license_cert" :hide-label="true">
       <div class="phone">
         <div class="phonecont">
-          <a-button class="more" v-if="showMore">点击加载更多</a-button>
+          <a-button class="more" v-if="showMore" @click="loadMore">点击加载更多</a-button>
           <div class="nomore" v-else>---没有更多了---</div>
 
           <div
@@ -183,37 +183,152 @@
             v-for="item in chatlist"
             :key="item.message_id"
           >
+           <a-avatar  v-if="modalForm.user_doctor.user_id == item.from_user_id && (item.message_type!='TIMCustomElem' || (item.message_type=='TIMCustomElem' &&  JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 7))">
             <img
-              v-if="modalForm.user_doctor.user_id == item.from_user_id"
-              class="chatAvater"
-              src="https://img.applets.igandanyiyuan.com/basic/file/patient_avatar.png"
-              alt=""
-            />
-            <img
-              v-else="modalForm.user_doctor.user_id == item.from_user_id"
+             
               class="chatAvater"
               :src="modalForm.user_doctor.avatar"
               alt=""
             />
-            <div class="msgcon">
+           
+           </a-avatar>
+           
+           <a-avatar  v-if="modalForm.user_doctor.user_id != item.from_user_id && item.message_type!='TIMCustomElem'">
+            <img
+             
+              class="chatAvater"
+              src="https://img.applets.igandanyiyuan.com/basic/file/patient_avatar.png"
+             
+              alt=""
+            />
+           </a-avatar>
+            <div class="msgcon" :class="item.message_type=='TIMCustomElem'?'tipcon':''"
+            :style="(item.message_type=='TIMCustomElem'&& JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 7)?'margin:6px;':''">
               <div class="msgtext" v-if="item.message_type == 'TIMTextElem'">
                 {{ JSON.parse(item.message_content).Text }}
               </div>
+              <div class="msgtext" v-if="item.message_type == 'TIMImageElem'">
+
+                 <a-image  width="200" :src="(JSON.parse(item.message_content).ImageInfoArray)[0].URL"  :preview-props="{
+      actionsLayout: ['rotateRight', 'zoomIn', 'zoomOut'],
+    }" />
+              </div>
               <div
                 class="msgtext"
                 v-else-if="item.message_type == 'TIMCustomElem'"
+                :class="JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 7?'otherColor':''"
               >
-                <div
+              <div
                   v-if="
+                    JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 1
+                  "
+                  class="text"
+                >
+                  {{ JSON.parse(JSON.parse(item.message_content).Data)
+                      .title}}
+                </div>
+                <div
+                  v-else-if="
                     JSON.parse(JSON.parse(item.message_content).Data)
                       .message_type == 2
                   "
                   class="text"
                 >
-                  222
+                  系统推送评价消息
+                </div>
+                <div
+                  v-else-if="
+                    JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 3
+                  "
+                  class="text"
+                >
+                  系统推送医生端系统通知
+                </div>
+                <div
+                  v-else-if="
+                    JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 4
+                  "
+                  class="text"
+                >
+                  系统推送医生端服务通知
+                </div>
+                <div
+                  v-else-if="
+                    JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 5
+                  "
+                  class="text"
+                >
+                  系统推送患者端系统消息
+                </div>
+                <div
+                  v-else-if="
+                    JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 6
+                  "
+                  class="text"
+                >
+                药师审核中
+                </div>
+                <div
+                  v-else-if="
+                    JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 7
+                  "
+                  class="text"
+                >
+                 <div class="chufangbox">
+                   <div class="title">处方已开具</div>
+                   <div class="productbox">
+                     <div class="row">
+                      <div class="name">RP：</div>
+                     <div class="desc">{{ JSON.parse(JSON.parse(item.message_content).Data)
+                      .data.product_name }}</div> 
+                     </div>
+                     <div class="row">
+                      <div class="name">开方日期：</div>
+                      <div class="desc">{{JSON.parse(JSON.parse(item.message_content).Data)
+                      .data.pharmacist_verify_time}}</div>
+                     </div> 
+                    
+                   </div>
+                 </div>
+                </div>
+                <div
+                  v-else-if="
+                    JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 10
+                  "
+                  class="text"
+                >
+                系统推送糖组检测报告
+                </div>
+                <div
+                  v-else-if="
+                    JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 11
+                  "
+                  class="text"
+                >
+                系统推送患者病例
+                </div>
+                <div
+                  v-else-if="
+                    JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 11
+                  "
+                  class="text"
+                >
+                  系统推送患者信息
                 </div>
               </div>
-              <div class="date">{{ item.created_at }}</div>
+              <div class="date"  v-if="item.message_type != 'TIMCustomElem'">{{ parseTime(item.message_send_time) }}</div>
             </div>
           </div>
         </div>
@@ -335,8 +450,10 @@ const HandleGetIm = async (id, params = {}) => {
   const { code, data } = await getIm(id, params);
   if (code == 200) {
    
-    if (chatlist.value < 10) {
+    if ( data.data.length < 10) {
       showMore.value = false;
+    }else{
+      showMore.value = true;
     }
     chatlist.value = data.data.reverse().concat(chatlist.value);
     if(!firstIn.value){
@@ -379,6 +496,12 @@ const openDcotor = () => {
 const handleClose = () => {
   emits('inquiryVisibleChange', (modalVisible.value = false));
 };
+const loadMore=()=>{
+  pager.page= pager.page+1;
+  let id=props.modalForm.order_inquiry_case.inquiry_case_id
+  HandleGetIm(id, { ...pager });
+ 
+}
 </script>
 <style scoped>
 .more {
@@ -412,7 +535,7 @@ const handleClose = () => {
   background: #111;
   border-radius: 55px;
   box-shadow: 0px 0px 0px 2px #aaa;
-  width: 320px;
+  width: 360px;
   height: 480px;
   padding: 105px 25px 60px;
   -webkit-box-sizing: content-box;
@@ -451,12 +574,23 @@ const handleClose = () => {
   flex-direction: row;
   justify-content: flex-start;
 }
+
 .phonecont .msgtext {
   max-width: 80vw;
   border-radius: 5px;
   padding: 5px 8px;
+  word-break: break-all;
+  color: var(--color-text-1);
   background: #efefef;
+
 }
+.patientmsg .msgtext{
+  background: #3CC7C0;
+  color:#fff;
+  
+  
+}
+
 .msgbox .msgcon {
   margin-right: 6px;
 }
@@ -467,4 +601,45 @@ const handleClose = () => {
   font-size: 12px;
   color: #666;
 }
+.patientmsg .tipcon{
+  width:88%;
+  margin:0 auto;
+  text-align: center;
+  
+}
+.tipcon .msgtext{
+  color: var(--color-text-1);
+  background: #efefef;
+}
+.phonecont .otherColor{
+  background: #3CC7C0;
+  color:#fff;
+}
+
+.tipcon .msgtext{
+  padding:0px;
+  font-size: 15px;
+}
+.chufangbox{
+  margin:0 20px;
+}
+.productbox .row{
+  display: flex;
+  align-items: center;
+}
+.chufangbox .title{
+  padding: 8px 0;
+  border-bottom:1px solid #E7E7E7;;
+}
+.productbox{
+  padding: 8px 0;
+}
+.productbox .row .name{
+  color:#fff;
+}
+.desc{
+  line-height: 28px;
+  color:#fff;
+  font-size: 15px;
+}
 </style>
\ No newline at end of file

From 69c2f8c24c2052bed7bc4683e277913c67e60a5d Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 13 Oct 2023 16:20:32 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=8C=BB=E7=94=9F=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/doctor/doctor-list/index.vue | 54 +++++++++++++-------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/src/views/doctor/doctor-list/index.vue b/src/views/doctor/doctor-list/index.vue
index 542abeb..249bfc5 100644
--- a/src/views/doctor/doctor-list/index.vue
+++ b/src/views/doctor/doctor-list/index.vue
@@ -120,9 +120,7 @@
       <template #hospital_name="{record}">
         <div class="hospital_name" :title="record.hospital_name">{{record.hospital_name}}</div>
       </template>
-      <template #inquiry_service="{ record }">
-        <span>{{filterService(record)}}</span>
-      </template>
+    
       <template #iden_auth_status="{ record }">
         <!-- 身份认证状态（0:未认证 1:认证通过 2:审核中 3:认证失败） -->
         <a-tag v-if="record.iden_auth_status == 0" color="gray">未认证</a-tag>
@@ -941,7 +939,7 @@
     { title: '手机号码', dataIndex: 'mobile', width: 125 },
     { title: '医院', dataIndex: 'hospital_name', width: '150', slotName: 'hospital_name' },
     { title: '职称', dataIndex: 'doctor_title', slotName: 'doctor_title' },
-    { title: '开启服务', dataIndex: 'inquiry_service', slotName: 'inquiry_service' },
+    { title: '开启服务', dataIndex: 'inquiry_type' },
     { title: '多点审核状态', dataIndex: 'multi_point_status', slotName: 'multi_point_status', width: 140 },
     { title: '是否推荐', dataIndex: 'is_recommend', slotName: 'is_recommend' },
     { title: '深度合作', dataIndex: 'is_platform_deep_cooperation', slotName: 'is_platform_deep_cooperation' },
@@ -1116,30 +1114,30 @@
 
   };
   //开启服务处理
-  const filterService = (record) => {
-    let arr = [];
-    let str = '';
-    if (record.is_img_expert_reception == 1) {
-      arr.push("专家问诊");
-    }
-    if (record.is_img_welfare_reception == 1) {
-      arr.push("公益问诊")
-    }
-    if (record.is_img_quick_reception == 1) {
-      arr.push("快速问诊")
-    };
-    if (record.multi_point_status == 1) {
-      arr.push("问诊购药")
-    }
-    arr.forEach((item) => {
-      if (!str) {
-        str += item
-      } else {
-        str += ',' + item
-      }
-    })
-    return str ? str : "暂无"
-  }
+  // const filterService = (record) => {
+  //   let arr = [];
+  //   let str = '';
+  //   if (record.is_img_expert_reception == 1) {
+  //     arr.push("专家问诊");
+  //   }
+  //   if (record.is_img_welfare_reception == 1) {
+  //     arr.push("公益问诊")
+  //   }
+  //   if (record.is_img_quick_reception == 1) {
+  //     arr.push("快速问诊")
+  //   };
+  //   if (record.multi_point_status == 1) {
+  //     arr.push("问诊购药")
+  //   }
+  //   arr.forEach((item) => {
+  //     if (!str) {
+  //       str += item
+  //     } else {
+  //       str += ',' + item
+  //     }
+  //   })
+  //   return str ? str : "暂无"
+  // }
   // Modal ok
   // 异步关闭Modal需要调用 done()
   const handleSubmit = (done) => {

From e9e8c5d69e77a08e2362a62c1dab54296f4bc504 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 16 Oct 2023 09:34:33 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inquiry/config.js                | 18 +++++
 src/utils/format.js                      | 11 +++-
 src/views/inquiry/inquiry-list/index.vue | 84 +++++++++++-------------
 3 files changed, 68 insertions(+), 45 deletions(-)
 create mode 100644 src/api/inquiry/config.js

diff --git a/src/api/inquiry/config.js b/src/api/inquiry/config.js
new file mode 100644
index 0000000..81a82bf
--- /dev/null
+++ b/src/api/inquiry/config.js
@@ -0,0 +1,18 @@
+import request from '../../utils/request'
+
+const url = '/admin/inquiry/config/doctor';
+
+
+export function getInquiryconfigList(params){
+  return request({
+    url:'/admin/inquiry/config/doctor',
+    method: 'get',
+    params
+  })
+}
+export function getInquiryconfigDetail(id){
+    return request({
+      url:'/admin/inquiry/config/doctor/'+id,
+      method: 'get'
+    })
+  }
\ No newline at end of file
diff --git a/src/utils/format.js b/src/utils/format.js
index badd837..9285380 100644
--- a/src/utils/format.js
+++ b/src/utils/format.js
@@ -88,4 +88,13 @@ export const formatRelation=(val)=>{
       }else{
        return ''
       }
- }
\ No newline at end of file
+ };
+ export const formatMultipoint=(val)=>{
+   //医生多点执业认证状态（0:未认证 1:认证通过 2:审核中 3:认证失败）
+   let data={0:'未认证',1:'认证通过', 2:'审核中', 3:'认证失败'}
+      if(val|| val==0){
+       return data[val]
+      }else{
+       return ''
+      }
+ };
\ No newline at end of file
diff --git a/src/views/inquiry/inquiry-list/index.vue b/src/views/inquiry/inquiry-list/index.vue
index c54fe7e..e4f662e 100644
--- a/src/views/inquiry/inquiry-list/index.vue
+++ b/src/views/inquiry/inquiry-list/index.vue
@@ -2,25 +2,30 @@
     <div class="app-container">
       <a-form :model="queryForm" ref="queryFormRef" layout="inline">
   
-        <a-form-item field="user_name" label="账号名字">
+        <a-form-item field="doctor_name" label="医生姓名">
           <a-input :style="{ width: '182px' }" v-model="queryForm.user_name" placeholder="请输入账号或者姓名" @press-enter="handleQuery" />
         </a-form-item>
         <a-form-item field="mobile" label="电话号码">
           <a-input :style="{ width: '182px' }" v-model="queryForm.mobile" placeholder="请输入电话号码" @press-enter="handleQuery" />
         </a-form-item>
-        <!-- <a-form-item field="status" label="启用状态">
-          <a-select  v-model="queryForm.status" placeholder="请选择启用状态" :style="{ width: '182px' }">
-            <a-option :value="0">禁用</a-option>
-            <a-option :value="1">正常</a-option>
-            <a-option :value="2">删除</a-option>
+        <a-form-item field="inquiry_type" label="问诊类型">
+        <a-select  v-model="queryForm.inquiry_type" placeholder="请选择服务类型" :style="{ width: '182px' }">
+          <!-- 1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药 -->
+          <a-option :value="1">专家问诊</a-option>
+          <a-option :value="2">快速问诊</a-option>
+          <a-option :value="3">公益问诊</a-option>
+          <a-option :value="4">问诊购药</a-option>
+        </a-select>
+        
+      </a-form-item>
+         <a-form-item field="is_enable" label="启用状态">
+          <a-select  v-model="queryForm.is_enable" placeholder="请选择启用状态" :style="{ width: '182px' }">
+            <a-option :value="0">否</a-option>
+            <a-option :value="1">是</a-option>
+  
           </a-select>
-        </a-form-item> -->
-        <a-form-item field="create_range_time" label="创建时间范围">
-          <a-range-picker
-            style="width: 260px"
-            v-model="queryForm.create_range_time"
-          />
         </a-form-item>
+        
         <a-form-item>
           <a-space>
             <a-button type="primary" @click="handleQuery"><icon-search /> 搜索</a-button>
@@ -41,28 +46,27 @@
   
       <!-- table -->
       <a-table :columns="columns" :data="tableData" 
+      :scroll="{ x: 1400 }"
         :row-selection="{ type: 'checkbox', showCheckedAll: true }"
         :pagination="{ 'show-total': true, 'show-jumper': true, 'show-page-size': true, total: pager.total, current: currentPage }"
         row-key="doctor_id" @selection-change="(selection) => {deleteData = selection;console.log(selection)}"
         @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
         <template #doctor_id="{record,rowIndex}">
-            <span>{{pager.page}}</span>
           <div>{{(rowIndex+1)+(pager.page-1)*10}}</div>
         </template>
-        <template #status="{ record }">
-          <!-- 状态（0:禁用 1:正常 2:删除） -->
-          <a-tag v-if="record.status == 0" color="#ffb400">禁用</a-tag>
-          <a-tag v-else-if="record.status == 1" color="green">正常</a-tag>
-          <a-tag v-else color="red">删除</a-tag>
+        <template #doctor_title="{ record }">
+           <div>{{ formatDoctorTitle(record.doctor_title) }}</div>
         </template>
-        <template #is_platform_deep_cooperation="{ record }">
-          <a-tag v-if="record.is_platform_deep_cooperation == 0" color="gray">否</a-tag>
-          <a-tag v-else color="green">是</a-tag>
+        <template #multi_point_status="{ record }">
+          <div>{{ formatMultipoint(record.multi_point_status) }}</div>
         </template>
     
-        <template #disable_reason="{record}">
-          <div class="reason" v-if="record.disable_reason" :title="record.disable_reason">{{ record.disable_reason }}</div>
-          <div v-else>-</div>
+        <template #inquiry_type="{record}">
+          <div>{{ formatInquiryType(record.inquiry_type) }}</div>
+        </template>
+        <template #last_enable_method="{record}">
+          <div class="reason" v-if="record.last_enable_method==1" >自己</div>
+          <div v-else>后台</div>
         </template>
         <template #relation="{record}">
           <div>{{formatRelation(record.relation)}}</div>
@@ -97,8 +101,8 @@
   
   <script setup>
     import { reactive, ref, getCurrentInstance, onMounted, nextTick, watch, computed } from 'vue';
-    import { getInquiryList,getInquiryDetail} from '@/api/inquiry/list';
-    import {formatRelation} from "@/utils/format"
+    import { getInquiryconfigList,getInquiryconfigDetail} from '@/api/inquiry/config';
+    import {formatDoctorTitle,formatInquiryType,formatMultipoint} from "@/utils/format"
   
     // Akiraka 20230210 删除数据
     const deleteData = ref([])
@@ -151,16 +155,6 @@
       avatar: 'https://img.applets.igandanyiyuan.com/basic/file/patient_avatar.png',
    
     });
-    watch(() => queryForm.create_range_time,
-    (value) => {
-      if (value) {
-        let [startTime, endTime] = value;
-        queryForm.created_at = startTime + '&' + endTime;
-      } else {
-        queryForm.created_at = '';
-      }
-    }
-  );
     // Modal
     const modalVisible = ref(false);
     const modalTitle = ref('默认标题');
@@ -171,11 +165,14 @@
     // Table Columns
     const columns = [
       { title: '编号', dataIndex: 'doctor_id', slotName: 'doctor_id', width: '90' },
-      { title: '订单编号', dataIndex: 'inquiry_no',slotName: 'inquiry_type',width:200 },
-      { title: '服务分类', dataIndex: '服务分类',slotName: 'inquiry_type', width:200 },
-      { title: '坐班时间', dataIndex:'reception_time',slotName: 'reception_time',width:200 },
-      { title: '价格范围', dataIndex: 'relation', slotName: 'relation',width: 150 },
-       { title: '问诊价格', dataIndex: 'status', slotName: 'status' },
+      { title: '医生姓名', dataIndex: 'doctor_name',width:180 },
+      { title: '手机号码', dataIndex: 'mobile_mask', width:130 },
+      { title: '科室', dataIndex: 'department_custom_name', width: 150 },
+       { title: '职称', dataIndex: 'doctor_title', slotName: 'doctor_title' },
+       { title: '接诊数量', dataIndex: 'work_num_day' },
+       { title: '多点执业', dataIndex: 'multi_point_status',slotName:'multi_point_status' },
+       { title: '问诊类型', dataIndex: 'inquiry_type',slotName:'inquiry_type' },
+       { title: '申请人', dataIndex: 'last_enable_method',slotName:'last_enable_method' },
       { title: '操作', slotName: 'action', fixed: "right", width: 180 },
     ];
   
@@ -194,7 +191,7 @@
   
     //详情
     const handleDetail = async (record) => {
-      const { code, data, message } = await getInquiryDetail(record.family_id);
+      const { code, data, message } = await getInquiryconfigDetail(record.family_id);
   
       if (code == 200) {
           Object.assign(modalForm, data);
@@ -242,8 +239,7 @@
   
     // 获取患者信息
     const getInquiryInfo = async (params = {}) => {
-        console.log(params)
-      const { data, code, message } = await getInquiryList(params);
+      const { data, code, message } = await getInquiryconfigList(params);
       if (code == 200) {
         tableData.value = data.data;
         Object.assign(pager, { total: data.total, page: data.page, page_size: data.page_size });

From 944b42dbd5b2db5f2e3f52ddc4be63f5dcc420ff Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 16 Oct 2023 16:58:04 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E9=97=AE=E8=AF=8A=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/addInquiryConfigModal.vue | 193 ++++++++++++
 src/components/chatRecord.vue            | 354 +++++++++++++++++++++++
 src/components/inquiryDetailModal.vue    | 350 +---------------------
 src/components/prescriptionModal.vue     |   2 +-
 src/views/inquiry/inquiry-list/index.vue |   8 +-
 src/views/order/inquiry-record/index.vue |   2 +-
 src/views/order/order-list/index.vue     |  31 +-
 7 files changed, 593 insertions(+), 347 deletions(-)
 create mode 100644 src/components/addInquiryConfigModal.vue
 create mode 100644 src/components/chatRecord.vue

diff --git a/src/components/addInquiryConfigModal.vue b/src/components/addInquiryConfigModal.vue
new file mode 100644
index 0000000..ab18f75
--- /dev/null
+++ b/src/components/addInquiryConfigModal.vue
@@ -0,0 +1,193 @@
+<template>
+ <!-- Modal -->
+ <a-modal v-model:visible="modalVisible" fullscreen title="添加问诊配置" title-align="start" :footer="false"
+       @cancel="handleClose">
+      <div class="titlebox">
+        <div class="bar"></div>
+        <div class="name">基本信息</div>
+      </div>
+      <a-form :model="modalForm"    ref="modalFormRef" :auto-label-width="true">
+        <a-row :gutter="24" style="margin-top: 35px;">
+          <a-col :span="12">
+            <a-form-item field="avatar" label="真实姓名：">
+              <span>{{modalForm.card_name}} （{{modalForm.sex==1?'男，':'女，'}}{{modalForm.age
+}}岁）</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item field="idCard" label="身份证号：" >
+              <div class="box" v-show="!showEye ">
+                <div class="cardNum">{{modalForm.id_number_mask}}</div>
+                <icon-eye-invisible class="eye" @click="handelDecryptCard(modalForm.user.user_id,modalForm.family_id)" />
+              </div>
+              <div class="box" v-show="showEye">
+                <div class="cardNum">{{id_card_num}}</div>
+                <icon-eye class="eye" @click="()=>{showEye=false}" />
+              </div>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24" v-if="modalForm.mobile_mask">
+          <a-col :span="12">
+            <a-form-item field="idCard" label="手机号码：" >
+              <div class="box" v-show="!family_Eye">
+                <div class="cardNum">{{modalForm.mobile_mask}}</div>
+                <icon-eye-invisible class="eye" @click="handleDecryptMobile(modalForm.user.user_id,modalForm.family_id)" />
+              </div>
+              <div class="box" v-show="family_Eye">
+                <div class="cardNum">{{family_mobile}}</div>
+                <icon-eye class="eye" @click="()=>{family_Eye=false}" />
+              </div>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-divider />
+        <div class="titlebox">
+        <div class="bar"></div>
+        <div class="name">所属账号</div>
+      </div>
+        <a-row :gutter="24" style="margin-top: 35px;">
+          <a-col :span="12">
+            <a-form-item field="avatar" label="账号用户名：">
+              <span>{{modalForm.user.user_name}}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+      
+            <a-form-item field="idCard" label="账号电话：" >
+              <div class="box" v-show="!count_Eye">
+                <div class="cardNum">{{modalForm.user.mobile}}</div>
+                <icon-eye-invisible class="eye" @click="handleDecryptMobile(modalForm.user.user_id)" />
+              </div>
+              <div class="box" v-show="count_Eye">
+                <div class="cardNum">{{count_mobile}}</div>
+                <icon-eye class="eye" @click="()=>{count_Eye=false}" />
+              </div>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item field="idCard" label="与就诊人关系：" >
+              <span v-if="modalForm.relation">{{formatRelation(modalForm.relation)}}</span>
+              <span v-else>-</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-divider />
+        <!-- <div class="titlebox">
+          <div class="bar"></div>
+          <div class="name">病例信息</div>
+        </div>
+        <a-row :gutter="24" style="margin-top: 35px;">
+          <a-col :span="12">
+            
+          </a-col>
+        </a-row>
+        <a-divider /> -->
+
+      </a-form>
+      <!-- <div class="titlebox" >
+        <div class="bar"></div>
+        <div class="name">操作</div>
+      </div>
+      <a-row :gutter="24" style="margin-top: 35px;" >
+        <a-col :span="24">
+          <a-form-item field="" label="" no-style>
+            <a-space >
+              <a-button type="primary" status="danger" @click="">禁用</a-button>
+            </a-space>
+          </a-form-item>
+        </a-col>
+      </a-row> -->
+    </a-modal>
+</template>
+<script setup>
+import {ref,toRefs} from 'vue';
+import {decryptCard} from '@/api/doctor/list';
+import {decryptMobile} from '@/api/patient/family';
+import {formatRelation} from "@/utils/format"
+const props = defineProps({
+  // 是否显示
+  modalVisible: {
+    type: Boolean,
+    default: false,
+  },
+  modalForm: {
+    type: Object,
+  },
+});
+const emits = defineEmits(['familyVisibleChange']);
+const {modalVisible,modalForm} = toRefs(props);
+//切换小眼睛
+const showEye = ref(false);
+  const id_card_num = ref('');
+  //解密身份证号码
+  const handelDecryptCard = async (user_id,family_id) => {
+    showEye.value = true;
+    const { data, code, message } = await decryptCard({
+      user_id,
+      family_id
+    });
+    if (code == 200) {
+      id_card_num.value = data;
+    }
+  };
+  //切换手机号
+  const count_Eye= ref(false);
+  const family_Eye= ref(false);
+  const count_mobile=ref('');
+  const family_mobile=ref('')
+  const handleDecryptMobile=async(user_id,family_id='')=>{
+    let dataObj=null;
+    if(family_id){
+      dataObj={ user_id,family_id}
+      family_Eye.value=true
+    }else{
+      dataObj={ user_id,family_id};
+      count_Eye.value=true
+    }
+    const { data, code, message } = await decryptMobile(dataObj);
+    if(code==200){
+      if(family_id){
+        family_mobile.value=data
+      }else{
+        count_mobile.value=data;
+      }
+    }
+  }
+// Akiraka 20230210 关闭弹窗
+const handleClose = () => {
+  emits('familyVisibleChange', false);
+};
+</script>
+<style scoped>
+  .cardNum {
+    width: 150px;
+  }
+ .arco-form-item-layout-horizontal:first-child,
+  .arco-form-item-layout-horizontal:nth-child(2) {
+    align-items: center;
+  }
+  .cellbox{
+    margin-top: 35px;
+  }
+  .cellbox .cell{
+    width:50%;
+    border-bottom:1px dashed #efefef;
+    margin-bottom: 20px;
+  }
+  .cellbox .cell:first-child{
+    border: none;
+  }
+ 
+  .box {
+    display: flex;
+    align-items: center;
+  }
+
+  .cert .arco-form-item-label-col {
+    flex: 0 0 8px !important;
+  }
+
+</style>
\ No newline at end of file
diff --git a/src/components/chatRecord.vue b/src/components/chatRecord.vue
new file mode 100644
index 0000000..71f43e4
--- /dev/null
+++ b/src/components/chatRecord.vue
@@ -0,0 +1,354 @@
+<template>
+    <div class="phone">
+        <div class="phonecont" v-if="chatlist.length>0">
+          <a-button class="more" v-if="showMore" @click="loadMore">点击加载更多</a-button>
+          <div class="nomore" v-else>---没有更多了---</div>
+
+          <div
+            class="msgbox"
+            :class="
+              user_doctor.user_id == item.from_user_id
+                ? 'patientmsg'
+                : ''
+            "
+            v-for="item in chatlist"
+            :key="item.message_id"
+          >
+           <a-avatar  v-if="user_doctor.user_id == item.from_user_id && (item.message_type!='TIMCustomElem' || (item.message_type=='TIMCustomElem' &&  JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 7))">
+            <img
+             
+              class="chatAvater"
+              :src="user_doctor.avatar"
+              alt=""
+            />
+           
+           </a-avatar>
+           
+           <a-avatar  v-if="user_doctor.user_id != item.from_user_id && item.message_type!='TIMCustomElem'">
+            <img
+             
+              class="chatAvater"
+              src="https://img.applets.igandanyiyuan.com/basic/file/patient_avatar.png"
+             
+              alt=""
+            />
+           </a-avatar>
+            <div class="msgcon" :class="item.message_type=='TIMCustomElem'?'tipcon':''"
+            :style="(item.message_type=='TIMCustomElem'&& JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 7)?'margin:6px;':''">
+              <div class="msgtext" v-if="item.message_type == 'TIMTextElem'">
+                {{ JSON.parse(item.message_content).Text }}
+              </div>
+              <div class="msgtext" v-if="item.message_type == 'TIMImageElem'">
+
+                 <a-image  width="200" :src="(JSON.parse(item.message_content).ImageInfoArray)[0].URL"  :preview-props="{
+      actionsLayout: ['rotateRight', 'zoomIn', 'zoomOut'],
+    }" />
+              </div>
+              <div
+                class="msgtext"
+                v-else-if="item.message_type == 'TIMCustomElem'"
+                :class="JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 7?'otherColor':''"
+              >
+              <div
+                  v-if="
+                    JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 1
+                  "
+                  class="text"
+                >
+                  {{ JSON.parse(JSON.parse(item.message_content).Data)
+                      .title}}
+                </div>
+                <div
+                  v-else-if="
+                    JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 2
+                  "
+                  class="text"
+                >
+                  系统推送评价消息
+                </div>
+                <div
+                  v-else-if="
+                    JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 3
+                  "
+                  class="text"
+                >
+                  系统推送医生端系统通知
+                </div>
+                <div
+                  v-else-if="
+                    JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 4
+                  "
+                  class="text"
+                >
+                  系统推送医生端服务通知
+                </div>
+                <div
+                  v-else-if="
+                    JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 5
+                  "
+                  class="text"
+                >
+                  系统推送患者端系统消息
+                </div>
+                <div
+                  v-else-if="
+                    JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 6
+                  "
+                  class="text"
+                >
+                药师审核中
+                </div>
+                <div
+                  v-else-if="
+                    JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 7
+                  "
+                  class="text"
+                >
+                 <div class="chufangbox">
+                   <div class="title">处方已开具</div>
+                   <div class="productbox">
+                     <div class="row">
+                      <div class="name">RP：</div>
+                     <div class="desc">{{ JSON.parse(JSON.parse(item.message_content).Data)
+                      .data.product_name }}</div> 
+                     </div>
+                     <div class="row">
+                      <div class="name">开方日期：</div>
+                      <div class="desc">{{JSON.parse(JSON.parse(item.message_content).Data)
+                      .data.pharmacist_verify_time}}</div>
+                     </div> 
+                    
+                   </div>
+                 </div>
+                </div>
+                <div
+                  v-else-if="
+                    JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 10
+                  "
+                  class="text"
+                >
+                系统推送糖组检测报告
+                </div>
+                <div
+                  v-else-if="
+                    JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 11
+                  "
+                  class="text"
+                >
+                系统推送患者病例
+                </div>
+                <div
+                  v-else-if="
+                    JSON.parse(JSON.parse(item.message_content).Data)
+                      .message_type == 11
+                  "
+                  class="text"
+                >
+                  系统推送患者信息
+                </div>
+              </div>
+              <div class="date"  v-if="item.message_type != 'TIMCustomElem'">{{ parseTime(item.message_send_time) }}</div>
+            </div>
+          </div>
+        </div>
+        <div class="phonecont" v-else>
+            <a-empty />
+        </div>
+      </div>
+</template>
+<script setup>
+import { ref, toRefs, reactive, watch,nextTick } from 'vue';
+import {getIm } from '@/api/order/list';
+const props = defineProps({
+  id:{
+    type: String,
+    default:'',
+  },
+  user_doctor:{
+    type:Object
+  }
+
+});
+const {user_doctor}=toRefs(props);
+const firstIn=ref(false);
+const pager = reactive({
+  page: 1,
+  page_size: 10,
+});
+const chatlist = ref([]);
+const showMore = ref(true);
+const HandleGetIm = async (id, params = {}) => {
+  const { code, data } = await getIm(id, params);
+  if (code == 200) {
+   
+    if ( data.data.length < 10) {
+      showMore.value = false;
+    }else{
+      showMore.value = true;
+    }
+    chatlist.value = data.data.reverse().concat(chatlist.value);
+    if(!firstIn.value){
+      nextTick(() => {
+      // 要放在对响应式数据修改之后
+      let ele = document.querySelector('.phonecont');
+      ele.scrollTop = ele.scrollHeight;
+    });
+    }
+
+    firstIn.value=true
+  }
+};
+watch(()=>props.id,(newVal,oldVal)=>{
+    if(newVal){
+      firstIn.value=false;
+      chatlist.value=[];
+      pager.page=1;
+      HandleGetIm(newVal, { ...pager });  
+    }
+},{immediate:true,deep:true})
+
+
+const loadMore=()=>{
+  pager.page= pager.page+1;
+  let id=props.id;
+  HandleGetIm(id, { ...pager });
+ 
+}
+</script>
+<style scoped>
+.more {
+  display: flex;
+  margin: 20px auto 10px;
+}
+.nomore {
+  font-size: 12px;
+  color: #666;
+  text-align: center;
+  margin: 20px auto 10px;
+}
+.phone {
+  margin-top: 35px;
+  position: relative;
+  background: #111;
+  border-radius: 55px;
+  box-shadow: 0px 0px 0px 2px #aaa;
+  width: 360px;
+  height: 480px;
+  padding: 105px 25px 60px;
+  -webkit-box-sizing: content-box;
+  box-sizing: content-box;
+}
+.phone:before {
+  content: '';
+  width: 60px;
+  height: 10px;
+  border-radius: 10px;
+  position: absolute;
+  left: 50%;
+  margin-left: -30px;
+  background: #333;
+  top: 50px;
+}
+.phonecont {
+  width: 100%;
+  height: 100%;
+  overflow: scroll;
+  background: #fff;
+}
+.chatAvater {
+  width: 40px;
+  height: 40px;
+  border-radius: 50%;
+}
+.msgbox {
+  display: flex;
+  margin: 4px 12px 12px;
+
+  flex-direction: row-reverse;
+}
+.patientmsg {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+}
+
+.phonecont .msgtext {
+  max-width: 80vw;
+  border-radius: 5px;
+  padding: 5px 8px;
+  word-break: break-all;
+  color: var(--color-text-1);
+  background: #efefef;
+
+}
+.patientmsg .msgtext{
+  background: #3CC7C0;
+  color:#fff;
+  
+  
+}
+
+.msgbox .msgcon {
+  margin-right: 6px;
+}
+.patientmsg .msgcon {
+  margin-left: 6px;
+}
+.date {
+  font-size: 12px;
+  color: #666;
+}
+.patientmsg .tipcon{
+  width:88%;
+  margin:0 auto;
+  text-align: center;
+  
+}
+.tipcon .msgtext{
+  color: var(--color-text-1);
+  background: #efefef;
+}
+.phonecont .otherColor{
+  background: #3CC7C0;
+  color:#fff;
+}
+
+.tipcon .msgtext{
+  padding:0px;
+  font-size: 15px;
+}
+.chufangbox{
+  margin:0 20px;
+}
+.productbox .row{
+  display: flex;
+  align-items: center;
+}
+.chufangbox .title{
+  padding: 8px 0;
+  border-bottom:1px solid #E7E7E7;;
+}
+.productbox{
+  padding: 8px 0;
+}
+.productbox .row .name{
+  color:#fff;
+}
+.desc{
+  line-height: 28px;
+  color:#fff;
+  font-size: 15px;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/inquiryDetailModal.vue b/src/components/inquiryDetailModal.vue
index c029d06..4deb246 100644
--- a/src/components/inquiryDetailModal.vue
+++ b/src/components/inquiryDetailModal.vue
@@ -168,171 +168,7 @@
       <div class="name">聊天记录</div>
     </div>
     <a-form-item field="license_cert" :hide-label="true">
-      <div class="phone">
-        <div class="phonecont">
-          <a-button class="more" v-if="showMore" @click="loadMore">点击加载更多</a-button>
-          <div class="nomore" v-else>---没有更多了---</div>
-
-          <div
-            class="msgbox"
-            :class="
-              modalForm.user_doctor.user_id == item.from_user_id
-                ? 'patientmsg'
-                : ''
-            "
-            v-for="item in chatlist"
-            :key="item.message_id"
-          >
-           <a-avatar  v-if="modalForm.user_doctor.user_id == item.from_user_id && (item.message_type!='TIMCustomElem' || (item.message_type=='TIMCustomElem' &&  JSON.parse(JSON.parse(item.message_content).Data)
-                      .message_type == 7))">
-            <img
-             
-              class="chatAvater"
-              :src="modalForm.user_doctor.avatar"
-              alt=""
-            />
-           
-           </a-avatar>
-           
-           <a-avatar  v-if="modalForm.user_doctor.user_id != item.from_user_id && item.message_type!='TIMCustomElem'">
-            <img
-             
-              class="chatAvater"
-              src="https://img.applets.igandanyiyuan.com/basic/file/patient_avatar.png"
-             
-              alt=""
-            />
-           </a-avatar>
-            <div class="msgcon" :class="item.message_type=='TIMCustomElem'?'tipcon':''"
-            :style="(item.message_type=='TIMCustomElem'&& JSON.parse(JSON.parse(item.message_content).Data)
-                      .message_type == 7)?'margin:6px;':''">
-              <div class="msgtext" v-if="item.message_type == 'TIMTextElem'">
-                {{ JSON.parse(item.message_content).Text }}
-              </div>
-              <div class="msgtext" v-if="item.message_type == 'TIMImageElem'">
-
-                 <a-image  width="200" :src="(JSON.parse(item.message_content).ImageInfoArray)[0].URL"  :preview-props="{
-      actionsLayout: ['rotateRight', 'zoomIn', 'zoomOut'],
-    }" />
-              </div>
-              <div
-                class="msgtext"
-                v-else-if="item.message_type == 'TIMCustomElem'"
-                :class="JSON.parse(JSON.parse(item.message_content).Data)
-                      .message_type == 7?'otherColor':''"
-              >
-              <div
-                  v-if="
-                    JSON.parse(JSON.parse(item.message_content).Data)
-                      .message_type == 1
-                  "
-                  class="text"
-                >
-                  {{ JSON.parse(JSON.parse(item.message_content).Data)
-                      .title}}
-                </div>
-                <div
-                  v-else-if="
-                    JSON.parse(JSON.parse(item.message_content).Data)
-                      .message_type == 2
-                  "
-                  class="text"
-                >
-                  系统推送评价消息
-                </div>
-                <div
-                  v-else-if="
-                    JSON.parse(JSON.parse(item.message_content).Data)
-                      .message_type == 3
-                  "
-                  class="text"
-                >
-                  系统推送医生端系统通知
-                </div>
-                <div
-                  v-else-if="
-                    JSON.parse(JSON.parse(item.message_content).Data)
-                      .message_type == 4
-                  "
-                  class="text"
-                >
-                  系统推送医生端服务通知
-                </div>
-                <div
-                  v-else-if="
-                    JSON.parse(JSON.parse(item.message_content).Data)
-                      .message_type == 5
-                  "
-                  class="text"
-                >
-                  系统推送患者端系统消息
-                </div>
-                <div
-                  v-else-if="
-                    JSON.parse(JSON.parse(item.message_content).Data)
-                      .message_type == 6
-                  "
-                  class="text"
-                >
-                药师审核中
-                </div>
-                <div
-                  v-else-if="
-                    JSON.parse(JSON.parse(item.message_content).Data)
-                      .message_type == 7
-                  "
-                  class="text"
-                >
-                 <div class="chufangbox">
-                   <div class="title">处方已开具</div>
-                   <div class="productbox">
-                     <div class="row">
-                      <div class="name">RP：</div>
-                     <div class="desc">{{ JSON.parse(JSON.parse(item.message_content).Data)
-                      .data.product_name }}</div> 
-                     </div>
-                     <div class="row">
-                      <div class="name">开方日期：</div>
-                      <div class="desc">{{JSON.parse(JSON.parse(item.message_content).Data)
-                      .data.pharmacist_verify_time}}</div>
-                     </div> 
-                    
-                   </div>
-                 </div>
-                </div>
-                <div
-                  v-else-if="
-                    JSON.parse(JSON.parse(item.message_content).Data)
-                      .message_type == 10
-                  "
-                  class="text"
-                >
-                系统推送糖组检测报告
-                </div>
-                <div
-                  v-else-if="
-                    JSON.parse(JSON.parse(item.message_content).Data)
-                      .message_type == 11
-                  "
-                  class="text"
-                >
-                系统推送患者病例
-                </div>
-                <div
-                  v-else-if="
-                    JSON.parse(JSON.parse(item.message_content).Data)
-                      .message_type == 11
-                  "
-                  class="text"
-                >
-                  系统推送患者信息
-                </div>
-              </div>
-              <div class="date"  v-if="item.message_type != 'TIMCustomElem'">{{ parseTime(item.message_send_time) }}</div>
-            </div>
-          </div>
-        </div>
-      </div>
+      <chatRecord :id="modalForm.order_inquiry_id" :user_doctor="modalForm.user_doctor"></chatRecord>
     </a-form-item>
     <a-divider />
     <div class="titlebox">
@@ -417,10 +253,9 @@
 import { ref, toRefs, reactive, watch,nextTick } from 'vue';
 import { formatDoctorTitle } from '@/utils/format';
 import { parseTime } from '@/utils/parseTime';
-import { inquiryCase, getIm } from '@/api/order/list';
+import { inquiryCase} from '@/api/order/list';
 import { formatInquiryType, formatInquiryStatus } from '@/utils/format';
 const emits = defineEmits(['inquiryVisibleChange']);
-const showMore = ref(true);
 const props = defineProps({
   // 是否显示
   modalVisible: {
@@ -429,9 +264,13 @@ const props = defineProps({
   },
   modalForm: {
     type: Object,
+    default:{
+      order_inquiry_case:{
+        inquiry_case_id:''
+      }
+    }
   },
 });
-const firstIn=ref(false);
 const doctorVisible = ref(false);
 const doctor_id = ref('');
 const patientVisible = ref(false);
@@ -441,36 +280,8 @@ const { modalVisible, modalForm } = toRefs(props);
 const openPatient = () => {
   patientVisible.value = true;
 };
-const pager = reactive({
-  page: 1,
-  page_size: 10,
-});
-const chatlist = ref([]);
-const HandleGetIm = async (id, params = {}) => {
-  const { code, data } = await getIm(id, params);
-  if (code == 200) {
-   
-    if ( data.data.length < 10) {
-      showMore.value = false;
-    }else{
-      showMore.value = true;
-    }
-    chatlist.value = data.data.reverse().concat(chatlist.value);
-    if(!firstIn.value){
-      nextTick(() => {
-      // 要放在对响应式数据修改之后
-      let ele = document.querySelector('.phonecont');
-      ele.scrollTop = ele.scrollHeight;
-    });
-    }
-
-    firstIn.value=true
-  }
-};
-
-watch(
-  () => props.modalForm,
-  () => {
+const order_inquiry_id=ref('');
+watch(() => props.modalForm,() => {
     if (
       props.modalForm.order_inquiry_case &&
       props.modalForm.order_inquiry_case.inquiry_case_id
@@ -480,15 +291,10 @@ watch(
         Object.assign(patientData, data.data);
       });
     }
-    if (props.modalForm.order_inquiry_id) {
-      let id = props.modalForm.order_inquiry_id;
-      chatlist.value=[];
-      pager.page=1;
-      HandleGetIm(id, { ...pager });
-    }
-  },
-  { immediate: true, deep: true }
-);
+    // if(props.modalForm.order_inquiry_id){
+    //     order_inquiry_id.value=props.modalForm.order_inquiry_id;
+    //   }
+  },{ immediate: true, deep: true })
 const openDcotor = () => {
   doctor_id.value = props.modalForm.doctor_id;
   doctorVisible.value = true;
@@ -496,24 +302,10 @@ const openDcotor = () => {
 const handleClose = () => {
   emits('inquiryVisibleChange', (modalVisible.value = false));
 };
-const loadMore=()=>{
-  pager.page= pager.page+1;
-  let id=props.modalForm.order_inquiry_case.inquiry_case_id
-  HandleGetIm(id, { ...pager });
- 
-}
+
 </script>
 <style scoped>
-.more {
-  display: flex;
-  margin: 20px auto 10px;
-}
-.nomore {
-  font-size: 12px;
-  color: #666;
-  text-align: center;
-  margin: 20px auto 10px;
-}
+
 .headImg {
   margin-right: 20px;
   border-radius: 50%;
@@ -529,117 +321,5 @@ const loadMore=()=>{
   flex-direction: column;
   justify-content: space-between;
 }
-.phone {
-  margin-top: 35px;
-  position: relative;
-  background: #111;
-  border-radius: 55px;
-  box-shadow: 0px 0px 0px 2px #aaa;
-  width: 360px;
-  height: 480px;
-  padding: 105px 25px 60px;
-  -webkit-box-sizing: content-box;
-  box-sizing: content-box;
-}
-.phone:before {
-  content: '';
-  width: 60px;
-  height: 10px;
-  border-radius: 10px;
-  position: absolute;
-  left: 50%;
-  margin-left: -30px;
-  background: #333;
-  top: 50px;
-}
-.phonecont {
-  width: 100%;
-  height: 100%;
-  overflow: scroll;
-  background: #fff;
-}
-.chatAvater {
-  width: 40px;
-  height: 40px;
-  border-radius: 50%;
-}
-.msgbox {
-  display: flex;
-  margin: 4px 12px 12px;
 
-  flex-direction: row-reverse;
-}
-.patientmsg {
-  display: flex;
-  flex-direction: row;
-  justify-content: flex-start;
-}
-
-.phonecont .msgtext {
-  max-width: 80vw;
-  border-radius: 5px;
-  padding: 5px 8px;
-  word-break: break-all;
-  color: var(--color-text-1);
-  background: #efefef;
-
-}
-.patientmsg .msgtext{
-  background: #3CC7C0;
-  color:#fff;
-  
-  
-}
-
-.msgbox .msgcon {
-  margin-right: 6px;
-}
-.patientmsg .msgcon {
-  margin-left: 6px;
-}
-.date {
-  font-size: 12px;
-  color: #666;
-}
-.patientmsg .tipcon{
-  width:88%;
-  margin:0 auto;
-  text-align: center;
-  
-}
-.tipcon .msgtext{
-  color: var(--color-text-1);
-  background: #efefef;
-}
-.phonecont .otherColor{
-  background: #3CC7C0;
-  color:#fff;
-}
-
-.tipcon .msgtext{
-  padding:0px;
-  font-size: 15px;
-}
-.chufangbox{
-  margin:0 20px;
-}
-.productbox .row{
-  display: flex;
-  align-items: center;
-}
-.chufangbox .title{
-  padding: 8px 0;
-  border-bottom:1px solid #E7E7E7;;
-}
-.productbox{
-  padding: 8px 0;
-}
-.productbox .row .name{
-  color:#fff;
-}
-.desc{
-  line-height: 28px;
-  color:#fff;
-  font-size: 15px;
-}
 </style>
\ No newline at end of file
diff --git a/src/components/prescriptionModal.vue b/src/components/prescriptionModal.vue
index 9285ff7..421b8e5 100644
--- a/src/components/prescriptionModal.vue
+++ b/src/components/prescriptionModal.vue
@@ -176,7 +176,7 @@
                  <a-button type="primary"  @click="lookMedince" v-has="'admin:sysPrescriptionList:vieworder'">查看订单</a-button>
                </a-space>
                <a-space >
-                 <a-button type="primary" status="danger" @click="downloadFile(downloadUrl)" v-has="'admin:sysPrescriptionList:download'" >下载</a-button>
+                 <a-button type="primary"  @click="downloadFile(downloadUrl)" v-has="'admin:sysPrescriptionList:download'" >下载</a-button>
                </a-space>
              </a-form-item>
            </a-col>
diff --git a/src/views/inquiry/inquiry-list/index.vue b/src/views/inquiry/inquiry-list/index.vue
index e4f662e..8e45571 100644
--- a/src/views/inquiry/inquiry-list/index.vue
+++ b/src/views/inquiry/inquiry-list/index.vue
@@ -37,12 +37,12 @@
       <a-divider />
   
       <!-- action -->
-      <!-- <div class="action">
+      <div class="action">
         <a-space>
           <a-button v-has="'admin:sysFamilyList:add'" type="primary" @click="handleAdd"><icon-plus /> 新增 </a-button>
-          <a-button v-has="'admin:sysFamilyList:remove'" type="primary" status="danger"><icon-delete /> 批量删除 </a-button> 
+          <!-- <a-button v-has="'admin:sysFamilyList:remove'" type="primary" status="danger"><icon-delete /> 批量删除 </a-button>  -->
         </a-space>
-      </div> -->
+      </div> 
   
       <!-- table -->
       <a-table :columns="columns" :data="tableData" 
@@ -84,7 +84,7 @@
         </template>
       </a-table>
   
-      <familyModal :modalVisible="modalVisible" :modalForm="modalForm" @familyVisibleChange="()=>{modalVisible=false}"></familyModal>
+      <addInquiryConfigModal :modalVisible="modalVisible" :modalForm="modalForm" @familyVisibleChange="()=>{modalVisible=false}"></addInquiryConfigModal>
       <!-- Akiraka 20230223 删除与批量删除 开始 -->
       <!-- <DeleteModal :data="deleteData" :visible="deleteVisible" :apiDelete="removeFamily"
         @deleteVisibleChange="() => deleteVisible = false" /> -->
diff --git a/src/views/order/inquiry-record/index.vue b/src/views/order/inquiry-record/index.vue
index b4cc2a7..53da55e 100644
--- a/src/views/order/inquiry-record/index.vue
+++ b/src/views/order/inquiry-record/index.vue
@@ -82,7 +82,7 @@
         </template>
         <template #action="{ record }">
           <a-space>
-            <a-button v-has="'admin:sysFamilyList:detail'" type="text"
+            <a-button v-has="'admin:sysInquiryRecord:detail'" type="text"
               @click="handleDetail(record)"><icon-book />详情</a-button>
             <!-- <a-button v-has="'admin:sysFamilyList:edit'" type="text" @click="handleUpdate(record)"><icon-edit />
               修改</a-button> -->
diff --git a/src/views/order/order-list/index.vue b/src/views/order/order-list/index.vue
index d25b4de..98f41e8 100644
--- a/src/views/order/order-list/index.vue
+++ b/src/views/order/order-list/index.vue
@@ -378,9 +378,9 @@
       <a-row :gutter="24" style="margin-top: 35px;" >
         <a-col :span="24">
           <a-form-item field="" label="" no-style>
-            <!-- <a-space  style="margin-right: 8px;">
-              <a-button type="primary" @click="openInquiryRecord">问诊记录</a-button>
-            </a-space> -->
+            <a-space  style="margin-right: 8px;" v-if="modalForm.inquiry_status==4 || modalForm.inquiry_status==5 || modalForm.inquiry_status==6">
+              <a-button type="primary" @click="openInquiryRecord"  v-has="'admin:sysOrderList:record'">问诊记录</a-button>
+            </a-space>
             <a-space  style="margin-right: 8px;" v-if="modalForm.inquiry_status==4 || modalForm.inquiry_status==5">
               <a-button type="primary" status="danger"   v-has="'admin:sysOrderList:cancel'" @click="()=>{okVisible=true;cur_inruiry_id=modalForm.order_inquiry_id;}">取消问诊</a-button>
             </a-space>
@@ -396,6 +396,24 @@
       <patientModal :patientVisible="patientVisible" :data="patientData" @patientVisibleChange="() => {patientVisible = false;}"></patientModal>
 
       <confirmModal :okVisible="okVisible"  :api="cancelInquiry" :title="'确定取消此订单吗？'" :dealType="'order_inquiry_id'" :id="cur_inruiry_id" @closeChange="handelCloseChange"></confirmModal>
+
+      <!-- 聊天记录 -->
+      <!-- Modal -->
+      <!-- <a-modal v-model:visible="chatVisible" fullscreen title="聊天记录" title-align="start" :footer="false"
+      @close="() => {}">
+      <a-form :model="modalForm" :disabled="true" :rules="rules" ref="modalFormRef" :auto-label-width="true">
+        <a-row :gutter="24" >
+          <a-col :span="24">
+            <a-form-item field="license_cert" :hide-label="true">
+      <chatRecord :id="modalForm.order_inquiry_id" :user_doctor="modalForm.user_doctor"></chatRecord>
+    </a-form-item>
+          </a-col>
+         
+        </a-row>
+      </a-form>
+      </a-modal> -->
+      <!-- 问诊记录详情 -->
+      <inquiryDetailModal :modalVisible="recordVisible" :modalForm="modalForm" @inquiryVisibleChange="()=>{recordVisible=false}"></inquiryDetailModal>
   </div>
 
 
@@ -421,7 +439,8 @@ const patientData=reactive({
 });
 const comment=reactive({
 
-})
+});
+const recordVisible=ref(false);
 // Akiraka 20230210 监听删除事件
 watch(() => deleteVisible.value ,(value) => {
 
@@ -617,7 +636,6 @@ const handleQuery = async () => {
   getOrderInfo(params);
 };
 
-
 //获取订单详情
  const handleDetail = async (record) => {
     modalVisible.value = true;
@@ -629,6 +647,7 @@ const handleQuery = async () => {
       Object.assign(modalForm, data);
       let result=data.order_evaluation;
       if(data.order_inquiry_case && data.order_inquiry_case.inquiry_case_id){
+      
         const caseInfo= await inquiryCase(data.order_inquiry_case.inquiry_case_id);
         Object.assign(patientData,caseInfo.data);
 
@@ -684,7 +703,7 @@ const openPatient=()=>{
   patientVisible.value=true;
 }
 const openInquiryRecord=()=>{
-  alert("开发中");
+ recordVisible.value=true;
 }
 //关闭确认框
 const handelCloseChange=(data)=>{

From 730934de5d059bb79811b200a1ccdacc9f5f429b Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 17 Oct 2023 10:28:05 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/order/list.js         |  4 ++--
 src/components/chatRecord.vue | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/api/order/list.js b/src/api/order/list.js
index 6c8110a..007fa78 100644
--- a/src/api/order/list.js
+++ b/src/api/order/list.js
@@ -65,9 +65,9 @@ export function inquiryCase(id){//病例详情
     method: 'get'
   })
 }
-export function getIm(id,params){//获取im分页
+export function getIm(params){//获取im分页
   return request({
-    url:`/admin/order/inquiry/im/${id}`,
+    url:`/admin/order/inquiry/im`,
     method: 'get',
     params
   })
diff --git a/src/components/chatRecord.vue b/src/components/chatRecord.vue
index 71f43e4..bae08cb 100644
--- a/src/components/chatRecord.vue
+++ b/src/components/chatRecord.vue
@@ -189,8 +189,8 @@ const pager = reactive({
 });
 const chatlist = ref([]);
 const showMore = ref(true);
-const HandleGetIm = async (id, params = {}) => {
-  const { code, data } = await getIm(id, params);
+const HandleGetIm = async (params = {}) => {
+  const { code, data } = await getIm(params);
   if (code == 200) {
    
     if ( data.data.length < 10) {
@@ -215,15 +215,16 @@ watch(()=>props.id,(newVal,oldVal)=>{
       firstIn.value=false;
       chatlist.value=[];
       pager.page=1;
-      HandleGetIm(newVal, { ...pager });  
+      pager.order_inquiry_id=newVal;
+      HandleGetIm({ ...pager });  
     }
 },{immediate:true,deep:true})
 
 
 const loadMore=()=>{
   pager.page= pager.page+1;
-  let id=props.id;
-  HandleGetIm(id, { ...pager });
+  pager.order_inquiry_id=props.id;
+  HandleGetIm({ ...pager });
  
 }
 </script>

From 514813401d88b517d34713f17ee895dfb4486ab6 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 18 Oct 2023 10:51:45 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=A4=84=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   2 +
 src/api/inquiry/config.js                     |  15 +
 src/components/addInquiryConfigModal.vue      | 378 +++++++++++-------
 src/main.js                                   |   1 +
 src/views/inquiry/inquiry-list/index.vue      |   2 +-
 .../prescription/prescription-list/index.vue  |   6 +-
 vite.config.js                                |   8 +-
 7 files changed, 252 insertions(+), 160 deletions(-)

diff --git a/package.json b/package.json
index 6d2b8f3..0103cb6 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "codemirror": "^6.0.1",
     "cropperjs": "^1.5.13",
     "dayjs": "^1.11.9",
+    "element-plus": "^2.4.0",
     "file-saver": "^2.0.5",
     "i": "^0.3.7",
     "js-cookie": "^3.0.5",
@@ -40,6 +41,7 @@
     "eslint-plugin-vue": "^9.12.0",
     "mockjs": "^1.1.0",
     "sass": "^1.62.1",
+    "unplugin-auto-import": "^0.16.6",
     "unplugin-vue-components": "^0.24.1",
     "vite": "^4.3.5",
     "vite-plugin-mock": "^3.0.0",
diff --git a/src/api/inquiry/config.js b/src/api/inquiry/config.js
index 81a82bf..05d4fa3 100644
--- a/src/api/inquiry/config.js
+++ b/src/api/inquiry/config.js
@@ -10,6 +10,21 @@ export function getInquiryconfigList(params){
     params
   })
 }
+
+export function addInquiryconfig(data){//添加配置
+  return request({
+    url:'/admin/inquiry/config/doctor',
+    method: 'put',
+    data
+  })
+}
+export function editInquiryconfig(data,id){//添加配置
+  return request({
+    url:'/admin/inquiry/config/doctor/'+id,
+    method: 'put',
+    data
+  })
+}
 export function getInquiryconfigDetail(id){
     return request({
       url:'/admin/inquiry/config/doctor/'+id,
diff --git a/src/components/addInquiryConfigModal.vue b/src/components/addInquiryConfigModal.vue
index ab18f75..4b11411 100644
--- a/src/components/addInquiryConfigModal.vue
+++ b/src/components/addInquiryConfigModal.vue
@@ -1,93 +1,165 @@
 <template>
- <!-- Modal -->
- <a-modal v-model:visible="modalVisible" fullscreen title="添加问诊配置" title-align="start" :footer="false"
-       @cancel="handleClose">
+  <!-- Modal -->
+  <a-modal
+    v-model:visible="modalVisible"
+    fullscreen
+    title="添加问诊配置"
+    title-align="start"
+    :footer="false"
+    @cancel="handleClose"
+  >
+    <div class="titlebox">
+      <div class="bar"></div>
+      <div class="name">添加医生</div>
+    </div>
+    <a-form :model="modalForm" ref="modalFormRef" :auto-label-width="true">
+      <a-row :gutter="24" style="margin-top: 35px">
+        <a-col :span="12">
+          <a-form-item field="avatar" :hide-label="true">
+            <a-input
+              :style="{width:'320px'}"
+              v-model="modalForm.card_num"
+              placeholder="请输入医生名字并选择想要添加的医生"
+            />
+          </a-form-item>
+        </a-col>
+      </a-row>
+
+      <a-divider />
       <div class="titlebox">
         <div class="bar"></div>
-        <div class="name">基本信息</div>
+        <div class="name">问诊类型</div>
       </div>
-      <a-form :model="modalForm"    ref="modalFormRef" :auto-label-width="true">
-        <a-row :gutter="24" style="margin-top: 35px;">
-          <a-col :span="12">
-            <a-form-item field="avatar" label="真实姓名：">
-              <span>{{modalForm.card_name}} （{{modalForm.sex==1?'男，':'女，'}}{{modalForm.age
-}}岁）</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item field="idCard" label="身份证号：" >
-              <div class="box" v-show="!showEye ">
-                <div class="cardNum">{{modalForm.id_number_mask}}</div>
-                <icon-eye-invisible class="eye" @click="handelDecryptCard(modalForm.user.user_id,modalForm.family_id)" />
-              </div>
-              <div class="box" v-show="showEye">
-                <div class="cardNum">{{id_card_num}}</div>
-                <icon-eye class="eye" @click="()=>{showEye=false}" />
-              </div>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24" v-if="modalForm.mobile_mask">
-          <a-col :span="12">
-            <a-form-item field="idCard" label="手机号码：" >
-              <div class="box" v-show="!family_Eye">
-                <div class="cardNum">{{modalForm.mobile_mask}}</div>
-                <icon-eye-invisible class="eye" @click="handleDecryptMobile(modalForm.user.user_id,modalForm.family_id)" />
-              </div>
-              <div class="box" v-show="family_Eye">
-                <div class="cardNum">{{family_mobile}}</div>
-                <icon-eye class="eye" @click="()=>{family_Eye=false}" />
-              </div>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-divider />
+      <a-row :gutter="24" style="margin-top: 35px">
+        <a-col :span="12">
+          <a-form-item field="avatar" :hide-label="true">
+            <a-select
+              v-model="modalForm.inquiry_type"
+              placeholder="请选择服务类型"
+              :style="{ width: '320px' }"
+            >
+              <!-- 1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药 -->
+              <a-option :value="1">专家问诊</a-option>
+              <a-option :value="2">快速问诊</a-option>
+              <a-option :value="3">公益问诊</a-option>
+              <a-option :value="4">问诊购药</a-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-divider />
+      <div class="typebox">
         <div class="titlebox">
-        <div class="bar"></div>
-        <div class="name">所属账号</div>
-      </div>
-        <a-row :gutter="24" style="margin-top: 35px;">
-          <a-col :span="12">
-            <a-form-item field="avatar" label="账号用户名：">
-              <span>{{modalForm.user.user_name}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-      
-            <a-form-item field="idCard" label="账号电话：" >
-              <div class="box" v-show="!count_Eye">
-                <div class="cardNum">{{modalForm.user.mobile}}</div>
-                <icon-eye-invisible class="eye" @click="handleDecryptMobile(modalForm.user.user_id)" />
-              </div>
-              <div class="box" v-show="count_Eye">
-                <div class="cardNum">{{count_mobile}}</div>
-                <icon-eye class="eye" @click="()=>{count_Eye=false}" />
-              </div>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item field="idCard" label="与就诊人关系：" >
-              <span v-if="modalForm.relation">{{formatRelation(modalForm.relation)}}</span>
-              <span v-else>-</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-divider />
-        <!-- <div class="titlebox">
           <div class="bar"></div>
-          <div class="name">病例信息</div>
+          <div class="name">问诊价格</div>
         </div>
         <a-row :gutter="24" style="margin-top: 35px;">
           <a-col :span="12">
-            
+            <a-input
+            :style="{width:'320px'}"
+              v-model="modalForm.card_num"
+              placeholder="请选择问诊价格"
+            />
           </a-col>
         </a-row>
-        <a-divider /> -->
+        <a-divider /> 
+        <div class="titlebox" >
+        <div class="bar"></div>
+        <div class="name">接诊数量</div>
+      </div>
+      <a-row :gutter="24" style="margin-top: 35px;" >
+        <a-col :span="24">
+          <a-form-item field="" label="" no-style>
+            <a-space  direction="vertical" size="large">
+              <a-input-number v-model="value" :style="{width:'320px'}" placeholder="Please Enter" class="input-demo" :min="10" :max="100"/>
+            </a-space>
+          </a-form-item>
+        </a-col>
+      </a-row> 
+      </div>
+      <div class="typebox">
+        <div class="titlebox">
+          <div class="bar"></div>
+          <div class="name">问诊日期</div>
+        </div>
+        <a-form>
+         <div class="timecon">
+          <div class="left">
+          <a-row :gutter="24" style="margin-top: 35px;">
+          <a-col :span="24">
+            <el-config-provider :locale="locale">
+              <a-form-item field="" label="问诊日期：" >
+            <el-date-picker
+        v-model="modalForm.value1"
+        type="dates"
+        placeholder="选择问诊日期（可多选）"
+      />
+    </a-form-item>
+    </el-config-provider>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24" >
+          <a-col :span="24">
+            <el-config-provider :locale="locale">
+              <a-form-item field="" label="问诊时间：" >
+            <el-date-picker
+        v-model="modalForm.value1"
+        type="dates"
+        placeholder="选择问诊日期（可多选）"
+      />
+    </a-form-item>
+    
+    </el-config-provider>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24" >
+          <a-col :span="24">
+            
+              <a-form-item field="" label="" >
+                <a-space>
+                  <a-button type="primary"
+            ><icon-check-circle /> 确定</a-button
+          >
+          <a-button @click="reset"><icon-loop /> 重置</a-button>
+                </a-space>
+              
+    </a-form-item>
 
-      </a-form>
-      <!-- <div class="titlebox" >
+          </a-col>
+          
+        </a-row>
+         </div>
+         <div class="line"></div>
+         <div class="right">
+          <a-form-item field="" label="" >
+               <div class="surebox">
+                <div class="title">已选问诊时间</div>
+              <div class="timebox">
+                <a-tag color="green" closable>111</a-tag>
+              </div>
+               </div>
+            </a-form-item>
+         </div>
+         </div>
+        </a-form>
+        <a-divider /> 
+        <div class="titlebox" >
+        <div class="bar"></div>
+        <div class="name">是否为坐班医生</div>
+      </div>
+      <a-row :gutter="24" style="margin-top: 35px;" >
+        <a-col :span="24">
+          <a-form-item field="" label="" no-style>
+            <a-space  direction="vertical" size="large">
+              <a-switch />
+            </a-space>
+          </a-form-item>
+        </a-col>
+      </a-row> 
+      <a-divider /> 
+      </div>
+    </a-form>
+    <div class="titlebox" >
         <div class="bar"></div>
         <div class="name">操作</div>
       </div>
@@ -95,99 +167,97 @@
         <a-col :span="24">
           <a-form-item field="" label="" no-style>
             <a-space >
-              <a-button type="primary" status="danger" @click="">禁用</a-button>
+              <a-button type="primary"  @click="">开启</a-button>
+              <a-button type="primary" status="danger" @click="">关闭</a-button>
             </a-space>
           </a-form-item>
         </a-col>
-      </a-row> -->
-    </a-modal>
+      </a-row> 
+  </a-modal>
 </template>
 <script setup>
-import {ref,toRefs} from 'vue';
-import {decryptCard} from '@/api/doctor/list';
-import {decryptMobile} from '@/api/patient/family';
-import {formatRelation} from "@/utils/format"
+import { ref, toRefs } from 'vue';
+import { addInquiryconfig } from '@/api/inquiry/config';
+import { formatRelation } from '@/utils/format';
+import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
+import { reactive } from 'vue';
 const props = defineProps({
   // 是否显示
   modalVisible: {
     type: Boolean,
     default: false,
-  },
-  modalForm: {
-    type: Object,
-  },
-});
-const emits = defineEmits(['familyVisibleChange']);
-const {modalVisible,modalForm} = toRefs(props);
-//切换小眼睛
-const showEye = ref(false);
-  const id_card_num = ref('');
-  //解密身份证号码
-  const handelDecryptCard = async (user_id,family_id) => {
-    showEye.value = true;
-    const { data, code, message } = await decryptCard({
-      user_id,
-      family_id
-    });
-    if (code == 200) {
-      id_card_num.value = data;
-    }
-  };
-  //切换手机号
-  const count_Eye= ref(false);
-  const family_Eye= ref(false);
-  const count_mobile=ref('');
-  const family_mobile=ref('')
-  const handleDecryptMobile=async(user_id,family_id='')=>{
-    let dataObj=null;
-    if(family_id){
-      dataObj={ user_id,family_id}
-      family_Eye.value=true
-    }else{
-      dataObj={ user_id,family_id};
-      count_Eye.value=true
-    }
-    const { data, code, message } = await decryptMobile(dataObj);
-    if(code==200){
-      if(family_id){
-        family_mobile.value=data
-      }else{
-        count_mobile.value=data;
-      }
-    }
   }
+});
+const  modalForm=reactive({
+  
+})
+const {modalVisible}=toRefs(props);
+const emits = defineEmits(['familyVisibleChange']);
+
+//添加配置
+const handleAddInquiryconfig = async () => {
+  const { data, code, message } = await AddInquiryconfig(modalForm);
+}
 // Akiraka 20230210 关闭弹窗
 const handleClose = () => {
   emits('familyVisibleChange', false);
 };
+const reset=()=>{
+  alert("重置")
+}
 </script>
 <style scoped>
-  .cardNum {
-    width: 150px;
-  }
- .arco-form-item-layout-horizontal:first-child,
-  .arco-form-item-layout-horizontal:nth-child(2) {
-    align-items: center;
-  }
-  .cellbox{
-    margin-top: 35px;
-  }
-  .cellbox .cell{
-    width:50%;
-    border-bottom:1px dashed #efefef;
-    margin-bottom: 20px;
-  }
-  .cellbox .cell:first-child{
-    border: none;
-  }
- 
-  .box {
-    display: flex;
-    align-items: center;
-  }
+.cardNum {
+  width: 150px;
+}
+.arco-form-item-layout-horizontal:first-child,
+.arco-form-item-layout-horizontal:nth-child(2) {
+  align-items: center;
+}
+.cellbox {
+  margin-top: 35px;
+}
+.cellbox .cell {
+  width: 50%;
+  border-bottom: 1px dashed #efefef;
+  margin-bottom: 20px;
+}
+.cellbox .cell:first-child {
+  border: none;
+}
 
-  .cert .arco-form-item-label-col {
-    flex: 0 0 8px !important;
-  }
+.box {
+  display: flex;
+  align-items: center;
+}
 
+.cert .arco-form-item-label-col {
+  flex: 0 0 8px !important;
+}
+.timebox{
+  min-height:200px;
+  width:300px;
+  margin-top: 20px;
+  padding: 20px;
+  border:1px solid  var(--color-neutral-3);
+  border-radius: 8px;
+}
+.timecon{
+  display: flex;
+  width: 1000px;
+  align-items: center;
+}
+.left{
+  width:400px
+}
+
+.right{
+  width:600px;
+  flex:1;
+}
+.line{
+  height: 240px;
+  width:2px;
+  background: var(--color-neutral-3);
+}
 </style>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 9868b05..91c3e3a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,6 +6,7 @@ import { Message, Modal, Notification } from '@arco-design/web-vue';
 import '@arco-design/web-vue/dist/arco.css';
 import router from './router/';
 import { parseTime } from '@/utils/parseTime';
+
 import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
 // Directive
 import permission from '@/directive/permission/permission';
diff --git a/src/views/inquiry/inquiry-list/index.vue b/src/views/inquiry/inquiry-list/index.vue
index 8e45571..65d4c49 100644
--- a/src/views/inquiry/inquiry-list/index.vue
+++ b/src/views/inquiry/inquiry-list/index.vue
@@ -75,7 +75,7 @@
         <template #action="{ record }">
           <a-space>
             <a-button v-has="'admin:sysFamilyList:detail'" type="text"
-              @click="handleDetail(record)"><icon-book />详情</a-button>
+              @click="handleDetail(record)"><icon-edit />修改</a-button>
             <!-- <a-button v-has="'admin:sysFamilyList:edit'" type="text" @click="handleUpdate(record)"><icon-edit />
               修改</a-button> -->
             <!-- <a-button v-has="'admin:sysFamilyList:remove'" type="text"
diff --git a/src/views/prescription/prescription-list/index.vue b/src/views/prescription/prescription-list/index.vue
index 773d79a..6046cfd 100644
--- a/src/views/prescription/prescription-list/index.vue
+++ b/src/views/prescription/prescription-list/index.vue
@@ -77,12 +77,12 @@
     <a-divider />
 
     <!-- action -->
-    <div class="action">
+   <!-- <div class="action">
       <a-space>
         <a-button v-has="'admin:sysPrescriptionList:add'" type="primary" @click="handleAdd"><icon-plus /> 新增 </a-button>
-        <!-- <a-button v-has="'admin:sysPrescriptionList:remove'" type="primary" status="danger"><icon-delete /> 批量删除 </a-button> -->
+         <a-button v-has="'admin:sysPrescriptionList:remove'" type="primary" status="danger"><icon-delete /> 批量删除 </a-button> 
       </a-space>
-    </div>
+    </div>-->
 
     <!-- table -->
     <a-table :columns="columns" :data="tableData" 
diff --git a/vite.config.js b/vite.config.js
index 1a69d47..b2574ac 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -3,7 +3,8 @@ import { defineConfig } from 'vite';
 import { viteMockServe } from 'vite-plugin-mock';
 import vue from '@vitejs/plugin-vue';
 import svgLoader from 'vite-svg-loader';
-import { VuetifyResolver } from 'unplugin-vue-components/resolvers';
+import { VuetifyResolver,ElementPlusResolver } from 'unplugin-vue-components/resolvers';
+import AutoImport from 'unplugin-auto-import/vite'
 import Components from 'unplugin-vue-components/vite';
 import viteCompression from 'vite-plugin-compression'
 
@@ -21,8 +22,11 @@ export default defineConfig({
     viteCompression({
       threshold: 1024000 // 对大于 1mb 的文件进行压缩
     }),
+    AutoImport({
+      resolvers: [ElementPlusResolver()]
+    }),
     Components({
-      resolvers: [VuetifyResolver()],
+      resolvers: [VuetifyResolver(),ElementPlusResolver()],
       include: [/\.vue$/, /\.vue\?vue/, /\.md$/],
     }),
   ],