bug修改,,,

fengcang
anthonyywj2 3 years ago
parent 0c34aa3761
commit 726822bef6

@ -430,15 +430,11 @@ export default {
this.submitFunction(status); this.submitFunction(status);
} else { } else {
for (let i = 0; i < this.codeArray.length; i++) { for (let i = 0; i < this.codeArray.length; i++) {
// if (this.$isBlank(this.codeArray[i].batchNo)) {
// if (!this.codeArray[i].allowNoBatch) {
// return this.$message.error('');
// }
// }
if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) { if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
return this.$message.error('生产日期与失效日期不能全部为空'); return this.$message.error('生产日期与失效日期不能全部为空');
} }
if (this.$isBlank(this.codeArray[i].reCount) || this.codeArray[i].reCount === '0') { if (this.$isBlank(this.codeArray[i].reCount) || this.codeArray[i].reCount < 1) {
return this.$message.error('配货数量不能小于0'); return this.$message.error('配货数量不能小于0');
} }
if (this.detailCountMax) { if (this.detailCountMax) {

@ -499,6 +499,7 @@ export default {
this.currentRow = {}; this.currentRow = {};
this.selectedIndex = ""; this.selectedIndex = "";
this.iCount = 0; this.iCount = 0;
this.$forceUpdate();
this.$refs["dataForm"].validate(valid => { this.$refs["dataForm"].validate(valid => {
if (valid) { if (valid) {
if (this.codeArray.length < 1) { if (this.codeArray.length < 1) {
@ -1164,8 +1165,8 @@ export default {
// this.formData.locStorageCode == null; // this.formData.locStorageCode == null;
// } else { // } else {
this.curAction = this.getActionItem(item); this.curAction = this.getActionItem(item);
if (this.curAction.storageCode != null)
this.formData.locStorageCode = this.curAction.storageCode; this.formData.locStorageCode = this.curAction.storageCode;
console.log(this.curAction.corpType + "---" + this.formData.locStorageCode + "-----" + this.curAction.action);
this.findMethod(); this.findMethod();
// } // }

@ -453,22 +453,22 @@
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="24" class="el-col"> <el-col :span="24" class="el-col">
<div style="margin-top: 18px;margin-bottom: 18px"> <div style="margin-top: 18px;margin-bottom: 18px">
<el-checkbox v-model="checked" <el-checkbox v-model="checked" disabled
>以使用单元数量入库 >以使用单元数量入库
</el-checkbox> </el-checkbox>
<el-checkbox v-model="editQuery.isDisable" <el-checkbox v-model="editQuery.isDisable" disabled
>是否禁用 >是否禁用
</el-checkbox> </el-checkbox>
<el-checkbox v-model="editQuery.isAdavence" <el-checkbox v-model="editQuery.isAdavence" disabled
>是否寄售 >是否寄售
</el-checkbox> </el-checkbox>
<el-checkbox v-model="editQuery.allowNoBatch" <el-checkbox v-model="editQuery.allowNoBatch" disabled
>允许无批次号 >允许无批次号
</el-checkbox> </el-checkbox>
<el-checkbox v-model="editQuery.allowNoExpire" <el-checkbox v-model="editQuery.allowNoExpire" disabled
>允许无失效日期 >允许无失效日期
</el-checkbox> </el-checkbox>
<el-checkbox v-model="editQuery.allowNoProduct" <el-checkbox v-model="editQuery.allowNoProduct" disabled
>允许无生产日期 >允许无生产日期
</el-checkbox> </el-checkbox>
</div> </div>

@ -199,7 +199,10 @@
<el-descriptions-item label="单据(单据类型)" label-style="width: 150px"> <el-descriptions-item label="单据(单据类型)" label-style="width: 150px">
<div style="float: right;margin-bottom: 10px;margin-right: 25px"> <div style="float: right;margin-bottom: 10px;margin-right: 25px">
<el-button type="primary" size="small" @click="addBusTypeDialog()"></el-button> <el-button type="primary" size="small"
:disabled="configQuery.downstreamEnable"
@click="addBusTypeDialog()">添加扫码单据类型
</el-button>
</div> </div>
<el-table <el-table
:data="checkedBusTypes" :data="checkedBusTypes"

Loading…
Cancel
Save