Browse Source

5.24

master
fengdong777 2 years ago
parent
commit
c659a2cc79
  1. 52
      warehousing-system/project_web/src/styles/variables copy.scss
  2. 12
      warehousing-system/project_web/src/views/redirect/index.vue
  3. 33
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/baseInfo/commodityBrand/index.js
  4. 10
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue
  5. 9
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js
  6. 2
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityBrand/index.vue
  7. 200
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/commodity.vue
  8. 248
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/index.vue

52
warehousing-system/project_web/src/styles/variables copy.scss

@ -0,0 +1,52 @@
// 行为色
$color-primary: #018ad2;
$color-success: #4cd964;
$color-warning: #f0ad4e;
$color-error: #dd524d;
// header
$header-bg:#0294d7;
// sidebar
$menuText: rgba($color: #FFFFFF, $alpha: 0.9);
$menuActiveText:#ffffff;
$subMenuActiveText:#ffffff; //https://github.com/ElemeFE/element/issues/12951
$menuBg:#0294d7;
$menuHover:#087dba;
$subMenuBg:#0294d7;
$subMenuHover:#087dba;
$sideBarWidth: 210px;
/* 表格的相关样式 */
$search-bg:#edf1f7; // 表格搜索景色
$table-bg-color:#edf1f7; // 表格背景
$table-border-color:#e0e3eb; // 表格边框色
// 文字
$table-a-color:#018ad2;
/* 表格的相关样式 */
/* 边框颜色 */
$border-color:#018ad2;
/* 文字基本颜色 */
$text-color:#333;//基本色
$text-color-inverse:#fff;//反色
$text-color-grey:#999;//辅助灰色如加载更多的提示信息
$text-color-placeholder: #808080;
$text-color-disable:#c0c0c0;
$text-red: #d00000;
$a-color:#018ad2;
// the :export directive is the magic sauce for webpack
// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
:export {
menuText: $menuText;
menuActiveText: $menuActiveText;
subMenuActiveText: $subMenuActiveText;
menuBg: $menuBg;
menuHover: $menuHover;
subMenuBg: $subMenuBg;
subMenuHover: $subMenuHover;
sideBarWidth: $sideBarWidth;
}

12
warehousing-system/project_web/src/views/redirect/index.vue

@ -0,0 +1,12 @@
<script>
export default {
created() {
const { params, query } = this.$route
const { path } = params
this.$router.replace({ path: '/' + path, query })
},
render: function(h) {
return h() // avoid warning message
}
}
</script>

33
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/baseInfo/commodityBrand/index.js

@ -38,4 +38,37 @@ export default {
}
})
},
// 查询档案
listPages: function(params) {
return request({
url: '/cyf/productType/listPage',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json',
'token': tokens
}
})
},
// 查看类别
selectProductType: function(sid) {
return request({
url: '/cyf/productType/selectProductType/' + sid,
method: 'get'
})
},
// 查询所有品牌
selectList: function(data) {
return request({
url: '/cyf/productInfo/selectList',
method: 'get',
data: data,
headers: {
'Content-Type': 'application/json',
'token': tokens
}
})
},
}

10
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue

@ -287,6 +287,16 @@ export default {
name: "/baseInfo/commodityBrand",
path: "/baseInfo/commodityBrand",
},
{
alwaysShow: true,
component: "index",
meta: {
icon: "el-icon-help",
title: "商品类别",
},
name: "/baseInfo/commodityFily",
path: "/baseInfo/commodityFily",
},
],
},
// {

9
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js

