Merge remote-tracking branch 'origin/dev' into dev

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

@@ -64,9 +64,11 @@
         </div>
 
         <!-- 原因 -->
+        <template v-if="showReason">
         <van-field v-model="formData.reason" name="reason" label="原因" :placeholder="formData.reason || '请选择'" readonly
             :clickable="canSelectReason" :is-link="canSelectReason"
-            :rules="[{ required: true, message: '请选择原因' }]" required
+            :rules="canSelectReason ? [{ required: true, message: '请选择原因' }] : []"
+            :required="canSelectReason"
             @click="canSelectReason && (showReasonPicker = true)" />
 
         <!-- 原因选择弹窗 -->
@@ -79,6 +81,7 @@
         <van-field v-if="formData.reason === '其他'" v-model="formData.otherReasons" name="otherReasons" label="其他原因"
             placeholder="请输入其他原因" type="textarea" rows="3" maxlength="500" show-word-limit
             :rules="[{ required: true, message: '请填写其他原因' }]" required />
+        </template>
 
         <!-- 执法时间（可选，近10天内） -->
         <van-field v-model="formData.enforcementTime" name="enforcementTime" label="执法时间" placeholder="请选择执法时间" readonly
@@ -189,6 +192,10 @@ const props = defineProps({
         type: Boolean,
         default: false
     },
+    showReason: {
+        type: Boolean,
+        default: true
+    },
     canEditTime: {
         type: Boolean,
         default: true

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

@@ -59,9 +59,11 @@
         </div>
 
         <!-- 原因 -->
+        <template v-if="showReason">
         <van-field v-model="formData.reason" name="reason" label="原因" :placeholder="formData.reason || '请选择'" readonly
             :clickable="canSelectReason" :is-link="canSelectReason"
-            :rules="[{ required: true, message: '请选择原因' }]" required
+            :rules="canSelectReason ? [{ required: true, message: '请选择原因' }] : []"
+            :required="canSelectReason"
             @click="canSelectReason && (showReasonPicker = true)" />
 
         <!-- 原因选择弹窗 -->
@@ -74,6 +76,7 @@
         <van-field v-if="formData.reason === '其他'" v-model="formData.otherReasons" name="otherReasons" label="其他原因"
             placeholder="请输入其他原因" type="textarea" rows="3" maxlength="500" show-word-limit
             :rules="[{ required: true, message: '请填写其他原因' }]" required />
+        </template>
 
         <!-- 入企时间（可选，近10天内；仅补录模式可编辑） -->
         <van-field v-model="formData.enforcementTime" name="enforcementTime" label="入企时间" placeholder="请选择入企时间"
@@ -181,6 +184,10 @@ const props = defineProps({
         type: Boolean,
         default: false
     },
+    showReason: {
+        type: Boolean,
+        default: true
+    },
     canEditTime: {
         type: Boolean,
         default: false

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

@@ -16,6 +16,7 @@
             <EnforcementInfoSection v-if="!isNonEnforcement" :form-data="formData"
                 :default-person="enforcementPersons[0]" :additional-persons="additionalPersons"
                 :enterprise-number="enterpriseData.enterpriseNumber" :can-select-reason="canSelectReason"
+                :show-reason="showReason"
                 :can-edit-time="isSignMode"
                 @show-notice-picker="showPopups.notice = true" @open-person-picker="handleOpenPersonPicker"
                 @remove-person="handleRemovePerson" @show-category-picker="showPopups.category = true"
@@ -26,6 +27,7 @@
             <!-- 活动信息组件（非行政执法模式） -->
             <NonEnforcementInfoSection v-else :form-data="formData" :default-person="enforcementPersons[0]"
                 :additional-persons="additionalPersons" :can-select-reason="canSelectReason"
+                :show-reason="showReason"
                 :can-edit-time="isSignMode"
                 @open-person-picker="handleOpenPersonPicker"
                 @remove-person="handleRemovePerson" @open-basis-picker="handleOpenBasisPicker"
@@ -72,7 +74,12 @@ const isSignMode = ref(false);
 // 扫码登记模式
 const isScanMode = ref(false);
 
-// 是否可以选择原因（补录和扫码登记模式不可选择，手动搜索企业可选择）
+// 原因字段是否显示（仅扫码登记模式不显示）
+const showReason = computed(() => {
+    return !isScanMode.value;
+});
+
+// 是否可以选择原因（仅手动搜索企业可选择，补录模式显示但不可选择）
 const canSelectReason = computed(() => {
     return !isSignMode.value && !isScanMode.value;
 });

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

@@ -23,9 +23,9 @@
                                 <div class="info-value">{{ enterpriseData.enterpriseName }}</div>
                             </div>
                             <template v-if="!isCollapsed">
-                                <div class="info-item">
-                                    <div class="info-label">统一社会信用代码</div>
-                                    <div class="info-value">{{ enterpriseData.enterpriseNumber }}</div>
+                                <div class="info-item enterpriseData-number">
+                                    <div class="info-label">统一社会<br>信用代码</div>
+                                    <div class="info-value ">{{ enterpriseData.enterpriseNumber }}</div>
                                 </div>
                                 <div class="info-item">
                                     <div class="info-label">法定代表人</div>
@@ -33,11 +33,11 @@
                                 </div>
                                 <div class="info-item">
                                     <div class="info-label">企业类型</div>
-                                    <div class="info-value">{{ enterpriseData.enterpriseType }}</div>
+                                    <div class="info-value">{{ enterpriseData.companyOrgType }}</div>
                                 </div>
                                 <div class="info-item">
                                     <div class="info-label">注册资本</div>
-                                    <div class="info-value">{{ enterpriseData.registeredCapital }}</div>
+                                    <div class="info-value">{{ formatCapital(enterpriseData.registeredCapital) }}（万元人民币)</div>
                                 </div>
                                 <div class="info-item">
                                     <div class="info-label">成立日期</div>
@@ -45,7 +45,7 @@
                                 </div>
                                 <div class="info-item">
                                     <div class="info-label">经营期限</div>
-                                    <div class="info-value">{{ enterpriseData.operatingTerm }}</div>
+                                    <div class="info-value">{{ enterpriseData.operatingTerm }} 至 {{ formatDate(enterpriseData.operatingTermEnd) }}</div>
                                 </div>
                                 <div class="info-item">
                                     <div class="info-label">注册地址</div>
@@ -153,6 +153,14 @@ const hasFetchedCaseData = ref(false);
 
 
 // ========== 方法 ==========
+// 注册资本保留两位小数
+const formatCapital = (val) => {
+    if (val === null || val === undefined || val === '') return '';
+    const num = Number(val);
+    if (isNaN(num)) return val;
+    return num.toFixed(2);
+};
+
 const toggleCollapse = () => {
     isCollapsed.value = !isCollapsed.value;
 };
@@ -414,6 +422,12 @@ const toSign = () => {
         word-break: break-all;
     }
 
+    .enterpriseData-number {
+       display: flex;
+       align-items: center;
+       justify-content: flex-start;
+    }
+
     .address-value,
     .scope-value {
         display: flex;