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

修改了工作方式，界面增加字段的查询

Browse Source
This commit is contained in:
梁州 2025-11-13 10:49:12 +08:00
parent 2d12eac2ed
commit 902964a2cf
3 changed files with 484 additions and 457 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

681
src/layout/taskMonitor.vue
View File

@ -1,379 +1,388 @@
<template> <template>
<div style="margin-bottom: 10px"> <div style="margin-bottom: 10px">
<el-config-provider :locale="zhCn"> <el-config-provider :locale="zhCn">
<el-row> <el-row>
<el-input v-model="goodsIdQuery" style="width: 196px; margin-right: 10px;" placeholder="料号" /> <el-input v-model="goodsIdQuery" style="width: 196px; margin-right: 10px;" placeholder="料号"/>
<el-input v-model="vehicleIdQuery" style="width: 196px; margin-right: 10px;" placeholder="箱号" /> <el-input v-model="vehicleIdQuery" style="width: 196px; margin-right: 10px;" placeholder="箱号"/>
<el-select-v2 v-model="taskTypeQuery" style="width: 196px; margin-right: 10px;" placeholder="请选择任务类型" <el-select-v2 v-model="taskTypeQuery" style="width: 196px; margin-right: 10px;" placeholder="请选择任务类型"
:options="taskTypeOptions" @change="search()"></el-select-v2> :options="taskTypeOptions" @change="search()"></el-select-v2>
<el-select-v2 v-model="taskStatusQuery" style="width: 196px; margin-right: 10px;" placeholder="请选择任务状态" <el-select-v2 v-model="taskStatusQuery" style="width: 196px; margin-right: 10px;" placeholder="请选择任务状态"
:options="taskStatusOptions" @change="search()"></el-select-v2> :options="taskStatusOptions" @change="search()"></el-select-v2>
<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-row> </el-row>
<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' }"
@row-click="getCurrentRow"> @row-click="getCurrentRow">
<el-table-column width="65px" fixed="left"> <el-table-column width="65px" fixed="left">
<template v-slot="scope"> <template v-slot="scope">
<el-radio :label="scope.row.taskId" v-model="taskId">&nbsp;</el-radio> <el-radio :label="scope.row.taskId" v-model="taskId">&nbsp;</el-radio>
</template> </template>
</el-table-column> </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/>
<el-table-column prop="goodsRelated.goodsId" label="料号" min-width="120px" show-overflow-tooltip /> <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="goodsRelated.goodsName" label="料名" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="taskGroup" label="任务组" min-width="120px" show-overflow-tooltip /> <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="goodsRelated.opNum" label="操作数量" min-width="120px" /> <el-table-column prop="goodsRelated.opNum" label="操作数量" min-width="120px"/>
<el-table-column prop="goodsRelated.originNum" 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" show-overflow-tooltip /> <el-table-column prop="pickStand" label="下发站台" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="createTime" label="运行时长" :formatter="dueFormat" min-width="120px" show-overflow-tooltip /> <el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px"
<el-table-column prop="userName" label="操作人员姓名" min-width="120px" /> show-overflow-tooltip/>
<el-table-column prop="taskStatus" label="任务状态" fixed="right" :formatter="taskStatusFormat" <el-table-column prop="createTime" label="运行时长" :formatter="dueFormat" min-width="120px"
min-width="120px" show-overflow-tooltip /> show-overflow-tooltip/>
<el-table-column fixed="right" label="操作" width="120px"> <el-table-column prop="userName" label="操作人员姓名" min-width="120px"/>
<template v-slot="scope"> <el-table-column prop="taskStatus" label="任务状态" fixed="right" :formatter="taskStatusFormat"
<el-button plain type="primary" @click="editCurrentRowTask(scope.row)">编辑</el-button> min-width="120px" show-overflow-tooltip/>
</template> <el-table-column fixed="right" label="操作" width="120px">
</el-table-column> <template v-slot="scope">
</el-table> <el-button plain type="primary" @click="editCurrentRowTask(scope.row)">编辑</el-button>
<br /> </template>
<el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 25, 50]" </el-table-column>
:small="false" :disabled="false" :background="false" :default-page-size="10" </el-table>
layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search" <br/>
@current-change="search" /> <el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 25, 50]"
<el-dialog v-model="dialogVisible" title="任务信息" width="40%" draggable :show-close="false"> :small="false" :disabled="false" :background="false" :default-page-size="10"
<el-form ref="taskFormRef" :model="taskFormEntity" :label-position="labelPosition" label-width="100px" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search"
style="max-width: 100%" :rules="rules" status-icon> @current-change="search"/>
<el-row :gutter="16"> <el-dialog v-model="dialogVisible" title="任务信息" width="40%" draggable :show-close="false">
<el-col :span="12" :offset="0"> <el-form ref="taskFormRef" :model="taskFormEntity" :label-position="labelPosition" label-width="100px"
<el-form-item label="任务号" prop="taskId"> style="max-width: 100%" :rules="rules" status-icon>
<el-input v-model="taskFormEntity.taskId" disabled /> <el-row :gutter="16">
</el-form-item> <el-col :span="12" :offset="0">
</el-col> <el-form-item label="任务号" prop="taskId">
<el-col :span="12"> <el-input v-model="taskFormEntity.taskId" disabled/>
<el-form-item label="任务优先级" prop="taskPriority"> </el-form-item>
<el-input-number v-model.number="taskFormEntity.taskPriority" controls-position="right" </el-col>
:min="1" :max="9" disabled /> <el-col :span="12">
</el-form-item> <el-form-item label="任务优先级" prop="taskPriority">
</el-col> <el-input-number v-model.number="taskFormEntity.taskPriority" controls-position="right"
</el-row> :min="1" :max="9" disabled/>
<el-row :gutter="16"> </el-form-item>
<el-col :span="12" :offset="0"> </el-col>
<el-form-item label="料箱号" prop="vehicleId"> </el-row>
<el-input v-model="taskFormEntity.vehicleId" disabled /> <el-row :gutter="16">
</el-form-item> <el-col :span="12" :offset="0">
</el-col> <el-form-item label="料箱号" prop="vehicleId">
<el-col :span="12"> <el-input v-model="taskFormEntity.vehicleId" disabled/>
<el-form-item label="料号" prop="goodsId"> </el-form-item>
<el-input v-model="taskFormEntity.goodsId" disabled /> </el-col>
</el-form-item> <el-col :span="12">
</el-col> <el-form-item label="料号" prop="goodsId">
</el-row> <el-input v-model="taskFormEntity.goodsId" disabled/>
<el-row :gutter="16"> </el-form-item>
<el-col :span="12" :offset="0"> </el-col>
<el-form-item label="起点" prop="origin"> </el-row>
<el-input v-model="taskFormEntity.origin" disabled /> <el-row :gutter="16">
</el-form-item> <el-col :span="12" :offset="0">
</el-col> <el-form-item label="起点" prop="origin">
<!-- <el-col :span="12" v-if="taskFormEntity.taskType == 1"> <el-input v-model="taskFormEntity.origin" disabled/>
<el-form-item label="终点" prop="destination"> </el-form-item>
<el-select-v2 v-model="taskFormEntity.destination" </el-col>
:options="availableLocationOptions"></el-select-v2> <!-- <el-col :span="12" v-if="taskFormEntity.taskType == 1">
</el-form-item> <el-form-item label="终点" prop="destination">
</el-col> <el-select-v2 v-model="taskFormEntity.destination"
<el-col :span="12" v-if="taskFormEntity.taskType == 2"> :options="availableLocationOptions"></el-select-v2>
<el-form-item label="终点" prop="destination"> </el-form-item>
<el-input v-model="taskFormEntity.destination" disabled /> </el-col>
</el-form-item> <el-col :span="12" v-if="taskFormEntity.taskType == 2">
</el-col> --> <el-form-item label="终点" prop="destination">
<el-col :span="12"> <el-input v-model="taskFormEntity.destination" disabled />
<el-form-item label="终点" prop="destination"> </el-form-item>
<el-input v-model="taskFormEntity.destination" disabled /> </el-col> -->
</el-form-item> <el-col :span="12">
</el-col> <el-form-item label="终点" prop="destination">
</el-row> <el-input v-model="taskFormEntity.destination" disabled/>
<el-row :gutter="16"> </el-form-item>
<el-col :span="12" :offset="0"> </el-col>
<el-form-item label="任务类型" prop="taskType"> </el-row>
<el-select-v2 v-model="taskFormEntity.taskType" placeholder="请选择任务类型" disabled <el-row :gutter="16">
:options="taskTypeOptions"></el-select-v2> <el-col :span="12" :offset="0">
</el-form-item> <el-form-item label="任务类型" prop="taskType">
</el-col> <el-select-v2 v-model="taskFormEntity.taskType" placeholder="请选择任务类型" disabled
<el-col :span="12"> :options="taskTypeOptions"></el-select-v2>
<el-form-item label="任务状态" prop="taskStatus"> </el-form-item>
<el-select-v2 v-model="taskFormEntity.taskStatus" placeholder="请选择任务状态" </el-col>
:options="taskStatusOptions"></el-select-v2> <el-col :span="12">
</el-form-item> <el-form-item label="任务状态" prop="taskStatus">
</el-col> <el-select-v2 v-model="taskFormEntity.taskStatus" placeholder="请选择任务状态"
</el-row> :options="taskStatusOptions"></el-select-v2>
</el-form> </el-form-item>
<template #footer> </el-col>
</el-row>
</el-form>
<template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="dialogVisible = false">取消</el-button> <el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" @click="submitTaskInfo(taskFormEntity)"> <el-button type="primary" @click="submitTaskInfo(taskFormEntity)">
确定 确定
</el-button> </el-button>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
</el-config-provider> </el-config-provider>
</div> </div>
</template> </template>
<script setup> <script setup>
import { getTasksByPage, updateTaskInfo } from '@/api/task.js' import {getTasksByPage, updateTaskInfo} from '@/api/task.js'
import { dateFormatter, taskStatusFormatter, timeFormatter, dueFormatter } from '@/utils/formatter.js' import {dateFormatter, taskStatusFormatter, timeFormatter, dueFormatter} from '@/utils/formatter.js'
import zhCn from 'element-plus/dist/locale/zh-cn.mjs' import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
import { errorBox } from '@/utils/myMessageBox.js' import {errorBox} from '@/utils/myMessageBox.js'
import { ElMessage } from 'element-plus' import {ElMessage} from 'element-plus'
import store from '@/store' import store from '@/store'
import { ref, reactive } from 'vue' import {ref, reactive} from 'vue'
</script> </script>
<script> <script>
export default { export default {
name: 'taskMonitor', name: 'taskMonitor',
data() { data() {
return { return {
tasks: [], tasks: [],
currentPage: 1, currentPage: 1,
pageSize: 10, pageSize: 10,
total: 0, total: 0,
goodsIdQuery: '', goodsIdQuery: '',
vehicleIdQuery: '', vehicleIdQuery: '',
taskTypeQuery: -99, taskTypeQuery: -99,
taskStatusQuery: -99, taskStatusQuery: -99,
loading: true, loading: true,
dialogVisible: false, dialogVisible: false,
taskFormEntity: reactive({}), taskFormEntity: reactive({}),
labelPosition: 'top', labelPosition: 'top',
taskFormRef: ref(), taskFormRef: ref(),
rules: reactive({}), rules: reactive({}),
taskId: '', taskId: '',
taskTypeOptions: [ taskTypeOptions: [
{ {
value: -99, value: -99,
label: '所有类型' label: '所有类型'
}, },
{ {
value: 1, value: 1,
label: '入库' label: '入库'
}, },
{ {
value: 2, value: 2,
label: '出库' label: '出库'
}, },
{ {
value: 3, value: 3,
label: '盘点' label: '盘点'
}, },
{ {
value: 9, value: 9,
label: '移库' label: '移库'
}, },
], ],
taskStatusOptions: [ taskStatusOptions: [
{ {
value: -99, value: -99,
label: '所有状态' label: '所有状态'
}, },
{ {
value: -2, value: -2,
label: '重复入库' label: '重复入库'
}, },
{ {
value: -1, value: -1,
label: '暂存' label: '暂存'
}, },
{ {
value: 0, value: 0,
label: '新建待下发' label: '新建待下发'
}, },
{ {
value: 1, value: 1,
label: '已下发' label: '已下发'
}, },
{ {
value: 2, value: 2,
label: '开始执行' label: '开始执行'
}, },
{ {
value: 8, value: 8,
label: '拣选中' label: '拣选中'
}, },
{ {
value: 9, value: 9,
label: '盘点中' label: '盘点中'
}, },
{ {
value: 100, value: 100,
label: '任务完成' label: '任务完成'
}, },
{ {
value: 998, value: 998,
label: '任务取消' label: '任务取消'
}, },
{ {
value: 999, value: 999,
label: '任务异常' label: '任务异常'
}
],
availableLocationOptions: []
} }
],
availableLocationOptions: []
}
},
mounted() {
this.search()
},
methods: {
dateFormat: (row, column, cellValue, index) => {
return dateFormatter(cellValue)
}, },
mounted() { timeFormat: (row, column, cellValue, index) => {
this.search() return timeFormatter(cellValue)
}, },
methods: { taskStatusFormat: (row, column, cellValue, index) => {
dateFormat: (row, column, cellValue, index) => { return taskStatusFormatter(cellValue)
return dateFormatter(cellValue) },
}, taskTypeFormat: (row, column, cellValue, index) => {
timeFormat: (row, column, cellValue, index) => { switch (cellValue) {
return timeFormatter(cellValue) case 1:
}, return '入库'
taskStatusFormat: (row, column, cellValue, index) => { case 2:
return taskStatusFormatter(cellValue) return '出库'
}, case 3:
taskTypeFormat: (row, column, cellValue, index) => { return '盘点'
switch (cellValue) { case 9:
case 1: return '入库' return '移库'
case 2: return '出库' default:
case 3: return '盘点' return '未知'
case 9: return '移库' }
default: return '未知' },
} dueFormat: (row, column, cellValue, index) => {
}, return dueFormatter(cellValue)
dueFormat: (row, column, cellValue, index) => { },
return dueFormatter(cellValue) search() {
}, this.loading = true
search() { const tableRequest = {
this.loading = true pageNo: this.currentPage,
const tableRequest = { pageSize: this.pageSize,
pageNo: this.currentPage, taskType: this.taskTypeQuery == -99 ? null : this.taskTypeQuery,
pageSize: this.pageSize, taskStatus: this.taskStatusQuery == -99 ? null : this.taskStatusQuery,
taskType: this.taskTypeQuery == -99 ? null : this.taskTypeQuery, goodsId: this.goodsIdQuery.trim(),
taskStatus: this.taskStatusQuery == -99 ? null : this.taskStatusQuery, vehicleId: this.vehicleIdQuery.trim(),
goodsId: this.goodsIdQuery.trim(), userName: store.getters.getUserName
vehicleId: this.vehicleIdQuery.trim(), }
userName: store.getters.getUserName getTasksByPage(tableRequest).then(res => {
} const tableResponse = res.data
getTasksByPage(tableRequest).then(res => { if (tableResponse.code == 0) {
const tableResponse = res.data this.tasks = tableResponse.returnData.lists
if (tableResponse.code == 0) { this.total = tableResponse.returnData.total
this.tasks = tableResponse.returnData.lists console.log(this.tasks)
this.total = tableResponse.returnData.total } else {
console.log(this.tasks) errorBox(tableResponse.message)
} else {
errorBox(tableResponse.message)
}
}).catch(err => {
console.log(err)
errorBox('查询任务错误')
})
this.loading = false
},
reset() {
this.goodsIdQuery = ''
this.vehicleIdQuery = ''
},
editCurrentRowTask(row) {
console.log(row)
// if (row.taskType == 1) {
// this.availableLocationOptions = []
// var currentOption = {
// value: row.destination,
// label: locationFormatter(row.destination)
// }
// this.availableLocationOptions.push(currentOption)
// // 生成可用库位列表
// const requestParam = {
// areaId: 1
// }
// getAvailableLocations(requestParam).then(res => {
// if (res.data.code == 0) {
// for (const location of res.data.returnData) {
// var newOption = {}
// newOption.value = location.locationId
// newOption.label = locationFormatter(location.locationId)
// this.availableLocationOptions.push(newOption)
// }
// }
// }).catch(err => {
// errorBox('查找可用库位失败:' + err)
// })
// }
this.taskFormEntity = {
taskId: row.taskId,
taskPriority: row.taskPriority,
vehicleId: row.vehicleId,
goodsId: row.goodsRelated == null ? '' : row.goodsRelated.goodsId,
origin: row.origin,
destination: row.destination,
taskType: row.taskType,
taskStatus: row.taskStatus,
}
this.dialogVisible = true
},
submitTaskInfo() {
if (this.taskFormEntity.taskStatus == null || this.taskFormEntity.taskStatus == undefined) {
errorBox('请选择任务状态')
return
}
const request = {
taskId: this.taskFormEntity.taskId,
taskStatus: this.taskFormEntity.taskStatus,
userName: store.getters.getUserName
}
updateTaskInfo(request).then(res => {
if (res.data.code == 0) {
this.dialogVisible = false
ElMessage.success('修改任务成功')
this.search()
} else {
errorBox(res.data.message)
}
}).catch(err => {
console.log(err)
errorBox('修改任务失败')
})
},
getCurrentRow(row) {
this.taskId = row.taskId
} }
}).catch(err => {
console.log(err)
errorBox('查询任务错误')
})
this.loading = false
}, },
reset() {
this.goodsIdQuery = ''
this.vehicleIdQuery = ''
},
editCurrentRowTask(row) {
console.log(row)
// if (row.taskType == 1) {
// this.availableLocationOptions = []
// var currentOption = {
// value: row.destination,
// label: locationFormatter(row.destination)
// }
// this.availableLocationOptions.push(currentOption)
// // 生成可用库位列表
// const requestParam = {
// areaId: 1
// }
// getAvailableLocations(requestParam).then(res => {
// if (res.data.code == 0) {
// for (const location of res.data.returnData) {
// var newOption = {}
// newOption.value = location.locationId
// newOption.label = locationFormatter(location.locationId)
// this.availableLocationOptions.push(newOption)
// }
// }
// }).catch(err => {
// errorBox('查找可用库位失败:' + err)
// })
// }
this.taskFormEntity = {
taskId: row.taskId,
taskPriority: row.taskPriority,
vehicleId: row.vehicleId,
goodsId: row.goodsRelated == null ? '' : row.goodsRelated.goodsId,
origin: row.origin,
destination: row.destination,
taskType: row.taskType,
taskStatus: row.taskStatus,
}
this.dialogVisible = true
},
submitTaskInfo() {
if (this.taskFormEntity.taskStatus == null || this.taskFormEntity.taskStatus == undefined) {
errorBox('请选择任务状态')
return
}
const request = {
taskId: this.taskFormEntity.taskId,
taskStatus: this.taskFormEntity.taskStatus,
userName: store.getters.getUserName
}
updateTaskInfo(request).then(res => {
if (res.data.code == 0) {
this.dialogVisible = false
ElMessage.success('修改任务成功')
this.search()
} else {
errorBox(res.data.message)
}
}).catch(err => {
console.log(err)
errorBox('修改任务失败')
})
},
getCurrentRow(row) {
this.taskId = row.taskId
}
},
} }
</script> </script>
<style scoped> <style scoped>
.el-pagination { .el-pagination {
padding-left: 5px; padding-left: 5px;
} }
.el-row .el-button { .el-row .el-button {
width: 72px; width: 72px;
margin-left: 0px; margin-left: 0px;
margin-right: 5px; margin-right: 5px;
} }
.table-class { .table-class {
width: 100%; width: 100%;
} }
.el-row .el-form-item .el-select-v2 { .el-row .el-form-item .el-select-v2 {
width: 100% !important; width: 100% !important;
} }
.el-row .el-form-item .el-input-number { .el-row .el-form-item .el-input-number {
width: 100% !important; width: 100% !important;
} }
.el-row .el-form-item .el-button { .el-row .el-form-item .el-button {
margin: auto; margin: auto;
} }
</style> </style>

