修改打印会更改入库时间问题

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -1320,16 +1320,16 @@
                 fixed="right"
             >
               <template slot-scope="scope">
-                <el-button
-                  type="text"
-                  size="small"
-                  disabled
-                >提交</el-button>
-                <el-button
-                  type="text"
-                  size="small"
-                  disabled
-                >撤销</el-button>
+<!--                <el-button-->
+<!--                  type="text"-->
+<!--                  size="small"-->
+<!--                  disabled-->
+<!--                >提交</el-button>-->
+<!--                <el-button-->
+<!--                  type="text"-->
+<!--                  size="small"-->
+<!--                  disabled-->
+<!--                >撤销</el-button>-->
                 <el-button
                     :disabled="browseStatus || scope.row.fBillstatus > 30"
                     type="text"
@@ -1393,6 +1393,7 @@
             :fNetweight="fNetweight"
             :fCntqty="fCntqty"
             :form="form"
+            :company="company"
         ></income-money>
       </el-collapse-item>
 
@@ -1407,6 +1408,8 @@
             :browseStatus="browseStatus"
             @chiSave="saveForm"
             @chiAdd="addpayment"
+            @checkRow="checkRow"
+            @revokeRow="revokeRow"
             :warehouseCrList="warehouseCrList"
             :businessTypeOption="businessTypeOption"
             :fCNameOptions="fCNameOptions"
@@ -2898,7 +2901,7 @@
         >
           {{ company }}货物标识卡
         </div>
-        <div class="print_table" style="display: flex">
+        <div class="print_table" style="display: flex;flex-direction: column">
           <table
               border="0"
               cellspacing="0"
@@ -5263,7 +5266,7 @@
         >
           {{ company }}货物标识卡
         </div>
-        <div class="print_table" style="display: flex">
+        <div class="print_table" style="display: flex;flex-direction: column">
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%" v-for="(item, index) in Printinglist"
                  :key="index">
             <tr>
