执法人员修改

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

@@ -15,12 +15,16 @@
             <div class="form-label"><span class="required-mark">*</span>执法人员</div>
             <div class="form-value person-select">
                 <div class="person-item default-person">
-                    <span>{{ defaultPerson?.name }} {{ defaultPerson?.lawCertificateNum || defaultPerson?.phonenumber }} </span>
+                    <span class="enforcer-name">{{ defaultPerson?.name }}</span>
+                    <span v-if="defaultPerson?.lawCertificateNum || defaultPerson?.phonenumber" class="enforcer-id">{{ defaultPerson?.lawCertificateNum || defaultPerson?.phonenumber }}</span>
                 </div>
                 <div v-for="(person, index) in additionalPersons" :key="index" class="person-item-add">
-                    <span @click="$emit('openPersonPicker', index)" :class="{ placeholder: !person.name }">
-                        {{ person.name || '请选择' }}{{ person.id || '' }}
-                    </span>
+                    <div class="enforcer-line">
+                        <span class="enforcer-name" @click="$emit('openPersonPicker', index)" :class="{ placeholder: !person.name }">
+                            {{ person.name || '请选择' }}
+                        </span>
+                        <span v-if="person.id" class="enforcer-id">{{ person.id }}</span>
+                    </div>
                     <van-icon name="close" class="remove-icon" @click="$emit('removePerson', index)" />
                 </div>
                 <div class="person-add" v-if="additionalPersons.length < 2">
@@ -443,12 +447,30 @@ const onAfterReadImage = (file) => {
     align-items: center;
     font-size: 14px;
 
-    &.default-person span {
+    &.default-person .enforcer-name {
         color: #333;
         font-size: 14px;
     }
 }
 
+.enforcer-line {
+    display: flex;
+    align-items: baseline;
+    white-space: nowrap;
+}
+
+.enforcer-name {
+    display: inline-block;
+    min-width: 3em;
+    text-align: justify;
+    text-align-last: justify;
+}
+
+.enforcer-id {
+    margin-left: 0.4em;
+    color: #8a8a8a;
+}
+
 .person-item-add {
     padding: 10px 10px 0px 0px;
     display: flex;
@@ -468,7 +490,7 @@ const onAfterReadImage = (file) => {
     color: #c8c9cc;
     font-size: 14px;
     padding: 10px 10px 0px 0px;
-
+    width:100%;
     .add-circle-icon {
         font-size: 16px;
         color: #333;

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

@@ -11,12 +11,16 @@
             <div class="form-label"><span class="required-mark">*</span>入企人员</div>
             <div class="form-value person-select">
                 <div class="person-item default-person">
-                    <span>{{ defaultPerson?.name }} {{ defaultPerson?.phonenumber }}</span>
+                    <span class="enforcer-name">{{ defaultPerson?.name }}</span>
+                    <span v-if="defaultPerson?.lawCertificateNum || defaultPerson?.phonenumber" class="enforcer-id">{{ defaultPerson?.lawCertificateNum || defaultPerson?.phonenumber }}</span>
                 </div>
                 <div v-for="(person, index) in additionalPersons" :key="index" class="person-item-add">
-                    <span @click="$emit('openPersonPicker', index)" :class="{ placeholder: !person.name }">
-                        {{ person.name || '请选择' }} {{ person.id }}
-                    </span>
+                    <div class="enforcer-line">
+                        <span class="enforcer-name" @click="$emit('openPersonPicker', index)" :class="{ placeholder: !person.name }">
+                            {{ person.name || '请选择' }}
+                        </span>
+                        <span v-if="person.id" class="enforcer-id">{{ person.id }}</span>
+                    </div>
                     <van-icon name="close" class="remove-icon" @click="$emit('removePerson', index)" />
                 </div>
                 <div class="person-add">
@@ -302,12 +306,30 @@ const onAfterReadImage = (file) => {
     align-items: center;
     font-size: 14px;
 
-    &.default-person span {
+    &.default-person .enforcer-name {
         color: #333;
         font-size: 14px;
     }
 }
 
+.enforcer-line {
+    display: flex;
+    align-items: baseline;
+    white-space: nowrap;
+}
+
+.enforcer-name {
+    display: inline-block;
+    min-width: 3em;
+    text-align: justify;
+    text-align-last: justify;
+}
+
+.enforcer-id {
+    margin-left: 0.4em;
+    color: #8a8a8a;
+}
+
 .person-item-add {
     padding: 10px 10px 0px 0px;
     display: flex;

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

@@ -239,7 +239,7 @@ const loadPersonList = () => {
     if (notUserId) {
         params.notUserId = notUserId;
     }
-    console.log(params);
+    // console.log(params);
     getBureauUnitUsers(params, (res) => {
         if (res.code === 200 || res.code === 0) {
             let data = res.data || res.rows || [];

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

@@ -320,7 +320,7 @@ const buildSubmitPayload = () => {
     // 主执法人员
     const mainPerson = enforcementPersons.value[0] || {};
     const lawEnforcer = mainPerson.name || '';
-    const lawEnforcerId = mainPerson.phonenumber || '';
+    const lawEnforcerId = mainPerson.lawCertificateNum || mainPerson.phonenumber || '';
     const lawEnforcerTel = mainPerson.phonenumber || '';
     const lawCertificateNumText = mainPerson.name && mainPerson.phonenumber
         ? `${mainPerson.name} ${mainPerson.phonenumber}`
@@ -334,7 +334,6 @@ const buildSubmitPayload = () => {
         .filter(p => p.name && p.phonenumber)
         .map(p => `${p.name} ${p.phonenumber}`)
         .join(',');
-
     // 构建 lawEnforcerOther：姓名,姓名,...
     const lawEnforcerOther = validAdditionalPersons.map(p => p.name).join(',');
     const lawEnforcerIdOther = validAdditionalPersons.map(p => p.id).join(',');