提交

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

@@ -1,15 +1,21 @@
 <script lang="ts" setup>
 import { ref, reactive, onMounted, inject, watchEffect, computed } from 'vue';
 import { storeToRefs } from 'pinia';
-import { Props, Emits, optionsType } from './type';
+import { Emits, optionsType } from './type';
 import { useStore } from '@/store/index'
 import { generateUniqueId } from '@/utils/tools'
 import { post, get, uploadFile } from "@/utils/request";
 
-const props = defineProps<Props>();
+const props = defineProps({
+  modelValue: { type: [String, Number, Array, Object, Boolean], required: true },
+  multiple: { type: Boolean, required: false, default: false },
+  size: { type: String as () => assemblySize, required: true, default: () => 'small' },
+  placeholder: { type: String, required: false, default: () => '请填写' },
+  disabled: { type: Boolean, required: false, default: false },
+  options: { type: Array as () => optionsType, required: false, default: () => [] },
+});
 const emit = defineEmits<Emits>();
 const { userInfo } = storeToRefs(useStore());
-const options = ref<optionsType>([]);
 
 const timeRef = generateUniqueId()
 const controlTranslation = reactive({
@@ -39,10 +45,11 @@ console.log(props, userInfo, '<==== 看看数据')
 </script>
 
 <template>
-  <!-- <el-select v-model="selectedValue" :ref="`selectRef${timeRef}`" :multiple="multiple ? true : false" :size="size ? size : ''" :placeholder="placeholder ? placeholder : '请输入'"
-    :disabled="disabled ? true : false" clearable collapse-tags @change="updateValue" @visible-change="visibleChange">
+  <el-select v-model="selectedValue" :ref="`selectRef${timeRef}`" :multiple="multiple" :size="size"
+    :placeholder="placeholder" :disabled="disabled" clearable collapse-tags @change="updateValue"
+    @visible-change="visibleChange">
     <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
-  </el-select> -->
+  </el-select>
 </template>
 
 <style lang="scss" scoped></style>

fhKeeper/formulahousekeeper/customerBuler-crm/src/components/translationComponent/personnelSearch/type.d.ts

@@ -4,15 +4,6 @@ export type optionsType = {
   jobNumber?: string,
 }[]
 
-export interface Props {
-  modelValue: any,
-  size: assemblySize,
-  placeholder: string,
-  disabled?: Boolean,
-  multiple?: Boolean,
-  options?: optionsType, // 使用自定义数据
-}
-
 export interface Emits {
   (event: "change", value: any): void;
   /**

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

@@ -187,7 +187,7 @@ watchEffect(() => {
           </el-select>
         </div>
         <div class="w-40">
-          <personnel-search v-model="selectVal" size="small" :disabled="false" multiple placeholder="你好世界" @change="selectChange"></personnel-search>
+          <personnel-search v-model="selectVal" disabled multiple placeholder="你好世界" @change="selectChange"></personnel-search>
           <el-select
             ref="select1"
             size="small"

fhKeeper/formulahousekeeper/customerBuler-crm/src/type.d.ts

@@ -27,7 +27,7 @@ type templateKey = { // 自定义模板键值
 
 type translationType = "userName" | "departmentName" | "deptName"; // 企业微信, 钉钉转译类型，
 
-type assemblySize = "mini" | "medium" | "large" | '' | 'large' | 'default' | 'small';
+type assemblySize = '' | 'large' | 'default' | 'small';
 
 type saveLoadingType = "1" | "2" | "3" | "4"; //1是没有保存, 2是正在保存, 3是保存成功, 4是保存失败