Browse Source

bug修复

dev
wangmingyong@163.com 1 month ago
parent
commit
8133d9a055
  1. 5
      zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnforcementInfoSection.vue
  2. 5
      zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/NonEnforcementInfoSection.vue
  3. 5
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/EnforcementRecordList.vue
  4. 6
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementEvaluateDetail.vue
  5. 26
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue
  6. 2
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue

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

@ -66,6 +66,7 @@
<!-- 原因 -->
<van-field v-model="formData.reason" name="reason" label="原因" :placeholder="formData.reason || '请选择'" readonly
:clickable="canSelectReason" :is-link="canSelectReason"
:rules="[{ required: true, message: '请选择原因' }]" required
@click="canSelectReason && (showReasonPicker = true)" />
<!-- 原因选择弹窗 -->
@ -75,7 +76,7 @@
</van-popup>
<!-- 其他原因输入框选择"其他"时显示 -->
<van-field v-if="formData.reason === '其他'" v-model="formData.other_reasons" name="other_reasons" label="其他原因"
<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 />
@ -293,7 +294,7 @@ const selectReason = ({ selectedOptions }) => {
props.formData.reason = selectedOptions[0]?.text || '';
const selectedValue = selectedOptions[0]?.value || '';
if (selectedValue !== '其他' && selectedOptions[0]?.text !== '其他') {
props.formData.other_reasons = '';
props.formData.otherReasons = '';
}
showReasonPicker.value = false;
};

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

@ -61,6 +61,7 @@
<!-- 原因 -->
<van-field v-model="formData.reason" name="reason" label="原因" :placeholder="formData.reason || '请选择'" readonly
:clickable="canSelectReason" :is-link="canSelectReason"
:rules="[{ required: true, message: '请选择原因' }]" required
@click="canSelectReason && (showReasonPicker = true)" />
<!-- 原因选择弹窗 -->
@ -70,7 +71,7 @@
</van-popup>
<!-- 其他原因输入框选择"其他"时显示 -->
<van-field v-if="formData.reason === '其他'" v-model="formData.other_reasons" name="other_reasons" label="其他原因"
<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 />
@ -127,7 +128,7 @@ const selectReason = ({ selectedOptions }) => {
props.formData.reason = selectedOptions[0]?.text || '';
const selectedValue = selectedOptions[0]?.value || '';
if (selectedValue !== '其他' && selectedOptions[0]?.text !== '其他') {
props.formData.other_reasons = '';
props.formData.otherReasons = '';
}
showReasonPicker.value = false;
};

5
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/EnforcementRecordList.vue

@ -19,7 +19,7 @@
<div class="record-card-header">
<div class="header-time">{{ cityRecords[0].createTime }}</div>
<div class="header-company">{{ enterpriseName }}</div>
<div class="header-count">被执法次数{{ cityRecords.length }}</div>
<div class="header-count">被执法次数{{ listCount }}</div>
</div>
<!-- 时间轴记录 -->
<div class="record-card-body" v-if="isExpanded">
@ -73,6 +73,7 @@ const props = defineProps({
// ========== ==========
const recordTab = ref(0);
const cityRecords = ref([]);
const listCount = ref(0);
const loading = ref(false);
const isExpanded = ref(true);
@ -115,6 +116,7 @@ const fetchEnfRegistrationList = (isLoadMore = false) => {
}
if (res.code === 200) {
const payload = res.data || {};
listCount.value = payload.listCount || payload.total || 0;
const rows = payload.list || payload.rows || (Array.isArray(payload) ? payload : []);
const pageData = (Array.isArray(rows) ? rows : []).filter(
item => item !== null && item !== undefined
@ -163,6 +165,7 @@ const handleRecordTabChange = (tabIndex) => {
recordTab.value = tabIndex;
pageNum.value = 1;
hasMore.value = true;
listCount.value = 0;
cityRecords.value = [];
fetchEnfRegistrationList();
};

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

@ -53,10 +53,14 @@
<span class="info-value">{{ basis.trim() }}</span>
</div>
</template>
<div class="info-row" v-if="detail.reason">
<div class="info-row" v-if="detail.enforceReason">
<span class="info-label">原因</span>
<span class="info-value">{{ detail.enforceReason }}</span>
</div>
<div class="info-row" v-if="detail.otherReasons">
<span class="info-label">原因描述</span>
<span class="info-value">{{ detail.otherReasons }}</span>
</div>
<div class="info-row">
<span class="info-label">执法时间</span>
<span class="info-value">{{ formatTime(detail.enforcementTime) }}</span>

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

@ -102,6 +102,7 @@ const formData = reactive({
enforcementBases: [''],
enforcementBasesIds: [''],
reason: '',
otherReasons: '',
enforcementTime: '',
jointEnforcement: '0',
isNewJoint: false,
@ -376,6 +377,7 @@ const getCurrentDateTime = () => {
fileList: buildFileList(),
userId: useCommon.userId || '',
enforceReason: formData.reason || '',
otherReasons: formData.otherReasons || '',
checkCss: formData.checkCss || '0',
};
}
@ -418,6 +420,7 @@ const getCurrentDateTime = () => {
enforce: formData.enforce || '',
checkCss: formData.checkCss || '',
enforceReason: formData.reason || '',
otherReasons: formData.otherReasons || '',
lawField: formData.lawField || '',
lawFieldText: formData.lawFieldText || '',
checkCategory: checkCategory,
@ -594,7 +597,8 @@ const fetchDetail = (id) => {
formData.taskSource = checkCategoryItem?.text || data.checkCategoryText || '';
formData.lawEnforcementItemText = data.lawEnforcementItemText || '';
formData.enforcementTime = data.enforcementTime || '';
formData.enforceReason = data.enforceReason || '';
formData.reason = data.enforceReason || '';
formData.otherReasons = data.otherReasons || '';
formData.jointEnforcement = data.uniteCheck ? '1' : '0';
formData.entrustedEnforcement = data.hasAuto === 1 ? '1' : '0';
formData.entrustedAgency = data.entrustDeptName || '';
@ -614,13 +618,21 @@ const fetchDetail = (id) => {
}];
}
//
// lawEnforcerTwo/lawEnforcerIdTwolawEnforcerOther/lawEnforcerIdOther/lawEnforcerTelOther
additionalPersons.value = [];
if (data.lawEnforcerTwo) {
additionalPersons.value.push({
name: data.lawEnforcerTwo,
id: data.lawEnforcerIdTwo || '',
phonenumber: data.lawEnforcerIdTwo || ''
const extraNames = data.lawEnforcerTwo || data.lawEnforcerOther || '';
const extraIds = data.lawEnforcerIdTwo || data.lawEnforcerIdOther || '';
const extraTels = data.lawEnforcerTelOther || '';
if (extraNames) {
const nameArr = extraNames.split(',').map(s => s.trim()).filter(Boolean);
const idArr = extraIds ? extraIds.split(',').map(s => s.trim()).filter(Boolean) : [];
const telArr = extraTels ? extraTels.split(',').map(s => s.trim()).filter(Boolean) : [];
nameArr.forEach((name, i) => {
additionalPersons.value.push({
name: name,
id: idArr[i] || '',
phonenumber: telArr[i] || idArr[i] || ''
});
});
}

2
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue

@ -102,7 +102,7 @@ const { useCommon } = $globalStore;
const hasLaw = computed(() => !!useCommon.hasLaw);
// ========== Loading ==========
const isLoading = ref(true);
const isLoading = ref(!useCommon.token);
//
const checkLawPermission = () => {

Loading…
Cancel
Save