diff --git a/src/views/baseInfo/warehouses/warehouse/index.vue b/src/views/baseInfo/warehouses/warehouse/index.vue index fa61c8b..aa35e92 100644 --- a/src/views/baseInfo/warehouses/warehouse/index.vue +++ b/src/views/baseInfo/warehouses/warehouse/index.vue @@ -48,8 +48,8 @@ diff --git a/src/views/inStorage/deliveryNotice/receiptAdd.vue b/src/views/inStorage/deliveryNotice/receiptAdd.vue index 58799ba..1aa2d17 100644 --- a/src/views/inStorage/deliveryNotice/receiptAdd.vue +++ b/src/views/inStorage/deliveryNotice/receiptAdd.vue @@ -284,7 +284,7 @@ this.formobj.createOrgSid = res.data this.formobj.useOrgSid = res.data - this.getsupplierLust() + this.getsupplierLust() } }) @@ -319,7 +319,7 @@ choiceSupplierInfo({ - createOrgSid: this.formobj.createOrgSid + createOrgSid: this.formobj.createOrgSid }).then((resp) => { if (resp.success) { this.supplierNameList = resp.data @@ -493,6 +493,7 @@ orderCount: row.orderCount, batchNumber: '', manufactureDate: '', + expirationDate: '', batchCount: 0, } @@ -549,19 +550,6 @@ // return // } - for (var i = 0; i < this.formobj.list.length; i++) { - - if (Number(this.formobj.list[i].actualInCount) == 0) { - this.$message({ - showClose: true, - type: 'error', - message: '商品实收数量不能为空' - }) - - return - } - - } this.$refs['form_obj'].validate((valid) => { @@ -598,20 +586,44 @@ // return // } - for (var i = 0; i < this.formobj.list.length; i++) { + for (var i = 0; i < this.formobj.list.length; i++) { - if (Number(this.formobj.list[i].actualInCount) == 0) { - this.$message({ - showClose: true, - type: 'error', - message: '商品实收数量不能为空' - }) + if (Number(this.formobj.list[i].actualInCount) == 0) { + this.$message({ + showClose: true, + type: 'error', + message: '商品实收数量不能为空' + }) - return - } + return + } + } + + for (var i = 0; i < this.formobj.pcList.length; i++) { + + if (this.formobj.pcList[i].expirationDate == '') { + this.$message({ + showClose: true, + type: 'error', + message: '生产日期不能为空' + }) + + return } + if (Number(this.formobj.pcList[i].batchCount) == 0) { + this.$message({ + showClose: true, + type: 'error', + message: '批次数量不能为0' + }) + + return + } + + } + this.$refs['form_obj'].validate((valid) => { if (valid) { diff --git a/src/views/inStorage/deliveryNotice/receiptInfo.vue b/src/views/inStorage/deliveryNotice/receiptInfo.vue index d0647c4..63c49cf 100644 --- a/src/views/inStorage/deliveryNotice/receiptInfo.vue +++ b/src/views/inStorage/deliveryNotice/receiptInfo.vue @@ -81,7 +81,7 @@ - + @@ -161,6 +161,10 @@ width: calc(100% - 115px); } + .first_row { + border-top: 1px solid #E0E3EB; + } + .titleOne { padding: 7px; display: flex; diff --git a/src/views/inStorage/receivingGoods/receivingGoodsAdd.vue b/src/views/inStorage/receivingGoods/receivingGoodsAdd.vue index b8f2518..cc0bc87 100644 --- a/src/views/inStorage/receivingGoods/receivingGoodsAdd.vue +++ b/src/views/inStorage/receivingGoods/receivingGoodsAdd.vue @@ -92,8 +92,11 @@
商品列表
- 选择商品 - +
+ 选择商品 + 批次收货 +
+
@@ -110,13 +113,14 @@ --> - + - + + @@ -498,14 +502,14 @@ "goodsSkuSid": e.goodsSpuSid, "goodsSpuName": e.goodsSpuName, - "goodsSkuTitle": e.goodsSkuTitle, + "goodsSkuTitle": e.goodsSpuName, "goodsSkuCode": e.goodsSkuCode, "goodsSkuOwnSpec": e.indexes, "unit": e.goodsUnitName, "warehouseSid": e.warehouseSid, "warehouseName": e.warehouseName, "warehouseRackSid": e.warehouseRackSid, - "warehouseRackName": e.warehouseRackCode, + "warehouseRackName": e.warehouseRackName, "actualInCount": 0, "rejectCount": 0, "rejectReason": "", @@ -616,6 +620,31 @@ } + for (var i = 0; i < this.formobj.pcList.length; i++) { + + if (this.formobj.pcList[i].expirationDate == '') { + this.$message({ + showClose: true, + type: 'error', + message: '生产日期不能为空' + }) + + return + } + + if (Number(this.formobj.pcList[i].batchCount) == 0) { + this.$message({ + showClose: true, + type: 'error', + message: '批次数量不能为0' + }) + + return + } + + } + + this.$refs['form_obj'].validate((valid) => { if (valid) { this.submitdisabled = true @@ -672,7 +701,7 @@ console.log("showAdd", this.isUpdata); this.getsupplierLust() - this.getWarehouseList() + // this.getWarehouseList() this.$nextTick(() => { this.$refs['form_obj'].clearValidate() @@ -690,7 +719,7 @@ this.title = "【修改】" this.isUpdata = true this.getsupplierLust() - this.getWarehouseList() + // this.getWarehouseList() console.log("showEdit", this.isUpdata); this.$nextTick(() => { @@ -714,10 +743,10 @@ if (resp.success) { this.formobj = resp.data - this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window - .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1) - this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage - .getItem('defaultOrgPath').lastIndexOf('/') + 1) + // this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window + // .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1) + // this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage + // .getItem('defaultOrgPath').lastIndexOf('/') + 1) diff --git a/src/views/inStorage/receivingGoods/receivingGoodsInfo.vue b/src/views/inStorage/receivingGoods/receivingGoodsInfo.vue index ada7b67..efc265f 100644 --- a/src/views/inStorage/receivingGoods/receivingGoodsInfo.vue +++ b/src/views/inStorage/receivingGoods/receivingGoodsInfo.vue @@ -79,7 +79,7 @@ - + @@ -113,7 +113,7 @@ - + diff --git a/src/views/inStorage/receivingGoods/upShelfAddRecord.vue b/src/views/inStorage/receivingGoods/upShelfAddRecord.vue index eee55f5..0150378 100644 --- a/src/views/inStorage/receivingGoods/upShelfAddRecord.vue +++ b/src/views/inStorage/receivingGoods/upShelfAddRecord.vue @@ -82,7 +82,7 @@ 删除 - + @@ -302,10 +302,10 @@ if (resp.success) { this.formobj = resp.data - this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window - .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1) - this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage - .getItem('defaultOrgPath').lastIndexOf('/') + 1) + // this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window + // .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1) + // this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage + // .getItem('defaultOrgPath').lastIndexOf('/') + 1) } }) .catch(e => { diff --git a/src/views/inStorage/upShelf/upShelfAdd.vue b/src/views/inStorage/upShelf/upShelfAdd.vue index 2ef8638..6067579 100644 --- a/src/views/inStorage/upShelf/upShelfAdd.vue +++ b/src/views/inStorage/upShelf/upShelfAdd.vue @@ -28,11 +28,6 @@
制单部门
{{ formobj.deptName }} - -
制单人
- -
* 单据日期
- +