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

src/views/reportManagement/whgenleg/index.vue

@@ -1,100 +1,114 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="入库件数" prop="fQtyd">
-        <el-input
-          v-model="queryParams.fQtyd"
-          placeholder="请输入入库件数"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="入库尺码" prop="fVolumnd">
-        <el-input
-          v-model="queryParams.fVolumnd"
-          placeholder="请输入入库尺码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="入库毛重" prop="fGrossweightd">
-        <el-input
-          v-model="queryParams.fGrossweightd"
-          placeholder="请输入入库毛重"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="入库净重" prop="fNetweightd">
-        <el-input
-          v-model="queryParams.fNetweightd"
-          placeholder="请输入入库净重"
+      <el-form-item label="仓库" prop="fwarehouseid">
+        <el-select
+          v-model="queryParams.fWarehouseid"
+          filterable
+          :disabled="browseStatus"
+          remote
           clearable
           size="small"
+          :remote-method="warehouseRemoteMethod"
           @keyup.enter.native="handleQuery"
-        />
+          placeholder="请选择仓库"
+        >
+          <el-option
+            v-for="(dict, index) in warehouseOptions"
+            :key="index.fId"
+            :label="dict.fName"
+            :value="dict.fId"
+          ></el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="出口尺码" prop="fVolumnc">
-        <el-input
-          v-model="queryParams.fVolumnc"
-          placeholder="请输入出口尺码"
-          clearable
+      <el-form-item label="库区" prop="fWarehouseLocationid">
+        <el-select
+          v-model="queryParams.fWarehouseLocationid"
+          filterable
+          remote
           size="small"
-          @keyup.enter.native="handleQuery"
-        />
+          :disabled="browseStatus"
+          :remote-method="kqhouseRemoteMethod"
+          placeholder="请选择库区"
+        >
+          <el-option
+            v-for="(dict, index) in kqhouseOptions"
+            :key="index.fId"
+            :label="dict.fName"
+            :value="dict.fId"
+          ></el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="出库件数" prop="fQtyc">
-        <el-input
-          v-model="queryParams.fQtyc"
-          placeholder="请输入出库件数"
+      <el-form-item label="货物名称" prop="fgoodsid">
+        <el-select
+          v-model="queryParams.fGoodsid"
+          filterable
+          remote
           clearable
           size="small"
+          :remote-method="goodsRemoteMethod"
           @keyup.enter.native="handleQuery"
-        />
+          placeholder="请选择货物名称"
+        >
+          <el-option
+            v-for="(dict, index) in goodsOptions"
+            :key="index.fId"
+            :label="dict.fName"
+            :value="dict.fId"
+          ></el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="结余件数" prop="fQtyblc">
-        <el-input
-          v-model="queryParams.fQtyblc"
-          placeholder="请输入结余件数"
+      <el-form-item label="入库日期" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.timeInterval"
+          type="daterange"
+          value-format="yyyy-MM-dd"
           clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @keyup.enter.native="handleQuery">
+        </el-date-picker>
       </el-form-item>
-      <el-form-item label="出库毛重" prop="fGrossweightc">
-        <el-input
-          v-model="queryParams.fGrossweightc"
-          placeholder="请输入出库毛重"
+      <el-form-item label="贸易方式" prop="fTrademodeid">
+        <el-select
+          v-model="queryParams.fTrademodeid"
+          placeholder="请选择贸易方式"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="出库净重" prop="fNetweightc">
-        <el-input
-          v-model="queryParams.fNetweightc"
-          placeholder="请输入出库净重"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        >
+          <el-option
+            v-for="(dict, index) in fTrademodeidOptions"
+            :key="index.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="结余毛重" prop="fGrossweightblc">
-        <el-input
-          v-model="queryParams.fGrossweightblc"
-          placeholder="请输入结余毛重"
+      <el-form-item label="货权方" prop="fCorpid">
+        <el-select
+          v-model="queryParams.fCorpid"
+          filterable
+          remote
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-        />
+          :remote-method="corpsRemoteMethod"
+          placeholder="请选择货权方"
+        >
+          <el-option
+            v-for="(dict, index) in fMblnoOptions"
+            :key="index.fId"
+            :label="dict.fName"
+            :value="dict.fId"
+          ></el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="结余净重" prop="fNetweightblc">
+      <el-form-item label="提单号" prop="fMblno">
         <el-input
