diff --git a/src/api/enterprise.js b/src/api/enterprise.js index 4589ac7..78b2160 100644 --- a/src/api/enterprise.js +++ b/src/api/enterprise.js @@ -46,3 +46,28 @@ export const queryEnterpriseInfoList = (params, success, error) =>_get("/app/ent */ export const queryHistoryQrCodeList = (params, success, error) =>_get("/app/enterpriseInformation/queryHistoryQrCodeList",params, success, error) +/** + * 查询历史检查案件 + * @param {*} params + * @param {*} success + * @param {*} error + * @returns + */ +export const queryXzjcjbxxList = (enterpriseNumber, success, error) =>_get("/code/xzjcjbxx/" +enterpriseNumber, success, error) + +/** + * 查询强制案件 + * @param {*} enterpriseNumber + * @param {*} success + * @param {*} error + * @returns + */ +export const queryQZAJList = (enterpriseNumber, success, error) =>_get("/code/queryQZAJList/" +enterpriseNumber, success, error) +/** + * 查询历史处罚案件 + * @param {*} enterpriseNumber + * @param {*} success + * @param {*} error + * @returns + */ +export const queryCFAJList = (enterpriseNumber, success, error) =>_get("/code/queryCFAJList/" + enterpriseNumber, success, error) diff --git a/src/views/enforce/enforcementPlan.vue b/src/views/enforce/enforcementPlan.vue index c21757d..4b5c5d2 100644 --- a/src/views/enforce/enforcementPlan.vue +++ b/src/views/enforce/enforcementPlan.vue @@ -106,7 +106,7 @@ let searchParam = reactive({ //日期查询 searchDate: ref(''), // 用户id - dataScopeId: useCommon.userId, + dataScopeId: "", // dataScopeId: "1731", }); @@ -126,6 +126,7 @@ onMounted(() => { console.log(useCommon.enterpriseNumber); // getCard(); searchParam.enterpriseNumber = useCommon.enterpriseNumber; + searchParam.dataScopeId = useCommon.userId; console.log(useCommon.enterpriseNumber) queryList(); data.dateSearch = nowDate(new Date()); diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue index d08de2d..ec3fd71 100644 --- a/src/views/enforce/enforcementPlanAdd.vue +++ b/src/views/enforce/enforcementPlanAdd.vue @@ -81,7 +81,7 @@
文件上传 (不多于9张)
- + @@ -120,6 +120,8 @@ const data = reactive({ minDate: new Date(2020, 0, 1), maxDate: new Date(2125, 5, 1), currentDate1: ref(['2024','03','01']), + //vant组件上传照片列表 + fileListObj:[], }); //保存参数 const submitData = reactive({ @@ -143,8 +145,7 @@ const submitData = reactive({ isPublish:0, //后台保存图片列表 fileList:[], - //vant组件上传照片列表 - fileListObj:[], + }) @@ -234,9 +235,9 @@ const uploadFiles = (file) =>{ } const deleteFile = (file,index) =>{ console.log(index); - submitData.fileListObj.filter((item, indexs) => { + data.fileListObj.filter((item, indexs) => { if (index.index == indexs) { - submitData.fileListObj.splice(indexs, 1);//splice 删除 + data.fileListObj.splice(indexs, 1);//splice 删除 } }); submitData.fileList.filter((item, indexs) => { diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue index 8c454e5..4cdef6a 100644 --- a/src/views/enforce/enterpriseBaseInfo.vue +++ b/src/views/enforce/enterpriseBaseInfo.vue @@ -87,20 +87,20 @@
-
+
-
+
-

执法部门: {{ item.lawEnforcement }}

+

案件名称: {{ item.lawEnforcement }}

-

执法人员: {{ item.lawEnforcer }} , {{ item.lawEnforcerTwo }}

+

检查日期: {{ item.lawEnforcer }} , {{ item.lawEnforcerTwo }}

-

备注: {{ item.remark }}

+

检查结果: {{ item.remark }}

@@ -116,13 +116,13 @@

{{ item.lawEnforcementItem }}

-

处罚行政机关: {{ item.lawEnforcement }}

+

处罚方式: {{ item.lawEnforcement }}

处罚种类: {{ item.lawKind }}

-

备注: {{ item.remark }}

+

决定时间: {{ item.remark }}

@@ -139,13 +139,13 @@

{{ item.lawEnforcementItem }}

-

处罚行政: {{ item.lawEnforcement }}

+

强制种类: {{ item.lawEnforcement }}

-

执行时间: {{ item.lawDate }}

+

强制措施: {{ item.lawDate }}

-

备注: {{ item.remark }}

+

批准时间: {{ item.remark }}

@@ -165,8 +165,8 @@ import { showSuccessToast } from 'vant'; import 'vant/es/toast/style'; -import {addEnforcementRegistration,queryUserInfo,queryRegistrationList} from '../../api/enforce' -import {getEnterpriseInformation} from '../../api/enterprise' +import {addEnforcementRegistration,queryUserInfo,queryRegistrationList} from '@/api/enforce' +import {getEnterpriseInformation,queryXzjcjbxxList,queryQZAJList,queryCFAJList} from '@/api/enterprise' import {getDict} from '../../api/Home' import { reactive, ref } from "vue"; import { format } from 'date-fns'; @@ -262,12 +262,33 @@ onMounted(() =>{ }) //查询企业历史检查案件 - data.searchParam.enterpriseNumber = data.enterpriseInfo.enterpriseNumber; - queryRegistrationList(data.searchParam,success =>{ - data.checkDataList = success.data; - },error =>{ + // data.searchParam.enterpriseNumber = data.enterpriseInfo.enterpriseNumber; + // queryRegistrationList(data.searchParam,success =>{ + // data.checkDataList = success.data; + // },error =>{ - }) + // }) + //查询企业历史检查案件 + queryXzjcjbxxList(data.enterpriseInfo.enterpriseNumber,success =>{ + console.log("历史检查案件---",success.data) + data.checkDataList = success.data; + },error =>{ + + }); + //查询历史强制案件 + queryQZAJList(data.enterpriseInfo.enterpriseNumber,success =>{ + console.log("历史强制案件---",success.data) + },error =>{ + + }) + + //查询历史强制案件 + queryCFAJList(data.enterpriseInfo.enterpriseNumber,success =>{ + console.log("历史处罚案件---",success.data) + },error =>{ + + }) + } },error=>{