Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/views/warehouseBusiness/inStock/index.vue

@@ -3724,9 +3724,6 @@ export default {
     },
     showEditDialog_sss() {
       if (this.Printinglist.length > 0) {
-        // if (!this.form.fId) {
-        //   this.form.fId = this.fid
-        // }
         if(this.form.fFeetunit > 3){
           this.$message.error('请维护主表计费单位为件数、毛重(kg)或净重(kg)')
           return false
@@ -4690,26 +4687,34 @@ export default {
     addList() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          let formData = new window.FormData();
-          formData.append("warehouseBills", JSON.stringify(this.form));
-          formData.append("warehousebillsitems", JSON.stringify(this.dataListSelection));
-          formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
-          formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
-          formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
-          addJoblist(formData).then((response) => {
-            this.formBrowseStatus = true
-            let dataSelection = response.data.warehousebillsitems
-            for (let li in dataSelection) {
-              for (let i in this.dataList) {
-                if (dataSelection[li].fId === this.dataList[i].fId && this.dataList[i].fBillstatus === 10) {
-                  this.$set(this.dataList[i], 'fBillstatus', dataSelection[li].fBillstatus)
-                  this.$set(this.dataList[i], 'fSerialNumber', dataSelection[li].fSerialNumber)
-                  break
+          let dataList = []
+          for (let se in this.dataListSelection) {
+            if (Number(this.dataListSelection[se].fBillstatus) > 10) {
+              dataList.push(this.dataListSelection[se])
+            }
+          }
+          if (dataList.length !== 0) {
+            let formData = new window.FormData();
+            formData.append("warehouseBills", JSON.stringify(this.form));
+            formData.append("warehousebillsitems", JSON.stringify(dataList));
+            formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
+            formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
+            formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
+            addJoblist(formData).then((response) => {
+              this.formBrowseStatus = true
+              let dataSelection = response.data.warehousebillsitems
+              for (let li in dataSelection) {
+                for (let i in this.dataList) {
+                  if (dataSelection[li].fId === this.dataList[i].fId && this.dataList[i].fBillstatus === 10) {
+                    this.$set(this.dataList[i], 'fBillstatus', dataSelection[li].fBillstatus)
+                    this.$set(this.dataList[i], 'fSerialNumber', dataSelection[li].fSerialNumber)
+                    break
+                  }
                 }
               }
-            }
-            this.$refs.checkout.clearSelection()
-          })
+              this.$refs.checkout.clearSelection()
+            })
+          }
         }
       });
     },