clinic-v2
/
web
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
牛子源 2025-05-14 14:29:55 +08:00
parent b1160b4976 ce0e355981
commit 6fd2c14396
5 changed files with 57 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/Layout.vue
View File

@ -1,5 +1,4 @@
<template>
<div class="layout-container">
<Header class="header" />
<div class="space"></div>

6
src/views/LayoutInventory.vue
View File

@ -1,11 +1,15 @@
<template>
<div class="layout-container">
<Header class="header"/>
<header>
<div class="center-wrapper">
<div class="childMenu">
<router-link :to="item.path" class="child-item" v-for="(item,index) in childMenuList" :key="index">
{{ item.name }}
</router-link>
</div>
</div>
</header>
<div class="space"></div>
<main class="layout-main">
<router-view/>
@ -23,6 +27,7 @@
background: #fff;
display: flex;
align-items: center;
.child-item {
display: inline-block;
color: #151515;
@ -54,6 +59,7 @@ import "@/assets/scss/layout.scss"
import Header from "@/components/common/Header.vue";
import Footer from "@/components/common/Footer.vue";
import {ref} from "vue";
const childMenuList = ref([
{
name: '商品',

11
src/views/LayoutSetting.vue
View File

@ -1,11 +1,18 @@
<template>
<div class="layout-container">
<Header class="header"/>
<header>
<div class="center-wrapper">
<div class="childMenu">
<router-link :to="item.path" class="child-item" v-for="(item,index) in childMenuList" :key="index">
{{ item.name }}
</router-link>
</div>
</div>
</header>
<div class="space"></div>
<main class="layout-main">
<router-view/>
@ -17,12 +24,13 @@
</template>
<style scoped lang="scss">
.childMenu {
width: 100%;
height: 60px;
background: #fff;
display: flex;
align-items: center;
.child-item {
display: inline-block;
color: #151515;
@ -54,6 +62,7 @@ import "@/assets/scss/layout.scss"
import Header from "@/components/common/Header.vue";
import Footer from "@/components/common/Footer.vue";
import {ref} from "vue";
const childMenuList = ref([
{
name: '基本信息',

4
src/views/LayoutSocial.vue
View File

@ -1,11 +1,15 @@
<template>
<div class="layout-container">
<Header class="header" />
<header>
<div class="center-wrapper">
<div class="childMenu">
<router-link :to="item.path" class="child-item" v-for="(item,index) in childMenuList" :key="index">
{{ item.name }}
</router-link>
</div>
</div>
</header>
<div class="space"></div>
<main class="layout-main">
<router-view/>

30
src/views/inventory/goods.vue
View File

@ -8,23 +8,21 @@
<el-input placeholder="请输入名称"
clearable
v-model="searchModel.keyword"
style="width: 200px"
style="width: 290px;height: 42px"
@input="searchGoods"
>
<template #prefix>
<el-icon class="el-input__icon">
<search/>
</el-icon>
<el-icon><Search /></el-icon>
</template>
</el-input>
</el-form-item>
<el-form-item>
<el-cascader :options="allCateList" :show-all-levels="false" v-model="searchModel.cateId" clearable/>
<el-cascader style="width: 180px;height: 42px" :options="allCateList" :show-all-levels="false" v-model="searchModel.cateId" clearable/>
</el-form-item>
<el-form-item>
<el-select
placeholder="利润分类"
style="width: 150px"
style="width: 180px;"
multiple
collapse-tags
collapse-tags-tooltip
@ -39,7 +37,7 @@
</el-select>
</el-form-item>
<el-form-item style="margin-right: 0">
<el-input placeholder="最低毛利率" v-model="searchModel.minInterestRate" style="width: 100px">
<el-input placeholder="最低毛利率" v-model="searchModel.minInterestRate" style="width: 100px;height: 42px">
<template #suffix>
<el-icon class="el-input__icon">%</el-icon>
</template>
@ -48,9 +46,8 @@
<SemiSelect/>
</el-icon>
</el-form-item>
<el-form-item>
<el-input placeholder="最高毛利率" v-model="searchModel.maxInterestRate" style="width: 100px">
<el-input placeholder="最高毛利率" v-model="searchModel.maxInterestRate" style="width: 100px;height: 42px">
<template #suffix>
<el-icon class="el-input__icon">%</el-icon>
</template>
@ -58,8 +55,8 @@
</el-form-item>
</el-form>
<div class="btn">
<el-button type="primary" @click="searchGoods">搜索</el-button>
<el-button type="primary" @click="resetSearch">重置</el-button>
<div @click="searchGoods">搜索</div>
<div @click="resetSearch">重置</div>
</div>
</div>
<div class="right">
@ -148,7 +145,7 @@
￥{{ scope.row.costPrice.toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="医保码" prop="hilistCode" width="240"></el-table-column>
<el-table-column label="医保码" prop="hilistCode" width="240" show-overflow-tooltip></el-table-column>
<el-table-column label="标签" prop="producer" width="200">
<template #default="scope">
<el-tag class="tags" type="success" v-for="item in getTagsArray(scope.row.tags)">{{ item }}</el-tag>
@ -207,7 +204,7 @@ import Edit from "@/components/inventory/goods/Edit.vue";
import InventoryBatchDetail from "@/components/inventory/goods/InventoryBatchDetail.vue";
import InventoryStatistics from "@/components/inventory/goods/InventoryStatistics.vue";
import CloseBtn from "@/components/CloseBtn.vue";
import {Plus, SemiSelect} from "@element-plus/icons-vue";
import {Search, SemiSelect} from "@element-plus/icons-vue";
const statisticsData = ref<any>({})
const inventoryNumber = ref(false)
const status = ref(false)
@ -502,5 +499,10 @@ const getStatisticsData = () => {
.tags {
margin-left: 5px;
}
:deep(.el-cascader .el-input){
height: 42px;
}
:deep(.el-select__wrapper){
height: 42px;
}
</style>