Browse Source

通讯录 相应参数 ok 及详情

Luka 12 hours ago
parent
commit
42ce33aec4

+ 5 - 13
src/views/addressBook/components/detail.vue

@@ -74,12 +74,10 @@
 									</template>
 									<template v-if="item.type === 'msgRecipient'">
 										<el-radio-group v-model="formData.msgRecipient">
-											<el-radio value="1">是</el-radio>
-											<el-radio value="2">否</el-radio>
+											<el-radio v-for="vax in bj_msg_recipient" border :value="vax.value">{{
+												vax.label
+											}}</el-radio>
 										</el-radio-group>
-										<!-- <el-radio-group v-model="formData[item.prop]">
-											<el-radio v-for="vax in bj_msg_recipient" :value="vax.value">{{ vax.label }}</el-radio>
-										</el-radio-group> -->
 									</template>
 									<template v-if="item.type === 'contactName'">
 										<el-select
@@ -216,14 +214,8 @@ async function setDialogVisible(isNew: boolean = true, check: boolean = false) {
 		}
 	} else {
 		props.modalConfig.formItems.map((m: any) => {
-			if (m.numberType === '2') {
-				if (m.prop === initialForm[m.prop]) {
-					initialForm[m.prop] = (0.0).toFixed(2);
-				}
-			} else if (m.numberType === '1') {
-				if (m.porp === initialForm[m.porp]) {
-					initialForm[m.prop] = Math.trunc(0);
-				}
+			if (m.prop === 'msgRecipient') {
+				initialForm[m.prop] = '2';
 			}
 		});
 		formData.value = JSON.parse(JSON.stringify(initialForm));

+ 4 - 4
src/views/addressBook/config/search.config.ts

@@ -5,10 +5,10 @@ interface Inew {
 
 const searchConfig = {
 	pageName: 'ntlo',
-	// pageListParams: {
-	// 	industryType: '1',
-	// 	belongsDept: '',
-	// },
+	pageListParams: {
+		industryType: '1',
+		belongsDeptIds: '',
+	},
 	formItems: [
 		{
 			label: '姓名',

+ 1 - 1
src/views/addressBook/config/search.nonIndustry.config.ts

@@ -7,7 +7,7 @@ const searchConfig = {
 	pageName: 'ntlo',
 	pageListParams: {
 		industryType: '2',
-		belongsDept: '',
+		belongsDeptIds: '',
 	},
 	formItems: [
 		{

+ 7 - 14
src/views/addressBook/index.vue

@@ -102,29 +102,22 @@ const tabs = reactive([
 ]);
 
 const activeTab = ref('1');
-
+const searchTableRef: any = ref<InstanceType<typeof pageSearch>>();
 // 操作弹框
 import usePageModal from '@/components/components/hooks/usePageDetails';
 const { modalRef, handleNewDataClick, handleEditDataClick, handleCheckDataClick, handlePageDetail } =
 	usePageModal();
 
 const getTreeCheck = async data => {
-	console.log(data);
-	// console.log(searchObj);
-	if (tableListRef.value) {
-		if (activeTab.value == '1') {
-			console.log(data.join());
-			searchConfig.pageListParams.belongsDept = data.join();
-			console.log(searchConfig);
-		} else {
-			searchNonIndustryConfig.pageListParams.belongsDept = data.join();
-		}
-
-		await tableListRef.value[0].fetchPageListData({ belongsDept: data.join() });
+	if (activeTab.value == '1') {
+		searchConfig.pageListParams.belongsDeptIds = data.join();
+	} else {
+		searchNonIndustryConfig.pageListParams.belongsDeptIds = data.join();
 	}
+	searchTableRef.value[0].handleQueryClick();
 };
 const treeSelectdRef = ref<InstanceType<typeof TreeSelect>>();
-const searchTableRef = ref<InstanceType<typeof pageSearch>>();
+
 const handleClick = async (tab: TabsPaneContext) => {
 	setTimeout(() => {
 		if (treeSelectdRef.value) {