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

src/components/charge/ChargeQueue.vue

@@ -148,6 +148,11 @@ const statusList = ref([
     num: 0,
     value: 1
   },
+  {
+    label: '已退',
+    num: 0,
+    value: 2
+  }
 ])
 const tab = (item: any) => {
   query.value.status = item.value

src/components/charge/TotalPrice.vue

@@ -23,10 +23,11 @@ const openSettlement =()=>{
   <Panel :showTools="false" :showHeader="false">
     <div class="footer">
       <div>总金额：<span class="text icon">￥</span><span class="text">{{ totalAmount || '0' }}</span></div>
-      <div class="btn-group" v-if="status">
-        <span class="default-btn" @click="openCheckOut">追溯码</span>
-        <span class="default-btn" @click="openSettlement" style="margin-left: 24px">收费</span>
-
+      <div class="btn-group">
+        <span class="default-btn" @click="openCheckOut" v-if="status ==0">追溯码</span>
+        <span class="default-btn" @click="openSettlement" style="margin-left: 24px" v-if="status ==0">收费</span>
+        <span class="default-btn" @click="" v-if="status ==1 || status == 2">打印</span>
+        <span class="default-btn" @click="" style="margin-left: 24px" v-if="status ==1">退费</span>
       </div>
     </div>
   </Panel>

src/views/charge/index.vue

@@ -57,7 +57,7 @@
       <div class="bottom">
         <TotalPrice v-model="formData.totalPrice"
                     @save="charge"
-                    :status="formData.status ==0"
+                    :status="formData.status"
                     @openSettlement="charge"
                     @openCheckOut="openCheckoutDetail(formData.goodsDetail,formData.patientRegistration.psnNo)"