diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnforcementInfoSection.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnforcementInfoSection.vue
index e770127e..369e5f14 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnforcementInfoSection.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnforcementInfoSection.vue
@@ -23,7 +23,7 @@
{{ person.name || '请选择' }}
- {{ person.id }}
+ {{ person.phonenumber }}
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue
index b8610425..ab5b20d5 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue
@@ -201,12 +201,13 @@ const handleOpenPersonPicker = (index) => {
// 选择人员
const handleSelectPerson = (person) => {
+ console.log(person,'person');
if (currentEditIndex.value === -1) {
// 新增人员
- additionalPersons.value.push({ name: person.name, id: person.id, phonenumber: person.id });
+ additionalPersons.value.push({ name: person.name, id: person.userId, phonenumber: person.id });
} else {
// 编辑现有人员
- additionalPersons.value[currentEditIndex.value] = { name: person.name, id: person.id, phonenumber: person.id };
+ additionalPersons.value[currentEditIndex.value] = { name: person.name, id: person.userId, phonenumber: person.id };
}
showPopups.person = false;
};
@@ -316,17 +317,18 @@ const goBack = () => {
const buildSubmitPayload = () => {
const useCommonStr = sessionStorage.getItem('useCommon');
const useCommon = JSON.parse(useCommonStr) || {};
-
// 主执法人员
const mainPerson = enforcementPersons.value[0] || {};
+ console.log(mainPerson,'mainPerson');
const lawEnforcer = mainPerson.name || '';
- const lawEnforcerId = mainPerson.lawCertificateNum || mainPerson.phonenumber || '';
- const lawEnforcerTel = mainPerson.phonenumber || '';
+ const lawEnforcerId = mainPerson.userId || mainPerson.phonenumber || '';
+ const lawEnforcerTel =mainPerson.lawCertificateNum|| mainPerson.phonenumber || '';
const lawCertificateNumText = mainPerson.name && mainPerson.phonenumber
? `${mainPerson.name} ${mainPerson.phonenumber}`
: '';
-
// 额外执法人员(多个,逗号拼接)
+ console.log(lawEnforcerTel,'lawEnforcerTel');
+ console.log(additionalPersons.value,'additionalPersons.value');
const validAdditionalPersons = additionalPersons.value.filter(p => p.name);
const lawEnforcerTwo = validAdditionalPersons.map(p => p.name).join(',');
const lawEnforcerIdTwo = validAdditionalPersons.map(p => p.id).join(',');
@@ -337,8 +339,7 @@ const buildSubmitPayload = () => {
// 构建 lawEnforcerOther:姓名,姓名,...
const lawEnforcerOther = validAdditionalPersons.map(p => p.name).join(',');
const lawEnforcerIdOther = validAdditionalPersons.map(p => p.id).join(',');
- const lawEnforcerTelOther = validAdditionalPersons.map(p => p.phonenumber || '').join(',');
-
+ const lawEnforcerTelTwo = validAdditionalPersons.map(p => p.phonenumber || '').join(',');
// 任务来源:数字和中文名称
const lawEnforceCategory = categoryOptions.value.find(item => item.text === formData.category)?.value || '';
const lawEnforceCategoryText = formData.category || '';
@@ -378,7 +379,7 @@ const getCurrentDateTime = () => {
lawEnforcerTel: lawEnforcerTel,
lawEnforcerOther: lawEnforcerOther,
lawEnforcerIdOther: lawEnforcerIdOther,
- lawEnforcerTelOther: lawEnforcerTelOther,
+ lawEnforcerTelTwo: lawEnforcerTelTwo,
bureauDeptId: useCommon.bureauUnitId || '',
bureauDeptName: useCommon.bureauUnitName || '',
creditcode: '无',
@@ -450,7 +451,9 @@ const getCurrentDateTime = () => {
entrustDeptId: formData.entrustedAgencyId || '',
reason: formData.reason || '',
lawEnforcementBasisText: formData.enforcementBases ? formData.enforcementBases.join(',') : '',
- oureauDeptName: formData.enforcementUnit || ''
+ oureauDeptName: formData.enforcementUnit || '',
+ lawEnforcerTel: lawEnforcerTel,
+ lawEnforcerTelTwo: lawEnforcerTelTwo,
};
};