Explorar o código

feat(库存调拨): 添加调拨数量列并优化维度选择逻辑

liujt hai 7 meses
pai
achega
a8d847fde0

+ 7 - 7
src/views/warehouseManagement/inventoryAllocation/add.vue

@@ -189,8 +189,8 @@
                       v-model="dimension"
                       placeholder="请选择"
                     >
-                      <el-option v-if="allocateId != 1" label="物品维度" value="1"> </el-option>
-                      <el-option v-if="allocateId != 1" label="批次维度" value="2"> </el-option>
+                      <el-option label="物品维度" value="1"> </el-option>
+                      <el-option label="批次维度" value="2"> </el-option>
                       <el-option label="包装维度" value="3"> </el-option>
                     </el-select>
                   </template>
@@ -701,7 +701,7 @@
         tuneLibrary: [], // 调入库
         outWarehouseList: [],
         inWarehouseList: [],
-        dimension: '3',
+        dimension: '2',
         // 搜索验证状态
         searchState: { hasError: false },
         params: {
@@ -1158,7 +1158,7 @@
         if (baseInfo.inventoryDimension == 0) {
           if (dataList?.length) {
             if (dataList[0].packageNo) {
-              this.dimension = '3';
+              this.dimension = '2';
             }else{
               this.dimension = '2';
             }
@@ -1493,10 +1493,10 @@
       inWarehouseChange(val) {
         this.inCargoAreaList = this.inTreeList.filter(
           (item) => item.id == val
-        )[0].children;
+        )[0]?.children;
         this.params.inWarehouseName = this.inTreeList.filter(
           (item) => item.id == val
-        )[0].name;
+        )[0]?.name;
         // this.productList = [];
         // this.tableData = [];
         // this.selection = [];
@@ -1651,7 +1651,7 @@
                   goodsAllocationName: item.goodsAllocationName,
                   goodsShelfId: item.goodsShelfId,
                   goodsShelfName: item.goodsShelfName,
-                  outInDetailRecordId: item.outInDetailRecordId,
+                  outInDetailRecordId: item.id,
                   targetAreaId: item.targetAreaId,
                   targetAreaName: item.targetAreaName,
                   targetGoodsAllocationId: item.targetGoodsAllocationId,

+ 5 - 0
src/views/warehouseManagement/inventoryAllocation/details.vue

@@ -164,6 +164,11 @@
               prop="measureQuantity"
               :show-overflow-tooltip="true"
             ></el-table-column>
+            <el-table-column
+              label="调拨数量"
+              prop="quantity"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
             <el-table-column
               label="计量单位"
               prop="measureUnit"