kelvin/wms-dj-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Compare commits

base: kelvin:02d57055567a32f42e941352779bba56ac96e678
Branches Tags
kelvin:master
kelvin:1.2.0_241127_beta
...
compare: kelvin:2543902e167ca11545a4566d7efbbf3af81ebed7
Branches Tags
kelvin:master
kelvin:1.2.0_241127_beta

2 Commits
02d5705556 ... 2543902e16

Author SHA1 Message Date
Kelvin
2543902e16 Merge remote-tracking branch 'gitea/master' 2024-12-11 16:49:25 +08:00
Kelvin
e28bfd93e5 refactor(入库计划): 优化 2024-12-10 10:53:02 +08:00
2 changed files with 9 additions and 10 deletions
Show Stats Expand all files Collapse all files

17
src/views/mes/wm/inPlan/wmsInPlanKnifeBackFormCmps.vue
View File

@ -29,7 +29,6 @@ export default {
wmsInPlanDetailEntityList: [], wmsInPlanDetailEntityList: [],
// 表单校验 // 表单校验
rules: { rules: {
planCode: [{required: true}],
relBillCode: [{required: true}], relBillCode: [{required: true}],
}, },
localVisible: this.visible, localVisible: this.visible,
@ -71,11 +70,11 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
async submitForm() { async submitForm() {
const validateRfidResult = await this.validateRfid(); // const validateRfidResult = await this.validateRfid();
if (Array.isArray(validateRfidResult) && validateRfidResult.length > 0) { // if (Array.isArray(validateRfidResult) && validateRfidResult.length > 0) {
this.$modal.msgError(`RFID重复：${validateRfidResult}`); // this.$modal.msgError(`RFID重复：${validateRfidResult}`);
return; // return;
} // }
await this.$refs["form"].validate(valid => { await this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
this.localDataForm.wmsInPlanDetailsList = [] this.localDataForm.wmsInPlanDetailsList = []
@ -200,9 +199,9 @@ export default {
<!--状态为1已执行 则禁用--> <!--状态为1已执行 则禁用-->
<el-form ref="form" :model="localDataForm" :rules="rules" label-width="80px" inline <el-form ref="form" :model="localDataForm" :rules="rules" label-width="80px" inline
:disabled="localDataForm.state === '1'"> :disabled="localDataForm.state === '1'">
<el-form-item label="计划编码" prop="planCode"> <!-- <el-form-item label="计划编码" prop="planCode">-->
<el-input v-model="localDataForm.planCode" placeholder="请输入计划编码"></el-input> <!-- <el-input v-model="localDataForm.planCode" placeholder="请输入计划编码"></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="localDataForm.remark" placeholder="请输入备注"></el-input> <el-input v-model="localDataForm.remark" placeholder="请输入备注"></el-input>
</el-form-item> </el-form-item>

2
src/views/mes/wm/wmsInTask/index.vue
View File

@ -60,7 +60,7 @@
>推入库位 >推入库位
</el-button> </el-button>
</template> </template>
<template v-if="scope.row.planInStatus !== '1'"> <template v-else-if="scope.row.planInStatus !== '1'">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"