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

代码更新：

Browse Source 
1. 修改打印标签-->居中
2. 整理盒子前端修改
3. 非计划领料修改
4. 料箱修改
This commit is contained in:
梁州 2024-09-23 19:07:34 +08:00
parent b93fb2309f
commit 9eeb6d731a
7 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/layout/clcNoPlan.vue
View File

@ -157,7 +157,7 @@
<div style="display: flex; margin-top: 20px;"> <div style="display: flex; margin-top: 20px;">
<div class="display-form-div-left"> <div class="display-form-div-left">
<el-input-number v-model.number="confirmFormEntity.realPickNum" <el-input-number v-model.number="confirmFormEntity.realPickNum"
ref="confirmRealPickNum" controls-position="right" :min="0" /> ref="confirmRealPickNum" v-on:keyup.enter="getCurrentGoodsPickNumMethod()" controls-position="right" :min="0" />
</div> </div>
<div class="display-form-div-right"> <div class="display-form-div-right">
<span class="display-form-text-right">PC</span> <span class="display-form-text-right">PC</span>
@ -196,6 +196,7 @@
<script setup> <script setup>
import store from '@/store' import store from '@/store'
import { clcNoPlan, clcNoPlanConfirmBack } from '@/api/task' import { clcNoPlan, clcNoPlanConfirmBack } from '@/api/task'
import { replaceEnglishAndNumberIGAI } from '@/utils/formatter'
import { errorBox } from '@/utils/myMessageBox.js' import { errorBox } from '@/utils/myMessageBox.js'
import { getStockNumByGoodsId } from '@/api/stock' import { getStockNumByGoodsId } from '@/api/stock'
import { reactive, ref } from 'vue' import { reactive, ref } from 'vue'
@ -259,14 +260,18 @@ export default {
}) })
}, },
getCurrentGoodsPickNumMethod() { getCurrentGoodsPickNumMethod() {
this.confirmFormEntity.vehicleId = replaceEnglishAndNumberIGAI(this.confirmFormEntity.vehicleId)
if (this.confirmFormEntity.vehicleId == '' || this.confirmFormEntity.vehicleId == null|undefined) { if (this.confirmFormEntity.vehicleId == '' || this.confirmFormEntity.vehicleId == null|undefined) {
this.$refs.confirmVehicleId.focus() this.$refs.confirmVehicleId.focus()
return
} }
if (this.confirmFormEntity.goodsId == '' || this.confirmFormEntity.goodsId == null|undefined) { if (this.confirmFormEntity.goodsId == '' || this.confirmFormEntity.goodsId == null|undefined) {
this.$refs.confirmGoodsId.focus() this.$refs.confirmGoodsId.focus()
return
} }
if (this.confirmFormEntity.realPickNum == null | undefined) { if (this.confirmFormEntity.realPickNum == null | undefined) {
this.$refs.confirmRealPickNum.focus() this.$refs.confirmRealPickNum.focus()
return
} }
}, },
// 重置参数 // 重置参数

3
src/layout/finishKitting.vue
View File

@ -111,6 +111,7 @@
</el-form> </el-form>
</fieldset> </fieldset>
<div style="width: 0;height: 0;overflow: hidden"> <div style="width: 0;height: 0;overflow: hidden">
<!-- <div> -->
<div id="printArea" class="objectDialogFlowPrint"> <div id="printArea" class="objectDialogFlowPrint">
<!-- <div class="myPrint"> --> <!-- <div class="myPrint"> -->
<div class="pageWarp" v-for="item in printTabs"> <div class="pageWarp" v-for="item in printTabs">
@ -447,11 +448,13 @@ export default {
margin: 5px; margin: 5px;
width: 50%; width: 50%;
border-right: #156082 dashed 1px; border-right: #156082 dashed 1px;
align-content: center;
} }
.print-tab-right { .print-tab-right {
margin: 5px; margin: 5px;
width: 50%; width: 50%;
align-content: center;
} }
.print-disp { .print-disp {

26
src/layout/goods.vue
View File

@ -37,6 +37,8 @@
<el-table-column prop="goodsInVehicleType" label="料箱类型2" min-width="120px" /> <el-table-column prop="goodsInVehicleType" label="料箱类型2" min-width="120px" />
<el-table-column prop="feedingType" label="补料方式" min-width="120px" /> <el-table-column prop="feedingType" label="补料方式" min-width="120px" />
<el-table-column prop="feedingValue" label="补货点" min-width="120px" /> <el-table-column prop="feedingValue" label="补货点" min-width="120px" />
<el-table-column prop="heat" label="热度" min-width="120px" />
<el-table-column prop="releasePoint" label="卸货点" min-width="120px" />
<el-table-column prop="dataSource" label="数据来源" min-width="120px" /> <el-table-column prop="dataSource" label="数据来源" min-width="120px" />
<el-table-column prop="lastUpdateTime" label="最近更新时间" :formatter="timeFormat" min-width="120px" /> <el-table-column prop="lastUpdateTime" label="最近更新时间" :formatter="timeFormat" min-width="120px" />
<el-table-column prop="lastUpdateUser" label="最近更新用户" min-width="120px" /> <el-table-column prop="lastUpdateUser" label="最近更新用户" min-width="120px" />
@ -121,13 +123,13 @@
</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="vehicleTypeDescription"> <el-form-item label="热度" prop="heat">
<el-input v-model="goodsFormEntity.vehicleTypeDescription" clearable /> <el-input v-model="goodsFormEntity.heat" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="料箱类型2" prop="goodsInVehicleType"> <el-form-item label="卸货点" prop="releasePoint">
<el-input v-model="goodsFormEntity.goodsInVehicleType" clearable /> <el-input v-model="goodsFormEntity.releasePoint" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -144,6 +146,18 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="16">
<el-col :span="12" :offset="0">
<el-form-item label="料箱类型描述" prop="vehicleTypeDescription">
<el-input v-model="goodsFormEntity.vehicleTypeDescription" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="料箱类型2" prop="goodsInVehicleType">
<el-input v-model="goodsFormEntity.goodsInVehicleType" clearable />
</el-form-item>
</el-col>
</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="dataSource"> <el-form-item label="数据来源" prop="dataSource">
@ -259,6 +273,8 @@ export default {
feedingType: row.feedingType, feedingType: row.feedingType,
feedingValue: row.feedingValue, feedingValue: row.feedingValue,
dataSource: row.dataSource, dataSource: row.dataSource,
heat: row.heat,
releasePoint: row.releasePoint,
} }
this.dialogVisible = true this.dialogVisible = true
}, },
@ -308,6 +324,8 @@ export default {
goodsInVehicleType: formData.goodsInVehicleType, goodsInVehicleType: formData.goodsInVehicleType,
feedingType: formData.feedingType, feedingType: formData.feedingType,
feedingValue: formData.feedingValue, feedingValue: formData.feedingValue,
heat: formData.heat,
releasePoint: formData.releasePoint,
dataSource: formData.dataSource, dataSource: formData.dataSource,
userName: store.getters.getUserName userName: store.getters.getUserName
} }

