Revert "22"

This reverts commit 700c75f59fce569e9140c8a9312e3faf390930ab.

src/views/warehouseManagement/components/AssetsDialog copy.vue

@@ -291,7 +291,7 @@
           ></el-table-column>
           <el-table-column
             prop="minUnit"
-            label="单位"
+            label="包装单位"
             v-if="dimension != 4"
             width="90"
           ></el-table-column>

src/views/warehouseManagement/components/AssetsDialog.vue

@@ -257,7 +257,7 @@
           <el-table-column
             v-if="dimension == 3"
             prop="packingUnit"
-            label="单位"
+            label="包装单位"
             min-width="120"
             :show-overflow-tooltip="true"
           ></el-table-column>

src/views/warehouseManagement/components/enum.js

@@ -65,7 +65,7 @@ export const tableContentData = [
       { label: '型号', key: 'unit', inKey: 'basePackUtil' }
     ]
   }
-];
+]
 
 // *入库明细
 export const warehousingMaterialListTable = {
@@ -83,7 +83,7 @@ export const warehousingMaterialListTable = {
     realInventoryAmount: '', //实时库存金额
     outInAmount: '', //入库总额
     unit: 'unit', //单位
-    minimumPackingUnit: '', //最小单位
+    minimumPackingUnit: '', //最小包装单位
     minimumUnit: '', //最小单元
     warehouseName: '' //仓库
   },
@@ -162,4 +162,4 @@ export const warehousingMaterialListTable = {
     unit: 'unit', //单位
     warehouseName: '' //仓库
   }
-};
+}

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

@@ -106,7 +106,7 @@
           },
           {
             prop: 'packingUnit',
-            label: '单位',
+            label: '包装单位',
             align: 'center'
           },
           {

src/views/warehouseManagement/components/selectType.vue

@@ -100,7 +100,7 @@
             ></el-table-column>
             <el-table-column
               prop="packingUnit"
-              label="单位"
+              label="包装单位"
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
@@ -278,7 +278,7 @@
             materialName: 'informationName',
             batchNo: '', //批次号
             unit: 'measuringUnit', //单位
-            minPackUnit: 'packingUnit' //最小单位
+            minPackUnit: 'packingUnit' //最小包装单位
           };
           this.tableData = res.list.map((item) => {
             for (const key in curMap) {

src/views/warehouseManagement/inboundRequests/components/tgDetails.vue

@@ -58,7 +58,7 @@
           },
 
           {
-            label: '单位',
+            label: '包装单位',
             prop: 'packingUnit'
           },
 

src/views/warehouseManagement/inventoryAllocation/add copy.vue

@@ -182,7 +182,7 @@
             :show-overflow-tooltip="true"
           ></el-table-column>
           <el-table-column
-            label="单位"
+            label="包装单位"
             prop="packingUnit"
             :show-overflow-tooltip="true"
           ></el-table-column>
@@ -321,7 +321,7 @@
             :show-overflow-tooltip="true"
           ></el-table-column>
           <el-table-column
-            label="单位"
+            label="包装单位"
             prop="packingUnit"
             :show-overflow-tooltip="true"
           ></el-table-column>

src/views/warehouseManagement/inventoryAllocation/add.vue

@@ -296,7 +296,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               prop="packingUnit"
               :show-overflow-tooltip="true"
             ></el-table-column>
@@ -540,7 +540,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               prop="packingUnit"
               :show-overflow-tooltip="true"
             ></el-table-column>

src/views/warehouseManagement/inventoryAllocation/details.vue

@@ -155,7 +155,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               prop="packingUnit"
               :show-overflow-tooltip="true"
             ></el-table-column>

src/views/warehouseManagement/outgoingManagement/add copy.vue

@@ -992,7 +992,7 @@
             manualBatchNo: '', // 批号
             batchNo: '', //批次号
             unit: 'measuringUnit', //单位
-            minPackUnit: 'packingUnit' //最小单位
+            minPackUnit: 'packingUnit' //最小包装单位
           };
 
           res.data.forEach((item) => {

src/views/warehouseManagement/outgoingManagement/add.vue

@@ -225,7 +225,7 @@
               </el-table-column>
               <el-table-column
                 v-else
-                label="单位"
+                label="包装单位"
                 prop="packingUnit"
               ></el-table-column>
               <el-table-column
@@ -340,7 +340,7 @@
                 :show-overflow-tooltip="true"
               ></el-table-column>
               <el-table-column
-                label="单位"
+                label="包装单位"
                 prop="packingUnit"
                 :show-overflow-tooltip="true"
               ></el-table-column>

src/views/warehouseManagement/outgoingManagement/add_old.vue

@@ -1071,7 +1071,7 @@
             materialName: 'informationName',
             batchNo: '', //批次号
             unit: 'measuringUnit', //单位
-            minPackUnit: 'packingUnit' //最小单位
+            minPackUnit: 'packingUnit' //最小包装单位
           };
 
           res.data.forEach((item) => {

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

@@ -475,7 +475,7 @@
             materialName: 'informationName',
             batchNo: '', //批次号
             unit: 'measuringUnit', //单位
-            minPackUnit: 'packingUnit' //最小单位
+            minPackUnit: 'packingUnit' //最小包装单位
           };
 
           res.data.forEach((item) => {

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

@@ -43,7 +43,7 @@
       ></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="packingUnit"></el-table-column>
       <el-table-column
         label="计量数量"
         prop="availableCountBase"

src/views/warehouseManagement/outgoingManagement/details copy.vue

@@ -275,7 +275,10 @@
                 {{ row.packingCount == 0 ? '0' : row.packingCount }}
               </template>
             </el-table-column>
-            <el-table-column label="单位" prop="packingUnit"></el-table-column>
+            <el-table-column
+              label="包装单位"
+              prop="packingUnit"
+            ></el-table-column>
             <el-table-column
               label="计量数量"
               prop="totalCount"

src/views/warehouseManagement/outgoingManagement/details.vue

@@ -174,7 +174,7 @@
             >
             </el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               align="center"
               width="120"
               prop="packingUnit"
@@ -281,7 +281,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               prop="packingUnit"
               :show-overflow-tooltip="true"
             ></el-table-column>

src/views/warehouseManagement/outgoingManagement/details_2.vue

@@ -295,7 +295,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               prop="packingUnit"
               :show-overflow-tooltip="true"
             ></el-table-column>

src/views/warehouseManagement/outgoingManagement/details_3.vue

@@ -174,7 +174,7 @@
             >
             </el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               align="center"
               width="120"
               prop="packingUnit"
@@ -281,7 +281,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               prop="packingUnit"
               :show-overflow-tooltip="true"
             ></el-table-column>

src/views/warehouseManagement/outgoingManagement/edit.vue

@@ -410,7 +410,10 @@
               prop="packingCount"
               width="80"
             ></el-table-column>
-            <el-table-column label="单位" prop="packingUnit"></el-table-column>
+            <el-table-column
+              label="包装单位"
+              prop="packingUnit"
+            ></el-table-column>
             <el-table-column
               label="计量数量"
               prop="minPackingCount"

src/views/warehouseManagement/picking/add copy.vue

@@ -182,7 +182,7 @@
             :show-overflow-tooltip="true"
           ></el-table-column>
           <el-table-column
-            label="单位"
+            label="包装单位"
             prop="packingUnit"
             :show-overflow-tooltip="true"
           ></el-table-column>
@@ -321,7 +321,7 @@
             :show-overflow-tooltip="true"
           ></el-table-column>
           <el-table-column
-            label="单位"
+            label="包装单位"
             prop="packingUnit"
             :show-overflow-tooltip="true"
           ></el-table-column>

src/views/warehouseManagement/picking/add.vue

@@ -118,7 +118,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               prop="packingUnit"
               :show-overflow-tooltip="true"
             ></el-table-column>
@@ -362,7 +362,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               prop="packingUnit"
               :show-overflow-tooltip="true"
             ></el-table-column>
@@ -459,7 +459,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               prop="packingUnit"
               :show-overflow-tooltip="true"
             ></el-table-column>
@@ -605,7 +605,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               prop="packingUnit"
               :show-overflow-tooltip="true"
             ></el-table-column>
@@ -860,7 +860,7 @@
             this.$refs.productListTable.clearSelection();
             console.log(this.receiveList);
           } else {
-            return this.$message.error('所选物品与清单单位不一致');
+            return this.$message.error('所选物品与清单包装单位不一致');
           }
         } else {
           this.$message.error('请选选择对应包装规格数量的拣货的物品');

src/views/warehouseManagement/picking/components/disassembleDialog.vue

@@ -121,7 +121,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               prop="packingUnit"
               :show-overflow-tooltip="true"
             ></el-table-column>
@@ -213,7 +213,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               prop="packingUnit"
               :show-overflow-tooltip="true"
             ></el-table-column>
@@ -367,7 +367,7 @@
                   }
                 });
               } else {
-                return this.$message.error('请检查所选的单位是否正确');
+                return this.$message.error('请检查所选的包装单位是否正确');
               }
               // // 获取包装维度
               // let packingSpecification =
