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

src/views/warehouseBusiness/inStock/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,47 +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="createTime">
         <el-date-picker
+          v-model="queryParams.timeInterval"
+          type="daterange"
+          value-format="yyyy-MM-dd"
           clearable
-          size="small"
-          v-model="queryParams.createTime"
-          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="请输入贸易方式"
-          :disabled="browseStatus"
+          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-form-item label="提单号" prop="fMblno">
         <el-input
-          v-model="queryParams.fmblno"
+          v-model="queryParams.fMblno"
           placeholder="请输入提单号"
           clearable
           size="small"
@@ -65,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.fgoodsid"
-          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
+        <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
@@ -1856,7 +1911,6 @@ export default {
       dataList: [],
       warehouseCrList: [],
       warehouseDrList: [],
-      browseStatus: false,
       relevantAttachments: [],
       // 非单个禁用
       single: true,
@@ -1917,6 +1971,7 @@ export default {
         fCustomsdeclartion: null,
         fOriginalbillno: null,
         fDeptid: null,
+        timeInterval: null,
         fBsdeptid: null,
         fContacts: null,
         fTel: null,
@@ -2234,6 +2289,15 @@ export default {
         fCntrtype: null,
         fCntqty: null,
       };
+      this.fMblnoOptions = []
+      this.userOptions = []
+      this.warehouseOptions = []
+      this.fSbuOptions = []
+      this.goodsOptions = []
+      this.kqhouseOptions = []
+      this.relevantAttachments = []
+      this.KHblnoOptions = []
+      this.fWbuOptions = []
       this.resetForm("form");
     },
     /** 搜索按钮操作 */