完善出库

src/views/warehouseManagement/components/AssetsDialog.vue

@@ -2,7 +2,7 @@
   <el-dialog :visible.sync="visible" :title="`${title}信息`" width="80vw">
     <el-form :model="searchForm" label-width="100px">
       <el-row>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="仓库：" prop="warehouseId">
             <el-select
               style="width: 100%"
@@ -19,8 +19,8 @@
               </el-option>
             </el-select>
           </el-form-item>
-        </el-col>
-        <el-col :span="6">
+        </el-col> -->
+        <!-- <el-col :span="6">
           <el-form-item label="货位：" prop="cargoSpaceCode">
             <el-input
               v-model.trim="searchForm.cargoSpaceCode"
@@ -35,16 +35,16 @@
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="6">
+        </el-col> -->
+        <!-- <el-col :span="6">
           <el-form-item label="包装编码：" prop="num">
             <el-input
               v-model.trim="searchForm.num"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="6">
+        </el-col> -->
+        <!-- <el-col :span="6">
           <el-form-item label="列表维度：" prop="dimension">
             <template>
               <el-select
@@ -60,7 +60,7 @@
               </el-select>
             </template>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="6">
           <el-form-item label="物品编码">
             <el-input
@@ -79,7 +79,7 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6" style="padding-left: 40px">
+        <el-col style="text-align: right">
           <el-button type="primary" @click="doSearch">搜索</el-button>
           <el-button icon="el-icon-refresh-left" @click="reset">重置</el-button>
         </el-col>
@@ -125,6 +125,14 @@
               <template v-else>{{ row[item.prop] }}</template>
             </template></el-table-column
           >
+          <el-table-column
+            prop="measuringUnit"
+            label="计量单位"
+          ></el-table-column>
+          <el-table-column
+            prop="packingUnit"
+            label="包装单位"
+          ></el-table-column>
 
           <el-table-column prop="canUsedCount" label="可用库存">
           </el-table-column>
@@ -202,7 +210,8 @@
         },
         selectionList: [],
         materialType: '',
-        warehouseList: []
+        warehouseList: [],
+        dimension: '1'
       };
     },
     created() {

src/views/warehouseManagement/outgoingManagement/components/detailSelect.vue

@@ -2,7 +2,7 @@
   <el-dialog :visible.sync="visible" title="选择出库明细" width="90vw">
     <el-form :model="formData" label-width="120px">
       <el-row>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="仓库：" prop="warehouseId">
             <el-select
               style="width: 100%"
@@ -19,51 +19,51 @@
               </el-option>
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="6">
-          <el-form-item label="物品编码" prop="cargoSpaceCode">
+          <el-form-item label="物品编码" prop="code">
             <el-input
-              v-model.trim="formData.cargoSpaceCode"
+              v-model.trim="formData.code"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="物品名称" prop="cargoSpaceCode">
+          <el-form-item label="物品名称" prop="name">
             <el-input
-              v-model.trim="formData.cargoSpaceCode"
+              v-model.trim="formData.name"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="货位" prop="cargoSpaceCode">
+          <el-form-item label="货位" prop="goodsAllocation">
             <el-input
-              v-model.trim="formData.cargoSpaceCode"
+              v-model.trim="formData.goodsAllocation"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item :label="`${title}编码`" prop="onlyCode">
+          <el-form-item :label="`${title}编码`" prop="sourceBizNo">
             <el-input
-              v-model.trim="formData.onlyCode"
+              v-model.trim="formData.sourceBizNo"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="批次号" prop="batchNum">
+          <el-form-item label="批次号" prop="batchNo">
             <el-input
-              v-model.trim="formData.batchNum"
+              v-model.trim="formData.batchNo"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="包装编码" prop="num">
+          <el-form-item label="包装编码" prop="packageNo">
             <el-input
-              v-model.trim="formData.num"
+              v-model.trim="formData.packageNo"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
@@ -155,13 +155,15 @@
         label="货位"
         prop="pathName"
         show-overflow-tooltip
-        width="100"
+        width="270"
       >
       </el-table-column>
       <el-table-column
         :label="`${title}编码`"
         prop="sourceBizNo"
       ></el-table-column>
+      <el-table-column label="物品编码" prop="code"> </el-table-column>
+      <el-table-column label="物品名称" prop="name"> </el-table-column>
       <el-table-column label="批次号" prop="batchNum"> </el-table-column>
       <el-table-column
         label="生产日期"

src/views/warehouseManagement/stockLedger/allBatchDetails.vue

@@ -11,7 +11,7 @@
           <BaseInfo ref="baseInfoRef" :baseInfo="baseInfo"></BaseInfo>
           <warehouseConfigVue ref="warehouseConfigRef"></warehouseConfigVue>
         </el-tab-pane>
-        <el-tab-pane label="库存明细" name="first">
+        <!-- <el-tab-pane label="库存明细" name="first">
           <WarehouseDetail
             v-if="activeName == 'first'"
             :baseInfo="baseInfo"
@@ -24,7 +24,7 @@
             :baseInfo="baseInfo"
             :baseParams="baseParams"
           ></BatchDetail>
-        </el-tab-pane>
+        </el-tab-pane> -->
         <el-tab-pane label="入库单" name="second" lazy>
           <InWarehouse
             :baseInfo="baseInfo"

src/views/warehouseManagement/stockLedger/components/item-list.vue

@@ -18,7 +18,7 @@
       <template v-slot:toolbar> </template>
       <!-- 批次号 -->
       <template v-slot:batchNo="{ row }">
-        <el-popover placement="bottom" width="800" trigger="hover">
+        <el-popover placement="right-start" width="800" trigger="hover">
           <el-table :data="row.outInBatchDetailsVOList">
             <el-table-column
               width="150"
@@ -171,6 +171,12 @@
             label: '包装单位',
             showOverflowTooltip: true
           },
+          {
+            prop: 'paths',
+            width: 230,
+            label: '仓库',
+            showOverflowTooltip: true
+          },
           // {
           //   prop: '',
           //   label: '安全库存',
@@ -197,6 +203,10 @@
             label: '批次号',
             showOverflowTooltip: true
           });
+          let index = obj.findIndex((item) => item.label == '仓库');
+          if (index !== -1) {
+            obj.splice(index, 1);
+          }
         }
         return obj;
       }
@@ -245,13 +255,19 @@
         const dimension = this.$refs.refSeavch.dimension;
         const treeId = this.$parent.$parent.$parent.current.id;
         if (this.selectedDime == 1) {
-          return ouint.getRealTimeInventory({
+          const data = ouint.getRealTimeInventory({
             ...where,
             ...order,
             pageNum: page,
             size: limit,
             dimension: dimension
           });
+          return data.then((res) => {
+            let item = res.list.map((item) => {
+              return { ...item, paths: item.pathName.split(',')[0] };
+            });
+            return item;
+          });
         } else if (this.selectedDime == 2) {
           const params = {
             categoryLevelId: treeId,
@@ -285,7 +301,11 @@
           });
           return data.then((res) => {
             let item = res.list.map((item) => {
-              return { ...item, minUnit: item.packingUnit };
+              return {
+                ...item,
+                minUnit: item.packingUnit,
+                paths: item.pathName.split(',')[0]
+              };
             });
             return item;
           });