From c054516a38a2613a4e7399ba62694fbd99a606fe Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 06 一月 2023 09:10:09 +0800
Subject: [PATCH] 1.组织架构表格拖动实现demo

---
 src/views/zlgl/gxjyjl.vue |   49 ++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/src/views/zlgl/gxjyjl.vue b/src/views/zlgl/gxjyjl.vue
index ae3dc1f..4fb20ac 100644
--- a/src/views/zlgl/gxjyjl.vue
+++ b/src/views/zlgl/gxjyjl.vue
@@ -13,10 +13,10 @@
           :model="form"
           label-width="100px"
           inline
-          style="display: flex;justify-content: space-between"
+          style="display: flex;"
         >
           <div class="elForm">
-            <el-form-item label-width="70px" label="宸ュ崟缂栧彿" style=" display: flex;">
+            <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
               <el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item label="浜у搧缂栫爜" style=" display: flex;">
@@ -28,7 +28,7 @@
             <el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">
               <el-input v-model="form.partapec" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
-            <el-form-item v-show="isExpandForm" label-width="70px" label="宸ュ簭鍚嶇О" style=" display: flex;">
+            <el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style=" display: flex;">
               <el-input v-model="form.stepname" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item v-show="isExpandForm" label="鏍囧噯鍚嶇О" style=" display: flex;">
@@ -55,7 +55,7 @@
               </el-select>
             </el-form-item>
           </div>
-          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
             <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
             <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
           </div>
@@ -108,11 +108,13 @@
           <el-table-column
             prop="wo_code"
             label="宸ュ崟缂栫爜"
+            show-tooltip-when-overflow
             width="160"
             sortable="custom"
           />
           <el-table-column
             prop="partcode"
+            show-tooltip-when-overflow
             width="160"
             label="浜у搧缂栫爜"
             sortable="custom"
@@ -121,11 +123,13 @@
             prop="partname"
             label="浜у搧鍚嶇О"
             width="160"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
             prop="partspec"
             label="浜у搧瑙勬牸"
+            show-tooltip-when-overflow
             width="160"
             sortable="custom"
           >
@@ -138,29 +142,34 @@
             prop="step_code"
             label="宸ュ簭缂栫爜"
             width="120"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
             prop="stepname"
             label="宸ュ簭鍚嶇О"
             width="120"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
             prop="checkstaned_code"
             label="鏍囧噯缂栫爜"
             width="120"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
             prop="checkstaned_name"
             label="鏍囧噯鍚嶇О"
             width="120"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
             prop="check_type"
             label="妫�楠岀被鍨�"
+            show-tooltip-when-overflow
             sortable="custom"
             width="120"
           >
@@ -174,11 +183,17 @@
             prop="check_result"
             label="妫�楠岀粨鏋�"
             sortable="custom"
+            show-tooltip-when-overflow
             width="120"
           >
             <template slot-scope="{row}">
-              <div v-if="row.check_result==='NG'"> <i class="el-icon-circle-close" style="color:red;" /> 涓嶈壇</div>
-              <div v-if="row.check_result==='OK'">  <i class="el-icon-circle-check" style="color: #42b983" /> 鍚堟牸</div>
+              <div v-if="row.check_result==='NG'">
+                <i class="el-icon-info" style="margin-right: 2px" />
+                涓嶈壇
+              </div>
+              <div v-if="row.check_result==='OK'">
+                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+                鍚堟牸</div>
             </template>
           </el-table-column>
           <el-table-column
@@ -197,17 +212,20 @@
             prop="check_qty"
             label="妫�楠屾暟閲�"
             width="120"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
             prop="lm_user"
             label="妫�楠屼汉鍛�"
+            show-tooltip-when-overflow
             sortable="custom"
             width="120"
           />
           <el-table-column
             prop="lm_date"
             label="妫�楠屾椂闂�"
+            show-tooltip-when-overflow
             width="160"
             sortable="custom"
           />
@@ -224,7 +242,8 @@
                 <el-tooltip class="item" effect="dark" content="鏌ョ湅" placement="top">
                   <i
                     class="el-icon-view"
-                    style="color: #42b983;cursor: pointer;margin-right: 15px;"
+                    :style="{color:$store.state.settings.theme}"
+                    style="cursor: pointer;margin-right: 15px;"
                     @click="check(row)"
                   />
                 </el-tooltip>
@@ -279,35 +298,47 @@
 
           <el-table-column
             prop="checkitem_code"
+            show-tooltip-when-overflow
             label="妫�楠岄」鐩紪鍙�"
             width="120"
           />
           <el-table-column
             prop="checkitem_name"
             label="妫�楠岄」鐩悕绉�"
+            show-tooltip-when-overflow
           />
           <el-table-column
             prop="checkitem_descr"
             label="妫�楠岄」鐩弿杩�"
+            show-tooltip-when-overflow
           />
           <el-table-column
             prop="check_result"
             label="妫�楠岀粨鏋�"
+            show-tooltip-when-overflow
             width="120"
           >
             <template slot-scope="{row}">
-              <div v-if="row.check_result==='NG'"> <i class="el-icon-circle-close" style="color:red;" /> 涓嶈壇</div>
-              <div v-if="row.check_result==='OK'">  <i class="el-icon-circle-check" style="color: #42b983" /> 鍚堟牸</div>
+              <div v-if="row.check_result==='NG'">
+                <i class="el-icon-info" style="margin-right: 2px" />
+                涓嶈壇
+              </div>
+              <div v-if="row.check_result==='OK'">
+                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+                鍚堟牸
+              </div>
             </template>
           </el-table-column>
           <el-table-column
             prop="lm_user"
             label="妫�楠屼汉鍛�"
+            show-tooltip-when-overflow
             width="120"
           />
           <el-table-column
             prop="lm_date"
             label="妫�楠屾椂闂�"
+            show-tooltip-when-overflow
             width="160"
           />
           <!--          <el-table-column-->

--
Gitblit v1.9.3