出入库优化

src/views/warehouseBusiness/inStock/index.vue

@@ -198,7 +198,7 @@
           >修改
         </el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="danger"
           icon="el-icon-delete"
@@ -208,7 +208,7 @@
           v-hasPermi="['warehouseBusiness:warehousebills:remove']"
           >删除
         </el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -471,6 +471,7 @@
                 v-model="form.fPlanqty"
                 style="width: 80%"
                 laceholder="计划件数"
+                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                 :disabled="browseStatus"
               />
             </el-form-item>
@@ -480,7 +481,7 @@
               <el-input
                 v-model="form.fPlannetweight"
                 style="width: 80%"
-                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d).*$/, "$1$2.$3")'
+                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                 laceholder="计划毛重"
                 :disabled="browseStatus"
               />
@@ -490,7 +491,7 @@
             <el-form-item label="计划毛重" prop="fPlangrossweight">
               <el-input
                 v-model="form.fPlangrossweight"
-                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d).*$/, "$1$2.$3")'
+                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                 style="width: 80%"
                 laceholder="计划毛重"
                 :disabled="browseStatus"
@@ -1006,7 +1007,7 @@
         >
           <template slot-scope="scope">
             <el-input
-              oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d).*$/, "$1$2.$3")'
+              oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
               v-model="scope.row.fGrossweight"
               placeholder="入库毛重"
               :disabled="
@@ -1028,7 +1029,7 @@
         >
           <template slot-scope="scope">
             <el-input
-              oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d).*$/, "$1$2.$3")'
+              oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
               v-model="scope.row.fNetweight"
               placeholder="入库净重"
               :disabled="
@@ -1953,6 +1954,7 @@
             <el-col :span="8">
               <el-form-item label="计划件数" prop="fPlanqty">
                 <el-input
+                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                   v-model="planningList.fPlanqty"
                   style="width: 80%"
                   laceholder="计划件数"
@@ -1964,6 +1966,7 @@
               <el-form-item label="计划净重" prop="fPlannetweight">
                 <el-input
                   v-model="planningList.fPlannetweight"
+                  oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                   style="width: 80%"
                   disabled
                   laceholder="计划毛重"
@@ -1974,6 +1977,7 @@
               <el-form-item label="计划毛重" prop="fPlangrossweight">
                 <el-input
                   v-model="planningList.fPlangrossweight"
+                  oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                   style="width: 80%"
                   disabled
                   laceholder="计划毛重"
@@ -2428,10 +2432,10 @@
             <td>备注:</td>
             <td colspan="5">{{ form.remark}}</td>
           </tr>
-          <tr>
+          <tr v-for="(item, indexe) in Collectionoptionss" :key="indexe+'index'">
             <td>收费</td>
-            <td>装箱费</td>
-            <td>元</td>
+            <td>{{item.fFeeids}}</td>
+            <td>{{item.fAmount}} 元</td>
             <td colspan="4">办单费：5元，过磅费自理</td>
           </tr>
           <tr>
@@ -2733,11 +2737,6 @@ export default {
     this.getDicts("data_trademodes").then((response) => {
       this.fTrademodeidOptions = response.data;
     });
-    // this.getDicts("data_unitfees").then((response) => {
-    //   this.fFeetunitOptions = response.data;
-    //   console.log(response.data)
-    //   this.jFeetunitOptions = JSON.parse(JSON.stringify(response.data));
-    // });
     this.getDicts("data_stltype_type").then((response) => {
       this.fStltypeOptions = response.data;
     });
@@ -2782,7 +2781,6 @@ export default {
       });
     },
     printSomething1() {
-      console.log("22222");
       // 此处的style即为打印时的样式
       const style =
         "@media print { .print-div{ padding:8px;background-color:#cccccc;line-height:12px } .red{ color:#f00} .green{color:green} td{text-align: center}}";
@@ -2870,27 +2868,21 @@ export default {
         });
         return false;
       }
-      console.log(this.mum);
-
       this.fPlaNnumber = this.form.fPlannetweight / this.form.fPlanqty;
       this.fPlangNumber = this.form.fPlangrossweight / this.form.fPlanqty;
