cz 1 год назад
Родитель
Сommit
61423da227
1 измененных файлов с 32 добавлено и 46 удалено
  1. 32 46
      src/views/EHSD/saleContract/productionReport/index.vue

+ 32 - 46
src/views/EHSD/saleContract/productionReport/index.vue

@@ -5,34 +5,42 @@
     </byTable>
     <div style="padding: 0 15px 0px 15px; background-color: white">
       <el-table v-loading="loading" :data="sourceList.data" :height="tableHeight" :border="false">
-        <el-table-column label="工厂" prop="a" fixed width="100" />
-        <el-table-column label="订单号" prop="b" width="100" />
-        <el-table-column label="产品图片" prop="c" width="100" />
-        <el-table-column label="产品编码" prop="c" width="100" />
-        <el-table-column label="产品名称" prop="d" width="100" />
-        <el-table-column label="尺寸" prop="e" width="100" />
-        <el-table-column label="颜色" prop="f" width="150" />
-        <el-table-column label="生产件数" prop="g" width="100" />
-        <el-table-column label="交期" prop="h" width="100" />
-        <el-table-column label="完工时间" prop="i" width="160" />
-        <el-table-column label="是否逾期" prop="j" width="100" />
-        <el-table-column label="逾期天数" prop="k" width="100" />
-        <el-table-column label="及时率" prop="l" width="100">
+        <el-table-column label="工厂" prop="factoryName" fixed width="100" />
+        <el-table-column label="订单号" prop="orderCode" width="100" />
+        <!-- <el-table-column label="产品图片" prop="c" width="100" /> -->
+        <el-table-column label="产品编码" prop="productCode" width="130" />
+        <el-table-column label="产品名称" prop="productName" width="120" />
+        <el-table-column label="尺寸(cm)" width="110">
           <template #default="{ row }">
-            <div style="color:red"> {{row.l}}</div>
+            <div>
+              {{row.productLength}}*
+              {{row.productWidth}}*
+              {{row.productHeight}}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="颜色" prop="productColor" width="130" />
+        <el-table-column label="生产件数" prop="quantity" width="80" />
+        <el-table-column label="交期" prop="deliveryPeriod" width="90" />
+        <el-table-column label="完工时间" prop="finishTime" width="90" />
+        <el-table-column label="是否逾期" prop="isOverdue" width="80" :formatter="(row)=>row.isOverdue==1?'逾期':'未逾期'" />
+        <el-table-column label="逾期天数" prop="overdueDay" width="80" />
+        <el-table-column label="及时率" width="70">
+          <template #default="{ row }">
+            <div style="color:red"> {{row.overdueDay}} %</div>
           </template>
         </el-table-column>
         <el-table-column label="损耗" prop="m" align="center">
-          <el-table-column label="瑜伽垫(数量)" prop="n" width="125" />
-          <el-table-column label="瑜伽垫(成本)" prop="o" width="125" />
-          <el-table-column label="包材辅材(数量)" prop="p" width="140" />
-          <el-table-column label="包材辅材(成本)" prop="q" width="140" />
-          <el-table-column label="返工(道)" prop="r" width="100" />
-          <el-table-column label="返工(成本)" prop="s" width="110" />
+          <el-table-column label="瑜伽垫(数量)" prop="rawLossCount" width="100" />
+          <el-table-column label="瑜伽垫(成本)" prop="rawLossAmount" width="100" />
+          <el-table-column label="包材辅材(数量)" prop="bomLossCount" width="110" />
+          <el-table-column label="包材辅材(成本)" prop="bomLossAmount" width="110" />
+          <el-table-column label="返工(道)" prop="reworkCount" width="100" />
+          <el-table-column label="返工(成本)" prop="reworkAmount" width="100" />
         </el-table-column>
-        <el-table-column label="出错率" prop="t" width="100">
+        <el-table-column label="出错率" width="70">
           <template #default="{ row }">
-            <div style="color:red"> {{row.t}}</div>
+            <div style="color:red"> {{row.errRate}} %</div>
           </template>
         </el-table-column>
 
@@ -187,31 +195,9 @@ const getList = async (req) => {
   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
   loading.value = true;
   proxy
-    .post("/contract/getProfitClearingPage", sourceList.value.pagination)
+    .post("/report/productionReport", sourceList.value.pagination)
     .then((res) => {
-      sourceList.value.data = res.rows.map((x) => ({
-        a: "三梵",
-        b: "SC-202402-200",
-        c: "324",
-        d: "123454",
-        e: "180* 80* 1.5",
-        f: "兰黛紫Y03+粉红Y02",
-        g: "500",
-        h: "2024-02-05",
-        i: "2024-02-03 13:45:14",
-        j: "否",
-        k: "0",
-        l: "100%",
-        n: "10",
-        m: "100",
-        o: "10",
-        p: "200",
-        q: "10",
-        r: "300",
-        s: "2",
-        t: "20%",
-        u: "10%",
-      }));
+      sourceList.value.data = res.rows;
       sourceList.value.pagination.total = res.total;
       setTimeout(() => {
         loading.value = false;