提交

fhKeeper/formulahousekeeper/customerBuler-crm/src/components/translationComponent/departmentSelection/departmentSelection.vue

@@ -10,7 +10,7 @@ import { updateDepTreeData, generateUniqueId } from '@/utils/tools'
 
 const emit = defineEmits<Emits>();
 const props = defineProps({
-  modelValue: { type: [String, Number, Array, Object, Boolean], required: true },
+  modelValue: { type: null, required: true },
   size: { type: String as () => assemblySize, required: true, default: () => 'small' },
   placeholder: { type: String, required: false, default: () => '请选择' },
   multiple: { type: Boolean, required: false, default: false },
@@ -129,7 +129,7 @@ onMounted(() => {
 
 <template>
   <div class="departmentSelectionDiv" :style="`width: ${width}`">
-    <el-cascader v-model="departmentVal" :ref="'deptRef'" :options="departmantArray" :props="departmentProps"
+    <!-- <el-cascader v-model="departmentVal" :ref="'deptRef'" :options="departmantArray" :props="departmentProps"
       :size="size" :clearable="clearable" :placeholder="placeholder" filterable :show-all-levels="false"
       :class="`departmentSelection ${!multiple && !visibleFlag ? 'clearColor' : ''}`" :style="`width: ${width}`"
       :filter-method="filterMethod" @visible-change="visibleChange" @change="updateValue">
@@ -139,10 +139,9 @@ onMounted(() => {
         </span>
       </template>
     </el-cascader>
-    <!-- 覆盖 -->
     <div class="coverDept" v-if="!visibleFlag">
       <TextTranslation translationTypes="departmentName" :translationValue="deptLabel"></TextTranslation>
-    </div>
+    </div> -->
   </div>
 </template>
 

fhKeeper/formulahousekeeper/customerBuler-crm/src/components/translationComponent/textTranslation/textTranslation.vue

@@ -1,6 +1,6 @@
 <template>
   <template v-if="!translationVal">
-    {{ translationValue }} a
+    {{ translationValue }}
   </template>
   <template v-else>
     <ww-open-data :type="translationTypes" :openid="translationValue"></ww-open-data> a

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/team/index.vue

@@ -77,7 +77,7 @@
         <div class="bg-white w-full h-full shadow-md rounded-md flex flex-col overflow-hidden pt-2 pl-2 pr-2">
           <div class="flex-1">
             <el-table ref="multipleTableRef" :data="tableData" v-loading="loadingFrom.tableLoading"
-              @selection-change="changeBatch" :style="`width: 100%;height: calc(100vh - 204px);`">
+              @selection-change="changeBatch" style="width: 100%;height: calc(100vh - 204px);">
               <el-table-column type="selection" width="55" />
               <el-table-column label="姓名" property="name" width="150">
                 <template #default="scope">