FeiDaBaoKai/wms_client_kate_suzhou
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新：

Browse Source 
1. 修改任务记录界面
This commit is contained in:
梁州 2024-10-15 17:12:10 +08:00
parent b700b59284
commit 18c7068b28
4 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/layout/goodsInQR.vue
View File

@ -160,7 +160,15 @@ export default {
}) })
}, },
addTempTask() { addTempTask() {
this.workFormEntity.vehicleId = replaceEnglishAndNumberIGAI(this.workFormEntity.vehicleId) if (this.workFormEntity.vehicleId != '') {
const vehicleIdString = replaceEnglishAndNumberIGAI(this.workFormEntity.vehicleId)
if (!vehicleIdString.startsWith('ASRS') || vehicleIdString.length != 9) {
errorBox('料箱格式不正确')
return
} else {
this.workFormEntity.vehicleId = vehicleIdString
}
}
if (this.workFormEntity.qrcode != '') { if (this.workFormEntity.qrcode != '') {
try { try {
const goodsInfo = this.workFormEntity.qrcode.split('-') const goodsInfo = this.workFormEntity.qrcode.split('-')

10
src/layout/inTaskRecord.vue
View File

@ -12,11 +12,6 @@
<el-table :data="tasks" stripe border v-loading="loading" style="width: 100%" max-height="684px" <el-table :data="tasks" stripe border v-loading="loading" style="width: 100%" max-height="684px"
class="table-class" :header-cell-style="{ 'text-align': 'center' }" class="table-class" :header-cell-style="{ 'text-align': 'center' }"
: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.taskId" v-model="taskId">&nbsp;</el-radio>
</template>
</el-table-column>
<el-table-column prop="taskId" label="任务号" fixed="left" show-overflow-tooltip min-width="120px" /> <el-table-column prop="taskId" label="任务号" fixed="left" show-overflow-tooltip min-width="120px" />
<el-table-column prop="taskType" label="任务类型" fixed="left" :formatter="taskTypeFormat" min-width="120px" /> <el-table-column prop="taskType" label="任务类型" fixed="left" :formatter="taskTypeFormat" min-width="120px" />
<el-table-column prop="vehicleId" label="箱号" min-width="120px" show-overflow-tooltip /> <el-table-column prop="vehicleId" label="箱号" min-width="120px" show-overflow-tooltip />
@ -30,7 +25,6 @@
<el-table-column prop="taskPriority" label="任务优先级" min-width="120px" /> <el-table-column prop="taskPriority" label="任务优先级" min-width="120px" />
<el-table-column prop="preTask" label="前置任务" min-width="120px" show-overflow-tooltip /> <el-table-column prop="preTask" label="前置任务" min-width="120px" show-overflow-tooltip />
<el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px" show-overflow-tooltip /> <el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px" show-overflow-tooltip />
<el-table-column prop="createTime" label="运行时长" :formatter="dueFormat" min-width="120px" show-overflow-tooltip />
<el-table-column prop="userName" label="操作人员姓名" min-width="120px" /> <el-table-column prop="userName" label="操作人员姓名" min-width="120px" />
<el-table-column prop="taskStatus" label="任务状态" fixed="right" :formatter="taskStatusFormat" <el-table-column prop="taskStatus" label="任务状态" fixed="right" :formatter="taskStatusFormat"
min-width="120px" /> min-width="120px" />
@ -63,7 +57,7 @@ export default {
total: 0, total: 0,
goodsIdQuery: '', goodsIdQuery: '',
vehicleIdQuery: '', vehicleIdQuery: '',
loading: true loading: true,
} }
}, },
mounted() { mounted() {
@ -144,7 +138,7 @@ export default {
errorBox('下载文件失败') errorBox('下载文件失败')
} }
}).catch(err => { }).catch(err => {
console.log(e) console.log(err)
errorBox('导出失败') errorBox('导出失败')
}) })
}, },

21
src/layout/outTaskRecord.vue
View File

