跳转

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

@@ -316,7 +316,7 @@ async function importBusiness(param: UploadRequestOptions) {
     allLoading.importLoading = false
   })
   if (res.code == 'ok') {
-    globalPopup?.showSuccess('导入成功' || '')
+    globalPopup?.showSuccess('导入成功')
     getCustomerTable()
     return
   }

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/login.vue

@@ -66,10 +66,10 @@ const router = useRouter();
 const globalPopup = inject<GlobalPopup>('globalPopup')
 const ruleFormRef = ref<FormInstance>();
 const ruleForm = ref({
-  username: "18122222222",
-  password: "000000",
-  // username: "",
-  // password: "",
+  // username: "18122222222",
+  // password: "000000",
+  username: "",
+  password: "",
 });
 const loginLoading = ref(false);
 const rules = reactive<FormRules<typeof ruleForm>>({

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

@@ -366,7 +366,7 @@ async function importUser(param: UploadRequestOptions) {
   })
   loadingFrom.importLoading = false
   if (res.code == 'ok') {
-    globalPopup?.showSuccess('导入成功' || '')
+    globalPopup?.showSuccess('导入成功')
     closeModal('importVisible')
     getTableData()
     return
@@ -437,7 +437,6 @@ function changeBatch(flag: boolean = true) {
 }
 
 function addPersone(item: any) {
-  console.log(item)
   if (!item) {
     personnelFromData.value = {}
     dialogFrom.addPersonnelDialogVisible = true

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/team/module/AddPersonnelModal.vue

@@ -33,7 +33,7 @@
                     <!-- <el-cascader v-model="personnelFrom.departmentId" :options="data.deptList" placeholder="请选择部门" :props="{ checkStrictly: true }" clearable style="width: 100%" /> -->
                     <tree-select v-model="personnelFrom.departmentId" :size="''" checkStrictly placeholder="请选择部门" :key="personnelFrom.departmentId"></tree-select>
                 </el-form-item>
-                <el-form-item label="角色">
+                <el-form-item label="角色" prop="roleId">
                     <el-select v-model="personnelFrom.roleId" placeholder="请选择角色" size="large">
                         <el-option v-for="item in data.roleList" :key="item.id" :label="item.rolename"
                             :value="item.id" />
@@ -99,7 +99,8 @@ const props = defineProps<Props>();
 
 // 定义校验规则
 const personnelRules = reactive<FormRules<typeof personnelFrom>>({ // 部门表单校验规则
-    name: [{ required: true, trigger: 'blur', message: '请输入姓名' }]
+    name: [{ required: true, trigger: 'blur', message: '请输入姓名' }],
+    roleId: [{ required: true, trigger: 'change', message: '请选择角色' }]
 })
 
 // 定义方法