更新
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2024-04-16 15:08:37
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2024-04-16 16:22:00
|
||||
* @LastEditTime: 2024-05-24 09:57:14
|
||||
* @Description:
|
||||
*/
|
||||
import request from '@/utils/request'
|
||||
@@ -14,6 +14,14 @@ export function createDelivery(data) {
|
||||
data: data
|
||||
})
|
||||
}
|
||||
// 创建点对点出库单
|
||||
export function createDeliveryList(data) {
|
||||
return request({
|
||||
url: '/asrs/delivery/createList',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 更新出库单
|
||||
export function updateDelivery(data) {
|
||||
@@ -82,7 +90,7 @@ export function cancelDelivery(data) {
|
||||
})
|
||||
}
|
||||
|
||||
// 获得出库单分页
|
||||
// 获得出库单历史分页
|
||||
export function getDeliveryHisPage(query) {
|
||||
return request({
|
||||
url: '/asrs/delivery-history/page',
|
||||
@@ -91,6 +99,15 @@ export function getDeliveryHisPage(query) {
|
||||
})
|
||||
}
|
||||
|
||||
// 获得出库单历史和膜卷关系
|
||||
export function getDeliveryHisProPage(query) {
|
||||
return request({
|
||||
url: '/asrs/delivery-history-product/page',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 获得code
|
||||
export function getCode() {
|
||||
return request({
|
||||
@@ -98,3 +115,13 @@ export function getCode() {
|
||||
method: 'post'
|
||||
})
|
||||
}
|
||||
|
||||
// 导出历史 Excel
|
||||
export function exportDeliveryHisExcel(query) {
|
||||
return request({
|
||||
url: '/asrs/delivery-history/export-excel',
|
||||
method: 'get',
|
||||
params: query,
|
||||
responseType: 'blob'
|
||||
})
|
||||
}
|
||||
|
||||
@@ -85,13 +85,15 @@ export default {
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.startFun();
|
||||
axios
|
||||
.post('http://172.22.22.190/wcs-njlm/business/wcsTask/isonline')
|
||||
.then((res) => {
|
||||
if (res.code === 500) {
|
||||
console.log(res);
|
||||
if (res.data.code == 500) {
|
||||
this.$notify({
|
||||
title: '设备异常',
|
||||
message: res.msg,
|
||||
message: res.data.msg,
|
||||
type: 'warning',
|
||||
duration: 0,
|
||||
});
|
||||
@@ -113,6 +115,41 @@ export default {
|
||||
handleClickOutside() {
|
||||
this.$store.dispatch('app/closeSideBar', { withoutAnimation: false });
|
||||
},
|
||||
startFun() {
|
||||
setInterval(() => {
|
||||
this.getRealAlarm();
|
||||
}, 10000);
|
||||
},
|
||||
getRealAlarm() {
|
||||
axios
|
||||
.post('http://172.22.22.190/wcs-njlm/business/wcsTask/isAlarm')
|
||||
.then((res) => {
|
||||
res.data.forEach((item, index) => {
|
||||
if (index < 4) {
|
||||
if (item.code !== 0) {
|
||||
this.$notify({
|
||||
title: '异常',
|
||||
message: item.msg,
|
||||
type: 'warning',
|
||||
duration: 8000,
|
||||
});
|
||||
}
|
||||
} else {
|
||||
if (item.code > 30) {
|
||||
this.$notify({
|
||||
title: '异常',
|
||||
message: item.msg,
|
||||
type: 'warning',
|
||||
duration: 9000,
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error('There was an error!', error);
|
||||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
@@ -2,126 +2,349 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2021-11-18 14:16:25
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2024-05-09 09:33:08
|
||||
* @LastEditTime: 2024-05-22 10:09:16
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<el-form
|
||||
:model="dataForm"
|
||||
:rules="dataRule"
|
||||
ref="dataForm"
|
||||
@keyup.enter.native="dataFormSubmit()"
|
||||
label-width="100px">
|
||||
<el-form-item label="出库单号" prop="deliveryCode">
|
||||
<el-input
|
||||
v-model="dataForm.deliveryCode"
|
||||
clearable
|
||||
placeholder="请输入出库单号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="货物名称" prop="productName">
|
||||
<el-select
|
||||
v-model="dataForm.productName"
|
||||
filterable
|
||||
style="display: inline-block"
|
||||
@change="setShowTrayType"
|
||||
placeholder="请选择货物名称"
|
||||
remote
|
||||
:remote-method="remoteMethod"
|
||||
value-key="id"
|
||||
:loading="loading">
|
||||
<el-option
|
||||
v-for="item in productArr"
|
||||
:key="item.id"
|
||||
:label="item.goodSpecificationName"
|
||||
:value="item.goodSpecificationName"></el-option>
|
||||
</el-select>
|
||||
<div style="display: inline-block;margin-left: 10px;">
|
||||
<el-tag size="mini" type="warning">
|
||||
<i class="el-icon-question" />
|
||||
出空托盘请选择无产品
|
||||
</el-tag>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="出库类型" prop="deliveryType">
|
||||
<el-radio-group
|
||||
v-model="dataForm.deliveryType"
|
||||
@input="setNeedTrayNumber">
|
||||
<el-radio :label="1">单托盘出库</el-radio>
|
||||
<el-radio :label="2">多托盘出库</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="所需托盘数" prop="needTrayNumber">
|
||||
<el-input-number
|
||||
v-model="dataForm.needTrayNumber"
|
||||
:min="dataForm.deliveryType === 2 ? 2 : 1"
|
||||
:disabled="dataForm.deliveryType === 1" />
|
||||
</el-form-item>
|
||||
<el-form-item label="已补托盘数" prop="alreadyOutNumber">
|
||||
<el-input-number v-model="dataForm.alreadyOutNumber" disabled />
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="发货位置"
|
||||
prop="lineEdgeLibraryCode"
|
||||
key="lineEdgeLibraryCode"
|
||||
v-if="dataForm.deliveryType === 1">
|
||||
<el-select
|
||||
v-model="dataForm.lineEdgeLibraryCode"
|
||||
filterable
|
||||
placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in potArr"
|
||||
:key="item.id"
|
||||
:label="item.lineEdgeLibraryCode"
|
||||
:value="item.lineEdgeLibraryCode"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="发货区域"
|
||||
prop="region"
|
||||
key="region"
|
||||
v-if="dataForm.deliveryType === 2">
|
||||
<el-select v-model="dataForm.region" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in regionArr"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="货物品质"
|
||||
prop="productQuality"
|
||||
key="productQuality"
|
||||
v-if="!showTrayType">
|
||||
<el-input
|
||||
v-model="dataForm.productQuality"
|
||||
clearable
|
||||
placeholder="请输入货物品质" />
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="膜卷号"
|
||||
prop="rollCode"
|
||||
key="rollCode"
|
||||
v-if="dataForm.deliveryType === 1 && !showTrayType">
|
||||
<el-input
|
||||
v-model="dataForm.rollCode"
|
||||
clearable
|
||||
placeholder="请输入膜卷号" />
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="托盘类型"
|
||||
key="trayType"
|
||||
prop="trayType"
|
||||
v-if="showTrayType">
|
||||
<el-select v-model="dataForm.trayType" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in trayTypeArr"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div>
|
||||
<el-form
|
||||
:model="dataForm"
|
||||
:rules="dataRule"
|
||||
ref="dataForm"
|
||||
@keyup.enter.native="dataFormSubmit()"
|
||||
label-width="100px">
|
||||
<el-row :gutter="15">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="出库单号" prop="deliveryCode">
|
||||
<el-input
|
||||
v-model="dataForm.deliveryCode"
|
||||
clearable
|
||||
placeholder="请输入出库单号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12" v-if="dataForm.deliveryType !== 3">
|
||||
<el-form-item label="货物名称" prop="productName">
|
||||
<el-select
|
||||
v-model="dataForm.productName"
|
||||
filterable
|
||||
style="display: inline-block; width: 100%"
|
||||
@change="setShowTrayType"
|
||||
placeholder="请选择货物名称"
|
||||
remote
|
||||
:remote-method="remoteMethod"
|
||||
value-key="id"
|
||||
:loading="loading">
|
||||
<el-option
|
||||
v-for="item in productArr"
|
||||
:key="item.id"
|
||||
:label="item.goodSpecificationName"
|
||||
:value="item.goodSpecificationName"></el-option>
|
||||
</el-select>
|
||||
<div style="display: inline-block; margin-left: 10px">
|
||||
<el-tag size="mini" type="warning">
|
||||
<i class="el-icon-question" />
|
||||
出空托盘请选择无产品
|
||||
</el-tag>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="出库类型" prop="deliveryType">
|
||||
<el-radio-group
|
||||
v-model="dataForm.deliveryType"
|
||||
@input="setNeedTrayNumber">
|
||||
<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-col>
|
||||
<div v-if="dataForm.deliveryType !== 3" style="">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="所需托盘数" prop="needTrayNumber">
|
||||
<el-input-number
|
||||
style="width: 100%"
|
||||
v-model="dataForm.needTrayNumber"
|
||||
:min="dataForm.deliveryType === 2 ? 2 : 1"
|
||||
:disabled="dataForm.deliveryType === 1" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="已补托盘数" prop="alreadyOutNumber">
|
||||
<el-input-number
|
||||
style="width: 100%"
|
||||
v-model="dataForm.alreadyOutNumber"
|
||||
disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12" v-if="dataForm.deliveryType === 1">
|
||||
<el-form-item
|
||||
label="发货位置"
|
||||
prop="lineEdgeLibraryCode"
|
||||
key="lineEdgeLibraryCode">
|
||||
<el-select
|
||||
v-model="dataForm.lineEdgeLibraryCode"
|
||||
filterable
|
||||
style="width: 100%"
|
||||
placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in potArr"
|
||||
:key="item.id"
|
||||
:label="item.lineEdgeLibraryCode"
|
||||
:value="item.lineEdgeLibraryCode"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12" v-if="dataForm.deliveryType === 2">
|
||||
<el-form-item label="发货区域" prop="region" key="region">
|
||||
<el-select
|
||||
style="width: 100%"
|
||||
v-model="dataForm.region"
|
||||
placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in regionArr"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12" v-if="!showTrayType">
|
||||
<el-form-item
|
||||
label="货物品质"
|
||||
prop="productQuality"
|
||||
key="productQuality">
|
||||
<el-input
|
||||
v-model="dataForm.productQuality"
|
||||
clearable
|
||||
placeholder="请输入货物品质" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col
|
||||
:span="12"
|
||||
v-if="dataForm.deliveryType === 1 && !showTrayType">
|
||||
<el-form-item label="膜卷号" prop="rollCode" key="rollCode">
|
||||
<el-input
|
||||
v-model="dataForm.rollCode"
|
||||
clearable
|
||||
placeholder="请输入膜卷号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12" v-if="showTrayType">
|
||||
<el-form-item label="托盘类型" key="trayType" prop="trayType">
|
||||
<el-select
|
||||
style="width: 100%"
|
||||
v-model="dataForm.trayType"
|
||||
placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in trayTypeArr"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="工单" prop="workOrder">
|
||||
<el-input
|
||||
v-model="dataForm.workOrder"
|
||||
clearable
|
||||
placeholder="请输入工单" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="工序" prop="process">
|
||||
<el-input
|
||||
v-model="dataForm.process"
|
||||
clearable
|
||||
placeholder="请输入工序" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</div>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="部门" prop="department">
|
||||
<el-input
|
||||
v-model="dataForm.department"
|
||||
clearable
|
||||
placeholder="请输入部门" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="申请人" prop="applicant">
|
||||
<el-input
|
||||
v-model="dataForm.applicant"
|
||||
clearable
|
||||
placeholder="请输入申请人" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<div v-if="dataForm.deliveryType === 3">
|
||||
<el-table
|
||||
:data="tableData"
|
||||
:header-cell-style="{
|
||||
background: '#F2F4F9',
|
||||
color: '#606266',
|
||||
}"
|
||||
border
|
||||
empty-text="暂无数据"
|
||||
style="width: 100%"
|
||||
ref="dataList">
|
||||
<el-table-column
|
||||
type="index"
|
||||
fixed="left"
|
||||
label="#"
|
||||
align="center" />
|
||||
<el-table-column prop="lineEdgeLibraryCode" label="目的码头">
|
||||
<template slot-scope="scope">
|
||||
<el-select
|
||||
v-model="scope.row.lineEdgeLibraryCode"
|
||||
filterable
|
||||
@change="(val) => setEdgeInfo(val, scope.$index)"
|
||||
style="width: 100%"
|
||||
placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in potArr"
|
||||
:key="item.id"
|
||||
:label="item.lineEdgeLibraryCode"
|
||||
:value="item.lineEdgeLibraryCode"></el-option>
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="agvGroundCode" label="码头编码" width="80" />
|
||||
<el-table-column prop="region" label="区域名称" width="150">
|
||||
<template slot-scope="scope">
|
||||
<span>
|
||||
{{
|
||||
scope.row.region ? regionArr[scope.row.region - 1].name : ''
|
||||
}}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="trayCode" label="托盘编码">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.trayCode" readonly>
|
||||
<el-button
|
||||
slot="append"
|
||||
icon="el-icon-search"
|
||||
@click="showTray(scope.$index)" />
|
||||
</el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="productName" label="物料名称" />
|
||||
<el-table-column prop="productCode" label="物料编码" width="120" />
|
||||
<el-table-column prop="productQuality" label="货物品质" />
|
||||
<el-table-column fixed="right" label="操作" width="50">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
@click="handleClick(scope.$index)">
|
||||
<span
|
||||
class="iconfont icon-delete delete-color"
|
||||
style="color: #f56c6c"></span>
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!-- 表格底部加号 -->
|
||||
<el-button class="addButton" icon="el-icon-plus" @click="addNew">
|
||||
新增
|
||||
</el-button>
|
||||
</div>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<el-dialog
|
||||
width="80%"
|
||||
title="选择库存托盘"
|
||||
:visible.sync="innerVisible"
|
||||
append-to-body>
|
||||
<el-form
|
||||
:model="listQuery"
|
||||
ref="queryForm"
|
||||
size="small"
|
||||
:inline="true"
|
||||
label-width="68px">
|
||||
<el-form-item label="托盘编码" prop="trayCode">
|
||||
<el-input
|
||||
v-model="listQuery.trayCode"
|
||||
placeholder="请输入托盘编码"
|
||||
clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="工序" prop="process">
|
||||
<el-input
|
||||
v-model="listQuery.process"
|
||||
placeholder="请输入工序"
|
||||
clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="膜卷号" prop="rollCode">
|
||||
<el-input
|
||||
v-model="listQuery.rollCode"
|
||||
placeholder="请输入膜卷号"
|
||||
clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="产品名" prop="productName">
|
||||
<el-input
|
||||
v-model="listQuery.productName"
|
||||
placeholder="请输入产品名"
|
||||
clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="品质" prop="grade">
|
||||
<el-input
|
||||
v-model="listQuery.grade"
|
||||
placeholder="请输入品质"
|
||||
clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="入库时间" prop="createTime">
|
||||
<el-date-picker
|
||||
v-model="listQuery.createTime"
|
||||
style="width: 240px"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
type="daterange"
|
||||
range-separator="-"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
:default-time="['00:00:00', '23:59:59']" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery">
|
||||
搜索
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-table
|
||||
:data="gridData"
|
||||
border
|
||||
v-loading="loadingGrid"
|
||||
element-loading-text="拼命加载中"
|
||||
element-loading-spinner="el-icon-loading"
|
||||
element-loading-background="rgba(0, 0, 0, 0.8)">
|
||||
<el-table-column type="index" fixed="left" label="#" align="center" />
|
||||
<el-table-column label="" width="40">
|
||||
<template slot-scope="scope">
|
||||
<i
|
||||
class="el-icon-plus"
|
||||
@click="setTray(scope.row)"
|
||||
style="color: #409eff; cursor: pointer; font-weight: bolder" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column property="trayCode" label="托盘编码" width="80" />
|
||||
<el-table-column property="productCode" label="物料编码" width="120" />
|
||||
<el-table-column property="description" label="物料名称" />
|
||||
<el-table-column property="grade" label="货物品质" width="80" />
|
||||
<el-table-column property="inventory" label="膜卷号" />
|
||||
<el-table-column property="process" label="工序" width="80" />
|
||||
<el-table-column property="createTime" label="入库时间" width="180">
|
||||
<template v-slot="scope">
|
||||
<span>{{ parseTime(scope.row.createTime) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination
|
||||
:limit.sync="listQuery.pageSize"
|
||||
:page.sync="listQuery.pageNo"
|
||||
:total="listQuery.total"
|
||||
@pagination="getGridList" />
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
@@ -131,7 +354,9 @@ import {
|
||||
updateDelivery,
|
||||
getDelivery,
|
||||
getCode,
|
||||
createDeliveryList,
|
||||
} from '@/api/oth/delivery';
|
||||
import { getPage } from '@/api/oth/rollMessage';
|
||||
import { getLineList } from '@/api/asrs/warehouseStorehouse';
|
||||
import { getGoodSpecificationPage } from '@/api/asrs/goodSpecification';
|
||||
|
||||
@@ -173,11 +398,31 @@ export default {
|
||||
productQuality: null,
|
||||
rollCode: null,
|
||||
trayType: null,
|
||||
workOrder: null,
|
||||
department: null,
|
||||
applicant: null,
|
||||
process: null,
|
||||
},
|
||||
listQuery: {
|
||||
warehouseId: '1696803324030865409',
|
||||
trayCode: null,
|
||||
process: null,
|
||||
rollCode: null,
|
||||
productName: null,
|
||||
grade: null,
|
||||
pageSize: 10,
|
||||
pageNo: 1,
|
||||
total: 1,
|
||||
},
|
||||
tableData: [{}],
|
||||
regionArr,
|
||||
potArr: [],
|
||||
productArr: [],
|
||||
gridData: [],
|
||||
innerVisible: false,
|
||||
loadingGrid: false,
|
||||
showTrayType: false,
|
||||
trayIndex: null,
|
||||
trayTypeArr: [
|
||||
{ id: 1, name: '6臂' },
|
||||
{ id: 2, name: '12臂' },
|
||||
@@ -202,6 +447,12 @@ export default {
|
||||
trayType: [
|
||||
{ required: true, message: '托盘类型不能为空', trigger: 'change' },
|
||||
],
|
||||
department: [
|
||||
{ required: true, message: '部门不能为空', trigger: 'blur' },
|
||||
],
|
||||
applicant: [
|
||||
{ required: true, message: '申请人不能为空', trigger: 'blur' },
|
||||
],
|
||||
},
|
||||
};
|
||||
},
|
||||
@@ -231,6 +482,11 @@ export default {
|
||||
this.productArr = [];
|
||||
}
|
||||
},
|
||||
setEdgeInfo(val, index) {
|
||||
const info = this.potArr.find((item) => item.lineEdgeLibraryCode === val);
|
||||
this.tableData[index].agvGroundCode = info.agvGroundCode;
|
||||
this.tableData[index].region = info.region;
|
||||
},
|
||||
setNeedTrayNumber(val) {
|
||||
if (val === 1) {
|
||||
this.dataForm.needTrayNumber = 1;
|
||||
@@ -240,10 +496,12 @@ export default {
|
||||
} else {
|
||||
this.showTrayType = true;
|
||||
}
|
||||
} else {
|
||||
} else if (val === 2) {
|
||||
this.dataForm.needTrayNumber = 2;
|
||||
this.dataForm.lineEdgeLibraryCode = null;
|
||||
this.showTrayType = true;
|
||||
} else if (val === 3) {
|
||||
this.tableData = [{}];
|
||||
}
|
||||
},
|
||||
setShowTrayType(val) {
|
||||
@@ -253,6 +511,135 @@ export default {
|
||||
this.showTrayType = false;
|
||||
}
|
||||
},
|
||||
showTray(index) {
|
||||
this.trayIndex = index;
|
||||
this.innerVisible = true;
|
||||
this.listQuery = {
|
||||
warehouseId: '1696803324030865409',
|
||||
pageSize: 10,
|
||||
pageNo: 1,
|
||||
total: 1,
|
||||
};
|
||||
this.getGridList();
|
||||
},
|
||||
getGridList() {
|
||||
this.loadingGrid = true;
|
||||
getPage(this.listQuery).then((response) => {
|
||||
this.loadingGrid = false;
|
||||
this.gridData = response.data.list;
|
||||
this.listQuery.total = response.data.total;
|
||||
});
|
||||
},
|
||||
setTray(val) {
|
||||
this.innerVisible = false;
|
||||
this.$set(this.tableData[this.trayIndex], 'trayCode', val.trayCode);
|
||||
this.$set(this.tableData[this.trayIndex], 'productName', val.description);
|
||||
this.$set(this.tableData[this.trayIndex], 'productCode', val.productCode);
|
||||
this.$set(this.tableData[this.trayIndex], 'productQuality', val.grade);
|
||||
},
|
||||
//dialog查询
|
||||
handleQuery() {
|
||||
this.listQuery.pageNo = 1;
|
||||
this.listQuery.pageSize = 10;
|
||||
this.listQuery.trayCode = this.listQuery.trayCode || null;
|
||||
this.listQuery.process = this.listQuery.process || null;
|
||||
this.listQuery.rollCode = this.listQuery.rollCode || null;
|
||||
this.listQuery.productName = this.listQuery.productName || null;
|
||||
this.listQuery.grade = this.listQuery.grade || null;
|
||||
this.listQuery.startTime = this.listQuery.searchTime
|
||||
? this.listQuery.searchTime[0]
|
||||
: null;
|
||||
this.listQuery.endTime = this.listQuery.searchTime
|
||||
? this.listQuery.searchTime[1]
|
||||
: null;
|
||||
this.getGridList();
|
||||
},
|
||||
// 每页数
|
||||
sizeChangeHandle(val) {
|
||||
this.listQuery.pageSize = val;
|
||||
this.listQuery.pageNo = 1;
|
||||
this.getGridList();
|
||||
},
|
||||
// 当前页
|
||||
currentChangeHandle(val) {
|
||||
this.listQuery.pageNo = val;
|
||||
this.getGridList();
|
||||
},
|
||||
addNew() {
|
||||
const obj = {};
|
||||
this.tableData.push(obj);
|
||||
},
|
||||
handleClick(index) {
|
||||
this.tableData.splice(index, 1);
|
||||
},
|
||||
// 表单提交
|
||||
dataFormSubmit() {
|
||||
this.$refs['dataForm'].validate((valid) => {
|
||||
if (!valid) {
|
||||
return false;
|
||||
}
|
||||
// 点对点
|
||||
if (this.dataForm.deliveryType === 3) {
|
||||
let cancel = false;
|
||||
this.tableData.forEach((item) => {
|
||||
item.deliveryCode = this.dataForm.deliveryCode;
|
||||
item.department = this.dataForm.department;
|
||||
item.applicant = this.dataForm.applicant;
|
||||
item.warehouseId = this.aId;
|
||||
item.deliveryType = 3;
|
||||
item.needTrayNumber = 1;
|
||||
if (!item.lineEdgeLibraryCode || !item.trayCode) {
|
||||
cancel = true;
|
||||
this.$modal.msgWarning('目的码头或托盘编码不能为空!');
|
||||
}
|
||||
});
|
||||
if (cancel) return;
|
||||
createDeliveryList(this.tableData).then((response) => {
|
||||
if (response.data === -1) {
|
||||
this.$modal.msgWarning('排、列、层不能重复');
|
||||
} else if (response.data === 0) {
|
||||
this.$modal.msgWarning('名称或编码不能重复');
|
||||
} else {
|
||||
this.$modal.msgSuccess('新增成功');
|
||||
this.visible = false;
|
||||
this.$emit('refreshDataList');
|
||||
}
|
||||
});
|
||||
return;
|
||||
}
|
||||
// 添加的提交
|
||||
this.urlOptions.createURL(this.dataForm).then((response) => {
|
||||
if (response.data === -1) {
|
||||
this.$modal.msgWarning('排、列、层不能重复');
|
||||
} else if (response.data === 0) {
|
||||
this.$modal.msgWarning('名称或编码不能重复');
|
||||
} else {
|
||||
this.$modal.msgSuccess('新增成功');
|
||||
this.visible = false;
|
||||
this.$emit('refreshDataList');
|
||||
}
|
||||
});
|
||||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
<style scoped>
|
||||
.addButton {
|
||||
width: 100%;
|
||||
height: 35px;
|
||||
border-top: none;
|
||||
color: #0b58ff;
|
||||
border-color: #ebeef5;
|
||||
border-radius: 0;
|
||||
}
|
||||
.addButton:hover {
|
||||
color: #0b58ff;
|
||||
border-color: #ebeef5;
|
||||
background-color: #fff;
|
||||
}
|
||||
.addButton:focus {
|
||||
border-color: #ebeef5;
|
||||
background-color: #fff;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,23 +1,24 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<search-bar
|
||||
:formConfigs="formConfig"
|
||||
ref="searchBarForm"
|
||||
@headBtnClick="buttonClick" />
|
||||
<base-table
|
||||
v-loading="dataListLoading"
|
||||
:table-props="tableProps"
|
||||
:page="listQuery.pageNo"
|
||||
:limit="listQuery.pageSize"
|
||||
:table-data="tableData">
|
||||
<method-btn
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
:width="200"
|
||||
label="操作"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleClick" />
|
||||
</base-table>
|
||||
<search-bar
|
||||
:isFold="true"
|
||||
:formConfigs="formConfig"
|
||||
ref="searchBarForm"
|
||||
@headBtnClick="buttonClick" />
|
||||
<base-table
|
||||
v-loading="dataListLoading"
|
||||
:table-props="tableProps"
|
||||
:page="listQuery.pageNo"
|
||||
:limit="listQuery.pageSize"
|
||||
:table-data="tableData">
|
||||
<method-btn
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
:width="200"
|
||||
label="操作"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleClick" />
|
||||
</base-table>
|
||||
<pagination
|
||||
:limit.sync="listQuery.pageSize"
|
||||
:page.sync="listQuery.pageNo"
|
||||
@@ -61,6 +62,10 @@ const tableProps = [
|
||||
prop: 'productName',
|
||||
label: '货物名称',
|
||||
},
|
||||
{
|
||||
prop: 'trayCode',
|
||||
label: '托盘编码',
|
||||
},
|
||||
{
|
||||
prop: 'needTrayNumber',
|
||||
label: '所需托盘数',
|
||||
@@ -106,6 +111,22 @@ const tableProps = [
|
||||
filter: codeFilter('trayType'),
|
||||
width: 80,
|
||||
},
|
||||
{
|
||||
prop: 'workOrder',
|
||||
label: '工单',
|
||||
},
|
||||
{
|
||||
prop: 'department',
|
||||
label: '部门',
|
||||
},
|
||||
{
|
||||
prop: 'applicant',
|
||||
label: '申请人',
|
||||
},
|
||||
{
|
||||
prop: 'process',
|
||||
label: '工序',
|
||||
},
|
||||
{
|
||||
prop: 'updateTime',
|
||||
label: '更新时间',
|
||||
@@ -214,6 +235,30 @@ export default {
|
||||
defaultSelect: '',
|
||||
filterable: true,
|
||||
},
|
||||
{
|
||||
type: 'input',
|
||||
label: '膜卷号',
|
||||
placeholder: '膜卷号',
|
||||
param: 'rollCode',
|
||||
},
|
||||
{
|
||||
type: 'input',
|
||||
label: '工单',
|
||||
placeholder: '工单',
|
||||
param: 'workOrder',
|
||||
},
|
||||
{
|
||||
type: 'input',
|
||||
label: '工序',
|
||||
placeholder: '工序',
|
||||
param: 'process',
|
||||
},
|
||||
{
|
||||
type: 'input',
|
||||
label: '托盘编码',
|
||||
placeholder: '托盘编码',
|
||||
param: 'trayCode',
|
||||
},
|
||||
{
|
||||
type: 'input',
|
||||
label: '货物品质',
|
||||
@@ -262,9 +307,13 @@ export default {
|
||||
this.listQuery.pageNo = 1;
|
||||
this.listQuery.pageSize = 10;
|
||||
this.listQuery.productName = val.productName;
|
||||
this.listQuery.lineEdgeLibraryCode = val.lineEdgeLibraryCode || null;
|
||||
this.listQuery.region = val.region || null;
|
||||
this.listQuery.productQuality = val.quality || null;
|
||||
this.listQuery.lineEdgeLibraryCode = val.lineEdgeLibraryCode || null;
|
||||
this.listQuery.region = val.region || null;
|
||||
this.listQuery.productQuality = val.quality || null;
|
||||
this.listQuery.workOrder = val.workOrder || null;
|
||||
this.listQuery.process = val.process || null;
|
||||
this.listQuery.rollCode = val.rollCode || null;
|
||||
this.listQuery.trayCode = val.trayCode || null;
|
||||
this.getDataList();
|
||||
break;
|
||||
case 'add':
|
||||
|
||||
@@ -1,15 +1,77 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<search-bar
|
||||
:isFold="true"
|
||||
:formConfigs="formConfig"
|
||||
ref="searchBarForm"
|
||||
@headBtnClick="buttonClick" />
|
||||
<base-table
|
||||
<el-table
|
||||
:data="tableData"
|
||||
:header-cell-style="{
|
||||
background: '#F2F4F9',
|
||||
color: '#606266',
|
||||
}"
|
||||
border
|
||||
v-loading="dataListLoading"
|
||||
:table-props="tableProps"
|
||||
:page="listQuery.pageNo"
|
||||
:limit="listQuery.pageSize"
|
||||
:table-data="tableData"></base-table>
|
||||
style="width: 100%"
|
||||
ref="dataList">
|
||||
<el-table-column type="expand">
|
||||
<template slot-scope="scope">
|
||||
<product :delivery-history-id="scope.row.id"></product>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="deliveryCode" label="出库单号" width="155" />
|
||||
<el-table-column prop="productName" label="货物名称" />
|
||||
<el-table-column prop="trayCode" label="托盘编码" />
|
||||
<el-table-column prop="needTrayNumber" label="所需托盘数" width="90" />
|
||||
<el-table-column prop="alreadyOutNumber" label="已补托盘数" width="90" />
|
||||
<el-table-column prop="status" label="出库单状态" width="90">
|
||||
<template slot-scope="scope">
|
||||
<span>
|
||||
{{ scope.row.status >= 0 ? status[scope.row.status] : '' }}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="deliveryType" label="出库类型" width="95">
|
||||
<template slot-scope="scope">
|
||||
<span>
|
||||
{{
|
||||
scope.row.deliveryType >= 0
|
||||
? deliveryType[scope.row.deliveryType]
|
||||
: ''
|
||||
}}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="lineEdgeLibraryCode" label="码头位置" />
|
||||
<el-table-column prop="region" label="发货区域" width="95">
|
||||
<template slot-scope="scope">
|
||||
<span>
|
||||
{{
|
||||
scope.row.region >= 0 ? region[scope.row.region] : ''
|
||||
}}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="productQuality" label="货物品质" width="75" />
|
||||
<el-table-column prop="rollCode" label="膜卷号" />
|
||||
<el-table-column prop="trayType" label="托盘类型" width="75">
|
||||
<template slot-scope="scope">
|
||||
<span>
|
||||
{{ scope.row.trayType >= 0 ? trayType[scope.row.trayType] : '' }}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="workOrder" label="工单" />
|
||||
<el-table-column prop="department" label="部门" />
|
||||
<el-table-column prop="applicant" label="申请人" />
|
||||
<el-table-column prop="process" label="工序" />
|
||||
<el-table-column prop="createTime" label="创建时间" width="150">
|
||||
<template v-slot="scope">
|
||||
<span>{{ parseTime(scope.row.createTime) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination
|
||||
:limit.sync="listQuery.pageSize"
|
||||
:page.sync="listQuery.pageNo"
|
||||
@@ -19,74 +81,12 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import product from './product-mini';
|
||||
import basicPage from '../mixins/basic-page';
|
||||
import { parseTime } from '../mixins/code-filter';
|
||||
import { getDeliveryHisPage } from '@/api/oth/delivery';
|
||||
import codeFilter from '../mixins/code-filter';
|
||||
import { getDeliveryHisPage,exportDeliveryHisExcel } from '@/api/oth/delivery';
|
||||
import { getLineList } from '@/api/asrs/warehouseStorehouse';
|
||||
import { getGoodSpecificationPage } from '@/api/asrs/goodSpecification';
|
||||
|
||||
const tableProps = [
|
||||
{
|
||||
prop: 'deliveryCode',
|
||||
label: '出库单号',
|
||||
},
|
||||
{
|
||||
prop: 'productName',
|
||||
label: '货物名称',
|
||||
},
|
||||
{
|
||||
prop: 'needTrayNumber',
|
||||
label: '所需托盘数',
|
||||
width: 90
|
||||
},
|
||||
{
|
||||
prop: 'alreadyOutNumber',
|
||||
label: '已补托盘数',
|
||||
width: 90
|
||||
},
|
||||
{
|
||||
prop: 'status',
|
||||
label: '出库单状态',
|
||||
filter: codeFilter('status'),
|
||||
width: 90
|
||||
},
|
||||
{
|
||||
prop: 'deliveryType',
|
||||
label: '出库类型',
|
||||
filter: codeFilter('deliveryType'),
|
||||
width: 95
|
||||
},
|
||||
{
|
||||
prop: 'lineEdgeLibraryCode',
|
||||
label: '码头位置',
|
||||
},
|
||||
{
|
||||
prop: 'region',
|
||||
label: '发货区域',
|
||||
filter: codeFilter('region'),
|
||||
},
|
||||
{
|
||||
prop: 'productQuality',
|
||||
label: '货物品质',
|
||||
},
|
||||
{
|
||||
prop: 'rollCode',
|
||||
label: '膜卷号',
|
||||
},
|
||||
{
|
||||
prop: 'trayType',
|
||||
label: '托盘类型',
|
||||
filter: codeFilter('trayType'),
|
||||
width: 80
|
||||
},
|
||||
{
|
||||
prop: 'createTime',
|
||||
label: '创建时间',
|
||||
filter: parseTime,
|
||||
width: 150,
|
||||
},
|
||||
];
|
||||
const regionArr = [
|
||||
{ name: '一次分切区域1线', id: 1 },
|
||||
{ name: '一次分拣区域', id: 2 },
|
||||
@@ -100,14 +100,35 @@ const regionArr = [
|
||||
{ name: '一次分切区域3线', id: 10 },
|
||||
{ name: '一次分切区域4线', id: 11 },
|
||||
];
|
||||
const region = [
|
||||
'',
|
||||
'一次分切区域1线',
|
||||
'一次分拣区域',
|
||||
'二次分切区域',
|
||||
'二次分拣区域',
|
||||
'手动包装区域',
|
||||
'涂覆区域',
|
||||
'其他',
|
||||
'自动包装区域',
|
||||
'一次分切区域2线',
|
||||
'一次分切区域3线',
|
||||
'一次分切区域4线',
|
||||
];
|
||||
const status = ['', '优先执行', '正常运行', '暂停', '完成', '取消'];
|
||||
const deliveryType = ['', '单托盘出库', '多托盘出库', '点对点出库'];
|
||||
const trayType = ['无要求', '6臂', '12臂'];
|
||||
export default {
|
||||
mixins: [basicPage],
|
||||
data() {
|
||||
return {
|
||||
urlOptions: {
|
||||
getDataListURL: getDeliveryHisPage,
|
||||
exportURL: exportDeliveryHisExcel,
|
||||
},
|
||||
tableProps,
|
||||
status,
|
||||
deliveryType,
|
||||
trayType,
|
||||
region,
|
||||
tableData: [],
|
||||
formConfig: [
|
||||
{
|
||||
@@ -138,6 +159,30 @@ export default {
|
||||
defaultSelect: '',
|
||||
filterable: true,
|
||||
},
|
||||
{
|
||||
type: 'input',
|
||||
label: '膜卷号',
|
||||
placeholder: '膜卷号',
|
||||
param: 'rollCode',
|
||||
},
|
||||
{
|
||||
type: 'input',
|
||||
label: '工单',
|
||||
placeholder: '工单',
|
||||
param: 'workOrder',
|
||||
},
|
||||
{
|
||||
type: 'input',
|
||||
label: '工序',
|
||||
placeholder: '工序',
|
||||
param: 'process',
|
||||
},
|
||||
{
|
||||
type: 'input',
|
||||
label: '托盘编码',
|
||||
placeholder: '托盘编码',
|
||||
param: 'trayCode',
|
||||
},
|
||||
{
|
||||
type: 'input',
|
||||
label: '货物品质',
|
||||
@@ -150,10 +195,19 @@ export default {
|
||||
name: 'search',
|
||||
color: 'primary',
|
||||
},
|
||||
{
|
||||
type: 'button',
|
||||
btnName: '导出',
|
||||
name: 'export',
|
||||
color: 'primary',
|
||||
plain: true,
|
||||
},
|
||||
],
|
||||
};
|
||||
},
|
||||
components: {},
|
||||
components: {
|
||||
product,
|
||||
},
|
||||
created() {
|
||||
const params = {
|
||||
pageSize: 100,
|
||||
@@ -176,11 +230,28 @@ export default {
|
||||
this.listQuery.pageNo = 1;
|
||||
this.listQuery.pageSize = 10;
|
||||
this.listQuery.productName = val.productName;
|
||||
this.listQuery.lineEdgeLibraryCode = val.lineEdgeLibraryCode || null;
|
||||
this.listQuery.region = val.region || null;
|
||||
this.listQuery.productQuality = val.quality || null;
|
||||
this.listQuery.lineEdgeLibraryCode = val.lineEdgeLibraryCode || null;
|
||||
this.listQuery.region = val.region || null;
|
||||
this.listQuery.productQuality = val.quality || null;
|
||||
this.listQuery.workOrder = val.workOrder || null;
|
||||
this.listQuery.process = val.process || null;
|
||||
this.listQuery.rollCode = val.rollCode || null;
|
||||
this.listQuery.trayCode = val.trayCode || null;
|
||||
this.getDataList();
|
||||
break;
|
||||
case 'export':
|
||||
this.listQuery.pageNo = undefined;
|
||||
this.listQuery.pageSize = undefined;
|
||||
this.listQuery.productName = val.productName;
|
||||
this.listQuery.lineEdgeLibraryCode = val.lineEdgeLibraryCode || null;
|
||||
this.listQuery.region = val.region || null;
|
||||
this.listQuery.productQuality = val.quality || null;
|
||||
this.listQuery.workOrder = val.workOrder || null;
|
||||
this.listQuery.process = val.process || null;
|
||||
this.listQuery.rollCode = val.rollCode || null;
|
||||
this.listQuery.trayCode = val.trayCode || null;
|
||||
this.handleExport(this.listQuery, '历史出库单导出');
|
||||
break;
|
||||
default:
|
||||
console.log(val);
|
||||
}
|
||||
@@ -188,3 +259,16 @@ export default {
|
||||
},
|
||||
};
|
||||
</script>
|
||||
<style>
|
||||
.app-container .el-table .el-table__cell {
|
||||
padding: 0;
|
||||
height: 35px;
|
||||
}
|
||||
.el-table .warning-row {
|
||||
background: oldlace;
|
||||
}
|
||||
|
||||
.el-table .success-row {
|
||||
background: #f0f9eb;
|
||||
}
|
||||
</style>
|
||||
|
||||
118
src/views/asrs/deliveryHis/product-mini.vue
Normal file
118
src/views/asrs/deliveryHis/product-mini.vue
Normal file
@@ -0,0 +1,118 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2023-08-24 14:47:58
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2024-05-22 16:42:40
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<div>
|
||||
<!-- <div class="app-container"> -->
|
||||
<base-table
|
||||
v-loading="dataListLoading"
|
||||
:table-props="tableProps"
|
||||
max-height="200"
|
||||
:table-data="tableData" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import basicPage from '../mixins/basic-page';
|
||||
import { parseTime } from '../mixins/code-filter';
|
||||
import { getDeliveryHisProPage } from '@/api/oth/delivery';
|
||||
|
||||
const tableProps = [
|
||||
{
|
||||
prop: 'deliveryCode',
|
||||
label: '出库单号',
|
||||
},
|
||||
{
|
||||
prop: 'subContainerCode',
|
||||
label: '悬臂号',
|
||||
},
|
||||
{
|
||||
prop: 'trayCode',
|
||||
label: '托盘编码',
|
||||
},
|
||||
{
|
||||
prop: 'inventory',
|
||||
label: '膜卷号',
|
||||
width: 167,
|
||||
},
|
||||
{
|
||||
prop: 'productCode',
|
||||
label: '物料编码',
|
||||
width: 120,
|
||||
},
|
||||
{
|
||||
prop: 'productName',
|
||||
label: '物料名称',
|
||||
},
|
||||
{
|
||||
prop: 'grade',
|
||||
label: '品质',
|
||||
},
|
||||
{
|
||||
prop: 'planQty',
|
||||
label: '数量',
|
||||
},
|
||||
{
|
||||
prop: 'orderFrom',
|
||||
label: '产出工单',
|
||||
width: 100,
|
||||
},
|
||||
{
|
||||
prop: 'applicant',
|
||||
label: '申请人',
|
||||
},
|
||||
{
|
||||
prop: 'region',
|
||||
label: '目标区域',
|
||||
},
|
||||
{
|
||||
prop: 'lineEdgeLibraryCode',
|
||||
label: '目标位置',
|
||||
},
|
||||
{
|
||||
prop: 'lineId',
|
||||
label: '行号',
|
||||
},
|
||||
{
|
||||
prop: 'createTime',
|
||||
label: '创建时间',
|
||||
filter: parseTime,
|
||||
width: 150,
|
||||
},
|
||||
];
|
||||
|
||||
export default {
|
||||
mixins: [basicPage],
|
||||
props: {
|
||||
deliveryHistoryId: {
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
urlOptions: {
|
||||
getDataListURL: getDeliveryHisProPage,
|
||||
},
|
||||
tableProps,
|
||||
tableData: [],
|
||||
listQuery: {
|
||||
deliveryHistoryId: this.deliveryHistoryId,
|
||||
pageSize: 100,
|
||||
pageNo: 1,
|
||||
total: 1,
|
||||
},
|
||||
};
|
||||
},
|
||||
components: {
|
||||
},
|
||||
created() {
|
||||
},
|
||||
methods: {
|
||||
},
|
||||
};
|
||||
</script>
|
||||
169
src/views/asrs/heavenlyEyeLog/index-2.vue
Normal file
169
src/views/asrs/heavenlyEyeLog/index-2.vue
Normal file
@@ -0,0 +1,169 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2024-05-15 16:18:19
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2024-05-16 09:57:13
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-table
|
||||
:data="tableData"
|
||||
:header-cell-style="{
|
||||
background: '#F2F4F9',
|
||||
color: '#606266',
|
||||
}"
|
||||
border
|
||||
:cell-style="cellStyle"
|
||||
:span-method="objectSpanMethod"
|
||||
empty-text="暂无数据"
|
||||
style="width: 100%"
|
||||
ref="dataList">
|
||||
<el-table-column type="index" fixed="left" label="#" align="center" />
|
||||
<el-table-column prop="name" label="仓库名"></el-table-column>
|
||||
<el-table-column prop="code" label="仓库编码"></el-table-column>
|
||||
<el-table-column
|
||||
v-for="item in columns"
|
||||
:key="item.label"
|
||||
align="center"
|
||||
:label="item.label">
|
||||
<el-table-column
|
||||
v-for="it in item.children"
|
||||
:key="it.prop"
|
||||
:prop="it.prop"
|
||||
align="center"
|
||||
header-align="left"
|
||||
:label="it.label">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row[it.prop] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
tableData: [
|
||||
{
|
||||
name: 1,
|
||||
code: '1',
|
||||
prop1: '1',
|
||||
prop2: '2',
|
||||
prop3: '3',
|
||||
prop4: '4',
|
||||
prop5: '5',
|
||||
prop6: '6',
|
||||
span: [2, 4],
|
||||
},
|
||||
{
|
||||
name: 2,
|
||||
code: '2',
|
||||
prop1: '7',
|
||||
prop2: '8',
|
||||
prop3: '9',
|
||||
prop4: '10',
|
||||
prop5: '11',
|
||||
prop6: '12',
|
||||
span: [1, 5],
|
||||
},
|
||||
],
|
||||
columns: [
|
||||
{
|
||||
label: '2023/1',
|
||||
children: [
|
||||
{
|
||||
label: '1',
|
||||
prop: 'prop1',
|
||||
},
|
||||
{
|
||||
label: '15',
|
||||
prop: 'prop2',
|
||||
},
|
||||
{
|
||||
label: '30',
|
||||
prop: 'prop3',
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
label: '2023/2',
|
||||
children: [
|
||||
{
|
||||
label: '1',
|
||||
prop: 'prop4',
|
||||
},
|
||||
{
|
||||
label: '15',
|
||||
prop: 'prop5',
|
||||
},
|
||||
{
|
||||
label: '30',
|
||||
prop: 'prop6',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
color: [
|
||||
'#5470c6',
|
||||
'#91cc75',
|
||||
'#fac858',
|
||||
'#ee6666',
|
||||
'#73c0de',
|
||||
'#3ba272',
|
||||
'#fc8452',
|
||||
'#9a60b4',
|
||||
'#ea7ccc',
|
||||
],
|
||||
};
|
||||
},
|
||||
components: {},
|
||||
created() {},
|
||||
methods: {
|
||||
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
|
||||
let i = 0;
|
||||
if (columnIndex === 3) {
|
||||
return [1, row.span[0]];
|
||||
} else if (columnIndex === 3 + row.span[i]) {
|
||||
i += 1;
|
||||
return [1, row.span[i]];
|
||||
} else if (columnIndex > 3) {
|
||||
return [0, 0];
|
||||
}
|
||||
},
|
||||
cellStyle({ row, column, rowIndex, columnIndex }) {
|
||||
let i = 0;
|
||||
if (columnIndex === 3) {
|
||||
return {
|
||||
color: 'white',
|
||||
borderRadius: '15px',
|
||||
background: this.color[0],
|
||||
};
|
||||
} else if (columnIndex === 3 + row.span[i]) {
|
||||
i += 1;
|
||||
return {
|
||||
color: 'white',
|
||||
borderRadius: '15px',
|
||||
background: i < 9 ? this.color[i] : 'none',
|
||||
};
|
||||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
<style>
|
||||
.app-container .el-table .el-table__cell {
|
||||
padding: 0;
|
||||
height: 35px;
|
||||
}
|
||||
.el-table .warning-row {
|
||||
background: oldlace;
|
||||
}
|
||||
|
||||
.el-table .success-row {
|
||||
background: #f0f9eb;
|
||||
}
|
||||
</style>
|
||||
@@ -24,7 +24,7 @@
|
||||
import basicPage from '../mixins/basic-page';
|
||||
import { parseTime } from '../mixins/code-filter';
|
||||
import codeFilter from '../mixins/code-filter';
|
||||
import { getMainTaskHistoryPage } from '@/api/oth/mainTaskHistory';
|
||||
import { getMainTaskHistoryPage,exportMainTaskHistoryExcel } from '@/api/oth/mainTaskHistory';
|
||||
import point from './point';
|
||||
|
||||
const tableProps = [
|
||||
@@ -195,6 +195,7 @@ export default {
|
||||
return {
|
||||
urlOptions: {
|
||||
getDataListURL: getMainTaskHistoryPage,
|
||||
exportURL: exportMainTaskHistoryExcel,
|
||||
},
|
||||
tableProps,
|
||||
tableData: [],
|
||||
@@ -265,6 +266,13 @@ export default {
|
||||
btnName: '重置',
|
||||
name: 'reset',
|
||||
},
|
||||
{
|
||||
type: 'button',
|
||||
btnName: '导出',
|
||||
name: 'export',
|
||||
color: 'primary',
|
||||
plain: true,
|
||||
},
|
||||
],
|
||||
};
|
||||
},
|
||||
@@ -311,6 +319,21 @@ export default {
|
||||
};
|
||||
this.getDataList();
|
||||
break;
|
||||
case 'export':
|
||||
this.listQuery.pageNo = undefined;
|
||||
this.listQuery.pageSize = undefined;
|
||||
this.listQuery.mainTaskCode = val.code;
|
||||
this.listQuery.mainTaskType = val.taskType;
|
||||
this.listQuery.barCode = val.tcode;
|
||||
// this.listQuery.mainTaskState = val.status;
|
||||
this.listQuery.mainTaskState = 5;
|
||||
this.listQuery.stacker = val.stacker;
|
||||
this.listQuery.agv = val.agv;
|
||||
this.listQuery.createTime = val.searchTime;
|
||||
this.listQuery.startTime = val.searchTime ? val.searchTime[0] : '';
|
||||
this.listQuery.endTime = val.searchTime ? val.searchTime[1] : '';
|
||||
this.handleExport(this.listQuery, '历史任务导出');
|
||||
break;
|
||||
default:
|
||||
console.log(val);
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
import basicPage from '../mixins/basic-page';
|
||||
import { parseTime } from '../mixins/code-filter';
|
||||
import codeFilter from '../mixins/code-filter';
|
||||
import { getMainTaskHistoryPage } from '@/api/oth/mainTaskHistory';
|
||||
import { getMainTaskHistoryPage,exportMainTaskHistoryExcel } from '@/api/oth/mainTaskHistory';
|
||||
import point from './point';
|
||||
|
||||
const tableProps = [
|
||||
@@ -195,6 +195,7 @@ export default {
|
||||
return {
|
||||
urlOptions: {
|
||||
getDataListURL: getMainTaskHistoryPage,
|
||||
exportURL: exportMainTaskHistoryExcel,
|
||||
},
|
||||
tableProps,
|
||||
tableData: [],
|
||||
@@ -265,6 +266,13 @@ export default {
|
||||
btnName: '重置',
|
||||
name: 'reset',
|
||||
},
|
||||
{
|
||||
type: 'button',
|
||||
btnName: '导出',
|
||||
name: 'export',
|
||||
color: 'primary',
|
||||
plain: true,
|
||||
},
|
||||
],
|
||||
};
|
||||
},
|
||||
@@ -312,6 +320,21 @@ export default {
|
||||
};
|
||||
this.getDataList();
|
||||
break;
|
||||
case 'export':
|
||||
this.listQuery.pageNo = undefined;
|
||||
this.listQuery.pageSize = undefined;
|
||||
this.listQuery.mainTaskCode = val.code;
|
||||
this.listQuery.mainTaskType = val.taskType;
|
||||
this.listQuery.barCode = val.tcode;
|
||||
// this.listQuery.mainTaskState = val.status;
|
||||
this.listQuery.mainTaskState = 5;
|
||||
this.listQuery.stacker = val.stacker;
|
||||
this.listQuery.agv = val.agv;
|
||||
this.listQuery.createTime = val.searchTime;
|
||||
this.listQuery.startTime = val.searchTime ? val.searchTime[0] : '';
|
||||
this.listQuery.endTime = val.searchTime ? val.searchTime[1] : '';
|
||||
this.handleExport(this.listQuery, '历史任务导出');
|
||||
break;
|
||||
default:
|
||||
console.log(val);
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2022-08-24 11:19:43
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2023-10-10 15:29:31
|
||||
* @LastEditTime: 2024-05-24 09:45:34
|
||||
* @Description:
|
||||
*/
|
||||
export default {
|
||||
@@ -155,16 +155,13 @@ export default {
|
||||
this.getDataList()
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport(id) {
|
||||
handleExport(params,name) {
|
||||
// 处理查询参数
|
||||
let params = { warehouseId:id };
|
||||
params.pageNo = undefined;
|
||||
params.pageSize = undefined;
|
||||
this.$modal.confirm('是否确认导出所有数据项?').then(() => {
|
||||
this.exportLoading = true;
|
||||
return this.urlOptions.exportURL(params);
|
||||
}).then(response => {
|
||||
this.$download.excel(response, '导出.xls');
|
||||
this.$download.excel(response, name+'.xls');
|
||||
this.exportLoading = false;
|
||||
}).catch(() => { });
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/*
|
||||
* @Date: 2020-12-29 16:49:28
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2024-04-25 16:39:43
|
||||
* @LastEditTime: 2024-05-21 14:44:43
|
||||
* @FilePath: \basic-admin\src\filters\basicData\index.js
|
||||
* @Description:
|
||||
*/
|
||||
@@ -88,6 +88,7 @@ const table = {
|
||||
deliveryType: {
|
||||
1: '单托盘出库',
|
||||
2: '多托盘出库',
|
||||
3: '点对点出库',
|
||||
},
|
||||
trayType: {
|
||||
2: '12臂',
|
||||
|
||||
@@ -198,6 +198,17 @@ export default {
|
||||
placeholder: '入库单号',
|
||||
param: 'workOrderCode',
|
||||
},
|
||||
{
|
||||
type: 'datePicker',
|
||||
label: '创建时间',
|
||||
dateType: 'datetimerange',
|
||||
format: 'yyyy-MM-dd HH:mm:ss',
|
||||
valueFormat: 'yyyy-MM-dd HH:mm:ss',
|
||||
rangeSeparator: '-',
|
||||
startPlaceholder: '开始时间',
|
||||
endPlaceholder: '结束时间',
|
||||
param: 'searchTime',
|
||||
},
|
||||
{
|
||||
type: 'button',
|
||||
btnName: '搜索',
|
||||
@@ -227,7 +238,9 @@ export default {
|
||||
this.listQuery.rollCode = val.rollCode.trim() || null;
|
||||
this.listQuery.productName = val.productName.trim() || null;
|
||||
this.listQuery.grade = val.grade.trim() || null;
|
||||
this.listQuery.workOrderCode = val.workOrderCode.trim() || null
|
||||
this.listQuery.workOrderCode = val.workOrderCode.trim() || null;
|
||||
this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
|
||||
this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
|
||||
this.getDataList();
|
||||
break;
|
||||
case 'reset':
|
||||
@@ -246,6 +259,8 @@ export default {
|
||||
this.listQuery.productName = val.productName || null;
|
||||
this.listQuery.grade = val.grade || null;
|
||||
this.listQuery.workOrderCode = val.workOrderCode || null;
|
||||
this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
|
||||
this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
|
||||
this.handleExport();
|
||||
break;
|
||||
default:
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2024-01-17 09:58:41
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2024-04-24 16:58:36
|
||||
* @LastEditTime: 2024-05-24 11:27:27
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@@ -59,10 +59,10 @@
|
||||
</el-divider>
|
||||
<div v-for="i in 7" :key="i + 'F'">
|
||||
<el-row style="margin-bottom: 10px" type="flex" class="flex-warp">
|
||||
<div
|
||||
<!-- <div
|
||||
class="dashboard-layout-item"
|
||||
style="opacity: 0"
|
||||
v-if="i === 7" />
|
||||
v-if="i === 7" /> -->
|
||||
<div
|
||||
class="dashboard-layout-item"
|
||||
v-for="j in wareData
|
||||
@@ -208,7 +208,7 @@
|
||||
</el-divider>
|
||||
<el-row style="margin-bottom: 10px" type="flex" class="flex-warp">
|
||||
<div
|
||||
class="dashboard-layout-item"
|
||||
class="dashboard-layout-item interval"
|
||||
v-for="j in wareData.filter((item) => item.region == 3).reverse()"
|
||||
:key="j.id"
|
||||
:title="j.lineEdgeLibraryCode">
|
||||
@@ -233,6 +233,43 @@
|
||||
</el-popover>
|
||||
</div>
|
||||
</el-row>
|
||||
<el-divider class="divider" content-position="left">
|
||||
涂覆区
|
||||
</el-divider>
|
||||
<div v-for="i in 4" :key="i + 'C'">
|
||||
<el-row style="margin-bottom: 10px" type="flex" class="flex-warp">
|
||||
<div
|
||||
class="dashboard-layout-item"
|
||||
v-for="j in wareData
|
||||
.filter(
|
||||
(item) =>
|
||||
item.agvGroundCode.substr(1, 2) == i && item.region === 6
|
||||
)
|
||||
.reverse()"
|
||||
:key="j.id"
|
||||
:title="j.lineEdgeLibraryCode">
|
||||
<el-popover
|
||||
placement="top-start"
|
||||
:title="j.lineEdgeLibraryCode"
|
||||
width="200"
|
||||
trigger="hover">
|
||||
<div class="point" />
|
||||
托盘编码: {{ j.trayCode }}
|
||||
<br />
|
||||
<div class="point" />
|
||||
Agv地码: {{ j.agvGroundCode }}
|
||||
<div
|
||||
slot="reference"
|
||||
class="hoverDiv"
|
||||
:style="{
|
||||
cursor:
|
||||
j.lineEdgeLibraryState === 1 ? 'not-allowed' : 'pointer',
|
||||
background: bgColor[j.lineEdgeLibraryState],
|
||||
}"></div>
|
||||
</el-popover>
|
||||
</div>
|
||||
</el-row>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -313,6 +350,24 @@ export default {
|
||||
margin-right: 30px;
|
||||
}
|
||||
}
|
||||
.interval {
|
||||
&:nth-child(2n) {
|
||||
margin-right: 30px;
|
||||
::before {
|
||||
content: '';
|
||||
}
|
||||
::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
right: -15px;
|
||||
top: 1px;
|
||||
z-index: 1;
|
||||
background-color: black;
|
||||
width: 1px;
|
||||
height: 12px;
|
||||
}
|
||||
}
|
||||
}
|
||||
.hoverDiv {
|
||||
width: 100%;
|
||||
height: 30px;
|
||||
|
||||
@@ -99,6 +99,7 @@ import { parseTime } from '../mixins/code-filter';
|
||||
import {
|
||||
getWarehouseStorehousePage,
|
||||
updateWarehouseStorehouse,
|
||||
exportWarehouseStorehouseExcel
|
||||
} from '@/api/asrs/warehouseStorehouse';
|
||||
|
||||
const processArr = [
|
||||
@@ -143,6 +144,7 @@ export default {
|
||||
return {
|
||||
urlOptions: {
|
||||
getDataListURL: getWarehouseStorehousePage,
|
||||
exportURL: exportWarehouseStorehouseExcel
|
||||
},
|
||||
tableData: [],
|
||||
processArr,
|
||||
@@ -227,15 +229,13 @@ export default {
|
||||
name: 'search',
|
||||
color: 'primary',
|
||||
},
|
||||
// {
|
||||
// type: this.$auth.hasPermi('base:factory:create') ? 'separate' : '',
|
||||
// },
|
||||
// {
|
||||
// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
|
||||
// btnName: '导出',
|
||||
// name: 'export',
|
||||
// color: 'warning',
|
||||
// },
|
||||
{
|
||||
type: 'button',
|
||||
btnName: '导出',
|
||||
name: 'export',
|
||||
color: 'primary',
|
||||
plain: true,
|
||||
},
|
||||
],
|
||||
};
|
||||
},
|
||||
@@ -302,7 +302,19 @@ export default {
|
||||
this.addOrUpdateHandle();
|
||||
break;
|
||||
case 'export':
|
||||
this.handleExport();
|
||||
this.listQuery.pageNo = undefined;
|
||||
this.listQuery.pageSize = undefined;
|
||||
this.listQuery.wareRow = val.wareRow;
|
||||
this.listQuery.wareColumn = val.wareColumn;
|
||||
this.listQuery.wareLayer = val.wareLayer;
|
||||
this.listQuery.trayCode = val.code;
|
||||
this.listQuery.goodName = val.pname;
|
||||
this.listQuery.grade = val.quality;
|
||||
this.listQuery.rollCode = val.rollCode;
|
||||
this.listQuery.process = val.processId;
|
||||
this.listQuery.warehouseStorehouseState =
|
||||
val.warehouseStorehouseStateId;
|
||||
this.handleExport(this.listQuery,'库位产品导出');
|
||||
break;
|
||||
default:
|
||||
console.log(val);
|
||||
|
||||
@@ -96,6 +96,7 @@ import { parseTime } from '../mixins/code-filter';
|
||||
import {
|
||||
getWarehouseStorehousePage,
|
||||
updateWarehouseStorehouse,
|
||||
exportWarehouseStorehouseExcel
|
||||
} from '@/api/asrs/warehouseStorehouse';
|
||||
|
||||
const processArr = [
|
||||
@@ -140,6 +141,7 @@ export default {
|
||||
return {
|
||||
urlOptions: {
|
||||
getDataListURL: getWarehouseStorehousePage,
|
||||
exportURL: exportWarehouseStorehouseExcel
|
||||
},
|
||||
tableData: [],
|
||||
processArr,
|
||||
@@ -225,15 +227,13 @@ export default {
|
||||
name: 'search',
|
||||
color: 'primary',
|
||||
},
|
||||
// {
|
||||
// type: this.$auth.hasPermi('base:factory:create') ? 'separate' : '',
|
||||
// },
|
||||
// {
|
||||
// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
|
||||
// btnName: '导出',
|
||||
// name: 'export',
|
||||
// color: 'warning',
|
||||
// },
|
||||
{
|
||||
type: 'button',
|
||||
btnName: '导出',
|
||||
name: 'export',
|
||||
color: 'primary',
|
||||
plain: true,
|
||||
},
|
||||
],
|
||||
};
|
||||
},
|
||||
@@ -300,6 +300,19 @@ export default {
|
||||
this.addOrUpdateHandle();
|
||||
break;
|
||||
case 'export':
|
||||
this.listQuery.pageNo = undefined;
|
||||
this.listQuery.pageSize = undefined;
|
||||
this.listQuery.wareRow = val.wareRow;
|
||||
this.listQuery.wareColumn = val.wareColumn;
|
||||
this.listQuery.wareLayer = val.wareLayer;
|
||||
this.listQuery.trayCode = val.code;
|
||||
this.listQuery.goodName = val.pname;
|
||||
this.listQuery.grade = val.quality;
|
||||
this.listQuery.rollCode = val.rollCode;
|
||||
this.listQuery.process = val.processId;
|
||||
this.listQuery.warehouseStorehouseState =
|
||||
val.warehouseStorehouseStateId;
|
||||
this.handleExport(this.listQuery,'库位产品导出');
|
||||
this.handleExport();
|
||||
break;
|
||||
default:
|
||||
|
||||
@@ -22,15 +22,15 @@
|
||||
</el-table-column>
|
||||
<el-table-column prop="warehouseName" label="仓库名"></el-table-column>
|
||||
<el-table-column prop="warehouseCode" label="仓库编码"></el-table-column>
|
||||
<el-table-column
|
||||
prop="warehouseStorehouseName"
|
||||
label="库位名" />
|
||||
<el-table-column prop="warehouseStorehouseName" label="库位名" />
|
||||
<el-table-column
|
||||
prop="warehouseStorehouseCode"
|
||||
label="库位编码"></el-table-column>
|
||||
<el-table-column prop="trayCode" label="托盘编码"></el-table-column>
|
||||
<el-table-column prop="process" label="工序" width="110">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="process"
|
||||
label="工序"
|
||||
width="110"></el-table-column>
|
||||
<el-table-column prop="createTime" label="出入库时间">
|
||||
<template v-slot="scope">
|
||||
<span>{{ parseTime(scope.row.createTime) }}</span>
|
||||
@@ -64,7 +64,10 @@
|
||||
<script>
|
||||
import product from '../product-mini';
|
||||
import basicPage from '../mixins/basic-page';
|
||||
import { getWarehouseStorehouseStoragePage } from '@/api/asrs/warehouseStorehouseStorage';
|
||||
import {
|
||||
getWarehouseStorehouseStoragePage,
|
||||
exportWarehouseStorehouseStorageExcel,
|
||||
} from '@/api/asrs/warehouseStorehouseStorage';
|
||||
const warehouseStorehouseStorageState = [
|
||||
{
|
||||
name: '入库',
|
||||
@@ -107,6 +110,7 @@ export default {
|
||||
return {
|
||||
urlOptions: {
|
||||
getDataListURL: getWarehouseStorehouseStoragePage,
|
||||
exportURL: exportWarehouseStorehouseStorageExcel,
|
||||
},
|
||||
processArr,
|
||||
tableData: [],
|
||||
@@ -155,15 +159,13 @@ export default {
|
||||
name: 'search',
|
||||
color: 'primary',
|
||||
},
|
||||
// {
|
||||
// type: this.$auth.hasPermi('base:factory:create') ? 'separate' : '',
|
||||
// },
|
||||
// {
|
||||
// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
|
||||
// btnName: '导出',
|
||||
// name: 'export',
|
||||
// color: 'warning',
|
||||
// },
|
||||
{
|
||||
type: 'button',
|
||||
btnName: '导出',
|
||||
name: 'export',
|
||||
color: 'primary',
|
||||
plain: true,
|
||||
},
|
||||
],
|
||||
};
|
||||
},
|
||||
@@ -201,13 +203,21 @@ export default {
|
||||
this.addOrUpdateHandle();
|
||||
break;
|
||||
case 'export':
|
||||
this.handleExport();
|
||||
this.listQuery.pageNo = undefined;
|
||||
this.listQuery.pageSize = undefined;
|
||||
this.listQuery.warehouseStorehouseName = val.name;
|
||||
this.listQuery.warehouseStorehouseCode = val.kcode;
|
||||
this.listQuery.trayCode = val.tcode;
|
||||
this.listQuery.warehouseStorehouseStorageState = val.state;
|
||||
this.listQuery.createTime = val.searchTime;
|
||||
this.listQuery.startTime = val.searchTime ? val.searchTime[0] : '';
|
||||
this.listQuery.endTime = val.searchTime ? val.searchTime[1] : '';
|
||||
this.handleExport(this.listQuery, '出入库历史信息导出');
|
||||
break;
|
||||
default:
|
||||
console.log(val);
|
||||
}
|
||||
},
|
||||
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
@@ -29,8 +29,7 @@
|
||||
prop="warehouseStorehouseCode"
|
||||
label="库位编码"></el-table-column>
|
||||
<el-table-column prop="trayCode" label="托盘编码"></el-table-column>
|
||||
<el-table-column prop="process" label="工序">
|
||||
</el-table-column>
|
||||
<el-table-column prop="process" label="工序"></el-table-column>
|
||||
<el-table-column prop="createTime" label="出入库时间">
|
||||
<template v-slot="scope">
|
||||
<span>{{ parseTime(scope.row.createTime) }}</span>
|
||||
@@ -63,7 +62,10 @@
|
||||
<script>
|
||||
import product from '../product-mini';
|
||||
import basicPage from '../mixins/basic-page';
|
||||
import { getWarehouseStorehouseStoragePage, } from "@/api/asrs/warehouseStorehouseStorage";
|
||||
import {
|
||||
getWarehouseStorehouseStoragePage,
|
||||
exportWarehouseStorehouseStorageExcel,
|
||||
} from '@/api/asrs/warehouseStorehouseStorage';
|
||||
const warehouseStorehouseStorageState = [
|
||||
{
|
||||
name: '入库',
|
||||
@@ -106,6 +108,7 @@ export default {
|
||||
return {
|
||||
urlOptions: {
|
||||
getDataListURL: getWarehouseStorehouseStoragePage,
|
||||
exportURL: exportWarehouseStorehouseStorageExcel,
|
||||
},
|
||||
processArr,
|
||||
tableData: [],
|
||||
@@ -154,15 +157,13 @@ export default {
|
||||
name: 'search',
|
||||
color: 'primary',
|
||||
},
|
||||
// {
|
||||
// type: this.$auth.hasPermi('base:factory:create') ? 'separate' : '',
|
||||
// },
|
||||
// {
|
||||
// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
|
||||
// btnName: '导出',
|
||||
// name: 'export',
|
||||
// color: 'warning',
|
||||
// },
|
||||
{
|
||||
type: 'button',
|
||||
btnName: '导出',
|
||||
name: 'export',
|
||||
color: 'primary',
|
||||
plain: true,
|
||||
},
|
||||
],
|
||||
};
|
||||
},
|
||||
@@ -171,7 +172,7 @@ export default {
|
||||
},
|
||||
created() {
|
||||
this.listQuery.warehouseId = this.bId;
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
buttonClick(val) {
|
||||
switch (val.btnName) {
|
||||
@@ -181,7 +182,7 @@ export default {
|
||||
this.listQuery.warehouseStorehouseName = val.name;
|
||||
this.listQuery.warehouseStorehouseCode = val.kcode;
|
||||
this.listQuery.trayCode = val.tcode;
|
||||
this.listQuery.warehouseStorehouseStorageState =val.state;
|
||||
this.listQuery.warehouseStorehouseStorageState = val.state;
|
||||
this.listQuery.createTime = val.searchTime;
|
||||
this.listQuery.startTime = val.searchTime ? val.searchTime[0] : '';
|
||||
this.listQuery.endTime = val.searchTime ? val.searchTime[1] : '';
|
||||
@@ -202,7 +203,16 @@ export default {
|
||||
this.addOrUpdateHandle();
|
||||
break;
|
||||
case 'export':
|
||||
this.handleExport();
|
||||
this.listQuery.pageNo = undefined;
|
||||
this.listQuery.pageSize = undefined;
|
||||
this.listQuery.warehouseStorehouseName = val.name;
|
||||
this.listQuery.warehouseStorehouseCode = val.kcode;
|
||||
this.listQuery.trayCode = val.tcode;
|
||||
this.listQuery.warehouseStorehouseStorageState = val.state;
|
||||
this.listQuery.createTime = val.searchTime;
|
||||
this.listQuery.startTime = val.searchTime ? val.searchTime[0] : '';
|
||||
this.listQuery.endTime = val.searchTime ? val.searchTime[1] : '';
|
||||
this.handleExport(this.listQuery, '出入库历史信息导出');
|
||||
break;
|
||||
default:
|
||||
console.log(val);
|
||||
|
||||
@@ -326,6 +326,10 @@ export default {
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
// 获得租户套餐列表
|
||||
getTenantPackageList().then((response) => {
|
||||
this.packageList = response.data;
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
/** 查询列表 */
|
||||
@@ -371,10 +375,6 @@ export default {
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset();
|
||||
// 获得租户套餐列表
|
||||
getTenantPackageList().then((response) => {
|
||||
this.packageList = response.data;
|
||||
});
|
||||
this.$nextTick(() => {
|
||||
this.open = true;
|
||||
this.title = '添加租户';
|
||||
|
||||
192
src/views/wcsAlarm/real.vue
Normal file
192
src/views/wcsAlarm/real.vue
Normal file
@@ -0,0 +1,192 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2024-05-21 14:25:27
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2024-05-21 16:44:47
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<div class="main-body">
|
||||
<el-divider content-position="left">堆垛机报警信息</el-divider>
|
||||
<el-row :gutter="20">
|
||||
<el-col v-for="i in 4" :key="i + 'ddj'" :span="6">
|
||||
<el-card class="box-card" style="min-width: 240px">
|
||||
<div slot="header" class="header-card">
|
||||
堆垛机:
|
||||
<div class="info">
|
||||
{{ Info[i - 1].name }}
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
报警信息:
|
||||
<div class="info">
|
||||
{{ Info[i - 1].msg }}
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
报警编码:
|
||||
<div class="info">
|
||||
{{ Info[i - 1].code }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="blinking-warning" v-if="Info[i - 1].code !== 0" />
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-divider content-position="left">1-2巷道输送线报警信息</el-divider>
|
||||
<el-row :gutter="20" v-for="l in 2" :key="l + 'line1'">
|
||||
<el-col v-for="i in 6" :key="i + 'ssx1'" :span="4">
|
||||
<el-card class="box-card" style="min-width: 240px">
|
||||
<div slot="header" class="header-card">
|
||||
输送线:
|
||||
<div class="info">
|
||||
{{ Info[i - 1 + 4 + (l - 1) * 6].name }}
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
报警信息:
|
||||
<div class="info">{{ Info[i - 1 + 4 + (l - 1) * 6].msg }}</div>
|
||||
</div>
|
||||
<div>
|
||||
报警编码:
|
||||
<div class="info">{{ Info[i - 1 + 4 + (l - 1) * 6].code }}</div>
|
||||
</div>
|
||||
<div
|
||||
class="blinking-warning"
|
||||
v-if="Info[i - 1 + 4 + (l - 1) * 6].code > 30" />
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-divider content-position="left">3-4巷道输送线报警信息</el-divider>
|
||||
<el-row :gutter="20" v-for="l in 2" :key="l + 'line2'">
|
||||
<el-col v-for="i in 6" :key="i + 'ssx2'" :span="4">
|
||||
<el-card class="box-card" style="min-width: 240px">
|
||||
<div slot="header" class="header-card">
|
||||
输送线:
|
||||
<div class="info">
|
||||
{{ Info[i - 1 + 4 + (l + 1) * 6].name }}
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
报警信息:
|
||||
<div class="info">{{ Info[i - 1 + 4 + (l + 1) * 6].msg }}</div>
|
||||
</div>
|
||||
<div>
|
||||
报警编码:
|
||||
<div class="info">{{ Info[i - 1 + 4 + (l + 1) * 6].code }}</div>
|
||||
</div>
|
||||
<div
|
||||
class="blinking-warning"
|
||||
v-if="Info[i - 1 + 4 + (l + 1) * 6].code > 30" />
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-divider content-position="left">检尺门报警信息</el-divider>
|
||||
<el-row :gutter="20">
|
||||
<el-col v-for="i in 4" :key="i + 'jcm'" :span="6">
|
||||
<el-card class="box-card" style="min-width: 240px">
|
||||
<div slot="header" class="header-card">
|
||||
检尺门:
|
||||
<div class="info">
|
||||
{{ Info[i - 1 + 4 + 24].name }}
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
报警信息:
|
||||
<div class="info">
|
||||
{{ Info[i - 1 + 4 + 24].msg }}
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
报警编码:
|
||||
<div class="info">
|
||||
{{ Info[i - 1 + 4 + 24].code }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="blinking-warning" v-if="Info[i - 1 + 4 + 24].code > 30" />
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import axios from 'axios';
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
Info: [],
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getInfo();
|
||||
this.startFun();
|
||||
},
|
||||
methods: {
|
||||
startFun() {
|
||||
const timer = setInterval(() => {
|
||||
this.getInfo();
|
||||
}, 10000);
|
||||
this.$once('hook:beforeDestroy', () => {
|
||||
clearInterval(timer);
|
||||
});
|
||||
},
|
||||
getInfo() {
|
||||
axios
|
||||
.post('http://172.22.22.190/wcs-njlm/business/wcsTask/isAlarm')
|
||||
.then((res) => {
|
||||
console.log('实时报警')
|
||||
console.log(res.data)
|
||||
this.Info = res.data
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error('There was an error!', error);
|
||||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.main-body {
|
||||
::v-deep .el-card__header {
|
||||
padding: 5px 20px;
|
||||
min-height: 25px;
|
||||
}
|
||||
::v-deep .el-card__body {
|
||||
padding: 10px 20px;
|
||||
}
|
||||
.box-card {
|
||||
font-size: 15px;
|
||||
position: relative;
|
||||
.header-card {
|
||||
font-size: 17px;
|
||||
}
|
||||
.info {
|
||||
color: #409eff;
|
||||
float: right;
|
||||
}
|
||||
}
|
||||
}
|
||||
.blinking-warning {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
background-color: #ff0000; /* 红色背景 */
|
||||
animation: blinkWarning 1s infinite; /* 动画名称和持续时间 */
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
@keyframes blinkWarning {
|
||||
0% {
|
||||
opacity: 0.7; /* 开始状态：不透明 */
|
||||
}
|
||||
50% {
|
||||
opacity: 0; /* 中间状态：完全透明 */
|
||||
}
|
||||
100% {
|
||||
opacity: 0.7; /* 结束状态：不透明 */
|
||||
}
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user