From df744014031c57bf69fd1d94767a3c6e07f2ecb8 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 31 十二月 2022 13:20:38 +0800
Subject: [PATCH] 1.横向竖向菜单模式切换功能

---
 src/views/scgl/scdd.vue |   33 +++++++++++++++++++++++++++++++--
 1 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index f7b7210..6867dcb 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -165,6 +165,7 @@
             label="璁㈠崟鐘舵��"
             sortable="custom"
             width="110"
+            show-tooltip-when-overflow
           >
             <template slot-scope="{row}">
               <div v-if="row.status==='NEW'">鏂拌鍗�</div>
@@ -176,6 +177,7 @@
           <el-table-column
             prop="wo"
             label="璁㈠崟缂栧彿"
+            show-tooltip-when-overflow
             sortable="custom"
             min-width="150"
           />
@@ -183,6 +185,7 @@
             prop="partcode"
             label="浜у搧缂栫爜"
             sortable="custom"
+            show-tooltip-when-overflow
             min-width="150"
           />
           <el-table-column
@@ -208,17 +211,20 @@
             prop="qty"
             label="璁㈠崟鏁伴噺"
             width="150"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
             prop="relse_qty"
             label="宸蹭笅鍗曟暟閲�"
+            show-tooltip-when-overflow
             width="150"
             sortable="custom"
           />
           <el-table-column
             prop="wkshp_name"
             label="鐢熶骇杞﹂棿"
+            show-tooltip-when-overflow
             sortable="custom"
             width="150"
           >
@@ -229,6 +235,7 @@
           </el-table-column>
           <el-table-column
             prop="planstartdate"
+            show-tooltip-when-overflow
             label="棰勮寮�宸ユ椂闂�"
             sortable="custom"
             width="130"
@@ -241,6 +248,7 @@
           <el-table-column
             prop="planenddate"
             label="棰勮瀹屽伐鏃堕棿"
+            show-tooltip-when-overflow
             sortable="custom"
             width="130"
           >
@@ -250,6 +258,19 @@
             </template>
           </el-table-column>
           <el-table-column
+            prop="saleOrderDeliveryDate"
+            label="棰勮浜や粯鏃ユ湡"
+            sortable="custom"
+            show-tooltip-when-overflow
+            width="130"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.saleOrderDeliveryDate">{{ row.saleOrderDeliveryDate.substring(0,11) }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            show-tooltip-when-overflow
             prop="createuser"
             label="鍒涘缓浜哄憳"
             sortable="custom"
@@ -264,6 +285,7 @@
             prop="createdate"
             label="鍒涘缓鏃堕棿"
             width="130"
+            show-tooltip-when-overflow
             sortable="custom"
           >
             <template slot-scope="{row}">
@@ -280,7 +302,7 @@
               <div class="operationClass">
                 <el-tooltip class="item" effect="dark" content="涓嬭揪" placement="top">
                   <!--                <el-button type="text" @click="edit('edit',row)">涓嬭揪</el-button>-->
-                  <i class="el-icon-bottom" style="color:#42b983;cursor: pointer;margin-left: 5px" @click="edit('edit',row)" />
+                  <i class="el-icon-bottom" :style="{color:$store.state.settings.theme}" style="cursor: pointer;margin-left: 5px" @click="edit('edit',row)" />
                 </el-tooltip>
               </div>
             </template>
@@ -379,6 +401,7 @@
             :picker-options="pickerOptions"
             format="yyyy-MM-dd"
             placeholder="閫夋嫨鏃ユ湡"
+            :disabled="dialogForm.saleOrderDeliveryDateIsDisabled"
           />
         </el-form-item>
 
@@ -471,7 +494,9 @@
         markqty: '', // 涓嬪崟鏁伴噺
         ordernum: '', // 涓嬪崟鍗曟暟
         relse_qty: '', // 宸蹭笅鍗曟暟閲�
-        saleOrderDeliveryDate: ''// 棰勮浜や粯鏃ユ湡
+        saleOrderDeliveryDate: '', // 棰勮浜や粯鏃ユ湡
+
+        saleOrderDeliveryDateIsDisabled: false// 棰勮浜や粯鏃ユ湡瀛楁鏄惁鍙慨鏀�
       },
       operation: '',
       dialogFormRules: {
@@ -669,6 +694,8 @@
 
         this.dialogForm.saleOrderDeliveryDate = row.saleOrderDeliveryDate
 
+        this.dialogForm.saleOrderDeliveryDateIsDisabled = this.dialogForm.saleOrderDeliveryDate !== null
+
         this.dialogForm.erpqty = row.qty
         this.dialogForm.markqty = parseFloat(row.qty) - parseFloat(row.relse_qty)
         this.dialogForm.ordernum = 1
@@ -694,6 +721,8 @@
       this.dialogForm.ordernum = ''
       this.dialogForm.relse_qty = ''
 
+      this.dialogForm.saleOrderDeliveryDateIsDisabled = false
+
       this.$refs.dialogForm.clearValidate()
     },
     // 瀵硅瘽妗嗗彇娑�

--
Gitblit v1.9.3