add

src/api/warehouseManagement/outin.js

@@ -38,9 +38,18 @@ export default {
       return res.data.data;
     }
   },
+  //出库实时库存
+  pageeLedger: async (params) => {
+    const res = await request.get(`/wms/inout/pageeLedger`, {
+      params
+    });
+    if (res.data.code == 0) {
+      return res.data.data;
+    }
+  },
   //出库物品实时库存
   getoutDetail: async (params) => {
-    const res = await request.get(`/wms/outin/getOutDetail`, {
+    const res = await request.get(`/wms/inout/pageInLedgerDetail`, {
       params
     });
     if (res.data.code == 0) {

src/views/warehouseManagement/components/AssetsDialog.vue

@@ -8,7 +8,7 @@
               type="text"
               size="small"
               placeholder="搜索物品编码"
-              v-model="searchForm.code"
+              v-model="searchForm.assetCode"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -18,7 +18,7 @@
               type="text"
               size="small"
               placeholder="搜索物品名称"
-              v-model="searchForm.name"
+              v-model="searchForm.assetName"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -54,11 +54,11 @@
           @selection-change="handleSelectionChange"
         >
           <el-table-column
-            prop="code"
+            prop="assetCode"
             label="物品编码"
             min-width="150"
           ></el-table-column>
-          <el-table-column prop="name" label="物品名称"></el-table-column>
+          <el-table-column prop="assetName" label="物品名称"></el-table-column>
           <el-table-column
             :prop="item.prop"
             :label="item.label"
@@ -73,8 +73,7 @@
             </template></el-table-column
           >
 
-          <el-table-column prop="availableCountBase" label="可用库存">
-          </el-table-column>
+          <el-table-column prop="number" label="可用库存"> </el-table-column>
           <el-table-column
             type="selection"
             :reserve-selection="true"
@@ -142,8 +141,8 @@
           size: 10
         },
         searchForm: {
-          code: '',
-          name: ''
+          assetCode: '',
+          assetName: ''
         },
         selectionList: [],
         materialType: ''
@@ -154,7 +153,6 @@
         this.visible = true;
         this.$nextTick(() => {
           this.$refs.treeList.getTreeData();
-
           // this.doSearch()
         });
       },
@@ -182,8 +180,8 @@
         this.getList();
       },
       reset() {
-        this.searchForm.code = '';
-        this.searchForm.name = '';
+        this.searchForm.assetCode = '';
+        this.searchForm.assetName = '';
         this.doSearch();
       },
       doSearch() {
@@ -197,17 +195,18 @@
       async getList() {
         const params = {
           ...this.pages,
-          ...this.searchForm,
-          dimension: 3
+          ...this.searchForm
+          // dimension: 3
+          // code: 5
         };
 
         if (this.materialType) {
           params.categoryLevelId = this.materialType;
         }
-        console.log(params);
+        console.log('params>>>', params);
 
-        const res = await outin.getRealTimeInventory(params);
-        console.log(res);
+        const res = await outin.pageeLedger(params);
+        console.log('111555==', res);
 
         if (res) {
           this.tableData = res.list;

src/views/warehouseManagement/components/selectType.vue

@@ -57,6 +57,11 @@
               label="物品名称"
               :show-overflow-tooltip="true"
             ></el-table-column>
+            <el-table-column
+              prop="brandNum"
+              label="牌号"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
             <el-table-column
               :prop="item.prop"
               :show-overflow-tooltip="true"
@@ -71,6 +76,36 @@
                 <template v-else>{{ row[item.prop] }}</template>
               </template></el-table-column
             >
+            <el-table-column
+              prop="measuringUnit"
+              label="计量单位"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              prop="weightUnit"
+              label="重量单位"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              prop="roughWeight"
+              label="毛重"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              prop="netWeight"
+              label="净重"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              prop="packingUnit"
+              label="包装单位"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              prop="categoryLevelPath"
+              label="分类"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
 
             <el-table-column type="selection" width="55" align="center">
             </el-table-column>

src/views/warehouseManagement/outgoingManagement/add.vue

@@ -14,7 +14,7 @@
         ></el-col> -->
           <el-col :span="8">
             <el-form-item label="出库物品类型" prop="extInfo.assetType">
-              <DictSelection
+              <!-- <DictSelection
                 dictName="类型用途"
                 :disabled="
                   !!(warehousingMaterialList && warehousingMaterialList.length)
@@ -22,7 +22,22 @@
                 clearable
                 v-model="formData.extInfo.assetType"
                 @itemChange="handleChange"
-              />
+              /> -->
+              <el-select
+                :disabled="
+                  !!(warehousingMaterialList && warehousingMaterialList.length)
+                "
+                clearable
+                v-model="formData.extInfo.assetType"
+                @change="handleChanges"
+              >
+                <el-option
+                  v-for="(item, index) in codeList"
+                  :key="index"
+                  :label="item.dictValue"
+                  :value="item.dictCode"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -243,8 +258,14 @@
             >
               <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="assetCode"
+              ></el-table-column>
+              <el-table-column
+                label="物品名称"
+                prop="assetName"
+              ></el-table-column>
 
               <el-table-column
                 v-for="(item, index) in tableHeader"
@@ -266,26 +287,31 @@
                 {{ row.materialId }}
               </template>
             </el-table-column> -->
-              <el-table-column label="出库数量" prop="" align="center" width="350px">
+              <el-table-column
+                label="出库数量"
+                prop=""
+                align="center"
+                width="350px"
+              >
                 <template slot-scope="{ row, $index }">
                   <el-row :gutter="4">
-                    <el-col :span="9">
+                    <!-- <el-col :span="9">
                       <el-input type="text" :value="row.selfSum" disabled>
                         <template slot="append">
-                          {{ row.measuringUnit }}
+                          {{ 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">
-                          {{ row.minUnit }}
+                          {{ row.minPackUnit }}
                         </template>
                       </el-input>
                     </el-col>
                     <el-col :span="6">
                       <el-button type="text" @click="handleSetting(row, $index)"
-                        >设置</el-button
+                        >详情</el-button
                       ></el-col
                     >
                   </el-row>
@@ -317,7 +343,7 @@
                 <el-table-column
                   :label="`${title}编码`"
                   min-width="100"
-                  prop="sourceBizNo"
+                  prop="onlyCode"
                 ></el-table-column>
                 <el-table-column
                   label="批次号"
@@ -326,14 +352,14 @@
                 <el-table-column label="生产日期" width="200">
                   <template slot-scope="{ row }">
                     <span v-if="row.dateType === 2">
-                      {{ row.dateValue }}
+                      {{ row.manufactureTime }}
                     </span>
                   </template>
                 </el-table-column>
                 <el-table-column label="采购日期" width="200">
                   <template slot-scope="{ row }">
                     <span v-if="row.dateType === 1">
-                      {{ row.dateValue }}
+                      {{ row.procurementtime }}
                     </span>
                   </template>
                 </el-table-column>
@@ -344,18 +370,14 @@
                 >
                   <template slot-scope="{ row, $index }">
                     <template v-if="!row.isUnpack">
-                      {{ row.minPackingCount }}{{ row.unit }}/{{
-                        row.minUnit
+                      {{ row.measurementUnit }}{{ row.unit }}/{{
+                        row.minPackUnit
                       }}</template
                     >
                   </template>
                 </el-table-column>
                 <el-table-column label="包装编码" prop="num"></el-table-column>
-                <el-table-column
-                  label="货位"
-                  prop="paths"
-                  show-overflow-tooltip
-                >
+                <el-table-column label="货位" prop="num" show-overflow-tooltip>
                 </el-table-column>
                 <el-table-column label="转消耗" prop="">
                   <template slot-scope="{ row }">
@@ -400,7 +422,7 @@
 <script>
   import outin from '@/api/warehouseManagement/outin';
   import warehouseDefinition from '@/api/warehouseManagement/warehouseDefinition';
-
+  import { getTreeByPid } from '@/api/classifyManage';
   import selectUpload from '@/components/selectUpload';
   import upload from '@/components/uploadImg';
   import {
@@ -433,6 +455,7 @@
     },
     data() {
       return {
+        codeList: [],
         materialType,
         warehousingType,
         outputSceneState,
@@ -489,7 +512,8 @@
           }
         },
         options: [],
-        loading: false
+        loading: false,
+        onSelectTableDataVal: []
       };
     },
     computed: {
@@ -498,6 +522,12 @@
       },
       // 条码信息
       materialCodeReqList() {
+        console.log(
+          '===',
+          this.warehousingMaterialList
+            .map((i) => i.warehouseLedgerDetails || [])
+            .flat()
+        );
         return this.warehousingMaterialList
           .map((i) => i.warehouseLedgerDetails || [])
           .flat();
@@ -653,7 +683,7 @@
                 if (row.isUnpack) {
                   return ++sum;
                 }
-                return sum + pre.minPackingCount;
+                return sum + pre.measurementUnit;
               }, 0)
             );
           });
@@ -747,7 +777,23 @@
 
             this.saveLoading = true;
 
-            const res = await outin.save(obj);
+            console.log('明细', this.warehousingMaterialList);
+            const categoryLevelId = this.$refs.assetsDialogRef.materialType;
+            let newObj = {
+              inOutAddPO: {
+                ...this.formData,
+                ...this.formData.extInfo,
+                bizStatus: 2
+              },
+              warehouseLedgerInfos: this.handelArr(
+                this.warehousingMaterialList,
+                categoryLevelId
+              )
+            };
+            delete newObj.inOutAddPO.extInfo;
+            console.log('2222', newObj);
+
+            const res = await outin.addInOut(newObj);
             if (res.code == 0) {
               this.$message.success('保存成功！');
             }
@@ -755,15 +801,44 @@
             this.saveLoading = false;
             this.$router.push('/warehouseManagement/outgoingManagement');
 
-            // if (res?.success) {
-            //   this.$message.success('保存成功！');
-            //   this.$router.go(-1);
-            // }
+            if (res?.success) {
+              this.$message.success('保存成功！');
+              this.$router.go(-1);
+            }
           }
         });
       },
+      handelArr(arr, id) {
+        for (const key in arr) {
+          arr[key].inLedgerId = arr[key].id;
+          arr[key].categoryLevelId = id;
+          for (const k in arr[key].warehouseLedgerDetails) {
+            arr[key].warehouseLedgerDetails[k].ledgerDetailId =
+              arr[key].warehouseLedgerDetails[k].id;
+            arr[key].warehouseLedgerDetails[k].inDetailId = arr[key].inLedgerId;
+
+            arr[key].warehouseLedgerDetails[k].isTransferAsset = arr[key]
+              .warehouseLedgerDetails[k].isTransferAsset
+              ? 1
+              : 0;
+            arr[key].warehouseLedgerDetails[k].bizStatus = 2;
+            arr[key].warehouseLedgerDetails[k].categoryLevelId = id;
+          }
+        }
+        return arr;
+        // let newArr = arr.map((item) => {
+        //   return { ...item, ledgerId: item.id };
+        // });
+        // newArr.map((item) => {
+        //   item.warehouseLedgerDetails.map((ite) => {
+        //     return { ...ite, ledgerDetailId: ite.id, ledgerId: item.id };
+        //   });
+        // });
+        // return newArr;
+      },
       //添加明细
       onSelectTableData(val) {
+        this.onSelectTableDataVal = val;
         this.warehousingMaterialList = val.map((next) => {
           delete next.updateTime;
           delete next.createTime;
@@ -787,6 +862,10 @@
         });
       },
       async initData() {
+        const { data } = await getTreeByPid(0);
+        this.codeList = data.map((item) => {
+          return { dictCode: item.id, dictValue: item.name };
+        });
         const res = await warehouseDefinition.tree();
         this.treeList = this.$util.toTreeData({
           data: res,
@@ -801,8 +880,8 @@
         this.fromUserList = res22.list;
 
         // /
-        const res111 = await warehouseDefinition.list();
-        this.warehouseList = res111.list;
+        // const res111 = await warehouseDefinition.list();
+        // this.warehouseList = res111.list;
         const info = JSON.parse(localStorage.getItem('info'));
         let obj = res.find((item) => item.id === info.deptId);
         this.formData.extInfo.deptName = obj.name;
@@ -827,6 +906,14 @@
           this.formData.documentSource = '';
         }
       },
+      handleChanges(code) {
+        const data = this.codeList.find((item) => item.dictCode == code);
+        this.title = data?.dictValue;
+        this.selectEquiType = data?.dictCode;
+        if (this.formData.bizType == 4) {
+          this.formData.documentSource = '';
+        }
+      },
       handleBizSceneChange() {
         if (this.formData.extInfo.assetType == 7) {
           this.formData.extInfo.documentSource = '';

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

@@ -3,9 +3,9 @@
     <el-form :model="formData" label-width="120px">
       <el-row>
         <el-col :span="6">
-          <el-form-item label="货位" prop="goodsAllocation">
+          <el-form-item label="货位" prop="cargoSpaceCode">
             <el-input
-              v-model.trim="formData.goodsAllocation"
+              v-model.trim="formData.cargoSpaceCode"
               placeholder="请输入"
               size="small"
             ></el-input>
@@ -21,18 +21,18 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="批次号" prop="batchNo">
+          <el-form-item label="批次号" prop="batchNum">
             <el-input
-              v-model.trim="formData.batchNo"
+              v-model.trim="formData.batchNum"
               placeholder="请输入"
               size="small"
             ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="包装编码" prop="packageNo">
+          <el-form-item label="包装编码" prop="num">
             <el-input
-              v-model.trim="formData.packageNo"
+              v-model.trim="formData.num"
               placeholder="请输入"
               size="small"
             ></el-input>
@@ -118,27 +118,27 @@
       <el-table-column label="序号" type="index"></el-table-column>
       <el-table-column
         label="货位"
-        prop="paths"
+        prop="cargoSpaceCode"
         show-overflow-tooltip
         width="100"
       >
       </el-table-column>
       <el-table-column
         :label="`${title}编码`"
-        prop="sourceBizNo"
+        prop="onlyCode"
       ></el-table-column>
-      <el-table-column label="批次号" prop="sourceBatchNo"> </el-table-column>
+      <el-table-column label="批次号" prop="batchNum"> </el-table-column>
       <el-table-column label="生产日期" width="180">
         <template slot-scope="{ row }">
           <span v-if="row.dateType === 2">
-            {{ row.dateValue }}
+            {{ row.manufactureTime }}
           </span>
         </template>
       </el-table-column>
       <el-table-column label="采购日期" width="180">
         <template slot-scope="{ row }">
           <span v-if="row.dateType === 1">
-            {{ row.dateValue }}
+            {{ row.procurementTime }}
           </span>
         </template>
       </el-table-column>
@@ -149,10 +149,10 @@
         v-if="!infoData.isUnpack"
       >
         <template slot-scope="{ row }">
-          {{ row.minPackingCount }}{{ row.unit }}/{{ row.minUnit }}
+          {{ row.measurementUnit }}{{ row.unit }}/{{ row.minPackUnit }}
         </template>
       </el-table-column>
-      <el-table-column label="包装编码" prop="packageNo"></el-table-column>
+      <el-table-column label="包装编码" prop="num"></el-table-column>
       <el-table-column label="入库时间" prop="createTime"></el-table-column>
       <el-table-column width="50" type="selection"></el-table-column>
     </el-table>
@@ -214,7 +214,7 @@
         tableData: [],
         selectList: [],
         formData: {
-          goodsAllocation: '',
+          cargoSpaceCode: '',
           time: '',
           dateType: 1,
           batchNo: '',
@@ -241,6 +241,8 @@
     },
     methods: {
       selecctedRow(val) {
+        console.log(val);
+        this.$emit('mxArgs', val);
         this.memo = val;
       },
       open(infoData, memo = []) {
@@ -337,10 +339,20 @@
       // 表格数据
       async handleList(val) {
         console.log(this.infoData);
+        console.log('sasa', this.formData);
+        if (this.formData.dateType == 1) {
+          this.formData.manufactureTime = this.formData.productTime;
+        } else {
+          this.formData.procurementTime = this.formData.productTime;
+        }
         const res = await outin.getoutDetail({
-          categoryId: this.infoData.id
+          ...this.formData,
+          ledgerId: this.infoData.id,
+          pageNum: 1,
+          size: 1
         });
-        this.tableData = res.data;
+        console.log(res);
+        this.tableData = res.data.list;
         if (res.data.length > 0 && res.data[0].brandNum) {
           this.infoData.brandNum = res.data[0].brandNum;
         }

src/views/warehouseManagement/outgoingManagement/details.vue

@@ -5,7 +5,7 @@
         <!-- <PageHeader title="出库单详情"> </PageHeader> -->
       </div>
 
-      <StatusStep :activeCode="infoData.verifyStatus" />
+      <!-- <StatusStep :activeCode="infoData.verifyStatus" /> -->
       <div class="stepsStatus">
         <el-steps :active="active" align-center>
           <el-step title="创建"></el-step>
@@ -27,7 +27,7 @@
               <el-col :span="8">
                 <el-form-item label="出库物品类型">
                   <span>{{
-                    getDictValue('类型用途', infoData?.extInfo?.assetType)
+                    getDictValue('类型用途', infoData.assetType)
                   }}</span>
                 </el-form-item>
               </el-col>
@@ -96,9 +96,12 @@
                 </el-table-column>
                 <el-table-column
                   label="物品编码"
-                  prop="categoryCode"
+                  prop="assetCode"
+                ></el-table-column>
+                <el-table-column
+                  label="物品名称"
+                  prop="assetName"
                 ></el-table-column>
-                <el-table-column label="物品名称" prop="name"></el-table-column>
 
                 <el-table-column
                   v-for="(item, index) in tableHeader"
@@ -117,7 +120,14 @@
                 <el-table-column label="出库数量" align="center" width="320">
                   <template slot-scope="{ row }">
                     <el-row :gutter="4">
-                      <el-col :span="9">
+                      <el-col :span="9" v-if="!row.isUnpack">
+                        <el-input type="text" disabled :value="row.outInNum">
+                          <template slot="append">
+                            {{ row.minPackUnit }}
+                          </template>
+                        </el-input>
+                      </el-col>
+                      <!-- <el-col :span="9">
                         <el-input
                           type="text"
                           :value="row.minPackingCount"
@@ -138,7 +148,7 @@
                             {{ row.packingUnit }}
                           </template>
                         </el-input>
-                      </el-col>
+                      </el-col> -->
                     </el-row>
                   </template>
                 </el-table-column>
@@ -146,15 +156,12 @@
             </div>
           </div>
         </div>
+
         <div class="mt20">
           <header-title
-            :title="`${getDictValue(
-              '类型用途',
-              infoData?.extInfo?.assetType
-            )}明细`"
+            :title="`${getDictValue('类型用途', infoData.assetType)}明细`"
             size="16px"
           ></header-title>
-
           <el-table
             ref="multipleTable"
             :data="materialCodeReqList"
@@ -166,34 +173,34 @@
             <el-table-column label="序号" type="index" width="50">
             </el-table-column>
             <el-table-column
-              :label="`${getDictValue(
-                '类型用途',
-                infoData?.extInfo?.assetType
-              )}编码`"
-              prop="code"
+              :label="`${getDictValue('类型用途', infoData.assetType)}编码`"
+              prop="onlyCode"
+            ></el-table-column>
+            <el-table-column
+              label="批次号"
+              prop="sourceBatchNo"
             ></el-table-column>
-            <el-table-column label="批次号" prop="batchNo"></el-table-column>
             <el-table-column label="生产日期" width="200">
               <template slot-scope="{ row }">
                 <span v-if="row.dateType === 2">
-                  {{ row.dateValue }}
+                  {{ row.manufactureTime }}
                 </span>
               </template>
             </el-table-column>
             <el-table-column label="采购日期" width="200">
               <template slot-scope="{ row }">
                 <span v-if="row.dateType === 1">
-                  {{ row.dateValue }}
+                  {{ row.procurementtime }}
                 </span>
               </template>
             </el-table-column>
             <el-table-column align="center" label="最小包装单元">
-              <template slot-scope="{ row }">
-                <template>
-                  {{ row.minPackingCount }}{{ row.measuringUnit }} /{{
-                    row.packingUnit
-                  }}
-                </template>
+              <template slot-scope="{ row, $index }">
+                <template v-if="!row.isUnpack">
+                  {{ row.measurementUnit }}{{ row.unit }}/{{
+                    row.minPackUnit
+                  }}</template
+                >
               </template>
             </el-table-column>
             <el-table-column
@@ -333,32 +340,37 @@
       getSceneState: useDictLabel(outputSceneState),
       getAuditStatus: useDictLabel(auditStatus),
       async _getInfo() {
-        const res = await outin.getById(this.$route.query.id);
+        const res = await outin.getWms(this.$route.query.id);
         console.log(res);
-        this.infoData = res;
+        this.infoData = res.inOutVO;
         if (res) {
-          this.warehousingMaterialList = res.outInDetailVOList.map((item) => {
-            item.selfSum = (item.warehouseLedgerDetails || []).reduce(
-              (sum, pre) => {
-                if (item.isUnpack) {
-                  return ++sum;
-                }
-                return sum + pre.measurementUnit;
-              },
-              0
-            );
-
-            return item;
-          });
+          // this.warehousingMaterialList = res.warehouseLedgerInfos.map(
+          //   (item) => {
+          //     item.selfSum = (item.warehouseLedgerDetails || []).reduce(
+          //       (sum, pre) => {
+          //         if (item.isUnpack) {
+          //           return ++sum;
+          //         }
+          //         return sum + pre.measurementUnit;
+          //       },
+          //       0
+          //     );
 
-          this.materialCodeReqList = res.outInDetailVOList
-            .map((i) =>
-              (i.outInDetailRecordVOList || []).map((item) => ({
-                ...item,
-                isUnpack: i.isUnpack
-              }))
-            )
-            .flat();
+          //     return item;
+          //   }
+          // );
+          this.warehousingMaterialList = res.warehouseLedgerInfos.ledgers;
+          this.materialCodeReqList =
+            res.warehouseLedgerInfos.warehouseLedgerDetails;
+          console.log('sasa', res.warehouseLedgerInfos.ledgers);
+          // res.warehouseLedgerInfos.ledgers;
+          // .map((i) =>
+          //   (i.outInDetailRecordVOList || []).map((item) => ({
+          //     ...item,
+          //     isUnpack: i.isUnpack
+          //   }))
+          // )
+          // .flat();
         }
       },
       // 时间差计算

src/views/warehouseManagement/outgoingManagement/index.vue

@@ -97,8 +97,8 @@
         </template>
         <!-- 状态 -->
         <template v-slot:verifyStatus="{ row }">
-          <span :class="status[row.verifyStatus].class">
-            {{ status[row.verifyStatus].label }}
+          <span :class="status[row.verifyStatus + -1].class">
+            {{ status[row.verifyStatus - 1].label }}
           </span>
         </template>
         <!-- 领料人 -->
@@ -235,10 +235,10 @@
         }
         delete params.time;
         // params.bizStatus = 1;
-        const res = await outin.list({
+        const res = await outin.pageWms({
           pageNum: page,
           size: limit,
-          type: 2,
+          bizStatus: 2,
           ...params
         });
         return res;

src/views/warehouseManagement/stockManagement/add.vue

@@ -240,6 +240,7 @@
                 align="center"
               >
               </el-table-column>
+
               <el-table-column
                 label="物品编码"
                 prop="assetCode"
@@ -286,6 +287,18 @@
                   </el-form-item>
                 </template>
               </el-table-column>
+              <el-table-column
+                label="计量单位"
+                prop="batchNo"
+                width="150"
+                align="center"
+              >
+                <template slot-scope="{ row, $index }">
+                  <template>
+                    {{ row.measuringUnit }}
+                  </template>
+                </template>
+              </el-table-column>
               <el-table-column
                 label="最小包装单元"
                 align="center"
@@ -318,7 +331,7 @@
                 </el-table-column>
                 <el-table-column label="" prop="minPackingCount">
                   <template slot-scope="{ row, $index }">
-                    {{ row.unit }} /{{ row.minPackUnit }}
+                    {{ handleRowUnit(row) }} /{{ row.minPackUnit }}
                   </template>
                 </el-table-column>
               </el-table-column>
@@ -358,16 +371,16 @@
                 align="center"
               >
                 <template slot-scope="{ row, $index }">
-                  <template v-if="row.isSave || formData.bizType == 5">
+                  <!-- <template v-if="row.isSave || formData.bizType == 5">
                     <template v-if="row.univalence || row.univalence === 0">
                       {{ row.univalence
                       }}{{
                         { yuan: '元', wanyuan: '万元' }[row.univalenceUnit]
                       }}
                     </template>
-                  </template>
+                  </template> -->
+                  <!-- v-else -->
                   <el-form-item
-                    v-else
                     :prop="`warehousingMaterialList.${$index}.univalence`"
                   >
                     <el-input
@@ -378,24 +391,25 @@
                           (row.univalence = value.replace(/^(0+)|[^\d]+/g, ''))
                       "
                     >
-                      <template slot="suffix">
-                        {{
+                      <template slot="append">
+                        元/{{ handleRowUnit(row) }}
+                        <!-- {{
                           { yuan: '元', wanyuan: '万元' }[row.univalenceUnit]
-                        }}
+                        }} -->
                       </template>
                     </el-input>
                   </el-form-item>
                 </template>
               </el-table-column>
               <el-table-column
-                label="总额"
+                label="金额"
                 align="center"
                 prop="contentImage"
                 :show-overflow-tooltip="true"
               >
                 <template slot-scope="{ row, $index }">
                   {{
-                    calcSum(
+                    calcSumTotal(
                       row.outInNum,
                       row.minPackingCount,
                       row.univalence,
@@ -405,15 +419,30 @@
                 </template>
               </el-table-column>
               <el-table-column
-                label="质检单"
-                v-if="formData.extInfo.assetType === 3"
+                label="重量"
+                align="center"
                 prop="contentImage"
                 :show-overflow-tooltip="true"
               >
                 <template slot-scope="{ row, $index }">
-                  <upload @on-success="(data) => (row.contentImage = [data])"
-                    ><template slot="placeholder">上传</template></upload
-                  >
+                  {{ weightTotal(row.outInNum, row.minPackingCount) }}
+                  <template slot="append">
+                    {{ handleRowUnit(row) }}
+                    <!-- {{
+                          { yuan: '元', wanyuan: '万元' }[row.univalenceUnit]
+                        }} -->
+                  </template>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="重量单位"
+                align="center"
+                prop="contentImage"
+                :show-overflow-tooltip="true"
+              >
+                <template slot-scope="{ row, $index }">
+                  {{ row.weightUnit }}
+                  <template slot="append"> </template>
                 </template>
               </el-table-column>
               <el-table-column
@@ -452,6 +481,19 @@
                   </el-form-item>
                 </template>
               </el-table-column>
+              <el-table-column
+                label="质检单"
+                v-if="formData.extInfo.assetType === 3"
+                prop="contentImage"
+                :show-overflow-tooltip="true"
+              >
+                <template slot-scope="{ row, $index }">
+                  <upload @on-success="(data) => (row.contentImage = [data])"
+                    ><template slot="placeholder">上传</template></upload
+                  >
+                </template>
+              </el-table-column>
+
               <el-table-column
                 label="操作"
                 width="200"
@@ -759,6 +801,33 @@
       this.initData();
     },
     methods: {
+      //计算重量
+      weightTotal(PackingCount, outInNum) {
+        const total = {
+          PackingCount: Number(PackingCount),
+          outInNum: Number(outInNum)
+        };
+        return total.PackingCount * total.outInNum;
+      },
+      //计算金额
+      calcSumTotal(PackingCount, outInNum, univalence) {
+        //最小包装单元,包装数量,单价
+        const total = {
+          PackingCount: Number(PackingCount),
+          outInNum: Number(outInNum),
+          univalence: Number(univalence)
+        };
+        return total.PackingCount * total.outInNum * total.univalence;
+      },
+      handleRowUnit(row) {
+        console.log('===sss', this.formData);
+        if (this.formData.extInfo.assetType == 1) {
+          console.log(row);
+          return row.weightUnit;
+        } else if (this.formData.extInfo.assetType == 4) {
+          return row.measuringUnit;
+        }
+      },
       changeVerfy(it) {
         this.formData.verifyName = it.name;
         console.log(this.formData.verifyName);
@@ -1208,7 +1277,10 @@
                       ...houseList[j],
                       rootCategoryLevelId:
                         parmasObj.warehouseLedgerInfos[i]
-                          .categoryLevelPathIdParent
+                          .categoryLevelPathIdParent,
+
+                      categoryLevelId:
+                        parmasObj.warehouseLedgerInfos[i].categoryLevelId
                     };
                     delete parmasObj.warehouseLedgerInfos[i].houseList;
                   }
@@ -1226,7 +1298,9 @@
                     ...warehouseLedgerDetails[g],
                     ...warehouseLedgerDetails[g].houseList[q],
                     rootCategoryLevelId:
-                      warehouseLedgerDetails[g].categoryLevelPathIdParent
+                      warehouseLedgerDetails[g].categoryLevelPathIdParent,
+                    categoryLevelId:
+                      parmasObj.warehouseLedgerInfos[i].categoryLevelId
                   };
                 }
               }

src/views/warehouseManagement/stockManagement/index.vue

@@ -223,7 +223,8 @@
           pageNum: page,
           size: limit,
           type: 1,
-          ...params
+          ...params,
+          bizStatus: 1
         });
 
         return res;