@ -3,8 +3,8 @@
<div style="margin-bottom: 15px"> <div style="margin-bottom: 15px">
<el-config-provider :locale="zhCn"> <el-config-provider :locale="zhCn">
<el-row> <el-row>
<el-input v-model="goodsIdQuery" style="width: 256px; margin-right: 10px;" placeholder="物料编号" /> <el-input v-model="goodsIdQuery" style="width: 256px; margin-right: 10px;" placeholder="料号" />
<el-input v-model="vehicleIdQuery" style="width: 256px; margin-right: 10px;" placeholder="载具号" /> <el-input v-model="vehicleIdQuery" style="width: 256px; margin-right: 10px;" placeholder="箱号" />
<el-button type="primary" @click="search()">搜索</el-button> <el-button type="primary" @click="search()">搜索</el-button>
<el-button type="warning" @click="reset()">重置</el-button> <el-button type="warning" @click="reset()">重置</el-button>
<el-button type="success" @click="exportExcel()">导出记录</el-button> <el-button type="success" @click="exportExcel()">导出记录</el-button>
@ -12,19 +12,20 @@
<br /> <br />
<el-table :data="tasks" stripe border v-loading="loading" style="width: 100%" max-height="684px" <el-table :data="tasks" 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' }"> class="table-class" :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }">
<el-table-column prop="taskId" label="任务号" fixed="left" show-overflow-tooltip min-width="120px" />
<el-table-column prop="taskType" label="任务类型" fixed="left" :formatter="taskTypeFormat" min-width="120px" /> <el-table-column prop="taskType" label="任务类型" fixed="left" :formatter="taskTypeFormat" min-width="120px" />
<el-table-column prop="goodsType" label="型号" min-width="120px" /> <el-table-column prop="vehicleId" label="箱号" min-width="120px" show-overflow-tooltip />
<el-table-column prop="specification" label="规格" min-width="120px" /> <el-table-column prop="goodsRelated.goodsId" label="料号" min-width="120px" show-overflow-tooltip />
<el-table-column prop="batchNo" label="批次号" min-width="120px" /> <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="taskGroup" label="任务组" min-width="120px" show-overflow-tooltip />
<el-table-column prop="origin" label="起点" min-width="120px" /> <el-table-column prop="origin" label="起点" min-width="120px" />
<el-table-column prop="destination" label="终点" min-width="120px" /> <el-table-column prop="destination" label="终点" min-width="120px" />
<el-table-column prop="operateNum" label="操作数量" min-width="120px" /> <el-table-column prop="goodsRelated.opNum" label="操作数量" min-width="120px" />
<el-table-column prop="totalNum" label="库存数量" min-width="120px" /> <el-table-column prop="goodsRelated.originNum" label="库存数量" min-width="120px" />
<el-table-column prop="taskPriority" label="任务优先级" min-width="120px" /> <el-table-column prop="taskPriority" label="任务优先级" min-width="120px" />
<el-table-column prop="preTask" label="前置任务" min-width="120px" show-overflow-tooltip /> <el-table-column prop="preTask" label="前置任务" min-width="120px" show-overflow-tooltip />
<el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px" /> <el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px" show-overflow-tooltip />
<!-- <el-table-column prop="userName" label="操作人员姓名" min-width="120px" /> --> <el-table-column prop="userName" label="操作人员姓名" min-width="120px" />
<el-table-column prop="taskStatus" label="任务状态" fixed="right" :formatter="taskStatusFormat" <el-table-column prop="taskStatus" label="任务状态" fixed="right" :formatter="taskStatusFormat"
min-width="120px" /> min-width="120px" />
</el-table> </el-table>

2
src/layout/stockUpdateRecord.vue
View File

@ -34,7 +34,7 @@
<el-table-column prop="reason" label="原因" fixed="right" show-overflow-tooltip min-width="120px" /> <el-table-column prop="reason" label="原因" fixed="right" show-overflow-tooltip min-width="120px" />
<el-table-column prop="updateTime" label="完成时间" :formatter="timeFormat" min-width="120px" <el-table-column prop="updateTime" label="完成时间" :formatter="timeFormat" min-width="120px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column prop="updateUser" label="操作用户" min-width="120px" /> <el-table-column prop="updateUser" label="操作用户" show-overflow-tooltip min-width="120px" />
</el-table> </el-table>
<br /> <br />
<el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 25, 50]" <el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 25, 50]"