mt-ck/mt-qj-wms-ui
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update

Browse Source
This commit is contained in:
gtz217 2021-12-17 17:13:28 +08:00
parent 1231ba99c3
commit eb3288b3ed
4 changed files with 170 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/views/common/ex-warehouse-info.vue
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: zwq * @Author: zwq
* @Date: 2021-11-17 15:49:18 * @Date: 2021-11-17 15:49:18
* @LastEditors: zwq * @LastEditors: gtz
* @LastEditTime: 2021-11-17 15:58:31 * @LastEditTime: 2021-12-17 17:02:25
* @Description: * @Description:
--> -->
<template> <template>
@ -11,7 +11,9 @@
:visible.sync="visible"> :visible.sync="visible">
<el-table <el-table
:data="dataList" :data="dataList"
border v-loading="formLoading"
:stripe="true"
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
style="width: 100%;"> style="width: 100%;">
<el-table-column <el-table-column
type="index" type="index"
@ -21,19 +23,19 @@
width="50"> width="50">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="id" prop="idenCardNum"
header-align="center" header-align="center"
align="center" align="center"
label="标识卡"> label="标识卡">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="id1" prop="customer"
header-align="center" header-align="center"
align="center" align="center"
label="客户信息"> label="客户信息">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="number" prop="quantity"
header-align="center" header-align="center"
align="center" align="center"
label="数量"> label="数量">
@ -56,24 +58,27 @@
data () { data () {
return { return {
visible: false, visible: false,
dataList: [] dataList: [],
formLoading: false
} }
}, },
methods: { methods: {
init (id) { init (id) {
this.visible = true this.visible = true
this.formLoading = true
this.$nextTick(() => { this.$nextTick(() => {
if (id) { if (id) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/sys/config/info/${this.dataForm.id}`), url: this.$http.adornUrl(`/outStock/get`),
method: 'get', method: 'post',
params: this.$http.adornParams() data: this.$http.adornData({ id })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataForm.paramKey = data.config.paramKey this.dataForm = data.data
this.dataForm.paramValue = data.config.paramValue } else {
this.dataForm.remark = data.config.remark this.$message.error(data.msg)
} }
this.formLoading = false
}) })
} }
}) })

84
src/views/common/ex-warehouse.vue
View File

@ -1,40 +1,24 @@
<!-- <!--
* @Author: zwq * @Author: zwq
* @Date: 2021-11-15 15:17:30 * @Date: 2021-11-15 15:17:30
* @LastEditors: zwq * @LastEditors: gtz
* @LastEditTime: 2021-11-17 16:07:04 * @LastEditTime: 2021-12-17 17:05:22
* @Description: * @Description:
--> -->
<template> <template>
<div> <div v-loading="dataListLoading">
<div class="mainDiv" style="margin:10px 0 100px"> <div class="mainDiv" style="margin:10px 0 100px">
<div class="flexDiv">
<div <div
class="wareBox" class="wareBox"
:class="[ :class="[
count > Math.round(Math.random() * 10) ? 'enableBox' : 'disableBox', item.empty === 1 ? 'enableBox' : 'disableBox',
{ active: count === isActive } { active: item.locationId === isActive }
]" ]"
@click="selectBox(count)" @click="selectBox(item.locationId)"
v-for="count in 10" v-for="item in warehouseList"
v-bind:key="count" :key="item.locationId"
> >
<div class="plat">库位{{ count }}</div> <div class="plat">{{ item.locationName }}</div>
</div>
</div>
<div class="flexDiv">
<div
class="wareBox"
:class="[
count > Math.round(Math.random() * 10) ? 'enableBox' : 'disableBox',
{ active: count + 10 === isActive }
]"
@click="selectBox(count + 10)"
v-for="count in 10"
v-bind:key="count"
>
<div class="plat">库位{{ count + 10 }}</div>
</div>
</div> </div>
</div> </div>
<div class="line"></div> <div class="line"></div>
@ -59,31 +43,66 @@ export default {
data () { data () {
return { return {
isActive: '', isActive: '',
ExWarehouseInfoVisible: false ExWarehouseInfoVisible: false,
dataListLoading: false,
warehouseList: []
} }
}, },
components: { components: {
ExWarehouseInfo ExWarehouseInfo
}, },
created () {}, created () {
this.getWarehouseList()
},
methods: { methods: {
selectBox (count) { getWarehouseList () {
this.isActive = count this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/outStock/list'),
method: 'post'
}).then(({data}) => {
if (data && data.code === 0) {
this.warehouseList = data.data
} else {
this.warehouseList = []
}
this.dataListLoading = false
})
},
selectBox (id) {
this.isActive = id
this.ExWarehouseInfoVisible = true this.ExWarehouseInfoVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.ExWarehouseInfoRef.init() this.$refs.ExWarehouseInfoRef.init(id)
}) })
}, },
selectPlat (count) { selectPlat (count) {
if (this.isActive) { if (this.isActive) {
this.$confirm(`确认从库位${this.isActive}出库至提升台${count}?`, '提示', { this.$confirm(`确认从库位id为[${this.isActive}]出库至提升台${count}?`, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'info ' type: 'info '
}).then(() => { }).then(() => {
this.$http({
url: this.$http.adornUrl('/outStock/runOutTask'),
method: 'post',
data: this.$http.adornData({
code: count,
localtionId: this.isActive
})
}).then(({data}) => {
if (data && data.code === 0) {
this.$message({ this.$message({
type: 'success', type: 'success',
message: '出库成功!' message: '出库成功!',
onClose: () => {
this.getWarehouseList()
}
})
} else {
this.$message.error(data.msg)
}
this.dataListLoading = false
}) })
}).catch(() => { }).catch(() => {
this.$message({ this.$message({
@ -132,6 +151,7 @@ export default {
.wareBox { .wareBox {
cursor: pointer; cursor: pointer;
margin: 10px; margin: 10px;
width: 100px;
height: 100px; height: 100px;
padding: 10px; padding: 10px;
line-height: 90px; line-height: 90px;

83
src/views/report/car-alarm.vue
View File

@ -1,18 +1,18 @@
<template> <template>
<div class="mod-log"> <div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item> <el-form-item>
<el-select v-model="dataForm.key" filterable placeholder="车辆名称"> <el-select size="small" v-model="dataForm.equipmentId" clearable filterable placeholder="车辆名称">
<el-option <el-option
v-for="item in options" v-for="item in carList"
:key="item.value" :key="item.id"
:label="item.label" :label="item.vehicleName"
:value="item.value" :value="item.id"
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <!-- <el-form-item>
<el-date-picker <el-date-picker
v-model="dataForm.time" v-model="dataForm.time"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -22,14 +22,15 @@
end-placeholder="结束日期" end-placeholder="结束日期"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">查询</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
:data="dataList" :data="dataList"
border :stripe="true"
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%"> style="width: 100%">
<el-table-column <el-table-column
@ -40,27 +41,19 @@
width="50"> width="50">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="username" prop="equipmentName"
header-align="center"
align="center"
label="车辆名称"> label="车辆名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="operation" prop="createTime"
header-align="center"
align="center"
label="报警时间"> label="报警时间">
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column
prop="time" prop="time"
header-align="center"
align="center"
label="报警级别"> label="报警级别">
</el-table-column> </el-table-column> -->
<el-table-column <el-table-column
prop="ip" prop="alarmInfo"
header-align="center"
align="center"
label="报警内容"> label="报警内容">
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -81,8 +74,7 @@
data () { data () {
return { return {
dataForm: { dataForm: {
key: '', equipmentId: null
time: []
}, },
dataList: [], dataList: [],
options: [], options: [],
@ -90,28 +82,49 @@
pageSize: 10, pageSize: 10,
totalPage: 0, totalPage: 0,
dataListLoading: false, dataListLoading: false,
selectionDataList: [] selectionDataList: [],
carList: []
} }
}, },
created () { created () {
this.getDataList() this.getCarList()
}, },
methods: { methods: {
// 获取车辆列表
getCarList () {
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/vehicle/page'),
method: 'post',
data: this.$http.adornData({
current: 1,
size: 999
})
}).then(({ data }) => {
if (data && data.code === 0) {
this.carList = data.data.records
this.getDataList()
} else {
this.carList = []
}
})
},
// 获取数据列表 // 获取数据列表
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl('/sys/log/list'), url: this.$http.adornUrl('/alarmInfo/page'),
method: 'get', method: 'post',
params: this.$http.adornParams({ data: this.$http.adornData({
'page': this.pageIndex, current: this.pageIndex,
'limit': this.pageSize, size: this.pageSize,
'key': this.dataForm.key type: 1,
equipmentId: this.dataForm.equipmentId
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.data.records
this.totalPage = data.page.totalCount this.totalPage = data.data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

88
src/views/report/kiln-alarm.vue
View File

@ -1,23 +1,20 @@
<template> <template>
<div class="mod-log"> <div class="mod-config">
<el-form <el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
:inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()"
>
<el-form-item> <el-form-item>
<el-select v-model="dataForm.key" filterable placeholder="窑炉名称"> <el-select size="small" v-model="dataForm.equipmentId" clearable filterable placeholder="窑炉名称">
<el-option <el-option
v-for="item in options" v-for="item in kilnList"
:key="item.value" :key="item.id"
:label="item.label" :label="item.kilnName"
:value="item.value" :value="item.id"
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <!-- <el-form-item>
<el-date-picker <el-date-picker
size="small"
v-model="dataForm.time" v-model="dataForm.time"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="daterange" type="daterange"
@ -26,14 +23,15 @@
end-placeholder="结束日期" end-placeholder="结束日期"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">查询</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
:data="dataList" :data="dataList"
border :stripe="true"
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%" style="width: 100%"
> >
@ -46,30 +44,22 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="username" prop="equipmentName"
header-align="center"
align="center"
label="窑炉名称" label="窑炉名称"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="operation" prop="createTime"
header-align="center"
align="center"
label="报警时间" label="报警时间"
> >
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column
prop="time" prop="time"
header-align="center"
align="center"
label="报警级别" label="报警级别"
> > -->
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ip" prop="alarmInfo"
header-align="center"
align="center"
label="报警内容" label="报警内容"
> >
</el-table-column> </el-table-column>
@ -92,8 +82,7 @@ export default {
data () { data () {
return { return {
dataForm: { dataForm: {
key: '', equipmentId: null
time: []
}, },
dataList: [], dataList: [],
options: [], options: [],
@ -101,28 +90,49 @@ export default {
pageSize: 10, pageSize: 10,
totalPage: 0, totalPage: 0,
dataListLoading: false, dataListLoading: false,
selectionDataList: [] selectionDataList: [],
kilnList: []
} }
}, },
created () { created () {
this.getDataList() this.getKilnList()
}, },
methods: { methods: {
// 获取窑炉列表
getKilnList () {
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/kilnInfo/page'),
method: 'post',
data: this.$http.adornData({
current: 1,
size: 999
})
}).then(({ data }) => {
if (data && data.code === 0) {
this.kilnList = data.data.records
this.getDataList()
} else {
this.kilnList = []
}
})
},
// 获取数据列表 // 获取数据列表
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl('/sys/log/list'), url: this.$http.adornUrl('/alarmInfo/page'),
method: 'get', method: 'post',
params: this.$http.adornParams({ data: this.$http.adornData({
page: this.pageIndex, current: this.pageIndex,
limit: this.pageSize, size: this.pageSize,
key: this.dataForm.key type: 0,
equipmentId: this.dataForm.equipmentId
}) })
}).then(({ data }) => { }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.data.records
this.totalPage = data.page.totalCount this.totalPage = data.data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0