出库

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -911,13 +911,6 @@
               align="center"
               label="箱号"
             >
-              <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.fCntrno"
-                  placeholder="箱号"
-                  :disabled="browseStatus || scope.row.fBillstatus >= 20"
-                />
-              </template>
             </el-table-column>
             <el-table-column
               prop="fGoodsval"
@@ -935,7 +928,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              prop="ftruckno"
+              prop="fTruckno"
               header-align="center"
               width="150px"
               align="center"
@@ -945,7 +938,7 @@
                 <el-input
                   v-model="scope.row.fTruckno"
                   placeholder="车号"
-                  :disabled="browseStatus || scope.row.fBillstatus >= 20"
+                  :disabled="browseStatus || scope.row.fBillstatus >= 40"
                 />
               </template>
             </el-table-column>
@@ -2757,15 +2750,7 @@ export default {
         fWarehouseid: [{ required: true, message: " ", trigger: "blur" }],
         fbillingway: [{ required: true, message: " ", trigger: "blur" }],
         fTocorpid: [{ required: true, message: " ", trigger: "blur" }],
-      },
-      imporRules: {
-        fQty: [{ required: true, message: " ", trigger: "blur" }],
-        fGoodsid: [{ required: true, message: " ", trigger: "blur" }],
-        fBusinessType: [{ required: true, message: " ", trigger: "blur" }],
-        fMarks: [{ required: true, message: " ", trigger: "blur" }],
-        fWarehouselocid: [{ required: true, message: " ", trigger: "blur" }],
-        fPackagespecs: [{ required: true, message: " ", trigger: "blur" }],
-        fTruckno: [{ required: true, message: " ", trigger: "blur" }],
+        fFeetUnit: [{ required: true, message: " ", trigger: "blur" }],
       },
       browseStatus: false,
       goodsOptions: [],
@@ -3022,7 +3007,7 @@ export default {
     //撤销审批
     revokeTwo() {
       let data = {
-        actId: 110,
+        actId: 120,
         billId: this.form.fId,
         id: this.form.fId,
       };
@@ -3044,9 +3029,8 @@ export default {
     },
     addOrUpdateHandle(form) {
       this.addOrUpdateVisible = true;
-      let actId = "110";
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(form.fId, actId);
+        this.$refs.addOrUpdate.init(form.fId, 120);
       });
     },
     addOrUpdateHand(form) {
@@ -3150,7 +3134,10 @@ export default {
           if ((response.code = 200)) {
             this.detailList.map((e, index) => {
               response.data.warehousebillsitems.map((item) => {
-                item.fBsdate = Date.parse(item.fBsdate);
+                item.fBsdate = Date.parse(new Date(item.fBsdate));
+                if (item.fBusinessType) {
+                  item.fBusinessType = item.fBusinessType.toString();
+                }
                 if (e.fId == item.fId) {
                   e = item;
                   this.$set(this.detailList, index, e);
@@ -3166,6 +3153,7 @@ export default {
       }
     },
     creditClick() {
+      console.log(this.Printinglist)
       for (let item in this.Printinglist) {
         if (!this.Printinglist[item].fId) {
           return this.$message.error("请存在未保存的数据");
@@ -3173,8 +3161,11 @@ export default {
         if (this.Printinglist[item].fBillstatus == 10) {
           return this.$message.error("请存在未打印的作业单");
         }
-        if (this.Printinglist[item].fBillstatus == 20) {
-          return this.$message.error("请存在未卸货的数据");
+        if (!this.Printinglist[item].fTruckno) {
+          return this.$message.error("车号不能为空");
+        }
+           if (this.Printinglist[item].fIsPass == "F") {
+          return this.$message.error("未放行，不能出库");
         }
       }
       if (this.CntrTable.length > 0) {
@@ -3242,7 +3233,10 @@ export default {
         if ((response.code = 200)) {
           this.detailList.map((e, index) => {
             response.data.warehouseItem.map((item) => {
-              item.fBsdate = Date.parse(item.fBsdate);
+              item.fBsdate = Date.parse(new Date(item.fBsdate));
+              if (item.fBusinessType) {
+                item.fBusinessType = item.fBusinessType.toString();
+              }
               if (e.fId == item.fId) {
                 e = item;
                 this.$set(this.detailList, index, e);
@@ -3392,7 +3386,7 @@ export default {
         this.$set(this.form, "fBstifime", Date.parse(this.form.fBstime));
         this.$set(this.form, "createTime", Date.parse(this.form.createTime));
         this.$set(this.form, "fFeetUnit", this.form.fFeetunit);
-        if (this.form.fCartype||this.form.fCartype==0) {
+        if (this.form.fCartype || this.form.fCartype == 0) {
           this.$set(this.form, "fCartype", this.form.fCartype.toString());
         }
         if (this.form.fStltypeid || this.form.fStltypeid == 0) {
@@ -3568,10 +3562,10 @@ export default {
             this.form.fMarks = "";
           }
           let formData = new window.FormData();
-          formData.append("tWarehouseBills", JSON.stringify(this.form));
+          formData.append("warehouseBills", JSON.stringify(this.form));
           // 库存明细
           formData.append(
-            "tWarehousebillsitems",
+            "warehousebillsitems",
             JSON.stringify(this.detailList)
           );
           // 附件数据
@@ -3581,17 +3575,17 @@ export default {
           );
           // 费用明细付款
           formData.append(
-            "tWarehousebillsfeesCr",
+            "warehousebillsfeesCr",
             JSON.stringify(this.warehouseCrList)
           );
           // 收款
           formData.append(
-            "tWarehousebillsfeesDr",
+            "warehousebillsfeesDr",
             JSON.stringify(this.warehouseDrList)
           );
           formData.append("mblnoStatus", JSON.stringify(this.mblnoStatus));
           formData.append("tCntr", JSON.stringify(this.CntrTable));
-          addWarehouse(formData).then((response) => {
+          warehouseSubmission(formData).then((response) => {
             if (response.code == 200) {
               this.msgSuccess("提交成功");
               setTimeout(() => {
@@ -3741,7 +3735,7 @@ export default {
                   );
                 }
                 this.$set(this.form, "fFeetUnit", this.form.fFeetunit);
-                if (this.form.fCartype||this.form.fCartype==0) {
+                if (this.form.fCartype || this.form.fCartype == 0) {
                   this.$set(
                     this.form,
                     "fCartype",
@@ -4388,10 +4382,12 @@ export default {
           if (response.code == 200) {
             this.detailList.map((e, index) => {
               response.data.warehousebillsitems.map((item) => {
-                item.fBsdate = Date.parse(item.fBsdate);
+                item.fBsdate = Date.parse(new Date(item.fBsdate));
+                if (item.fBusinessType) {
+                  item.fBusinessType = item.fBusinessType.toString();
+                }
                 if (e.fId == item.fId) {
-                  e = item;
-                  this.$set(this.detailList, index, e);
+                  this.$set(this.detailList, index, item);
                 }
               });
             });