lxf пре 1 година
родитељ
комит
c578282b56

+ 3 - 11
src/views/production/operation/batching/index.vue

@@ -67,19 +67,15 @@
           </byTable>
           <table class="table-class" border="0" cellpadding="0" cellspacing="0" v-loading="loading">
             <tr>
-              <th style="width: 200px">BOM品号</th>
-              <th style="min-width: 320px">BOM品名</th>
               <th style="width: 200px">SKU品号</th>
-              <th style="width: 120px; text-align: center">数量小计</th>
-              <th style="width: 140px; text-align: center">数量总计</th>
+              <th style="min-width: 320px">SKU品名</th>
+              <th style="width: 120px; text-align: center">数量</th>
             </tr>
             <tbody v-for="(item, index) in sourceListThree.data" :key="index">
               <tr v-for="(itemSKU, indexSKU) in item.skuInfoList" :key="indexSKU">
-                <td v-if="indexSKU === 0" :rowspan="item.skuInfoList.length">{{ item.bomSpecCode }}</td>
-                <td v-if="indexSKU === 0" :rowspan="item.skuInfoList.length">{{ item.bomSpecName }}</td>
                 <td>{{ itemSKU.skuSpecCode }}</td>
+                <td>{{ itemSKU.skuSpecName }}</td>
                 <td style="text-align: center">{{ itemSKU.quantity }}</td>
-                <td v-if="indexSKU === 0" :rowspan="item.skuInfoList.length" style="text-align: center">{{ item.totalQuantity }}</td>
               </tr>
             </tbody>
           </table>
@@ -170,10 +166,6 @@ import Quick from "/src/views/production/operation/batching/quick";
 const { proxy } = getCurrentInstance();
 const activeName = ref("first");
 const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
-const orderStockType = ref([
-  { dictKey: "0", dictValue: "半成品" },
-  { dictKey: "1", dictValue: "成品" },
-]);
 const sourceList = ref({
   data: [],
   pagination: {

+ 4 - 2
src/views/production/operation/batching/quick.vue

@@ -27,8 +27,10 @@
           <div style="width: 100%; padding: 0 20px">
             <div style="margin-bottom: 10px">{{ statisticalQuantity() }}</div>
             <el-table :data="inOutStorageBomList" :row-style="{ height: '35px' }" header-row-class-name="tableHeader">
-              <el-table-column label="BOM品号" prop="bomSpecCode" width="180" />
-              <el-table-column label="BOM品名" prop="bomSpecName" min-width="220" />
+              <el-table-column label="BOM品号" prop="bomSpecCode" width="180" v-if="props.pagination.orderStockType == '0'" />
+              <el-table-column label="BOM品名" prop="bomSpecName" min-width="220" v-if="props.pagination.orderStockType == '0'" />
+              <el-table-column label="SKU品号" prop="skuSpecCode" width="180" v-if="props.pagination.orderStockType == '1'" />
+              <el-table-column label="SKU品名" prop="skuSpecName" min-width="220" v-if="props.pagination.orderStockType == '1'" />
               <el-table-column label="仓库名称" prop="warehouseName" width="160" />
               <el-table-column label="剩余库存" prop="inventoryQuantity" width="120" />
               <el-table-column label="出库数量" width="140">