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

src/api/warehouseBusiness/warehouseInStock.js

@@ -26,7 +26,16 @@ export function addWarehousebills(data) {
   })
 }
 
-// 入库详情信息入账
+// 撤销入库
+export function updateCredit(data) {
+  return request({
+    url: '/warehouseBusiness/inStock/updateCredit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 入库确认
 export function addWhgenleg(data) {
   return request({
     url: '/warehouseBusiness/inStock/addCredit',

src/views/agreement/agreementTask/index.vue

@@ -536,6 +536,7 @@ export default {
     getList() {
       this.loading = true
       listAgreement(this.queryParams).then(response => {
+        console.log(response)
         this.agreementList = response.rows
         this.total = response.total
         this.loading = false

src/views/basicdata/corps/index.vue

@@ -525,12 +525,18 @@
         form: {},
         // 表单校验
         rules: {
+           fTypeid: [
+            { required: true, message: "客户类别不能为空", trigger: "blur" }
+          ],
           fNo: [
             { required: true, message: "编号不能为空", trigger: "blur" }
           ],
           fName: [
             { required: true, message: "名称不能为空", trigger: "blur" }
           ],
+          fCname:[
+            { required: true, message: "简称不能为空", trigger: "blur" }
+          ],
           fStatus: [
             { required: true, message: "状态默认 T ,正常T 停用F 下拉选择不能为空", trigger: "blur" }
           ],

src/views/basicdata/fees/index.vue

@@ -42,7 +42,7 @@
       <el-form-item label="币种" prop="fCurrency">
         <el-input
           v-model="queryParams.fCurrency"
-          placeholder="请输入币种"
+          placeholder="默认RMB"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"

src/views/warehouseBusiness/agreement/index.vue

@@ -556,6 +556,7 @@ export default {
     getList() {
       this.loading = true
       listAgreement(this.queryParams).then(response => {
+        console.log(response)
         this.agreementList = response.rows
         this.total = response.total
         this.loading = false

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -527,6 +527,15 @@
                   placeholder="唛头"
                 />
               </el-form-item>
+            </el-col><el-col :span="8">
+              <el-form-item label="业务编号" prop="fBillno">
+                <el-input
+                  v-model="form.fBillno"
+                  style="width: 80%"
+                  :disabled="browseStatus"
+                  placeholder="业务编号"
+                />
+              </el-form-item>
             </el-col>
         </el-row>
         <el-button type="primary" @click="submitForm(2)">保 存</el-button>

src/views/warehouseBusiness/inStock/index.vue

@@ -371,7 +371,7 @@
                 v-model="form.fStltypeid"
                 placeholder="请选择结算方式"
                 clearable
-                :disabled="browseStatus || formBrowseStatus"
+                :disabled="browseStatus"
                 style="width: 80%"
               >
                 <el-option
@@ -436,6 +436,7 @@
                 filterable
                 :disabled="browseStatus || formBrowseStatus"
                 remote
+                @change="changefWarehouseid()"
                 style="width: 80%"
                 :remote-method="warehouseRemoteMethod"
                 placeholder="请输入模糊查找"
@@ -468,7 +469,7 @@
                 v-model="form.fIfdamage"
                 placeholder="请选择是否破损"
                 clearable
-                :disabled="browseStatus || formBrowseStatus"
+                :disabled="browseStatus"
                 style="width: 80%"
               >
                 <el-option
@@ -486,7 +487,7 @@
                 v-model="form.fIfweigh"
                 placeholder="请选择是否过磅"
                 clearable
-                :disabled="browseStatus || formBrowseStatus"
+                :disabled="browseStatus"
                 style="width: 80%"
               >
                 <el-option
@@ -507,7 +508,7 @@
                 v-model="form.fIfpledge"
                 placeholder="请选择是否过磅"
                 clearable
-                :disabled="browseStatus || formBrowseStatus"
+                :disabled="browseStatus"
                 style="width: 80%"
               >
                 <el-option
@@ -527,7 +528,7 @@
                 remote
                 clearable
                 style="width: 80%"
-                :disabled="browseStatus || formBrowseStatus"
+                :disabled="browseStatus"
                 @keyup.enter.native="handleQuery"
                 :remote-method="corpsRemoteMethodd"
                 placeholder="请输入模糊查找"
@@ -737,22 +738,51 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item disabled label="仓储计费日期" prop="fChargedate">
+                <el-date-picker
+                  v-model="form.fChargedate"
+                  size="large"
+                  type="date"
+                  value-format="timestamp"
+                  placeholder="仓储计费日期"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="计费方式" prop="fBillingway">
+                <el-select
+                  v-model="form.fBillingway"
+                  filterable
+                  style="width: 80%"
+                  remote
+                >
+                  <el-option
+                v-for="(dict, index) in jFeetunitOptions"
+                :key="index.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            </el-row>
         </div>
       </el-form>
 
       <div class="dialogTableTitle flex a-center jlr" style="display:flex;justify-content:space-between;align-items:center;margin: 10px 0;">
-        
+
         <div>
           <el-button type="primary" :disabled="browseStatus" @click.prevent="addRelevant()"
           >新行
         </el-button>
-        <el-button :disabled="dataListSelection.length <= 0" @click.prevent="creditClick()"
+        <el-button :disabled="dataListSelection.length <= 0" @click.prevent="creditClick"
           >入库确认
         </el-button>
-        <!-- <el-button :disabled="browseStatus" @click.prevent="deleteRoww(warehouseDrList)"
-          >删除
-        </el-button> -->
+        <el-button :disabled="dataWithdrawList.length <= 0" @click.prevent="withdrawClick">撤回入库</el-button>
         <el-button :disabled="browseStatus" type="primary" @click="submitForm(2)">保 存</el-button>
         </div>
         <div>
@@ -1143,7 +1173,7 @@
           >新行
         </el-button>
         </div>
-         <div>附件明细</div>
+         <div style="font-size:18px">附件明细</div>
       </div>
       <el-table
         :data="relevantAttachments"
@@ -1182,8 +1212,8 @@
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.createBy"
-              :disabled="browseStatus"
-              placeholder="默认登陆人"
+              disabled
+              placeholder="上传人"
               show-word-limit
             />
           </template>
@@ -1479,7 +1509,7 @@
         <!-- <el-button type="warning">仓储费协议</el-button> -->
         <el-button type="danger">作业费协议</el-button></div>
         <div style="font-size:18px">付款信息</div>
-  
+
       </div>
       <el-table
         :data="warehouseCrList"
@@ -1728,14 +1758,14 @@
       </div>
       <!-- 选择库存总账数据 -->
       <el-dialog
-        title="仓储费协议"
+        title="作业费协议"
         :modal="false"
         style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
         :visible.sync="warehousingagreement"
         width="70%"
       >
         <el-table
-          :data="whgenlegList"
+          :data="tasklegList"
           ref="table"
           tooltip-effect="dark"
           width="100%"
@@ -1744,11 +1774,13 @@
           @selection-change="whgenlegSelectionChange"
         >
           <el-table-column type="selection" width="55"> </el-table-column>
+          <el-table-column label="行号" type="index" width="80">
+            </el-table-column>
           <el-table-column
             prop="fMblno"
             header-align="center"
             align="center"
-            label="提单号"
+            label="费用名称"
           >
           </el-table-column>
           <el-table-column
@@ -1756,52 +1788,52 @@
             header-align="center"
             align="center"
             width="180px"
-            label="入库日期"
+            label="计价单位"
           >
           </el-table-column>
           <el-table-column
             prop="fGoodsid"
             header-align="center"
             align="center"
-            label="品名"
+            label="单价"
           >
           </el-table-column>
           <el-table-column
             prop="fQtyblc"
             header-align="center"
             align="center"
-            label="结余数量"
+            label="录入人"
           >
           </el-table-column>
           <el-table-column
             prop="fWarehouseLocationid"
             header-align="center"
             align="center"
-            label="库区"
+            label="录入时间"
           >
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             prop="fMarks"
             header-align="center"
             align="center"
             label="唛头"
           >
-          </el-table-column>
+          </el-table-column> -->
         </el-table>
         <pagination
           v-show="whgenlegTotal > 0"
           :total="whgenlegTotal"
-          :page.sync="whgenlegParams.pageNum"
-          :limit.sync="whgenlegParams.pageSize"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
           @pagination="getWhgenlegList"
         />
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="whgenlegData">导入</el-button>
+          <el-button type="primary" @click="">导入</el-button>
           <el-button @click="warehousingagreement = false">取 消</el-button>
         </div>
       </el-dialog>
       <el-dialog
-        title="入库页面"
+        title=""
         :modal="false"
         style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
         :visible.sync="editDialogVisible_s"
@@ -1922,7 +1954,7 @@
         <button @click="printSomething">打印</button>
       </el-dialog>
       <el-dialog
-        title="收货单打印"
+        title=""
         style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
         :visible.sync="editDialogVisible_ss"
         width="70%"
@@ -1950,25 +1982,26 @@
             <td width="400">{{fTruckno}}</td>
             <td
               width="500"
-              colspan="2"
+              colspan="4"
               style="padding-bottom: 0px; font-weight: bold; border: none"
               class="zzss"
             >
-              日期：
+              日期：{{fBsdate}}
             </td>
-            <td
+            <!-- <td
               width="500"
               colspan="2"
               style="padding-bottom: 0px; font-weight: bold; border: none"
               class="zzss"
             >
-              {{fBsdate}}
-            </td>
+              
+            </td> -->
           </tr>
           <tr v-for="(item,index) in dataListSelection" :key="index">
             <td width="250">货物品名:</td>
+            <!-- <td width="200" colspan="">1</td> -->
             <td width="250">{{item.fGoodsids}}</td>
-            <td width="250">白色聚吕</td>
+            <!-- <td width="250">白色聚吕</td> -->
             <!-- <td width="200" colspan="2">件数: 161件</td> -->
             <!-- <td width="200"></td> -->
             <td width="200" colspan="4" class="zzss">件数: {{item.fQty}}件</td>
@@ -2008,7 +2041,7 @@
         <button @click="printSomething">打印</button>
       </el-dialog>
        <el-dialog
-        title="收货单打印"
+        title=""
         style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
         :visible.sync="editDialogVisible_sss"
         width="70%"
@@ -2104,6 +2137,7 @@
 import print from "print-js";
 import {
   addWhgenleg,
+  updateCredit,
   listWarehousebills,
   getWarehousebills,
   delWarehousebills,
@@ -2111,7 +2145,7 @@ import {
   updateWarehousebills,
   exportWarehousebills,
 } from "@/api/warehouseBusiness/warehouseInStock";
-
+import { listAgreement } from '@/api/agreement/agreement';
 import { listCorps } from "@/api/basicdata/corps";
 
 import { listFees } from "@/api/basicdata/fees";
@@ -2191,11 +2225,13 @@ export default {
       // 货权方(客户数据)
       // 客户名称
       KHblnoOptions: [],
-      // 仓储费协议
-      whgenlegList: [],
+      // 作业费协议
+      tasklegList: [],
       whgenlegTotal: 0,
        // 库存明细入账数组
       dataListSelection: [],
+       // 库存明细撤回入账数组
+      dataWithdrawList: [],
       fSbuOptions: [],
       // 操作员
       userOptions: [],
@@ -2274,13 +2310,26 @@ export default {
         fCntrtype: null,
         fCntqty: null,
       },
-         // 库存总账参数
-      whgenlegParams: {
+         // 作业费参数
+      queryParams: {
         pageNum: 1,
         pageSize: 10,
-        fMblno: null,
+        fBillno: null,
+        fDeptid: null,
+        fContractno: null,
         fCorpid: null,
-        fWarehouseid: null,
+        fStltypeid: null,
+        fGoodsid: null,
+        fFeetypeid: null,
+        tPackages: null,
+        fTrademodeid: null,
+        fFreedays: null,
+        fBegindate: null,
+        fEnddate: null,
+        fBillstatus: null
+        // fMblno: null,
+        // fCorpid: null,
+        // fWarehouseid: null,
       },
       // 表单参数
       form: {
@@ -2302,9 +2351,15 @@ export default {
             trigger: "blur",
           },
         ],
+        fChargedate: [
+          { required: true, message: " ", trigger: "blur" },
+        ],
         fMarks: [
           { required: true, message: " ", trigger: "blur" },
         ],
+        fBillingway: [
+          { required: true, message: " ", trigger: "blur" },
+        ],
         fBsdate: [
           { required: true, message: " ", trigger: "blur" },
         ],
@@ -2390,7 +2445,7 @@ export default {
       this.relevantAttachments.push({
         fUrl: null,
         fName: null,
-        createBy: this.queryParams.createBy,
+        createBy: this.form.createBy,
         createTime: Date.parse(new Date()),
       });
     },
@@ -2400,6 +2455,7 @@ export default {
       this.dialogWhgenlegList = [];
       this.whgenlegTotal = 0;
       this.warehousingagreement = true;
+      // this.whgenlegData()
       this.getWhgenlegList();
     },
     // 新增list
@@ -2431,13 +2487,13 @@ export default {
 
     // 收货单打印界面
     showEditDialog_s() {
-      if(this.Printinglist.length>0) {
-      for(let aorp in this.Printinglist){
-          var date = new Date(this.Printinglist[aorp].fBsdate)
+      if(this.dataListSelection.length>0) {
+      for(let aorp in this.dataListSelection){
+          var date = new Date(this.dataListSelection[aorp].fBsdate)
           var Y = date.getFullYear() + '-'
           var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
           var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' '
-          this.$set(this.Printinglist[aorp], 'fBsdate', Y + M + D)
+          this.$set(this.dataListSelection[aorp], 'fBsdate', Y + M + D)
      }
 
       this.editDialogVisible_s = true;
@@ -2466,7 +2522,7 @@ export default {
       }
     },
     showEditDialog_sss() {
-       if(this.Printinglist.length>0) {
+       if(this.dataListSelection.length>0) {
       this.editDialogVisible_sss = true;
       }else {
         this.$message.error("请选择需要打印的明细!");
@@ -2531,14 +2587,25 @@ export default {
         this.loading = false;
       });
     },
-     // 查询仓储费信息
+     // 查询作业费信息
     getWhgenlegList() {
+      listAgreement(this.queryParams).then((response) => {
+        console.log(response)
+        this.tasklegList = response.rows;
+        console.log(this.whgenlegList);
+        this.whgenlegTotal = response.total;
+      });
 
     },
     // 导入仓储费协议
-    whgenlegData() {
-
-    },
+    // whgenlegData() {
+    //   listAgreement(this.queryParams).then(response => {
+    //     console.log(response)
+    //     this.agreementList = response.rows
+    //     this.total = response.total
+    //     this.loading = false
+    //   })
+    // },
     // 贸易方式(数据字典),对���t_trademodels 字典翻译
     fTrademodeidFormat(row, column) {
       return this.selectDictLabel(this.fTrademodeidOptions, row.fTrademodeid);
@@ -2664,11 +2731,13 @@ export default {
         for (let se in selection) {
           if (!selection[se].fBillstatus || selection[se].fBillstatus !== '6') {
             this.dataListSelection.push(selection[se]);
+          } else if (selection[se].fBillstatus && selection[se].fBillstatus === '6') {
+            this.dataWithdrawList.push(selection[se])
           }
         }
         if (this.dataListSelection.length > 0) {
           this.fTruckno = selection[0].fTruckno;
-           this.fCntrtype = selection[0].fCntrtype;
+          this.fCntrtype = selection[0].fCntrtype;
           this.fGoodsids = selection[0].fGoodsids;
           var date = new Date(selection[0].fBsdate)
           var Y = date.getFullYear() + '-'
@@ -2711,6 +2780,7 @@ export default {
       this.warehouseDrList = [];
       this.relevantAttachments = [];
       this.title = "入库单";
+      this.formBrowseStatus = false;
     },
     /** 修改按钮操作 */
     handleUpdate(row, status) {
@@ -2777,11 +2847,6 @@ export default {
         this.title = "修改仓入库";
       });
     },
-    // 库存明细多选框结果
-    dataListChange (row) {
-      console.log(JSON.stringify(row))
-      this.dataListSelection = row
-    },
      // 库存总账多选框
     whgenlegSelectionChange(selection) {
       this.dialogWhgenlegList = selection;
@@ -2863,6 +2928,7 @@ export default {
               return prev;
             }
           }, 0); // sums[index]
+
         }
       });
       this.sums = sums;
@@ -2908,15 +2974,16 @@ export default {
       }
       this.$set(row, "fAmount", Number(fUnitprice) * Number(fQty)).toFixed(2);
     },
-    changefBsdate(row) {
-      if (this.dataList.length > 0) {
-        for (var i = 0; i < this.dataList.length; i++) {
-          this.$set(this.dataList[i], "fBsdate", row);
-        }
-      }
-    },
     changefCorpid(row) {
        this.$set(row, "fSbu", row.fCorpid);
+       for(let corp in this.fMblnoOptions) {
+         if(row.fCorpid === this.fMblnoOptions[corp].fId) {
+           this.$set(this.form, "fStltypeid", this.fMblnoOptions[corp].fStltypeid + '');
+         }
+       }
+    },
+    changefWarehouseid(row) {
+        console.log(this.warehouseOptions)
     },
     // 变更计价单位
     changeFeeUnit(row) {
@@ -2963,11 +3030,11 @@ export default {
               return false;
             }
             if (!this.dataListSelection[warehouseCr].fQty) {
-              this.$message.error("入库件数");
+              this.$message.error("请选择入库件数");
               return false;
             }
             if (!this.dataListSelection[warehouseCr].fPackagespecs) {
-              this.$message.error("入库件数");
+              this.$message.error("请选择入库规格");
               return false;
             }
           }
@@ -2998,6 +3065,32 @@ export default {
         }
       })
     },
+    // 撤回入账
+    withdrawClick() {
+      // 撤回入库
+      let formData = new window.FormData();
+      formData.append("warehouseBills", JSON.stringify(this.form))
+      formData.append("warehousebillsitems", JSON.stringify(this.dataWithdrawList))
+      updateCredit(formData).then((response) => {
+        this.fid = response.data;
+        this.formBrowseStatus = false
+        this.msgSuccess("撤销入账成功");
+        this.$refs.table.clearSelection();
+        for (let li in this.dataWithdrawList) {
+          for (let i in this.dataList) {
+            let fQty = this.dataList[i].fQty === this.dataWithdrawList[li].fQty;
+            let fBsdate = this.dataList[i].fBsdate === this.dataWithdrawList[li].fBsdate;
+            let fGoodsid = this.dataList[i].fGoodsid === this.dataWithdrawList[li].fGoodsid;
+            let fcntrtype = this.dataList[i].fcntrtype === this.dataWithdrawList[li].fcntrtype;
+            let fNetweight = this.dataList[i].fNetweight === this.dataWithdrawList[li].fNetweight;
+            let fGrossweight = this.dataList[i].fGrossweight === this.dataWithdrawList[li].fGrossweight;
+            if (fBsdate && fGoodsid && fcntrtype && fGrossweight && fNetweight && fQty) {
+              this.$set(this.dataList[i], 'fBillstatus', '1')
+            }
+          }
+        }
+      })
+    },
     /** 提交按钮 */
     submitForm(status) {
       this.$refs["form"].validate((valid) => {
@@ -3024,12 +3117,6 @@ export default {
               return false;
             }
           }
-          // for (let relevant in this.relevantAttachments) {
-          //   if (!this.relevantAttachments[relevant].fName) {
-          //     this.$message.error("请输入附件名称!");
-          //     return false;
-          //   }
-          // }
           for (let warehouseDr in this.warehouseDrList) {
             if (!this.warehouseDrList[warehouseDr].fCorpid) {
               this.$message.error("请选择客户名称");
@@ -3084,7 +3171,12 @@ export default {
           formData.append("tWarehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
           addWarehousebills(formData).then((response) => {
             this.msgSuccess("提交成功");
-            this.open = false;
+            if(status === 2) {
+              this.open = true;
+            }else {
+              this.open = false;
+            }
+            
             this.getList();
           });
         }
@@ -3137,6 +3229,7 @@ export default {
       let queryParams = { pageNum: 1, pageSize: 10, fName: name, type: 1 };
       listCorps(queryParams).then((response) => {
         this.fMblnoOptions = response.rows;
+        console.log(response.rows)
         this.KHblnoOptions = response.rows;
       });
     },

src/views/warehouseBusiness/outStock/index.vue

@@ -742,7 +742,38 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item disabled label="仓储计费日期" prop="fChargedate">
+                <el-date-picker
+                  v-model="form.fChargedate"
+                  size="large"
+                  type="date"
+                  value-format="timestamp"
+                  placeholder="仓储计费日期"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="计费方式" prop="fBillingway">
+                <el-select
+                  v-model="form.fBillingway"
+                  filterable
+                  style="width: 80%"
+                  remote
+                >
+                  <el-option
+                v-for="(dict, index) in jFeetunitOptions"
+                :key="index.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            </el-row>
         </div>
       </el-form>
 
@@ -770,9 +801,9 @@
           >{{ detailsHidden ? "隐藏" : "展开" }}</el-button
         >
         <el-button type="primary" @click="submitForm(2)">保 存</el-button>
-        <el-button type="success" prop="打印" @click="showEditDialog_ss"
+        <!-- <el-button type="success" prop="打印" @click="showEditDialog_ss"
           >收货单
-        </el-button>
+        </el-button> -->
         <el-button type="warning" prop="打印" @click="showEditDialog_s"
           >出库单
         </el-button>
@@ -1133,8 +1164,8 @@
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.createBy"
-              :disabled="browseStatus"
-              placeholder="默认登陆人"
+              disabled
+              placeholder="上传人"
               show-word-limit
             />
           </template>
@@ -1655,9 +1686,9 @@
         </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
-        <el-button type="success" prop="打印" @click="showEditDialog_ss"
+        <!-- <el-button type="success" prop="打印" @click="showEditDialog_ss"
           >收货单
-        </el-button>
+        </el-button> -->
         <el-button type="warning" prop="打印" @click="showEditDialog_s"
           >出库单
         </el-button>
@@ -1702,7 +1733,7 @@
           >
           </el-table-column>
           <el-table-column
-            prop="fGoodsid"
+            prop="fGoodsids"
             header-align="center"
             align="center"
             label="品名"
@@ -1716,7 +1747,7 @@
           >
           </el-table-column>
           <el-table-column
-            prop="fWarehouseLocationid"
+            prop="fWarehouseLocationids"
             header-align="center"
             align="center"
             label="库区"
@@ -2257,6 +2288,12 @@ export default {
         fMarks: [
           { required: true, message: " ", trigger: "blur" },
         ],
+        fChargedate: [
+          { required: true, message: " ", trigger: "blur" },
+        ],
+        fBillingway: [
+          { required: true, message: " ", trigger: "blur" },
+        ],
         fBsdate: [{ required: true, message: " ", trigger: "blur" }],
         fTrademodeid: [{ required: true, message: " ", trigger: "blur" }],
         fSbu: [{ required: true, message: " ", trigger: "blur" }],
@@ -2336,7 +2373,7 @@ export default {
       this.relevantAttachments.push({
         fUrl: null,
         fName: null,
-        createBy: this.queryParams.createBy,
+        createBy: this.form.createBy,
         createTime: Date.parse(new Date()),
       });
     },
@@ -2643,6 +2680,7 @@ export default {
       this.warehouseDrList = [];
       this.relevantAttachments = [];
       this.title = "出库单";
+      this.formBrowseStatus = false;
     },
     /** 修改按钮操作 */
     handleUpdate(row, status) {
@@ -2761,8 +2799,12 @@ export default {
       console.log(selection);
     },
     changefCorpid(row) {
-      console.log(row);
       this.$set(row, "fSbu", row.fCorpid);
+      for(let corp in this.fMblnoOptions) {
+         if(row.fCorpid === this.fMblnoOptions[corp].fId) {
+           this.$set(this.form, "fStltypeid", this.fMblnoOptions[corp].fStltypeid + '');
+         }
+       }
     },
     // 合计
     getSummaries(param) {
@@ -2923,7 +2965,6 @@ export default {
                 let fGoodsid = this.dataList[i].fGoodsid === this.dataListSelection[li].fGoodsid;
                 let fNetweight = this.dataList[i].fNetweight === this.dataListSelection[li].fNetweight;
                 let fGrossweight = this.dataList[i].fGrossweight === this.dataListSelection[li].fGrossweight;
-                alert(fQty + fMblno + fBillstatus + fPackagespecs + fWarehouselocid + fGoodsid + fNetweight + fGrossweight)
                 if (fMblno && fGoodsid && fBillstatus && fPackagespecs && fWarehouselocid && fGrossweight && fNetweight && fQty) {
                   this.$set(this.dataList[i], 'fBillstatus', '6');
                 }
@@ -3035,7 +3076,11 @@ export default {
             );
             addWarehousebills(formData).then((response) => {
               this.msgSuccess("提交成功");
-              this.open = false;
+              if(status === 2) {
+              this.open = true;
+                }else {
+                  this.open = false;
+                }
               this.getList();
             });
           }