Lijy пре 2 година
родитељ
комит
399fc8f66a

+ 10 - 4
fhKeeper/formulahousekeeper/timesheet/src/components/cascader.vue

@@ -3,8 +3,8 @@
     <div :class="disabled ? 'disabledTrue' : 'disabledFalse'" @mouseenter="moveIonDiv" @mouseleave="outIonDiv">
         <div :style="`width:${selectWidth}px;height:${selectHeight}px`" :class="classDiv ? 'select selectDiv' : 'select'" @click="selectCli" :ref="disabled ? '' : 'selectDiv'">
             <div :style="'line-height: '+selectHeight+'px'" :class="selectName == $t('defaultText.pleaseChoose') ? 'selecttex selecttexXuan' : 'selecttex'">
-                <!-- <ww-open-data type='userName' :openid='selectName'></ww-open-data> -->
-                {{selectName}}
+                <ww-open-data type='departmentName' :openid='selectName'></ww-open-data>
+                <!-- {{selectName}} -->
             </div>
             <i :class=" move ? 'el-icon-arrow-down iostu iostuHover' : 'el-icon-arrow-down iostu'" v-if="!moveIon"></i>
             <i v-if="moveIon" class="el-icon-circle-close iostu" @click.stop="clearDelete"></i>
@@ -15,10 +15,16 @@
         <div class="transitionBox">
             <ul class="transitionBoxUl">
                 <li :class="transitionBoxLiIdx == index ? 'liHover' : ''" v-for="(item, index) in options" :key="index" @mouseover="liMouseOver(index, item)" @click.stop="liClist(item)"> 
-                    <span :class="item.children ? 'idxspan' : ''" v-if="!radios">{{item.label}}</span>
+                    <span :class="item.children ? 'idxspan' : ''" v-if="!radios">
+                        <!-- {{item.label}} -->
+                        <ww-open-data type='departmentName' :openid='item.label'></ww-open-data>
+                    </span>
                     <span v-if="radios" style="margin-left: -15px">
                         <el-radio v-model="optionsOId" :label="item.value">
-                            <span class="idxspan" style="margin-left: -10px"> {{item.label}} </span>
+                            <span class="idxspan" style="margin-left: -10px"> 
+                                <!-- {{item.label}}  -->
+                                <ww-open-data type='departmentName' :openid='item.label'></ww-open-data>
+                            </span>
                         </el-radio>
                     </span>
                     <i class="el-icon-arrow-right" v-if="item.children"></i>

+ 4 - 1
fhKeeper/formulahousekeeper/timesheet/src/components/cascaderOption.vue

@@ -6,7 +6,10 @@
                 <span :class="item.children ? 'idxspan' : ''" v-if="!radios">{{item.label}}</span>
                 <span v-if="radios" style="margin-left: -15px">
                     <el-radio v-model="departmentId" :label="item.value">
-                        <span class="idxspan" style="margin-left: -10px"> {{item.label}} </span>
+                        <span class="idxspan" style="margin-left: -10px"> 
+                            <!-- {{item.label}}  -->
+                            <ww-open-data type='departmentName' :openid='item.label'></ww-open-data>
+                        </span>
                     </el-radio>
                 </span>
                 <i class="el-icon-arrow-right" v-if="item.children"></i>