每日看板调整

src/views/group/data-board/daily-board/index.vue

@@ -15,7 +15,7 @@
       </el-form>
     </el-card>
     <el-row :gutter="10" style="padding-top: 10px">
-      <el-col :span="7">
+      <el-col :span="6">
         <el-card v-loading="topLeft">
           <div class="cardTitle">MES今日生产出库数据</div>
           <div class="firstRowBoard">
@@ -40,7 +40,7 @@
           </el-table>
         </el-card>
       </el-col>
-      <el-col :span="10">
+      <el-col :span="9">
         <el-card v-loading="topCenter">
           <div class="cardTitle">MES&万里牛今日订单和BOM差异（不含自建订单）</div>
           <div class="firstRowBoard">
@@ -71,15 +71,21 @@
           </el-table>
         </el-card>
       </el-col>
-      <el-col :span="7">
+      <el-col :span="9">
         <el-card v-loading="topRight" style="height: 100%">
-          <!-- <div class="cardTitle">MES今日生产&出库差异</div>
+          <div class="cardTitle">MES今日自建订单数据</div>
           <div class="firstRowBoard">
-            <span style="font-size: 16px !important">差异总数（个）</span>
-            <span style="font-weight: 700; font-size: 20px !important">{{ TRData.count || 0 }}</span>
+            <div style="width: 50%; padding: 0 8px; display: flex">
+              <span style="font-size: 16px !important">自建订单总数（单）</span>
+              <span style="font-weight: 700; font-size: 20px !important; padding-left: 16px">{{ TRData.sumOrderCount || 0 }}</span>
+            </div>
+            <div style="width: 50%; padding: 0 8px">
+              <span style="font-size: 16px !important">自建订单BOM总数（个）</span>
+              <span style="font-weight: 700; font-size: 20px !important; padding-left: 16px">{{ TRData.sumBomCount || 0 }}</span>
+            </div>
           </div>
           <el-table
-            :data="TRData.list"
+            :data="TRData.outStorageBomList"
             :cell-style="{ padding: '0' }"
             :row-style="{ height: '50px' }"
             header-row-class-name="tableHeader"
@@ -87,19 +93,13 @@
             style="margin-top: 20px">
             <el-table-column label="序号" align="center" type="index" width="60" />
             <el-table-column label="BOM编号" prop="bomSpecCode" min-width="140" />
-            <el-table-column label="今日生产" align="center" width="80">
-              <template #default="{ row }">
-                <span v-if="row.productCount">{{ Number(row.productCount) }}</span>
-                <span v-else>0</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="出库" align="center" width="80">
+            <el-table-column label="数量" align="center" width="80">
               <template #default="{ row }">
-                <span v-if="row.comeStockCount">{{ Number(row.comeStockCount) }}</span>
+                <span v-if="row.quantity">{{ Number(row.quantity) }}</span>
                 <span v-else>0</span>
               </template>
             </el-table-column>
-          </el-table> -->
+          </el-table>
         </el-card>
       </el-col>
     </el-row>
@@ -299,7 +299,7 @@
         </el-card>
       </el-col>
     </el-row>
-    <div style="padding-top: 10px">
+    <!-- <div style="padding-top: 10px">
       <el-card v-loading="bottomCenter">
         <div class="cardTitle">MES今日自建订单数据</div>
         <el-row :gutter="20">
@@ -337,7 +337,7 @@
           </el-col>
         </el-row>
       </el-card>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -352,7 +352,6 @@ const topCenter = ref(false);
 const topRight = ref(false);
 const centerLeft = ref(false);
 const centerRight = ref(false);
-const bottomCenter = ref(false);
 const TLData = ref({
   count: 0,
   list: [],
@@ -361,10 +360,11 @@ const TCData = ref({
   count: 0,
   list: [],
 });
-// const TRData = ref({
-//   count: 0,
-//   list: [],
-// });
+const TRData = ref({
+  sumOrderCount: 0,
+  sumBomCount: 0,
+  outStorageBomList: [],
+});
 const CLData = ref({
   sumOrderCount: 0,
   sumBomCount: 0,
@@ -387,11 +387,6 @@ const CRData = ref({
   sySumBomCount: 0,
   syOutStorageBomList: [],
 });
-const BCData = ref({
-  sumOrderCount: 0,
-  sumBomCount: 0,
-  outStorageBomList: [],
-});
 const changeTime = () => {
   if (timeList.value && timeList.value.length == 2) {
     getList();
@@ -472,16 +467,16 @@ const getList = () => {
       centerRight.value = false;
     }
   );
-  BCData.value = {};
-  bottomCenter.value = true;
+  TRData.value = {};
+  topRight.value = true;
   proxy.post("/dailyBoard/getSelfOrderOutStorageInfo", { beginDate: timeList.value[0] + " 00:00:00", endDate: timeList.value[1] + " 23:59:59" }).then(
     (res) => {
-      BCData.value = res;
-      bottomCenter.value = false;
+      TRData.value = res;
+      topRight.value = false;
     },
     (err) => {
       console.log(err);
-      bottomCenter.value = false;
+      topRight.value = false;
     }
   );
 };