diff --git a/index.html b/index.html
index 9e5fc8f..0d32c06 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
-
Vite App
+ 药慧精灵智慧诊所
diff --git a/public/favicon.ico b/public/favicon.ico
index 1b36c1c..a49da11 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/src/assets/config/apiConfig.ts b/src/assets/config/apiConfig.ts
index 55b64f0..a4ff29f 100644
--- a/src/assets/config/apiConfig.ts
+++ b/src/assets/config/apiConfig.ts
@@ -3,7 +3,8 @@ export enum apiConfig{
* 用户操作
*/
"ManagerLogin"="manager/user/login",//登录
- "signUp"="signUp/signUp",//签到
+ "signIn"="sign/in",//签到
+ "signOut"="sign/out",//签退
/**
* 接诊操作
*/
diff --git a/src/components/common/Header.vue b/src/components/common/Header.vue
index d0a889b..28b69ed 100644
--- a/src/components/common/Header.vue
+++ b/src/components/common/Header.vue
@@ -11,7 +11,9 @@
- 退出登录
+
+ 退出登录
+
@@ -51,7 +53,7 @@
border-radius: 12px;
background-repeat: no-repeat;
background-size: 100%;
- background-position:0 10px;
+ background-position: 0 10px;
}
&:nth-child(1)::before {
@@ -145,15 +147,24 @@ header {
}
diff --git a/src/components/common/Mask.vue b/src/components/common/Mask.vue
index cee509c..37b01fa 100644
--- a/src/components/common/Mask.vue
+++ b/src/components/common/Mask.vue
@@ -73,6 +73,7 @@ const closeBtn = () => {
position: relative;
height: 72px;
padding: 0 4px;
+ border-bottom: 1px solid #EAEAEC;
.title {
position: absolute;
diff --git a/src/components/inventory/purchase/AddOrder.vue b/src/components/inventory/purchase/AddOrder.vue
index 9ba0ed2..dfedd19 100644
--- a/src/components/inventory/purchase/AddOrder.vue
+++ b/src/components/inventory/purchase/AddOrder.vue
@@ -1,38 +1,46 @@
-
-
-
- {{ inventory_order_data.code != null ? inventory_order_data.code : "创建后自动生成" }}
-
-
-
-
-
-
+
+
+
+
+
+ {{ inventory_order_data.code != null ? inventory_order_data.code : "创建后自动生成" }}
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
-
+
@@ -147,7 +163,7 @@ import Edit from "@/components/inventory/goods/Edit.vue";
import Mask from "@/components/common/Mask.vue";
import {ElMessage} from "element-plus";
import GoodsSearch from "@/components/inventory/GoodsSearch.vue";
-import CloseBtn from "@/components/CloseBtn.vue";
+import {Search} from "@element-plus/icons-vue";
const orderForm = ref()
const formRules = ref({
@@ -387,4 +403,24 @@ onMounted(() => {
.error {
background-color: #F00;
}
+.edit-panel{
+ margin-top: 24px;
+}
+.table_content{
+ margin-top: 24px;
+ background: #F9FAFC;
+ .add_goods{
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ font-weight: 800;
+ font-size: 18px;
+ color: #333333;
+ font-style: normal;
+ .search{
+ display: flex;
+ align-items: center;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/components/settings/SectionEdit.vue b/src/components/settings/SectionEdit.vue
index fac5a21..31542e0 100644
--- a/src/components/settings/SectionEdit.vue
+++ b/src/components/settings/SectionEdit.vue
@@ -1,7 +1,6 @@
{
- const count = ref(0)
- const doubleCount = computed(() => count.value * 2)
- function increment() {
- count.value++
+export const singStatus = defineStore('counter', () => {
+ const singShow = ref(null)
+ function setSingShow(val:any){
+ singShow.value = val
}
-
- return { count, doubleCount, increment }
+ return { singShow,setSingShow}
})
diff --git a/src/views/Login.vue b/src/views/Login.vue
index c7dbf42..6e8ba60 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -31,8 +31,6 @@ const handleLogin = () => {
message: "获取本地IP地址失败,将使用默认IP地址",
type: 'warning',
duration: 1000,
- onClose: () => {
- }
})
}
@@ -40,7 +38,7 @@ const handleLogin = () => {
post(apiConfig.ManagerLogin, {username: username.value, password: password.value}).then((token: any) => {
localStorage.setItem('token', token)
//签到,如果 签到成功,则直接调用success,如果失败,调用error
- post('signUp/signUp', {mac: netWork.value.mac, ip: netWork.value.ip}, {catch_error: true}).then((res: any) => {
+ post(apiConfig.signIn, {mac: netWork.value.mac, ip: netWork.value.ip}, {catch_error: true}).then((res: any) => {
success()
}).catch(() => {
error()
diff --git a/src/views/settings/section.vue b/src/views/settings/section.vue
index f5eee08..427e99b 100644
--- a/src/views/settings/section.vue
+++ b/src/views/settings/section.vue
@@ -62,7 +62,7 @@
-
+