-          v-model="queryParams.fNetweightblc"
-          placeholder="请输入结余净重"
+          v-model="queryParams.fMblno"
+          placeholder="请输入提单号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -109,20 +123,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="fStatus">
-        <el-select v-model="queryParams.fStatus" placeholder="请选择状态" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="唛头" prop="fMarks">
-        <el-input
-          v-model="queryParams.fMarks"
-          placeholder="请输入唛头"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -175,9 +175,14 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="客户" align="center" prop="fCorpid" />
       <el-table-column label="提单号" align="center" prop="fMblno" />
-      <el-table-column label="库区" align="center" prop="fWarehouseLocationid" />
-      <el-table-column label="货物品名" align="center" prop="fGoodsid" />
-      <el-table-column label="贸易方式" align="center" prop="fTrademodeid" />
+      <el-table-column label="库区" align="center" prop="fWarehouseLocationids" />
+      <el-table-column label="货物品名" align="center" prop="fGoodsids" />
+      <el-table-column
+        label="贸易方式"
+        align="center"
+        prop="fTrademodeid"
+        :formatter="fTrademodeidFormat"
+      />
       <el-table-column label="入库件数" align="center" prop="fQtyd" />
       <el-table-column label="入库尺码" align="center" prop="fVolumnd" />
       <el-table-column label="入库毛重" align="center" prop="fGrossweightd" />
@@ -296,6 +301,10 @@
 
 <script>
 import { listWhgenleg, getWhgenleg, delWhgenleg, addWhgenleg, updateWhgenleg, exportWhgenleg } from "@/api/reportManagement/whgenleg";
