Browse Source

补录隐藏掉

dev-V1.0.6
wangmingyong@163.com 3 months ago
parent
commit
50d1ce05ab
  1. 10
      zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnforcementInfoSection.vue
  2. 2
      zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/NonEnforcementInfoSection.vue
  3. 14
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/law/lawServiceDetail.vue
  4. 10
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/query/enforcementQuery.vue
  5. 30
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/scanEntQRCode.vue

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

@ -28,7 +28,7 @@
<van-icon name="close" class="remove-icon" @click="$emit('removePerson', index)" />
</div>
<div class="person-add" v-if="additionalPersons.length < 2">
<span @click="$emit('openPersonPicker', -1)">请选择</span>
<span class="person_item" @click="$emit('openPersonPicker', -1)">请选择</span>
<van-icon name="add-o" class="add-circle-icon" @click="$emit('addPerson')" />
</div>
</div>
@ -239,7 +239,7 @@ onMounted(() => {
datePickerValue.value = [...range.currentDate];
loadDict('no-scan-reason', (columns) => {
reasonOptions.value = columns;
reasonOptions.value = columns.filter(item => item.text !== '补录' && item.value !== '补录');
});
});
@ -489,8 +489,12 @@ const onAfterReadImage = (file) => {
align-items: center;
color: #c8c9cc;
font-size: 14px;
padding: 10px 10px 0px 0px;
//padding: 10px 10px 0px 0px;
width:100%;
.person_item{
width: 100%;
padding: 10px 10px 0px 0px;
}
.add-circle-icon {
font-size: 16px;
color: #333;

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

@ -153,7 +153,7 @@ onMounted(() => {
});
loadDict('no-scan-reason', (columns) => {
reasonOptions.value = columns;
reasonOptions.value = columns.filter(item => item.text !== '补录' && item.value !== '补录');
});
});

14
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/law/lawServiceDetail.vue

@ -1,17 +1,17 @@
<template>
<div class="law-service-detail-page">
<!-- 顶部导航栏 -->
<van-nav-bar
<!-- <van-nav-bar
title="普法服务"
left-text="关闭"
left-arrow
@click-left="onClickLeft"
>
> -->
<!-- <template #right>
<van-icon name="filter-o" size="20" @click="onFilterClick" />
<van-icon name="search" size="20" style="margin-left: 12px;" @click="onSearchClick" />
</template> -->
</van-nav-bar>
<!-- </van-nav-bar> -->
<!-- 内容区域 -->
<div class="detail-content">
@ -261,6 +261,7 @@ const previewImage = (index) => {
font-size: 0.37rem;
color: #333;
line-height: 1.8;
overflow: hidden;
p {
text-indent: 2em;
@ -289,10 +290,13 @@ const previewImage = (index) => {
}
img {
max-width: 100%;
height: auto;
max-width: 100% !important;
width: auto !important;
height: auto !important;
border-radius: 0.15rem;
margin: 0.2rem 0;
display: block;
object-fit: contain;
}
a {

10
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/query/enforcementQuery.vue

@ -44,7 +44,7 @@
<div class="timeline-dot"></div>
<div class="timeline-line" v-if="idx < group.records.length - 1"></div>
<div class="timeline-content">
<div class="record-time">{{ item.createTime || item.enforcementTime || '-' }}</div>
<div class="record-time">{{ item.enforcementTime || item.createTime || '-' }}</div>
<div class="record-unit">执法单位:{{ item.bureauDeptName || item.unitName || '-' }}</div>
</div>
</div>
@ -145,14 +145,6 @@ const groupedList = computed(() => {
}
groups[key].records.push(item);
});
// 按时间倒序排列每个企业的记录
Object.values(groups).forEach(group => {
group.records.sort((a, b) => {
const timeA = new Date(a.createTime || a.enforcementTime || 0);
const timeB = new Date(b.createTime || b.enforcementTime || 0);
return timeB - timeA;
});
});
return Object.values(groups);
});

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

@ -43,8 +43,8 @@
<div class="reason-section">
<div class="section-label">请选择无法扫码的原因:</div>
<div class="reason-tags">
<div v-for="(reason, index) in reasonOptions" :key="index" class="reason-tag"
:class="{ active: selectedReason === index }" @click="selectedReason = index">
<div v-for="(reason, index) in filteredReasonOptions" :key="reason.value" class="reason-tag"
:class="{ active: selectedReason === reason.originalIndex }" @click="selectedReason = reason.originalIndex">
{{ reason.text }}
</div>
</div>
@ -91,7 +91,7 @@
</template>
<script setup name="ScanEntQRCode">
import { ref, reactive, onMounted, onBeforeUnmount, nextTick } from 'vue';
import { ref, reactive, computed, onMounted, onBeforeUnmount, nextTick } from 'vue';
import { useRouter, useRoute } from 'vue-router';
import { showFailToast, showSuccessToast, showToast, showConfirmDialog } from 'vant';
import { baseUrl, appEnv } from '@/config/env.js';
@ -335,6 +335,12 @@ const error = ref(false);
const reasonOptions = ref([]);
const filteredReasonOptions = computed(() => {
return reasonOptions.value
.map((item, index) => ({ ...item, originalIndex: index }))
.filter(item => item.text !== '补录' && item.value !== '补录');
});
const showSearchPopup = () => {
showSearchModal.value = true;
searchKeyword.value = '';
@ -345,16 +351,16 @@ const showSearchPopup = () => {
if (reasonOptions.value.length === 0) {
loadDict('no-scan-reason', (columns) => {
reasonOptions.value = columns;
const otherIndex = columns.findIndex(item => item.text === '其他' || item.value === '其他');
selectedReason.value = otherIndex !== -1 ? otherIndex : 0;
const otherItem = filteredReasonOptions.value.find(item => item.text === '其他' || item.value === '其他');
selectedReason.value = otherItem ? otherItem.originalIndex : (filteredReasonOptions.value[0]?.originalIndex ?? 0);
nextTick(() => {
loadEnterprises();
});
});
} else {
if (selectedReason.value === -1) {
const otherIndex = reasonOptions.value.findIndex(item => item.text === '其他' || item.value === '其他');
selectedReason.value = otherIndex !== -1 ? otherIndex : 0;
const otherItem = filteredReasonOptions.value.find(item => item.text === '其他' || item.value === '其他');
selectedReason.value = otherItem ? otherItem.originalIndex : (filteredReasonOptions.value[0]?.originalIndex ?? 0);
}
nextTick(() => {
loadEnterprises();
@ -473,11 +479,11 @@ const toSign = () => {
onMounted(() => {
loadDict('no-scan-reason', (columns) => {
reasonOptions.value = columns;
const otherIndex = columns.findIndex(item => item.text === '其他' || item.value === '其他');
if (otherIndex !== -1) {
selectedReason.value = otherIndex;
} else if (columns.length > 0) {
selectedReason.value = 0;
const otherItem = filteredReasonOptions.value.find(item => item.text === '其他' || item.value === '其他');
if (otherItem) {
selectedReason.value = otherItem.originalIndex;
} else if (filteredReasonOptions.value.length > 0) {
selectedReason.value = filteredReasonOptions.value[0].originalIndex;
}
});
});

Loading…
Cancel
Save