dev

src/components/charge/OrderDetail.vue

@@ -198,16 +198,16 @@ const close = () => {
 defineExpose({init})
 const refund = () => {
   console.log(orderInfo.value)
-  post("retail/refund",{orderId:orderInfo.value.id}).then((res:any)=>{
+  post("charge/refund",{changeOrderCode:orderInfo.value.code}).then((res:any)=>{
     close()
   })
 }
-const cancel = () => {
-  post("retail/cancelOrder",{orderId:orderInfo.value.id}).then((res:any)=>{
-    close()
-  })
-
-}
+// const cancel = () => {
+//   post("retail/cancelOrder",{orderId:orderInfo.value.id}).then((res:any)=>{
+//     close()
+//   })
+//
+// }
 const wsStore = useWsStore();
 // 定义 medType 的合法键类型
 type MedTypeKey = keyof typeof medTypeJson;

src/views/member/index.vue

@@ -122,8 +122,11 @@
                 </el-table-column>
                 <el-table-column label="状态" width="100">
                   <template #default="scope">
-                    <el-tag v-if="scope.row.status==0" type="info">{{ getStatusStr(scope.row.status) }}</el-tag>
+                    <el-tag v-if="scope.row.status==0 || scope.row.status==2 " type="info">
+                      {{ getStatusStr(scope.row.status) }}
+                    </el-tag>
                     <el-tag v-if="scope.row.status==1" type="success">{{ getStatusStr(scope.row.status) }}</el-tag>
+                    <el-tag v-if="scope.row.status==3" type="danger">{{ getStatusStr(scope.row.status) }}</el-tag>
                   </template>
                 </el-table-column>
                 <el-table-column label="支付时间" prop="payTime">
@@ -161,7 +164,7 @@
   <Mask :is-show="isFlowingWater" @close="isFlowingWater = false" title="流水记录">
     <FlowingWater :info="listItem"></FlowingWater>
   </Mask>
-  <OrderDetail ref="orderDetailRef"></OrderDetail>
+  <OrderDetail ref="orderDetailRef" @updateOrderList="getChargeList(listItem.id)"></OrderDetail>
 </template>
 <script setup lang="ts">
 import {ref, onMounted, nextTick} from 'vue'

src/views/social/costRecord.vue

@@ -18,8 +18,8 @@
         <el-table-column prop="projectCode" label="订单号" width="240"></el-table-column>
         <el-table-column prop="source" label="结算类型" width="180">
           <template #default="scope">
-            <el-tag v-if="scope.row.source == 0" type="success">零售</el-tag>
-            <el-tag v-else>{{ scope.row.source }}</el-tag>
+            <el-tag v-if="scope.row.source == 0" type="success">门诊收费</el-tag>
+            <el-tag v-if="scope.row.source == 1" type="success">门诊退费</el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="payType" label="支付类型" width="180">