dev
This commit is contained in:
parent
a0c20212cc
commit
e9a3464f62
|
|
@ -27,6 +27,10 @@
|
|||
<span>领用药品</span>
|
||||
<div class="search">
|
||||
<GoodsSearch @selectCallBack="goodsSelectCallBack"></GoodsSearch>
|
||||
<span class="default-btn" @click="goodsSelectCallBack">
|
||||
<span class="iconfont icon-RectangleCopy"></span>
|
||||
搜索
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<table class="simple-table" style="margin-top: 15px;width: 100% ;height:300px ;max-height:550px">
|
||||
|
|
@ -127,8 +131,8 @@
|
|||
</div>
|
||||
<template #footer>
|
||||
<div class="bottom">
|
||||
<el-button type="primary" @click="save">保存</el-button>
|
||||
<el-button type="primary" @click="exit">关闭</el-button>
|
||||
<span class="small-btn" @click="exit">关闭</span>
|
||||
<span class="small-btn" @click="save">保存</span>
|
||||
</div>
|
||||
</template>
|
||||
</Mask>
|
||||
|
|
@ -187,9 +191,7 @@ const findIndexForTableList = (goodId: any) => {
|
|||
return tableList.value.findIndex((item: any) => item.goodId === goodId);
|
||||
}
|
||||
const goodsSelectCallBack = (inventory: any) => {
|
||||
if (findIndexForTableList(inventory.goodId) != -1) {
|
||||
return
|
||||
}
|
||||
if (findIndexForTableList(inventory.goodId) != -1) return
|
||||
post("inventory/goods/getByGoodsId", {goodsId: inventory.goodId,isZero:false}).then((res: any) => {
|
||||
inventory.batchList = res.inventoryGoodsList
|
||||
inventory.minPackagingUnit = res.minPackagingUnit
|
||||
|
|
@ -398,7 +400,8 @@ defineExpose({init})
|
|||
font-style: normal;
|
||||
|
||||
.search {
|
||||
width: 50%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -48,8 +48,8 @@
|
|||
</div>
|
||||
<template #footer>
|
||||
<div class="bottom">
|
||||
<span class="default-btn" @click="save">确定</span>
|
||||
<span class="default-btn" @click="close" style="margin-left: 24px">取消</span>
|
||||
<span class="small-btn" @click="close">取消</span>
|
||||
<span class="small-btn" @click="save">确定</span>
|
||||
</div>
|
||||
</template>
|
||||
</Mask>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<template xmlns="http://www.w3.org/1999/html">
|
||||
<template>
|
||||
<div class="container">
|
||||
<div class="left">
|
||||
<chargeQueue @clickItem="clickItem" @getStatus="getStatus" ref="chargeQueueRef"></ChargeQueue>
|
||||
|
|
@ -338,13 +338,11 @@ const list = () => {
|
|||
}
|
||||
const getStatus = (status: any) => {
|
||||
statusDisabled.value = status
|
||||
formData.value = {
|
||||
patientInfo: {},
|
||||
diagnosisMedicalRecord: {},
|
||||
goodsDetail: [],
|
||||
itemDetail: [],
|
||||
patientRegistration: {}
|
||||
}
|
||||
initFormData()
|
||||
nextTick(() => {
|
||||
patientCardRef.value?.clear()
|
||||
recordsConsumptionRef.value?.clearList();
|
||||
})
|
||||
}
|
||||
//退费
|
||||
const refund = async () => {
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<span class="iconfont icon-RectangleCopy1"></span>
|
||||
重置
|
||||
</div>
|
||||
<div class="default-btn" @click="getList" style="margin-left: 24px">
|
||||
<div class="default-btn" @click="getList">
|
||||
<span class="iconfont icon-RectangleCopy"></span>
|
||||
搜索
|
||||
</div>
|
||||
|
|
@ -91,12 +91,10 @@
|
|||
</div>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import Mask from "@/components/common/Mask.vue";
|
||||
import AddApply from "@/components/inventory/apply/AddApply.vue";
|
||||
import {nextTick, onMounted, ref} from "vue";
|
||||
import {post} from "@/utils/request.ts";
|
||||
import DetailApply from "@/components/inventory/apply/DetailApply.vue";
|
||||
import {Refresh,Search} from "@element-plus/icons-vue";
|
||||
import {formatDateArray, getEndOfDay} from "@/utils/dateUtils.ts";
|
||||
|
||||
const is_add = ref(false)
|
||||
|
|
@ -175,36 +173,16 @@ const resetSearch= () => {
|
|||
@use "@/assets/scss/base.scss";
|
||||
.container-wrapper {
|
||||
box-sizing: border-box;
|
||||
padding: 24px;
|
||||
padding: 24px 24px 0;
|
||||
overflow: hidden;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
height: 100%;
|
||||
.content {
|
||||
width: 100%;
|
||||
flex: 1;
|
||||
overflow: hidden;
|
||||
margin-top: base.$margin-base;
|
||||
}
|
||||
.bottom {
|
||||
width: 100%;
|
||||
height: 60px;
|
||||
background-color: #FFF;
|
||||
box-sizing: border-box;
|
||||
padding: 10px;
|
||||
position: relative;
|
||||
border-top: 1px solid #EEE;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
|
||||
.top {
|
||||
height: 110px;
|
||||
border-radius: 8px;
|
||||
.top {
|
||||
background: #fff;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
margin-bottom: 24px;
|
||||
|
||||
.search {
|
||||
display: flex;
|
||||
|
|
@ -243,10 +221,32 @@ const resetSearch= () => {
|
|||
|
||||
.addBtn {
|
||||
span {
|
||||
display: inline-block;
|
||||
&:first-child{
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.content {
|
||||
width: 100%;
|
||||
flex: 1;
|
||||
overflow: hidden;
|
||||
}
|
||||
.bottom {
|
||||
width: 100%;
|
||||
height: 60px;
|
||||
background-color: #FFF;
|
||||
box-sizing: border-box;
|
||||
padding: 10px;
|
||||
position: relative;
|
||||
border-top: 1px solid #EEE;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
:deep(.el-input__wrapper){
|
||||
height: 42px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<span class="iconfont icon-RectangleCopy1"></span>
|
||||
重置
|
||||
</div>
|
||||
<div class="default-btn" @click="getCheck" style="margin-left: 24px">
|
||||
<div class="default-btn" @click="getCheck">
|
||||
<span class="iconfont icon-RectangleCopy"></span>
|
||||
搜索
|
||||
</div>
|
||||
|
|
@ -175,11 +175,11 @@ const resetSearch = () => {
|
|||
display: flex;
|
||||
flex-direction: column;
|
||||
height: 100%;
|
||||
padding: 24px;
|
||||
padding: 24px 24px 0;
|
||||
border-radius: 8px;
|
||||
|
||||
.content_list {
|
||||
flex: 1;
|
||||
margin-top: base.$margin-base;
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
|
|
@ -197,10 +197,10 @@ const resetSearch = () => {
|
|||
}
|
||||
|
||||
.top {
|
||||
height: 110px;
|
||||
background: #fff;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
margin-bottom: 24px;
|
||||
|
||||
.search {
|
||||
display: flex;
|
||||
|
|
@ -244,8 +244,9 @@ const resetSearch = () => {
|
|||
|
||||
.addBtn {
|
||||
span {
|
||||
display: inline-block;
|
||||
margin-right: 24px;
|
||||
&:first-child{
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
<span class="iconfont icon-RectangleCopy1"></span>
|
||||
重置
|
||||
</div>
|
||||
<div class="default-btn" @click="init" style="margin-left: 24px">
|
||||
<div class="default-btn" @click="init">
|
||||
<span class="iconfont icon-RectangleCopy"></span>
|
||||
搜索
|
||||
</div>
|
||||
|
|
@ -290,6 +290,7 @@ const initAddOrderData = (initData: any) => {
|
|||
background: #fff;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
margin-bottom: 24px;
|
||||
|
||||
.search {
|
||||
display: flex;
|
||||
|
|
@ -325,7 +326,6 @@ const initAddOrderData = (initData: any) => {
|
|||
width: 100%;
|
||||
flex: 1;
|
||||
overflow: hidden;
|
||||
margin-top: base.$margin-base;
|
||||
}
|
||||
|
||||
.bottom {
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<span class="iconfont icon-RectangleCopy1"></span>
|
||||
重置
|
||||
</div>
|
||||
<div class="default-btn" @click="getSupplier" style="margin-left: 24px">
|
||||
<div class="default-btn" @click="getSupplier">
|
||||
<span class="iconfont icon-RectangleCopy"></span>
|
||||
搜索
|
||||
</div>
|
||||
|
|
@ -122,15 +122,15 @@ const resetSearch = () => {
|
|||
@use "@/assets/scss/base.scss";
|
||||
.container-wrapper {
|
||||
box-sizing: border-box;
|
||||
padding: 24px;
|
||||
padding: 24px 24px 0;
|
||||
overflow: hidden;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
height: 100%;
|
||||
border-radius: 8px;
|
||||
.content {
|
||||
width: 100%;
|
||||
flex: 1;
|
||||
margin-top: base.$margin-base;
|
||||
}
|
||||
.bottom {
|
||||
width: 100%;
|
||||
|
|
@ -147,10 +147,10 @@ const resetSearch = () => {
|
|||
}
|
||||
|
||||
.top {
|
||||
height: 110px;
|
||||
background: #fff;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
margin-bottom: 24px;
|
||||
|
||||
.search {
|
||||
display: flex;
|
||||
|
|
@ -189,7 +189,9 @@ const resetSearch = () => {
|
|||
|
||||
.addBtn {
|
||||
span {
|
||||
display: inline-block;
|
||||
&:first-child{
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue