add

src/api/classifyManage/index.js

@@ -72,3 +72,11 @@ export async function getBatchDetails(data) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+export async function getDetailById(data) {
+  const res = await request.post(`/wms/outin/getDetailById`, data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/views/warehouseManagement/common.js

@@ -5,7 +5,8 @@ export const tableHeader = (selectEquiType) => {
     case 8:
       return [
         { label: '型号', prop: 'modelType' },
-        { label: '规格', prop: 'specification' }
+        { label: '规格', prop: 'specification' },
+        { label: '牌号', prop: 'brandNum' }
       ];
     case 4:
       return [

src/views/warehouseManagement/components/AssetsDialog.vue

@@ -1,5 +1,6 @@
 <template>
   <el-dialog :visible.sync="visible" :title="`${title}信息`" width="80vw">
+    =={{ searchForm }}++{{ dimension }}
     <el-form :model="searchForm" label-width="100px">
       <el-row>
         <!-- <el-col :span="6">
@@ -54,10 +55,10 @@
                 v-model="dimension"
                 placeholder="请选择"
               >
-                <el-option label="物品维度" value="1"> </el-option>
-                <el-option label="批次维度" value="2"> </el-option>
-                <el-option label="包装维度" value="3"> </el-option>
                 <el-option label="物料维度" value="4"> </el-option>
+                <el-option label="包装维度" value="3"> </el-option>
+                <el-option label="批次维度" value="2"> </el-option>
+                <el-option label="物品维度" value="1"> </el-option>
               </el-select>
             </template>
           </el-form-item>
@@ -96,6 +97,7 @@
           paramsType="type"
         />
       </el-aside>
+      =={{ rowKey }}
       <el-main>
         <el-table
           ref="multipleTable"
@@ -103,15 +105,16 @@
           tooltip-effect="dark"
           height="50vh"
           border
-          row-key="id"
+          row-key="oid"
           style="width: 100%"
           :header-cell-style="{ background: '#F0F3F3', border: 'none' }"
           @selection-change="handleSelectionChange"
         >
           <el-table-column
-            prop="code"
+            prop="assetCode"
             label="编码"
             min-width="120"
+            v-if="dimension != 3 || dimension != 4"
           ></el-table-column>
           <el-table-column
             prop="name"
@@ -132,29 +135,104 @@
               <template v-else>{{ row[item.prop] }}</template>
             </template></el-table-column
           >
+          <el-table-column
+            v-if="dimension == 2 || dimension == 3 || dimension == 4"
+            prop="batchNo"
+            label="批次号"
+            min-width="120"
+          ></el-table-column>
+          <el-table-column
+            v-if="dimension == 3 || dimension == 4"
+            prop="onlyCode"
+            label="包装编码"
+            min-width="120"
+          ></el-table-column>
+          <el-table-column
+            v-if="dimension == 4"
+            prop="code"
+            label="物料编码"
+            min-width="120"
+          ></el-table-column>
+          <el-table-column
+            v-if="dimension == 4"
+            prop="meterielCode"
+            label="物料代号"
+            min-width="120"
+          ></el-table-column>
+          <el-table-column
+            v-if="dimension == 4"
+            prop="clientCode"
+            label="客户代号"
+            min-width="120"
+          ></el-table-column>
+          <el-table-column
+            v-if="dimension == 4"
+            prop="engrave"
+            label="刻码"
+            min-width="120"
+          ></el-table-column>
 
           <el-table-column
             prop="availableCountBase"
             label="包装库存数量"
+            width="120"
+            v-if="dimension != 4"
           ></el-table-column>
           <el-table-column
             prop="minUnit"
             label="包装单位"
+            v-if="dimension != 4"
             width="90"
           ></el-table-column>
           <el-table-column
             prop="packingCountBase"
             label="计量库存数量"
+            width="120"
           ></el-table-column>
           <el-table-column
             prop="measuringUnit"
             label="计量单位"
             width="90"
           ></el-table-column>
+          <el-table-column
+            v-if="dimension == 4"
+            prop="weight"
+            label="重量"
+            min-width="120"
+          ></el-table-column>
+          <el-table-column
+            v-if="dimension == 4"
+            prop="weightUnit"
+            label="重量单位"
+            min-width="120"
+          ></el-table-column>
+          <el-table-column
+            prop="expirationTime"
+            label="周期倒计时"
+            min-width="120"
+          ></el-table-column>
+          <el-table-column prop="weightUnit" label="质检状态" min-width="120">
+            <template slot-scope="{ row }">
+              <span v-if="row.qualityStatus == 0">未质检</span>
+              <span v-else-if="row.qualityStatus == 1">已质检</span>
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="weightUnit" label="质检结果" min-width="120">
+            <template slot-scope="{ row }">
+              <span v-if="row.qualityResult == 0">合格</span>
+              <span v-else-if="row.qualityResult == 1">不合格</span>
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="pathName"
+            label="仓库"
+            min-width="120"
+          ></el-table-column>
 
           <!-- <el-table-column prop="pathName" label="仓库"> </el-table-column> -->
           <el-table-column
-            fixed="right"
             type="selection"
             :reserve-selection="true"
             width="55"
@@ -194,7 +272,7 @@
   import outin from '@/api/warehouseManagement/outin';
   import { login } from '@/api/login';
   import { getWarehouseList } from '@/api/classifyManage/itemInformation';
-  import { getBatchDetails } from '@/api/classifyManage';
+  import { getBatchDetails, getDetailById } from '@/api/classifyManage';
   export default {
     components: { AssetTree },
     props: {
@@ -230,11 +308,21 @@
         selectionList: [],
         materialType: '',
         warehouseList: [],
-        dimension: '1'
+        dimension: '4',
+        rowKey: 'meterielId'
       };
     },
     created() {},
     methods: {
+      // rowKey() {
+      //   if (this.dimension == 1 || this.dimension == 3) {
+      //     return 'id';
+      //   } else if (this.dimension == 2) {
+      //     return 'stockBatchId';
+      //   } else {
+      //     return 'meterielId';
+      //   }
+      // },
       async changeDimension(e) {
         this.dimension = e;
         let res = {};
@@ -248,32 +336,63 @@
         }
         if (e == 2) {
           res = await getBatchDetails(params);
-          this.tableData = res.list;
+          this.tableData = res.list.map((item) => {
+            return {
+              ...item,
+              minUnit: item.packingUnit,
+              oid: item.stockBatchId
+            };
+          });
+          this.rowKey = 'stockBatchId';
         } else if (e == 3) {
           res = await outin.getInventoryDetails(params);
-          this.tableData = res.list;
+          this.tableData = res.list.map((item) => {
+            return {
+              ...item,
+              batchNo: item.batchNum,
+              minUnit: item.packingUnit,
+              availableCountBase: 1,
+              oid: item.id
+            };
+          });
+          this.rowKey = 'id';
         } else if (e == 4) {
           res = await outin.getMaterielDetails(params);
-          this.tableData = res.list;
+          this.tableData = res.list.map((item) => {
+            return {
+              ...item,
+              availableCountBase: 1,
+              packingCountBase: 1,
+              minUnit: item.packingUnit,
+              oid: item.meterielId
+            };
+          });
+          this.rowKey = 'meterielId';
         } else {
           res = await outin.getRealTimeInventory(params);
-          this.tableData = res.list;
+          this.tableData = res.list.map((item) => {
+            return { ...item, oid: item.id };
+          });
+          this.rowKey = 'id';
         }
 
         if (res) {
           this.total = res.count;
           // this.selectionList = deepClone(this.warehousingMaterialList);
 
+          console.log(' this.dimension', this.dimension);
           this.$nextTick(() => {
             this.tableData.forEach((item) => {
-              if (this.warehousingMaterialList.length != 0) {
-                const index = this.warehousingMaterialList.findIndex(
-                  (i) => item.id == i.id
-                );
-                if (index > -1) {
-                  // 删除还给 multipleSelection
-                  this.$refs.multipleTable.toggleRowSelection(item, true);
-                }
+              const index = this.warehousingMaterialList.findIndex((i) =>
+                this.dimension == 1 || this.dimension == 3
+                  ? item.id == i.id
+                  : this.dimension == 2
+                  ? item.stockBatchId == i.stockBatchId
+                  : item.meterielId == i.meterielId
+              );
+              if (index > -1) {
+                // 删除还给 multipleSelection
+                this.$refs.multipleTable.toggleRowSelection(item, true);
               }
             });
           });
@@ -288,17 +407,48 @@
       },
       open() {
         this.visible = true;
+        console.log('有数据', this.warehousingMaterialList);
         this.$nextTick(() => {
           this.$refs.treeList.getTreeData();
           // this.doSearch()
         });
       },
-      confirm() {
+      async handleExit(arr) {
+        let ids = null;
+        if (this.dimension == 1 || this.dimension == 3) {
+          ids = arr.map((item) => {
+            return item.id;
+          });
+        } else if (this.dimension == 2) {
+          ids = arr.map((item) => {
+            return item.stockBatchId;
+          });
+        } else {
+          ids = arr.map((item) => {
+            return item.meterielId;
+          });
+        }
+        const parmas = {
+          categoryLevelId: this.materialType,
+          type: this.dimension,
+          ids: ids
+        };
+        const data = await getDetailById(parmas);
+        return data;
+      },
+      async confirm() {
         if (!this.selectionList.length) {
           this.$message.error('请至少选择一条数据！');
           return;
         }
-        this.$emit('selectTableData', this.selectionList);
+        const data = await this.handleExit(this.selectionList);
+        this.$emit(
+          'detailData',
+          { ...data, wlList: this.selectionList },
+          this.dimension
+        );
+
+        // this.$emit('selectTableData', this.selectionList);
         this.cancel();
       },
       cancel() {
@@ -310,6 +460,7 @@
         for (const key in val) {
           val[key].categoryId = val[key].id;
         }
+        console.log('===12123121212', val);
         this.selectionList = val;
       },
       handleNodeClick(data) {
@@ -317,7 +468,8 @@
         this.doSearch();
       },
       handleCurrentChange() {
-        this.getList();
+        // this.getList();
+        this.changeDimension(this.dimension);
       },
       reset() {
         this.searchForm.code = '';
@@ -326,11 +478,13 @@
       },
       doSearch() {
         this.pages.pageNum = 1;
-        this.getList();
+        // this.getList();
+        this.changeDimension(this.dimension);
       },
       handleSizeChange() {
         this.pages.pageNum = 1;
-        this.getList();
+        // this.getList();
+        this.changeDimension(this.dimension);
       },
       async getList() {
         const params = {
@@ -344,24 +498,31 @@
           params.categoryLevelId = this.materialType;
         }
 
-        const res = await outin.getRealTimeInventory(params);
-        console.log('111555==', res);
+        const res = await outin.getMaterielDetails(params);
 
         if (res) {
-          this.tableData = res.list;
+          this.tableData = res.list.map((item) => {
+            return { ...item, oid: item.id };
+          });
           this.total = res.count;
           // this.selectionList = deepClone(this.warehousingMaterialList);
-
+          console.log(' this.tableData', this.tableData);
+          console.log(
+            'this.warehousingMaterialList',
+            this.warehousingMaterialList
+          );
           this.$nextTick(() => {
             this.tableData.forEach((item) => {
-              if (this.warehousingMaterialList.length != 0) {
-                const index = this.warehousingMaterialList.findIndex(
-                  (i) => item.id == i.id
-                );
-                if (index > -1) {
-                  // 删除还给 multipleSelection
-                  this.$refs.multipleTable.toggleRowSelection(item, true);
-                }
+              const index = this.warehousingMaterialList.findIndex((i) =>
+                this.dimension == 1 || this.dimension == 3
+                  ? item.id == i.id
+                  : this.dimension == 2
+                  ? item.stockBatchId == i.stockBatchId
+                  : item.meterielId == i.meterielId
+              );
+              if (index > -1) {
+                // 删除还给 multipleSelection
+                this.$refs.multipleTable.toggleRowSelection(item, true);
               }
             });
           });

src/views/warehouseManagement/outgoingManagement/add.vue

@@ -313,61 +313,93 @@
           </el-col>
         </el-row>
       </el-form>
+      =={{ dimension }}
 
       <div class="material">
-        <div class="flex">
-          <div><span class="red">*</span>出库明细</div>
-          <div>
-            <el-button type="primary" @click="addStock">添加</el-button>
+        <el-button type="primary" @click="addStock">添加</el-button>
+        <div v-if="dimension != 4">
+          <div class="flex">
+            <div><span class="red">*</span>物品清单</div>
+            <div>
+              <!-- <el-button type="primary" @click="addStock">添加</el-button> -->
+            </div>
           </div>
-        </div>
-        <div class="mt10 form-table">
-          <el-form
-            ref="warehousingMaterialListRef"
-            :model="{ warehousingMaterialList: warehousingMaterialList }"
-            :show-message="false"
-          >
-            <el-table
-              ref="multipleTable"
-              :data="warehousingMaterialList"
-              tooltip-effect="dark"
-              style="width: 100%"
-              stripe
-              :header-cell-style="{ background: '#EEEEEE', border: 'none' }"
+          <div class="mt10 form-table">
+            <el-form
+              ref="warehousingMaterialListRef"
+              :model="{ warehousingMaterialList: warehousingMaterialList }"
+              :show-message="false"
             >
-              <el-table-column label="序号" type="index" width="50">
-              </el-table-column>
-              <el-table-column
-                label="物品编码"
-                prop="assetCode"
-              ></el-table-column>
+              <el-table
+                ref="multipleTable"
+                :data="warehousingMaterialList"
+                tooltip-effect="dark"
+                style="width: 100%"
+                stripe
+                :header-cell-style="{ background: '#EEEEEE', border: 'none' }"
+              >
+                <el-table-column label="序号" type="index" width="50">
+                </el-table-column>
+                <el-table-column
+                  label="编码"
+                  prop="assetCode"
+                ></el-table-column>
 
-              <el-table-column
-                label="物品名称"
-                prop="assetName"
-              ></el-table-column>
+                <el-table-column
+                  label="名称"
+                  prop="assetName"
+                ></el-table-column>
 
-              <el-table-column
-                v-for="(item, index) in tableHeader"
-                :key="index"
-                align="center"
-                :label="item.label"
-                width="150"
-                :prop="item.prop"
-              >
-                <template slot-scope="{ row }">
-                  <template v-if="item.formatter">{{
-                    item.formatter(row)
-                  }}</template>
-                  <template v-else>{{ row[item.prop] }}</template>
-                </template>
-              </el-table-column>
-              <!-- <el-table-column label="类型" prop="materialId">
-              <template slot-scope="{ row, $index }">
-                {{ row.materialId }}
-              </template>
-            </el-table-column> -->
-              <el-table-column
+                <el-table-column
+                  v-for="(item, index) in tableHeader"
+                  :key="index"
+                  align="center"
+                  :label="item.label"
+                  width="150"
+                  :prop="item.prop"
+                >
+                  <template slot-scope="{ row }">
+                    <template v-if="item.formatter">{{
+                      item.formatter(row)
+                    }}</template>
+                    <template v-else>{{ row[item.prop] }}</template>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="批次号"
+                  prop="batchNo"
+                ></el-table-column>
+                <el-table-column label="最小包装单元" width="120">
+                  <template slot-scope="{ row }">
+                    {{ row.packingCountBase }}{{ row.measuringUnit }}/{{
+                      row.minUnit
+                    }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="包装数量" prop="availableCountBase">
+                  <template slot-scope="{ row }">
+                    {{ row.availableCountBase }}{{ row.minUnit }}
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="计量数量"
+                  prop="packingCountBase"
+                ></el-table-column>
+                <el-table-column
+                  label="计量单位"
+                  prop="measuringUnit"
+                ></el-table-column>
+                <el-table-column label="重量" prop="weight"></el-table-column>
+                <el-table-column
+                  label="重量单位"
+                  prop="weightUnit"
+                ></el-table-column>
+                <el-table-column
+                  label="仓库"
+                  width="300"
+                  prop="pathName"
+                ></el-table-column>
+                <!-- <el-table-column
                 label="出库数量"
                 prop=""
                 align="center"
@@ -375,13 +407,6 @@
               >
                 <template slot-scope="{ row, $index }">
                   <el-row :gutter="4">
-                    <!-- <el-col :span="9">
-                      <el-input type="text" :value="row.selfSum" disabled>
-                        <template slot="append">
-                          {{ row.unit }}
-                        </template>
-                      </el-input></el-col
-                    > -->
                     <el-col :span="9" v-if="!row.isUnpack">
                       <el-input type="text" disabled :value="row.outInNum">
                         <template slot="append">
@@ -396,17 +421,38 @@
                     >
                   </el-row>
                 </template>
-              </el-table-column>
-              <el-table-column label="操作" width="200">
-                <template slot-scope="{ row, $index }">
-                  <el-button type="text" @click="listDel(row, $index)"
-                    >删除</el-button
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-form>
+              </el-table-column> -->
+                <el-table-column label="操作" width="200">
+                  <template slot-scope="{ row, $index }">
+                    <el-button type="text" @click="listDel(row, $index)"
+                      >删除</el-button
+                    >
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form>
+          </div>
+          <div class="flex" style="margin-top: 20px">
+            <div><span class="red">*</span>包装清单</div>
+          </div>
+          <div class="mt10 form-table">
+            <BatchDetail
+              :assetType="formData.extInfo.assetType"
+              :data="batchDetailsVOList"
+            />
+          </div>
+        </div>
+        <!-- <div class="flex" style="margin-top: 20px">
+          <div><span class="red">*</span>包装清单</div>
         </div>
+        <div class="mt10 form-table">
+          <BatchDetail
+            :assetType="formData.extInfo.assetType"
+            :codeObj="{ name: '包装编码', prop: 'code' }"
+            :nameObj="{ name: '名称', prop: 'name' }"
+          />
+        </div> -->
+
         <div class="mt20">
           <el-tabs v-model="activeName" type="card">
             <el-tab-pane :label="`${title}明细`" name="a">
@@ -420,34 +466,45 @@
               >
                 <el-table-column label="序号" type="index" width="50">
                 </el-table-column>
+
                 <el-table-column
-                  :label="`${title}编码`"
+                  :label="`编码`"
                   min-width="100"
-                  prop="sourceBizNo"
+                  prop="assetCode"
                 ></el-table-column>
-                <el-table-column
-                  label="客户代号"
-                  v-if="formData.bizType == 3"
-                  prop="contactCode"
-                >
-                  <template slot-scope="{ row }">
-                    {{ row.customCode }}
-                  </template>
+                <el-table-column label="名称" prop="name" width="50">
+                </el-table-column>
+
+                <el-table-column label="批次号" prop="batchNo">
                 </el-table-column>
                 <el-table-column
-                  label="供应商代号"
-                  v-if="formData.bizType == 4"
+                  v-if="dimension == 4"
+                  label="包装编码"
+                  min-width="100"
                   prop="assetCode"
+                ></el-table-column>
+                <el-table-column
+                  v-for="(item, index) in tableHeader"
+                  :key="index"
+                  align="center"
+                  :label="item.label"
+                  width="150"
+                  :prop="item.prop"
                 >
                   <template slot-scope="{ row }">
-                    {{ row.supplierCode }}
+                    <template v-if="item.formatter">{{
+                      item.formatter(row)
+                    }}</template>
+                    <template v-else>{{ row[item.prop] }}</template>
                   </template>
                 </el-table-column>
                 <el-table-column
-                  label="批次号"
-                  prop="sourceBatchNo"
+                  label="物料编码"
+                  width="250"
+                  prop="code"
                 ></el-table-column>
-                <el-table-column label="生产日期" width="200">
+
+                <!-- <el-table-column label="生产日期" width="200">
                   <template slot-scope="{ row }">
                     <span v-if="row.dateType === 2">
                       {{ row.produceTime }}
@@ -460,25 +517,27 @@
                       {{ row.procureTime }}
                     </span>
                   </template>
+                </el-table-column> -->
+                <el-table-column label="计量数量" prop="">
+                  <template slot-scope="{ row }">1</template>
                 </el-table-column>
                 <el-table-column
-                  label="最小包装单元"
-                  align="center"
-                  prop="modelType"
-                >
-                  <template slot-scope="{ row, $index }">
-                    <template v-if="!row.isUnpack">
-                      {{ row.measurementUnit }}{{ row.unit }}/{{
-                        row.minUnit
-                      }}</template
-                    >
-                  </template>
+                  label="计量单位"
+                  prop="measuringUnit"
+                ></el-table-column>
+                <el-table-column label="物料代号" prop="materielCode">
                 </el-table-column>
                 <el-table-column
-                  label="包装编码"
-                  prop="packageNo"
+                  label="客户代号"
+                  prop="clientCode"
                 ></el-table-column>
+                <el-table-column label="刻码" prop=""></el-table-column>
+                <el-table-column label="重量" prop="weight"></el-table-column>
                 <el-table-column
+                  label="重量单位"
+                  prop="weightUnit"
+                ></el-table-column>
+                <!-- <el-table-column
                   label="货位"
                   prop="pathName"
                   show-overflow-tooltip
@@ -488,7 +547,7 @@
                   <template slot-scope="{ row }">
                     <el-checkbox v-model="row.isTransferAsset"></el-checkbox>
                   </template>
-                </el-table-column>
+                </el-table-column> -->
               </el-table>
             </el-tab-pane>
           </el-tabs>
@@ -505,11 +564,13 @@
     <AssetsDialog
       ref="assetsDialogRef"
       :title="title"
-      :warehousingMaterialList="warehousingMaterialList"
+      :warehousingMaterialList="selectionList"
       :assetType="formData.extInfo.assetType"
-      @selectTableData="onSelectTableData"
+      @detailData="detailData"
     />
 
+    <!-- @selectTableData="onSelectTableData" -->
+
     <!-- 选桶号 -->
     <detailSelect
       ref="detailSelectRef"
@@ -554,8 +615,11 @@
   import { tableHeader } from '../common';
   import detailSelect from './components/detailSelect';
   import eom from './components/eom.vue';
+
+  import BatchDetail from './components/batchDetail.vue';
   export default {
     components: {
+      BatchDetail,
       pickOrder,
       selectUpload,
       selectTree,
@@ -569,6 +633,7 @@
     },
     data() {
       return {
+        dimension: '3',
         llList: [],
         codeList: [],
         materialType,
@@ -628,25 +693,68 @@
         },
         options: [],
         loading: false,
-        onSelectTableDataVal: []
+        onSelectTableDataVal: [],
+        batchDetailsVOList: [],
+        materialCodeReqList: [],
+        selectionList: []
         // shouldTriggerPickorder: true
       };
     },
     computed: {
       tableHeader() {
         return tableHeader(this.formData.extInfo.assetType);
-      },
-      // 条码信息
-      materialCodeReqList() {
-        return this.warehousingMaterialList
-          .map((i) => i.warehouseLedgerDetails || [])
-          .flat();
       }
+      // 条码信息
+      // materialCodeReqList() {
+      //   return this.warehousingMaterialList
+      //     .map((i) => i.warehouseLedgerDetails || [])
+      //     .flat();
+      // }
     },
     created() {
       this.initData();
     },
     methods: {
+      detailData(data, dimension) {
+        this.dimension = dimension;
+        console.log('总数居', data);
+        this.onSelectTableDataVal = data.realTimeInventoryVOList;
+        this.warehousingMaterialList = data.realTimeInventoryVOList.map(
+          (next) => {
+            delete next.updateTime;
+            delete next.createTime;
+            return {
+              ...next,
+              realInventoryAmount: 0,
+              assetType: this.formData.extInfo.assetType,
+              outInNum: '',
+              assetCode: next.code,
+              assetName: next.name,
+              bizStatus: 2,
+              contactCode: next.contactCode
+            };
+          }
+        );
+        // this.batchDetailsVOList = data.batchDetailsVOList;
+
+        if (dimension == 4) {
+          this.materialCodeReqList = data.wlList;
+          this.selectionList = data.wlList;
+          const obj = {
+            outInDetailAddPOList: data.realTimeInventoryVOList
+          };
+          // this.batchDetailsVOList = data.batchDetailsVOList;
+          // this.selectionList = data.wlList;
+        } else if (dimension == 3) {
+          // this.selectionList = data.wlList;
+          this.batchDetailsVOList = data.wlList.map((item) => {
+            return { ...item, packingCountBase: 1 };
+          });
+        } else if (dimension == 2) {
+          this.batchDetailsVOList = data.wlList;
+        }
+      },
+
       onClear() {
         this.formData.sourceBizNo = '';
         this.warehousingMaterialList = [];

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

@@ -0,0 +1,47 @@
+<template>
+  <div class="table">
+    <el-table
+      ref="multipleTable"
+      :data="data"
+      tooltip-effect="dark"
+      style="width: 100%"
+      stripe
+      :header-cell-style="{ background: '#EEEEEE', border: 'none' }"
+    >
+      <el-table-column label="序号" type="index" width="50"> </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="batchNo"></el-table-column>
+      <el-table-column label="包装编码" prop="batchNo"></el-table-column>
+      <el-table-column label="包装数量" prop="packingCountBase" width="120">
+      </el-table-column>
+      <el-table-column label="包装单位" prop="packingUnit"></el-table-column>
+      <el-table-column
+        label="计量数量"
+        prop="packingCountBase"
+      ></el-table-column>
+      <el-table-column label="计量单位" prop="measuringUnit"></el-table-column>
+      <el-table-column label="物料代号" prop="materielCode"></el-table-column>
+      <el-table-column label="客户代号" prop="clientCode"></el-table-column>
+      <el-table-column label="重量" prop="weight"></el-table-column>
+      <el-table-column label="重量单位" prop="weightUnit"></el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+  import { tableHeader } from '../../common';
+  export default {
+    props: ['assetType', 'data'],
+    data() {
+      return {
+        batchTable: []
+      };
+    },
+    computed: {
+      tableHeader() {
+        return tableHeader(this.assetType);
+      }
+    }
+  };
+</script>

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

@@ -204,11 +204,6 @@
             label: '计量单位',
             align: 'center'
           },
-          // {
-          //   prop: 'weightUnit',
-          //   label: '重量单位',
-          //   showOverflowTooltip: true
-          // },
           {
             prop: 'expirationDate',
             slot: 'expirationDate',
@@ -531,7 +526,7 @@
           query: {
             key,
             dimension: this.$refs.refSeavch.dimension,
-            id: row.id,
+            id: this.$refs.refSeavch.dimension != 3 ? row.id : row.categoryId,
             assetId: row.assetId,
             batchNo: row.batchNo
           }

src/views/warehouseManagement/warehouseDefinition/components/WarehouseEdit.vue

@@ -154,7 +154,9 @@
           remarks: '',
           factoryId: '',
           status: 1,
-          lockStatus: 0
+          lockStatus: 0,
+          ownerId: '',
+          departmentId: ''
         },
         rules: {
           code: [
@@ -170,10 +172,10 @@
             { required: true, message: '请选择工厂名称', trigger: 'blur' }
           ],
           departmentId: [
-            { required: true, message: '请选择权属部门', trigger: 'blur' }
+            { required: true, message: '请选择权属部门', trigger: 'change' }
           ],
           ownerId: [
-            { required: true, message: '请选择权属人', trigger: 'blur' }
+            { required: true, message: '请选择权属人', trigger: 'change' }
           ]
           // status: [
           //   { required: true, message: '请选择仓库状态', trigger: 'blur' }