zhuibobo
/
EnforcementCode-2.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

登记数据提交是checkCss带上对应的字典值

dev-V1.0.5
wangmingyong@163.com 6 days ago
parent
ff93662b75
commit
cb75380069
7 changed files with 43 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js
  2. 2
      zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnforcementInfoSection.vue
  3. 2
      zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/NonEnforcementInfoSection.vue
  4. 9
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementList.vue
  5. 35
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue
  6. 4
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/scanEntQRCode.vue
  7. 4
      zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev-wmy

3
zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js
View File

@ -68,6 +68,9 @@ export const submitEnfRegistration = (params, success, error) => _post(baseUrl +
// 历史活动列表
export const queryNonRegistrationList = (params, success, error) => _get(baseUrl + "/nonRegistration/queryList", params, success, error);
// 非行政执法登记列表
export const queryNonRegistrationPageList = (params, success, error) => _get(baseUrl + "/nonRegistration/list", params, success, error);
// 历史活动详情
export const queryNonRegistrationDetail = (params, success, error) => _get(baseUrl + "/nonRegistration/queryById", params, success, error);

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

@ -362,6 +362,8 @@ const enforcementTimeDisplay = computed(() => {
const selectReason = ({ selectedOptions }) => {
props.formData.reason = selectedOptions[0]?.text || '';
const selectedValue = selectedOptions[0]?.value || '';
// checkCss 存储原因选择器的 value 值（扫码模式无选择时为空）
props.formData.checkCss = selectedValue;
if (selectedValue !== '其他' && selectedOptions[0]?.text !== '其他') {
props.formData.otherReasons = '';
}

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

@ -134,6 +134,8 @@ const selectMatter = ({ selectedOptions }) => {
const selectReason = ({ selectedOptions }) => {
props.formData.reason = selectedOptions[0]?.text || '';
const selectedValue = selectedOptions[0]?.value || '';
// checkCss 存储原因选择器的 value 值（扫码模式无选择时为空）
props.formData.checkCss = selectedValue;
if (selectedValue !== '其他' && selectedOptions[0]?.text !== '其他') {
props.formData.otherReasons = '';
}

9
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementList.vue
View File

@ -57,14 +57,15 @@
<script setup name="enforcementRegistrationList">
import { ref, onMounted } from 'vue';
import { useRouter } from 'vue-router';
import { useRouter, useRoute } from 'vue-router';
import { showToast } from 'vant';
import 'vant/es/toast/style';
import { queryEnforcementRegistrationPageList } from '@/api/enforcement';
import { queryEnforcementRegistrationPageList, queryNonRegistrationPageList } from '@/api/enforcement';
import { formatEnforcer, parseEnforcer, formatTime } from '@/util/util';
import SearchFilterBar from '@/components/common/SearchFilterBar.vue';
const router = useRouter();
const route = useRoute();
// ========== 列表状态 ==========
const list = ref([]);
@ -209,6 +210,10 @@ const toEdit = (id) => {
};
onMounted(() => {
// 根据 URL 参数预选 tab
// if (route.query.tab === 'non-enforcement') {
// activeTab.value = 'non-enforcement';
// }
fetchList();
});
</script>

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

@ -439,7 +439,7 @@ const getCurrentDateTime = () => {
userId: useCommon.userId || '',
reason: formData.reason || '',
otherReasons: formData.otherReasons || '',
checkCss: formData.checkCss || '0',
checkCss: formData.checkCss || '',
noticeId: formData.noticeId || '',
};
}
@ -528,7 +528,10 @@ const handleSave = () => {
sessionStorage.removeItem('enterpriseScanData');
sessionStorage.removeItem('outOfCityEnterprise');
sessionStorage.removeItem('scanReason');
router.replace('/enforcement/enforcementList');
sessionStorage.removeItem('scanReasonValue');
// 先 replace 到首页清除中间页面，再 push 到列表页，确保列表页回退到首页
router.replace('/enforcement/enforcementHome');
router.push('/enforcement/enforcementList');
} else {
showToast(res.msg || '保存失败');
}
@ -590,19 +593,20 @@ const onSubmit = () => {
sessionStorage.removeItem('enterpriseScanData');
sessionStorage.removeItem('outOfCityEnterprise');
if (isNonEnforcement.value) {
// 非行政执法模式跳转到历史活动页面
router.replace({
path: '/enforcement/enterpriseScanPreview',
query: {
type: 'non-enforcement',
enterpriseNumber: enterpriseData.value.enterpriseNumber,
tab: '1',
isManualSearch:'true'
}
sessionStorage.removeItem('scanReason');
sessionStorage.removeItem('scanReasonValue');
// 先 replace 到首页清除中间页面，再 push 到列表页（默认选中非行政执法 tab），确保回退到首页
router.replace('/enforcement/enforcementHome');
router.push({
path: '/enforcement/enforcementList',
query: { tab: 'non-enforcement' }
});
} else {
sessionStorage.removeItem('scanReason');
router.replace('/enforcement/enforcementList');
sessionStorage.removeItem('scanReasonValue');
// 先 replace 到首页清除中间页面，再 push 到列表页，确保列表页回退到首页
router.replace('/enforcement/enforcementHome');
router.push('/enforcement/enforcementList');
}
} else {
showToast(res.msg || '提交失败');
@ -639,6 +643,9 @@ const handleSubmitAndTransfer = () => {
sessionStorage.removeItem('enterpriseScanData');
sessionStorage.removeItem('outOfCityEnterprise');
sessionStorage.removeItem('scanReason');
sessionStorage.removeItem('scanReasonValue');
// 先 replace 到首页清除中间页面，再 push 到列表页，确保列表页回退到首页
router.replace('/enforcement/enforcementHome');
router.push('/enforcement/enforcementList');
} else {
showToast(res.msg || '提交失败');
@ -806,14 +813,18 @@ onMounted(() => {
if (isSignMode.value) {
// 补录模式：默认值为"补录"，不可选择
formData.reason = '补录';
formData.checkCss = '9';
} else if (isScanMode.value) {
// 扫码登记模式：原因为空，不可选择
formData.reason = '';
formData.checkCss = '';
} else {
// 手动搜索企业：读取选择的原因作为初始值，可选择
const savedReason = sessionStorage.getItem('scanReason');
const savedReasonValue = sessionStorage.getItem('scanReasonValue');
if (savedReason) {
formData.reason = savedReason;
formData.checkCss = savedReasonValue || '';
}
}

4
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/scanEntQRCode.vue
View File

@ -472,7 +472,9 @@ const selectEnterprise = (item) => {
console.log('选中企业:', item);
// 保存无法扫码原因到 sessionStorage
const selectedReasonText = reasonOptions.value[selectedReason.value]?.text || '';
const selectedReasonValue = reasonOptions.value[selectedReason.value]?.value || '';
sessionStorage.setItem('scanReason', selectedReasonText);
sessionStorage.setItem('scanReasonValue', selectedReasonValue);
showSearchModal.value = false;
router.push({
path: '/enforcement/enterpriseScanPreview',
@ -487,7 +489,9 @@ const selectEnterprise = (item) => {
// 市外注册企业信息录入
const handleOutOfCityEnterprise = () => {
const selectedReasonText = reasonOptions.value[selectedReason.value]?.text || '';
const selectedReasonValue = reasonOptions.value[selectedReason.value]?.value || '';
sessionStorage.setItem('scanReason', selectedReasonText);
sessionStorage.setItem('scanReasonValue', selectedReasonValue);
showSearchModal.value = false;
router.push({
path: '/enforcement/outOfCityEnterprise',

4
zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev-wmy
View File

@ -4,9 +4,9 @@ VITE_BASE_URL = '/efcode20-enf-app/api'
VITE_CONTEXT_PATH = '/efcode20-enf-app/'
# VITE_PROXY_TARGET = 'http://139.186.148.21:8080'
# VITE_API_URL = 'http://192.168.1.17:8080'
# VITE_PROXY_TARGET = 'http://172.16.21.213:8080'
VITE_PROXY_TARGET = 'http://172.16.21.213:8080'
# VITE_PROXY_TARGET = 'http://172.16.21.93:8080'
VITE_PROXY_TARGET = 'http://172.16.20.72:8080'
# VITE_PROXY_TARGET = 'http://172.16.20.72:8080'
VITE_DEFAULT_LOGIN = '/enforcement/loginByPassword'
VITE_APP_ENV = 'dev'
VITE_FILE_URL = ''

Write Preview
Loading…
Cancel
Save