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/jcsz/jsqd.vue |   78 ++++++++++++++++++++++++++++++--------
 1 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 4caa124..73891d7 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -97,7 +97,12 @@
             min-width="160"
             label="瑙掕壊鎻忚堪"
             sortable="custom"
-          />
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.description">{{ row.description }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="lm_user"
             label="鍒涘缓浜哄憳"
@@ -122,8 +127,18 @@
             sortable="custom"
           >
             <template slot-scope="{row}">
-              <i v-if="row.is_user==='Y'" class="el-icon-user-solid" style="color:#42b983;cursor: pointer" @click="userClick(row)" />
-              <i v-if="row.is_user==='N'" class="el-icon-user-solid" style="color: rgb(180 ,181, 185);cursor: pointer" @click="userClick(row)" />
+              <i
+                v-if="row.is_user==='Y'"
+                class="el-icon-user-solid"
+                style="color:#42b983;cursor: pointer"
+                @click="userClick(row)"
+              />
+              <i
+                v-if="row.is_user==='N'"
+                class="el-icon-user-solid"
+                style="color: rgb(180 ,181, 185);cursor: pointer"
+                @click="userClick(row)"
+              />
             </template>
           </el-table-column>
           <el-table-column
@@ -134,7 +149,12 @@
           >
             <template slot-scope="{row}">
               <i v-if="row.is_right==='Y'" class="el-icon-share" @click="rightClick(row)" />
-              <i v-if="row.is_right==='N'" class="el-icon-share" style="color: rgb(180 ,181, 185)" @click="rightClick(row)" />
+              <i
+                v-if="row.is_right==='N'"
+                class="el-icon-share"
+                style="color: rgb(180 ,181, 185)"
+                @click="rightClick(row)"
+              />
             </template>
           </el-table-column>
           <el-table-column
@@ -379,12 +399,12 @@
         ref="multipleTable"
         :data="dialogFormUserTable"
         border
+        :row-class-name="tableRowClassName"
         highlight-current-row
         :height="isIpad?400:365"
         :header-cell-style="this.$headerCellStyle"
         :cell-style="this.$cellStyle"
         :row-key="getRowKey"
-        :row-class-name="tableRowClassName"
         @sort-change="sortChangeOfUser"
         @selection-change="handleSelectionChange"
       >
@@ -394,6 +414,7 @@
           type="selection"
           width="50"
           :reserve-selection="true"
+          fixed
         />
         <el-table-column
           prop="RowNum"
@@ -419,10 +440,17 @@
           prop="flag"
           label="鍏宠仈瑙掕壊"
           sortable="custom"
+          fixed="right"
         >
           <template slot-scope="{row}">
-            <div v-if="row.flag==='Y'">鏄�</div>
-            <div v-if="row.flag==='N'">鍚�</div>
+            <div v-if="row.flag==='Y'">
+              <svg-icon icon-class="circleYes" style="margin-right: 2px" />
+              鏄�
+            </div>
+            <div v-if="row.flag==='N'">
+              <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+              鍚�
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -525,7 +553,14 @@
     </el-dialog>
 
     <!--瀵煎叆缁勪欢-->
-    <import-picker ref="importPickerFunc" class="importPickerClass" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />
+    <import-picker
+      ref="importPickerFunc"
+      class="importPickerClass"
+      :shows.sync="shows"
+      :title="title_value"
+      :colos="colos"
+      :code="code"
+    />
 
   </div>
 </template>
@@ -1132,9 +1167,9 @@
 
       // 鐩墠涓�鏈熻偗瀹氭槸杩欎釜
       if (this.PCTrue && !this.APPTrue) {
-        pcIsSelected1 = true
+        // pcIsSelected1 = true
         if (rightPCArrFlag === 'Y') {
-          // pcIsSelected1 = true
+          pcIsSelected1 = true
           pcIsSelected2 = true
 
           const interval = setInterval(() => {
@@ -1149,9 +1184,9 @@
             }
           }, 100)
 
-          // this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
+          this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
         }
-        this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
+        // this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
       }
 
       if (!this.PCTrue && this.APPTrue) {
@@ -1495,6 +1530,7 @@
 ::v-deep .el-dialog__body {
   padding: 20px 100px !important;
 }
+
 .settingDialogVisible, .userDialogVisible, .dialogVisibleRight {
   ::v-deep .el-dialog__body {
     padding: 10px 20px !important;
@@ -1566,11 +1602,16 @@
 <!--鍏叡椤甸潰鏍峰紡-->
 <style lang="scss" scoped>
 $main_color: #42b983;
-.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
+::v-deep .el-button--text{
+  font-size: 14px ;
+  cursor: pointer ;
+}
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
   color: $main_color;
   cursor: pointer;
 }
-.el-icon-edit-outline{
+
+.el-icon-edit-outline {
   margin-right: 15px;
 }
 
@@ -1631,8 +1672,8 @@
   background-color: #f8f8fa;
 }
 
-::v-deep .el-table__body .el-table__row.hover-row td{
-  background-color: #eaecef ;
+::v-deep .el-table__body .el-table__row.hover-row td {
+  background-color: #eaecef;
 }
 
 ::v-deep .el-form--inline .el-form-item__label {
@@ -1648,6 +1689,7 @@
 .body ::v-deep .el-form-item {
   margin-bottom: 0;
 }
+
 .userDialogVisible ::v-deep .el-form-item {
   margin-bottom: 0;
 }
@@ -1658,7 +1700,9 @@
 .el-table .custom-row {
   background: #f8f8fa;
 }
-.el-form-item__label{
+
+.el-form-item__label {
   font-weight: 400 !important
 }
+
 </style>

--
Gitblit v1.9.3