From dc24803e0bc49c5a356b7eaad43060d463469a51 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 08 三月 2023 16:10:20 +0800
Subject: [PATCH] 1.车间生产看板优化

---
 src/views/kb/cjsc.vue    |   81 ++++++++++++++++++++++++++--------------
 src/views/bbgl/bzgz.vue  |    4 +-
 src/views/scgl/sckbg.vue |    4 +-
 3 files changed, 57 insertions(+), 32 deletions(-)

diff --git a/src/views/bbgl/bzgz.vue b/src/views/bbgl/bzgz.vue
index 71514bb..5760bcd 100644
--- a/src/views/bbgl/bzgz.vue
+++ b/src/views/bbgl/bzgz.vue
@@ -220,7 +220,7 @@
               </el-table-column>
               <el-table-column
                 prop="usermoney"
-                label="璁颁欢宸ヨ祫"
+                label="璁′欢宸ヨ祫"
                 width="110"
                 sortable="custom"
               >
@@ -383,7 +383,7 @@
               </el-table-column>
               <el-table-column
                 prop="usermoney"
-                label="璁颁欢宸ヨ祫"
+                label="璁′欢宸ヨ祫"
                 width="110"
                 sortable="custom"
               >
diff --git a/src/views/kb/cjsc.vue b/src/views/kb/cjsc.vue
index 6c7caef..8006300 100644
--- a/src/views/kb/cjsc.vue
+++ b/src/views/kb/cjsc.vue
@@ -28,7 +28,7 @@
               <el-table
                 ref="tableDataLeftTopRef"
                 :data="tableDataLeftTop"
-                class="tableData"
+                class="tableData  tableDataCell"
                 style="width: 100%;"
                 :header-cell-style="headerCellStyle"
                 :cell-style="cellStyle"
@@ -37,12 +37,16 @@
                 <el-table-column
                   prop="saleOrderCode"
                   label="閿�鍞崟鍙�"
-                  width="165"
-                />
-
+                  width="130"
+                >
+                  <template slot-scope="{row}">
+                    <div v-if="row.saleOrderCode" style="text-align: left" class="ellipsis">{{ row.saleOrderCode }}</div>
+                    <div v-else>/</div>
+                  </template>
+                </el-table-column>
                 <el-table-column
                   prop="partname"
-                  width="120"
+                  width="170"
                   label="浜у搧鍚嶇О"
                 >
                   <template slot-scope="{row}">
@@ -53,7 +57,7 @@
                 <el-table-column
                   prop="good_qty"
                   label="鏁伴噺"
-                  width="80"
+                  width="70"
                 />
               </el-table>
             </div>
@@ -67,7 +71,7 @@
               <el-table
                 ref="tableDataLeftBottomRef"
                 :data="tableDataLeftBottom"
-                class="tableData"
+                class="tableData tableDataCell"
                 style="width: 100%;"
                 :header-cell-style="headerCellStyle"
                 :cell-style="cellStyle"
@@ -76,12 +80,17 @@
                 <el-table-column
                   prop="saleOrderCode"
                   label="閿�鍞崟鍙�"
-                  width="165"
-                />
+                  width="130"
+                >
+                  <template slot-scope="{row}">
+                    <div v-if="row.saleOrderCode" style="text-align: left" class="ellipsis">{{ row.saleOrderCode }}</div>
+                    <div v-else>/</div>
+                  </template>
+                </el-table-column>
 
                 <el-table-column
                   prop="partname"
-                  width="120"
+                  width="170"
                   label="浜у搧鍚嶇О"
                 >
                   <template slot-scope="{row}">
@@ -92,7 +101,7 @@
                 <el-table-column
                   prop="good_qty"
                   label="鏁伴噺"
-                  width="80"
+                  width="70"
                 />
               </el-table>
             </div>
@@ -108,7 +117,7 @@
             <el-table
               ref="tableDataLeftCenterRef"
               :data="tableDataCenterTop"
-              class="tableData"
+              class="tableData tableDataCell"
               style="width: 100%;"
               :header-cell-style="headerCellStyleCenter"
               :cell-style="cellStyleCenter"
@@ -117,7 +126,7 @@
               <el-table-column
                 type="RowNum"
                 label="搴忓彿"
-                width="60"
+                width="50"
               >
                 <template slot-scope="{row}">
                   <div
@@ -140,7 +149,7 @@
               </el-table-column>
               <el-table-column
                 prop="eqp_name"
-                width="100"
+                width="90"
                 label="浜х嚎鍚嶇О"
               >
                 <template slot-scope="{row}">
@@ -152,7 +161,7 @@
               </el-table-column>
               <el-table-column
                 prop="partname"
