huang_an 2 ani în urmă
părinte
comite
6299444378

+ 0 - 1
src/views/warehouseManagement/stockLedger/allBatchDetails.vue

@@ -16,7 +16,6 @@
             v-if="activeName == 'first'"
             :baseInfo="baseInfo"
             :baseParams="baseParams"
-            :stockList="stockList"
           ></WarehouseDetail>
         </el-tab-pane>
         <el-tab-pane label="批次明细" name="sixth" lazy>

+ 30 - 3
src/views/warehouseManagement/stockLedger/components/item-list.vue

@@ -44,6 +44,7 @@
   } from '@/api/classifyManage/itemInformation';
 
   import ouint from '@/api/warehouseManagement/outin';
+  import { getBatchDetails } from '@/api/classifyManage/index';
 
   export default {
     components: { ItemSearch },
@@ -152,10 +153,36 @@
     methods: {
       handledime(val) {
         this.$set(this, 'isShow', val == 2);
-        this.reload({
-          ...this.$refs.refSeavch.params,
-          dimension: this.$refs.refSeavch.dimension
+        // this.reload({
+        //   ...this.$refs.refSeavch.params,
+        //   dimension: this.$refs.refSeavch.dimension
+        // });
+        if (val == 2) {
+          this.handleBatchDimension(val);
+        } else if (val == 3) {
+          this.handleInventoryDimension(val);
+        }
+      },
+      async handleBatchDimension(event) {
+        const treeId = this.$parent.$parent.$parent.current.id;
+        const params = {
+          page: 1,
+          size: 10,
+          categoryLevelId: treeId
+        };
+        const res = await getBatchDetails(params);
+        console.log(res);
+        // 待完善
+      },
+      async handleInventoryDimension(val) {
+        const treeId = this.$parent.$parent.$parent.current.id;
+        const rep = await ouint.getInventoryDetails({
+          pageNum: 1,
+          size: 10,
+          categoryLevelId: treeId
         });
+        console.log(rep);
+        //待完善
       },
       /* 表格数据源 */
       datasource({ page, limit, where, order }) {

+ 51 - 0
src/views/warehouseManagement/stockLedger/components/item-search.vue

@@ -27,10 +27,60 @@
           </template>
         </el-form-item>
       </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="货位:" prop="cargoSpaceCode">
+          <el-input
+            v-model.trim="params.cargoSpaceCode"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="批次号:" prop="batchNum">
+          <el-input
+            v-model.trim="params.batchNum"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="包装编码:" prop="num">
+          <el-input v-model.trim="params.num" placeholder="请输入"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="时间类型:">
+          <el-select
+            style="width: 100%"
+            v-model="params.dateType"
+            placeholder="请选择"
+            @change="$forceUpdate()"
+          >
+            <el-option label="生产日期" :value="2"> </el-option>
+            <el-option label="采购日期" :value="1"> </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="时间:" prop="productTime">
+          <el-date-picker
+            v-model="params.productTime"
+            type="daterange"
+            style="width: 100%"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            placeholder="选择日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="列表维度:" prop="dimension">
           <template>
             <el-select
+              style="width: 100%"
               clearable
               @change="$emit('handledime', $event)"
               v-model="dimension"
@@ -38,6 +88,7 @@
             >
               <el-option label="物品维度" value="1"> </el-option>
               <el-option label="批次维度" value="2"> </el-option>
+              <el-option label="库存维度" value="3"> </el-option>
             </el-select>
           </template>
         </el-form-item>