Pārlūkot izejas kodu

Merge branch 'CD_techPool_208' into debug

hbchen 2 gadi atpakaļ
vecāks
revīzija
686bde6776

+ 7 - 0
src/directives/modules/overflow-tooltip.js

@@ -16,10 +16,17 @@ export const overflowTooltip={
         if(!mainElement){
           throw new Error('找不到指定css选择器的元素')
         }
+        if(mainElement?.scrollWidth > mainElement?.clientWidth){
+          // 超出
+          tooltipNode.component.props.disabled=false
+        }else{
+          tooltipNode.component.props.disabled=true
+        }
       },0)
       if(!value){
         throw new Error('请设置长度溢出的元素的css选择器')
       }
+      console.log(tooltipNode);
       if(!tooltipNode){
         throw new Error('找不到el-tooltip组件')
       }

+ 1 - 2
src/views/financialManagement/contractProgress.vue

@@ -1621,8 +1621,7 @@
                       <el-form-item label="代付方" prop="actual_pay_companies" v-if="contractInfo.form.has_payment==1"
                       :rules="contractInfo.form.contract_source==0?{required:true,message:'代付方信息不能为空',trigger:'blur'}:{}">
                         <div v-overflowTooltip="'#overflow-input'">
-                          <el-tooltip placement="top" :content="contractInfo.form.actual_pay_companies" 
-                          :trigger-keys="['Enter']" :disabled="false">
+                          <el-tooltip placement="top" :content="contractInfo.form.actual_pay_companies" >
                             <el-input v-model="contractInfo.form.actual_pay_companies" :disabled="contractInfo.form.contract_source==0?false:true"
                             placeholder="请输入代付方信息" id="overflow-input" />
                           </el-tooltip>