From b8ee668eaace5d422ebb27a200c3b178b82e2a6d Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 23 八月 2022 22:55:03 +0800
Subject: [PATCH] 1.提交

---
 src/views/kb/cgdd.vue |  151 ++++++++++++++++++++++++++++++-------------------
 1 files changed, 92 insertions(+), 59 deletions(-)

diff --git a/src/views/kb/cgdd.vue b/src/views/kb/cgdd.vue
index fc1bf15..ee9fd37 100644
--- a/src/views/kb/cgdd.vue
+++ b/src/views/kb/cgdd.vue
@@ -39,7 +39,7 @@
           <!-- 2-->
           <div class="kb_left_bottom kb_pd10">
             <div class="kb_left_bottom_content">
-              <div class="content_head">閲囪喘鍒拌揣璺熻釜锛�</div>
+              <div class="content_head kb_title_text">閲囪喘鍒拌揣璺熻釜</div>
               <div class="content_body">
                 <el-table
                   ref="tableData"
@@ -63,33 +63,53 @@
                   <el-table-column
                     prop="suppername"
                     label="渚涘簲鍟�"
-                    width="163"
-                  />
+                    width="125"
+                  >
+                    <template slot-scope="{row}">
+                      <div v-if="row.suppername" class="ellipsis">{{ row.suppername }}</div>
+                      <div v-else />
+                    </template>
+                  </el-table-column>
                   <el-table-column
                     prop="username"
                     label="閲囪喘鍛�"
                     width="68"
-                  />
+                  >
+                    <template slot-scope="{row}">
+                      <div v-if="row.username">{{ row.username }}</div>
+                      <div v-else>/</div>
+                    </template>
+                  </el-table-column>
                   <el-table-column
                     prop="partcode"
                     label="浜у搧缂栫爜"
-                    width="84"
+                    width="108"
                   />
                   <el-table-column
                     prop="partname"
                     label="浜у搧鍚嶇О"
-                    width="168"
+                    width="155"
                   />
                   <el-table-column
                     prop="partspec"
                     label="瑙勬牸鍨嬪彿"
-                    width="84"
-                  />
+                    width="130"
+                  >
+                    <template slot-scope="{row}">
+                      <div v-if="row.partspec" class="ellipsis">{{ row.partspec }}</div>
+                      <div v-else>/</div>
+                    </template>
+                  </el-table-column>
                   <el-table-column
                     prop="quantity"
                     label="璁㈠崟鏁伴噺"
-                    width="84"
-                  />
+                    width="74"
+                  >
+                    <template slot-scope="{row}">
+                      <div v-if="row.quantity">{{ parseFloat(row.quantity) }}</div>
+                      <div v-else>0</div>
+                    </template>
+                  </el-table-column>
                   <el-table-column
                     prop="checktype"
                     label="妫�楠岀姸鎬�"
@@ -108,23 +128,30 @@
                   <el-table-column
                     prop="quantity1"
                     label="宸叉敹鏁伴噺"
-                    width="84"
-                  />
-                  <el-table-column
-                    label="鏈敹鏁伴噺"
-                    width="84"
+                    width="74"
                   >
                     <template slot-scope="{row}">
-                      <div>{{ parseFloat(row.quantity- row.quantity1) }}</div>
+                      <div v-if="row.quantity1">{{ parseFloat(row.quantity1) }}</div>
+                      <div v-else>0</div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="鏈敹鏁伴噺"
+                    width="74"
+                  >
+                    <template slot-scope="{row}">
+                      <div v-if="row.quantity- row.quantity1">{{ parseFloat(row.quantity- row.quantity1) }}</div>
+                      <div v-else>0</div>
                     </template>
                   </el-table-column>
                   <el-table-column
                     prop="acceptDate"
                     label="棰勮浜ゆ湡"
-                    width="84"
+                    width="95"
                   >
                     <template slot-scope="{row}">
-                      <div>{{ row.acceptDate.substring(5, 10) }}</div>
+                      <div v-if="row.acceptDate">{{ row.acceptDate.substring(0, 10) }}</div>
+                      <div v-else>/</div>
                     </template>
                   </el-table-column>
                   <el-table-column
@@ -134,8 +161,9 @@
                   >
                     <template slot-scope="{row}">
                       <div v-if="parseFloat(row.warning)<0" style="color: red">{{ Math.abs(parseFloat(row.warning)) }}</div>
-                      <div v-else-if="row.warning===null">0</div>
-                      <div v-else>{{ row.warning }}</div>
+                      <div v-else-if="row.warning===null||row.warning===''||row.warning===0">0</div>
+                      <div v-else-if="parseFloat(row.warning)>3">{{ row.warning }}</div>
+                      <div v-else-if="parseFloat(row.warning)>0&&parseFloat(row.warning)<=3" style="color:yellow;">{{ row.warning }}</div>
                     </template>
                   </el-table-column>
                 </el-table>