4
src/layout/sortBoxs.vue
View File

@ -42,7 +42,7 @@
<div style="display: flex; margin-top: 20px;"> <div style="display: flex; margin-top: 20px;">
<div class="display-form-div-left"> <div class="display-form-div-left">
<el-input-number v-model.number="workFormEntity.orderOfOrders" <el-input-number v-model.number="workFormEntity.orderOfOrders"
controls-position="right" :min="1" :max="10" disabled /> controls-position="right" :min="1" disabled />
</div> </div>
</div> </div>
</div> </div>
@ -121,8 +121,8 @@ export default {
requestSortBox(request).then(res => { requestSortBox(request).then(res => {
const response = res.data const response = res.data
if (response.code == 0) { if (response.code == 0) {
this.workFormEntity.orderOfOrders = response.returnData.orderOfOrders
ElMessage.success('请根据灯光拣选盒子。') ElMessage.success('请根据灯光拣选盒子。')
this.resetForms()
} else { } else {
errorBox(response.message) errorBox(response.message)
} }

12
src/layout/vehicle.vue
View File

@ -62,7 +62,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="状态" prop="vehicleStatus"> <el-form-item label="状态" prop="vehicleStatus">
<el-select-v2 v-model="vehicleFormEntity.vehicleStatus" placeholder="请选择托盘状态" <el-select-v2 v-model="vehicleFormEntity.vehicleStatus" placeholder="请选择料箱状态"
:options="vehicleStatusOptions"></el-select-v2> :options="vehicleStatusOptions"></el-select-v2>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -127,22 +127,22 @@ export default {
}, },
{ {
value: 1, value: 1,
label: '空托' label: '空箱'
} }
], ],
// 托盘状态 // 托盘状态
vehicleStatusOptions: [ vehicleStatusOptions: [
{ {
value: 1, value: 1,
label: '在库中' label: '入库中'
}, },
{ {
value: 2, value: 2,
label: '在站台' label: '在库中'
}, },
{ {
value: 3, value: 3,
label: '移动中' label: '出库中'
} }
] ]
} }
@ -210,7 +210,7 @@ export default {
currentLocation: formData.currentLocation, currentLocation: formData.currentLocation,
isEmpty: formData.isEmpty, isEmpty: formData.isEmpty,
vehicleStatus: formData.vehicleStatus, vehicleStatus: formData.vehicleStatus,
lastInTime: row.lastInTime, lastInTime: formData.lastInTime,
userName: store.getters.getUserName userName: store.getters.getUserName
} }
updateVehicleInfo(request).then(res => { updateVehicleInfo(request).then(res => {

6
src/utils/formatter.js
View File

@ -27,7 +27,7 @@ function taskStatusFormatter(value) {
case -2: case -2:
return '重复入库' return '重复入库'
case -1: case -1:
return '暂存任务' return '暂存任务'
case 0: case 0:
return '任务新建，待下发' return '任务新建，待下发'
case 1: case 1:
@ -95,6 +95,8 @@ function vehicleStatusFormatter(value) {
return '在库中' return '在库中'
case 3: case 3:
return '出库中' return '出库中'
case 4:
return '移库中'
default: default:
return '异常状态' return '异常状态'
} }
@ -167,7 +169,7 @@ function jsonFormatter(value) {
return JSON.stringify(JSON.parse(value), null, 4) return JSON.stringify(JSON.parse(value), null, 4)
} catch (e) { } catch (e) {
return "error" return "error"
} }
} else { } else {
return JSON.stringify(value, null, 4) return JSON.stringify(value, null, 4)
} }

2
src/views/login.vue
View File

@ -57,7 +57,7 @@ const oauthConstants = {
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'
} }