出入库调拨打印修改

src/views/warehouseBusiness/inStock/index.vue

@@ -4689,8 +4689,9 @@ export default {
         if (valid) {
           let dataList = []
           for (let se in this.dataListSelection) {
-            if (Number(this.dataListSelection[se].fBillstatus) > 10) {
+            if (Number(this.dataListSelection[se].fBillstatus) >= 10) {
               dataList.push(this.dataListSelection[se])
+              console.log("111")
             }
           }
           if (dataList.length !== 0) {

src/views/warehouseBusiness/outStock/index.vue

@@ -853,7 +853,7 @@
             </div>
             <div style="display: flex">
               <el-button type="info" :disabled="printinglist.length <= 0 || browseStatus" prop="打印" @click="printJobSheet">作业单</el-button>
-              <el-button :disabled="printinglist.length <= 0 || browseStatus" @click="discharge">装货完成</el-button>
+              <el-button :disabled="printinglist.length <= 0 || browseStatu" @click="discharge">装货完成</el-button>
               <el-button
                 :disabled="dataListSelection.length <= 0 || browseStatus"
                 @click.prevent="creditClick"
@@ -2748,6 +2748,7 @@ export default {
   },
   data() {
     return {
+      browseStatu:false,
       key_s:'',
       // 劳务公司
       fCompanyOptIons: [],
@@ -3270,6 +3271,7 @@ export default {
         this.approval = JSON.parse(this.approval)
         this.approVal = true
         this.browseStatus = status;
+        this.browseStatu = true
         this.contrOl = true
         this.detailsHidden = false;
         this.formBrowseStatus = false;
@@ -3419,6 +3421,7 @@ export default {
       });
       this.addList();
       this.openPrintJobSheet = false;
+
     },
     // 关闭二级弹窗
     closeWindow () {
@@ -4159,6 +4162,7 @@ export default {
       // if (this.dataList.length === 0){
       //   this.contrOl = true
       // }
+      this.browseStatu = status;
       this.browseStatus = status;
       this.contrOl = status
       this.detailsHidden = false;
@@ -4507,6 +4511,7 @@ export default {
                 }
               }
             }
+
           });
         }
       });
@@ -4515,27 +4520,35 @@ export default {
     addList() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          let listSelection = JSON.parse(JSON.stringify(this.dataListSelection))
-          let formData = new window.FormData();
-          formData.append("warehouseBills", JSON.stringify(this.form));
-          formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
-          formData.append("warehousebillsitems", JSON.stringify(this.dataListSelection));
-          formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
-          formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
-          addJoblist(formData).then((response) => {
-            this.formBrowseStatus = true;
-            this.$refs.tableDr.clearSelection();
-            this.$refs.tableList.clearSelection();
-            let dataitem = response.data.warehousebillsitems
-            for (let ite in dataitem) {
-              for (let li in this.dataList) {
-                if (this.dataList[li].fId === dataitem[ite].fId) {
-                  this.$set(this.dataList[li], 'fBillstatus', dataitem[ite].fBillstatus)
-                  this.$set(this.dataList[li], 'fSerialNumber', dataitem[ite].fSerialNumber)
+          let dataList = []
+          for (let se in this.dataListSelection) {
+            if (Number(this.dataListSelection[se].fBillstatus) >= 10) {
+              dataList.push(this.dataListSelection[se])
+            }
+          }
+          this.$refs.tableList.clearSelection();
+          if (dataList.length !== 0) {
+            let formData = new window.FormData();
+            formData.append("warehouseBills", JSON.stringify(this.form));
+            formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
+            formData.append("warehousebillsitems", JSON.stringify(this.dataList));
+            formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
+            formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
+            addJoblist(formData).then((response) => {
+              this.formBrowseStatus = true;
+              this.$refs.tableDr.clearSelection();
+              let dataitem = response.data.warehousebillsitems
+              for (let ite in dataitem) {
+                for (let li in this.dataList) {
+                  if (this.dataList[li].fId === dataitem[ite].fId) {
+                    this.$set(this.dataList[li], 'fBillstatus', dataitem[ite].fBillstatus)
+                    this.$set(this.dataList[li], 'fSerialNumber', dataitem[ite].fSerialNumber)
+                    break
+                  }
                 }
               }
-            }
-          });
+            })
+          }
         }
       });
     },
