Compare commits

..

No commits in common. "2543902e167ca11545a4566d7efbbf3af81ebed7" and "02d57055567a32f42e941352779bba56ac96e678" have entirely different histories.

2 changed files with 10 additions and 9 deletions

View File

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

View File

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