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

1. 增加机型的选择

Browse Source
This commit is contained in:
梁州 2025-04-22 11:10:03 +08:00
parent 7804781bbe
commit c7a73a0f34
1 changed files with 445 additions and 442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/layout/workFlow.vue
View File

@ -4,28 +4,29 @@
<div style="display: flex;justify-content: space-between;"> <div style="display: flex;justify-content: space-between;">
<el-row> <el-row>
<el-input v-model="workOrderQuery" style="width: 158px; margin-right: 10px;" placeholder="工单号" <el-input v-model="workOrderQuery" style="width: 158px; margin-right: 10px;" placeholder="工单号"
:suffix-icon="Search" /> :suffix-icon="Search"/>
<el-input v-model="workCenterQuery" style="width: 158px; margin-right: 10px;" placeholder="工位/小盒子" <el-input v-model="workCenterQuery" style="width: 158px; margin-right: 10px;" placeholder="工位/小盒子"
:suffix-icon="Search" /> :suffix-icon="Search"/>
<el-input v-model="goodsIdQuery" style="width: 158px; margin-right: 10px;" placeholder="料号" <el-input v-model="goodsIdQuery" style="width: 158px; margin-right: 10px;" placeholder="料号"
:suffix-icon="Search" /> :suffix-icon="Search"/>
<el-input v-model="standIdQuery" style="width: 158px; margin-right: 10px;" placeholder="站台号" <el-input v-model="standIdQuery" style="width: 158px; margin-right: 10px;" placeholder="站台号"
:suffix-icon="Search" /> :suffix-icon="Search"/>
<el-select-v2 v-model="lightStatusQuery" style="width: 158px; margin-right: 10px;" <el-select-v2 v-model="lightStatusQuery" style="width: 158px; margin-right: 10px;"
placeholder="请选择灯光状态" :options="lightStatusOptions" @change="search()"></el-select-v2> placeholder="请选择灯光状态" :options="lightStatusOptions" @change="search()"></el-select-v2>
<el-select-v2 v-model="workStatusQuery" style="width: 158px; margin-right: 10px;" <el-select-v2 v-model="workStatusQuery" style="width: 158px; margin-right: 10px;"
placeholder="请选择工作状态" :options="workStatusOptions" @change="search()"></el-select-v2> placeholder="请选择工作状态" :options="workStatusOptions" @change="search()"></el-select-v2>
<el-select-v2 v-model="machineTypeQuery" style="width: 158px; margin-right: 10px;" <el-select-v2 v-model="machineTypeQuery" style="width: 158px; margin-right: 10px;"
placeholder="请选择机型" :options="workStatusOptions" @change="search()"></el-select-v2> placeholder="请选择机型" :options="machineTypeOptions" @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>
<el-row> <el-row>
<el-button style="background-color: #00CED1; color: #000;" <el-button style="background-color: #00CED1; color: #000;"
@click="openUploadDialog()">导入</el-button> @click="openUploadDialog()">导入
</el-button>
</el-row> </el-row>
</div> </div>
<br /> <br/>
<el-table :data="workFlowList" stripe border v-loading="loading" class="table-class" highlight-current-row <el-table :data="workFlowList" stripe border v-loading="loading" class="table-class" highlight-current-row
max-height="650px" @row-click="getCurrentRow" :header-cell-style="{ 'text-align': 'center' }" max-height="650px" @row-click="getCurrentRow" :header-cell-style="{ 'text-align': 'center' }"
:cell-style="{ 'text-align': 'center' }"> :cell-style="{ 'text-align': 'center' }">
@ -34,34 +35,34 @@
<el-radio :label="scope.row.workFlowId" v-model="workFlowId">&nbsp;</el-radio> <el-radio :label="scope.row.workFlowId" v-model="workFlowId">&nbsp;</el-radio>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="workFlowId" label="id" fixed="left" min-width="120px" show-overflow-tooltip /> <el-table-column prop="workFlowId" label="id" fixed="left" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="orderId" label="订单号" min-width="120px" show-overflow-tooltip /> <el-table-column prop="orderId" label="订单号" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="workStation" label="站台号" min-width="120px" show-overflow-tooltip /> <el-table-column prop="workStation" label="站台号" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="workOrder" label="工单号" min-width="120px" show-overflow-tooltip /> <el-table-column prop="workOrder" label="工单号" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="workCenter" label="工位/小盒子" show-overflow-tooltip min-width="120px" /> <el-table-column prop="workCenter" label="工位/小盒子" show-overflow-tooltip min-width="120px"/>
<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="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"/>
<el-table-column prop="planDate" label="计划日期" :formatter="dateFormat" min-width="120px" /> <el-table-column prop="planDate" label="计划日期" :formatter="dateFormat" min-width="120px"/>
<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 /> 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"/>
<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>
</template> </template>
</el-table-column> </el-table-column>
</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]"
:small="false" :disabled="false" :background="false" :default-page-size="10" :small="false" :disabled="false" :background="false" :default-page-size="10"
layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search"
@current-change="search" /> @current-change="search"/>
<el-dialog v-model="dialogVisible" title="工作流详细信息" width="40%" draggable :show-close="false"> <el-dialog v-model="dialogVisible" title="工作流详细信息" width="40%" draggable :show-close="false">
<div <div
style="max-width: 100%; max-height: 500px; overflow: auto; display: flex; justify-content: center;"> style="max-width: 100%; max-height: 500px; overflow: auto; display: flex; justify-content: center;">
@ -70,36 +71,36 @@
<el-row :gutter="16"> <el-row :gutter="16">
<el-col :span="12" :offset="0"> <el-col :span="12" :offset="0">
<el-form-item label="id" prop="workFlowId"> <el-form-item label="id" prop="workFlowId">
<el-input v-model="workFlowFormEntity.workFlowId" disabled /> <el-input v-model="workFlowFormEntity.workFlowId" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="订单id" prop="orderId"> <el-form-item label="订单id" prop="orderId">
<el-input v-model="workFlowFormEntity.orderId" disabled /> <el-input v-model="workFlowFormEntity.orderId" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="16"> <el-row :gutter="16">
<el-col :span="12" :offset="0"> <el-col :span="12" :offset="0">
<el-form-item label="站台号" prop="workStation"> <el-form-item label="站台号" prop="workStation">
<el-input v-model="workFlowFormEntity.workStation" disabled /> <el-input v-model="workFlowFormEntity.workStation" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工单" prop="workOrder"> <el-form-item label="工单" prop="workOrder">
<el-input v-model="workFlowFormEntity.workOrder" disabled /> <el-input v-model="workFlowFormEntity.workOrder" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="16"> <el-row :gutter="16">
<el-col :span="12" :offset="0"> <el-col :span="12" :offset="0">
<el-form-item label="工位/小盒子" prop="workCenter"> <el-form-item label="工位/小盒子" prop="workCenter">
<el-input v-model="workFlowFormEntity.workCenter" disabled /> <el-input v-model="workFlowFormEntity.workCenter" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="料号" prop="goodsId"> <el-form-item label="料号" prop="goodsId">
<el-input v-model="workFlowFormEntity.goodsId" disabled /> <el-input v-model="workFlowFormEntity.goodsId" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -107,14 +108,14 @@
<el-col :span="12" :offset="0"> <el-col :span="12" :offset="0">
<el-form-item label="需求数量" prop="needNum"> <el-form-item label="需求数量" prop="needNum">
<el-input-number v-model.number="workFlowFormEntity.needNum" <el-input-number v-model.number="workFlowFormEntity.needNum"
controls-position="right" disabled /> controls-position="right" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="已拣数量" prop="pickedNum"> <el-form-item label="已拣数量" prop="pickedNum">
<el-input-number v-model.number="workFlowFormEntity.pickedNum" <el-input-number v-model.number="workFlowFormEntity.pickedNum"
controls-position="right" :min="0" :max="workFlowFormEntity.needNum" controls-position="right" :min="0" :max="workFlowFormEntity.needNum"
clearable /> clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -135,19 +136,19 @@
<el-row :gutter="16"> <el-row :gutter="16">
<el-col :span="12" :offset="0"> <el-col :span="12" :offset="0">
<el-form-item label="创建时间" prop="createTime"> <el-form-item label="创建时间" prop="createTime">
<el-input v-model="workFlowFormEntity.createTime" disabled /> <el-input v-model="workFlowFormEntity.createTime" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="完成时间" prop="finishTime"> <el-form-item label="完成时间" prop="finishTime">
<el-input v-model="workFlowFormEntity.finishTime" disabled /> <el-input v-model="workFlowFormEntity.finishTime" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="16"> <el-row :gutter="16">
<el-col :span="12" :offset="0"> <el-col :span="12" :offset="0">
<el-form-item label="操作用户" prop="opUser"> <el-form-item label="操作用户" prop="opUser">
<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-row> </el-row>
@ -169,11 +170,11 @@
<div style="display: flex; margin-bottom: 10px;"> <div style="display: flex; margin-bottom: 10px;">
<div style="display: flex; width: 100%;"> <div style="display: flex; width: 100%;">
<div style="width: 30%; align-content: center;">时间：</div> <div style="width: 30%; align-content: center;">时间：</div>
<el-input v-model="uploadRecord.uploadTime" readonly /> <el-input v-model="uploadRecord.uploadTime" readonly/>
</div> </div>
<div style="display: flex; width: 100%; margin-left: 5px;"> <div style="display: flex; width: 100%; margin-left: 5px;">
<div style="width: 30%; align-content: center;">人员：</div> <div style="width: 30%; align-content: center;">人员：</div>
<el-input v-model="uploadRecord.uploadUser" readonly /> <el-input v-model="uploadRecord.uploadUser" readonly/>
</div> </div>
</div> </div>
<div style="display: flex; width: 100%;"> <div style="display: flex; width: 100%;">
@ -195,14 +196,14 @@
<script setup> <script setup>
import store from '@/store' import store from '@/store'
import { getWorkFlows, updateWorkFlows } from '@/api/kateWork.js' import {getWorkFlows, updateWorkFlows} from '@/api/kateWork.js'
import { errorBox } from '@/utils/myMessageBox.js' import {errorBox} from '@/utils/myMessageBox.js'
import { ElMessage } from 'element-plus' import {ElMessage} from 'element-plus'
import { ref, reactive } from 'vue' import {ref, reactive} from 'vue'
import { dateFormatter, timeFormatter } from '@/utils/formatter.js' import {dateFormatter, timeFormatter} from '@/utils/formatter.js'
import { Search } from '@element-plus/icons-vue' import {Search} from '@element-plus/icons-vue'
import UploadExcelWorkFlow from '@/excel/UploadExcelWorkFlow.vue' import UploadExcelWorkFlow from '@/excel/UploadExcelWorkFlow.vue'
import { queryUploadRecord } from '@/api/excel.js' import {queryUploadRecord} from '@/api/excel.js'
import zhCn from 'element-plus/dist/locale/zh-cn.mjs' import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
</script> </script>
<script> <script>
@ -218,6 +219,7 @@ export default {
workCenterQuery: '', workCenterQuery: '',
goodsIdQuery: '', goodsIdQuery: '',
standIdQuery: '', standIdQuery: '',
machineTypeQuery: -99,
lightStatusQuery: -99, lightStatusQuery: -99,
workStatusQuery: -99, workStatusQuery: -99,
loading: true, loading: true,
@ -304,6 +306,7 @@ export default {
goodsId: this.goodsIdQuery.trim(), goodsId: this.goodsIdQuery.trim(),
lightStatus: this.lightStatusQuery == -99 ? null : this.lightStatusQuery, lightStatus: this.lightStatusQuery == -99 ? null : this.lightStatusQuery,
workStatus: this.workStatusQuery == -99 ? null : this.workStatusQuery, workStatus: this.workStatusQuery == -99 ? null : this.workStatusQuery,
machineType: this.machineTypeQuery == -99 ? null : this.machineTypeQuery,
userName: store.getters.getUserName userName: store.getters.getUserName
} }
getWorkFlows(request).then(res => { getWorkFlows(request).then(res => {