Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

src/components/registration/List.vue

@@ -38,7 +38,12 @@ const visitType = ref<any>({
 })
 const roleList = ref<any>([])
 const initDoctor=()=> {
-  post('organization/member/allDoctorList').then((res: any) => {
+  let query={
+    name: null,
+    sectionId:  null,
+    role:1
+  }
+  post('organization/member/search',{query:query}).then((res: any) => {
     roleList.value=res
   })
 }

src/components/retail/OrderDetail.vue

@@ -1,37 +1,68 @@
 <template>
-  <Mask :width="1000" :height="560" :is-show="show" @close="show = false">
+  <Mask :width="1000" :height="560" :is-show="show" @close="show = false" title="订单详情">
     <div class="container">
       <div class="title">
         <CloseBtn @click="show = false"></CloseBtn>
       </div>
       <div class="content">
         <div class="left">
-          <el-table border  :header-cell-style="{ backgroundColor: '#f5f7fa' }" :data="orderInfo.retailOrderList" style="height: 100%">
-            <el-table-column label="商品" prop="goodsName" show-overflow-tooltip></el-table-column>
-            <el-table-column label="数量" prop="number" width="60" show-overflow-tooltip></el-table-column>
-            <el-table-column label="单位" prop="unit" width="60" show-overflow-tooltip></el-table-column>
-            <el-table-column label="单价"  show-overflow-tooltip>
+          <div class="goods-detail">
+            <div class="title">药品详情</div>
+          <el-table border  :header-cell-style="{ backgroundColor: '#f5f7fa' }"  :data="orderInfo.goodsDetail" style="height: 100%">
+            <el-table-column label="商品" prop="name"  width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column label="数量" prop="number" width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column label="单位" prop="unit" width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column label="单价"  width="100"  show-overflow-tooltip>
               <template #default="scope">
                 {{ scope.row.preUnitPrice }}元
               </template>
             </el-table-column >
-            <el-table-column label="实价"  show-overflow-tooltip>
+            <el-table-column label="实价" width="100" show-overflow-tooltip>
               <template #default="scope">
                 {{ scope.row.unitPrice }}元
               </template>
             </el-table-column>
-            <el-table-column label="小计"  show-overflow-tooltip>
+            <el-table-column label="小计" width="100" show-overflow-tooltip>
               <template #default="scope">
                 {{ scope.row.subTotalPrice }}元
               </template>
             </el-table-column>
             <el-table-column label="追溯码"  show-overflow-tooltip>
               <template #default="scope">
-                {{ scope.row.traceabilityCode.length ==2 ?"未绑定追溯码":scope.row.traceabilityCode}}
+                {{ scope.row.traceabilityCode?.length ==2 ?"未绑定追溯码":scope.row.traceabilityCode}}
               </template>
             </el-table-column>
           </el-table>
           </div>
+          <div class="service-detail">
+          <div class="title">服务详情</div>
+          <el-table border  :header-cell-style="{ backgroundColor: '#f5f7fa' }" :data="orderInfo.serviceDetail" style="height: 100%">
+            <el-table-column label="商品" prop="name" width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column label="数量" prop="number" width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column label="单位" prop="unit" width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column label="单价" width="100" show-overflow-tooltip>
+              <template #default="scope">
+                {{ scope.row.preUnitPrice }}元
+              </template>
+            </el-table-column >
+            <el-table-column label="实价" width="100" show-overflow-tooltip>
+              <template #default="scope">
+                {{ scope.row.unitPrice }}元
+              </template>
+            </el-table-column>
+            <el-table-column label="小计" width="100" show-overflow-tooltip>
+              <template #default="scope">
+                {{ scope.row.subTotalPrice }}元
+              </template>
+            </el-table-column>
+            <el-table-column label="追溯码"  show-overflow-tooltip>
+              <template #default="scope">
+                -
+              </template>
+            </el-table-column>
+          </el-table>
+          </div>
+        </div>
         <div class="right">
           <div class="right_head">
             <div class="title">支付信息</div>
@@ -97,13 +128,13 @@
         </div>
       </div>
       <div class="footer">
-       <el-button type="primary" plain>追溯码</el-button>
+<!--       <el-button type="primary" plain>追溯码</el-button>-->
       <div>
-        <el-button type="danger" plain @click="cancel" v-if="orderInfo.status == 0">取消</el-button>
-        <el-button type="danger" plain @click="refund" v-if="orderInfo.status == 1">退款</el-button>
-        <el-button type="primary" @click="print" v-if="orderInfo.status == 1">
-          打印<el-icon class="el-icon--right"><Upload /></el-icon>
-        </el-button>
+<!--        <el-button type="danger" plain @click="cancel" v-if="orderInfo.status == 0">取消</el-button>-->
+<!--        <el-button type="danger" plain @click="refund" v-if="orderInfo.status == 1">退款</el-button>-->
+<!--        <el-button type="primary" @click="print" v-if="orderInfo.status == 1">-->
+<!--          打印<el-icon class="el-icon&#45;&#45;right"><Upload /></el-icon>-->
+<!--        </el-button>-->
       </div>
       </div>
     </div>
@@ -249,7 +280,20 @@ onUnmounted(() => {
       height: 100%;
       margin-right: 10px;
       min-height: 0;
-      background: #a1c4fd;
+      .goods-detail{
+
+        height: 40%;
+        .title{
+          font-weight: bold;
+        }
+      }
+      .service-detail{
+        height: 40%;
+        margin-top: 50px;
+        .title{
+          font-weight: bold;
+        }
+      }
     }
 
     .right {

src/views/member/index.vue

@@ -96,7 +96,6 @@
                       @cell-click="openDetail">
               <el-table-column label="单号" prop="code" show-overflow-tooltip>
               </el-table-column>
-              <el-table-column label="商品"></el-table-column>
               <el-table-column label="创建时间" prop="createDatetime">
                 <template #default="scope">
                   {{ formatDate(scope.row.createDatetime) }}
@@ -228,6 +227,7 @@ const init = () => {
         item.levelName = res.name;
       });
     });
+    getChargeList(listItem.value.id);
 
 
   });
@@ -249,7 +249,7 @@ const closeExchange = () => {
 const btn = (item: any, i: number) => {
   index.value = i
   listItem.value = item
-  purchase(item.id)
+  getChargeList(listItem.value.id)
 }
 //点击发放
 const openGrant = () => {
@@ -258,11 +258,11 @@ const openGrant = () => {
 //消费时间
 const tableData = ref([])
 const orderDetailRef = ref<any>();
-const purchase = (id: any) => {
+const getChargeList = (id: any) => {
   const query = {
     page: page.value,
     pageSize: pageSize.value,
-    vipId: id
+    patientId: id
   }
   post('charge/list', {query}).then((res: any) => {
     tableData.value = res.list
@@ -320,7 +320,7 @@ const pageSize = ref(10)
 const page = ref(1)
 const handleCurrentChange = (val: number) => {
   page.value = val
-  purchase(listItem.value.id)
+  getChargeList(listItem.value.id)
 };
 const levelEditRef = ref();
 const openLevelEdit = (vip: any) => {

src/views/registration/index.vue

@@ -69,7 +69,12 @@ onMounted(() => {
   getPatientList()
 })
 const initDoctor = () => {
-  post('organization/member/allDoctorList').then((res: any) => {
+  let query={
+    name: null,
+    sectionId:  null,
+    role:1
+  }
+  post('organization/member/search',{query:query}).then((res: any) => {
     roleList.value = res
   })
 }