14
src/layout/workFlow.vue
View File

@ -44,6 +44,7 @@
<el-table-column prop="goodsId" label="料号" min-width="120px" show-overflow-tooltip/> <el-table-column prop="goodsId" label="料号" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="needNum" label="需求数量" min-width="120px"/> <el-table-column prop="needNum" label="需求数量" min-width="120px"/>
<el-table-column prop="pickedNum" label="已拣数量" min-width="120px"/> <el-table-column prop="pickedNum" label="已拣数量" min-width="120px"/>
<el-table-column prop="distributedNum" label="已分配数量" min-width="120px"/>
<el-table-column prop="lightStatus" label="亮灯状态" :formatter="lightStatusFormat" min-width="120px"/> <el-table-column prop="lightStatus" label="亮灯状态" :formatter="lightStatusFormat" min-width="120px"/>
<el-table-column prop="workStatus" label="工作状态" :formatter="workStatusFormat" min-width="120px"/> <el-table-column prop="workStatus" label="工作状态" :formatter="workStatusFormat" min-width="120px"/>
<el-table-column prop="machineType" label="机型" :formatter="machineTypeFormat" min-width="120px"/> <el-table-column prop="machineType" label="机型" :formatter="machineTypeFormat" min-width="120px"/>
@ -52,7 +53,7 @@
show-overflow-tooltip/> show-overflow-tooltip/>
<el-table-column prop="finishTime" label="完成时间" :formatter="timeFormat" min-width="120px" <el-table-column prop="finishTime" label="完成时间" :formatter="timeFormat" min-width="120px"
show-overflow-tooltip/> show-overflow-tooltip/>
<el-table-column prop="opUser" label="操作用户" min-width="120px"/> <el-table-column prop="opUser" label="操作用户" min-width="120px" show-overflow-tooltip/>
<el-table-column fixed="right" label="操作" width="120px"> <el-table-column fixed="right" label="操作" width="120px">
<template v-slot="scope"> <template v-slot="scope">
<el-button plain type="primary" @click="editCurrentRow(scope.row)">编辑</el-button> <el-button plain type="primary" @click="editCurrentRow(scope.row)">编辑</el-button>
@ -152,6 +153,13 @@
<el-input v-model="workFlowFormEntity.opUser" disabled/> <el-input v-model="workFlowFormEntity.opUser" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="已分配数量" prop="distributedNum">
<el-input-number v-model.number="workFlowFormEntity.distributedNum"
controls-position="right" :min="0" :max="workFlowFormEntity.needNum"
clearable/>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
@ -344,6 +352,8 @@ export default {
}, },
workStatusFormat: (row, column, cellValue, index) => { workStatusFormat: (row, column, cellValue, index) => {
switch (cellValue) { switch (cellValue) {
case -1:
return '暂存'
case 0: case 0:
return '未开始' return '未开始'
case 1: case 1:
@ -382,6 +392,7 @@ export default {
goodsId: row.goodsId, goodsId: row.goodsId,
pickedNum: row.pickedNum, pickedNum: row.pickedNum,
needNum: row.needNum, needNum: row.needNum,
distributedNum: row.distributedNum,
lightStatus: row.lightStatus, lightStatus: row.lightStatus,
workStatus: row.workStatus, workStatus: row.workStatus,
createTime: row.createTime, createTime: row.createTime,
@ -394,6 +405,7 @@ export default {
const params = { const params = {
workFlowId: formData.workFlowId, workFlowId: formData.workFlowId,
pickedNum: formData.pickedNum, pickedNum: formData.pickedNum,
distributedNum: formData.distributedNum,
lightStatus: formData.lightStatus, lightStatus: formData.lightStatus,
workStatus: formData.workStatus, workStatus: formData.workStatus,
userName: store.getters.getUserName userName: store.getters.getUserName

246
src/views/login.vue
View File

@ -1,28 +1,28 @@
<template> <template>
<body id="login-page"> <body id="login-page">
<el-form class="login-container" :model="loginForm" label-position="left" label-width="0px"> <el-form class="login-container" :model="loginForm" label-position="left" label-width="0px">
<h3 class="login_title">系统登录</h3> <h3 class="login_title">系统登录</h3>
<el-form-item> <el-form-item>
<el-input type="text" v-model="loginForm.loginAccount" auto-complete="off" placeholder="账号"></el-input> <el-input type="text" v-model="loginForm.loginAccount" auto-complete="off" placeholder="账号"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-input type="password" v-model="loginForm.loginPassword" auto-complete="off" placeholder="密码"></el-input> <el-input type="password" v-model="loginForm.loginPassword" auto-complete="off" placeholder="密码"></el-input>
</el-form-item> </el-form-item>
<el-form-item style="width: 100%"> <el-form-item style="width: 100%">
<el-button type="primary" style="width: 100%; border: none" @click="login">登录</el-button> <el-button type="primary" style="width: 100%; border: none" @click="login">登录</el-button>
</el-form-item> </el-form-item>
<el-form-item style="width: 100%"> <el-form-item style="width: 100%">
<el-button type="primary" style="width: 100%; border: none" @click="loginCate">卡特账号登录</el-button> <el-button type="primary" style="width: 100%; border: none" @click="loginCate">卡特账号登录</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</body> </body>
</template> </template>
<script setup> <script setup>
import { getUser, loginWithAuth, loginWithoutAuth } from '@/api/login.js' import {getUser, loginWithAuth, loginWithoutAuth} from '@/api/login.js'
import { postToGetToken } from "@/api/kateLogin.js"; import {postToGetToken} from "@/api/kateLogin.js";
import { ElMessage, ElLoading } from 'element-plus' import {ElMessage, ElLoading} from 'element-plus'
import { reactive, onMounted } from 'vue'; import {reactive, onMounted} from 'vue';
import store from '@/store' import store from '@/store'
import router from '@/router' import router from '@/router'
import crypto from 'crypto' import crypto from 'crypto'
@ -30,35 +30,37 @@ import loading from "@/utils/loading";
// Dependency: Node.js crypto module // Dependency: Node.js crypto module
// https://nodejs.org/api/crypto.html#crypto_crypto // https://nodejs.org/api/crypto.html#crypto_crypto
function base64URLEncode(str) { function base64URLEncode(str) {
return str.toString('base64') return str.toString('base64')
.replace(/\+/g, '-') .replace(/\+/g, '-')
.replace(/\//g, '_') .replace(/\//g, '_')
.replace(/=/g, ''); .replace(/=/g, '');
} }
var verifier = base64URLEncode(crypto.randomBytes(32)); var verifier = base64URLEncode(crypto.randomBytes(32));
// Dependency: Node.js crypto module // Dependency: Node.js crypto module
// https://nodejs.org/api/crypto.html#crypto_crypto // https://nodejs.org/api/crypto.html#crypto_crypto
function sha256(buffer) { function sha256(buffer) {
return crypto.createHash('sha256').update(buffer).digest(); return crypto.createHash('sha256').update(buffer).digest();
} }
var challenge = base64URLEncode(sha256(verifier)); var challenge = base64URLEncode(sha256(verifier));
const loginForm = reactive({ const loginForm = reactive({
loginAccount: "", loginAccount: "",
loginPassword: "", loginPassword: "",
}) })
// todo 参数待设置 // todo 参数待设置
const oauthConstants = { const oauthConstants = {
client_id: 'f921b5f5-ba70-4bcb-8a4b-f3c7d90ec84e',// 客户端id，卡特提供 client_id: 'f921b5f5-ba70-4bcb-8a4b-f3c7d90ec84e',// 客户端id，卡特提供
// client_id: 'ASRS_ac_client', // client_id: 'ASRS_ac_client',
response_type: 'code',// 授权类型，固定为code response_type: 'code',// 授权类型，固定为code
state: '001',// 客户端当前状态，任意值 state: '001',// 客户端当前状态，任意值
scope: 'openid%20profile',// 权限范围，固定为openid scope: 'openid%20profile',// 权限范围，固定为openid
grant_type: 'authorization_code', grant_type: 'authorization_code',
code_challenge: challenge, code_challenge: challenge,
code_challenge_method: 'S256', code_challenge_method: 'S256',
// response_mode: "form_post", // response_mode: "form_post",
redirect_uri: 'https://csclasrs.ecorp.cat.com/wms' redirect_uri: 'https://csclasrs.ecorp.cat.com/wms'
} }
@ -66,108 +68,112 @@ const oauthConstants = {
const cateLoginUrl = `https://login.microsoftonline.com/caterpillar.onmicrosoft.com/oauth2/v2.0/authorize?client_id=${oauthConstants.client_id}&response_type=${oauthConstants.response_type}&code_challenge=${oauthConstants.code_challenge}&code_challenge_method=S256&grant_type=${oauthConstants.grant_type}&scope=${oauthConstants.scope}&state=${oauthConstants.state}&redirect_uri=${oauthConstants.redirect_uri}` const cateLoginUrl = `https://login.microsoftonline.com/caterpillar.onmicrosoft.com/oauth2/v2.0/authorize?client_id=${oauthConstants.client_id}&response_type=${oauthConstants.response_type}&code_challenge=${oauthConstants.code_challenge}&code_challenge_method=S256&grant_type=${oauthConstants.grant_type}&scope=${oauthConstants.scope}&state=${oauthConstants.state}&redirect_uri=${oauthConstants.redirect_uri}`
// 登录 // 登录
const login = () => { const login = () => {
const loading = ElLoading.service({ const loading = ElLoading.service({
lock: true, lock: true,
text: 'Loading', text: 'Loading',
background: 'rgba(0, 0, 0, 0.7)', background: 'rgba(0, 0, 0, 0.7)',
}) })
loginWithAuth(loginForm).then(res => { loginWithAuth(loginForm).then(res => {
loading.close() loading.close()
if (res.data.code === 0) { if (res.data.code === 0) {
store.commit('mutationUser', res.data.returnData.user)// 用户信息 store.commit('mutationUser', res.data.returnData.user)// 用户信息
store.commit('mutationMenu', res.data.returnData.menuList)// 菜单信息 store.commit('mutationMenu', res.data.returnData.menuList)// 菜单信息
store.commit('mutationStandId', res.data.returnData.standId) store.commit('mutationStandId', res.data.returnData.standId)
// router.replace({ path: '/' })// 直接跳转到主页 // router.replace({ path: '/' })// 直接跳转到主页
router.replace({ path: '/systemCenter' })// 跳转到系统选择的界面 router.replace({path: '/systemCenter'})// 跳转到系统选择的界面
} else { } else {
ElMessage.error(res.data.message) ElMessage.error(res.data.message)
} }
}).catch(err => { }).catch(err => {
console.log(err) console.log(err)
loading.close() loading.close()
ElMessage.error('登录失败！') ElMessage.error('登录失败！')
}) })
} }
// 跳转卡特登录接口 // 跳转卡特登录接口
const loginCate = () => { const loginCate = () => {
store.commit('mutationAddVerify', verifier)// 添加认证信息 store.commit('mutationAddVerify', verifier)// 添加认证信息
// console.log(cateLoginUrl) // console.log(cateLoginUrl)
window.location.href = cateLoginUrl// 打开新窗口 window.location.href = cateLoginUrl// 打开新窗口
// window.open(cateLoginUrl)// 不打开新窗口 // window.open(cateLoginUrl)// 不打开新窗口
} }
onMounted(() => { onMounted(() => {
if (router.currentRoute.value.query.code !== undefined) { const urlParams = new URLSearchParams(window.location.search);
loading.open('请求登录中...') const code = urlParams.get('code');
const tokenParam = { console.log(code); // 输出 ?code= 后面的值
code_verifier: store.getters.getVerify, if (code !== undefined && code !== null && code !== '') {
client_id: '609f8296-74ab-441e-904f-3a8508030511', console.log('跳转并尝试登录。code：' + code)
// scope: 'openid', loading.open('请求登录中...')
code: router.currentRoute.value.query.code, const tokenParam = {
redirect_uri: 'https://csclasrs.ecorp.cat.com/wms', code_verifier: store.getters.getVerify,
grant_type: 'authorization_code', client_id: 'f921b5f5-ba70-4bcb-8a4b-f3c7d90ec84e',
// client_secret: 'o6h8Q~iLegnIBG.GzJngXk.03FYdBJzIoCtTtcwj', // scope: 'openid',
// response_type: 'id_token', code: code,
// response_mode: 'form_post' redirect_uri: 'https://csclasrs.ecorp.cat.com/wms',
} grant_type: 'authorization_code',
postToGetToken(tokenParam).then(res => { // client_secret: 'o6h8Q~iLegnIBG.GzJngXk.03FYdBJzIoCtTtcwj',
store.commit('mutationClearVerify', verifier)// 删除认证信息 // response_type: 'id_token',
if (res.data.id_token !== undefined) { // response_mode: 'form_post'
const codeInfo = {
id_token: res.data.id_token
}
getUser(codeInfo).then(res => {
if (res.data.code === 0) {
store.commit('mutationUser', res.data.returnData.user)// 用户信息
store.commit('mutationMenu', res.data.returnData.menuList)// 菜单信息
store.commit('mutationStandId', res.data.returnData.standId)
router.replace({ path: '/systemCenter' })
} else {
ElMessage.error(res.data.message)
}
}).catch(err => {
console.log(err)
ElMessage.error('登录失败！')
})
}
}).catch(err => {
console.log(err)
ElMessage.error('登录错误')
}).finally(() => {
loading.close()
})
} }
postToGetToken(tokenParam).then(res => {
store.commit('mutationClearVerify', verifier)// 删除认证信息
if (res.data.id_token !== undefined) {
const codeInfo = {
id_token: res.data.id_token
}
getUser(codeInfo).then(res => {
if (res.data.code === 0) {
store.commit('mutationUser', res.data.returnData.user)// 用户信息
store.commit('mutationMenu', res.data.returnData.menuList)// 菜单信息
store.commit('mutationStandId', res.data.returnData.standId)
router.replace({path: '/systemCenter'})
} else {
ElMessage.error(res.data.message)
}
}).catch(err => {
console.log(err)
ElMessage.error('登录失败！')
})
}
}).catch(err => {
console.log(err)
ElMessage.error('登录错误')
}).finally(() => {
loading.close()
})
}
}) })
</script> </script>
<style scoped> <style scoped>
#login-page { #login-page {
/* background: url("../assets/img/bg.jpg") no-repeat; */ /* background: url("../assets/img/bg.jpg") no-repeat; */
background-position: center; background-position: center;
height: 100%; height: 100%;
width: 100%; width: 100%;
background-size: cover; background-size: cover;
position: fixed; position: fixed;
} }
body { body {
margin: 0px; margin: 0px;
} }
.login-container { .login-container {
border-radius: 15px; border-radius: 15px;
background-clip: padding-box; background-clip: padding-box;
margin: 90px auto; margin: 90px auto;
width: 350px; width: 350px;
padding: 35px 35px 15px 35px; padding: 35px 35px 15px 35px;
background: #fff; background: #fff;
border: 1px solid #eaeaea; border: 1px solid #eaeaea;
box-shadow: 0 0 25px #cac6c6; box-shadow: 0 0 25px #cac6c6;
} }
.login_title { .login_title {
margin: 0px auto 40px auto; margin: 0px auto 40px auto;
text-align: center; text-align: center;
color: #505458; color: #505458;
} }
</style> </style>