+import {listWarehouse} from "@/api/basicdata/warehouse";
+import {listArea} from "@/api/basicdata/area";
+import {listGoods} from "@/api/basicdata/goods";
+import {listCorps} from "@/api/basicdata/corps";
 
 export default {
   name: "Whgenleg",
@@ -303,6 +312,15 @@ export default {
   },
   data() {
     return {
+      // 货权方(客户数据)
+      fMblnoOptions: [],
+      // 贸易方式(数据字典),对应t_trademodels 字典
+      fTrademodeidOptions: [],
+      // 货物
+      goodsOptions: [],
+      // 仓库(仓库数据)
+      warehouseOptions: [],
+      kqhouseOptions: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -356,8 +374,66 @@ export default {
   },
   created() {
     this.getList();
+    this.getDicts("data_trademodes").then((response) => {
+      this.fTrademodeidOptions = response.data;
+    });
   },
   methods: {
+    // 贸易方式(数据字典),对���t_trademodels 字典翻译
+    fTrademodeidFormat(row, column) {
+      return this.selectDictLabel(this.fTrademodeidOptions, row.fTrademodeid);
+    },
+    /* 远程模糊查询仓库 */
+    warehouseRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      let queryParams = { pageNum: 1, pageSize: 10, fName: name };
+      listWarehouse(queryParams).then((response) => {
+        this.warehouseOptions = response.rows;
+      });
+    },
+    /* 远程模糊查询库区 */
+    kqhouseRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      if (!this.queryParams.fWarehouseid) {
+        this.$message.error("请输入仓库!");
+        return false;
+      }
+
+      let queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        fWarehouseid: this.queryParams.fWarehouseid,
+        fName: name,
+      };
+      listArea(queryParams).then((response) => {
+        this.kqhouseOptions = response.rows;
+      });
+    },
+    /* 远程模糊查询商品 */
+    goodsRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      let queryParams = { pageNum: 1, pageSize: 10, fName: name };
+      listGoods(queryParams).then((response) => {
+        this.goodsOptions = response.rows;
+      });
+    },
+    /* 远程模糊查询用户 */
+    corpsRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      let queryParams = { pageNum: 1, pageSize: 10, fName: name };
+      listCorps(queryParams).then((response) => {
+        this.fMblnoOptions = response.rows;
+        this.KHblnoOptions = response.rows;
+      });
+    },
     /** 查询库存总账列表 */
     getList() {
       this.loading = true;

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -7,9 +7,9 @@
       v-show="showSearch"
       label-width="88px"
     >
-      <el-form-item label="业务编号" prop="fbillno">
+      <el-form-item label="业务编号" prop="fBillno">
         <el-input
-          v-model="queryParams.fbillno"
+          v-model="queryParams.fBillno"
           placeholder="请输入业务编号"
           clearable
           size="small"
@@ -17,46 +17,73 @@
         />
       </el-form-item>
       <el-form-item label="制单人" prop="createBy">
-        <el-input
+        <el-select
           v-model="queryParams.createBy"
-          placeholder="请输入制单人"
+          filterable
+          remote
           clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+          style="width: 250px"
+          :remote-method="userRemoteMethod"
+          placeholder="请选择制单人"
+        >
+          <el-option
+            v-for="(dict, index) in userOptions"
+            :key="index.userName"
+            :label="dict.nickName"
+            :value="dict.userName"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="货转日期" prop="fBsdate">
         <el-date-picker
+          v-model="queryParams.timeInterval"
+          type="daterange"
+          value-format="yyyy-MM-dd"
           clearable
-          size="small"
-          v-model="queryParams.fBsdate"
-          type="date"
-          value-format="timestamp"
-          placeholder="选择货转日期"
-        >
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @keyup.enter.native="handleQuery">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="贸易方式" prop="fTrademodeid">
-        <el-input
+        <el-select
           v-model="queryParams.fTrademodeid"
-          placeholder="请输入贸易方式"
+          placeholder="请选择贸易方式"
           clearable
-          size="small"
+          style="width: 250px"
           @keyup.enter.native="handleQuery"
-        />
+        >
+          <el-option
+            v-for="(dict, index) in fTrademodeidOptions"
+            :key="index.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="货权方" prop="fCorpid">
-        <el-input
+        <el-select
           v-model="queryParams.fCorpid"
-          placeholder="请输入货权方"
+          filterable
+          remote
           clearable
-          size="small"
+          style="width: 250px"
           @keyup.enter.native="handleQuery"
-        />
+          :remote-method="corpsRemoteMethod"
+          placeholder="请选择货权方"
+        >
+          <el-option
+            v-for="(dict, index) in fMblnoOptions"
+            :key="index.fId"
+            :label="dict.fName"
+            :value="dict.fId"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="提单号" prop="fmblno">
         <el-input
-          v-model="queryParams.fmblno"
+          v-model="queryParams.fMblno"
           placeholder="请输入提单号"
           clearable
           size="small"
@@ -64,32 +91,61 @@
         />
       </el-form-item>
       <el-form-item label="经营单位" prop="fsbu">
-        <el-input
+        <el-select
           v-model="queryParams.fSbu"
-          placeholder="请输入经营单位"
+          filterable
+          remote
           clearable
-          size="small"
+          :remote-method="fSbuRemoteMethod"
           @keyup.enter.native="handleQuery"
-        />
+          style="width: 250px"
+          placeholder="请选择经营单位"
+        >
+          <el-option
+            v-for="(dict, index) in fSbuOptions"
+            :key="index.fId"
+            :label="dict.fName"
+            :value="dict.fId"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="货物名称" prop="fgoodsid">
         <el-select
           v-model="queryParams.fGoodsid"
-          placeholder="请选择货物名称"
+          filterable
+          remote
           clearable
-          size="small"
+          :remote-method="goodsRemoteMethod"
+          @keyup.enter.native="handleQuery"
+          placeholder="请选择货物名称"
         >
-          <el-option label="请选择字典生成" value="" />
+          <el-option
+            v-for="(dict, index) in goodsOptions"
+            :key="index.fId"
+            :label="dict.fName"
+            :value="dict.fId"
+          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="仓库" prop="fwarehouseid">
-        <el-input
+        <el-select
           v-model="queryParams.fWarehouseid"
-          placeholder="请输入仓库"
+          filterable
+          :disabled="browseStatus"
+          remote
           clearable
-          size="small"
+          style="width: 250px"
+          :remote-method="warehouseRemoteMethod"
           @keyup.enter.native="handleQuery"
-        />
+          placeholder="请选择仓库"
+        >
+          <el-option
+            v-for="(dict, index) in warehouseOptions"
+            :key="index.fId"
+            :label="dict.fName"
+            :value="dict.fId"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button
@@ -104,7 +160,6 @@
         </el-button>
       </el-form-item>
     </el-form>
-
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -2005,6 +2060,13 @@ export default {
         fCntrtype: null,
         fCntqty: null,
       };
+      this.deptOptions = []
+      this.fWbuOptions = []
+      this.fWbuOptions = []
+      this.fMblnoOptions = []
+      this.KHblnoOptions = []
+      this.KHblnoOptions = []
+      this.warehouseOptions = []
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -2043,28 +2105,35 @@ export default {
       console.log("@@@+333")
       const fId = row.fId || this.ids;
       getGoodsTransfer(fId).then((response) => {
-        console.log(response)
-        this.form = response.data.goodsTransfer
+        this.form = response.data.warehousebills
+        if (this.form.fStltypeid) {
+          this.$set(this.form, 'fStltypeid', this.form.fStltypeid + '')
+        }
+        if (this.form.fChargedate) {
+          this.$set(this.form, 'fChargedate', Date.parse(this.form.fChargedate))
+        }
+        if (this.form.fTrademodeid) {
+          this.$set(this.form, 'fTrademodeid', this.form.fTrademodeid + '')
+        }
         this.fMblnoOptions = response.data.corps
         this.KHblnoOptions = response.data.corps
-        this.fSbuOptions = response.data.corps
         this.fWbuOptions = response.data.feesList
         this.warehouseOptions = response.data.warehouse;
-        this.$set(this.form, 'fStltypeid', this.form.fStltypeid + '')
-        this.$set(this.form,'fEta', Date.parse(this.form.fEta))
-        this.$set(this.form,'createTime', Date.parse(this.form.createTime))
-        this.$set(this.form, 'fTrademodeid', this.form.fTrademodeid + '')
-        this.dataList = response.data.goodsTransferItem;
+        if (response.data.dept) {
+          this.deptOptions = [];
+          this.deptOptions.push(response.data.dept);
+        }
+        this.dataList = response.data.warehouseBillsItem;
         for (let list in this.dataList) {
           this.$set(this.dataList[list], 'fBsdate', Date.parse(this.dataList[list].fBsdate))
         }
         this.goodsOptions = response.data.goodsList
         this.relevantAttachments = response.data.enclosures
-        this.warehouseDrList = response.data.goodsTransferfeesDr
+        this.warehouseDrList = response.data.warehousebillsfeesDr
         for (let dr in this.warehouseDrList) {
           this.$set(this.warehouseDrList[dr], 'fFeeUnitid', this.warehouseDrList[dr].fFeeUnitid + "")
         }
-        this.warehouseCrList = response.data.goodsTransferfeesCr
+        this.warehouseCrList = response.data.warehousebillsfeesCr
         for (let cr in this.warehouseCrList) {
           this.$set(this.warehouseCrList[cr], 'fFeeUnitid', this.warehouseCrList[cr].fFeeUnitid + "")
         }

src/views/warehouseBusiness/outStock/index.vue

@@ -17,19 +17,12 @@
         />
       </el-form-item>
       <el-form-item label="制单人" prop="createBy">
-        <!-- <el-input
-          v-model="queryParams.createBy"
-          placeholder="请输入制单人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        /> -->
         <el-select
           v-model="queryParams.createBy"
           filterable
           remote
           clearable
-          style="width: 200px"
+          style="width: 250px"
           :remote-method="userRemoteMethod"
           placeholder="请选择制单人"
         >
@@ -41,45 +34,35 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="出库日期" prop="createTime">
-        <!-- <el-date-picker
-          clearable
-          size="small"
-          v-model="queryParams.createTime"
-          type="date"
-          value-format="timestamp"
-          placeholder="选择出库日期"
-        >
-        </el-date-picker> -->
+      <el-form-item label="出库日期" prop="timeInterval">
         <el-date-picker
           v-model="queryParams.timeInterval"
           type="daterange"
           value-format="yyyy-MM-dd"
           clearable
-          style="width: 200px"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           @keyup.enter.native="handleQuery">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="贸易方式" prop="ftrademodeid">
-        <el-input
-          v-model="queryParams.frademodeid"
-          placeholder="请输入贸易方式"
+      <el-form-item label="贸易方式" prop="fTrademodeid">
+        <el-select
+          v-model="queryParams.fTrademodeid"
+          placeholder="请选择贸易方式"
           clearable
-          size="small"
+          style="width: 250px"
           @keyup.enter.native="handleQuery"
-        />
+        >
+          <el-option
+            v-for="(dict, index) in fTrademodeidOptions"
+            :key="index.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="货权方" prop="fCorpid">
-        <!-- <el-input
-          v-model="queryParams.fCorpid"
-          placeholder="请输入货权方"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        /> -->
         <el-select
           v-model="queryParams.fCorpid"
           filterable
@@ -100,7 +83,7 @@
       </el-form-item>
       <el-form-item label="提单号" prop="fmblno">
         <el-input
-          v-model="queryParams.fmblno"
+          v-model="queryParams.fMblno"
           placeholder="请输入提单号"
           clearable
           size="small"
@@ -108,32 +91,61 @@
         />
       </el-form-item>
       <el-form-item label="经营单位" prop="fsbu">
-        <!-- <el-input
-          v-model="queryParams.fsbu"
-          placeholder="请输入经营单位"
+        <el-select
+          v-model="queryParams.fSbu"
+          filterable
+          remote
           clearable
-          size="small"
+          :remote-method="fSbuRemoteMethod"
           @keyup.enter.native="handleQuery"
-        /> -->
+          style="width: 250px"
+          placeholder="请选择经营单位"
+        >
+          <el-option
+            v-for="(dict, index) in fSbuOptions"
+            :key="index.fId"
+            :label="dict.fName"
+            :value="dict.fId"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="货物名称" prop="fgoodsid">
         <el-select
-          v-model="queryParams.fgoodsids"
-          placeholder="请选择货物名称"
+          v-model="queryParams.fGoodsid"
+          filterable
+          remote
           clearable
-          size="small"
+          :remote-method="goodsRemoteMethod"
+          @keyup.enter.native="handleQuery"
+          placeholder="请选择货物名称"
         >
-          <el-option label="请选择字典生成" value="" />
+          <el-option
+            v-for="(dict, index) in goodsOptions"
+            :key="index.fId"
+            :label="dict.fName"
+            :value="dict.fId"
+          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="仓库" prop="fwarehouseid">
-        <el-input
-          v-model="queryParams.fwarehouseid"
-          placeholder="请输入仓库"
+        <el-select
+          v-model="queryParams.fWarehouseid"
+          filterable
+          :disabled="browseStatus"
+          remote
           clearable
-          size="small"
+          style="width: 250px"
+          :remote-method="warehouseRemoteMethod"
           @keyup.enter.native="handleQuery"
-        />
+          placeholder="请选择仓库"
+        >
+          <el-option
+            v-for="(dict, index) in warehouseOptions"
+            :key="index.fId"
+            :label="dict.fName"
+            :value="dict.fId"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button
@@ -592,21 +604,6 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="单据编号" prop="foriginalbillno">
-              <!-- <el-select
-                v-model="form.fSbu"
-                filterable
-                remote
-                :remote-method="fSbuRemoteMethod"
-                style="width: 250px"
-                placeholder="请选择经营单位"
-              >
-                <el-option
-                  v-for="dict in fSbuOptions"
-                  :key="dict.fId"
-                  :label="dict.fName"
-                  :value="dict.fId"
-                ></el-option>
-              </el-select> -->
               <el-input
                 v-model="form.fOriginalbillno"
                 style="width: 250px"
@@ -865,14 +862,6 @@
           align="center"
           label="库区"
         >
-          <!-- <template slot-scope="scope">
-            <el-input
-              oninput="value=value.replace(/[^\d.]/g,'')"
-              v-model="scope.row.fWarehouselocid"
-              placeholder="库区"
-              show-word-limit
-            />
-          </template> -->
           <template slot-scope="scope">
             <el-select
               v-model="scope.row.fWarehouselocid"
@@ -1091,12 +1080,6 @@
           label="客户名称"
         >
           <template slot-scope="scope">
-            <!-- <el-input
-              v-model="scope.row.fCorpid"
-              :disabled="browseStatus"
-              placeholder="客户名称"
-              show-word-limitfMblnoOptions
-            /> -->
             <el-select
               v-model="scope.row.fCorpid"
               filterable
@@ -1326,12 +1309,6 @@
           label="客户名称"
         >
           <template slot-scope="scope">
-            <!-- <el-input
-              v-model="scope.row.fCorpid"
-              :disabled="browseStatus"
-              placeholder="客户名称"
-              show-word-limit
-            /> -->
             <el-select
               v-model="scope.row.fCorpid"
               filterable
@@ -1357,11 +1334,6 @@
           label="费用名称"
         >
           <template slot-scope="scope">
-            <!-- <el-input
-              v-model="scope.row.fFeeid"
-              placeholder="费用名称"
-              show-word-limit
-            /> -->
             <el-select
               v-model="scope.row.fFeeid"
               filterable
@@ -1387,11 +1359,6 @@
           label="计价单位"
         >
           <template slot-scope="scope">
-            <!-- <el-input
-              v-model="scope.row.fFeeUnitid"
-              placeholder="计价单位"
-              show-word-limit
-            /> -->
             <el-select
               v-model="scope.row.fFeeUnitid"
               placeholder="请选择计费单位"
@@ -2293,7 +2260,7 @@
         this.whgenlegParams.fCorpid = this.form.fCorpid
         this.whgenlegParams.fWarehouseid = this.form.fWarehouseid
         this.whgenlegParams.fTrademodeid = this.form.fTrademodeid
-        
+
         listWhgenleg(this.whgenlegParams).then(response => {
           this.whgenlegList = response.rows
           this.whgenlegTotal = response.total
@@ -2383,6 +2350,14 @@
           fCntrtype: null,
           fCntqty: null,
         };
+        this.deptOptions = []
+        this.userOptions = []
+        this.fSbuOptions = []
+        this.fWbuOptions = []
+        this.goodsOptions = []
+        this.KHblnoOptions = []
+        this.fMblnoOptions = []
+        this.kqhouseOptions = []
         this.resetForm("form");
       },
       /** 搜索按钮操作 */
@@ -2456,7 +2431,7 @@
           "fBsdate",
           Date.parse(response.data.warehousebills.fBsdate)
         );
-        
+
           this.open = true;
           this.title = "修改出库";
         });
@@ -2508,7 +2483,7 @@
                   }
         if (column.property === 'fgrossweight') {
             values = data.map(item => Number(item['fGrossweight']))
- 
+
           }
           if (column.property === 'fnetweight') {
             values = data.map(item => Number(item['fNetweight']))
@@ -2720,14 +2695,14 @@
           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;
@@ -2858,7 +2833,7 @@
         this.$message.error('请输入仓库!')
         return false
       }
-     
+
       let queryParams = { pageNum: 1, pageSize: 10,  fWarehouseid:this.form.fWarehouseid , fName: name };
       listArea(queryParams).then((response) => {
         console.log(response);