From cf1b60ead7a9bb337c54ef231691137066d243be Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期四, 27 六月 2024 10:27:30 +0800
Subject: [PATCH] 1.优克仓库看板开发完成

---
 src/views/kanbanManager/ckgl.vue |  123 ++++++++++++++++++++++++++---------------
 1 files changed, 78 insertions(+), 45 deletions(-)

diff --git a/src/views/kanbanManager/ckgl.vue b/src/views/kanbanManager/ckgl.vue
index 11474d4..1407700 100644
--- a/src/views/kanbanManager/ckgl.vue
+++ b/src/views/kanbanManager/ckgl.vue
@@ -22,7 +22,7 @@
           <div style="height: 470px;">
             <div class="smallTitle">
               <svg-icon icon-class="cpdrk" class="svg_class" />
-              閲囪喘寰呭叆搴�
+              鐢熶骇寰呭叆搴�
             </div>
             <div class="lineContent horn" style="height: 410px">
               <el-table
@@ -37,7 +37,7 @@
                 <el-table-column
                   prop="voucherdate"
                   label="鍗曟嵁鏃ユ湡"
-                  width="161"
+                  width="131"
                 >
                   <template slot-scope="{row}">
                     <div v-if="row.voucherdate" class="ellipsis">{{ row.voucherdate.substring(0, 10) }}</div>
@@ -47,36 +47,44 @@
                 <el-table-column
                   prop="wo"
                   label="鍗曟嵁缂栧彿"
-                  width="209"
+                  width="189"
                 >
                   <template slot-scope="{row}">
                     <div class="ellipsis">{{ row.wo }}</div>
                   </template>
                 </el-table-column>
+                <el-table-column
+                  prop="wkshp_name"
+                  label="鐢熶骇杞﹂棿"
+                  width="105"
+                >
+                  <template slot-scope="{row}">
+                    <div class="ellipsis">{{ row.wkshp_name }}</div>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="saleOrderCode"
+                  label="閿�鍞鍗曞彿"
+                  width="200"
+                >
+                  <template slot-scope="{row}">
+                    <div v-if="row.saleOrderCode" class="ellipsis">{{ row.saleOrderCode }}</div>
+                    <div v-else>/</div>
+                  </template>
+                </el-table-column>
                 <!--                <el-table-column-->
-                <!--                  prop="wkshp_name"-->
-                <!--                  label="鐢熶骇杞﹂棿"-->
-                <!--                  width="105"-->
+                <!--                  prop="materiel_code"-->
+                <!--                  label="浜у搧缂栧彿"-->
+                <!--                  width="136"-->
                 <!--                >-->
                 <!--                  <template slot-scope="{row}">-->
-                <!--                    <div class="ellipsis">{{ row.wkshp_name }}</div>-->
+                <!--                    <div class="ellipsis">{{ row.materiel_code }}</div>-->
                 <!--                  </template>-->
                 <!--                </el-table-column>-->
-                <!--                <el-table-column-->
-                <!--                  prop="saleOrderCode"-->
-                <!--                  label="閿�鍞鍗曞彿"-->
-                <!--                  width="210"-->
-                <!--                >-->
-                <!--                  <template slot-scope="{row}">-->
-                <!--                    <div v-if="row.saleOrderCode" class="ellipsis">{{ row.saleOrderCode }}</div>-->
-                <!--                    <div v-else>/</div>-->
-                <!--                  </template>-->
-                <!--                </el-table-column>-->
-
                 <el-table-column
                   prop="materiel_name"
                   label="浜у搧鍚嶇О"
-                  width="390"
+                  width="170"
                 >
                   <template slot-scope="{row}">
                     <div class="ellipsis">{{ row.materiel_name }}</div>
@@ -85,7 +93,7 @@
                 <el-table-column
                   prop="specification"
                   label="瑙勬牸鍨嬪彿"
-                  width="146"
+                  width="136"
                 >
                   <template slot-scope="{row}">
                     <div v-if="row.specification" class="ellipsis">{{ row.specification }}</div>
@@ -95,7 +103,7 @@
                 <el-table-column
                   prop="stck_name"
                   label="棰勫叆浠撳簱"
-                  width="145"
+                  width="100"
                 >
                   <template slot-scope="{row}">
                     <div v-if="row.stck_name" class="ellipsis">{{ row.stck_name }}</div>
@@ -105,16 +113,41 @@
                 <el-table-column
                   prop="quantity"
                   label="鏁伴噺"
-                  width="113"
+                  width="63"
                 />
                 <el-table-column
                   prop="totalStockInQuantity"
                   label="宸插叆搴撴暟閲�"
-                  width="160"
+                  width="110"
                 >
                   <template slot-scope="{row}">
                     <div v-if="row.totalStockInQuantity">{{ row.totalStockInQuantity }}</div>
                     <div v-else>0</div>
