Merge branch 'dev'1.7bugxiufu

src/api/order/list.js

@@ -1,132 +1,124 @@
-import request from '../../utils/request'
-const url = '/admin/order/inquiry';
-export function getOrderList(params){
-  return request({
-    url:'/admin/order/inquiry',
-    method: 'get',
-    params
-  })
-}
-export function getList(){
-  return request({
-    url:'https://twx.igandan.org/book/drughand/getDrugList',
-    method: 'GET',
-    dataType: 'json'
-  })
-}
-export function getOrderDetail(id){
-    return request({
-      url:`${url}/${id}`,
-      method: 'get'
-    })
-  }
-export function productList(params){ //药品列表
-    return request({
-      url:'/admin/order/product',
-      method: 'get',
-      params
-    })
-}
-export function getProductDetail(id){//药品列表
-  return request({
-    url:`/admin/order/product/${id}`,
-    method: 'get'
-  })
-}
-export function cancelInquiry(id,data){//取消问诊
-  return request({
-    url:`/admin/order/inquiry/cancel/${id}`,
-    method: 'put',
-    data
-  })
-}
-export function cancelProduct(id,data){//取消药品
-  return request({
-    url:`/admin/order/product/cancel/${id}`,
-    method: 'put',
-    data
-  })
-}
-export function reportPrePscription(id){//上报处方
-  return request({
-    url:`/admin/order/report/pre/${id}`,
-    method: 'post'
-  })
-}
-export function lookAddress(id){//解密收货人地址
-  return request({
-    url:`/decrypt/order/product/consignee/${id}`,
-    method: 'get'
-  })
-}
-export function inquiryCase(id){//病例详情
-  return request({
-    url:`/admin/case/inquiry/${id}`,
-    method: 'get'
-  })
-}
-export function getIm(params){//获取im分页
-  return request({
-    url:`/admin/order/inquiry/im`,
-    method: 'get',
-    params
-  })
-}
- 
-export function exportInquiry(data){//导出问诊订单
-  return request({
-    url:'/admin/export/order/inquiry',
-    method: 'post',
-    data
-  })
-}
-export function exportProduct(data){//导出药品订单
-  return request({
-    url:'/admin/export/order/product',
-    method: 'post',
-    data
-  })
-}
-
-export function getServiceList(data){//服务列表
-  return request({
-    url:'/admin/order/service/page',
-    method: 'post',
-    data
-  })
-}
-export function serviceDetail(id){//服务包详情
-  return request({
-    url:`/admin/order/service/${id}`,
-    method: 'get'
-  })
-}
-export function serviceRightDetail(id){//服务包权益详情
-  return request({
-    url:`/admin/order/service/detail/${id}`,
-    method: 'get'
-  })
-}
-
-export function cancelService(id,data){//取消服务包-取消订单
-  return request({
-    url:`/admin/order/service/cancel/${id}`,
-    method: 'put',
-    data
-  })
-}
-export function exportService(data){//导出服务包
-  return request({
-    url:'/admin/export/order/service',
-    method: 'post',
-    data
-  })
-}
-
-export function hideInquiry(id, data){//年度审查隐藏
-  return request({
-    url:`/admin/order/inquiry/hide/${id}`,
-    method: 'put',
-    data
-  })
-}␍
+import request from '../../utils/request'
+const url = '/admin/order/inquiry';
+export function getOrderList(params){
+  return request({
+    url:'/admin/order/inquiry',
+    method: 'get',
+    params
+  })
+}
+export function getList(){
+  return request({
+    url:'https://twx.igandan.org/book/drughand/getDrugList',
+    method: 'GET',
+    dataType: 'json'
+  })
+}
+export function getOrderDetail(id){
+    return request({
+      url:`${url}/${id}`,
+      method: 'get'
+    })
+  }
+export function productList(params){ //药品列表
+    return request({
+      url:'/admin/order/product',
+      method: 'get',
+      params
+    })
+}
+export function getProductDetail(id){//药品列表
+  return request({
+    url:`/admin/order/product/${id}`,
+    method: 'get'
+  })
+}
+export function cancelInquiry(id,data){//取消问诊
+  return request({
+    url:`/admin/order/inquiry/cancel/${id}`,
+    method: 'put',
+    data
+  })
+}
+export function cancelProduct(id,data){//取消药品
+  return request({
+    url:`/admin/order/product/cancel/${id}`,
+    method: 'put',
+    data
+  })
+}
+export function reportPrePscription(id){//上报处方
+  return request({
+    url:`/admin/order/report/pre/${id}`,
+    method: 'post'
+  })
+}
+export function lookAddress(id){//解密收货人地址
+  return request({
+    url:`/decrypt/order/product/consignee/${id}`,
+    method: 'get'
+  })
+}
+export function inquiryCase(id){//病例详情
+  return request({
+    url:`/admin/case/inquiry/${id}`,
+    method: 'get'
+  })
+}
+export function getIm(params){//获取im分页
+  return request({
+    url:`/admin/order/inquiry/im`,
+    method: 'get',
+    params
+  })
+}
+ 
+export function exportInquiry(data){//导出问诊订单
+  return request({
+    url:'/admin/export/order/inquiry',
+    method: 'post',
+    data
+  })
+}
+export function exportProduct(data){//导出药品订单
+  return request({
+    url:'/admin/export/order/product',
+    method: 'post',
+    data
+  })
+}
+
+export function getServiceList(data){//服务列表
+  return request({
+    url:'/admin/order/service/page',
+    method: 'post',
+    data
+  })
+}
+export function serviceDetail(id){//服务包详情
+  return request({
+    url:`/admin/order/service/${id}`,
+    method: 'get'
+  })
+}
+export function serviceRightDetail(id){//服务包权益详情
+  return request({
+    url:`/admin/order/service/detail/${id}`,
+    method: 'get'
+  })
+}
+
+export function cancelService(id,data){//取消服务包-取消订单
+  return request({
+    url:`/admin/order/service/cancel/${id}`,
+    method: 'put',
+    data
+  })
+}
+export function exportService(data){//导出服务包
+  return request({
+    url:'/admin/export/order/service',
+    method: 'post',
+    data
+  })
+}

