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

# Conflicts:
#	src/components/registration/Edit.vue

src/components/charge/ChargeQueue.vue

@@ -85,6 +85,7 @@ const clickFirst = () => {
   clickItem(ChargeQueueList.value[0])
 }
 const getOrderList = () => {
+  debugger
   post("medical/record/getChargeQueue", {query: query.value}).then(
       (res: any) => {
         ChargeQueueList.value = res.list

src/components/charge/GoodsDetail.vue

@@ -1,8 +1,8 @@
 <template>
   <el-table :data="data.goodsDetail" max-height="150" style="width: 100%">
     <el-table-column prop="name" label="名称" show-overflow-tooltip ></el-table-column>
-    <el-table-column prop="selectedPrice" label="单价" width="100"></el-table-column>
+    <el-table-column prop="selectedPrice" label="单价" ></el-table-column>
-    <el-table-column prop="number" label="数量" width="200">
+    <el-table-column prop="number" label="数量" >
       <template #default="scope">
         <div v-if="data.status == 0">
           <el-input-number v-model="scope.row.selectedNum" min="0" @change="handleNumChange"></el-input-number>
@@ -24,9 +24,9 @@
 
       </template>
     </el-table-column>
-    <el-table-column label="操作" v-if="data.status == 0" width="60">
+    <el-table-column label="操作" v-if="data.status == 0" >
       <template #default="scope">
-        <div  @click="delGoods(scope.row)">X</div>
+        <el-button type="danger" link @click="delGoods(scope.row)">X</el-button>
       </template>
     </el-table-column>
   </el-table>
@@ -43,7 +43,7 @@ const props = defineProps({
 })
 const data = defineModel<any>();
 const delGoods = (item: any) => {
-  data.value.goodsDetail = data.value.filter((i: any) => i.id != item.id)
+  data.value.goodsDetail = data.value.goodsDetail.filter((i: any) => i.id != item.id)
 }
 
 const goodsSearchApi = "goods/goods/search";

src/components/charge/ServiceDetail.vue

@@ -23,7 +23,7 @@ import SearchInput from "@/components/SearchInput.vue";
 
 const data = defineModel<any>();
 const delService = (item: any) => {
-  data.value.itemDetail = data.value.filter((i: any) => i.id != item.id)
+  data.value.itemDetail = data.value.itemDetail.filter((i: any) => i.id != item.id)
 }
 const serviceSearchApi = "item/search";
 const serviceShowConfig = [

src/components/charge/Settlement.vue

@@ -47,6 +47,7 @@ import CardPay from "@/components/charge/CardPay.vue";
 import {medTypeJson, priceBtnList} from "@/assets/config/constants.ts"
 import {useWsStore} from "@/stores/wsStore.ts";
 import PersonalPayment from "@/components/charge/PersonalPayment.vue";
+import {ElMessage} from "element-plus";
 const wsStore = useWsStore();
 const socialCard =defineModel<any>();
 const prop=defineProps({
@@ -94,6 +95,7 @@ const completeSettlement = ()=>{
 
 const orderCompleted = ()=>{
   show.value = false;
+  ElMessage.success("保存成功")
   emit('orderComplete',printReceipt.value)
 }
 const orderCanceled = ()=>{

src/components/settings/ItemEdit.vue

@@ -10,19 +10,19 @@
               一键建档
             </el-button>
           </div>
-          <el-form :model="form" label-width="auto" :rules="formRules">
+          <el-form :model="form" label-width="auto" :rules="formRules" ref="formRef">
             <el-descriptions
                 :column="2"
                 direction="vertical"
                 border
             >
               <el-descriptions-item label="项目名称">
-                <el-form-item>
+                <el-form-item prop="itemName">
                   <el-input v-model="form.itemName"/>
                 </el-form-item>
               </el-descriptions-item>
               <el-descriptions-item label="单位">
-                <el-form-item>
+                <el-form-item prop="unit">
                   <el-popover
                       placement="bottom"
                       title="Title"
@@ -45,8 +45,8 @@
                 </el-form-item>
               </el-descriptions-item>
               <el-descriptions-item label="售价">
-                <el-form-item>
+                <el-form-item prop="unitPrice">
-                  <el-input v-model="form.unitPrice">
+                  <el-input v-model.number="form.unitPrice">
                     <template #prefix>￥</template>
                   </el-input>
                 </el-form-item>
@@ -116,27 +116,35 @@ const close = () => {
   emit('close')
 }
 const id = props.id
+const formRef = ref<any>()
 const save = () => {
-  if (props.add) {
+  formRef.value?.validate((valid: boolean) => {
-    if (props.menuId) {
+    if (!valid) {
-      form.value.name = form.value.itemName
+      return;
-      post('save', {data: form.value, id: props.menuId}).then(() => {
+    }
+    // 如果验证通过，发送请求
+    if (props.add) {
+      if (props.menuId) {
+        form.value.name = form.value.itemName
+        post('save', {data: form.value, id: props.menuId}).then(() => {
+          close()
+        })
+      } else {
+        post('save', {data: form.value}).then(() => {
+          close()
+        })
+      }
+    } else if (id) {
+      post("item/edit", {data: form.value}).then(() => {
         close()
       })
     } else {
-      post('save', {data: form.value}).then(() => {
+      post("item/add", {data: form.value}).then(() => {
         close()
       })
     }
-  } else if (id) {
+  });
-    post("item/edit", {data: form.value}).then(() => {
+
-      close()
-    })
-  } else {
-    post("item/add", {data: form.value}).then(() => {
-      close()
-    })
-  }
 
 }
 const imageURL = (e: any) => {
@@ -179,8 +187,13 @@ const formRules = {
   ],
   unit: [
     {required: true, message: '请输入单位', trigger: 'blur'},
-    {type: 'number', message: '单位必须为数字值'}
+
   ],
+  unitPrice:[
+    {required: true, message: '请输入售价', trigger: 'blur'},
+    {type: 'number', message: '单位必须为数字值'}
+  ]
+
 }
 defineExpose({init})
 </script>

src/views/charge/index.vue

@@ -43,8 +43,8 @@
             <GoodsDetail v-model="formData" @totalPriceChange="getOrderTotalPrice"></GoodsDetail>
           </Panel>
         </div>
-        <div class="bottom">
+        <div class="bottom" v-if="formData.status == 0">
-          <TotalPrice v-model="formData.totalPrice" @edit="saveAndCharge"></TotalPrice>
+          <TotalPrice v-model="formData.totalPrice" @edit="saveAndCharge" ></TotalPrice>
         </div>
       </el-scrollbar>
     </div>

src/views/outpatient/index.vue

@@ -86,6 +86,8 @@ const save = () => {
   }
   post('medical/record/save', {data: data}).then(() => {
     ElMessage.success("保存成功")
+
+
   })
 }
 const totalAmount = ref(0)