diff --git a/src/api/enforce.js b/src/api/enforce.js index b733db4..c6545ec 100644 --- a/src/api/enforce.js +++ b/src/api/enforce.js @@ -19,6 +19,22 @@ export const queryEnforcementInspectionProgramList = (params, success, error) = * @returns */ export const queryEnforcementInspectionProgramListNoPermission = (params, success, error) => _get("/app/code/enforcementInspectionProgram/queryListNoPermission", params, success, error); +/** + * 执法计划列表 无权限 不分页接口 + * @param {*} params + * @param {*} success + * @param {*} error + * @returns + */ +export const queryEnforcementInspectionProgramListNoPermissionNoPaging = (params, success, error) => _get("/app/code/enforcementInspectionProgram/queryListNoPermissionNoPaging", params, success, error); +/** + * 执法计划列表 按id查询 + * @param {*} params + * @param {*} success + * @param {*} error + * @returns + */ +export const detail = (id, success, error) => _get("/app/code/enforcementInspectionProgram/detail/"+id, null, success, error); /** * 添加年度执法计划 * @param {*} params @@ -27,10 +43,19 @@ export const queryEnforcementInspectionProgramListNoPermission = (params, succes * @returns */ export const addEnforcementInspectionProgram = (params, success, error) =>_post("/app/code/enforcementInspectionProgram/add", params, success, error) +/** + * 修改年度执法计划 + * @param {*} params + * @param {*} success + * @param {*} error + * @returns + */ +export const editEnforcementInspectionProgram = (params, success, error) =>_post("/app/code/enforcementInspectionProgram/edit", params, success, error) //保存执法信息登记 export const addEnforcementRegistration = (params, success, error) => _post("/app/code/registration/add",params,success,error) export const editEnforcementRegistration = (params, success, error) => _post("/app/code/registration/edit",params,success,error) +export const editEnforcementRegistration2 = (params, success, error) => _post("/app/code/registration/edit2",params,success,error) export const getRegByUserIdAndZero = (userId, success, error) => _get("/app/code/registration/getByUserIdAndZero/"+ userId,null,success,error) export const getByUserIdAndEnterpriseNumber = (modth, userId, enterpriseNumber, success, error) => _get("/app/code/registration/getByUserIdAndEnterpriseNumber/"+ modth +"/"+ userId +"/"+ enterpriseNumber,null,success,error) export const getByIdToDataFillIn = (id, success, error) => _get("/app/code/registration/getByIdToDataFillIn/" + id,null,success,error) @@ -42,6 +67,15 @@ export const queryRegistrationList = (params, success, error) => _get("/app/code // export const queryEarlyWarning = (params, success, error) => _get("/code/registration/queryEarlyWarning",params,success,error) export const queryEarlyWarning = (params, success, error) => _get("/app/code/LawEnforcementWarningList/queryList",params,success,error) +/** + * 查询当前企业本月预警信息列表 + * @param {*} params + * @param {*} success + * @param {*} error + * @returns + */ +export const queryListByEnterpriseNumber = (params, success, error) => _get("/app/code/LawEnforcementWarningList/queryListByEnterpriseNumber",params,success,error) + /** * 查询用户信息 * @param {*} params @@ -59,6 +93,7 @@ export const queryUserInfo = (userId, success, error) => _get("/app/getUserInfo/ * @returns */ export const queryEnforcementRegistrationById = (id, success, error) =>_get("/app/code/registration/queryById/" + id,null,success,error) +export const queryEnforcementRegistrationUniteById = (id, success, error) =>_get("/app/code/registration/queryUniteById/" + id,null,success,error) //查询附件 @@ -86,4 +121,6 @@ export const addQrCode = (num, success, error) => _get("/app/enterpriseInformati * @param {*} error * @returns */ -export const getEnterpriseInfoBySj = (params,success,error) => _get("/app/enterpriseInformation/getEnterpriseInfoBySj",params,success,error) +export const getEnterpriseInfoBySj = (params,success,error) =>_get("/app/enterpriseInformation/getEnterpriseInfoBySj",params,success,error) + + diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue index 116cde1..b09995c 100644 --- a/src/views/administrative/appointmentList.vue +++ b/src/views/administrative/appointmentList.vue @@ -91,7 +91,7 @@
@@ -187,7 +187,8 @@ { text: '季度', value: 'quarter' }, { text: '月度', value: 'month' }, ], - showIsCancel: ref(false) + showIsCancel: ref(false), + currentId: "", }); // 设置初始值为当前时间 @@ -440,15 +441,20 @@ } }); } + const openCancel = (id) =>{ + data.showIsCancel = true; + data.currentId = id; + } const cancel = (val) => { if(val == 0){ data.showIsCancel = false; return; }else{ - console.log("=====> route?.query?.id : ", route?.query?.id) - cancelEnterpriseLawEnforcement(route?.query?.id,success =>{ - router.go(-1); + console.log("=====> route?.query?.id : ", data.currentId) + cancelEnterpriseLawEnforcement(data.currentId,success =>{ + router.go(-1); + data.currentId = ""; }); } }; diff --git a/src/views/enforce/enforcementPlan.vue b/src/views/enforce/enforcementPlan.vue index 408b2d9..c23e6ed 100644 --- a/src/views/enforce/enforcementPlan.vue +++ b/src/views/enforce/enforcementPlan.vue @@ -179,7 +179,7 @@ if(element.quarter == "3") val = "三季度"; if(element.quarter == "4") val = "四季度"; element.planName = element.planYear + "年" + val + element.planName; - }else if (element.timeType == 'mouth') { + }else if (element.timeType == 'month') { const val = element.mouth + "月"; element.planName = element.planYear + "年" + val + element.planName; } diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue index a223f43..99ed82b 100644 --- a/src/views/enforce/enforcementPlanAdd.vue +++ b/src/views/enforce/enforcementPlanAdd.vue @@ -59,6 +59,7 @@ is-link placeholder="请选择年份" required + readonly @click="data.showDatePicker = true" /> @@ -296,10 +297,8 @@ const submit = () => { data.showIsPublish = true; - } const addPlan = (val) =>{ - // submitData.planName = submitData.planName + data.fieldValue +"行政检查计划"; submitData.isPublish = val; addEnforcementInspectionProgram(submitData, success => { console.log(success) @@ -494,6 +493,7 @@ // submitData.planYear = item; data.mouthText = item; nameObj.mouth = item + "月"; + submitData.mouth = item; }); // submitData.establishmentTime = "2023-04-21" data.showMouthPicker = false; diff --git a/src/views/enterprise/enterpriseEvaluate/evaluate.vue b/src/views/enterprise/enterpriseEvaluate/evaluate.vue index 89e289a..8b65a00 100644 --- a/src/views/enterprise/enterpriseEvaluate/evaluate.vue +++ b/src/views/enterprise/enterpriseEvaluate/evaluate.vue @@ -193,7 +193,8 @@ router.push({path:"/enterprise/registrationList"}) } },error =>{ - + console.log("评价失败"); + console.log(error); }) } const uploadFiles = (file) => {