lilei 2 lat temu
rodzic
commit
61e64b1b86

+ 4 - 4
src/views/salesReturnManagement/billOfLading/list.vue

@@ -222,13 +222,13 @@ export default {
   methods: {
     //  创建时间  change
     dateCreateChange (date) {
-      this.queryParam.beginDate = date[0]
-      this.queryParam.endDate = date[1]
+      this.queryParam.beginDate = date[0] + ' 00:00:00'
+      this.queryParam.endDate = date[1] + ' 59:59:59'
     },
     //  审核时间  change
     dateExamineChange (date) {
-      this.queryParam.auditBeginDate = date[0]
-      this.queryParam.auditEndDate = date[1]
+      this.queryParam.auditBeginDate = date[0] + ' 00:00:00'
+      this.queryParam.auditEndDate = date[1] + ' 59:59:59'
     },
     custChange (val) {
       this.queryParam.senderSn = val.key

+ 10 - 3
src/views/salesReturnManagement/receiveCheck/checking.vue

@@ -185,13 +185,21 @@ export default {
     plconfirm (val) {
       const _this = this
       const obj = []
+      const hasError = _this.rowSelectionInfo.selectedRows.filter(item => item.backStockQty > 0)
       _this.rowSelectionInfo && _this.rowSelectionInfo.selectedRows.map(item => {
+        // 批量设置良品
         if (this.actionType == 1) {
-          obj.push({
+          const pa = {
             salesReturnDetailSn: item.salesReturnDetailSn,
             goodQty: val == 1 ? item.receiveQty : 0
-          })
+          }
+          // 如果批量修改良品数量为0,且返库数量又不是0的情况
+          if (hasError.length && val == 0) {
+            pa.backStockQty = 0
+          }
+          obj.push(pa)
         } else {
+          // 批量设置返库
           obj.push({
             salesReturnDetailSn: item.salesReturnDetailSn,
             backStockQty: val == 1 ? item.goodQty : 0
@@ -200,7 +208,6 @@ export default {
       })
       console.log(obj)
       // 如果批量修改良品数量为0
-      const hasError = _this.rowSelectionInfo.selectedRows.filter(item => item.backStockQty > 0)
       if (val == 0 && this.actionType == 1 && hasError.length) {
         this.$confirm({
           title: '提示',