@@ -6017,6 +6020,7 @@ export default {
         fPlanqty: [{required: true, message: " ", trigger: "blur"}],
         fPlangrossweight: [{required: true, message: " ", trigger: "blur"}],
         fPlannetweight: [{required: true, message: " ", trigger: "blur"}],
+        fCustomno: [{required: true, message: " ", trigger: "blur"}],
         // fChargedate: [{ required: true, message: " ", trigger: "blur" }],
         fMarks: [{required: true, message: " ", trigger: "blur"}],
         fBsdate: [{required: true, message: " ", trigger: "blur"}],
@@ -6726,9 +6730,80 @@ export default {
     },
     //撤销请核
     revoke() {
-      revoke(this.form.fId).then((data) => {
+      revoke(this.form.fId).then(async (data) => {
         if (data.code === 200) {
           this.browseStatus = false;
+          await getWarehousebills(this.form.fId).then((response) => {
+            this.TFformdata(response.data.warehousebills);
+            if (!this.copyStatus || this.recordStatus === true) {
+              if (response.data.warehouseBillsItem) {
+                response.data.warehouseBillsItem.map((e) => {
+                  e.fLntype = e.fLntype ? e.fLntype.toString() : null;
+                });
+                this.detailList = response.data.warehouseBillsItem;
+              } else {
+                this.detailList = [];
+              }
+              response.data.warehousebillsfeesCr.map((e) => {
+                if (e.fFeeunitid) {
+                  e.fFeeUnitid = e.fFeeunitid.toString();
+                }
+                if (e.fStltypeid || e.fStltypeid == 0) {
+                  e.fStltypeid = e.fStltypeid.toString();
+                }
+              });
+              this.warehouseCrList = response.data.warehousebillsfeesCr;
+              response.data.warehousebillsfeesDr.map((e) => {
+                if (e.fFeeunitid) {
+                  e.fFeeUnitid = e.fFeeunitid.toString();
+                }
+                if (e.fStltypeid || e.fStltypeid == 0) {
+                  e.fStltypeid = e.fStltypeid.toString();
+                }
+              });
+              this.warehouseDrList = response.data.warehousebillsfeesDr;
+              if (response.data.tCntrList) {
+                this.CntrTable = response.data.tCntrList;
+              } else {
+                this.CntrTable = [];
+              }
+              if (response.data.enclosures) {
+                this.relevantAttachments = response.data.enclosures;
+              }
+            } else {
+              this.approvalStatus = false;
+              this.browseStatus = false;
+              this.$set(this.form, "fId", null);
+              this.$set(this.form, "fMblno", null);
+              this.$set(this.form, "fMarks", null);
+              this.$set(this.form, "fProductName", null);
+              this.$set(this.form, "warehouseStatus", null);
+              this.$set(this.form, "fBillstatus", null);
+              this.$set(this.form, "fItemsStatus", null);
+              this.$set(this.form, "fNetweight", 0);
+              this.$set(this.form, "fPlanvolumn", 0);
+              this.$set(this.form, "fGrossweight", 0);
+              // this.recordStatus = true
+            }
+          });
+          this.warehouseCrList.forEach((item, index) => {
+            if (item.fQty != 0 && item.fUnitprice !== 0 && item.fAmount !==0) {
+              item.fBillstatus = 6;
+            }
+          })
+          let formData = new window.FormData();
+          formData.append("tWarehouseBills", JSON.stringify(this.form));
+          // 库存明细
+          formData.append("tWarehousebillsitems",JSON.stringify(this.detailList));
+          // 附件数据
+          formData.append("tEnclosure",JSON.stringify(this.relevantAttachments));
+          // 费用明细付款
+          formData.append("tWarehousebillsfeesCr",JSON.stringify(this.warehouseCrList));
+          // 收款
+          formData.append("tWarehousebillsfeesDr",JSON.stringify(this.warehouseDrList));
+          formData.append("mblnoStatus", JSON.stringify(this.mblnoStatus));
+          formData.append("tCntr", JSON.stringify(this.CntrTable));
+          addWarehousebills(formData).then(res => {})
           this.msgSuccess("撤销成功");
         }
       });
@@ -7623,7 +7698,6 @@ export default {
               } else {
                 this.form.fMarks = "";
               }
-              console.log(JSON.stringify(this.form))
               this.$set(this.form, 'fFeetunit', this.form.fFeetUnit)
               formData.append("tWarehouseBills", JSON.stringify(this.form));
               // 库存明细
@@ -7657,6 +7731,59 @@ export default {
                     this.TFformdata(response.data.warehouseBills);
                     this.detailList = response.data.warehousebillsitems;
                     this.msgSuccess("保存成功");
+                    getWarehousebills(this.form.fId).then((response) => {
+                      this.TFformdata(response.data.warehousebills);
+                      if (!this.copyStatus || this.recordStatus === true) {
+                        if (response.data.warehouseBillsItem) {
+                          response.data.warehouseBillsItem.map((e) => {
+                            e.fLntype = e.fLntype ? e.fLntype.toString() : null;
+                          });
+                          this.detailList = response.data.warehouseBillsItem;
+                        } else {
+                          this.detailList = [];
+                        }
+                        response.data.warehousebillsfeesCr.map((e) => {
+                          if (e.fFeeunitid) {
+                            e.fFeeUnitid = e.fFeeunitid.toString();
+                          }
+                          if (e.fStltypeid || e.fStltypeid == 0) {
+                            e.fStltypeid = e.fStltypeid.toString();
+                          }
+                        });
+                        this.warehouseCrList = response.data.warehousebillsfeesCr;
+                        response.data.warehousebillsfeesDr.map((e) => {
+                          if (e.fFeeunitid) {
+                            e.fFeeUnitid = e.fFeeunitid.toString();
+                          }
+                          if (e.fStltypeid || e.fStltypeid == 0) {
+                            e.fStltypeid = e.fStltypeid.toString();
+                          }
+                        });
+                        this.warehouseDrList = response.data.warehousebillsfeesDr;
+                        if (response.data.tCntrList) {
+                          this.CntrTable = response.data.tCntrList;
+                        } else {
+                          this.CntrTable = [];
+                        }
+                        if (response.data.enclosures) {
+                          this.relevantAttachments = response.data.enclosures;
+                        }
+                      } else {
+                        this.approvalStatus = false;
+                        this.browseStatus = false;
+                        this.$set(this.form, "fId", null);
+                        this.$set(this.form, "fMblno", null);
+                        this.$set(this.form, "fMarks", null);
+                        this.$set(this.form, "fProductName", null);
+                        this.$set(this.form, "warehouseStatus", null);
+                        this.$set(this.form, "fBillstatus", null);
+                        this.$set(this.form, "fItemsStatus", null);
+                        this.$set(this.form, "fNetweight", 0);
+                        this.$set(this.form, "fPlanvolumn", 0);
+                        this.$set(this.form, "fGrossweight", 0);
+                        // this.recordStatus = true
+                      }
+                    });
                     if (status == "goBack") {
                       this.cancel();
                     }
@@ -8112,7 +8239,8 @@ export default {
                 this.allfQty += e.fQty;
               }
               if (e.fBsdate) {
-                let date = new Date(this.Printinglist[0].fBsdate);
+                // let date = new Date(this.Printinglist[0].fBsdate);
+                let date = new Date(e.fBsdate);
                 let Y = date.getFullYear();
                 let M =
                     date.getMonth() + 1 < 10
@@ -8144,11 +8272,12 @@ export default {
             } else if (command == "L") {
               this.print_ccdzrkd = true
             } else if (command == "M") {
-              if (this.Printinglist.length == 1) {
-                this.print_fxdkrkd = true
-              } else {
-                this.$message.error("请选择单条明细")
-              }
+              this.print_fxdkrkd = true
+              // if (this.Printinglist.length == 1) {
+              //   this.print_fxdkrkd = true
+              // } else {
+              //   this.$message.error("请选择单条明细")
+              // }
             } else if (command == "i") {
               this.print_khrkd = true
             } else if (command == "j") {
@@ -8611,6 +8740,55 @@ export default {
     downloadExcel() {
       window.location.href = "http://121.36.212.131:8080/file/入库模板.xlsx";
     },
+    // 付款信息请核
+    checkRow(index, rows) {
+      if (!rows[index].fQty) {
+        this.$message.error("请维护数量")
+        return false
+      }
+      if (!rows[index].fUnitprice) {
+        this.$message.error("请维护单价")
+        return false
+      }
+      if (!rows[index].fAmount) {
+        this.$message.error("请维护金额")
+        return false
+      }
+      rows[index].fBillstatus = 6
+      let formData = new window.FormData();
+      formData.append("tWarehouseBills", JSON.stringify(this.form));
+      // 库存明细
+      formData.append("tWarehousebillsitems",JSON.stringify(this.detailList));
+      // 附件数据
+      formData.append("tEnclosure",JSON.stringify(this.relevantAttachments));
+      // 费用明细付款
+      formData.append("tWarehousebillsfeesCr",JSON.stringify(this.warehouseCrList));
+      // 收款
+      formData.append("tWarehousebillsfeesDr",JSON.stringify(this.warehouseDrList));
+      formData.append("mblnoStatus", JSON.stringify(this.mblnoStatus));
+      formData.append("tCntr", JSON.stringify(this.CntrTable));
+      addWarehousebills(formData).then(res => {
+        this.msgSuccess("请核成功");
+      })
+    },
+    revokeRow(index, rows) {
+      rows[index].fBillstatus = 2
+      let formData = new window.FormData();
+      formData.append("tWarehouseBills", JSON.stringify(this.form));
+      // 库存明细
+      formData.append("tWarehousebillsitems",JSON.stringify(this.detailList));
+      // 附件数据
+      formData.append("tEnclosure",JSON.stringify(this.relevantAttachments));
+      // 费用明细付款
+      formData.append("tWarehousebillsfeesCr",JSON.stringify(this.warehouseCrList));
+      // 收款
+      formData.append("tWarehousebillsfeesDr",JSON.stringify(this.warehouseDrList));
+      formData.append("mblnoStatus", JSON.stringify(this.mblnoStatus));
+      formData.append("tCntr", JSON.stringify(this.CntrTable));
+      addWarehousebills(formData).then(res => {
+        this.msgSuccess("撤销成功");
+      })
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变