-                width="140"
+                width="170"
                 label="浜у搧鍚嶇О"
               >
                 <template slot-scope="{row}">
@@ -166,7 +175,7 @@
               <el-table-column
                 prop="plan_qty"
                 label="鐢熶骇鏁伴噺"
-                width="100"
+                width="90"
               >
                 <template slot-scope="{row}">
                   <div
@@ -238,7 +247,7 @@
               <el-table
                 ref="tableDataRightTopRef"
                 :data="tableDataRightTop"
-                class="tableData"
+                class="tableData tableDataCell"
                 style="width: 100%;"
                 :header-cell-style="headerCellStyle"
                 :cell-style="cellStyle"
@@ -247,12 +256,16 @@
                 <el-table-column
                   prop="saleOrderCode"
                   label="閿�鍞崟鍙�"
-                  width="165"
-                />
-
+                  width="130"
+                >
+                  <template slot-scope="{row}">
+                    <div v-if="row.saleOrderCode" style="text-align: left" class="ellipsis">{{ row.saleOrderCode }}</div>
+                    <div v-else>/</div>
+                  </template>
+                </el-table-column>
                 <el-table-column
                   prop="partname"
-                  width="120"
+                  width="170"
                   label="浜у搧鍚嶇О"
                 >
                   <template slot-scope="{row}">
@@ -263,7 +276,7 @@
                 <el-table-column
                   prop="good_qty"
                   label="鏁伴噺"
-                  width="80"
+                  width="70"
                 />
               </el-table>
             </div>
@@ -277,7 +290,7 @@
               <el-table
                 ref="tableDataRightBottomRef"
                 :data="tableDataRightBottom"
-                class="tableData"
+                class="tableData tableDataCell"
                 style="width: 100%;"
                 :header-cell-style="headerCellStyle"
                 :cell-style="cellStyle"
@@ -286,12 +299,16 @@
                 <el-table-column
                   prop="saleOrderCode"
                   label="閿�鍞崟鍙�"
-                  width="165"
-                />
-
+                  width="130"
+                >
+                  <template slot-scope="{row}">
+                    <div v-if="row.saleOrderCode" style="text-align: left" class="ellipsis">{{ row.saleOrderCode }}</div>
+                    <div v-else>/</div>
+                  </template>
+                </el-table-column>
                 <el-table-column
                   prop="partname"
-                  width="120"
+                  width="170"
                   label="浜у搧鍚嶇О"
                 >
                   <template slot-scope="{row}">
@@ -302,7 +319,7 @@
                 <el-table-column
                   prop="good_qty"
                   label="鏁伴噺"
-                  width="80"
+                  width="70"
                 />
               </el-table>
             </div>
@@ -463,6 +480,7 @@
       const scale = 10// 鍒诲害
 
       WkshpLineData({ LineCode: '003' }).then(res => {
+        this.tableDataRightTopTemp = res.data
         this.tableDataRightTop = this.tableDataRightTopTemp.slice(startValue, startValue + scale)
 
         const loop = Math.floor(this.tableDataRightTopTemp.length / scale)// 闇�瑕佸惊鐜殑娆℃暟
@@ -485,6 +503,7 @@
       const scale = 10// 鍒诲害
 
       WkshpLineData({ LineCode: '004' }).then(res => {
+        this.tableDataRightBottomTemp = res.data
         this.tableDataRightBottom = this.tableDataRightBottomTemp.slice(startValue, startValue + scale)
 
         const loop = Math.floor(this.tableDataRightBottomTemp.length / scale)// 闇�瑕佸惊鐜殑娆℃暟
@@ -576,6 +595,12 @@
 $main_color: #09d8f2;
 $color01: #00FFFF;
 
+.tableDataCell {
+  ::v-deep .cell{
+    padding: 0 2px ;
+  }
+}
+
 .tableData {
   background: #000;
 }
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 54d27de..4301899 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -1685,7 +1685,7 @@
         this.dialogForm.startqty = obj.noreportqty
 
         this.dialogForm.nextstepname = obj.nextstepname
-        this.dialogForm.nextstepcode = obj.nextstepcode
+        this.dialogForm.nextstepcode = obj.nextstepcode ? obj.nextstepcode : obj.stepcode
 
         this.dialogForm.startqtySum = obj.noreportqty
       })
@@ -1746,7 +1746,7 @@
         this.dialogForm.stepcode = obj.stepcode
 
         this.dialogForm.nextstepname = obj.nextstepname
-        this.dialogForm.nextstepcode = obj.nextstepcode
+        this.dialogForm.nextstepcode = obj.nextstepcode ? obj.nextstepcode : obj.stepcode
 
         this.dialogForm.noputqty = obj.noputqty
         this.dialogForm.stepseq = obj.seq

--
Gitblit v1.9.3