Merge branch 'dev-xuzhao'

src/views/addressBook/components/detail.vue

@@ -72,13 +72,14 @@
 											:disabled="item.disabled"
 										/>
 									</template>
-									<template v-if="item.type === 'textMessage'">
+									<template v-if="item.type === 'msgRecipient'">
 										<el-radio-group :disabled="item.disabled" v-model="formData[item.prop]">
-											<el-radio value="y">是</el-radio>
-											<el-radio value="n">否</el-radio>
+											<el-radio :key="vax.value" v-for="vax in bj_msg_recipient" :value="vax.value">{{
+												vax.label
+											}}</el-radio>
 										</el-radio-group>
 									</template>
-									<template v-if="item.type === 'userName'">
+									<template v-if="item.type === 'contactName'">
 										<el-select
 											:disabled="item.disabled"
 											v-model="formData[item.prop]"
@@ -124,6 +125,8 @@
 import { reactive, ref } from 'vue';
 import type { FormInstance } from 'element-plus';
 import useSystemStore from '@/store/main';
+import { outTypeList } from '@/libs/commonMeth';
+const bj_msg_recipient = outTypeList('bj_msg_recipient'); //短信接收人
 // 定义props
 interface IProps {
 	modalConfig: {

src/views/addressBook/config/detail.config.ts

@@ -15,58 +15,58 @@ const modalConfig = {
 	formItems: [
 		{
 			label: '创建人员',
-			prop: 'createBy',
+			prop: 'addName',
 			type: 'input',
 			disabled: true,
 			placeholder: '请输入创建人员',
 		},
 		{
 			label: '创建人员单位名称',
-			prop: 'contactId',
+			prop: 'addDept',
 			type: 'input',
 			disabled: true,
 			placeholder: '请输入创建人员单位名称',
 		},
 		{
 			label: '创建时间',
-			prop: 'createTime',
+			prop: 'addDate',
 			type: 'input',
 			disabled: true,
 			placeholder: '请输入创建时间',
 		},
 		{
 			label: '单位名称',
-			prop: 'contactDeptName',
+			prop: 'unitName',
 			type: 'select',
 			placeholder: '请选择单位名称',
 		},
 		{
 			label: '联络人名称',
-			prop: 'userName',
-			type: 'userName',
+			prop: 'contactName',
+			type: 'input',
 			placeholder: '请输入联络人名称',
 		},
 		{
 			label: '所属部门',
-			prop: 'relName',
-			type: 'select',
-			placeholder: '请选择所属部门',
+			prop: 'belongsDept',
+			type: 'input',
+			placeholder: '请输入所属部门',
 		},
 		{
 			label: '所属职务',
-			prop: 'dutyName',
-			type: 'select',
-			placeholder: '请选择所属职务',
+			prop: 'position',
+			type: 'input',
+			placeholder: '请输入所属职务',
 		},
 		{
 			label: '微信号',
-			prop: 'wx',
+			prop: 'wxNumber',
 			type: 'input',
 			placeholder: '请输入微信号',
 		},
 		{
 			label: '联系电话',
-			prop: 'mobilePhone',
+			prop: 'contactNumber',
 			type: 'input',
 			placeholder: '请输入联系电话',
 		},
@@ -78,7 +78,7 @@ const modalConfig = {
 		},
 		{
 			label: '传真号',
-			prop: 'faxNum',
+			prop: 'fixedTelephone',
 			type: 'input',
 			placeholder: '请输入传真号',
 		},
@@ -90,8 +90,8 @@ const modalConfig = {
 		},
 		{
 			label: '短信接收人',
-			prop: 'msgReceiver',
-			type: 'textMessage',
+			prop: 'msgRecipient',
+			type: 'msgRecipient',
 		},
 	],
 };

src/views/addressBook/config/detail.nonIndustry.config.ts

@@ -14,58 +14,58 @@ const modalConfig = {
 	formItems: [
 		{
 			label: '创建人员',
-			prop: 'createBy',
+			prop: 'addName',
 			type: 'input',
 			disabled: true,
 			placeholder: '请输入创建人员',
 		},
 		{
 			label: '创建人员单位名称',
-			prop: 'contactId',
+			prop: 'addDept',
 			type: 'input',
 			disabled: true,
 			placeholder: '请输入创建人员单位名称',
 		},
 		{
 			label: '创建时间',
-			prop: 'createTime',
+			prop: 'addDate',
 			type: 'input',
 			disabled: true,
 			placeholder: '请输入创建时间',
 		},
 		{
 			label: '单位名称',
-			prop: 'contactDeptName',
+			prop: 'unitName',
 			type: 'select',
 			placeholder: '请选择单位名称',
 		},
 		{
 			label: '联络人名称',
-			prop: 'userName',
-			type: 'userName',
+			prop: 'contactName',
+			type: 'input',
 			placeholder: '请输入联络人名称',
 		},
 		{
 			label: '所属部门',
-			prop: 'relName',
-			type: 'select',
-			placeholder: '请选择所属部门',
+			prop: 'belongsDept',
+			type: 'input',
+			placeholder: '请输入所属部门',
 		},
 		{
 			label: '所属职务',
-			prop: 'dutyName',
-			type: 'select',
-			placeholder: '请选择所属职务',
+			prop: 'position',
+			type: 'input',
+			placeholder: '请输入所属职务',
 		},
 		{
 			label: '微信号',
-			prop: 'wx',
+			prop: 'wxNumber',
 			type: 'input',
 			placeholder: '请输入微信号',
 		},
 		{
 			label: '联系电话',
-			prop: 'mobilePhone',
+			prop: 'contactNumber',
 			type: 'input',
 			placeholder: '请输入联系电话',
 		},
@@ -77,7 +77,7 @@ const modalConfig = {
 		},
 		{
 			label: '传真号',
-			prop: 'faxNum',
+			prop: 'fixedTelephone',
 			type: 'input',
 			placeholder: '请输入传真号',
 		},