@ -131,6 +131,15 @@ export const constantRoutes = [{
title: '商品品牌'
}
},
{
path: '/baseInfo/commodityFily',
component: () =>
import('@/views/baseInfo/commodityFily/index.vue'),
name: 'index',
meta: {
title: '商品档案'
}
},
]
}, {
path: '/supervise',

2
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityBrand/index.vue

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div v-show="viewState ==1">
<button-bar view-title="油罐信息" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<button-bar view-title="商品品牌" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>

200
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/commodity.vue

@ -0,0 +1,200 @@
<template>
<div>
<div class="tab-header webtop">
<!-- 标题 -->
<div>商品品牌</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-card class="box-card">
<div class="item">
<span class="item_text">品牌名称</span>
<el-select v-model="form.name" placeholder="请选择品牌名称" class="item_input" @change="getType">
<el-option v-for="(item,i) in crudeList" :key="i" :label="item.name" :value="item.number" />
</el-select>
</div>
<div class="item">
<span class="item_text">品牌编号</span>
<el-input v-model="form.number" placeholder="" :readonly="true" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">产品名称</span>
<el-select v-model="form.prodSid" placeholder="请选择产品名称" class="item_input" >
<el-option v-for="(item,i) in sidlist" :key="i" :label="item.name" :value="item.prodSid" />
</el-select>
</div>
<div class="item">
<span class="item_text">类别名称</span>
<el-input v-model="form.typeList.name" placeholder="" class="item_input" clearable />
</div>
</el-card>
</div>
</div>
</template>
<script>
import req from '@/api/baseInfo/commodityBrand/index.js'
export default {
data() {
return {
submitdisabled: false,
crudeList: [],
crudeLists: [],
flowmeterLists: [],
flowmeterList: [],
sidlist: [],
form: {
name: "",
number: "",
prodSid:'',
typeList:[
{
name:'',
number:''
}
]
},
listQuery: {
current: 1,
size: 100,
params: {
name:''
},
},
}
},
created() {
this.getlist()
this.getSid()
},
methods: {
saveOrUpdate() {
// req.save(this.formobj)
// .then(resp => {
// if (resp.success) {
// this.$message({
// showClose: true,
// type: 'success',
// message: resp.msg
// })
// this.handleReturn("true")
// } else {
// // resp.code
// }
// })
// .catch(() => {})
console.log(this.form)
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.form = {
name: "",
number: "",
}
this.$emit('doback')
},
getlist(){
req.selectList().then((res)=>{
if (res.success) {
this.crudeLists = res.data
for (var i = 0; i < this.crudeLists.length; i++) {
let item = {
name: this.crudeLists[i].name,
number: this.crudeLists[i].number,
}
this.crudeList.push(item)
}
}
})
},
getType(value) {
const choose = this.crudeLists.filter((item) => item.number === value)
this.form.name = choose[0].name
this.form.number = value
console.log(this.form);
},
getSid(){
req.listPages(this.listQuery).then((res)=>{
this.sidlist = res.data.records
})
}
}
}
</script>
<style lang="scss">
.box-card {
margin-left: 60px;
margin-right: 60px;
min-width: 70%;
margin-top: 20px;
.item {
display: flex;
flex-direction: row;
align-items: center;
margin-top: 15px;
height: 40px;
line-height: 40px;
.item_text {
flex: 0.8;
font-size: 18px;
text-align: right;
}
.item_input {
flex: 4;
font-size: 16px;
margin-left: 10px;
margin-right: 80px;
}
.item_left_input {
width: 20%;
}
.item_left_text {
height: 30px;
margin-left: 20px;
line-height: 30px;
color: #018AD2;
padding: 0px 15px;
border: 1.5px solid #018AD2;
border-radius: 5px;
}
.item_right {
flex: 1;
justify-items: center;
.item_right_list_text {
font-size: 16px;
}
.item_right_list_delect {
color: #5E94FF;
margin-left: 20px;
font-size: 16px;
text-decoration: underline;
}
}
}
}
</style>

248
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/index.vue

@ -0,0 +1,248 @@
<template>
<div class="app-container">
<div v-show="viewState ==1">
<button-bar view-title="商品类别" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="80px" class="tab-header">
<el-form-item label="类型名称">
<el-input v-model="listQuery.params.name" maxlength="20" placeholder="请输入类型名称" class="addinputw"
clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleReset">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="handleFilter">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">品牌列表</div>
<!-- 翻页分页 -->
<!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/> -->
</div>
<div class="">
<el-table v-loading="listLoading" :data="list" border style="width: 100%;">
<!-- <el-table-column type="selection" align="center" width="50"/> -->
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="查看类别" align="center" width="150px">
<template slot-scope="scope">
<el-button
type="primary"
size="mini"
@click="purchase(scope.row)"
>
查看
</el-button>
</template>
</el-table-column>
<el-table-column label="商品品牌" prop="informationName" align="center" />
<el-table-column label="品牌编码" prop="informationNumber" align="center" />
<el-table-column label="商品名称" prop="name" align="center" />
<el-table-column label="名称编号" prop="number" align="center" />
</el-table>
</div>
<div class="pages">
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div>
</div>
</div>
<oilTankAdd v-show="viewState ==2 || viewState ==3" ref="divAdd" @doback="resetState" @reloadlist="getList" />
<!-- <oilTypeInfo v-show="viewState ==4" ref="divInfo" @doback="resetState" @reloadlist="getList" /> -->
<el-dialog title="查看商品类别" :visible.sync="editDialog" width="40%">
<el-table ref="datalist" :data="datalist" border style="width: 100%">
<el-table-column
property="name"
label="商品类别"
align="center"
></el-table-column>
<el-table-column
property="number"
label="类别编码"
align="center"
></el-table-column>
</el-table>
</el-dialog>
</div>
</template>
<script>
import req from '@/api/baseInfo/commodityBrand/index.js'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import oilTankAdd from './commodity.vue'
// import oilTypeInfo from './oilTypeInfo.vue'
export default {
name: 'CustomerManagement',
components: {
Pagination,
pageye,
ButtonBar,
oilTankAdd,
// oilTypeInfo,
},
data() {
return {
listLoading: false,
btndisabled: false,
editDialog: false,
form: {
name:'',
number:'',
sid:''
},
btnList: [{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
list: [],
listQuery: {
current: 1,
size: 10,
params: {
name:''
},
total: 0
},
viewState: 1,
datalist:[]
}
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
this.init()
//
},
methods: {
btnHandle(btnKey) {
switch (btnKey) {
case 'toAdd':
this.toAdd()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
//
init() {
this.getList()
},
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
req.listPages(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
this.list = []
this.listQuery.total = 0
}
})
},
//
handleReset() {
this.listQuery.current = 1
this.getList()
},
//
handleFilter() {
this.listQuery = {
current: 1,
size: 10,
total: 0,
params: {
name:''
}
}
this.getList()
},
//
toAdd() {
this.viewState = 2
},
purchase(row) {
this.editDialog = true;
req.selectProductType(row.sid).then((res)=>{
console.log(res);
this.datalist=res.data
})
},
save() {
req.update(this.form)
.then(resp => {
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: resp.msg
})
this.editDialog = false;
this.getList()
} else {
// resp.code
}
})
.catch(() => {})
this.reset();
},
reset() {
this.form = {};
},
resetState() {
this.viewState = 1
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>
Loading…
Cancel
Save