+                  </template>
+                </el-table-column>
+                <!--                  <el-table-column-->
+                <!--                    prop="uomname"-->
+                <!--                    label="鍗曚綅"-->
+                <!--                    width="50"-->
+                <!--                  />-->
+                <!--                  <el-table-column-->
+                <!--                    prop="preStartDate"-->
+                <!--                    label="棰勮寮�宸�"-->
+                <!--                    width="100"-->
+                <!--                  >-->
+                <!--                    <template slot-scope="{row}">-->
+                <!--                      <div v-if="row.preStartDate">{{ row.preStartDate.substring(0, 10) }}</div>-->
+                <!--                      <div v-else />-->
+                <!--                    </template>-->
+                <!--                  </el-table-column>-->
+                <el-table-column
+                  prop="preFinishDate"
+                  label="棰勮鍏ュ簱"
+                  width="140"
+                >
+                  <template slot-scope="{row}">
+                    <div v-if="row.preFinishDate">{{ row.preFinishDate.substring(0, 10) }}</div>
+                    <div v-else />
                   </template>
                 </el-table-column>
 
@@ -123,8 +156,8 @@
           </div>
           <div style="height: 470px;margin-top: 30px;">
             <div class="smallTitle">
-              <svg-icon icon-class="cpdfh" class="svg_class" />
-              閿�鍞緟鍙戣揣
+              <svg-icon icon-class="drk" class="svg_class" />
+              濮斿寰呭叆搴�
             </div>
             <div class="lineContent horn" style="height: 410px">
               <el-table
@@ -139,7 +172,7 @@
                 <el-table-column
                   prop="voucherdate"
                   label="鍗曟嵁鏃ユ湡"
-                  width="131"
+                  width="151"
                 >
                   <template slot-scope="{row}">
                     <div v-if="row.voucherdate" class="ellipsis">{{ row.voucherdate.substring(0, 10) }}</div>
@@ -149,7 +182,7 @@
                 <el-table-column
                   prop="wo"
                   label="鍗曟嵁缂栧彿"
-                  width="205"
+                  width="225"
                 >
                   <template slot-scope="{row}">
                     <div class="ellipsis">{{ row.wo }}</div>
@@ -159,7 +192,7 @@
                 <el-table-column
                   prop="materiel_name"
                   label="浜у搧鍚嶇О"
-                  width="258"
+                  width="278"
                 >
                   <template slot-scope="{row}">
                     <div v-if="row.materiel_name" class="ellipsis">{{ row.materiel_name }}</div>
@@ -168,7 +201,7 @@
                 <el-table-column
                   prop="specification"
                   label="瑙勬牸鍨嬪彿"
-                  width="200"
+                  width="220"
                 >
                   <template slot-scope="{row}">
                     <div v-if="row.specification" class="ellipsis">{{ row.specification }}</div>
@@ -178,7 +211,7 @@
                 <el-table-column
                   prop="quantity"
                   label="鏁伴噺"
-                  width="100"
+                  width="120"
                 >
                   <template slot-scope="{row}">
                     <div class="ellipsis">{{ row.quantity }}</div>
@@ -187,7 +220,7 @@
                 <el-table-column
                   prop="saleOutQuantity"
                   label="宸插彂璐ф暟閲�"
-                  width="120"
+                  width="140"
                 >
                   <template slot-scope="{row}">
                     <div v-if="row.saleOutQuantity" class="ellipsis">{{ row.saleOutQuantity }}</div>
@@ -206,16 +239,16 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column
-                  prop="warning"
-                  label="寤舵湡澶╂暟"
-                  width="130"
-                >
-                  <template slot-scope="{row}">
-                    <div v-if="row.warning">{{ row.warning }}</div>
-                    <div v-else>/</div>
-                  </template>
-                </el-table-column>
+                <!--                <el-table-column-->
+                <!--                  prop="warning"-->
+                <!--                  label="寤舵湡澶╂暟"-->
+                <!--                  width="130"-->
+                <!--                >-->
+                <!--                  <template slot-scope="{row}">-->
+                <!--                    <div v-if="row.warning">{{ row.warning }}</div>-->
+                <!--                    <div v-else>/</div>-->
+                <!--                  </template>-->
+                <!--                </el-table-column>-->
               </el-table>
             </div>
           </div>
@@ -225,7 +258,7 @@
           <div style="height: 470px;">
             <div class="smallTitle">
               <svg-icon icon-class="ph" class="svg_class" />
-              杩戜竴鍛ㄩ噰璐緟鍏ュ簱鐗╂枡鎺掕Top5
+              鍗婃垚鍝併�佷骇鍝佸簱瀛橀噺鎺掕Top5
             </div>
             <div class="lineContent horn" style="height: 410px">
               <div id="bar03" style="width: 100%;height:100%; " />
@@ -235,7 +268,7 @@
           <div style="height: 470px;margin-top: 30px;">
             <div class="smallTitle">
               <svg-icon icon-class="ph" class="svg_class" />
-              杩戜竴鍛ㄩ攢鍞緟鍙戣揣浜у搧鎺掕Top5
+              鍘熸潗鏂欏簱瀛橀噺鎺掕Top5
             </div>
             <div class="lineContent horn" style="height: 410px">
               <div id="bar04" style="width: 100%;height:100%;" />
@@ -353,7 +386,7 @@
               }
             })
           }
-        }, this.tableDataTop.length <= 10 ? 1000 * 3 : 100)
+        }, this.tableDataTop.length <= 10 ? 1000 * 30 : 200)
       })
     },
     // 鑾峰彇宸︿笅table鏁版嵁
@@ -381,7 +414,7 @@
               }
             })
           }
-        }, this.tableDataBottom.length <= 10 ? 1000 * 3 : 100)
+        }, this.tableDataBottom.length <= 10 ? 1000 * 20 : 100)
       })
     },
 

--
Gitblit v1.9.3