@@ -4652,6 +4665,13 @@ export default {
     },
     // 库存明细多选
     selectinventory(selection) {
+      for(let item in selection){
+        if(selection[item].fBillstatus > '20'){
+          this.browseStatu = true
+        }else{
+          this.browseStatu = false
+        }
+      }
       this.printinglist = selection;
       this.dataWithdrawList = [];
       this.dataListSelection = [];

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -812,7 +812,7 @@
             </div>
             <div style="display: flex">
               <el-button type="info" :disabled="printinglist.length <= 0 || browseStatus" prop="打印" @click="printJobSheet">作业单</el-button>
-              <el-button :disabled="printinglist.length <= 0 || browseStatus" @click="discharge">装货</el-button>
+              <el-button :disabled="printinglist.length <= 0 || browseStatu " @click="discharge">装货</el-button>
               <el-button
                 :disabled="dataListSelection.length <= 0 || browseStatus"
                 @click.prevent="creditClick"
@@ -2402,6 +2402,7 @@ export default {
   },
   data() {
     return {
+      browseStatu:false,
       fCompanyOptIons:[],
       fleetOptions:[],
       activeIndex: '1',
@@ -2777,13 +2778,13 @@ export default {
     Jump(){
       this.approval = this.$route.query.data
       if(this.approval){
-        this.getTreeselect()
         this.reset()
         this.colseButton = false
         this.approval = JSON.parse(this.approval)
         this.hide = false
         this.open = true
         this.browseStatus = true
+        this.browseStatus = true
         this.contrOl = true
         this.notChange = true
         this.approve = true
@@ -3571,6 +3572,7 @@ export default {
       this.reset();
       this.contrOl = true
       this.browseStatus = status;
+      this.browseStatu = status;
       this.detailsHidden = false;
       let data = row || this.ids;
       getStockTransfer(data.fId).then((response) => {
@@ -4059,27 +4061,37 @@ export default {
     addList() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          let listSelection = JSON.parse(JSON.stringify(this.dataListSelection))
-          let formData = new window.FormData();
-          formData.append("warehouseBills", JSON.stringify(this.form));
-          formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
-          formData.append("warehousebillsitems", JSON.stringify(this.dataListSelection));
-          formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
-          formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
-          addJoblist(formData).then((response) => {
-            this.formBrowseStatus = true;
-            this.$refs.tableDr.clearSelection();
-            this.$refs.tableList.clearSelection();
-            let dataitem = response.data.warehousebillsitems
-            for (let ite in dataitem) {
-              for (let li in this.dataList) {
-                if (this.dataList[li].fId === dataitem[ite].fId) {
-                  this.$set(this.dataList[li], 'fBillstatus', dataitem[ite].fBillstatus)
-                  this.$set(this.dataList[li], 'fSerialNumber', dataitem[ite].fSerialNumber)
+          let dataList = []
+          for (let se in this.dataListSelection) {
+            if (Number(this.dataListSelection[se].fBillstatus) >= 10) {
+              dataList.push(this.dataListSelection[se])
+              console.log("111")
+            }
+          }
+          if (dataList.length !== 0) {
+            let formData = new window.FormData();
+            formData.append("warehouseBills", JSON.stringify(this.form));
+            formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
+            formData.append("warehousebillsitems", JSON.stringify(dataList));
+            formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
+            formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
+            addJoblist(formData).then((response) => {
+              this.formBrowseStatus = true;
+              // this.$refs.tableDr.clearSelection();
+              // this.$refs.tableList.clearSelection();
+              let dataSelection = response.data.warehousebillsitems
+              for (let ite in dataSelection) {
+                for (let li in this.dataList) {
+                  if (dataSelection[ite].fId === this.dataList[li].fId && this.dataList[li].fBillstatus === 10) {
+                    this.$set(this.dataList[li], 'fBillstatus', dataSelection[li].fBillstatus)
+                    this.$set(this.dataList[li], 'fSerialNumber', dataSelection[li].fSerialNumber)
+                    break
+                  }
                 }
               }
-            }
-          });
+              this.$refs.tableList.clearSelection()
+            });
+          }
         }
       });
     },
@@ -4198,6 +4210,15 @@ export default {
     },
     // 库存明细多选
     selectinventory(selection) {
+      for(let item in selection){
+        console.log(selection[item].fBillstatus)
+        if(selection[item].fBillstatus > '20'){
+          console.log("111")
+          this.browseStatu = true
+        }else{
+          this.browseStatu = false
+        }
+      }
       this.dataWithdrawList = [];
       this.dataListSelection = [];
       this.printinglist = selection;