Compare commits

..

No commits in common. "ce0e3559810a3106ac6f8db935a3540ea24f331c" and "baafcfd1e34aa49986baa106ee310e0d85790ee3" have entirely different histories.

5 changed files with 37 additions and 57 deletions

View File

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

View File

@ -1,21 +1,17 @@
<template> <template>
<div class="layout-container"> <div class="layout-container">
<Header class="header"/> <Header class="header" />
<header> <div class="childMenu">
<div class="center-wrapper"> <router-link :to="item.path" class="child-item" v-for="(item,index) in childMenuList" :key="index">
<div class="childMenu"> {{ item.name }}
<router-link :to="item.path" class="child-item" v-for="(item,index) in childMenuList" :key="index"> </router-link>
{{ item.name }} </div>
</router-link>
</div>
</div>
</header>
<div class="space"></div> <div class="space"></div>
<main class="layout-main"> <main class="layout-main">
<router-view/> <router-view/>
</main> </main>
<div class="space"></div> <div class="space"></div>
<Footer class="footer"/> <Footer class="footer" />
</div> </div>
</template> </template>
@ -27,7 +23,6 @@
background: #fff; background: #fff;
display: flex; display: flex;
align-items: center; align-items: center;
.child-item { .child-item {
display: inline-block; display: inline-block;
color: #151515; color: #151515;
@ -45,7 +40,7 @@
display: block; display: block;
width: 100%; width: 100%;
height: 2px; height: 2px;
background-color: #151515; // 线 background-color: #151515; // 线
position: absolute; position: absolute;
bottom: -5px; // 线 bottom: -5px; // 线
left: 0; left: 0;
@ -59,7 +54,6 @@ import "@/assets/scss/layout.scss"
import Header from "@/components/common/Header.vue"; import Header from "@/components/common/Header.vue";
import Footer from "@/components/common/Footer.vue"; import Footer from "@/components/common/Footer.vue";
import {ref} from "vue"; import {ref} from "vue";
const childMenuList = ref([ const childMenuList = ref([
{ {
name: '商品', name: '商品',

View File

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

View File

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

View File

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