优化代码

src/api/inpatient/xiang-mu-lu-ru.js

@@ -109,6 +109,7 @@ export function getBingQuDuiYingKeShi(ward) {
         params: {ward},
     })
 }
+
 export function weiGuiFeiYongFenXi(inpatientNo, execUnit) {
     return request({
         url: '/xmlr/weiGuiFeiYongFenXi',

src/components/medical-insurance/medicine-return-order/GenerateMedicineReturnOrder.vue

@@ -19,7 +19,7 @@
             value-format="YYYY-MM-DD"/>
       </div>
       <el-divider direction="vertical"/>
-      <el-button @click="submit">取数</el-button>
+      <el-button @click="clickToAccess">取数</el-button>
       <el-button @click="generateClick">生成药单</el-button>
       <el-button @click="queryTheMedicineList">查询药单</el-button>
       <el-button type="primary" icon="Printer" @click="printThePrescription">打印</el-button>
@@ -111,12 +111,13 @@ let data = $ref({
 })
 let groupNo = $ref('73')
 
-const submit = () => {
-  let dateS = getDateRangeFormatDate(dateRange.value)
-  if (stringIsBlank(dateS.startTime)) {
+// 获取未生成的药单
+const clickToAccess = () => {
+  let {startTime, endTime} = getDateRangeFormatDate(dateRange.value)
+  if (stringIsBlank(startTime)) {
     BizException(ExceptionEnum.MESSAGE_ERROR, "时间不能为空。")
   }
-  getNoMedicineReturnOrderGenerated(dateS.startTime, dateS.endTime, groupNo).then((res) => {
+  getNoMedicineReturnOrderGenerated(startTime, endTime, groupNo).then((res) => {
     data.notGenerated = res
     data.pageNo = null
   });
@@ -130,8 +131,8 @@ const generateClick = async () => {
   if (listIsBlank(data.notGenerated)) {
     BizException(ExceptionEnum.MESSAGE_ERROR, "请先取数")
   }
-  let dateS = getDateRangeFormatDate(dateRange.value)
-  data.pageNo = await generateMedicationList(dateS.startTime, dateS.endTime, groupNo)
+  let {startTime, endTime} = getDateRangeFormatDate(dateRange.value)
+  data.pageNo = await generateMedicationList(startTime, endTime, groupNo)
   data.toGenerate = clone(data.notGenerated)
   await queryTheMedicineList()
 }

src/components/xiao-chan/dialog/XcDialogV2.vue

@@ -4,6 +4,8 @@
                :title="props.title"
                :show-close="false"
                draggable
+               :close-on-press-escape="!props.manualShutdown"
+               :close-on-click-modal="!props.manualShutdown"
                :width="props.width"
                @closed="closed"
                :fullscreen="fullScreen">
@@ -16,7 +18,7 @@
             {{ title }}
           </div>
         </div>
-        <div class="xc-dialog-v2__icon">
+        <div class="xc-dialog-v2__icon" v-if="!props.manualShutdown">
           <div style="background-color: rgb(253,201,45)">
             <i class="iconfont icon-suoxiao"/>
           </div>
@@ -35,7 +37,6 @@
       <template #footer>
         <slot name="footer"/>
       </template>
-
     </el-dialog>
   </div>
 </template>
@@ -67,6 +68,10 @@ const props = defineProps({
   maximize: {
     type: Boolean,
     default: false
+  },
+  manualShutdown: {
+    type: Boolean,
+    default: false
   }
 })