Merge branch 'master' into 测试

src/views/group/data-board/subsidiary-sales-volume/index.vue

@@ -20,27 +20,33 @@
     <el-row :gutter="10" v-if="tableList && tableList.length > 0" v-loading="loading">
       <el-col :span="8" v-for="(item, index) in tableList" :key="index">
         <el-card style="margin-top: 10px">
-          <div class="secondRowBoardTop">
-            <div>{{ item.departmentName }}生产订单总数（单）</div>
-            <div style="font-weight: 700; margin-top: 10px; font-size: 20px !important">
-              {{ item.orderSalesCount || 0 }}
-            </div>
-          </div>
-          <div class="secondRowBoardBottom">
-            <div>{{ item.departmentName }}生产BOM总数（个）</div>
-            <div style="font-weight: 700; margin-top: 10px; font-size: 20px !important">
-              {{ item.bomSpecSalesCount || 0 }}
-            </div>
-          </div>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <div class="secondRowBoardTop">
+                <div>{{ item.departmentName }}生产订单总数（单）</div>
+                <div style="font-weight: 700; margin-top: 10px; font-size: 20px !important">
+                  {{ item.orderSalesCount || 0 }}
+                </div>
+              </div>
+            </el-col>
+            <el-col :span="12">
+              <div class="secondRowBoardBottom">
+                <div>{{ item.departmentName }}生产BOM总数（个）</div>
+                <div style="font-weight: 700; margin-top: 10px; font-size: 20px !important">
+                  {{ item.bomSpecSalesCount || 0 }}
+                </div>
+              </div>
+            </el-col>
+          </el-row>
           <el-table
             :data="item.bomSpecSalesList"
             :cell-style="{ padding: '0' }"
             :row-style="{ height: '50px' }"
             header-row-class-name="tableHeader"
-            height="30vh"
+            height="60vh"
             style="margin-top: 20px">
-            <el-table-column label="序号" align="center" type="index" width="60" />
-            <el-table-column label="BOM品号" prop="bomSpecCode" width="140" />
+            <el-table-column label="序号" align="center" type="index" width="54" />
+            <el-table-column label="BOM品号" prop="bomSpecCode" width="130" />
             <el-table-column label="BOM品名" prop="bomSpecName" min-width="140" />
             <el-table-column label="数量" align="center" width="80">
               <template #default="{ row }">
@@ -114,11 +120,13 @@ getList();
 }
 .secondRowBoardBottom {
   padding: 20px;
-  margin-top: 20px;
   background-color: #fff8ef;
   border-radius: 10px;
   div {
     font-size: 16px !important;
   }
 }
+::v-deep(.el-form-item--default) {
+  margin-bottom: 0;
+}
 </style>