Browse Source

执法人员保留id

dev-V1.0.6
wangmingyong@163.com 3 months ago
parent
commit
2984bc5106
  1. 2
      zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnforcementInfoSection.vue
  2. 23
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue

2
zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnforcementInfoSection.vue

@ -23,7 +23,7 @@
<span class="enforcer-name" :class="{ placeholder: !person.name }"> <span class="enforcer-name" :class="{ placeholder: !person.name }">
{{ person.name || '请选择' }} {{ person.name || '请选择' }}
</span> </span>
<span v-if="person.id" class="enforcer-id">{{ person.id }}</span> <span v-if="person.id" class="enforcer-id">{{ person.phonenumber }}</span>
</div> </div>
<van-icon name="close" class="remove-icon" @click="$emit('removePerson', index)" /> <van-icon name="close" class="remove-icon" @click="$emit('removePerson', index)" />
</div> </div>

23
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue

@ -201,12 +201,13 @@ const handleOpenPersonPicker = (index) => {
// 选择人员 // 选择人员
const handleSelectPerson = (person) => { const handleSelectPerson = (person) => {
console.log(person,'person');
if (currentEditIndex.value === -1) { 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 { } 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; showPopups.person = false;
}; };
@ -316,17 +317,18 @@ const goBack = () => {
const buildSubmitPayload = () => { const buildSubmitPayload = () => {
const useCommonStr = sessionStorage.getItem('useCommon'); const useCommonStr = sessionStorage.getItem('useCommon');
const useCommon = JSON.parse(useCommonStr) || {}; const useCommon = JSON.parse(useCommonStr) || {};
// 主执法人员 // 主执法人员
const mainPerson = enforcementPersons.value[0] || {}; const mainPerson = enforcementPersons.value[0] || {};
console.log(mainPerson,'mainPerson');
const lawEnforcer = mainPerson.name || ''; const lawEnforcer = mainPerson.name || '';
const lawEnforcerId = mainPerson.lawCertificateNum || mainPerson.phonenumber || ''; const lawEnforcerId = mainPerson.userId || mainPerson.phonenumber || '';
const lawEnforcerTel = mainPerson.phonenumber || ''; const lawEnforcerTel =mainPerson.lawCertificateNum|| mainPerson.phonenumber || '';
const lawCertificateNumText = mainPerson.name && mainPerson.phonenumber const lawCertificateNumText = mainPerson.name && mainPerson.phonenumber
? `${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 validAdditionalPersons = additionalPersons.value.filter(p => p.name);
const lawEnforcerTwo = validAdditionalPersons.map(p => p.name).join(','); const lawEnforcerTwo = validAdditionalPersons.map(p => p.name).join(',');
const lawEnforcerIdTwo = validAdditionalPersons.map(p => p.id).join(','); const lawEnforcerIdTwo = validAdditionalPersons.map(p => p.id).join(',');
@ -337,8 +339,7 @@ const buildSubmitPayload = () => {
// 构建 lawEnforcerOther:姓名,姓名,... // 构建 lawEnforcerOther:姓名,姓名,...
const lawEnforcerOther = validAdditionalPersons.map(p => p.name).join(','); const lawEnforcerOther = validAdditionalPersons.map(p => p.name).join(',');
const lawEnforcerIdOther = validAdditionalPersons.map(p => p.id).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 lawEnforceCategory = categoryOptions.value.find(item => item.text === formData.category)?.value || '';
const lawEnforceCategoryText = formData.category || ''; const lawEnforceCategoryText = formData.category || '';
@ -378,7 +379,7 @@ const getCurrentDateTime = () => {
lawEnforcerTel: lawEnforcerTel, lawEnforcerTel: lawEnforcerTel,
lawEnforcerOther: lawEnforcerOther, lawEnforcerOther: lawEnforcerOther,
lawEnforcerIdOther: lawEnforcerIdOther, lawEnforcerIdOther: lawEnforcerIdOther,
lawEnforcerTelOther: lawEnforcerTelOther, lawEnforcerTelTwo: lawEnforcerTelTwo,
bureauDeptId: useCommon.bureauUnitId || '', bureauDeptId: useCommon.bureauUnitId || '',
bureauDeptName: useCommon.bureauUnitName || '', bureauDeptName: useCommon.bureauUnitName || '',
creditcode: '无', creditcode: '无',
@ -450,7 +451,9 @@ const getCurrentDateTime = () => {
entrustDeptId: formData.entrustedAgencyId || '', entrustDeptId: formData.entrustedAgencyId || '',
reason: formData.reason || '', reason: formData.reason || '',
lawEnforcementBasisText: formData.enforcementBases ? formData.enforcementBases.join(',') : '', lawEnforcementBasisText: formData.enforcementBases ? formData.enforcementBases.join(',') : '',
oureauDeptName: formData.enforcementUnit || '' oureauDeptName: formData.enforcementUnit || '',
lawEnforcerTel: lawEnforcerTel,
lawEnforcerTelTwo: lawEnforcerTelTwo,
}; };
}; };

Loading…
Cancel
Save