代码更新
This commit is contained in:
parent
fcb060b884
commit
842c03043f
|
|
@ -160,6 +160,20 @@ const downloadMaterialExcel = () => {
|
|||
})
|
||||
}
|
||||
|
||||
const downloadVehicleExcel = (vehicleQuery) => {
|
||||
return request({
|
||||
url: '/excel/downloadVehicleExcel',
|
||||
method: 'get',
|
||||
responseType: 'blob',
|
||||
params: {
|
||||
vehicleId: vehicleQuery.vehicleId,
|
||||
locationId: vehicleQuery.locationId,
|
||||
isEmpty: vehicleQuery.isEmpty,
|
||||
vehicleStatus: vehicleQuery.vehicleStatus
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
export {
|
||||
downlocadExcel,
|
||||
uploadExcel,
|
||||
|
|
@ -179,5 +193,6 @@ export {
|
|||
downloadPackageExcel,
|
||||
uploadBoxConfig,
|
||||
uploadExcelKatePackage,
|
||||
downloadMaterialExcel
|
||||
downloadMaterialExcel,
|
||||
downloadVehicleExcel
|
||||
}
|
||||
|
|
@ -2,7 +2,7 @@ import request from "@/http/request";
|
|||
|
||||
const getAllVehicles = (params) => {
|
||||
return request({
|
||||
url: '/location/getVehicles',
|
||||
url: '/location/getVehiclesByPage',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import axios from 'axios'
|
||||
|
||||
const request = axios.create({
|
||||
baseURL: 'http://localhost:12315/wms',
|
||||
baseURL: 'http://192.168.3.254:12315/wms',
|
||||
timeout: 5000
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -1,300 +0,0 @@
|
|||
<template>
|
||||
<el-config-provider :locale="zhCn">
|
||||
<el-container class="content">
|
||||
<div class="left">
|
||||
<fieldset class="display-area">
|
||||
<legend>
|
||||
入库站台1
|
||||
</legend>
|
||||
<el-table :data="stand1ScanInfos" stripe border v-loading="loading" style="width: 100%"
|
||||
max-height="684px" class="table-class" :header-cell-style="{ 'text-align': 'center' }"
|
||||
:cell-style="{ 'text-align': 'center' }">
|
||||
<el-table-column width="65px" fixed="left">
|
||||
<template v-slot="scope">
|
||||
<el-radio :label="scope.row.scanId" v-model="scanId1"> </el-radio>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="standId" label="站台" min-width="120px" />
|
||||
<el-table-column prop="position" label="位置" min-width="120px" />
|
||||
<el-table-column prop="requestCode" label="请求条码" min-width="120px" />
|
||||
<el-table-column prop="scanCode" label="设备扫码" min-width="120px" />
|
||||
<el-table-column fixed="right" label="操作" width="120px">
|
||||
<template v-slot="scope">
|
||||
<el-button plain type="primary" @click="confirmCurrentRow(scope.row)">处理</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<br />
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="right">
|
||||
<fieldset class="display-area">
|
||||
<legend>
|
||||
入库站台2
|
||||
</legend>
|
||||
<el-table :data="stand2ScanInfos" stripe border v-loading="loading" style="width: 100%"
|
||||
max-height="684px" class="table-class" :header-cell-style="{ 'text-align': 'center' }"
|
||||
:cell-style="{ 'text-align': 'center' }">
|
||||
<el-table-column width="65px" fixed="left">
|
||||
<template v-slot="scope">
|
||||
<el-radio :label="scope.row.scanId" v-model="scanId2"> </el-radio>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="standId" label="站台" min-width="120px" />
|
||||
<el-table-column prop="position" label="位置" min-width="120px" />
|
||||
<el-table-column prop="requestCode" label="请求条码" min-width="120px" />
|
||||
<el-table-column prop="scanCode" label="设备扫码" min-width="120px" />
|
||||
<el-table-column fixed="right" label="操作" width="120px">
|
||||
<template v-slot="scope">
|
||||
<el-button plain type="primary" @click="confirmCurrentRow(scope.row)">处理</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<br />
|
||||
</fieldset>
|
||||
</div>
|
||||
<el-dialog v-model="dialogVisible" title="确认扫码信息" width="40%" draggable :show-close="false">
|
||||
<el-form ref="confirmFormRef" :model="confirmFormEntity" :label-position="labelPosition"
|
||||
label-width="100px" style="max-width: 100%" :rules="rules" status-icon>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="12" :offset="0">
|
||||
<el-form-item label="站台" prop="standId">
|
||||
<el-input v-model="confirmFormEntity.standId" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="位置" prop="position">
|
||||
<el-input v-model="confirmFormEntity.position" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="12" :offset="0">
|
||||
<el-form-item label="请求条码号" prop="requestCode">
|
||||
<el-input v-model="confirmFormEntity.requestCode" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="扫描条码号" prop="scanCode">
|
||||
<el-input v-model="confirmFormEntity.scanCode" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="12" :offset="0">
|
||||
<el-form-item label="确认条码号" prop="confirmCode">
|
||||
<el-select-v2 v-model="confirmFormEntity.confirmCode" placeholder="请选择正确的条码号"
|
||||
:options="confirmFormEntity.barCodeOptions"></el-select-v2>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<span class="dialog-footer">
|
||||
<el-button @click="dialogVisible = false">取消</el-button>
|
||||
<el-button type="primary" @click="submitConfirmCode(confirmFormEntity)">
|
||||
确定
|
||||
</el-button>
|
||||
</span>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</el-container>
|
||||
</el-config-provider>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { queryNotConfirmScanInfo, solveScanDifference } from '@/api/task'
|
||||
import { reactive, ref } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
|
||||
const confirmFormRef = ref()
|
||||
</script>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: 'scanConfirm',
|
||||
data() {
|
||||
return {
|
||||
labelPosition: "top",
|
||||
loading: false,
|
||||
scanId1: '',
|
||||
scanId2: '',
|
||||
stand1ScanInfos: [],
|
||||
stand2ScanInfos: [],
|
||||
tempTasks: [],
|
||||
tempStandId: '',
|
||||
confirmFormEntity: reactive({
|
||||
scanId: '',
|
||||
standId: '',
|
||||
position: null,
|
||||
requestCode: '',
|
||||
scanCode: '',
|
||||
confirmCode: '',
|
||||
barCodeOptions: []
|
||||
}),
|
||||
rules: reactive({
|
||||
confirmCode: [
|
||||
{ required: true, message: '请确认条码' }
|
||||
]
|
||||
}),
|
||||
dialogVisible: false
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.timer = setInterval(() => {
|
||||
this.getStand1Codes()
|
||||
this.getStand2Codes()
|
||||
}, 2000)
|
||||
},
|
||||
beforeUnmount() {
|
||||
clearInterval(this.timer)
|
||||
},
|
||||
methods: {
|
||||
getStand1Codes() {
|
||||
const scanRequest = {
|
||||
standId: 'R1'
|
||||
}
|
||||
queryNotConfirmScanInfo(scanRequest).then(res => {
|
||||
const scanResponse = res.data
|
||||
if (scanResponse.code != 0) {
|
||||
ElMessage.error(scanResponse.message)
|
||||
}
|
||||
this.stand1ScanInfos = scanResponse.returnData
|
||||
}).catch(err => {
|
||||
console.log(err)
|
||||
ElMessage.error('查询站台1扫码确认信息错误')
|
||||
})
|
||||
},
|
||||
getStand2Codes() {
|
||||
const scanRequest = {
|
||||
standId: 'R2'
|
||||
}
|
||||
queryNotConfirmScanInfo(scanRequest).then(res => {
|
||||
const scanResponse = res.data
|
||||
if (scanResponse.code != 0) {
|
||||
ElMessage.error(scanResponse.message)
|
||||
}
|
||||
this.stand2ScanInfos = scanResponse.returnData
|
||||
}).catch(err => {
|
||||
console.log(err)
|
||||
ElMessage.error('查询站台2扫码确认信息错误')
|
||||
})
|
||||
},
|
||||
confirmCurrentRow(row) {
|
||||
this.confirmFormEntity.scanId = row.scanId
|
||||
this.confirmFormEntity.standId = row.standId
|
||||
this.confirmFormEntity.position = row.position
|
||||
this.confirmFormEntity.requestCode = row.requestCode
|
||||
this.confirmFormEntity.scanCode = row.scanCode
|
||||
this.confirmFormEntity.confirmCode = ''
|
||||
this.confirmFormEntity.barCodeOptions = [
|
||||
{ value: row.requestCode, label: row.requestCode },
|
||||
{ value: row.scanCode, label: row.scanCode }
|
||||
]
|
||||
this.dialogVisible = true
|
||||
},
|
||||
submitConfirmCode(confirmFormEntity) {
|
||||
if (confirmFormEntity.scanId == null | undefined || confirmFormEntity.scanId == '') {
|
||||
ElMessage({ message: '缺少主键', type: 'error' })
|
||||
return
|
||||
}
|
||||
if (confirmFormEntity.confirmCode == null | undefined || confirmFormEntity.confirmCode == '') {
|
||||
ElMessage({ message: '确认条码不能为空', type: 'error' })
|
||||
return
|
||||
}
|
||||
solveScanDifference(confirmFormEntity).then(res => {
|
||||
if (res.data.code == 0) {
|
||||
this.clearFormEntity(confirmFormEntity)
|
||||
this.dialogVisible = false
|
||||
ElMessage({
|
||||
message: '处理扫码信息成功',
|
||||
type: 'success'
|
||||
})
|
||||
} else {
|
||||
ElMessage.error(res.data.message)
|
||||
}
|
||||
}).catch(err => {
|
||||
ElMessage({
|
||||
message: '处理扫码信息失败: ' + err,
|
||||
type: 'error',
|
||||
showClose: true
|
||||
})
|
||||
})
|
||||
},
|
||||
clearFormEntity(confirmFormEntity) {
|
||||
confirmFormEntity.scanId = ''
|
||||
confirmFormEntity.standId = ''
|
||||
confirmFormEntity.position = null
|
||||
confirmFormEntity.requestCode = ''
|
||||
confirmFormEntity.scanCode = ''
|
||||
confirmFormEntity.confirmCode = ''
|
||||
confirmFormEntity.barCodeOptions = []
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.content {
|
||||
display: flex;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.el-row .el-form-item {
|
||||
width: 30% inherit;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
/* .btn-area .el-form-item {
|
||||
width: 30% inherit;
|
||||
padding-left: 15px;
|
||||
} */
|
||||
|
||||
.el-row .el-form-item .el-select {
|
||||
width: 100% !important;
|
||||
}
|
||||
|
||||
.el-row .el-form-item .el-select-v2 {
|
||||
width: 100% !important;
|
||||
}
|
||||
|
||||
.el-row .el-form-item .el-input-number {
|
||||
width: 100% !important;
|
||||
}
|
||||
|
||||
.el-row .el-form-item .el-button {
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
.right {
|
||||
width: 49%;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
.left {
|
||||
width: 49%;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
.input-area {
|
||||
margin: auto;
|
||||
max-width: inherit;
|
||||
height: 632px;
|
||||
border: solid 1px;
|
||||
border-radius: 10px;
|
||||
box-shadow: 0px 15px 10px -15px #000;
|
||||
}
|
||||
|
||||
.display-area {
|
||||
margin: auto;
|
||||
min-width: inherit;
|
||||
height: 632px;
|
||||
border: solid 1px;
|
||||
border-radius: 10px;
|
||||
box-shadow: 0px 15px 10px -15px #000;
|
||||
}
|
||||
|
||||
.table-class {
|
||||
width: 100%;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -17,22 +17,22 @@
|
|||
<el-radio :label="scope.row.stockId" v-model="stockId"> </el-radio>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="goodsRelated.goodsId" label="物料号" fixed="left" min-width="120px" />
|
||||
<el-table-column prop="goodsRelated.goodsName" label="物料名称" fixed="left" min-width="120px" />
|
||||
<el-table-column prop="goodsRelated.goodsId" label="物料号" fixed="left" min-width="120px" show-overflow-tooltip />
|
||||
<el-table-column prop="goodsRelated.goodsName" label="物料名称" fixed="left" min-width="120px" show-overflow-tooltip />
|
||||
<el-table-column prop="goodsRelated.remainNum" label="剩余数量" min-width="120px" />
|
||||
<el-table-column prop="goodsRelated.totalNum" label="入库数量" min-width="120px" />
|
||||
<el-table-column prop="vehicleId" label="载具号" min-width="120px" />
|
||||
<el-table-column prop="locationId" label="库位" :formatter="locationFormat" min-width="120px" />
|
||||
<el-table-column prop="vehicleId" label="载具号" min-width="120px" show-overflow-tooltip />
|
||||
<el-table-column prop="locationId" label="库位" :formatter="locationFormat" min-width="120px" show-overflow-tooltip />
|
||||
<el-table-column prop="isInventory" label="是否盘点" min-width="120px" />
|
||||
<el-table-column prop="createTime" label="上架时间" :formatter="timeFormat" min-width="140px" />
|
||||
<el-table-column prop="createTime" label="上架时间" :formatter="timeFormat" min-width="120px" show-overflow-tooltip />
|
||||
<el-table-column prop="goodsRelated.goodsStatus" label="物料状态" :formatter="goodsStatusFormat" min-width="120px" />
|
||||
<el-table-column prop="stockStatus" label="库存状态" :formatter="stockStatusFormat" fixed="right"
|
||||
min-width="120px" />
|
||||
<el-table-column fixed="right" label="操作" width="120px" v-if="selStock == null">
|
||||
<!-- <el-table-column fixed="right" label="操作" width="120px" v-if="selStock == null">
|
||||
<template v-slot="scope">
|
||||
<el-button plain type="primary" @click="editCurrentRowStock(scope.row)">编辑</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column> -->
|
||||
</el-table>
|
||||
<br />
|
||||
<el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 25, 50]"
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
</el-table-column>
|
||||
<el-table-column prop="taskType" label="任务类型" fixed="left" :formatter="taskTypeFormat" min-width="120px" />
|
||||
<el-table-column prop="vehicleId" label="载具号" min-width="120px" />
|
||||
<el-table-column prop="goodsRelated.goodsId" label="规格" min-width="120px" />
|
||||
<el-table-column prop="goodsRelated.goodsName" label="批次号" min-width="120px" />
|
||||
<el-table-column prop="goodsRelated.goodsId" label="物料编号" min-width="120px" show-overflow-tooltip />
|
||||
<el-table-column prop="goodsRelated.goodsName" label="物料名称" min-width="120px" show-overflow-tooltip />
|
||||
<el-table-column prop="taskGroup" label="任务组" min-width="120px" />
|
||||
<el-table-column prop="origin" label="起点" min-width="120px" />
|
||||
<el-table-column prop="destination" label="终点" min-width="120px" />
|
||||
|
|
|
|||
288
src/layout/vehicle.vue
Normal file
288
src/layout/vehicle.vue
Normal file
|
|
@ -0,0 +1,288 @@
|
|||
<template>
|
||||
<div style="margin-bottom: 10px">
|
||||
<el-config-provider :locale="zhCn">
|
||||
<el-row style="align-items: flex-start;">
|
||||
<!-- <div v-if="selVehicle == null"><uploadVehicles></uploadVehicles></div> -->
|
||||
<el-input v-model="queryKey" style="width: 196px; margin-left: auto; margin-right: 10px;" placeholder="载具号" />
|
||||
<el-button type="primary" @click="search()">搜索</el-button>
|
||||
<el-button type="warning" @click="reset()">重置</el-button>
|
||||
<el-button type="success" @click="exportExcel()" v-if="selVehicle == null">导出信息</el-button>
|
||||
</el-row>
|
||||
<br />
|
||||
<el-table :data="vehicles" stripe border v-loading="loading" class="table-class" max-height="650px"
|
||||
highlight-current-row @row-click="getCurrentRow" :header-cell-style="{ 'text-align': 'center' }"
|
||||
:cell-style="{ 'text-align': 'center' }">
|
||||
<el-table-column width="65px" fixed="left">
|
||||
<template v-slot="scope">
|
||||
<el-radio :label="scope.row.vehicleId" v-model="vehicleId"> </el-radio>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="vehicleId" label="托盘号" fixed="left" min-width="120px" />
|
||||
<el-table-column prop="currentLocation" label="所在位置" fixed="left" :formatter="locationFormat" min-width="120px" show-overflow-tooltip />
|
||||
<el-table-column prop="vehicleStatus" label="状态" :formatter="vehicleStatusFormat" min-width="120px" />
|
||||
<el-table-column prop="isEmpty" label="空托" :formatter="isEmptyFormat" min-width="120px" />
|
||||
<el-table-column fixed="right" label="操作" width="120px" v-if="selVehicle == null">
|
||||
<template v-slot="scope">
|
||||
<el-button plain type="primary" @click="editCurrentRowVehicle(scope.row)">编辑</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<br />
|
||||
<el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 25, 50]"
|
||||
:small="false" :disabled="false" :background="false" :default-page-size="10"
|
||||
layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search"
|
||||
@current-change="search" />
|
||||
<el-dialog v-model="dialogVisible" title="托盘信息" width="40%" draggable :show-close="false">
|
||||
<el-form ref="vehicleFormRef" :model="vehicleFormEntity" :label-position="labelPosition" label-width="100px"
|
||||
style="max-width: 100%" :rules="rules" status-icon>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="12" :offset="0">
|
||||
<el-form-item label="载具号" prop="vehicleId">
|
||||
<el-input v-model="vehicleFormEntity.vehicleId" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="库位" prop="locationId">
|
||||
<el-input v-model="vehicleFormEntity.currentLocation" placeholder="请输入库位号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="12" :offset="0">
|
||||
<el-form-item label="空托" prop="isEmpty">
|
||||
<el-select-v2 v-model="vehicleFormEntity.isEmpty" placeholder="请选择是否空托"
|
||||
:options="isEmptyOptions"></el-select-v2>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="托盘状态" prop="vehicleStatus">
|
||||
<el-select-v2 v-model="vehicleFormEntity.vehicleStatus" placeholder="请选择托盘状态"
|
||||
:options="vehicleStatusOptions"></el-select-v2>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<span class="dialog-footer">
|
||||
<el-button @click="dialogVisible = false">取消</el-button>
|
||||
<el-button type="primary" @click="submitVehicleInfo(vehicleFormEntity)">
|
||||
确定
|
||||
</el-button>
|
||||
</span>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</el-config-provider>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { getAllVehicles, updateVehicleInfo } from '@/api/vehicle'
|
||||
import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { ref, reactive } from 'vue'
|
||||
import { vehicleStatusFormatter, locationFormatter, dateFormatter } from '@/utils/formatter.js'
|
||||
// import uploadVehicles from '@/excel/uploadVehicles.vue'
|
||||
import { downloadVehicleExcel } from '@/api/excel.js'
|
||||
</script>
|
||||
<script>
|
||||
export default {
|
||||
name: 'vehicle',
|
||||
props: ['selVehicle'],
|
||||
emits: ['update:selVehicle'],
|
||||
data() {
|
||||
return {
|
||||
pageInfo: {},
|
||||
vehicles: [],
|
||||
currentPage: 1,
|
||||
pageSize: 10,
|
||||
total: 0,
|
||||
queryKey: '',
|
||||
loading: true,
|
||||
dialogVisible: false,
|
||||
vehicleId: '',
|
||||
vehicleFormEntity: reactive({}),
|
||||
labelPosition: 'top',
|
||||
vehicleFormRef: ref(),
|
||||
rules: reactive({
|
||||
vehicleId: [
|
||||
{ required: true, message: '请输入托盘号' }
|
||||
],
|
||||
currentLocation: [
|
||||
{ required: true, message: '请输入库位' }
|
||||
]
|
||||
}),
|
||||
// 物料高度
|
||||
isEmptyOptions: [
|
||||
{
|
||||
value: 0,
|
||||
label: '带料'
|
||||
},
|
||||
{
|
||||
value: 1,
|
||||
label: '空托'
|
||||
}
|
||||
],
|
||||
// 托盘状态
|
||||
vehicleStatusOptions: [
|
||||
{
|
||||
value: 1,
|
||||
label: '在库中'
|
||||
},
|
||||
{
|
||||
value: 2,
|
||||
label: '在站台'
|
||||
},
|
||||
{
|
||||
value: 3,
|
||||
label: '移动中'
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.search()
|
||||
},
|
||||
methods: {
|
||||
search() {
|
||||
this.loading = true
|
||||
const tableRequest = {
|
||||
pageNo: this.currentPage,
|
||||
pageSize: this.pageSize,
|
||||
vehicleId: this.queryKey.trim()
|
||||
}
|
||||
getAllVehicles(tableRequest).then(res => {
|
||||
const tableResponse = res.data
|
||||
if (tableResponse.code != 0) {
|
||||
ElMessage.error(tableResponse.message)
|
||||
}
|
||||
this.vehicles = tableResponse.returnData.lists
|
||||
this.total = tableResponse.returnData.total
|
||||
}).catch(err => {
|
||||
ElMessage.error('查询载具信息错误' + err.message)
|
||||
})
|
||||
this.loading = false
|
||||
},
|
||||
vehicleStatusFormat: (row, column, cellValue, index) => {
|
||||
return vehicleStatusFormatter(cellValue)
|
||||
},
|
||||
locationFormat: (row, column, cellValue, index) => {
|
||||
return locationFormatter(cellValue)
|
||||
},
|
||||
isEmptyFormat: (row, column, cellValue, index) => {
|
||||
if (cellValue == 0) {
|
||||
return '带料'
|
||||
}
|
||||
if (cellValue == 1) {
|
||||
return '空载具'
|
||||
}
|
||||
},
|
||||
reset() {
|
||||
this.queryKey = ''
|
||||
this.search()
|
||||
},
|
||||
editCurrentRowVehicle(row) {
|
||||
this.vehicleFormEntity = row
|
||||
this.dialogVisible = true
|
||||
},
|
||||
submitVehicleInfo(formData) {
|
||||
const request = {
|
||||
vehicleId: formData.vehicleId,
|
||||
currentLocation: formData.currentLocation,
|
||||
isEmpty: formData.isEmpty,
|
||||
vehicleStatus: formData.vehicleStatus
|
||||
}
|
||||
updateVehicleInfo(request).then(res => {
|
||||
if (res.data.code == 0) {
|
||||
this.dialogVisible = false
|
||||
ElMessage({
|
||||
message: '更新载具信息成功',
|
||||
type: 'success',
|
||||
})
|
||||
this.search()
|
||||
} else {
|
||||
ElMessage.error(res.data.message)
|
||||
}
|
||||
}).catch(err => {
|
||||
ElMessage.error('更新载具信息失败:' + err)
|
||||
})
|
||||
},
|
||||
getCurrentRow(row) {
|
||||
this.vehicleId = row.vehicleId
|
||||
this.$emit('update:selVehicle', row)
|
||||
},
|
||||
exportExcel() {
|
||||
const request = {
|
||||
vehicleId: formData.vehicleId,
|
||||
currentLocation: formData.currentLocation,
|
||||
isEmpty: formData.isEmpty,
|
||||
vehicleStatus: formData.vehicleStatus
|
||||
}
|
||||
downloadVehicleExcel(request).then(res => {
|
||||
const link = document.createElement('a');//创建a标签
|
||||
try {
|
||||
// let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); //如果后台返回的不是blob对象类型，先定义成blob对象格式，该type导出为xls格式，
|
||||
let blob = res.data //如果后台返回的直接是blob对象类型，直接获取数据
|
||||
// let _fileName = res.headers['content-disposition'].split(';')[1].split('=')[1]; //拆解获取文件名，如果后端有给返回文件名的话
|
||||
let _fileName = "导出载具信息" + dateFormatter(new Date) + ".xlsx"
|
||||
link.style.display = 'none'//隐藏
|
||||
|
||||
// 兼容不同浏览器的URL对象
|
||||
const url = window.URL || window.webkitURL || window.moxURL
|
||||
link.href = url.createObjectURL(blob)
|
||||
link.setAttribute('download', _fileName.substring(_fileName.lastIndexOf('_') + 1))
|
||||
document.body.appendChild(link)
|
||||
link.click()
|
||||
document.body.removeChild(link)
|
||||
url.revokeObjectURL(link.href)//移除url对象
|
||||
} catch (e) {
|
||||
ElMessage({
|
||||
message: '下载文件失败：: ' + e,
|
||||
type: 'error',
|
||||
showClose: true
|
||||
})
|
||||
}
|
||||
}).catch(err => {
|
||||
ElMessage({
|
||||
message: '导出失败：: ' + err,
|
||||
type: 'error',
|
||||
showClose: true
|
||||
})
|
||||
})
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.el-pagination {
|
||||
padding-left: 5px;
|
||||
}
|
||||
|
||||
.el-row .el-button {
|
||||
width: 72px;
|
||||
margin-left: 0px;
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
.table-class {
|
||||
width: 100%;
|
||||
/* font-size: 5px; */
|
||||
}
|
||||
|
||||
.el-row .el-form-item {
|
||||
width: 10% inherit;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.el-row .el-form-item .el-select-v2 {
|
||||
width: 100% !important;
|
||||
}
|
||||
|
||||
.el-row .el-form-item .el-input-number {
|
||||
width: 100% !important;
|
||||
}
|
||||
|
||||
.el-row .el-form-item .el-button {
|
||||
margin: auto;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -1,359 +0,0 @@
|
|||
<template>
|
||||
<div style="margin-bottom: 10px">
|
||||
<el-config-provider :locale="zhCn">
|
||||
<el-row style="margin-top: 10px;">
|
||||
<el-input v-model="vehicleIdQuery" style="width: 256px; margin-right: 10px;" placeholder="零件号" />
|
||||
<el-button type="primary" @click="search()">搜索</el-button>
|
||||
<el-button type="warning" @click="reset()">重置</el-button>
|
||||
<el-button type="success" @click="exportExcel()">导出信息</el-button>
|
||||
</el-row>
|
||||
<br />
|
||||
<el-table :data="partInfos" stripe border v-loading="loading" class="table-class" max-height="650px"
|
||||
highlight-current-row @row-click="getCurrentRow" :header-cell-style="{ 'text-align': 'center' }"
|
||||
:cell-style="{ 'text-align': 'center' }">
|
||||
<el-table-column width="65px" fixed="left">
|
||||
<template v-slot="scope">
|
||||
<el-radio :label="scope.row.material" v-model="material"> </el-radio>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="material" label="零件号" fixed="left" sortable min-width="120px" />
|
||||
<el-table-column prop="itemDesc" label="描述" fixed="left" min-width="120px" />
|
||||
<el-table-column prop="category" label="零件类型" fixed="left" sortable min-width="120px" />
|
||||
<el-table-column prop="categoryRemark" label="策略" min-width="120px" />
|
||||
<el-table-column prop="unloadPlace" label="卸货点" min-width="120px" />
|
||||
<el-table-column prop="kittingPoint" label="配料点" min-width="120px" />
|
||||
<el-table-column prop="property" label="可用性" min-width="120px" />
|
||||
<el-table-column prop="vendorId" label="供应商代码" min-width="120px" />
|
||||
<el-table-column prop="dataOwner" label="数据负责人" min-width="120px" />
|
||||
<el-table-column prop="partWeight" label="重量" min-width="120px" />
|
||||
<el-table-column prop="storageLocation" label="库位" min-width="120px" />
|
||||
<el-table-column prop="storageType" label="存储类型" min-width="120px" />
|
||||
<el-table-column prop="storageBin" label="BIN位" min-width="120px" />
|
||||
<el-table-column prop="vendorNameEN" label="供应商名称（英文）" min-width="120px" />
|
||||
<el-table-column prop="vendorNameCN" label="供应商名称（中文）" min-width="120px" />
|
||||
<el-table-column prop="vendorCountry" label="供应商国家/地区" min-width="120px" />
|
||||
<el-table-column prop="SLED" label="SLED" min-width="120px" />
|
||||
<el-table-column prop="updateDate" label="更新日期" min-width="120px" />
|
||||
<el-table-column fixed="right" label="操作" width="240px">
|
||||
<template v-slot="scope">
|
||||
<el-button plain type="primary" @click="editCurrentRowGoods(scope.row)">编辑</el-button>
|
||||
<el-button plain type="danger" @click="deleteCurrentRowGoods(scope.row)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<br />
|
||||
<el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 25, 50]"
|
||||
:small="false" :disabled="false" :background="false" :default-page-size="10"
|
||||
layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search"
|
||||
@current-change="search" />
|
||||
<el-dialog v-model="dialogVisible" title="物料信息" width="40%" draggable :show-close="false">
|
||||
<el-form ref="goodsFormRef" :model="goodsFormEntity" :label-position="labelPosition" label-width="100px"
|
||||
style="max-width: 100%" :rules="rules" status-icon>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="12" :offset="0">
|
||||
<el-form-item label="零件号" prop="material">
|
||||
<el-input v-model="goodsFormEntity.material" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="描述" prop="itemDesc">
|
||||
<el-input v-model="goodsFormEntity.itemDesc" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="12" :offset="0">
|
||||
<el-form-item label="零件类型" prop="category">
|
||||
<el-input v-model="goodsFormEntity.category" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="策略" prop="categoryRemark">
|
||||
<el-input v-model="goodsFormEntity.categoryRemark" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="12" :offset="0">
|
||||
<el-form-item label="卸货点" prop="unloadPlace">
|
||||
<el-input v-model="goodsFormEntity.unloadPlace" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="配料点" prop="kittingPoint">
|
||||
<el-input v-model="goodsFormEntity.kittingPoint" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="12" :offset="0">
|
||||
<el-form-item label="可用性" prop="property">
|
||||
<el-input v-model="goodsFormEntity.property" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="供应商代码" prop="vendorId">
|
||||
<el-input v-model="goodsFormEntity.vendorId" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="12" :offset="0">
|
||||
<el-form-item label="数据负责人" prop="dataOwner">
|
||||
<el-input v-model="goodsFormEntity.dataOwner" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="重量" prop="partWeight">
|
||||
<el-input v-model="goodsFormEntity.partWeight" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="12" :offset="0">
|
||||
<el-form-item label="库位" prop="storageLocation">
|
||||
<el-input v-model="goodsFormEntity.storageLocation" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="存储类型" prop="storageType">
|
||||
<el-input v-model="goodsFormEntity.storageType" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="12" :offset="0">
|
||||
<el-form-item label="BIN位" prop="storageBin">
|
||||
<el-input v-model="goodsFormEntity.storageBin" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="供应商名称（英文）" prop="vendorNameEN">
|
||||
<el-input v-model="goodsFormEntity.vendorNameEN" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="12" :offset="0">
|
||||
<el-form-item label="供应商名称（中文）" prop="vendorNameCN">
|
||||
<el-input v-model="goodsFormEntity.vendorNameCN" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="供应商国家/地区" prop="vendorCountry">
|
||||
<el-input v-model="goodsFormEntity.vendorCountry" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="12" :offset="0">
|
||||
<el-form-item label="SLED" prop="SLED">
|
||||
<el-input-number v-model.number="goodsFormEntity.SLED" clearable controls-position="right"
|
||||
:min="0" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="更新日期" prop="updateDate">
|
||||
<el-input v-model="goodsFormEntity.updateDate" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<span class="dialog-footer">
|
||||
<el-button @click="dialogVisible = false">取消</el-button>
|
||||
<el-button type="primary" @click="submitGoodsInfo(goodsFormEntity)">
|
||||
确定
|
||||
</el-button>
|
||||
</span>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</el-config-provider>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { getPartInfo, updatePartInfo, deleteCurrentPartInfo } from '@/api/goods.js'
|
||||
import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { ref, reactive } from 'vue'
|
||||
import { dateFormatter } from '@/utils/formatter.js'
|
||||
import UploadExcelPart from '@/excel/UploadExcelPart.vue'
|
||||
import { downloadMaterialExcel } from '@/api/excel.js'
|
||||
</script>
|
||||
<script>
|
||||
export default {
|
||||
name: 'goods',
|
||||
data() {
|
||||
return {
|
||||
partInfos: [],
|
||||
pageInfo: {},
|
||||
currentPage: 1,
|
||||
pageSize: 10,
|
||||
total: 0,
|
||||
queryKey: '',
|
||||
loading: true,
|
||||
dialogVisible: false,
|
||||
material: '',
|
||||
goodsFormEntity: reactive({}),
|
||||
labelPosition: 'top',
|
||||
goodsFormRef: ref(),
|
||||
rules: reactive({})
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.search()
|
||||
},
|
||||
methods: {
|
||||
search() {
|
||||
this.loading = true
|
||||
this.pageInfo.pageNum = this.currentPage
|
||||
this.pageInfo.pageSize = this.pageSize
|
||||
const tableRequest = {
|
||||
page: this.pageInfo,
|
||||
param: {
|
||||
material: this.queryKey.trim()
|
||||
},
|
||||
}
|
||||
getPartInfo(tableRequest).then(res => {
|
||||
const tableResponse = res.data
|
||||
if (tableResponse.code != 0) {
|
||||
console.log(tableResponse.code + ':' + tableResponse.message)
|
||||
ElMessage.error(tableResponse.message)
|
||||
}
|
||||
this.partInfos = tableResponse.rows
|
||||
this.total = tableResponse.total
|
||||
}).catch(err => {
|
||||
ElMessage.error('查询物料错误' + err.message)
|
||||
})
|
||||
this.loading = false
|
||||
},
|
||||
dateFormat: (row, column, cellValue, index) => {
|
||||
return dateFormatter(cellValue)
|
||||
},
|
||||
reset() {
|
||||
this.queryKey = ''
|
||||
this.search
|
||||
},
|
||||
// getCurrentPageGoods() {
|
||||
// this.currentGoods = this.displayGoods.slice((this.currentPage - 1) * this.pageSize, this.currentPage * this.pageSize)
|
||||
// },
|
||||
editCurrentRowGoods(row) {
|
||||
this.goodsFormEntity = row
|
||||
this.dialogVisible = true
|
||||
},
|
||||
deleteCurrentRowGoods(row) {
|
||||
this.material = row.material
|
||||
const goods = {
|
||||
material: row.material
|
||||
}
|
||||
deleteCurrentPartInfo(goods).then(res => {
|
||||
if (res.data.code == 0) {
|
||||
ElMessage({
|
||||
message: '删除零件信息成功',
|
||||
type: 'success',
|
||||
})
|
||||
this.search()
|
||||
} else {
|
||||
ElMessage.error(res.data.message)
|
||||
}
|
||||
}).catch(err => {
|
||||
ElMessage.error('删除零件信息失败:' + err)
|
||||
})
|
||||
},
|
||||
submitGoodsInfo(formData) {
|
||||
updatePartInfo(formData).then(res => {
|
||||
if (res.data.code == 0) {
|
||||
this.dialogVisible = false
|
||||
ElMessage({
|
||||
message: '更新零件信息成功',
|
||||
type: 'success',
|
||||
})
|
||||
this.search()
|
||||
} else {
|
||||
ElMessage.error(res.data.message)
|
||||
}
|
||||
}).catch(err => {
|
||||
ElMessage.error('更新零件信息失败')
|
||||
})
|
||||
},
|
||||
getCurrentRow(row) {
|
||||
this.goodsId = row.goodsId
|
||||
},
|
||||
exportExcel() {
|
||||
downloadMaterialExcel().then(res => {
|
||||
const link = document.createElement('a');//创建a标签
|
||||
try {
|
||||
// let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); //如果后台返回的不是blob对象类型，先定义成blob对象格式，该type导出为xls格式，
|
||||
let blob = res.data //如果后台返回的直接是blob对象类型，直接获取数据
|
||||
// let _fileName = res.headers['content-disposition'].split(';')[1].split('=')[1]; //拆解获取文件名，如果后端有给返回文件名的话
|
||||
let _fileName = "导出物料信息" + dateFormatter(new Date) + ".xlsx"
|
||||
link.style.display = 'none'//隐藏
|
||||
|
||||
// 兼容不同浏览器的URL对象
|
||||
const url = window.URL || window.webkitURL || window.moxURL
|
||||
link.href = url.createObjectURL(blob)
|
||||
link.setAttribute('download', _fileName.substring(_fileName.lastIndexOf('_') + 1))
|
||||
document.body.appendChild(link)
|
||||
link.click()
|
||||
document.body.removeChild(link)
|
||||
url.revokeObjectURL(link.href)//移除url对象
|
||||
} catch (e) {
|
||||
ElMessage({
|
||||
message: '下载文件失败：: ' + e,
|
||||
type: 'error',
|
||||
showClose: true
|
||||
})
|
||||
}
|
||||
}).catch(err => {
|
||||
ElMessage({
|
||||
message: '导出失败：: ' + err,
|
||||
type: 'error',
|
||||
showClose: true
|
||||
})
|
||||
})
|
||||
},
|
||||
},
|
||||
// watch: {
|
||||
// currentPage() {
|
||||
// this.getCurrentPageGoods()
|
||||
// },
|
||||
// pageSize() {
|
||||
// this.getCurrentPageGoods()
|
||||
// }
|
||||
// }
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.el-pagination {
|
||||
padding-left: 5px;
|
||||
}
|
||||
|
||||
.el-row .el-button {
|
||||
width: 72px;
|
||||
margin-left: 0px;
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
.table-class {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.el-row .el-form-item {
|
||||
width: 10% inherit;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.el-row .el-form-item .el-select-v2 {
|
||||
width: 100% !important;
|
||||
}
|
||||
|
||||
.el-row .el-form-item .el-input-number {
|
||||
width: 100% !important;
|
||||
}
|
||||
|
||||
.el-row .el-form-item .el-button {
|
||||
margin: auto;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -21,10 +21,10 @@ const routes = [
|
|||
{ path: '/standSettings', component: () => import('@/layout/standSettings.vue') },// 站台（库口）设置
|
||||
{ path: '/config', component: () => import('@/layout/config.vue') },// 系统配置
|
||||
{ path: '/taskMonitor', component: () => import('@/layout/taskMonitor.vue') },// 任务监控
|
||||
{ path: '/vehicles', component: () => import('@/layout/vehicle.vue') },// 任务监控
|
||||
{ path: '/inventory', component: () => import('@/layout/inventory.vue') },// 盘点
|
||||
{ path: '/inventoryRecord', component: () => import('@/layout/inventoryRecord.vue') },// 盘点
|
||||
{ path: '/wmsLog', component: () => import('@/layout/wmsLog.vue') },// 日志
|
||||
{ path: '/scanConfirm', component: () => import('@/layout/scanConfirm.vue') },// 扫码确认
|
||||
]
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -57,7 +57,8 @@ function locationFormatter(locationId) {
|
|||
if (locationId === null || locationId == undefined) {
|
||||
return ''
|
||||
}
|
||||
return locationId.substr(0, 2) + '排' + locationId.substr(2, 2) + '列' + locationId.substr(4, 2) + '层' + locationId.substr(7, 3) + '深度'
|
||||
const locationArray = locationId.split('-')
|
||||
return locationArray[0] + '排' + locationArray[1] + '列' + locationArray[2] + '层' + locationArray[3] + '深度'
|
||||
}
|
||||
|
||||
function kateTaskStatusFormatter(value) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user