调拨

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -1856,7 +1856,6 @@
       <el-form
         ref="whgenlegParams"
         :model="whgenlegParams"
-        :rules="rules2"
         label-width="120px"
       >
         <el-row>
@@ -2690,11 +2689,6 @@ export default {
         fTocorpid: [{ required: true, message: " ", trigger: "blur" }],
         fFeetUnit: [{ required: true, message: " ", trigger: "blur" }],
       },
-      rules2: {
-        fCorpid: [{ required: true, message: " ", trigger: "blur" }],
-        fWarehouseid: [{ required: true, message: " ", trigger: "blur" }],
-        fTrademodeid: [{ required: true, message: " ", trigger: "blur" }],
-      },
       browseStatus: false,
       goodsOptions: [],
       warehouseOptions: [],

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -1879,7 +1879,48 @@
       style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
       :visible.sync="whgenlegVisible"
       width="70%"
+      @close="init2()"
     >
+      <el-form
+        ref="whgenlegParams"
+        :model="whgenlegParams"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="箱号" prop="fCntrno">
+              <el-input
+                v-model="whgenlegParams.fCntrno"
+                placeholder="请输入箱号"
+                clearable
+                style="width: 80%"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="入库日期区间" prop="orgStorageDate">
+              <el-date-picker
+                style="width: 80%"
+                v-model="whgenlegParams.orgStorageDate"
+                type="daterange"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :default-time="['00:00:00', '23:59:59']"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="2">
+            <el-button
+              type="cyan"
+              icon="el-icon-search"
+              @click="getWhgenlegList()"
+              >搜索</el-button
+            >
+          </el-col>
+        </el-row>
+      </el-form>
       <el-table
         :data="whgenlegList"
         ref="table"
@@ -2696,10 +2737,12 @@ export default {
       whgenlegParams: {
         pageNum: 1,
         pageSize: 10,
-        fMblno: null,
         fCorpid: null,
         fWarehouseid: null,
         fTruckno: null,
+        fCntrno: null,
+        fMblno: null,
+        orgStorageDate: null,
       },
       choiceWarehouse: false,
       treeselectList: {
@@ -2798,6 +2841,18 @@ export default {
       this.CntrTable = [];
       this.getForm();
     },
+    init2() {
+      this.whgenlegParams = {
+        pageNum: 1,
+        pageSize: 10,
+        fCorpid: null,
+        fWarehouseid: null,
+        fTruckno: null,
+        fCntrno: null,
+        fMblno: null,
+        orgStorageDate: null,
+      };
+    },
     changeStock(row) {
       let fNetweight = 0;
       let fGrossweight = 0;