表头设置逻辑bug更正

dsk-operate-ui/src/assets/styles/common.css

@@ -26,6 +26,16 @@
   opacity: 0;
 }
 
+.edit-fade-enter-active,
+.edit-fade-leave-active {
+  transition: opacity 0.3s ease-in-out;
+}
+
+.edit-fade-leave-to,
+.edit-fade-leave-to /* .fade-leave-active below version 2.1.8 */ {
+  opacity: 0;
+}
+
 .list-enter-active,
 .list-leave-active {
   transition: all 0.5s ease;

dsk-operate-ui/src/components/DskTableHeaderSetting/components/SettingBar/index.vue

@@ -18,7 +18,7 @@
             <transition-group name="fade" tag="div">
               <div class="use-header-item" v-for="(item,index) of useColumn" :key="item.uid">
                 <el-checkbox v-model="item.use" class="use-header-item-label"
-                  @change="flag => checkedChange(index,flag,item)">{{item.label}}</el-checkbox>
+                  @change="flag => checkedChange(index,flag,item,false)">{{item.label}}</el-checkbox>
                 <img src="@/assets/images/consultingAgencyManagement/use-header-btn.png" alt="" class="use-header-item-drag-icon">
               </div>
             </transition-group>
@@ -30,7 +30,7 @@
           <div class="not-use-header-title">未选字段</div>
           <div class="not-use-header-item" v-for="(item,index) of notUseColumn" :key="item.uid">
             <el-checkbox v-model="item.use" class="not-use-header-item-label"
-              @change="flag => checkedChange(index,flag,item)">{{item.label}}</el-checkbox>
+              @change="flag => checkedChange(index,flag,item,true)">{{item.label}}</el-checkbox>
           </div>
         </div>
 
@@ -129,10 +129,10 @@ export default {
         // console.log(this.notUseColumn);
       }
     },
-    checkedChange(index, flag, item) {
+    checkedChange(index, flag, item, isUse) {
       // 至少保证一个自适应列存在
-      const hasOnly = this.checkeOnlySelfAdaptation();
-      if (!hasOnly) {
+      const { status, onlyColumn } = this.checkeOnlySelfAdaptation();
+      if (status && onlyColumn.uid == item.uid && !isUse) {
         elementMessageSingleton("warning", "列表至少保证一个自适应列存在");
         this.useColumn.splice(index, 1, {
           ...item,
@@ -158,7 +158,14 @@ export default {
 
       const len = _array.length;
       //  len等于1时仅剩一个自适应列
-      return len == 1 ? false : true;
+      let status = false;
+      // 仅剩1个自适应列是用于判断当前取消的列是否是自适应列
+      let onlyColumn = null;
+      if (len == 1) {
+        onlyColumn = _array[0];
+        status = true;
+      }
+      return { status, onlyColumn };
     },
     cancel() {
       this.$emit("settingClose");

dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/consultingAgency.vue

@@ -14,11 +14,14 @@
           <tr>
             <td class="table-key">咨询机构名称</td>
             <td>
-              <span
-                v-if="!comIsModify">{{comProjectDetailInfo.advisoryBody && comProjectDetailInfo.advisoryBody.advisoryBodyName ? comProjectDetailInfo.advisoryBody.advisoryBodyName : "-"}}</span>
+              <!-- <transition mode="out-in" name="edit-fade"> -->
+              <div class="normal-value" v-if="!comIsModify">
+                {{comProjectDetailInfo.advisoryBody && comProjectDetailInfo.advisoryBody.advisoryBodyName ? comProjectDetailInfo.advisoryBody.advisoryBodyName : "-"}}
+              </div>
               <el-form-item label="" v-if="comIsModify">
-                <el-input v-model="comProjectDetailInfo.advisoryBody.advisoryBodyName" clearable></el-input>
+                <el-input v-model="comProjectDetailInfo.advisoryBody.advisoryBodyName" clearable v-focus></el-input>
               </el-form-item>
+              <!-- </transition> -->
             </td>
             <td class="table-key">法人代表</td>
             <td>
@@ -106,10 +109,18 @@ export default {
       default: false
     }
   },
+  directives: {
+    focus: {
+      inserted(el) {
+        el.querySelector(".el-input__inner").focus();
+      }
+    }
+  },
   watch: {
     projectDetailInfo: {
-      handler(newValue) {
+      handler(newValue, oldValue) {
         this.comProjectDetailInfo = JSON.parse(JSON.stringify(newValue));
+        this.oldComProjectDetailInfo = JSON.parse(JSON.stringify(oldValue));
       },
       deep: true
     },
@@ -123,6 +134,7 @@ export default {
     return {
       comIsModify: this.isModify,
       comProjectDetailInfo: JSON.parse(JSON.stringify(this.projectDetailInfo)),
+      oldComProjectDetailInfo: JSON.parse(JSON.stringify(this.projectDetailInfo)),
       rules: {
 
       },
@@ -162,6 +174,9 @@ export default {
       } catch (error) {
 
       }
+    },
+    cancelModify() {
+      this.comProjectDetailInfo = JSON.parse(JSON.stringify(this.oldComProjectDetailInfo));
     }
   },
 }
@@ -222,8 +237,8 @@ export default {
         font-size: 12px;
         position: relative;
 
-        & > span {
-          display: inline-block;
+        .normal-value {
+          vertical-align: middle;
           line-height: 22px;
         }
 
@@ -239,7 +254,7 @@ export default {
           .el-form-item__content {
             height: 100%;
             font-size: 12px;
-            line-height: 1;
+            line-height: unset;
 
             .el-input {
               height: 100%;
@@ -247,8 +262,8 @@ export default {
             }
 
             .el-input__inner {
-              height: 100%;
-              line-height: 22px;
+              height: 40px;
+              line-height: 40px;
               border-radius: unset;
               border-color: transparent;
               color: #232323;
@@ -256,6 +271,7 @@ export default {
               font-weight: 400;
               padding-left: 12px;
               outline: unset;
+              box-sizing: border-box;
 
               &:focus {
                 border: 1px solid #0081ff;

dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/projectDetail.vue

@@ -36,8 +36,8 @@
           <!-- 工程基本信息 -->
           <basic-engineering-information v-if="currentList === 'project'" :projectDetailInfo="projectDetailInfo"></basic-engineering-information>
           <!-- 咨询机构结算信息 -->
-          <consulting-agency v-if="currentList === 'consultingAgency'" :projectDetailInfo="projectDetailInfo"
-            :isModify="isModify"></consulting-agency>
+          <consulting-agency v-if="currentList === 'consultingAgency'" :projectDetailInfo="projectDetailInfo" :isModify="isModify"
+            ref="consultingAgency"></consulting-agency>
         </div>
 
       </div>
@@ -115,6 +115,7 @@ export default {
     },
     cancelSave() {
       this.isModify = false;
+      this.$refs["consultingAgency"].cancelModify();
     },
   },
 }