diff --git a/src/components/member/memberProfile/Exchange.vue b/src/components/member/memberProfile/Exchange.vue
index d6e6c0b..7fb1500 100644
--- a/src/components/member/memberProfile/Exchange.vue
+++ b/src/components/member/memberProfile/Exchange.vue
@@ -48,8 +48,8 @@
同时打印凭证
@@ -122,6 +122,7 @@ const reduceIntegral = () => {
flex-direction: column;
justify-content: center;
margin-left: 16px;
+
.name {
font-weight: bold;
font-size: 24px;
diff --git a/src/components/member/memberProfile/Grant.vue b/src/components/member/memberProfile/Grant.vue
index 04dc01c..7721768 100644
--- a/src/components/member/memberProfile/Grant.vue
+++ b/src/components/member/memberProfile/Grant.vue
@@ -45,8 +45,8 @@
diff --git a/src/components/member/memberProfile/VipEdit.vue b/src/components/member/memberProfile/VipEdit.vue
index b2b212c..3f4aad0 100644
--- a/src/components/member/memberProfile/VipEdit.vue
+++ b/src/components/member/memberProfile/VipEdit.vue
@@ -186,10 +186,8 @@
退出医保
- 取消
-
- 保存
-
+ 取消
+ 保存
diff --git a/src/components/settings/MemberEdit.vue b/src/components/settings/MemberEdit.vue
index cf00939..855cbc0 100644
--- a/src/components/settings/MemberEdit.vue
+++ b/src/components/settings/MemberEdit.vue
@@ -120,9 +120,9 @@
- 保存
- 取消
- 删除
+ 保存
+ 取消
+ 删除
diff --git a/src/components/settings/SectionEdit.vue b/src/components/settings/SectionEdit.vue
index 0c64d2f..335c4f2 100644
--- a/src/components/settings/SectionEdit.vue
+++ b/src/components/settings/SectionEdit.vue
@@ -115,9 +115,9 @@
- 保存
- 删除
- 取消
+ 取消
+ 保存
+ 删除
diff --git a/src/components/settings/item/ItemEdit.vue b/src/components/settings/item/ItemEdit.vue
index 6f19364..22d260f 100644
--- a/src/components/settings/item/ItemEdit.vue
+++ b/src/components/settings/item/ItemEdit.vue
@@ -5,10 +5,7 @@
- 保存
- 取消
- 删除
+ 保存
+ 取消
+ 删除
diff --git a/src/components/settings/item/ItemSearch.vue b/src/components/settings/item/ItemSearch.vue
index d713d90..f41c4dc 100644
--- a/src/components/settings/item/ItemSearch.vue
+++ b/src/components/settings/item/ItemSearch.vue
@@ -10,7 +10,7 @@
placeholder="请输入药品名称或者编号"
@keydown.enter="searchSocialItem"
clearable/>
- 搜索
+ 搜索
@@ -34,8 +34,8 @@
v-model:current-page="searchResult.pageNum" @current-change="changePage"/>
- 确认
- 关闭
+ 确认
+ 关闭
@@ -137,15 +137,15 @@ const close = () => {
display: flex;
margin-bottom: 24px;
- span {
- line-height: 42px;
- }
-
.input {
display: block;
flex: 1;
}
+ span {
+ line-height: 1;
+ }
+
.default-btn {
margin-left: 24px;
}
@@ -181,7 +181,6 @@ const close = () => {
:deep(.el-input__wrapper) {
width: 100%;
- height: 42px;
}
.btn {
diff --git a/src/components/settings/item/group/GroupAdd.vue b/src/components/settings/item/group/GroupAdd.vue
index f365a28..c9d537d 100644
--- a/src/components/settings/item/group/GroupAdd.vue
+++ b/src/components/settings/item/group/GroupAdd.vue
@@ -76,7 +76,7 @@
- 删除
+ 删除
diff --git a/src/components/settings/item/group/GroupList.vue b/src/components/settings/item/group/GroupList.vue
index 378248a..6384c03 100644
--- a/src/components/settings/item/group/GroupList.vue
+++ b/src/components/settings/item/group/GroupList.vue
@@ -24,8 +24,8 @@
- 编辑
- 删除
+ 编辑
+ 删除
@@ -194,4 +194,13 @@ const handleCurrentChange = (val: any) => {
align-items: center;
padding: 0 24px;
}
+.edit{
+ cursor: pointer;
+ color: #4d6de4;
+ margin-right: 10px
+}
+.delete{
+ cursor: pointer;
+ color: #ff0000;
+}
diff --git a/src/views/inventory/goods.vue b/src/views/inventory/goods.vue
index 71115a8..150cda2 100644
--- a/src/views/inventory/goods.vue
+++ b/src/views/inventory/goods.vue
@@ -67,7 +67,7 @@
重置
-
-
@@ -433,13 +433,13 @@ const props = {multiple: true}
height: 100%;
display: flex;
flex-direction: column;
-
+ border-radius: 8px;
+ padding: 24px 24px 0;
.top {
- height: 144px;
- padding: 24px 24px 0;
background: #fff;
display: flex;
flex-direction: column;
+ margin-bottom: 24px;
.search {
display: flex;
@@ -447,21 +447,18 @@ const props = {multiple: true}
.left {
flex: 1;
+ min-width: 0;
display: flex;
justify-content: space-between;
- margin-right: 24px;
-
- .el-form-item {
- margin-right: 5px;
- }
}
}
.addBtn {
span {
- display: inline-block;
- margin-right: 24px;
+ &:first-child {
+ margin-left: 0;
+ }
}
}
}
@@ -514,24 +511,5 @@ const props = {multiple: true}
.btn-group {
display: flex;
-
- .btn {
- width: 120px;
- height: 42px;
- background: #FFFFFF;
- border-radius: 6px;
- border: 1px solid #979797;
- display: flex;
- justify-content: center;
- align-items: center;
- margin-left: 24px;
- cursor: pointer;
-
- &:hover {
- background: #4D6DE4;
- color: #fff;
- border: none;
- }
- }
}
\ No newline at end of file
diff --git a/src/views/inventory/inventory.vue b/src/views/inventory/inventory.vue
index e539b57..7d5c9aa 100644
--- a/src/views/inventory/inventory.vue
+++ b/src/views/inventory/inventory.vue
@@ -78,37 +78,37 @@
-
-
-
- {{ scope.row.code }}
-
-
-
-
-
-
-
-
- ¥{{ scope.row.totalPrice.toFixed(2) }}
-
-
-
-
-
-
- {{ formatDate(scope.row.purchaseDate) }}
-
-
-
-
-
-
-
-
-
-
+
+
+
+ {{ scope.row.code }}
+
+
+
+
+
+
+
+
+ ¥{{ scope.row.totalPrice.toFixed(2) }}
+
+
+
+
+
+
+ {{ formatDate(scope.row.purchaseDate) }}
+
+
+
+
+
+
+
+
+
+
@@ -240,37 +240,37 @@ const resetSearch = () => {
init()
}
const show = ref(false)
-const openUpload= ()=>{
- show.value=true
+const openUpload = () => {
+ show.value = true
}
-const initAddOrderData = (initData:any)=>{
+const initAddOrderData = (initData: any) => {
const data = {
- invoiceCode:initData.tag.invoice_code,
- shippingCode:initData.tag.shipping_code,
- remark:initData.tag.remark,
+ invoiceCode: initData.tag.invoice_code,
+ shippingCode: initData.tag.shipping_code,
+ remark: initData.tag.remark,
purchaseDate: initData.tag.purchase_date,
}
let goodsList = []
- for (let i=0;i{
- addOrderRef.value?.init(data,goodsList)
+ nextTick(() => {
+ addOrderRef.value?.init(data, goodsList)
})
}
@@ -279,11 +279,47 @@ const initAddOrderData = (initData:any)=>{
.container-wrapper {
box-sizing: border-box;
- padding: 24px;
+ padding: 24px 24px 0;
overflow: hidden;
display: flex;
flex-direction: column;
height: 100%;
+ border-radius: 8px;
+
+ .top {
+ background: #fff;
+ display: flex;
+ flex-direction: column;
+
+ .search {
+ display: flex;
+ justify-content: space-between;
+
+ .left {
+ flex: 1;
+ display: flex;
+ justify-content: space-between;
+ margin-right: 24px;
+
+ .el-form-item {
+ margin-right: 5px;
+ }
+ }
+
+ .right {
+ display: flex;
+ }
+
+ }
+
+ .addBtn {
+ span {
+ &:first-child {
+ margin-left: 0;
+ }
+ }
+ }
+ }
.content_list {
width: 100%;
@@ -361,63 +397,11 @@ const initAddOrderData = (initData:any)=>{
}
-.top {
- height: 110px;
- background: #fff;
- display: flex;
- flex-direction: column;
-
- .search {
- display: flex;
- justify-content: space-between;
-
- .left {
- flex: 1;
- display: flex;
- justify-content: space-between;
- margin-right: 24px;
-
- .el-form-item {
- margin-right: 5px;
- }
- }
-
- .right {
- display: flex;
-
- .btn {
- width: 120px;
- height: 42px;
- background: #FFFFFF;
- border-radius: 6px;
- border: 1px solid #979797;
- display: flex;
- justify-content: center;
- align-items: center;
- margin-left: 24px;
- cursor: pointer;
-
- &:hover {
- background: #4D6DE4;
- color: #fff;
- border: none;
- }
- }
- }
-
- }
-
- .addBtn {
- span{
- display: inline-block;
- margin-right: 24px;
- }
- }
-}
:deep(.el-input__wrapper) {
height: 42px;
width: 200px;
}
+
:deep(.el-range-editor.el-input__wrapper) {
height: 42px;
}
diff --git a/src/views/settings/item.vue b/src/views/settings/item.vue
index b273ab2..192fbd4 100644
--- a/src/views/settings/item.vue
+++ b/src/views/settings/item.vue
@@ -37,13 +37,21 @@
-
+
-
-
+
+
+ {{ scope.row.purchaseUnitPrice ? scope.row.purchaseUnitPrice + '元' : '' }}
+
+
+
+
+ {{ scope.row.unitPrice ? scope.row.unitPrice + '元' : '' }}
+
+
{{ formatDate(scope.row.createDatetime) }}
diff --git a/src/views/settings/log.vue b/src/views/settings/log.vue
index fe21471..888f758 100644
--- a/src/views/settings/log.vue
+++ b/src/views/settings/log.vue
@@ -1,35 +1,35 @@
-
+
-
-
-
-
-
- 查询
-
-
-
-
-
+
+
+
+
+
+
+ 查询
+
+
-
-
-
-
-
+
+
+
+
+
@@ -111,18 +111,9 @@ const copy = (text: any) => {
.title {
font-size: 20px;
- height: 60px;
- line-height: 60px;
background: #fff;
font-weight: 500;
-
- .left {
- flex: 1;
- display: flex;
- justify-content: space-between;
- margin-right: 24px;
-
- }
+ margin-bottom: 24px;
}
.content {
diff --git a/src/views/settings/member.vue b/src/views/settings/member.vue
index f77af26..0b7d2bf 100644
--- a/src/views/settings/member.vue
+++ b/src/views/settings/member.vue
@@ -29,7 +29,10 @@
重置
- 查询
+
+
+ 查询
+
新增
@@ -37,7 +40,7 @@
-
+
{{ formatDate(scope.row.memberInfo.createDatetime) }}
@@ -203,10 +206,4 @@ const resetSearch = () => {
:deep(.el-select__wrapper) {
height: 42px;
}
-.default-btn{
- margin-left: 5px;
- &:first-child{
- margin-left: 0;
- }
-}
\ No newline at end of file
diff --git a/src/views/settings/section.vue b/src/views/settings/section.vue
index 7e9cee7..8ed7177 100644
--- a/src/views/settings/section.vue
+++ b/src/views/settings/section.vue
@@ -33,9 +33,13 @@
-
+
-
+
+
+ {{ scope.row.bedCnt?scope.row.bedCnt+'个':'' }}
+
+
@@ -44,17 +48,17 @@
-
+
-
-
+
+
-
-
+
+