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-12-25 14:05:14 +08:00
parent c33de5c502
commit b64ff96b7b
4 changed files with 745 additions and 703 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/layout/callEmptyVehicle.vue
View File

@ -104,7 +104,6 @@ export default {
standId: store.getters.getStandId, standId: store.getters.getStandId,
displayGoods: false,// 是否显示料号输入 displayGoods: false,// 是否显示料号输入
// displayVehicleType1Selection: false,// 是否显示料箱类型选择 // displayVehicleType1Selection: false,// 是否显示料箱类型选择
// timer: '',
labelPosition: 'top', labelPosition: 'top',
workFormRef: ref(), workFormRef: ref(),
workFormEntity: reactive({ workFormEntity: reactive({
@ -131,21 +130,9 @@ export default {
] ]
} }
}, },
mounted() {
// this.timer = setInterval(() => {
// // this.getAllTasks()
// }, 2000)
},
beforeUnmount() {
// clearInterval(this.timer)
},
methods: { methods: {
vehicleType2ChangeHandle() { vehicleType2ChangeHandle() {
if (this.workFormEntity.vehicleType2 == '间接物料') { this.displayGoods = this.workFormEntity.vehicleType2 === '间接物料';
this.displayGoods = true
} else {
this.displayGoods = false
}
}, },
resetForms() { resetForms() {
this.workFormEntity = reactive({ this.workFormEntity = reactive({
@ -156,7 +143,7 @@ export default {
}) })
}, },
confirmTask() { confirmTask() {
if (this.workFormEntity.vehicleType2 == '') { if (this.workFormEntity.vehicleType2 === '') {
errorBox('请选择物料种类') errorBox('请选择物料种类')
return return
} }
@ -173,7 +160,7 @@ export default {
} }
callEmptyVehicle(request).then(res => { callEmptyVehicle(request).then(res => {
const response = res.data const response = res.data
if (response.code == 0) { if (response.code === 0) {
ElMessage.success(response.message) ElMessage.success(response.message)
this.resetForms() this.resetForms()
} else { } else {

20
src/layout/goods.vue
View File

@ -5,6 +5,8 @@
<el-row> <el-row>
<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-select-v2 v-model="vehicleTypeQuery" style="width: 158px; margin-right: 10px;"
placeholder="物料类型" :options="vehicleTypeOptions" @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-button type="warning" style="width: 201px; background-color: red; color: #000;" @click="setIndirect()">一键设置间接物料相关信息</el-button> --> <!-- <el-button type="warning" style="width: 201px; background-color: red; color: #000;" @click="setIndirect()">一键设置间接物料相关信息</el-button> -->
@ -248,6 +250,7 @@ export default {
pageSize: 10, pageSize: 10,
total: 0, total: 0,
goodsIdQuery: '', goodsIdQuery: '',
vehicleTypeQuery: '',
loading: true, loading: true,
dialogVisible: false, dialogVisible: false,
uploadDialogVisible: false, uploadDialogVisible: false,
@ -255,7 +258,21 @@ export default {
goodsFormEntity: reactive({}), goodsFormEntity: reactive({}),
labelPosition: 'top', labelPosition: 'top',
goodsFormRef: ref(), goodsFormRef: ref(),
rules: reactive({}) rules: reactive({}),
vehicleTypeOptions: [
{
value: "",
label: '全部'
},
{
value: "直接物料",
label: '直接物料'
},
{
value: "间接物料",
label: '间接物料'
}
],
} }
}, },
mounted() { mounted() {
@ -282,6 +299,7 @@ export default {
pageNo: this.currentPage, pageNo: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
goodsId: this.goodsIdQuery.trim(), goodsId: this.goodsIdQuery.trim(),
goodsType: this.vehicleTypeQuery.trim(),
userName: store.getters.getUserName userName: store.getters.getUserName
} }
getGoodsInfoByPage(request).then(res => { getGoodsInfoByPage(request).then(res => {

114
src/layout/kateOrdersTable.vue
View File

@ -4,20 +4,23 @@
<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: 256px; margin-right: 10px;" placeholder="工单" <el-input v-model="workOrderQuery" style="width: 256px; margin-right: 10px;" placeholder="工单"
:suffix-icon="Search" /> :suffix-icon="Search"/>
<el-input v-model="goodsIdQuery" style="width: 256px; margin-right: 10px;" placeholder="料号" <el-input v-model="goodsIdQuery" style="width: 256px; margin-right: 10px;" placeholder="料号"
:suffix-icon="Search" /> :suffix-icon="Search"/>
<el-input v-model="smallBoxQuery" style="width: 256px; margin-right: 10px;" placeholder="小工位" <el-input v-model="smallBoxQuery" style="width: 256px; margin-right: 10px;" placeholder="小工位"
:suffix-icon="Search" /> :suffix-icon="Search"/>
<el-date-picker v-model="planStartDateQuery" type="date" placeholder="计划开工日期" :shortcuts="shortcuts"
style="width: 158px; margin-right: 10px;" clearable />
<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="ordersList" stripe border v-loading="loading" class="table-class" highlight-current-row <el-table :data="ordersList" 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' }">
@ -26,24 +29,30 @@
<el-radio :label="scope.row.orderId" v-model="orderId">&nbsp;</el-radio> <el-radio :label="scope.row.orderId" v-model="orderId">&nbsp;</el-radio>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="orderId" label="id" fixed="left" min-width="120px" show-overflow-tooltip /> <el-table-column prop="orderId" label="id" fixed="left" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="workOrder" label="工单" fixed="left" min-width="120px" show-overflow-tooltip /> <el-table-column prop="workOrder" label="工单" fixed="left" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="goodsId" label="料号" min-width="120px" /> <el-table-column prop="goodsId" label="料号" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="supplyArea" label="小工位" fixed="left" min-width="120px" /> <el-table-column prop="supplyArea" label="小工位" fixed="left" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="item" label="Item" min-width="120px" /> <el-table-column prop="item" label="Item" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="description" label="描述" min-width="120px" show-overflow-tooltip /> <el-table-column prop="description" label="描述" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="sLoc" label="SLoc" min-width="120px" /> <el-table-column prop="sLoc" label="SLoc" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="type" label="Type" min-width="120px" /> <el-table-column prop="type" label="Type" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="originStatus" label="Status" min-width="120px" /> <el-table-column prop="originStatus" label="Status" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="sortString" label="SortStrng" min-width="120px" /> <el-table-column prop="sortString" label="SortStrng" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="requirementQuantity" label="需求数量" sortable min-width="120px" /> <el-table-column prop="requirementQuantity" label="需求数量" sortable min-width="120px" show-overflow-tooltip/>
<el-table-column prop="goodsUnit" label="单位" min-width="120px" /> <el-table-column prop="goodsUnit" label="单位" min-width="120px" show-overflow-tooltip/>
<el-table-column v-if="isAddReqmtDate" prop="planStartDate" label="开工时间" min-width="120px" /> <el-table-column prop="planStartDate" label="开工时间" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="orderStatus" label="状态" min-width="120px" /> <el-table-column prop="orderStatus" label="状态" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="lackQuantity" label="缺少数量" min-width="120px" /> <el-table-column prop="lackQuantity" label="缺少数量" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="pickedQuantity" label="已拣数量" min-width="120px" /> <el-table-column prop="pickedQuantity" label="已拣数量" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="finishTime" label="计划完成时间" :formatter="timeFormat" 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="lastUpdateTime" label="最新更新时间" :formatter="timeFormat" min-width="120px"
show-overflow-tooltip/>
<el-table-column prop="finishTime" label="完成时间" :formatter="timeFormat" min-width="120px"
show-overflow-tooltip/>
<el-table-column prop="userName" label="操作人员" min-width="120px" show-overflow-tooltip/>
<el-table-column prop="lastUpdateReason" label="来源" min-width="120px" show-overflow-tooltip/>
<el-table-column fixed="right" label="操作" width="240px"> <el-table-column fixed="right" label="操作" width="240px">
<template v-slot="scope"> <template v-slot="scope">
<el-button plain type="primary" @click="editCurrentRowOrders(scope.row)">编辑</el-button> <el-button plain type="primary" @click="editCurrentRowOrders(scope.row)">编辑</el-button>
@ -51,11 +60,11 @@
</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;">
@ -64,24 +73,24 @@
<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="orderId"> <el-form-item label="id" prop="orderId">
<el-input v-model="ordersFormEntity.orderId" disabled /> <el-input v-model="ordersFormEntity.orderId" 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="ordersFormEntity.workOrder" disabled /> <el-input v-model="ordersFormEntity.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="supplyArea"> <el-form-item label="小工位" prop="supplyArea">
<el-input v-model="ordersFormEntity.supplyArea" disabled /> <el-input v-model="ordersFormEntity.supplyArea" 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="ordersFormEntity.goodsId" disabled /> <el-input v-model="ordersFormEntity.goodsId" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -89,13 +98,13 @@
<el-col :span="12" :offset="0"> <el-col :span="12" :offset="0">
<el-form-item label="需求数量" prop="requirementQuantity"> <el-form-item label="需求数量" prop="requirementQuantity">
<el-input-number v-model.number="ordersFormEntity.requirementQuantity" <el-input-number v-model.number="ordersFormEntity.requirementQuantity"
controls-position="right" :min="0" clearable /> controls-position="right" :min="0" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="状态" prop="orderStatus"> <el-form-item label="状态" prop="orderStatus">
<el-input-number v-model.number="ordersFormEntity.orderStatus" <el-input-number v-model.number="ordersFormEntity.orderStatus"
controls-position="right" :min="0" :max="4" clearable /> controls-position="right" :min="0" :max="4" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -103,17 +112,19 @@
<el-col :span="12" :offset="0"> <el-col :span="12" :offset="0">
<el-form-item label="缺少数量" prop="lackQuantity"> <el-form-item label="缺少数量" prop="lackQuantity">
<el-input-number v-model.number="ordersFormEntity.lackQuantity" <el-input-number v-model.number="ordersFormEntity.lackQuantity"
controls-position="right" :min="0" :max="ordersFormEntity.requirementQuantity" clearable /> controls-position="right" :min="0" :max="ordersFormEntity.requirementQuantity"
clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="已拣数量" prop="pickedQuantity"> <el-form-item label="已拣数量" prop="pickedQuantity">
<el-input-number v-model.number="ordersFormEntity.pickedQuantity" <el-input-number v-model.number="ordersFormEntity.pickedQuantity"
controls-position="right" :min="0" :max="ordersFormEntity.requirementQuantity" clearable /> controls-position="right" :min="0" :max="ordersFormEntity.requirementQuantity"
clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="isAddReqmtDate" :gutter="16"> <el-row :gutter="16">
<el-col :span="12" :offset="0"> <el-col :span="12" :offset="0">
<el-form-item label="计划开工时间" prop="planStartDate"> <el-form-item label="计划开工时间" prop="planStartDate">
<el-date-picker <el-date-picker
@ -144,11 +155,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%;">
@ -170,15 +181,15 @@
<script setup> <script setup>
import store from '@/store' import store from '@/store'
import { getOrders, deleteOrders, updateOrders } from '@/api/kateWork.js' import {getOrders, deleteOrders, updateOrders} from '@/api/kateWork.js'
import zhCn from 'element-plus/dist/locale/zh-cn.mjs' import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
import { ElMessageBox, ElMessage } from 'element-plus' import {ElMessageBox, ElMessage} from 'element-plus'
import { errorBox } from '@/utils/myMessageBox.js' import {errorBox} from '@/utils/myMessageBox.js'
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 UploadExcelOrders from '@/excel/UploadExcelOrders.vue' import UploadExcelOrders from '@/excel/UploadExcelOrders.vue'
import { queryUploadRecord } from '@/api/excel.js' import {queryUploadRecord} from '@/api/excel.js'
import { Search } from '@element-plus/icons-vue' import {Search} from '@element-plus/icons-vue'
</script> </script>
<script> <script>
export default { export default {
@ -205,7 +216,21 @@ export default {
labelPosition: 'top', labelPosition: 'top',
ordersFormRef: ref(), ordersFormRef: ref(),
rules: reactive({}), rules: reactive({}),
isAddReqmtDate: false shortcuts: [
{
text: '今天',
value: new Date(),
},
{
text: '昨天',
value: () => {
const date = new Date()
date.setTime(date.getTime() - 3600 * 1000 * 24)
return date
},
},
],
planStartDateQuery: null
} }
}, },
mounted() { mounted() {
@ -220,6 +245,7 @@ export default {
workOrder: this.workOrderQuery.trim(), workOrder: this.workOrderQuery.trim(),
goodsId: this.goodsIdQuery.trim(), goodsId: this.goodsIdQuery.trim(),
supplyArea: this.smallBoxQuery.trim(), supplyArea: this.smallBoxQuery.trim(),
planStartDate: dateFormatter(this.planStartDateQuery),
userName: store.getters.getUserName userName: store.getters.getUserName
} }
getOrders(request).then(res => { getOrders(request).then(res => {

69
src/layout/vehicle.vue
View File

@ -4,9 +4,11 @@
<div style="display: flex;justify-content: space-between;"> <div style="display: flex;justify-content: space-between;">
<el-row> <el-row>
<el-input v-model="queryKey" style="width: 158px; margin-right: 10px;" placeholder="箱号" <el-input v-model="queryKey" 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="料号"
:suffix-icon="Search"/>
<el-input v-model="locationQuery" style="width: 158px; margin-right: 10px;" placeholder="位置" <el-input v-model="locationQuery" style="width: 158px; margin-right: 10px;" placeholder="位置"
:suffix-icon="Search" /> :suffix-icon="Search"/>
<el-select-v2 v-model="isEmptyQuery" style="width: 158px; margin-right: 10px;" placeholder="是否空箱" <el-select-v2 v-model="isEmptyQuery" style="width: 158px; margin-right: 10px;" placeholder="是否空箱"
:options="isEmptyOptions" @change="search()"></el-select-v2> :options="isEmptyOptions" @change="search()"></el-select-v2>
<el-select-v2 v-model="vehicleTypeQuery" style="width: 158px; margin-right: 10px;" <el-select-v2 v-model="vehicleTypeQuery" style="width: 158px; margin-right: 10px;"
@ -18,7 +20,7 @@
<el-button style="background-color: #32CD32; color: #000;" @click="exportExcel()">导出</el-button> <el-button style="background-color: #32CD32; color: #000;" @click="exportExcel()">导出</el-button>
</el-row> </el-row>
</div> </div>
<br /> <br/>
<el-table :data="vehicles" stripe border v-loading="loading" class="table-class" max-height="550px" <el-table :data="vehicles" stripe border v-loading="loading" class="table-class" max-height="550px"
highlight-current-row @row-click="getCurrentRow" :header-cell-style="{ 'text-align': 'center' }" highlight-current-row @row-click="getCurrentRow" :header-cell-style="{ 'text-align': 'center' }"
:cell-style="{ 'text-align': 'center' }" @sort-change="handleSortChange"> :cell-style="{ 'text-align': 'center' }" @sort-change="handleSortChange">
@ -27,40 +29,40 @@
<el-radio :label="scope.row.vehicleId" v-model="vehicleId">&nbsp;</el-radio> <el-radio :label="scope.row.vehicleId" v-model="vehicleId">&nbsp;</el-radio>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="vehicleId" label="托盘号" fixed="left" min-width="120px" /> <el-table-column prop="vehicleId" label="托盘号" fixed="left" min-width="120px"/>
<el-table-column prop="currentLocation" label="库位" fixed="left" :formatter="locationFormat" <el-table-column prop="currentLocation" label="库位" fixed="left" :formatter="locationFormat"
min-width="120px" show-overflow-tooltip /> min-width="120px" show-overflow-tooltip/>
<el-table-column prop="vehicleStatus" label="状态" :formatter="vehicleStatusFormat" min-width="120px" /> <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 prop="isEmpty" label="空托" :formatter="isEmptyFormat" min-width="120px"/>
<el-table-column prop="lastInTime" label="最近入库时间" sortable="custom" :formatter="timeFormat" <el-table-column prop="lastInTime" label="最近入库时间" sortable="custom" :formatter="timeFormat"
min-width="120px" /> min-width="120px"/>
<el-table-column prop="vehicleType" label="物料类型" fixed="left" :formatter="vehicleTypeFormat" <el-table-column prop="vehicleType" label="物料类型" fixed="left" :formatter="vehicleTypeFormat"
min-width="120px" show-overflow-tooltip /> min-width="120px" show-overflow-tooltip/>
<el-table-column prop="details" label="绑定关系" :formatter="jsonFormat" min-width="180px" <el-table-column prop="goodsInfo" label="绑定关系" :formatter="jsonFormat" min-width="180px"
show-overflow-tooltip /> show-overflow-tooltip/>
<el-table-column fixed="right" label="操作" width="120px" v-if="selVehicle == null"> <el-table-column fixed="right" label="操作" width="120px" v-if="selVehicle == null">
<template v-slot="scope"> <template v-slot="scope">
<el-button plain type="primary" @click="editCurrentRowVehicle(scope.row)">编辑</el-button> <el-button plain type="primary" @click="editCurrentRowVehicle(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">
<el-form ref="vehicleFormRef" :model="vehicleFormEntity" :label-position="labelPosition" <el-form ref="vehicleFormRef" :model="vehicleFormEntity" :label-position="labelPosition"
label-width="100px" style="max-width: 100%" :rules="rules" status-icon> label-width="100px" style="max-width: 100%" :rules="rules" status-icon>
<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="vehicleId"> <el-form-item label="箱号" prop="vehicleId">
<el-input v-model="vehicleFormEntity.vehicleId" disabled /> <el-input v-model="vehicleFormEntity.vehicleId" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="库位" prop="locationId"> <el-form-item label="库位" prop="locationId">
<el-input v-model="vehicleFormEntity.currentLocation" placeholder="请输入库位号" /> <el-input v-model="vehicleFormEntity.currentLocation" placeholder="请输入库位号"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -86,8 +88,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="绑定关系" prop="details"> <el-form-item label="绑定关系" prop="goodsInfo">
<el-input type="textarea" :rows="2" v-model="vehicleFormEntity.details" placeholder="" <el-input type="textarea" :rows="2" v-model="vehicleFormEntity.goodsInfo" placeholder=""
:maxlength="-1" :show-word-limit="false" :autosize="{ minRows: 2, maxRows: 4 }"> :maxlength="-1" :show-word-limit="false" :autosize="{ minRows: 2, maxRows: 4 }">
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -108,16 +110,22 @@
</template> </template>
<script setup> <script setup>
import { getAllVehicles, updateVehicleInfo } from '@/api/vehicle' import {getAllVehicles, updateVehicleInfo} from '@/api/vehicle'
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 { Search } from '@element-plus/icons-vue' import {Search} from '@element-plus/icons-vue'
import { ref, reactive } from 'vue' import {ref, reactive} from 'vue'
import { vehicleStatusFormatter, locationFormatter, dateFormatter, timeFormatter, jsonFormatter } from '@/utils/formatter.js' import {
import { toUnderScoreCase } from '@/utils/stringUtils.js' vehicleStatusFormatter,
locationFormatter,
dateFormatter,
timeFormatter,
jsonFormatter
} from '@/utils/formatter.js'
import {toUnderScoreCase} from '@/utils/stringUtils.js'
// import uploadVehicles from '@/excel/uploadVehicles.vue' // import uploadVehicles from '@/excel/uploadVehicles.vue'
import { downloadVehicleExcel } from '@/api/excel.js' import {downloadVehicleExcel} from '@/api/excel.js'
import store from '@/store' import store from '@/store'
</script> </script>
<script> <script>
@ -135,6 +143,7 @@ export default {
isAsc: true, isAsc: true,
queryKey: '', queryKey: '',
locationQuery: '', locationQuery: '',
goodsIdQuery: '',
isEmptyQuery: -99, isEmptyQuery: -99,
vehicleTypeQuery: '', vehicleTypeQuery: '',
loading: true, loading: true,
@ -145,10 +154,10 @@ export default {
vehicleFormRef: ref(), vehicleFormRef: ref(),
rules: reactive({ rules: reactive({
vehicleId: [ vehicleId: [
{ required: true, message: '请输入箱号' } {required: true, message: '请输入箱号'}
], ],
currentLocation: [ currentLocation: [
{ required: true, message: '请输入库位' } {required: true, message: '请输入库位'}
] ]
}), }),
// 是否空箱 // 是否空箱
@ -215,6 +224,7 @@ export default {
vehicleId: this.queryKey.trim(), vehicleId: this.queryKey.trim(),
currentLocation: this.locationQuery.trim(), currentLocation: this.locationQuery.trim(),
vehicleType: this.vehicleTypeQuery.trim(), vehicleType: this.vehicleTypeQuery.trim(),
goodsId: this.goodsIdQuery.trim(),
isEmpty: this.isEmptyQuery == -99 ? null : this.isEmptyQuery, isEmpty: this.isEmptyQuery == -99 ? null : this.isEmptyQuery,
userName: store.getters.getUserName userName: store.getters.getUserName
} }
@ -262,6 +272,7 @@ export default {
} }
}, },
jsonFormat: (row, column, cellValue, index) => { jsonFormat: (row, column, cellValue, index) => {
console.log(cellValue)
return jsonFormatter(cellValue) return jsonFormatter(cellValue)
}, },
reset() { reset() {
@ -276,7 +287,7 @@ export default {
isEmpty: row.isEmpty, isEmpty: row.isEmpty,
vehicleStatus: row.vehicleStatus, vehicleStatus: row.vehicleStatus,
vehicleType: row.vehicleType == "间接物料" ? "间接物料" : "直接物料", vehicleType: row.vehicleType == "间接物料" ? "间接物料" : "直接物料",
details: jsonFormatter(row.details), goodsInfo: jsonFormatter(row.goodsInfo),
lastInTime: row.lastInTime lastInTime: row.lastInTime
} }
this.dialogVisible = true this.dialogVisible = true
@ -288,7 +299,7 @@ export default {
isEmpty: formData.isEmpty, isEmpty: formData.isEmpty,
vehicleStatus: formData.vehicleStatus, vehicleStatus: formData.vehicleStatus,
vehicleType: formData.vehicleType, vehicleType: formData.vehicleType,
details: formData.details, goodsInfo: formData.goodsInfo,
lastInTime: formData.lastInTime, lastInTime: formData.lastInTime,
userName: store.getters.getUserName userName: store.getters.getUserName
} }