dev
This commit is contained in:
parent
8217b3a44f
commit
e07b429f3d
|
|
@ -11,8 +11,8 @@
|
|||
<router-link to="/social" class="menu-item" active-class="active active7">医保</router-link>
|
||||
<router-link to="/statistics" class="menu-item" active-class="active active8">统计</router-link>
|
||||
<router-link to="/settings" class="menu-item" active-class="active active9">设置</router-link>
|
||||
<div style="float: right;color: #fff">
|
||||
<el-button style="float: right;color: #fff" @click="logout" type="text">退出登录</el-button>
|
||||
<div class="btn">
|
||||
<el-button :icon="Right" style="float: right;color: #fff" @click="logout" type="text">退出登录</el-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -145,26 +145,45 @@ header {
|
|||
background-color: base.$background-color-main;
|
||||
padding: 15px 0;
|
||||
}
|
||||
|
||||
.btn {
|
||||
color: #FFF;
|
||||
font-size: 18px;
|
||||
float: right;
|
||||
margin-right: 24px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
</style>
|
||||
<script setup lang="ts">
|
||||
import {useRouter} from 'vue-router'
|
||||
import {ElMessage} from 'element-plus'
|
||||
import {type Action, ElMessage, ElMessageBox} from 'element-plus'
|
||||
import {apiConfig} from "@/assets/config/apiConfig.ts";
|
||||
import {post} from "@/utils/request";
|
||||
import {singStatus} from "@/stores/counter.ts";
|
||||
import {Right} from "@element-plus/icons-vue";
|
||||
|
||||
let logout = function () {
|
||||
localStorage.removeItem('token')
|
||||
ElMessage({
|
||||
message: "退出成功并退出签到，即将为您跳转到登录页面",
|
||||
type: 'success',
|
||||
duration: 1000,
|
||||
onClose: () => {
|
||||
ElMessageBox.confirm(
|
||||
'退出成功并退出签到，即将为您跳转到登录页面,确定吗?',
|
||||
'退出提示',
|
||||
{
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
}
|
||||
)
|
||||
.then(() => {
|
||||
localStorage.removeItem('token')
|
||||
post(apiConfig.signOut).then((res: any) => {
|
||||
useRouter().push("/manager/login")
|
||||
})
|
||||
}
|
||||
})
|
||||
ElMessage({
|
||||
type: 'success',
|
||||
message: '退出登录并退出签到',
|
||||
})
|
||||
})
|
||||
.catch(() => {
|
||||
useRouter().push("/")
|
||||
})
|
||||
}
|
||||
const status = singStatus()
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -86,7 +86,6 @@ const handleSelect = (item: any) => {
|
|||
.search_box {
|
||||
//background-color: rgb(148.6, 212.3, 117.1);
|
||||
background-color: #fff;
|
||||
padding: 10px;
|
||||
border-radius: 10px;
|
||||
box-sizing: border-box;
|
||||
margin-top: 10px;
|
||||
|
|
|
|||
|
|
@ -1,17 +1,19 @@
|
|||
<template>
|
||||
<div class="body_wrapper">
|
||||
<div class="top">
|
||||
<el-descriptions
|
||||
title="盘点单"
|
||||
direction="vertical"
|
||||
:column="1"
|
||||
/>
|
||||
<el-input class="remark" v-model="remark">
|
||||
<template #prepend>备注</template>
|
||||
</el-input>
|
||||
<div class="top" style="width: 100%">
|
||||
<el-form :model="form" style="width: 100%" label-width="auto" class="demo-ruleForm" label-position="top">
|
||||
<el-form-item label="备注" style="width: 100%;margin-right: 0">
|
||||
<el-input v-model="form.remark" placeholder="请输入单据编号"></el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<div class="content">
|
||||
<GoodsSearch @selectCallBack="goodsSelectCallBack"></GoodsSearch>
|
||||
<div class="add_goods">
|
||||
<span>盘点药品</span>
|
||||
<div class="search">
|
||||
<GoodsSearch @selectCallBack="goodsSelectCallBack"></GoodsSearch>
|
||||
</div>
|
||||
</div>
|
||||
<table class="simple-table" style="margin-top: 15px;">
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
@ -121,8 +123,10 @@
|
|||
</div>
|
||||
|
||||
<div class="bottom">
|
||||
<el-button @click="save" type="primary">保存</el-button>
|
||||
<el-button @click="exit" type="primary">关闭</el-button>
|
||||
<div class="btn">
|
||||
<el-button @click="save" type="primary">保存</el-button>
|
||||
<el-button @click="exit" type="primary">关闭</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -134,17 +138,32 @@
|
|||
display: flex;
|
||||
min-height: 0;
|
||||
flex-direction: column;
|
||||
margin-top: 24px;
|
||||
|
||||
.top {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
height: 60px;
|
||||
}
|
||||
|
||||
.content {
|
||||
display: block;
|
||||
width: 100%;
|
||||
flex: 1;
|
||||
|
||||
.add_goods {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
font-weight: 800;
|
||||
font-size: 18px;
|
||||
color: #333333;
|
||||
font-style: normal;
|
||||
|
||||
.search {
|
||||
width: 50%;
|
||||
}
|
||||
}
|
||||
|
||||
//min-height: 0;
|
||||
|
||||
table {
|
||||
|
|
@ -267,10 +286,20 @@
|
|||
}
|
||||
|
||||
.bottom {
|
||||
height: 86px;
|
||||
width: 100%;
|
||||
margin-top: 10px;
|
||||
position: absolute;
|
||||
right: 10px;
|
||||
bottom: 10px;
|
||||
bottom: 0;
|
||||
border-top: 1px solid #EAEAEC;
|
||||
.btn{
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<script setup lang="ts">
|
||||
|
|
@ -279,7 +308,9 @@ import {post} from "@/utils/request.ts";
|
|||
import {ref} from "vue";
|
||||
import GoodsSearch from "@/components/inventory/GoodsSearch.vue";
|
||||
|
||||
const remark = ref("");
|
||||
const form = ref<any>({
|
||||
remark: ""
|
||||
})
|
||||
const state = ref([])
|
||||
const options = ref([])
|
||||
|
||||
|
|
@ -446,7 +477,7 @@ let addRow = (goodsId: number) => {
|
|||
})
|
||||
}
|
||||
let save = () => {
|
||||
post("inventory/check/save", {list: list.value, remark: remark.value}).then((res: any) => {
|
||||
post("inventory/check/save", {list: list.value, remark: form.value.remark}).then((res: any) => {
|
||||
emit('close');
|
||||
})
|
||||
// emit('close');
|
||||
|
|
|
|||
|
|
@ -1,14 +1,11 @@
|
|||
<template>
|
||||
<div class="body_wrapper">
|
||||
<div class="top">
|
||||
<el-descriptions
|
||||
title="盘点详情"
|
||||
direction="vertical"
|
||||
:column="1"
|
||||
/>
|
||||
<el-input class="remark" v-model="remark">
|
||||
<template #prepend>备注</template>
|
||||
</el-input>
|
||||
<el-form :model="form" style="width: 100%" label-width="auto" class="demo-ruleForm" label-position="top">
|
||||
<el-form-item label="备注" style="width: 100%;margin-right: 0">
|
||||
<el-input disabled v-model="form.remark"></el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<div class="content">
|
||||
<table class="simple-table" style="margin-top: 15px;">
|
||||
|
|
@ -113,7 +110,9 @@
|
|||
</div>
|
||||
|
||||
<div class="bottom">
|
||||
<el-button @click="exit" type="primary">关闭</el-button>
|
||||
<div class="btn">
|
||||
<el-button @click="exit" type="primary">关闭</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -125,6 +124,7 @@
|
|||
display: flex;
|
||||
min-height: 0;
|
||||
flex-direction: column;
|
||||
margin-top: 24px;
|
||||
|
||||
.top {
|
||||
position: relative;
|
||||
|
|
@ -258,10 +258,20 @@
|
|||
}
|
||||
|
||||
.bottom {
|
||||
height: 86px;
|
||||
width: 100%;
|
||||
margin-top: 10px;
|
||||
position: absolute;
|
||||
right: 10px;
|
||||
bottom: 10px;
|
||||
bottom: 0;
|
||||
border-top: 1px solid #EAEAEC;
|
||||
.btn{
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<script setup lang="ts">
|
||||
|
|
@ -274,8 +284,9 @@ const props = defineProps({
|
|||
default: null
|
||||
}
|
||||
})
|
||||
|
||||
const remark = ref("");
|
||||
const form=ref<any>({
|
||||
remark: "",
|
||||
})
|
||||
interface Check {
|
||||
id?: number,
|
||||
goodsId: number,
|
||||
|
|
|
|||
|
|
@ -31,10 +31,10 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<Mask :width="1200" :height="500" :is-show="showAdd" :top="100" @close="showAdd = false">
|
||||
<Mask :width="1200" :height="540" :is-show="showAdd" :top="100" @close="showAdd = false" title="新增盘点">
|
||||
<Add @close="showAdd = false;getCheck()"/>
|
||||
</Mask>
|
||||
<Mask :width="1200" :height="500" :is-show="showDetail" :top="100" @close="showDetail = false">
|
||||
<Mask :width="1200" :height="540" :is-show="showDetail" :top="100" @close="showDetail = false" title="查看盘点">
|
||||
<Detail :id="id" @close="showDetail = false;getCheck()"/>
|
||||
</Mask>
|
||||
</template>
|
||||
|
|
|
|||
Loading…
Reference in New Issue