From 48a61b6173924e6d750c257257c74c57fae8b0ea Mon Sep 17 00:00:00 2001 From: "wangmingyong@163.com" Date: Tue, 13 Oct 2026 17:26:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/nos/index.js | 3 + .../src/views/enforcement/nos/nosDetail.vue | 32 +- .../vite-env/.env.enforcement-dev-wmy | 4 +- .../src/components/enterprise/footerNav.vue | 2 +- .../router/enterprise-app/ent-main-router.js | 7 + .../enforcementRegistrationList.vue | 54 +++ .../src/views/enterprise/law/lawQuery.vue | 368 ++++++++---------- .../vite-env/.env.enterprise-dev-wmy | 3 +- 8 files changed, 252 insertions(+), 221 deletions(-) diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/nos/index.js b/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/nos/index.js index cf4ca5f5..f8aca221 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/nos/index.js +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/nos/index.js @@ -15,6 +15,9 @@ export const nosListPageApi = (params, success, error) => _post("/app-enf/nos-la export const nosInfoApi = (params, success, error) => _get("/app-enf/nos-law-enforcement-task/detail", params, success, error); // 审核非现场执法任务 export const nosApproveApi = (params, success, error) => _post("/app-enf/nos-law-enforcement-task/approve", params, success, error); + +// 核实案件（待核实状态） +export const nosVerifyCaseApi = (params, success, error) => _post("/app-enf/nos-law-enforcement-task/verify-case", params, success, error); // 查询非现场执法项目任务类别 export const nosTypeApi = (params, success, error) => _post("/app-enf/nos-law-enforcement-task/type", params, success, error); //查询非现场执法项目任务来源列表 diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/nos/nosDetail.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/nos/nosDetail.vue index fbcafbe7..04350515 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/nos/nosDetail.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/nos/nosDetail.vue @@ -39,10 +39,14 @@ -
- 云笔录 - 取消 - 提交 +
+ + 核实
@@ -52,7 +56,7 @@ import { showConfirmDialog, showSuccessToast, showToast } from 'vant' import NosDetailTaskTab from './components/NosDetailTaskTab.vue' import NosDetailMaterialsTab from './components/NosDetailMaterialsTab.vue' -import { nosInfoApi, nosApproveApi, cloudRecordStartApi } from '@/api/nos/index' +import { nosInfoApi, nosApproveApi, cloudRecordStartApi, nosVerifyCaseApi } from '@/api/nos/index' import { toFullFileUrl } from '@/util/fileUrl' const router = useRouter() @@ -73,6 +77,7 @@ const taskTabTitle = computed(() => TAB_TASK_TITLE_MAP[route.query.tab] || '行 const taskDetail = ref({}) const taskItemList = ref([]) const evaluateData = ref(null) +const showVerifyBtn = ref(false) const inspectResult = ref({ checkResult: '', @@ -143,6 +148,20 @@ const fetchTaskDetail = async () => { const res = await nosInfoApi({ taskId }) if (res && res.code === 200 && res.data) { applyDetailData(res.data) + // 待核实状态下，调用 verify-case 接口判断是否显示核实按钮 + if (Number(res.data.taskStatus) === 6) { + try { + const verifyRes = await nosVerifyCaseApi({ taskId }) + if (verifyRes && verifyRes.code === 200) { + showVerifyBtn.value = true + } else { + showVerifyBtn.value = false + } + } catch (verifyErr) { + console.error('verify-case error:', verifyErr) + showVerifyBtn.value = false + } + } } } catch (err) { console.error(err) @@ -341,6 +360,7 @@ const onSubmit = async () => { .detail-footer { flex-shrink: 0; display: flex; + flex-direction: column; gap: 12px; padding: 12px 16px; background: #fff; @@ -348,7 +368,7 @@ const onSubmit = async () => { .btn-cancel, .btn-submit { - flex: 1; + width: 100%; height: 44px; border-radius: 22px; font-size: 16px; diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev-wmy b/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev-wmy index a7ca76a5..3c6c9505 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev-wmy +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev-wmy @@ -5,8 +5,8 @@ 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.93:8080' -# VITE_PROXY_TARGET = 'http://172.16.20.72:8080' +# VITE_PROXY_TARGET = 'http://172.16.21.93:8080' +VITE_PROXY_TARGET = 'http://172.16.20.72:8080' VITE_DEFAULT_LOGIN = '/enforcement/loginByPassword' VITE_APP_ENV = 'dev' VITE_FILE_URL = '' diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/components/enterprise/footerNav.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/components/enterprise/footerNav.vue index 562c5152..0dec6de8 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/components/enterprise/footerNav.vue +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/components/enterprise/footerNav.vue @@ -7,7 +7,7 @@ - + 法律查询 diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/router/enterprise-app/ent-main-router.js b/zdxt-web-client/zdxt-efcode-enterprise-app/src/router/enterprise-app/ent-main-router.js index 771a3e23..b4520ca2 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/router/enterprise-app/ent-main-router.js +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/router/enterprise-app/ent-main-router.js @@ -93,6 +93,13 @@ const routes = [ meta: { title: "法律查询" }, component: () => import("@/views/enterprise/law/lawQuery.vue"), }, + // 法律详情 + { + path: "/enterprise/lawDetail", + name: "lawDetail", + meta: { title: "法律详情" }, + component: () => import("@/views/enterprise/law/lawDetail.vue"), + }, // 普法服务列表 { path: "/enterprise/lawServiceList", diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue index 336d680e..6a0e3c9d 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue @@ -2,6 +2,18 @@
+ + + + + +
@@ -66,6 +78,9 @@ const router = useRouter(); const searchFilterBarRef = ref(null); +// ========== Tab 切换：1=行政，2=非行政 ========== +const activeTab = ref('1'); + // ========== 列表状态 ========== const list = ref([]); const loading = ref(false); @@ -116,6 +131,7 @@ const fetchList = () => { const params = { pageNum: pageNum.value, pageSize: pageSize.value, + lawType: activeTab.value, // enterpriseNumber: useCommon.enterpriseNumber, }; if (searchText.value) { @@ -181,6 +197,15 @@ const onLoad = () => { fetchList(); }; +// ========== Tab 切换 ========== +const onTabChange = () => { + pageNum.value = 1; + list.value = []; + finished.value = false; + loading.value = true; + fetchList(); +}; + // ========== 下拉刷新 ========== const onRefresh = () => { pageNum.value = 1; @@ -230,6 +255,35 @@ const toEvaluate = (id, checkItem) => { height: 100%; background-color: #fbfdff; + .reg-tabs { + flex-shrink: 0; + + :deep(.van-tabs__wrap) { + background: #fff; + border-radius: 12px 12px 0 0; + border-top-left-radius: 12px; + border-top-right-radius: 12px; + } + + :deep(.van-tab) { + font-size: 15px; + color: #999; + width: 100%; + } + + :deep(.van-tab--active) { + font-weight: 600; + color: #333; + } + + :deep(.van-tabs__line) { + background: #2b7de9; + width: 40%; + height: 2px; + border-radius: 2px; + } + } + .list-container { flex: 1; overflow-y: auto; diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/law/lawQuery.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/law/lawQuery.vue index e0dd85c0..ee3ccb52 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/law/lawQuery.vue +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/law/lawQuery.vue @@ -1,8 +1,8 @@