diff --git a/src/views/basic/busType/busTypeAdvancedSettings.vue b/src/views/basic/busType/busTypeAdvancedSettings.vue index e750302e..8bc4297a 100644 --- a/src/views/basic/busType/busTypeAdvancedSettings.vue +++ b/src/views/basic/busType/busTypeAdvancedSettings.vue @@ -35,7 +35,10 @@ <el-checkbox v-model="inputQuery.advanceType" style="width: 200px" border>寄售类型单据 </el-checkbox> - <el-checkbox v-model="inputQuery.preIn" style="width: 200px" border>预验收 + <el-checkbox v-model="inputQuery.preIn" + :disabled="inputQuery.corpType!='2'" + style="width: 200px" border>预验收 + </el-checkbox> <el-checkbox v-model="inputQuery.spUse" style="width: 200px;" border> diff --git a/src/views/inout/DialogSelectInvProduct.vue b/src/views/inout/DialogSelectInvProduct.vue index 5627582b..e6e4f0e8 100644 --- a/src/views/inout/DialogSelectInvProduct.vue +++ b/src/views/inout/DialogSelectInvProduct.vue @@ -186,21 +186,24 @@ export default { return; } var idster = []; - if(this.codeArray.length>0){ - for(var i=0;i<this.codeArray.length;i++){ - idster.push(this.codeArray[i].relIdFk); + if(this.codeArray != null || this.codeArray!=undefined ){ + if(this.codeArray.length>0){ + for(var i=0;i<this.codeArray.length;i++){ + idster.push(this.codeArray[i].relIdFk); + } } - } - if(idster.length>0){ - for(var i=0;i<idster.length;i++){ + if(idster.length>0){ + for(var i=0;i<idster.length;i++){ for(var j=0;j<selection.length;j++){ if(idster[i]==selection[j].relIdFk){ this.$message.error("该产品已录入!"); return } } + } } } + var ids = []; selection.forEach((obj, index) => { let data = { diff --git a/src/views/inout/PanelCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue index 3a7cfe04..420290f1 100644 --- a/src/views/inout/PanelCreateOrderBizDetail.vue +++ b/src/views/inout/PanelCreateOrderBizDetail.vue @@ -375,6 +375,10 @@ export default { }, saveChange(row) { + + if(row.batchNo ==''){ + row.batchNo =null; + } updateBizProduct(row) .then((response) => { this.loading = false;