Merge branch 'dev' of http://git.echepei.com/zhujiawei/Warehouse_management_ui into dev

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -7121,50 +7121,85 @@ export default {
             this.form.fPlanvolumn = this.fPlanvolumn
             this.form.fGrossweight = this.fGrossweight
           }
-          // 判断出库件数长度
-          if (this.Printinglist.length === 1) {
-            for (let item in this.Printinglist) {
-              if (this.Printinglist[item].fQty === 0) {
-                this.$confirm('件数为0，是否继续出库', '提示', {
+          var formData = new window.FormData()
+          formData.append('warehouseBills', JSON.stringify(this.form))
+          formData.append(
+            'warehousebillsitems',
+            JSON.stringify(this.Printinglist)
+          )
+          formData.append(
+            'warehousebillsfeesDr',
+            JSON.stringify(this.warehouseDrList)
+          )
+          formData.append(
+            'warehousebillsfeesCr',
+            JSON.stringify(this.warehouseCrList)
+          )
+          formData.append(
+            'tEnclosure',
+            JSON.stringify(this.relevantAttachments)
+          )
+          formData.append('whgenleg', JSON.stringify(this.relevantAttachments))
+          formData.append('tCntr', JSON.stringify(this.CntrTable))
+          if (this.Printinglist.length !== 1) {
+            // 出库提交判断
+            for (var i = 0;i < this.Printinglist.length;i++) {
+              if (this.Printinglist[i].fQty === 0) {
+                this.$confirm('所选数据中存在件数为0，是否继续出库', '提示', {
                   confirmButtonText: '确认',
                   cancelButtonText: '取消',
                   type: 'warning'
                 }).then(() => {
-                  // 库存件数为 0 确认后出库
-                  this.addWhgenleg();
+                  for (var j = 1;j < this.Printinglist.length;j++) {
+                    if (this.Printinglist[0].fTruckno !== this.Printinglist[j].fTruckno) {
+                      this.$confirm('车号不相同，是否确认出库', '提示', {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                      }).then(() => {
+                        // 车号不相同，点击确认后出库
+                        return this.addWhgenleg(formData);
+                      })
+                    } else {
+                      return this.addWhgenleg(formData);
+                    }
+                  }
                 })
               } else {
-                this.addWhgenleg();
+                for (var j = 1;j < this.Printinglist.length;j++) {
+                  if (this.Printinglist[0].fTruckno !== this.Printinglist[j].fTruckno) {
+                    this.$confirm('车号不相同，是否确认出库', '提示', {
+                      confirmButtonText: '确认',
+                      cancelButtonText: '取消',
+                      type: 'warning'
+                    }).then(() => {
+                      // 车号不相同，点击确认后出库
+                      return this.addWhgenleg(formData);
+                    })
+                  } else {
+                    return this.addWhgenleg(formData);
+                  }
+                }
               }
             }
           } else {
-            return this.$message.error('请单独选择出库确认');
+            if (this.Printinglist[0].fQty === 0) {
+              this.$confirm('所选数据中存在件数为0，是否继续出库', '提示', {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                return this.addWhgenleg(formData);
+              })
+            } else {
+              return this.addWhgenleg(formData);
+            }
           }
         }
       })
     },
     // 出库确认
-    addWhgenleg() {
-      let formData = new window.FormData()
-      formData.append('warehouseBills', JSON.stringify(this.form))
-      formData.append(
-        'warehousebillsitems',
-        JSON.stringify(this.Printinglist)
-      )
-      formData.append(
-        'warehousebillsfeesDr',
-        JSON.stringify(this.warehouseDrList)
-      )
-      formData.append(
-        'warehousebillsfeesCr',
-        JSON.stringify(this.warehouseCrList)
-      )
-      formData.append(
-        'tEnclosure',
-        JSON.stringify(this.relevantAttachments)
-      )
-      formData.append('whgenleg', JSON.stringify(this.relevantAttachments))
-      formData.append('tCntr', JSON.stringify(this.CntrTable))
+    addWhgenleg(formData) {
       addWhgenleg(formData).then((response) => {
         if ((response.code = 200)) {
           this.mblnoStatus = ''