@@ -146,7 +174,7 @@
         <div class="kb_right kb_pd10">
           <div class="kb_right_top kb_pd10">
             <div class="kb_right_top_content">
-              <div class="content_head">渚涘簲鍟嗗欢鏈熶氦璐ф帓琛岋細</div>
+              <div class="content_head kb_title_text">渚涘簲鍟嗗欢鏈熶氦璐ф帓琛�</div>
               <div class="content_body">
                 <el-table
                   ref="tableDataRank"
@@ -160,7 +188,7 @@
                   <el-table-column
                     type="index"
                     label="搴忓彿"
-                    width="100"
+                    width="90"
                   >
                     <template slot-scope="{row}">
                       <div>NO.{{ row.index }}</div>
@@ -174,17 +202,17 @@
                   <el-table-column
                     prop="suppercode"
                     label="渚涘簲鍟嗙紪鐮�"
-                    width="145"
+                    width="170"
                   />
                   <el-table-column
                     prop="suppername"
-                    width="163"
+                    width="183"
                     label="渚涘簲鍟嗗悕绉�"
                   />
                   <el-table-column
                     prop="cont"
                     label="寤舵湡娆℃暟"
-                    width="125"
+                    width="90"
                   />
                 </el-table>
               </div>
@@ -229,7 +257,7 @@
     getPurchaseLeftTop() {
       PurchaseLeftTop().then(res => {
         this.purchaseLeftTopData = res.data[0]
-        console.log(this.purchaseLeftTopData)
+        // console.log(this.purchaseLeftTopData)
       })
       setInterval(() => {
         PurchaseLeftTop().then(res => {
@@ -241,45 +269,45 @@
     getPurchaseLeftBottom() {
       PurchaseLeftBottom().then(res => {
         this.tableData = res.data
-      })
 
-      const divData = this.$refs.tableData.bodyWrapper
-      // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
-      setInterval(() => {
-        // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
-        // divData.scrollTop += divData.scrollHeight / this.tableDataRank.length
-        divData.scrollTop += 1
-        // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
-        if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
-          // 閲嶇疆table璺濈椤堕儴璺濈
-          divData.scrollTop = 0
-          PurchaseLeftBottom().then(res => {
-            this.tableData = res.data
-          })
-        }
-      }, this.tableData.length <= 14 ? 1000 * 6 : 100)
+        const divData = this.$refs.tableData.bodyWrapper
+        // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+        setInterval(() => {
+          // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+          // divData.scrollTop += divData.scrollHeight / this.tableDataRank.length
+          divData.scrollTop += 1
+          // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
+          if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+            // 閲嶇疆table璺濈椤堕儴璺濈
+            divData.scrollTop = 0
+            PurchaseLeftBottom().then(res => {
+              this.tableData = res.data
+            })
+          }
+        }, this.tableData.length <= 14 ? 1000 * 6 : 100)
+      })
     },
 
     getPurchaseRight() {
       PurchaseRight().then(res => {
         this.tableDataRank = res.data
-      })
 
-      const divData = this.$refs.tableDataRank.bodyWrapper
-      // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
-      setInterval(() => {
-        // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
-        // divData.scrollTop += divData.scrollHeight / this.tableDataRank.length
-        divData.scrollTop += 1
-        // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
-        if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
-          // 閲嶇疆table璺濈椤堕儴璺濈
-          divData.scrollTop = 0
-          PurchaseRight().then(res => {
-            this.tableDataRank = res.data
-          })
-        }
-      }, this.tableDataRank.length <= 22 ? 1000 * 6 : 100)
+        const divData = this.$refs.tableDataRank.bodyWrapper
+        // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+        setInterval(() => {
+          // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+          // divData.scrollTop += divData.scrollHeight / this.tableDataRank.length
+          divData.scrollTop += 1
+          // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
+          if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+            // 閲嶇疆table璺濈椤堕儴璺濈
+            divData.scrollTop = 0
+            PurchaseRight().then(res => {
+              this.tableDataRank = res.data
+            })
+          }
+        }, this.tableDataRank.length <= 22 ? 1000 * 6 : 100)
+      })
     },
 
     tableRowClassName({ row, rowIndex }) {
@@ -335,7 +363,8 @@
 </script>
 
 <style scoped lang="scss">
-$kbBorderColor: #09d8f2;
+//$kbBorderColor: #09d8f2;
+$kbBorderColor: rgba(9,216,242,0.4);
 
 .kb_content {
   display: flex;
@@ -459,4 +488,8 @@
   /* width: 0;瀹藉害涓�0鏆楄棌 */
   width: 0;
 }
+
+::v-deep .cell {
+  padding: 0 !important;
+}
 </style>

--
Gitblit v1.9.3