Merge pull request 'fix : 通讯录去除班组, 拨打单位必填' (#225) from dj into master

Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/225
This commit is contained in:
2024-12-29 08:07:49 +00:00

View File

@@ -57,6 +57,9 @@ const formRules = reactive({
name: [ name: [
{required: true, message: "请输入姓名", trigger: ["change", "blur"]} {required: true, message: "请输入姓名", trigger: ["change", "blur"]}
], ],
dispatchUnit: [
{required: true, message: "请输入拨打单位", trigger: ["change", "blur"]}
],
phone: [ phone: [
{required: true, message: "请输入手机号码", trigger: ["change", "blur"]}, {required: true, message: "请输入手机号码", trigger: ["change", "blur"]},
{validator: checkPhone, trigger: ["change", "blur"]}, {validator: checkPhone, trigger: ["change", "blur"]},
@@ -102,18 +105,6 @@ const formSchema = computed(() => {
clearable: true, clearable: true,
} }
}, },
{
label: '班组信息',
prop: 'team',
component: 'el-input',
colProps: {
span: 24
},
props: {
placeholder: '请输入班组信息',
clearable: true,
}
},
{ {
label: '姓名', label: '姓名',
prop: 'name', prop: 'name',
@@ -229,11 +220,6 @@ const addressBookTableConfig = reactive({
label: '拨打单位', label: '拨打单位',
align: 'center' align: 'center'
}, },
{
prop: 'team',
label: '班组信息',
align: 'center'
},
{ {
prop: 'name', prop: 'name',
label: '姓名', label: '姓名',
@@ -416,14 +402,10 @@ const handleSubmitAddressBook = async (formInstance) => {
if (!formInstance) return; if (!formInstance) return;
let validate = await formInstance.validate() let validate = await formInstance.validate()
if (!validate.isValidate) return; if (!validate.isValidate) return;
if (formInstance.getValues().role == '0' && !formInstance.getValues().team) { // if (formInstance.getValues().role == '1' && !formInstance.getValues().dispatchUnit) {
ElMessage.warning('请输入班组信息'); // ElMessage.warning('请输入拨打单位');
return; // return;
} // }
if (formInstance.getValues().role == '1' && !formInstance.getValues().dispatchUnit) {
ElMessage.warning('请输入拨打单位');
return;
}
if (dialogType.value === "add") { if (dialogType.value === "add") {
addContact(formInstance.getValues()).then(res => { addContact(formInstance.getValues()).then(res => {