Commit a06b00b7 by huangqy

223423

parent bd3075f0
......@@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>智能库房作业系统</title>
<title>智能自动化库房作业管理信息系统</title>
</head>
<body>
<noscript>
......
......@@ -17,6 +17,12 @@ const basicData = [
component: () => import(/* webpackChunkName: "index/data/goods" */ '@/basicData/kfdw')
},
{
// 基础数据 - 智能库配置
path: prefix +'/data/znkpz',
name: 'data/znkpz',
component: () => import(/* webpackChunkName: "index/data/goods" */ '@/basicData/znkpz')
},
{
// 基础数据 - 单位数据同步
path: prefix +'/data/company',
name: 'data/company',
......
......@@ -4,7 +4,7 @@
<div style="border: 2px solid #43A747;">
<el-card :style="'height:' + (height - 60) + 'px;overflow-y: auto;position:relative;'">
<el-row type="flex" justify="space-between" align="middle">
<el-form :inline="true" size="medium" label-position="left">
<el-form :inline="true" size="medium" label-position="left" style="flex: 3">
<el-form-item>
<el-radio-group v-model="layer" @change="changeLayer">
<el-radio-button v-for="item in layerList" :key="item.vlayer" :label="'第' + item.vlayer + '层'"></el-radio-button>
......@@ -25,7 +25,15 @@
</el-form-item>
</el-form>
<div style="flex: 0.8">
<i class="el-icon-question" style="color: #D2D0D1;margin-left: 8px;"><span style="color:#000">空货位</span></i>
<i class="el-icon-question" style="color: #8cacea;margin-left: 22px;"><span style="color:#000">空托盘</span></i>
<i class="el-icon-question" style="color: #0376c2;margin-left: 22px;"><span style="color:#000">有货货位</span></i>
<br>
<i class="el-icon-question" style="color: greenyellow;margin-left: 8px;"><span style="color:#000">工作货位</span></i>
<i class="el-icon-question" style="color: red;margin-left: 8px;"><span style="color:#000">问题货位</span></i>
<i class="el-icon-question" style="color: #FF8833;margin-left: 8px;"><span style="color:#000">封闭货位</span></i>
</div>
</el-row>
......@@ -33,7 +41,7 @@
<el-col :span="18">
<el-card style="height: 620px; overflow: auto;">
<div v-for="(item,index) in this.ArrayListX" :key="index">
<ul :style="'grid-template-columns: repeat('+ item.length +', 4%);'" >
<ul :style="'grid-template-columns: repeat('+ item.length +', 3.4%);'" >
<li v-for="(items,k) in item" :key="k+''+index" @click="onClick(items)" :style="items.select ? 'border: 1px solid black' : ''"
:class="items.x === 0 || items.y === 0 ? 'box' : items.status === 'E' ? 'boxE' : items.status === 'P' ? 'boxP': items.status === 'F' ? 'boxF' : items.status === 'A' ? 'boxA' : items.status === 'W' ? 'boxW' : items.status === 'C' ? 'boxC' : '' ">
{{ items.x === 0 ? items.y : items.y ===0 ? items.x : ''}}
......@@ -215,7 +223,7 @@ ul {
li {
font-size: 1em;
line-height: 40px;
line-height: 27px;
text-align: center;
cursor:pointer
}
......@@ -225,15 +233,15 @@ li {
}
.boxE {
background-color: #d0e4a9;
border: 2px solid #e5e4e9;
background-color: #D2D0D1;
border: 2px solid #A09E87;
}
.boxP {
background-color: #0376c2;
background-color: #8cacea;
border: 2px solid #e5e4e9;
}
.boxF {
background-color: #8cacea;
background-color: #0376c2;
border: 2px solid #e5e4e9;
}
.boxA {
......
<template>
<div class="body" :style="'height:' + height + 'px'">
<div style="border: 2px solid #43A747;">
<!-- 主体区域 - 卡片视图 -->
<el-card :style="'height:' + (height - 60) + 'px;overflow-y: auto;position:relative;'">
<!-- 查询功能区域 -->
<el-form :inline="true" :model="searchData.condition" size="medium" label-position="left" >
<el-row type="flex" justify="space-between" align="middle">
<el-form-item>
<a-button type="primary" @click="editClick({})" icon="edit" ghost round>
新建
</a-button>
</el-form-item>
</el-row>
</el-form>
<el-table :data="companyData" style="width: 100%;overflow: auto;" size="medium" highlight-current-row>
<el-table-column type="index" width="60" label="序号" align="center" />
<el-table-column prop="rulePolicy" label="规则" align="center">
<template slot-scope="scope">
{{ scope.row.rulePolicy === 1 ? '固定分配': '平均分配' }}
</template>
</el-table-column>
<el-table-column prop="inModelPolicy" label="模式" align="center">
<template slot-scope="scope">
{{ scope.row.inModelPolicy === 1 ? '物资入库': scope.row.inModelPolicy === 2? '手动绑定' : '空托盘入库' }}
</template>
</el-table-column>
<el-table-column label="数量设定开关" align="center" >
<template slot-scope="scope">
{{ scope.row.numberLimit === 1 ? '开': '关' }}
</template>
</el-table-column>
<el-table-column prop="amount" label="数量" align="center" />
<el-table-column label="操作" align="center" width="200">
<template v-slot="scope">
<a-button type="primary" ghost icon="edit" size="small" @click="editClick(scope.row)">编辑</a-button>
</template>
</el-table-column>
</el-table>
<el-pagination
style="text-align: center;position: absolute;bottom: 0;background: #fff;width: 100%"
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="searchData.pageNo"
:page-size="searchData.pageSize"
layout="total, prev, pager, next, jumper"
:total="total"/>
<el-dialog :append-to-body="true" title="设置" :visible.sync="dialogVisible" @close="editClose()" width="700px" :close-on-click-modal="false">
<!-- 表单区域 -->
<el-form :model="formData" ref="fromRef" size="medium" label-position="right">
<el-row type="flex" justify="space-between">
<el-form-item label="规则 :">
<el-select v-model="formData.rulePolicy" filterable placeholder="请选择规则">
<el-option label="固定分配" :value="1"></el-option>
<el-option label="平均分配" :value="2"></el-option>
</el-select>
</el-form-item>
</el-row>
<el-row type="flex" justify="space-between">
<el-form-item label="模式 :">
<el-radio-group v-model="formData.inModelPolicy">
<el-radio :label="1">物资入库</el-radio>
<el-radio :label="2">手动绑定</el-radio>
<el-radio :label="3">空托盘入库</el-radio>
</el-radio-group>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="数量设定开关 :">
<el-switch
v-model="formData.numberLimit"
active-color="#409EFF"
inactive-color="#F56C6C"
:active-value="1"
:inactive-value="2"
/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="数量 :">
<el-input-number style="width: 100%" v-model="formData.amount" placeholder="请输入数量" controls-position="right" :min="0"/>
</el-form-item>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false" type="danger" size="medium">取 消</el-button>
<el-button type="primary" @click="subFormData()" size="medium">提 交</el-button>
</span>
</el-dialog>
</el-card>
</div>
</div>
</template>
<script>
export default {
data () {
return {
height: document.documentElement.clientHeight - 176,
// 同步遮罩层
dialogVisible: false,
data: [],
// 筛选数据
searchData: {
pageNo: 1,
pageSize: 10
},
formData: {},
// 总条数
total: 0,
}
},
created () {
this.getData()
},
mounted() {
const that = this
window.onresize = function temp() {
that.height = document.documentElement.clientHeight - 176
}
},
methods: {
// 获取单位数据
async getData () {
const { data: res } = await this.$axios.get('/rule/getRulePolicy', {params: this.searchData})
if (res.code !== 99200) return this.$message(res.message)
this.total = res.data.totalRows - 0
this.data = res.data.records
},
// 重置
resClick () {
this.searchData = {
pageNo: 1,
pageSize: 10,
}
this.getData()
},
editClick(row) {
const obj = JSON.parse(JSON.stringify(row))
this.formData = obj
this.dialogVisible = true
},
subFormData() {
this.$refs.fromRef.validate(async falg => {
if (!falg) return this.$message.error(res.message)
// 提交信息
let url = '/rule/updateRulePolicy'
const { data: res } = await this.$axios.post(url, this.formData)
if (!res.data) return this.$message.error(res.message)
this.$message.success(res.message)
this.dialogVisible = false
this.getData()
})
},
// 分页功能
// 每页显示条数发生改变时
handleSizeChange (val) {
this.searchData.pageSize = val
this.getData()
},
// 当前页数发生改变时
handleCurrentChange (val) {
this.searchData.pageNo = val
this.getData()
},
},
computed: {
}
}
</script>
<style scoped lang='less'>
</style>
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论