src/components/chatRecord.vue

@@ -209,14 +209,12 @@ const HandleGetIm = async (params = {}) => {
     console.log(chatlist.value)
     if(!firstIn.value){
       nextTick(() => {
-        try {
-         // 要放在对响应式数据修改之后
-      let ele = document.querySelector('.phonecont');
-      ele.scrollTop = ele.scrollHeight;
-      } catch (error) {
-       
-      }
-     
+      // 要放在对响应式数据修改之后
+       try {
+        let ele = document.querySelector('.phonecont');
+        ele.scrollTop = ele.scrollHeight;
+       } catch (error) {
+       }
     });
     }
 

src/router/index.js

@@ -91,12 +91,13 @@ router.beforeEach(async(to, from, next) => {
       const menuList= permissionStore.menuList;
       next({ path: menuList[0].children[0].path });
    } else {
-    if(to.path=="/" || to.path=="/admin"){
-      const menuList= permissionStore.menuList;
-      next({ path: menuList[0].children[0].path });
-     }else{
-      next();
-     }
+       if(to.path=="/" || to.path=="/admin"){
+        const menuList= permissionStore.menuList;
+        next({ path: menuList[0].children[0].path });
+       }else{
+        next();
+       }
+
     }
 
   }

src/views/order/order-list/index.vue

@@ -145,11 +145,6 @@
         <a-space>
           <a-button v-has="'admin:sysOrderList:detail'" type="text"
             @click="handleDetail(record)"><icon-book />详情</a-button>
-          <a-button v-has="'admin:sysOrderList:hide'" type="text" @click="handleHide(record)">
-            <icon-eye-invisible v-if="record.annual_review_hide !== 1" />
-            <icon-eye v-else />
-            {{ record.annual_review_hide === 1 ? '取消隐藏' : '隐藏' }}
-          </a-button>
           <!-- <a-button v-has="'admin:sysPost:remove'" type="text" @click="() => { deleteVisible = true; deleteData = [record.post_id];  }"><icon-delete /> 删除</a-button> -->
         </a-space>
       </template>
@@ -479,7 +474,7 @@
 
 <script setup>
 import { reactive, ref, getCurrentInstance, onMounted, nextTick, watch } from 'vue';
-import {exportInquiry, getOrderList,getOrderDetail,cancelInquiry,inquiryCase,hideInquiry} from '@/api/order/list';
+import {exportInquiry, getOrderList,getOrderDetail,cancelInquiry,inquiryCase} from '@/api/order/list';
 import { parseTime } from '@/utils/parseTime';
 import {formatDoctorTitle,formatOrderCancelReason,formatMode} from "@/utils/format"
 import { downloadFile } from '@/utils/downloadFile';
@@ -602,7 +597,7 @@ const columns = [
   { title: '支付方式', dataIndex: 'inquiry_pay_channel',slotName:  'inquiry_pay_channel'},
   { title: '订单状态', dataIndex: 'inquiry_status', slotName:'inquiry_status' },
   { title: '支付时间', dataIndex: 'pay_time', slotName: 'pay_time',width:200 },
-  { title: '操作', slotName: 'action',fixed: "right", width: 180  },
+  { title: '操作', slotName: 'action',fixed: "right", width: 100  },
 ];
 
 // Table Data
@@ -696,18 +691,6 @@ const handleQuery = async () => {
   getOrderInfo(params);
 };
 
-const handleHide = async (record) => {
-  const annual_review_hide = record.annual_review_hide === 1 ? 0 : 1;
-  const { code, message } = await hideInquiry(record.order_inquiry_id, { annual_review_hide });
-  if (code == 200) {
-    proxy.$notification.success(annual_review_hide === 1 ? '隐藏成功' : '取消隐藏成功');
-    record.annual_review_hide = annual_review_hide;
-    // getOrderInfo({ ...pager, ...queryForm }); // 避免全局刷新导致重新获取的数据里没有该字段，这里直接局部更新
-  } else {
-    proxy.$notification.error(message || '操作失败');
-  }
-};
-
 //获取订单详情
  const handleDetail = async (record) => {
     modalVisible.value = true;