diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss
index 6e6bcec..b95c990 100644
--- a/src/assets/scss/main.scss
+++ b/src/assets/scss/main.scss
@@ -137,34 +137,26 @@ $lighter-color: rgba(#4D6DE4, 0.5);
display: inline-block;
width: 120px;
height: 42px;
- line-height: 42px;
+ line-height: 40px;
background: $btn-color;
border-radius: 6px;
color: #FFF;
font-size: 16px;
text-align: center;
- margin-left: 9px;
+ margin-left: 24px;
+ border:1px solid transparent;
&:hover{
background: $lighter-color;
}
}
.default-close-btn{
- cursor: pointer;
- display: inline-block;
- width: 119px;
- height: 42px;
- line-height: 42px;
background: #fff;
- border-radius: 6px;
color: #333333;
- font-size: 16px;
- text-align: center;
- margin-left: 9px;
border:1px solid #D8D8D8;
&:hover{
+ border: 1px solid transparent;
background: $lighter-color;
color: #fff;
- border:none;
}
}
diff --git a/src/components/common/goods/GoodsDetail.vue b/src/components/common/goods/GoodsDetail.vue
index 121960b..7619c69 100644
--- a/src/components/common/goods/GoodsDetail.vue
+++ b/src/components/common/goods/GoodsDetail.vue
@@ -54,7 +54,7 @@
-
+
@@ -259,6 +259,9 @@ const colosInfo = () => {
getTotalPrice()
emit('totalPriceChange')
}
+const clickItem = (value: any) => {
+ usage.value = value
+}
\ No newline at end of file
diff --git a/src/components/inventory/goods/Edit.vue b/src/components/inventory/goods/Edit.vue
index 1f5fb07..b6925e4 100644
--- a/src/components/inventory/goods/Edit.vue
+++ b/src/components/inventory/goods/Edit.vue
@@ -451,7 +451,7 @@ import {post} from "@/utils/request.ts";
import Cate from "@/components/inventory/goods/Cate.vue";
import {ElMessage, ElMessageBox} from "element-plus";
import Divider from "@/components/Divider.vue";
-import UnitSelector from "@/components/UnitSelector.vue";
+import UnitSelector from "@/components/inventory/goods/UnitSelector.vue";
import SocialInfo from "@/components/inventory/goods/SocialInfo.vue";
import {API} from "@/assets/config/API.ts";
diff --git a/src/components/UnitSelector.vue b/src/components/inventory/goods/UnitSelector.vue
similarity index 100%
rename from src/components/UnitSelector.vue
rename to src/components/inventory/goods/UnitSelector.vue
diff --git a/src/components/outpatient/Settlement.vue b/src/components/outpatient/Settlement.vue
index f813114..e409daa 100644
--- a/src/components/outpatient/Settlement.vue
+++ b/src/components/outpatient/Settlement.vue
@@ -20,7 +20,7 @@ const editItem= () => {
@@ -227,7 +202,7 @@ import Quick from "@/components/charge/RecordsLog/Quick.vue";
import {getCurrentTime, getToday} from "@/utils/dateUtils.ts";
import {API} from "@/assets/config/API.ts";
-const height = ref(570)
+const height = ref(670)
const certTypeList = ref([])
const edit_data = ref({
timeList: []
@@ -280,7 +255,7 @@ const close = () => {
isShowCard.value = true
nextTick(() => {
cardDefaultRef.value?.close()
- height.value = 570
+ height.value = 670
})
emit('close')
}
@@ -410,7 +385,7 @@ const socialCardUpdate = (e: any) => {
height.value = 820
multipleTable.value?.setCurrentRow(tableData.value[0])
} else {
- height.value = 570
+ height.value = 670
}
})
loading.value = false
@@ -427,7 +402,7 @@ const deleteCard = () => {
tableData.value = []
nextTick(() => {
cardDefaultRef.value?.close()
- height.value = 570
+ height.value = 670
})
}
},
@@ -549,12 +524,23 @@ defineExpose({init})
}
}
-:deep(.el-form-item) {
- margin-bottom: 2px !important;
-}
-
.disabled {
cursor: not-allowed;
- background: rgba(#4D6DE4,.5);
+ background: rgba(#4D6DE4, .5);
+}
+
+.left{
+ flex: 1;
+ min-width: 0;
+
+}
+.middle{
+ flex: 1;
+ min-width: 0;
+ margin: 0 24px;
+}
+.right{
+ flex: 1;
+ min-width: 0;
}
\ No newline at end of file
diff --git a/src/components/settings/item/ItemEdit.vue b/src/components/settings/item/ItemEdit.vue
index d981dd3..6cf40b0 100644
--- a/src/components/settings/item/ItemEdit.vue
+++ b/src/components/settings/item/ItemEdit.vue
@@ -74,7 +74,7 @@ import {post} from "@/utils/request.ts";
import {ElMessage} from "element-plus";
import Mask from "@/components/common/Mask.vue";
import ItemSearch from "@/components/settings/item/ItemSearch.vue";
-import UnitSelector from "@/components/UnitSelector.vue";
+import UnitSelector from "@/components/inventory/goods/UnitSelector.vue";
import {itemUnitList} from "@/utils/unitList.ts"
import {API} from "@/assets/config/API.ts";
diff --git a/src/components/settings/item/group/GroupAdd.vue b/src/components/settings/item/group/GroupAdd.vue
index 82fc431..3fdb922 100644
--- a/src/components/settings/item/group/GroupAdd.vue
+++ b/src/components/settings/item/group/GroupAdd.vue
@@ -101,7 +101,7 @@ import ItemSearch from "@/components/settings/item/ItemSearch.vue";
const createSearchRef = ref('')
import {itemUnitList} from "@/utils/unitList.ts"
-import UnitSelector from "@/components/UnitSelector.vue";
+import UnitSelector from "@/components/inventory/goods/UnitSelector.vue";
import {post} from "@/utils/request.ts";
import {API} from "@/assets/config/API.ts";