-      console.log(this.fPlaNnumber);
-      console.log(this.fPlangNumber);
       (this.planningList.fPlanqty =
         Number(this.form.fPlanqty) - Number(this.mum)),
         (this.planningList.fPlannetweight = (
           Number(this.fPlaNnumber) * Number(this.planningList.fPlanqty)
-        ).toFixed(6)),
+        ).toFixed(2)),
         (this.planningList.fPlangrossweight = (
           Number(this.fPlangNumber) * Number(this.planningList.fPlanqty)
-        ).toFixed(6)),
+        ).toFixed(2)),
         (this.weightList = true);
-      let time = null;
     },
 
     // 收货单打印界面
     showEditDialog_s() {
-      console.log(this.dataListSelection);
       if (this.Printinglist.length > 0) {
         this.editDialogVisible_s = true;
         for (let aorp in this.Printinglist) {
@@ -2912,7 +2904,6 @@ export default {
         }
 
         for (let sorp in this.warehouseOptions) {
-          console.log(this.form.fWarehouseid);
           if (this.form.fWarehouseid === this.warehouseOptions[sorp].fId) {
             this.$set(
               this.form,
@@ -2935,7 +2926,6 @@ export default {
       }
     },
     showEditDialog_ss() {
-      console.log(this.dataListSelection);
       if (this.Printinglist.length > 0) {
         this.editDialogVisible_ss = true;
       } else {
@@ -2960,6 +2950,21 @@ export default {
           );
         }
       }
+      
+      // for(let lest in this.this.fWbuOptions){
+
+      // }
+      if (this.Collectionoptionss.length > 0) {
+        for(let list in this.Collectionoptionss) {
+          if(!this.Collectionoptionss[list].fFeeid){
+            this.$message.error("请选择收款信息费用名称!");
+            return false;
+          }
+        }
+      }else {
+        this.$message.error("请选择需要的收款信息!");
+        return false;
+      }
       if (this.Printinglist.length > 0) {
         for (let warehouseCr in this.Printinglist) {
           if (
@@ -3022,6 +3027,7 @@ export default {
       } else {
         this.$message.error("请选择需要打印的明细!");
       }
+      
     },
     // 收款信息
     addCollection() {
@@ -3051,7 +3057,7 @@ export default {
         fExrate: "1",
         fCxrate: null,
         fRate: null,
-        remarks: null,
+        remarks: null
       });
     },
     queryUser() {
@@ -3064,7 +3070,6 @@ export default {
           this.$set(this.form, "fIfdamage", "1");
           this.$set(this.form, "fIfweigh", "1");
           this.$set(this.form, "fTrademodeid", "1");
-          // this.$set(this.relevantAttachments, "opUserName", this.userVal.userName);
           this.$set(this.form, "createTime", Date.parse(new Date()));
         }
         if (response.dept !== null) {
@@ -3102,10 +3107,6 @@ export default {
     },
     // 导入计划重量
     costList() {
-      console.log(this.planningList.fPlanqty);
-      console.log(this.form.fPlanqty);
-      console.log(this.mum);
-      console.log(this.fQty);
       if (Number(this.planningList.fPlanqty) > Number(this.form.fPlanqty)) {
         console.log(this.planningList.fPlanqty);
         console.log(this.form.fPlanqty);
@@ -3127,11 +3128,8 @@ export default {
         fGoodsid: null,
         fCntrtype: null,
         fCntqty: 1,
-        // fPlangrossweight: 0,
-        // fPlannetweight: 0,
         fNetweight: this.planningList.fPlannetweight,
         fPlanvolumn: 0,
-        // fPlanqty: 0,
         fGrossweight: this.planningList.fPlangrossweight,
         fQty: this.planningList.fPlanqty,
         fPackagespecs: null,
@@ -3148,7 +3146,6 @@ export default {
     // 导入付款信息
     whgenlegData() {
       console.log(this.dialogWhgenlegList);
-      console.log("...(");
       if (this.dialogWhgenlegList.length === 0) {
         this.$message({
           message: "请选择需要导入的数据",
@@ -3171,8 +3168,10 @@ export default {
           });
         }
         for(let list in this.warehouseDrList) {
+          console.log(this.warehouseDrList)
+          
            if(this.warehouseDrList[list].fFeeUnitid == 1){
-             this.$set(this.warehouseDrList[list], "fQty", this.fQty);
+             this.$set(this.warehouseDrList[list], "fQty", this.fQty);  
            } else if(this.warehouseDrList[list].fFeeUnitid == 2) {
              this.$set(this.warehouseDrList[list], "fQty", this.fGrossweight);
            } else if(this.warehouseDrList[list].fFeeUnitid == 3) {
@@ -3180,8 +3179,8 @@ export default {
            } else{
              this.$set(this.warehouseDrList[list], "fQty", 0);
            }
-           
-        } 
+           this.$set(this.warehouseDrList[list], "fAmount", Number(this.warehouseDrList[list].fUnitprice) * Number(this.warehouseDrList[list].fQty));
+        }
         this.warehousingagreement = false;
       }
     },
@@ -3217,7 +3216,7 @@ export default {
            } else{
              this.$set(this.warehouseCrList[list], "fQty", 0);
            }
-           
+            this.$set(this.warehouseCrList[list], "fAmount", Number(this.warehouseCrList[list].fUnitprice) * Number(this.warehouseCrList[list].fQty));
         } 
         this.warehousingagreements = false;
       }
@@ -3333,25 +3332,20 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      console.log(selection);
       this.ids = selection.map((item) => item.fId);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
     // 库存明细多选
     Selectinventory(selection) {
-      console.log(selection);
-      console.log(this.form);
       this.Printinglist = selection;
       this.Printinglists = selection;
-      console.log(this.Printinglist); 
       this.dataListSelection = [];
       this.dataWithdrawList = [];
       if (!selection || selection.length === 0) {
         return false;
       } else {
         for (let se in selection) {
-          console.log(selection)
           if (!selection[se].fBillstatus || selection[se].fBillstatus !== 40) {
             this.dataListSelection.push(selection[se]);
           } else if (
@@ -3364,7 +3358,6 @@ export default {
           }
         }
         if (this.dataListSelection.length > 0) {
-          console.log(selection);
           this.fTruckno = selection[0].fTruckno;
           this.fCntrtype = selection[0].fCntrtype;
           this.fGoodsids = selection[0].fGoodsids;
@@ -3385,9 +3378,20 @@ export default {
       }
     },
 
-    // 收款选择
+    // 收款选
     Collectionoptions(selection) {
       this.Collectionoptionss = selection;
+      for(let lest in this.fWbuOptions){
+          for(let li in this.Collectionoptionss){
+            if(this.fWbuOptions[lest].fId == this.Collectionoptionss[li].fFeeid){
+              this.$set(
+            this.Collectionoptionss[li],
+            "fFeeids",
+            this.fWbuOptions[lest].fName
+          );
+            }
+          }
+      }
     },
     // 收款删除
     deleteRow(index, rows) {
@@ -3486,7 +3490,7 @@ export default {
           this.$set(
             this.warehouseCrList[cr],
             "fFeeUnitid",
-            this.warehouseCrList[cr].fFeeUnitid + ""
+            this.warehouseCrList[cr].fFeeunitid + ""
           );
         }
         this.userOptions = response.data.sysUser;
@@ -3552,7 +3556,6 @@ export default {
               }
               return prev + curr;
             } else {
-              alert();
               if (column.property === "fQty") {
                 this.fQty = prev;
                 this.mum = prev;
@@ -3563,7 +3566,6 @@ export default {
         }
       });
       this.sums = sums;
-      // this.dataList = []
       return sums;
     },
     // 付款合计
@@ -3664,8 +3666,6 @@ export default {
     },
     // 变更计价单位
     changeFeeUnit(row) {
-      console.log(this.fCntqty);
-      console.log(row);
       if (!row.fFeeUnitid) {
         return false;
       }
@@ -3886,8 +3886,9 @@ export default {
         this.fid = response.data;
         this.formBrowseStatus = false;
         this.msgSuccess("撤销入账成功");
-        this.$refs.tableList.clearSelection();
+        
         console.log(this.dataWithdrawList)
+        console.log(this.dataList)
         for (let li in this.dataWithdrawList) {
           for (let i in this.dataList) {
             let fQty = this.dataList[i].fQty === this.dataWithdrawList[li].fQty;
@@ -3915,11 +3916,11 @@ export default {
               fNetweight &&
               fQty
             ) {
-              alert("222")
               this.$set(this.dataList[i], "fBillstatus", 10);
             }
           }
         }
+        this.$refs.tableList.clearSelection();
       });
     },
     // 卸货按钮
@@ -3928,7 +3929,7 @@ export default {
         console.log(this.Printinglist);
         for (let warehouseCr in this.Printinglist) {
           if (this.Printinglist[warehouseCr].fBillstatus === 10) {
-            this.$message.error("请先打印");
+            this.$message.error("请先打印作业单");
             return false;
           }
           if (this.Printinglist[warehouseCr].fBillstatus === 30) {

src/views/warehouseBusiness/outStock/index.vue

@@ -197,7 +197,7 @@
           >修改
         </el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="danger"
           icon="el-icon-delete"
@@ -207,7 +207,7 @@
           v-hasPermi="['warehouseBusiness:warehousebills:remove']"
           >删除
         </el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -558,7 +558,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="计费单位" prop="ffeetunit">
+            <el-form-item label="计费单位" prop="fFeetunit">
               <el-select
                 v-model="form.fFeetunit"
                 placeholder="请选择计费单位"
@@ -1048,9 +1048,10 @@
           label="*出库件数"
         >
           <template slot-scope="scope">
+             <!-- @change="qtyChange(scope.row)" -->
             <el-input
               oninput='this.value=this.value.replace(/[^\-?\d]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "")'
-              @change="qtyChange(scope.row)"
+             
               v-model="scope.row.fQty"
               :disabled="
                 browseStatus ||
@@ -1268,15 +1269,15 @@
         </el-table-column>
 
         <el-table-column
-          prop="fDriverIdCa"
+          prop="fDriverIdCar"
           header-align="center"
-          width="130px"
+          width="200px"
           align="center"
           label="*司机身份证"
         >
           <template slot-scope="scope">
             <el-input
-              v-model="scope.row.fDriverIdCa"
+              v-model="scope.row.fDriverIdCar"
               placeholder="司机身份证"
               :disabled="
                 browseStatus ||
@@ -1301,12 +1302,7 @@
                 v-model="scope.row.fIsPass"
                 placeholder="是否放行"
                 clearable
-                :disabled="
-                browseStatus ||
-                scope.row.fBillstatus === 20 ||
-                scope.row.fBillstatus === 30 ||
-                scope.row.fBillstatus === 40
-              "
+                disabled
                 style="width: 80%"
               >
                 <el-option
@@ -2129,7 +2125,7 @@
                 v-model="scope.row.fFeeUnitid"
                 placeholder="请选择计费单位"
                 @change="changeFeeUnit(scope.row)"
-                :disabled="browseStatus"
+                disabled
                 clearable
               >
                 <el-option
@@ -2215,9 +2211,9 @@
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fFeeUnitid"
-                placeholder="请选择计费单位"
+                placeholder="请选择计价单位"
                 @change="changeFeeUnit(scope.row)"
-                :disabled="browseStatus"
+                disabled
                 clearable
               >
                 <el-option
@@ -2656,20 +2652,7 @@
             <td width="200">{{ item.fTruckno }}</td>
             <td width="200">货物品名</td>
             <td width="200" colspan="4" class="zzss">
-               <el-select
-              v-model="item.fGoodsid"
-              filterable
-              remote
-              :remote-method="goodsRemoteMethod"
-              placeholder="请选择品名"
-            >
-              <el-option
-                v-for="(dict, index) in goodsOptions"
-                :key="index.fId"
-                :label="dict.fName"
-                :value="dict.fId"
-              ></el-option>
-            </el-select>
+               {{ item.fGoodsids }}
             </td>
           </tr>
           <tr>
@@ -2679,10 +2662,10 @@
             <td>备注:</td>
             <td colspan="5"></td>
           </tr>
-          <tr>
+          <tr v-for="(item, indexe) in Collectionoptionss" :key="indexe+'index'">
             <td>收费</td>
-            <td>装箱费</td>
-            <td>元</td>
+            <td>{{item.fFeeids}}</td>
+            <td>{{item.fAmount}} 元</td>
             <td colspan="4">办单费：5元，过磅费自理</td>
           </tr>
           <tr>
@@ -2817,6 +2800,7 @@ export default {
       warehouseCrList: [],
       warehouseDrList: [],
       Printinglist: [],
+      Collectionoptionss: [],
       browseStatus: false,
       relevantAttachments: [],
       // 非单个禁用
@@ -2973,7 +2957,7 @@ export default {
           },
         ],
         fMarks: [{ required: true, message: " ", trigger: "blur" }],
-
+        fFeetunit: [{ required: true, message: " ", trigger: "blur" }],
         fFeeUnitid: [{ required: true, message: " ", trigger: "blur" }],
         fChargedate: [{ required: true, message: " ", trigger: "blur" }],
         fBillingway: [{ required: true, message: " ", trigger: "blur" }],
@@ -3059,6 +3043,7 @@ export default {
         scanStyles: false,
       });
       this.addList();
+      this.editDialogVisible_sss = false;
     },
     // 新增附件上传
     addRelevt() {
@@ -3188,6 +3173,20 @@ export default {
             fRate: this.fTaxrate
           });
         }
+         for(let list in this.warehouseDrList) {
+          console.log(this.warehouseDrList)
+          
+           if(this.warehouseDrList[list].fFeeUnitid == 1){
+             this.$set(this.warehouseDrList[list], "fQty", this.fQty);  
+           } else if(this.warehouseDrList[list].fFeeUnitid == 2) {
+             this.$set(this.warehouseDrList[list], "fQty", this.fGrossweight);
+           } else if(this.warehouseDrList[list].fFeeUnitid == 3) {
+            this.$set(this.warehouseDrList[list], "fQty", this.fNetweight);
+           } else{
+             this.$set(this.warehouseDrList[list], "fQty", 0);
+           }
+           this.$set(this.warehouseDrList[list], "fAmount", Number(this.warehouseDrList[list].fUnitprice) * Number(this.warehouseDrList[list].fQty));
+        }
         this.warehousingagreement = false;
       }
     },
@@ -3214,6 +3213,18 @@ export default {
             fRate: this.fTaxrate
           });
         }
+        for(let list in this.warehouseCrList) {
+           if(this.warehouseCrList[list].fFeeUnitid == 1){
+             this.$set(this.warehouseCrList[list], "fQty", this.fQty);
+           } else if(this.warehouseCrList[list].fFeeUnitid == 2) {
+             this.$set(this.warehouseCrList[list], "fQty", this.fGrossweight);
+           } else if(this.warehouseCrList[list].fFeeUnitid == 3) {
+            this.$set(this.warehouseCrList[list], "fQty", this.fNetweight);
+           } else{
+             this.$set(this.warehouseCrList[list], "fQty", 0);
+           }
+            this.$set(this.warehouseCrList[list], "fAmount", Number(this.warehouseCrList[list].fUnitprice) * Number(this.warehouseCrList[list].fQty));
+        } 
         this.warehousingagreements = false;
       }
     },
@@ -3254,6 +3265,7 @@ export default {
         if (!this.form.fMblno || this.form.fMblno === "") {
           this.$set(this.form, "fMblno", this.dialogWhgenlegList[whgen].fMblno);
         }
+        console.log(this.dialogWhgenlegList)
         this.dataList.push({
           fMblno: this.dialogWhgenlegList[whgen].fMblno,
           fGoodsid: this.dialogWhgenlegList[whgen].fGoodsid,
@@ -3281,6 +3293,11 @@ export default {
           remark: null,
           fIsPass: 1 + ''
         });
+        console.log(this.dataList)
+        console.log(this.goodsOptions)
+        // for(let list in this.dataList) {
+        //   this.$set(this.dataList[list], "fGoodsid", this.dataList[list].fGoodsids);
+        // }
       }
       this.whgenlegVisible = false;
     },
@@ -3331,6 +3348,17 @@ export default {
           return false;
         }
       }
+       if (this.Collectionoptionss.length > 0) {
+        for(let list in this.Collectionoptionss) {
+          if(!this.Collectionoptionss[list].fFeeid){
+            this.$message.error("请选择收款信息费用名称!");
+            return false;
+          }
+        }
+      }else {
+        this.$message.error("请选择需要的收款信息!");
+        return false;
+      }
       if (this.Printinglist.length > 0) {
         for (let warehouseCr in this.Printinglist) {
           if (
@@ -3377,7 +3405,6 @@ export default {
             }
         }
         this.editDialogVisible_sss = true;
-        // this.addList()
       } else {
         this.$message.error("请选择需要打印的明细!");
       }
@@ -3422,7 +3449,6 @@ export default {
             }
         }
         this.editDialogVisible_sss = true;
-        // this.addList()
       } else {
         this.$message.error("请选择需要打印的明细!");
       }
@@ -3645,6 +3671,13 @@ export default {
             this.formBrowseStatus = false;
           }
         }
+        if(response.data.warehouseBillsItem) {
+          for (let li in response.data.warehouseBillsItem){
+            if(response.data.warehouseBillsItem[li] != 10){
+              this.formBrowseStatus = true;
+            }
+          }
+        }
         if (response.data.corps) {
           this.fMblnoOptions = response.data.corps;
           this.KHblnoOptions = response.data.corps;
@@ -3662,11 +3695,11 @@ export default {
             if (!this.form.fMblno) {
               this.$set(this.form, "fMblno", this.dataList[list].fMblno);
             }
-            this.$set(
-              this.dataList[list],
-              "fGoodsids",
-              this.dataList[list].fGoodsid
-            );
+            // this.$set(
+            //   this.dataList[list],
+            //   "fGoodsids",
+            //   this.dataList[list].fGoodsid
+            // );
             this.$set(
               this.dataList[list],
               "fBsdate",
@@ -3683,7 +3716,7 @@ export default {
             this.$set(
               this.warehouseDrList[dr],
               "fFeeUnitid",
-              this.warehouseDrList[dr].fFeeUnitid + ""
+              this.warehouseDrList[dr].fFeeunitid + ""
             );
           }
         }
@@ -3694,7 +3727,7 @@ export default {
             this.$set(
               this.warehouseCrList[cr],
               "fFeeUnitid",
-              this.warehouseCrList[cr].fFeeUnitid + ""
+              this.warehouseCrList[cr].fFeeunitid + ""
             );
           }
         }
@@ -3766,6 +3799,18 @@ export default {
     // 选择按钮
     Collectionoptions(selection) {
       console.log(selection);
+      this.Collectionoptionss = selection;
+      for(let lest in this.fWbuOptions){
+          for(let li in this.Collectionoptionss){
+            if(this.fWbuOptions[lest].fId == this.Collectionoptionss[li].fFeeid){
+              this.$set(
+            this.Collectionoptionss[li],
+            "fFeeids",
+            this.fWbuOptions[lest].fName
+          );
+            }
+          }
+      }
     },
     changefCorpid(row) {
       this.$set(row, "fSbu", row.fCorpid);
@@ -3901,7 +3946,7 @@ export default {
       this.$refs["form"].validate((valid) => {
         for (let warehouseCr in this.dataListSelection) {
            if (this.dataListSelection[warehouseCr].fBillstatus === 20) {
-            this.$message.error("请先卸货");
+            this.$message.error("请先装货");
             return false;
           }
           if (this.dataListSelection[warehouseCr].fBillstatus != 30) {
@@ -4026,13 +4071,20 @@ export default {
               for (let i in this.dataList) {
                 let fQty =
                   this.dataList[i].fQty === this.dataListSelection[li].fQty;
-
+                let fMblno =
+                  this.dataList[i].fMblno === this.dataListSelection[li].fMblno;
+                let fBillstatus =
+                  this.dataList[i].fBillstatus ===
+                  this.dataListSelection[li].fBillstatus;
+                let fPackagespecs =
+                  this.dataList[i].fPackagespecs ===
+                  this.dataListSelection[li].fPackagespecs;
+                let fWarehouselocid =
+                  this.dataList[i].fWarehouselocid ===
+                  this.dataListSelection[li].fWarehouselocid;
                 let fGoodsid =
                   this.dataList[i].fGoodsid ===
                   this.dataListSelection[li].fGoodsid;
-                let fcntrtype =
-                  this.dataList[i].fcntrtype ===
-                  this.dataListSelection[li].fcntrtype;
                 let fNetweight =
                   this.dataList[i].fNetweight ===
                   this.dataListSelection[li].fNetweight;
@@ -4040,13 +4092,19 @@ export default {
                   this.dataList[i].fGrossweight ===
                   this.dataListSelection[li].fGrossweight;
                 if (
+                  fMblno &&
                   fGoodsid &&
-                  fcntrtype &&
+                  fBillstatus &&
+                  fPackagespecs &&
+                  fWarehouselocid &&
                   fGrossweight &&
                   fNetweight &&
                   fQty
                 ) {
                   this.$set(this.dataList[i], "fBillstatus", 20);
+                  for(let list in response.data.warehousebillsitems){
+                    this.$set(this.dataList[i], "fSerialNumber", response.data.warehousebillsitems[list].fSerialNumber);
+                  }
                 }
               }
               // }
@@ -4072,7 +4130,6 @@ export default {
         this.fid = response.data;
         this.formBrowseStatus = false;
         this.msgSuccess("撤销入账成功");
-        this.$refs.tableList.clearSelection();
         for (let li in this.dataWithdrawList) {
           for (let i in this.dataList) {
             let fQty = this.dataList[i].fQty === this.dataWithdrawList[li].fQty;
@@ -4101,6 +4158,7 @@ export default {
             }
           }
         }
+        this.$refs.tableList.clearSelection();
       });
     },
      // 装货按钮
@@ -4108,15 +4166,15 @@ export default {
      if (this.Printinglist.length > 0) {
         for (let warehouseCr in this.Printinglist) {
           console.log(this.Printinglist);
-           if (this.dataListSelection[warehouseCr].fBillstatus === 10) {
-            this.$message.error("请先打印");
+           if (this.Printinglist[warehouseCr].fBillstatus === 10) {
+            this.$message.error("请先打印作业单");
             return false;
-          }if (this.dataListSelection[warehouseCr].fBillstatus === 30) {
-            this.$message.error("请勿重复卸货");
+          }if (this.Printinglist[warehouseCr].fBillstatus === 30) {
+            this.$message.error("请勿重复装货");
             return false;
           }
           if (this.Printinglist[warehouseCr].fBillstatus === 40) {
-            this.$message.error("请勿重复卸货");
+            this.$message.error("请勿重复装货");
             return false;
           }
           
@@ -4144,27 +4202,31 @@ export default {
                 console.log(this.dataListSelection);
                 console.log(this.dataList)
               for (let li in this.dataListSelection) {
-              for (let i in this.dataList) {
-                let fQty =
-                  this.dataList[i].fQty === this.dataListSelection[li].fQty;
-                let fGoodsid =
-                  this.dataList[i].fGoodsid ===
-                  this.dataListSelection[li].fGoodsid;
-                let fcntrtype =
-                  this.dataList[i].fcntrtype ===
-                  this.dataListSelection[li].fcntrtype;
-                let fNetweight =
-                  this.dataList[i].fNetweight ===
-                  this.dataListSelection[li].fNetweight;
-                let fGrossweight =
-                  this.dataList[i].fGrossweight ===
-                  this.dataListSelection[li].fGrossweight;
-                if (
-                  fGoodsid &&
-                  fcntrtype &&
-                  fGrossweight &&
-                  fNetweight &&
-                  fQty
+                for (let i in this.dataList) {
+                  let fQty =
+                    this.dataList[i].fQty === this.dataListSelection[li].fQty;
+                  let fBsdate =
+                    this.dataList[i].fBsdate ===
+                    this.dataListSelection[li].fBsdate;
+                  let fGoodsid =
+                    this.dataList[i].fGoodsid ===
+                    this.dataListSelection[li].fGoodsid;
+                  let fcntrtype =
+                    this.dataList[i].fcntrtype ===
+                    this.dataListSelection[li].fcntrtype;
+                  let fNetweight =
+                    this.dataList[i].fNetweight ===
+                    this.dataListSelection[li].fNetweight;
+                  let fGrossweight =
+                    this.dataList[i].fGrossweight ===
+                    this.dataListSelection[li].fGrossweight;
+                  if (
+                    fBsdate &&
+                    fGoodsid &&
+                    fcntrtype &&
+                    fGrossweight &&
+                    fNetweight &&
+                    fQty
                 ) {
                   this.$set(this.dataList[i], "fBillstatus", 30);
                 }
@@ -4284,8 +4346,7 @@ export default {
           if (!this.form.fId) {
             this.form.fId = this.fid;
           }
-        }
-      });
+        
        let formDatae = new window.FormData();
           // 附件数据
           formDatae.append("tWarehouseBills", JSON.stringify(this.form));
@@ -4317,19 +4378,11 @@ export default {
       addWarehousebills(formDatae).then((response) => {
             this.msgSuccess("保存成功");
             this.dataList = response.data.warehousebillsitems;
-            console.log(response.data.warehousebillsitems)
-            console.log(this.dataList)
-            // for (let list in this.dataList) {
-            //   this.$set(
-            //     this.dataList[list],
-            //     "fGoodsids",
-            //     Date.parse(this.dataList[list].fGoodsid + '')
-            //   );
-            // }
             this.fid = response.data.warehouseBills.fId;
-              // this.open = true;
             this.getList();
           });
+          }
+      });
     },
     // 请核成功
     pleaseCheck () {
@@ -4338,18 +4391,6 @@ export default {
             this.$message.error("请新增库存明细!");
             return false;
           }
-          // if (this.relevantAttachments.length === 0) {
-          //   this.$message.error("请新增附件上传!");
-          //   return false;
-          // }
-          if (this.warehouseDrList.length === 0) {
-            this.$message.error("请新增收款信息!");
-            return false;
-          }
-          if (this.warehouseCrList.length === 0) {
-            this.$message.error("请新增付款信息!");
-            return false;
-          }
           for (let list in this.dataList) {
             if (!this.dataList[list].fWarehouselocid) {
               this.$message.error("请输入库区!");
@@ -4375,24 +4416,6 @@ export default {
               return false;
             }
           }
-          // for (let list in this.relevantAttachments) {
-          //   if (this.relevantAttachments[list].fName === null) {
-          //     this.$message.error("请输入附件名称!");
-          //     return false;
-          //   }
-          // }
-          for (let list in this.warehouseDrList) {
-            if (!this.warehouseDrList[list].fCorpid) {
-              this.$message.error("请选择客户名称");
-              return false;
-            }
-          }
-          for (let list in this.warehouseCrList) {
-            if (!this.warehouseCrList[list].fCorpid) {
-              this.$message.error("请选择客户名称");
-              return false;
-            }
-          }
         if (valid) {
           this.form.fBillstatus = status;
           this.form.fNetweight = this.fNetweight;
@@ -4405,7 +4428,7 @@ export default {
           if (!this.form.fId) {
             this.form.fId = this.fid;
           }
-        }
+        
       
        let formData = new window.FormData();
           // 附件数据
@@ -4445,6 +4468,7 @@ export default {
               this.open = false;
             this.getList();
           });
+          }
           });
     },
     /** 删除按钮操作 */
@@ -4483,31 +4507,31 @@ export default {
         });
     },
     // 出库件数的计算
-    qtyChange(row) {
-      if (!row.fQty || row.fQty === "") {
-        this.$set(row, "fNetweight", 0);
-        this.$set(row, "fGrossweight", 0);
-        return false;
-      }
-      // 净重 fPlannetweight
-      // 毛重 fPlangrossweight
-      let netweight = parseFloat(
-        Number(row.fPlannetweight) / Number(row.fPlanqty)
-      ).toFixed(6);
-      let grossweigh = parseFloat(
-        Number(row.fPlangrossweight) / Number(row.fPlanqty)
-      ).toFixed(6);
-      this.$set(
-        row,
-        "fNetweight",
-        parseFloat(Number(netweight) * Number(row.fQty)).toFixed(6)
-      );
-      this.$set(
-        row,
-        "fGrossweight",
-        parseFloat(Number(grossweigh) * Number(row.fQty)).toFixed(6)
-      );
-    },
+    // qtyChange(row) {
+    //   if (!row.fQty || row.fQty === "") {
+    //     this.$set(row, "fNetweight", 0);
+    //     this.$set(row, "fGrossweight", 0);
+    //     return false;
+    //   }
+    //   // 净重 fPlannetweight
+    //   // 毛重 fPlangrossweight
+    //   let netweight = parseFloat(
+    //     Number(row.fPlannetweight) / Number(row.fPlanqty)
+    //   ).toFixed(6);
+    //   let grossweigh = parseFloat(
+    //     Number(row.fPlangrossweight) / Number(row.fPlanqty)
+    //   ).toFixed(6);
+    //   this.$set(
+    //     row,
+    //     "fNetweight",
+    //     parseFloat(Number(netweight) * Number(row.fQty)).toFixed(6)
+    //   );
+    //   this.$set(
+    //     row,
+    //     "fGrossweight",
+    //     parseFloat(Number(grossweigh) * Number(row.fQty)).toFixed(6)
+    //   );
+    // },
     deleteRow(index, rows) {
       rows.splice(index, 1);
     },
@@ -4610,7 +4634,7 @@ export default {
   text-align: center;
 }
 .biaoge > tr > td {
-  height: 30px;
+  height: 50px;
   text-align: center;
   border-right: 1px solid #dfe6ec !important;
   order-bottom: 1px solid #dfe6ec !important;