@@ -488,7 +488,7 @@
                   return this.$message.error('请按照包装规格数量进行打包');
                 }
               } else {
-                return this.$message.error('请检查所选的单位是否正确');
+                return this.$message.error('请检查所选的包装单位是否正确');
               }
               // let isBoolen = this.selection.every(
               //   (item) =>

src/views/warehouseManagement/picking/details.vue

@@ -169,7 +169,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               prop="packingUnit"
               :show-overflow-tooltip="true"
             ></el-table-column>

src/views/warehouseManagement/sparePartsOutbound/add.vue

@@ -1019,7 +1019,7 @@
             manualBatchNo: '', // 批号
             batchNo: '', //批次号
             unit: 'measuringUnit', //单位
-            minPackUnit: 'packingUnit' //最小单位
+            minPackUnit: 'packingUnit' //最小包装单位
           };
 
           res.data.forEach((item) => {

src/views/warehouseManagement/sparePartsOutbound/components/basicInformation.vue

@@ -475,7 +475,7 @@
             materialName: 'informationName',
             batchNo: '', //批次号
             unit: 'measuringUnit', //单位
-            minPackUnit: 'packingUnit' //最小单位
+            minPackUnit: 'packingUnit' //最小包装单位
           };
 
           res.data.forEach((item) => {

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

@@ -43,7 +43,7 @@
       ></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="packingUnit"></el-table-column>
       <el-table-column
         label="计量数量"
         prop="availableCountBase"

src/views/warehouseManagement/sparePartsOutbound/details.vue

@@ -267,7 +267,10 @@
                 {{ row.packingCount == 0 ? '0' : row.packingCount }}
               </template>
             </el-table-column>
-            <el-table-column label="单位" prop="packingUnit"></el-table-column>
+            <el-table-column
+              label="包装单位"
+              prop="packingUnit"
+            ></el-table-column>
             <el-table-column
               label="计量数量"
               prop="totalCount"

src/views/warehouseManagement/sparePartsOutbound/edit.vue

@@ -410,7 +410,10 @@
               prop="packingCount"
               width="80"
             ></el-table-column>
-            <el-table-column label="单位" prop="packingUnit"></el-table-column>
+            <el-table-column
+              label="包装单位"
+              prop="packingUnit"
+            ></el-table-column>
             <el-table-column
               label="计量数量"
               prop="minPackingCount"

src/views/warehouseManagement/stockLedger/components/BaseInfo.vue

@@ -33,7 +33,7 @@
           </el-form-item>
         </el-col>
         <!-- <el-col :span="8">
-        <el-form-item label="单位">
+        <el-form-item label="包装单位">
           <span>{{ baseInfo.minPackUnit }}</span>
         </el-form-item>
       </el-col> -->

src/views/warehouseManagement/stockLedger/components/allot.vue

@@ -22,7 +22,7 @@
         prop="packingCountBase"
         label="包装库存数量"
       ></el-table-column>
-      <el-table-column prop="minUnit" label="单位"></el-table-column>
+      <el-table-column prop="minUnit" label="包装单位"></el-table-column>
       <el-table-column
         prop="minPackingCount"
         label="最小包装单元"

src/views/warehouseManagement/stockLedger/components/details/BaseInfo.vue

@@ -40,7 +40,7 @@
         {{ idata.weightUnit }}
       </el-descriptions-item>
       <el-descriptions-item>
-        <template slot="label"> 单位 </template>
+        <template slot="label"> 包装单位 </template>
         {{ idata.packingUnit }}
       </el-descriptions-item>
       <el-descriptions-item>

src/views/warehouseManagement/stockLedger/components/details/BatchDetail.vue

@@ -34,12 +34,12 @@
               </el-table-column>
               <el-table-column label="数量" prop="count"></el-table-column>
               <el-table-column
-                label="单位"
+                label="包装单位"
                 width="120"
                 prop="packingUnit"
               ></el-table-column>
               <el-table-column
-                label="最小单位"
+                label="最小包装单位"
                 width="120"
                 prop="minPackUnit"
               ></el-table-column>

src/views/warehouseManagement/stockLedger/components/details/InWarehouse.vue

@@ -172,7 +172,7 @@
         label="包装数量"
         prop="packingQuantity"
       ></el-table-column>
-      <el-table-column label="单位" prop="packingUnit"></el-table-column>
+      <el-table-column label="包装单位" prop="packingUnit"></el-table-column>
       <el-table-column label="重量" prop="weight"></el-table-column>
       <el-table-column label="重量单位" prop="weightUnit"></el-table-column>
       <el-table-column
@@ -281,7 +281,7 @@
           },
           {
             prop: 'packingUnit',
-            label: '单位',
+            label: '包装单位',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 110

src/views/warehouseManagement/stockLedger/components/details/InventoryAllocation.vue

@@ -56,7 +56,7 @@
         label="包装数量"
         prop="packingQuantity"
       ></el-table-column>
-      <el-table-column label="单位" prop="packingUnit"></el-table-column>
+      <el-table-column label="包装单位" prop="packingUnit"></el-table-column>
       <el-table-column
         label="计量数量"
         prop="measureQuantity"
@@ -160,7 +160,7 @@
           },
           {
             prop: 'packingUnit',
-            label: '单位',
+            label: '包装单位',
             align: 'center',
             showOverflowTooltip: true
           },

src/views/warehouseManagement/stockLedger/components/details/OutWarehouse.vue

@@ -170,7 +170,7 @@
           label="包装数量"
           prop="packingQuantity"
         ></el-table-column>
-        <el-table-column label="单位" prop="packingUnit"></el-table-column>
+        <el-table-column label="包装单位" prop="packingUnit"></el-table-column>
       </template>
       <el-table-column label="重量" prop="weight"></el-table-column>
       <el-table-column label="重量单位" prop="weightUnit"></el-table-column>
@@ -298,7 +298,7 @@
           },
           {
             prop: 'packingUnit',
-            label: '单位',
+            label: '包装单位',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 110

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

@@ -73,7 +73,7 @@
             <el-table-column
               width="80"
               property="packingUnit"
-              label="单位"
+              label="包装单位"
             ></el-table-column>
             <el-table-column
               width="330"
@@ -376,7 +376,7 @@
               },
               {
                 prop: 'minUnit',
-                label: '单位',
+                label: '包装单位',
                 showOverflowTooltip: true
               },
               {
@@ -547,7 +547,7 @@
               },
               {
                 prop: 'minUnit',
-                label: '单位',
+                label: '包装单位',
                 showOverflowTooltip: true
               },
               {

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

@@ -80,7 +80,7 @@
             <el-table-column
               width="80"
               property="packingUnit"
-              label="单位"
+              label="包装单位"
             ></el-table-column>
             <el-table-column
               width="330"
@@ -326,7 +326,7 @@
           this.selectedDime == 3
             ? {
                 prop: 'packingUnit',
-                label: '单位	',
+                label: '包装单位	',
                 showOverflowTooltip: true
               }
             : '',

src/views/warehouseManagement/stockLedger/enums.js

@@ -1,11 +1,11 @@
 // import { sceneState, outputSceneState } from '@/utils/dict/warehouse'
 // import { useDictLabel } from '@/utils/dict'
-const minPackUnitFun = (row) => {
-  return `${row.measurementUnit || ''}${row.unit}/${row.minPackUnit}`;
-};
+const minPackUnitFun = row => {
+  return `${row.measurementUnit || ''}${row.unit}/${row.minPackUnit}`
+}
 
-const bizSceneFormatter = useDictLabel(sceneState);
-const outputSceneStateFormatter = useDictLabel(outputSceneState);
+const bizSceneFormatter = useDictLabel(sceneState)
+const outputSceneStateFormatter = useDictLabel(outputSceneState)
 export const tableColumnConfigM = {
   first: [
     { label: '条码号', prop: 'barCode', type: 'barCode' },
@@ -18,7 +18,7 @@ export const tableColumnConfigM = {
     {
       label: '货位',
       prop: 'bizNum',
-      formatter: (row) =>
+      formatter: row =>
         `${row.warehouseName}-${row.areaName}-${row.shelfCode}-${row.cargoSpaceCode}`
     }
   ],
@@ -27,16 +27,16 @@ export const tableColumnConfigM = {
     {
       label: '入库场景',
       prop: 'bizScene',
-      formatter: (row) => bizSceneFormatter(+row.bizScene)
+      formatter: row => bizSceneFormatter(+row.bizScene)
     },
     {
       label: '入库数量',
       prop: 'outInNum',
-      formatter: (row) => row.measurementUnit * row.outInNum
+      formatter: row => row.measurementUnit * row.outInNum
     },
     { label: '计量单位', prop: 'unit' },
     { label: '包装数量', prop: 'outInNum' },
-    { label: '最小单位', prop: 'minPackUnit' },
+    { label: '最小包装单位', prop: 'minPackUnit' },
     // { label: '最小单元', prop: 'minPackUnit', formatter: minPackUnitFun },
     // { label: '库位', prop: 'cargoSpaceCode' },
     { label: '入库时间', prop: 'verifyTime' }
@@ -46,13 +46,13 @@ export const tableColumnConfigM = {
     {
       label: '调拨数量',
       prop: 'outInNum',
-      formatter: (row) => row.measurementUnit * row.count
+      formatter: row => row.measurementUnit * row.count
     },
     { label: '计量单位', prop: 'unit' },
     { label: '包装数量', prop: 'count' },
-    { label: '最小单位', prop: 'minPackUnit' },
+    { label: '最小包装单位', prop: 'minPackUnit' },
     // { label: '包装数量', prop: 'measurementUnit' },
-    // { label: '最小单位', prop: 'minPackUnit' },
+    // { label: '最小包装单位', prop: 'minPackUnit' },
     // { label: '最小单元', prop: 'minPackUnit', formatter: minPackUnitFun },
     { label: '调出仓库', prop: 'warehouseName' },
     { label: '调入仓库', prop: 'inWarehouseName' },
@@ -63,7 +63,7 @@ export const tableColumnConfigM = {
     {
       label: '出库场景',
       prop: 'bizScene',
-      formatter: (row) => outputSceneStateFormatter(+row.bizScene)
+      formatter: row => outputSceneStateFormatter(+row.bizScene)
     },
     // {
     //   label: '出库数量',
@@ -72,9 +72,9 @@ export const tableColumnConfigM = {
     // },
     { label: '计量单位', prop: 'unit' },
     { label: '包装数量', prop: 'outInNum' },
-    { label: '最小单位', prop: 'minPackUnit' },
+    { label: '最小包装单位', prop: 'minPackUnit' },
     // { label: '包装数量', prop: 'measurementUnit' },
-    // { label: '最小单位', prop: 'minPackUnit' },
+    // { label: '最小包装单位', prop: 'minPackUnit' },
     // { label: '最小单元', prop: 'minPackUnit', formatter: minPackUnitFun },
     // {
     //   label: '出库库位',
@@ -89,13 +89,13 @@ export const tableColumnConfigM = {
     {
       label: '状态',
       prop: 'status',
-      class: (row) => (row.status == 3 ? 'primary-text' : 'danger-text'),
-      formatter: (row) => (row.status == 3 ? '盘盈' : '盘亏')
+      class: row => (row.status == 3 ? 'primary-text' : 'danger-text'),
+      formatter: row => (row.status == 3 ? '盘盈' : '盘亏')
     },
     {
       label: '损溢数量',
       prop: 'amount',
-      formatter: (row) =>
+      formatter: row =>
         row.amount === null
           ? ''
           : row.status == 3
@@ -104,7 +104,7 @@ export const tableColumnConfigM = {
     },
     { label: '计量单位', prop: 'unit' },
     // { label: '包装数量', prop: '' },
-    // { label: '最小单位', prop: 'minimumPackUnit' },
+    // { label: '最小包装单位', prop: 'minimumPackUnit' },
     // { label: '最小单元', prop: '', formatter: minPackUnitFun },
     // {
     //   label: '库位',
@@ -114,7 +114,7 @@ export const tableColumnConfigM = {
     // },
     { label: '审核时间', prop: 'planAuditTime' }
   ]
-};
+}
 // 物料
 export const tableColumnConfig = {
   first: [
@@ -128,7 +128,7 @@ export const tableColumnConfig = {
     {
       label: '货位',
       prop: 'bizNum',
-      formatter: (row) =>
+      formatter: row =>
         `${row.warehouseName}-${row.areaName}-${row.shelfCode}-${row.cargoSpaceCode}`
     }
     // { label: '条码', prop: 'barCode', type: 'barCode' }
@@ -139,11 +139,11 @@ export const tableColumnConfig = {
     {
       label: '入库数量',
       prop: 'outInNum',
-      formatter: (row) => row.measurementUnit * row.outInNum
+      formatter: row => row.measurementUnit * row.outInNum
     },
     { label: '计量单位', prop: 'unit' },
     { label: '包装数量', prop: 'outInNum' },
-    { label: '最小单位', prop: 'minPackUnit' },
+    { label: '最小包装单位', prop: 'minPackUnit' },
     // { label: '最小单元', prop: 'minPackUnit', formatter: minPackUnitFun },
     // {
     //   label: '库位',
@@ -159,13 +159,13 @@ export const tableColumnConfig = {
     {
       label: '调拨数量',
       prop: 'outInNum',
-      formatter: (row) => row.measurementUnit * row.count
+      formatter: row => row.measurementUnit * row.count
     },
     { label: '计量单位', prop: 'unit' },
     { label: '包装数量', prop: 'count' },
-    { label: '最小单位', prop: 'minPackUnit' },
+    { label: '最小包装单位', prop: 'minPackUnit' },
     // { label: '包装数量', prop: 'measurementUnit' },
-    // { label: '最小单位', prop: 'minPackUnit' },
+    // { label: '最小包装单位', prop: 'minPackUnit' },
     // { label: '最小单元', prop: 'minPackUnit', formatter: minPackUnitFun },
     { label: '调出仓库', prop: 'warehouseName' },
     { label: '调入仓库', prop: 'inWarehouseName' },
@@ -176,7 +176,7 @@ export const tableColumnConfig = {
     {
       label: '出库场景',
       prop: 'bizScene',
-      formatter: (row) => outputSceneStateFormatter(+row.bizScene)
+      formatter: row => outputSceneStateFormatter(+row.bizScene)
     },
     // {
     //   label: '出库数量',
@@ -185,14 +185,14 @@ export const tableColumnConfig = {
     // },
     { label: '计量单位', prop: 'unit' },
     { label: '包装数量', prop: 'outInNum' },
-    { label: '最小单位', prop: 'minPackUnit' },
+    { label: '最小包装单位', prop: 'minPackUnit' },
     // { label: '包装数量', prop: 'measurementUnit' },
-    // { label: '最小单位', prop: 'minPackUnit' },
+    // { label: '最小包装单位', prop: 'minPackUnit' },
     // { label: '最小单元', prop: 'minPackUnit', formatter: minPackUnitFun },
     {
       label: '出库库位',
       prop: 'cargoSpaceCode',
-      formatter: (row) =>
+      formatter: row =>
         `${row.warehouseName}-${row.areaName}-${row.shelfCode}-${row.cargoSpaceCode}`
     },
     { label: '出库时间', prop: 'verifyTime' }
@@ -202,13 +202,13 @@ export const tableColumnConfig = {
     {
       label: '状态',
       prop: 'status',
-      class: (row) => (row.status == 3 ? 'primary-text' : 'danger-text'),
-      formatter: (row) => (row.status == 3 ? '盘盈' : '盘亏')
+      class: row => (row.status == 3 ? 'primary-text' : 'danger-text'),
+      formatter: row => (row.status == 3 ? '盘盈' : '盘亏')
     },
     {
       label: '损溢数量',
       prop: 'amount',
-      formatter: (row) =>
+      formatter: row =>
         row.amount === null
           ? ''
           : row.status == 3
@@ -217,7 +217,7 @@ export const tableColumnConfig = {
     },
     { label: '计量单位', prop: 'unit' },
     // { label: '包装数量', prop: '' },
-    // { label: '最小单位', prop: 'minimumPackUnit' },
+    // { label: '最小包装单位', prop: 'minimumPackUnit' },
     // { label: '最小单元', prop: '', formatter: minPackUnitFun },
     // {
     //   label: '库位',
@@ -227,7 +227,7 @@ export const tableColumnConfig = {
     // },
     { label: '审核时间', prop: 'planAuditTime' }
   ]
-};
+}
 
 // export const
 
@@ -236,4 +236,4 @@ export const titleCof = {
   third: '调拨单号',
   fourth: '出库单号',
   fifth: '工单编号'
-};
+}

src/views/warehouseManagement/stockManagement/add copy 2.vue

@@ -521,7 +521,10 @@
             prop="packingQuantity"
             width="80"
           ></el-table-column>
-          <el-table-column label="单位" prop="packingUnit"></el-table-column>
+          <el-table-column
+            label="包装单位"
+            prop="packingUnit"
+          ></el-table-column>
           <el-table-column
             label="计量数量"
             prop="measureQuantity"
@@ -1392,7 +1395,7 @@
             batchNo: batchNo, // 批次号
             minPackingQuantity: '', // 最小包装单元数量
             packingQuantity: '', // 包装数量
-            packingUnit: item.packingUnit, // 单位
+            packingUnit: item.packingUnit, // 包装单位
             measureQuantity: 0, // 计量数量
             measureUnit: item.measuringUnit, // 计量单位
             netWeight: item.netWeight, // 净重
@@ -1612,7 +1615,7 @@
             batchNo: row.batchNo, // 批次号
             packageNo: packingCodeList[index].onlyCode, // 包装编码
             packingQuantity: 1, // 包装数量
-            packingUnit: row.packingUnit, // 单位
+            packingUnit: row.packingUnit, // 包装单位
             measureQuantity: row.minPackingQuantity, // 计量数量
             measureUnit: row.measureUnit, // 计量单位
             weight: Number(

src/views/warehouseManagement/stockManagement/add copy.vue

@@ -976,7 +976,10 @@
               prop="packingCount"
               width="80"
             ></el-table-column>
-            <el-table-column label="单位" prop="packingUnit"></el-table-column>
+            <el-table-column
+              label="包装单位"
+              prop="packingUnit"
+            ></el-table-column>
             <el-table-column
               label="计量数量"
               prop="minPackingCount"

src/views/warehouseManagement/stockManagement/add.vue

@@ -285,7 +285,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                label="单位"
+                label="包装单位"
                 align="center"
                 prop="packingUnit"
                 width="100"
@@ -579,7 +579,10 @@
             prop="packingQuantity"
             width="80"
           ></el-table-column>
-          <el-table-column label="单位" prop="packingUnit"></el-table-column>
+          <el-table-column
+            label="包装单位"
+            prop="packingUnit"
+          ></el-table-column>
           <el-table-column
             label="计量数量"
             prop="measureQuantity"
@@ -1064,7 +1067,7 @@
                 batchNo: batchNo, // 批次号
                 minPackingQuantity: item.quantity, // 最小包装单元数量
                 packingQuantity: 1, // 包装数量
-                packingUnit: item.packingUnit, // 单位
+                packingUnit: item.packingUnit, // 包装单位
                 measureQuantity: 0, // 计量数量
                 measureUnit: item.measuringUnit, // 计量单位
                 netWeight: item.netWeight > -1 ? item.netWeight : 0, // 净重
@@ -1235,7 +1238,7 @@
             );
           }
           row.measureQuantity = this.changeCount(total);
-          // 判断单位和计量单位是否为不拆物料层规格
+          // 判断包装单位和计量单位是否为不拆物料层规格
           let packingBoolen = !!this.getDict('不拆物料层规格', row.packingUnit)
             .dictValue;
           let measureBoolen = !!this.getDict('不拆物料层规格', row.measureUnit)
@@ -1693,7 +1696,7 @@
                 batchNo: batchNo, // 批次号
                 minPackingQuantity: 1, // 最小包装单元数量
                 packingQuantity: filterArray[0]['数量'], // 包装数量
-                packingUnit: item.packingUnit, // 单位
+                packingUnit: item.packingUnit, // 包装单位
                 measureQuantity: 0, // 计量数量
                 measureUnit: item.measuringUnit, // 计量单位
                 netWeight: item.netWeight > -1 ? item.netWeight : 0, // 净重
@@ -2125,7 +2128,7 @@
             packingSpecificationLabel: packingSpecificationLabel, // 包装规格显示
             minPackingQuantity: '', // 最小包装单元数量
             packingQuantity: '', // 包装数量
-            packingUnit: '', // 单位
+            packingUnit: '', // 包装单位
             measureQuantity: 0, // 计量数量
             measureUnit: item.measuringUnit, // 计量单位
             netWeight: item.netWeight > -1 ? item.netWeight : 0, // 净重
@@ -2189,7 +2192,7 @@
           .then(async () => {
             // 批量获取包装编码并处理
             let packingCodePrams = this.productList.map((row) => {
-              // 判断单位和计量单位是否为不拆物料层规格
+              // 判断包装单位和计量单位是否为不拆物料层规格
               let packingBoolen = !!this.getDict(
                 '不拆物料层规格',
                 row.packingUnit
@@ -2213,7 +2216,7 @@
               if (row.isSave) {
                 return {};
               } else {
-                // 处理单位为KG类的情况
+                // 处理包装单位为KG类的情况
                 if (packingBoolen) {
                   return {
                     assetCode: row.categoryCode + row.index,
@@ -2223,7 +2226,7 @@
                 } else {
                   if (row.isUnpack) {
                     if (measureBoolen) {
-                      // 处理单位不为KG类,计量单位为KG类的情况
+                      // 处理包装单位不为KG类,计量单位为KG类的情况
                       let num = row.packingQuantity;
                       let splitIndex = row.packingSpecificationOption.findIndex(
                         (item) =>
@@ -2383,13 +2386,13 @@
       // 产品保存操作
       listSave(row, index) {
         this.validateFormIndividually(index).then(async () => {
-          // 判断单位和计量单位是否为不拆物料层规格
+          // 判断包装单位和计量单位是否为不拆物料层规格
           let packingBoolen = !!this.getDict('不拆物料层规格', row.packingUnit)
             .dictValue;
           let measureBoolen = !!this.getDict('不拆物料层规格', row.measureUnit)
             .dictValue;
           let packingNum = 0;
-          // 处理单位为KG类的情况
+          // 处理包装单位为KG类的情况
           if (packingBoolen) {
             let filterArr = row.packingSpecificationOption.filter((item) => {
               return (
@@ -2401,7 +2404,7 @@
               row.packingQuantity / filterArr[0].packageCell
             );
           }
-          // 处理单位不为KG类,计量单位为KG类的情况
+          // 处理包装单位不为KG类,计量单位为KG类的情况
           let measureNum = row.packingQuantity;
           if (measureBoolen) {
             let splitIndex = row.packingSpecificationOption.findIndex(
@@ -2627,14 +2630,14 @@
           purchaseDate = `${obj.year}-${obj.month}-${obj.strDate} ${obj.hour}:${obj.minute}:${obj.second}`;
           this.curDateType = 'purchaseDate';
         }
-        // 判断单位和计量单位是否为不拆物料层规格
+        // 判断包装单位和计量单位是否为不拆物料层规格
         let packingBoolen = !!this.getDict('不拆物料层规格', row.packingUnit)
           .dictValue;
         let measureBoolen = !!this.getDict('不拆物料层规格', row.measureUnit)
           .dictValue;
         let num = row.packingQuantity;
         let filterArr = [];
-        // 处理单位为KG类的情况
+        // 处理包装单位为KG类的情况
         if (packingBoolen) {
           filterArr = row.packingSpecificationOption.filter((item) => {
             return (
@@ -2646,7 +2649,7 @@
         } else {
           if (row.isUnpack) {
             if (measureBoolen) {
-              // 处理单位不为KG类,计量单位为KG类的情况
+              // 处理包装单位不为KG类,计量单位为KG类的情况
               let splitIndex = row.packingSpecificationOption.findIndex(
                 (item) =>
                   item.conversionUnit == row.packingUnit &&
@@ -2681,7 +2684,7 @@
         console.log('num-----------', num);
         for (let index = 0; index < num; index++) {
           let measureQuantity = 1;
-          // 处理单位为KG类,计算每桶KG值
+          // 处理包装单位为KG类,计算每桶KG值
           if (packingBoolen) {
             console.log(
               this.$math.format(filterArr[0].packageCell * (index + 1), 14)
@@ -2696,7 +2699,7 @@
           } else {
             if (!row.isUnpack) {
               if (measureBoolen) {
-                // 处理单位不为KG类,计量单位为KG类的情况
+                // 处理包装单位不为KG类,计量单位为KG类的情况
                 let splitIndex = row.packingSpecificationOption.findIndex(
                   (item) =>
                     item.conversionUnit == row.packingUnit &&

src/views/warehouseManagement/stockManagement/add0429.vue

@@ -849,7 +849,10 @@
               prop="packingCount"
               width="80"
             ></el-table-column>
-            <el-table-column label="单位" prop="packingUnit"></el-table-column>
+            <el-table-column
+              label="包装单位"
+              prop="packingUnit"
+            ></el-table-column>
             <el-table-column
               label="计量数量"
               prop="minPackingCount"

src/views/warehouseManagement/stockManagement/add1111.vue

@@ -605,7 +605,10 @@
             prop="packingQuantity"
             width="80"
           ></el-table-column>
-          <el-table-column label="单位" prop="packingUnit"></el-table-column>
+          <el-table-column
+            label="包装单位"
+            prop="packingUnit"
+          ></el-table-column>
           <el-table-column
             label="计量数量"
             prop="measureQuantity"
@@ -1110,7 +1113,7 @@
                 batchNo: batchNo, // 批次号
                 minPackingQuantity: item.quantity, // 最小包装单元数量
                 packingQuantity: 1, // 包装数量
-                packingUnit: item.packingUnit, // 单位
+                packingUnit: item.packingUnit, // 包装单位
                 measureQuantity: 0, // 计量数量
                 measureUnit: item.measuringUnit, // 计量单位
                 netWeight: item.netWeight > -1 ? item.netWeight : 0, // 净重
@@ -1631,7 +1634,7 @@
                 batchNo: batchNo, // 批次号
                 minPackingQuantity: 1, // 最小包装单元数量
                 packingQuantity: filterArray[0]['数量'], // 包装数量
-                packingUnit: item.packingUnit, // 单位
+                packingUnit: item.packingUnit, // 包装单位
                 measureQuantity: 0, // 计量数量
                 measureUnit: item.measuringUnit, // 计量单位
                 netWeight: item.netWeight > -1 ? item.netWeight : 0, // 净重
@@ -2027,7 +2030,7 @@
             packingSpecification: item.packingSpecification, // 包装规格
             minPackingQuantity: '', // 最小包装单元数量
             packingQuantity: '', // 包装数量
-            packingUnit: item.packingUnit, // 单位
+            packingUnit: item.packingUnit, // 包装单位
             measureQuantity: 0, // 计量数量
             measureUnit: item.measuringUnit, // 计量单位
             netWeight: item.netWeight > -1 ? item.netWeight : 0, // 净重
@@ -2342,7 +2345,7 @@
             batchNo: row.batchNo, // 批次号
             packageNo: packingCodeList[index].onlyCode, // 包装编码
             packingQuantity: 1, // 包装数量
-            packingUnit: row.packingUnit, // 单位
+            packingUnit: row.packingUnit, // 包装单位
             measureQuantity: row.minPackingQuantity, // 计量数量
             measureUnit: row.measureUnit, // 计量单位
             weight: Number(

src/views/warehouseManagement/stockManagement/add_2.vue

@@ -624,7 +624,10 @@
             prop="packingQuantity"
             width="80"
           ></el-table-column>
-          <el-table-column label="单位" prop="packingUnit"></el-table-column>
+          <el-table-column
+            label="包装单位"
+            prop="packingUnit"
+          ></el-table-column>
           <el-table-column
             label="计量数量"
             prop="measureQuantity"
@@ -1122,7 +1125,7 @@
                 batchNo: batchNo, // 批次号
                 minPackingQuantity: item.quantity, // 最小包装单元数量
                 packingQuantity: 1, // 包装数量
-                packingUnit: item.packingUnit, // 单位
+                packingUnit: item.packingUnit, // 包装单位
                 measureQuantity: 0, // 计量数量
                 measureUnit: item.measuringUnit, // 计量单位
                 netWeight: item.netWeight > -1 ? item.netWeight : 0, // 净重
@@ -1652,7 +1655,7 @@
                 batchNo: batchNo, // 批次号
                 minPackingQuantity: filterArray[0]['现存量'], // 最小包装单元数量
                 packingQuantity: 1, // 包装数量
-                packingUnit: item.packingUnit, // 单位
+                packingUnit: item.packingUnit, // 包装单位
                 measureQuantity: 0, // 计量数量
                 measureUnit: item.measuringUnit, // 计量单位
                 netWeight: item.netWeight > -1 ? item.netWeight : 0, // 净重
@@ -1750,7 +1753,7 @@
                 batchNo: batchNo, // 批次号
                 minPackingQuantity: filterArray[0]['现存量'], // 最小包装单元数量
                 packingQuantity: 1, // 包装数量
-                packingUnit: item.packingUnit, // 单位
+                packingUnit: item.packingUnit, // 包装单位
                 measureQuantity: 0, // 计量数量
                 measureUnit: item.measuringUnit, // 计量单位
                 netWeight: item.netWeight > -1 ? item.netWeight : 0, // 净重
@@ -2154,7 +2157,7 @@
             packingSpecification: item.packingSpecification, // 包装规格
             minPackingQuantity: '', // 最小包装单元数量
             packingQuantity: '', // 包装数量
-            packingUnit: item.packingUnit, // 单位
+            packingUnit: item.packingUnit, // 包装单位
             measureQuantity: 0, // 计量数量
             measureUnit: item.measuringUnit, // 计量单位
             netWeight: item.netWeight > -1 ? item.netWeight : 0, // 净重
@@ -2469,7 +2472,7 @@
             batchNo: row.batchNo, // 批次号
             packageNo: packingCodeList[index].onlyCode, // 包装编码
             packingQuantity: 1, // 包装数量
-            packingUnit: row.packingUnit, // 单位
+            packingUnit: row.packingUnit, // 包装单位
             measureQuantity: row.minPackingQuantity, // 计量数量
             measureUnit: row.measureUnit, // 计量单位
             weight: Number(

src/views/warehouseManagement/stockManagement/add_3.vue

@@ -282,7 +282,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                label="单位"
+                label="包装单位"
                 align="center"
                 prop="packingUnit"
                 width="100"
@@ -576,7 +576,10 @@
             prop="packingQuantity"
             width="80"
           ></el-table-column>
-          <el-table-column label="单位" prop="packingUnit"></el-table-column>
+          <el-table-column
+            label="包装单位"
+            prop="packingUnit"
+          ></el-table-column>
           <el-table-column
             label="计量数量"
             prop="measureQuantity"
@@ -1060,7 +1063,7 @@
                 batchNo: batchNo, // 批次号
                 minPackingQuantity: item.quantity, // 最小包装单元数量
                 packingQuantity: 1, // 包装数量
-                packingUnit: item.packingUnit, // 单位
+                packingUnit: item.packingUnit, // 包装单位
                 measureQuantity: 0, // 计量数量
                 measureUnit: item.measuringUnit, // 计量单位
                 netWeight: item.netWeight > -1 ? item.netWeight : 0, // 净重
@@ -1226,7 +1229,7 @@
             );
           }
           row.measureQuantity = this.changeCount(total);
-          // 判断单位和计量单位是否为不拆物料层规格
+          // 判断包装单位和计量单位是否为不拆物料层规格
           let packingBoolen = !!this.getDict('不拆物料层规格', row.packingUnit)
             .dictValue;
           let measureBoolen = !!this.getDict('不拆物料层规格', row.measureUnit)
@@ -1684,7 +1687,7 @@
                 batchNo: batchNo, // 批次号
                 minPackingQuantity: 1, // 最小包装单元数量
                 packingQuantity: filterArray[0]['数量'], // 包装数量
-                packingUnit: item.packingUnit, // 单位
+                packingUnit: item.packingUnit, // 包装单位
                 measureQuantity: 0, // 计量数量
                 measureUnit: item.measuringUnit, // 计量单位
                 netWeight: item.netWeight > -1 ? item.netWeight : 0, // 净重
@@ -2113,7 +2116,7 @@
             packingSpecificationLabel: packingSpecificationLabel, // 包装规格显示
             minPackingQuantity: '', // 最小包装单元数量
             packingQuantity: '', // 包装数量
-            packingUnit: '', // 单位
+            packingUnit: '', // 包装单位
             measureQuantity: 0, // 计量数量
             measureUnit: item.measuringUnit, // 计量单位
             netWeight: item.netWeight > -1 ? item.netWeight : 0, // 净重
@@ -2177,7 +2180,7 @@
           .then(async () => {
             // 批量获取包装编码并处理
             let packingCodePrams = this.productList.map((row) => {
-              // 判断单位和计量单位是否为不拆物料层规格
+              // 判断包装单位和计量单位是否为不拆物料层规格
               let packingBoolen = !!this.getDict(
                 '不拆物料层规格',
                 row.packingUnit
@@ -2201,7 +2204,7 @@
               if (row.isSave) {
                 return {};
               } else {
-                // 处理单位为KG类的情况
+                // 处理包装单位为KG类的情况
                 if (packingBoolen) {
                   return {
                     assetCode: row.categoryCode + row.index,
@@ -2211,7 +2214,7 @@
                 } else {
                   if (row.isUnpack) {
                     if (measureBoolen) {
-                      // 处理单位不为KG类,计量单位为KG类的情况
+                      // 处理包装单位不为KG类,计量单位为KG类的情况
                       let num = row.packingQuantity;
                       let splitIndex = row.packingSpecificationOption.findIndex(
                         (item) =>
@@ -2371,13 +2374,13 @@
       // 产品保存操作
       listSave(row, index) {
         this.validateFormIndividually(index).then(async () => {
-          // 判断单位和计量单位是否为不拆物料层规格
+          // 判断包装单位和计量单位是否为不拆物料层规格
           let packingBoolen = !!this.getDict('不拆物料层规格', row.packingUnit)
             .dictValue;
           let measureBoolen = !!this.getDict('不拆物料层规格', row.measureUnit)
             .dictValue;
           let packingNum = 0;
-          // 处理单位为KG类的情况
+          // 处理包装单位为KG类的情况
           if (packingBoolen) {
             let filterArr = row.packingSpecificationOption.filter((item) => {
               return (
@@ -2389,7 +2392,7 @@
               row.packingQuantity / filterArr[0].packageCell
             );
           }
-          // 处理单位不为KG类,计量单位为KG类的情况
+          // 处理包装单位不为KG类,计量单位为KG类的情况
           let measureNum = row.packingQuantity;
           if (measureBoolen) {
             let splitIndex = row.packingSpecificationOption.findIndex(
@@ -2594,14 +2597,14 @@
           purchaseDate = `${obj.year}-${obj.month}-${obj.strDate} ${obj.hour}:${obj.minute}:${obj.second}`;
           this.curDateType = 'purchaseDate';
         }
-        // 判断单位和计量单位是否为不拆物料层规格
+        // 判断包装单位和计量单位是否为不拆物料层规格
         let packingBoolen = !!this.getDict('不拆物料层规格', row.packingUnit)
           .dictValue;
         let measureBoolen = !!this.getDict('不拆物料层规格', row.measureUnit)
           .dictValue;
         let num = row.packingQuantity;
         let filterArr = [];
-        // 处理单位为KG类的情况
+        // 处理包装单位为KG类的情况
         if (packingBoolen) {
           filterArr = row.packingSpecificationOption.filter((item) => {
             return (
@@ -2613,7 +2616,7 @@
         } else {
           if (row.isUnpack) {
             if (measureBoolen) {
-              // 处理单位不为KG类,计量单位为KG类的情况
+              // 处理包装单位不为KG类,计量单位为KG类的情况
               let splitIndex = row.packingSpecificationOption.findIndex(
                 (item) =>
                   item.conversionUnit == row.packingUnit &&
@@ -2648,7 +2651,7 @@
         console.log('num-----------', num);
         for (let index = 0; index < num; index++) {
           let measureQuantity = 1;
-          // 处理单位为KG类,计算每桶KG值
+          // 处理包装单位为KG类,计算每桶KG值
           if (packingBoolen) {
             console.log(
               this.$math.format(filterArr[0].packageCell * (index + 1), 14)
@@ -2663,7 +2666,7 @@
           } else {
             if (!row.isUnpack) {
               if (measureBoolen) {
-                // 处理单位不为KG类,计量单位为KG类的情况
+                // 处理包装单位不为KG类,计量单位为KG类的情况
                 let splitIndex = row.packingSpecificationOption.findIndex(
                   (item) =>
                     item.conversionUnit == row.packingUnit &&

src/views/warehouseManagement/stockManagement/add_export.vue

@@ -538,7 +538,10 @@
               prop="packingCount"
               width="80"
             ></el-table-column>
-            <el-table-column label="单位" prop="packingUnit"></el-table-column>
+            <el-table-column
+              label="包装单位"
+              prop="packingUnit"
+            ></el-table-column>
             <el-table-column
               label="计量数量"
               prop="minPackingCount"

src/views/warehouseManagement/stockManagement/add_new.vue

@@ -400,7 +400,10 @@
               prop="packingCount"
               width="80"
             ></el-table-column>
-            <el-table-column label="单位" prop="packingUnit"></el-table-column>
+            <el-table-column
+              label="包装单位"
+              prop="packingUnit"
+            ></el-table-column>
             <el-table-column
               label="计量数量"
               prop="minPackingCount"

src/views/warehouseManagement/stockManagement/add_old.vue

@@ -841,7 +841,10 @@
               prop="packingCount"
               width="80"
             ></el-table-column>
-            <el-table-column label="单位" prop="packingUnit"></el-table-column>
+            <el-table-column
+              label="包装单位"
+              prop="packingUnit"
+            ></el-table-column>
             <el-table-column
               label="计量数量"
               prop="minPackingCount"

src/views/warehouseManagement/stockManagement/components/selectType.vue

@@ -133,7 +133,7 @@
             ></el-table-column>
             <el-table-column
               prop="packingUnit"
-              label="单位"
+              label="包装单位"
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
@@ -346,7 +346,7 @@
             materialName: 'informationName',
             batchNo: '', //批次号
             unit: 'measuringUnit', //单位
-            minPackUnit: 'packingUnit' //最小单位
+            minPackUnit: 'packingUnit' //最小包装单位
           };
           this.tableData = res.list.map((item) => {
             for (const key in curMap) {

src/views/warehouseManagement/stockManagement/details copy3.vue

@@ -372,7 +372,10 @@
               prop="packingCount"
               width="80"
             ></el-table-column>
-            <el-table-column label="单位" prop="packingUnit"></el-table-column>
+            <el-table-column
+              label="包装单位"
+              prop="packingUnit"
+            ></el-table-column>
             <el-table-column
               label="计量数量"
               prop="minPackingCount"

src/views/warehouseManagement/stockManagement/details.vue

@@ -173,7 +173,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               align="center"
               width="120"
               prop="packingUnit"
@@ -333,7 +333,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               prop="packingUnit"
               :show-overflow-tooltip="true"
             ></el-table-column>

src/views/warehouseManagement/stockManagement/details_2.vue

@@ -329,7 +329,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               prop="packingUnit"
               :show-overflow-tooltip="true"
             ></el-table-column>

src/views/warehouseManagement/stockManagement/details_3 copy.vue

@@ -173,7 +173,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               align="center"
               width="120"
               prop="packingUnit"
@@ -333,7 +333,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               prop="packingUnit"
               :show-overflow-tooltip="true"
             ></el-table-column>

src/views/warehouseManagement/stockManagement/details_3.vue

@@ -173,7 +173,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               align="center"
               width="120"
               prop="packingUnit"
@@ -333,7 +333,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               prop="packingUnit"
               :show-overflow-tooltip="true"
             ></el-table-column>

src/views/warehouseManagement/stockManagement/edit.vue

@@ -410,7 +410,10 @@
               prop="packingCount"
               width="80"
             ></el-table-column>
-            <el-table-column label="单位" prop="packingUnit"></el-table-column>
+            <el-table-column
+              label="包装单位"
+              prop="packingUnit"
+            ></el-table-column>
             <el-table-column
               label="计量数量"
               prop="minPackingCount"

src/views/warehouseManagement/stockManagement/priceMaintenance.vue

@@ -179,7 +179,6 @@
       </div>
       <div class="submit">
         <el-button type="primary" @click="confirm">保存</el-button>
-        <el-button @click="goBack">返回</el-button>
       </div>
     </el-card>
   </div>
@@ -248,9 +247,6 @@
           }
         });
       },
-      goBack() {
-        this.$router.go(-1);
-      },
       async getInboundDetail() {
         const res = await storageApi.getInboundDetailsById(
           this.$route.query.ids

src/views/warehouseManagement/stockManagement/quality.vue

@@ -197,7 +197,7 @@
             </el-table-column>
             <el-table-column
               v-else
-              label="单位"
+              label="包装单位"
               prop="packingUnit"
             ></el-table-column>
             <el-table-column
@@ -307,7 +307,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               prop="packingUnit"
               :show-overflow-tooltip="true"
             ></el-table-column>

src/views/warehouseManagement/stocktaking/plan/components/addInventoryDialog.vue

@@ -162,32 +162,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="预计开始时间" prop="planStartTime">
-            <el-date-picker
-              clearable
-              v-model="addForm.planStartTime"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="请选择日期"
-              :disabled="isBindPlan"
-            >
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="预计结束时间" prop="planEndTime">
-            <el-date-picker
-              clearable
-              v-model="addForm.planEndTime"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="请选择日期"
-              :disabled="isBindPlan"
-            >
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
         <!-- <el-col :span="8">
           <el-form-item label="锁库盘点" prop="isTreasuryLock">
             <el-switch
@@ -411,9 +385,7 @@
           remark: '', // 备注
           approvalUserId: '', // 审核人Id
           approvalUserName: '', // 审核人name
-          executorDuration: 0, // 盘点时长
-          planStartTime: '',
-          planEndTime: ''
+          executorDuration: 0 // 盘点时长
         },
         rules: {
           code: [

src/views/warehouseManagement/stocktaking/plan/details.vue

@@ -103,7 +103,7 @@
                       label="包装数量"
                     >
                     </el-table-column>
-                    <el-table-column prop="info.packingUnit" label="单位">
+                    <el-table-column prop="info.packingUnit" label="包装单位">
                     </el-table-column>
                     <!-- <el-table-column prop="weight" label="重量">
                     </el-table-column>

src/views/warehouseManagement/stocktaking/reportLoss/components/addReportDialog.vue

@@ -185,7 +185,7 @@
                   :show-overflow-tooltip="true"
                 ></el-table-column>
                 <el-table-column
-                  label="单位"
+                  label="包装单位"
                   prop="info.packingUnit"
                   :show-overflow-tooltip="true"
                 ></el-table-column>

src/views/warehouseManagement/stocktaking/reportLoss/components/reportProcuts.vue

@@ -115,7 +115,7 @@
                       :show-overflow-tooltip="true"
                     ></el-table-column>
                     <el-table-column
-                      label="单位"
+                      label="包装单位"
                       prop="info.packingUnit"
                       :show-overflow-tooltip="true"
                     ></el-table-column>

src/views/warehouseManagement/stocktaking/work/components/disposeDialog.vue

@@ -68,7 +68,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               prop="info.packingUnit"
               :show-overflow-tooltip="true"
             ></el-table-column>
@@ -192,7 +192,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               prop="info.packingUnit"
               :show-overflow-tooltip="true"
             ></el-table-column>

src/views/warehouseManagement/stocktaking/work/details.vue

@@ -103,7 +103,7 @@
                       label="包装数量"
                     >
                     </el-table-column>
-                    <el-table-column prop="info.packingUnit" label="单位">
+                    <el-table-column prop="info.packingUnit" label="包装单位">
                     </el-table-column>
                     <!-- <el-table-column prop="weight" label="重量">
                     </el-table-column>
@@ -219,7 +219,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-              label="单位"
+              label="包装单位"
               prop="info.packingUnit"
               :show-overflow-tooltip="true"
             ></el-table-column>