diff --git a/src/api/enterprise.js b/src/api/enterprise.js index 4cff3db..670c0ab 100644 --- a/src/api/enterprise.js +++ b/src/api/enterprise.js @@ -11,6 +11,9 @@ export const queryRegistrationList = (params, success, error) => _get("/app/code //查询企业执法登记列表 - 剔除执法日期距离今天超过5天的执法记录 export const queryRegistrationList2 = (params, success, error) => _get("/app/code/registration/queryList2",params,success,error) +//查询执法日期距离今天至5日内的的执法记录 +export const queryListWithFiveDay = (params, success, error) => _get("/app/code/registration/queryListWithFiveDay",params,success,error) + //保存在线投诉 export const addEnterpriseComplaint = (params, success, error) => _post("/app/code/complaint/add",params,success,error) // 查询 diff --git a/src/router/home.js b/src/router/home.js index 309bd9a..158eb03 100644 --- a/src/router/home.js +++ b/src/router/home.js @@ -125,6 +125,24 @@ const routes = [ name: "evaluate", component: () => import("@/views/enterprise/enterpriseEvaluate/evaluate.vue"), }, +// 投诉页面 +{ + path: "/compaintBase", + name: "compaintBase", + component: () => import("@/views/enterprise/compaint/compaintBase.vue"), +}, +// 投诉详情页面 +{ + path: "/compaintDetailIndex", + name: "compaintDetailIndex", + component: () => import("@/views/enterprise/compaint/compaintDetailIndex.vue"), +}, +//五个自然日的执法事项列表 +{ + path: "/registrationListView", + name: "registrationListView", + component: () => import("@/views/enterprise/compaint/registrationListView.vue"), +}, ]; export { routes }; diff --git a/src/views/Home.vue b/src/views/Home.vue index a2d05e2..9d5ab6e 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -109,7 +109,7 @@ } const toComplaintView = async () => { router.push({ - path: "/enterprise/complaint", + path: "/compaintBase", query: { isSelect: true } diff --git a/src/views/enterprise/caseFilter.vue b/src/views/enterprise/caseFilter.vue index 72a4f32..2592fde 100644 --- a/src/views/enterprise/caseFilter.vue +++ b/src/views/enterprise/caseFilter.vue @@ -31,20 +31,21 @@ + + v-model="searchParam.lawEnforcementItemText"/> + @@ -101,7 +102,7 @@
执法事项:{{ item.lawEnforcementItemText }}
-
执法部门:{{ item.lawEnforcement }}
+
执法部门:{{ item.bureauDeptName }}
执法人员:{{ item.lawEnforcer }} ,{{ item.lawEnforcerTwo }}
执法时间:{{ item.createTime }}
@@ -146,6 +147,8 @@ lawEnforcementItemText: ref(""), beginTime: ref(), endTime: ref(), + //执法部门-局级 + bureauDeptName:"", }, showPicker: false, @@ -154,9 +157,9 @@ beginTime: ref(), endTime: ref(), currentDate: ref(['2024', '01']), - minDate: new Date(2020, 0, 1), + minDate: new Date(2024, 0, 1), maxDate: new Date(2125, 5, 1), - columnsType: ['year', 'month'], + columnsType: ['year', 'month',"day"], showBeginDatePicker: false, showEndDatePicker: false, }, @@ -223,8 +226,8 @@ value.selectedValues.forEach((item, index) => { console.log(item); }); - this.date.beginTime = value.selectedValues[0] + "/" + value.selectedValues[1] - this.searchParam.beginTime = value.selectedValues[0] + "-" + value.selectedValues[1]; + this.date.beginTime = value.selectedValues[0] + "/" + value.selectedValues[1] + "/" + value.selectedValues[2] + this.searchParam.beginTime = value.selectedValues[0] + "-" + value.selectedValues[1]+ "-" + value.selectedValues[2]; this.date.showBeginDatePicker = false; }, onEndDateConfirm(value) { @@ -232,8 +235,8 @@ value.selectedValues.forEach((item, index) => { console.log(item); }); - this.date.endTime = value.selectedValues[0] + "/" + value.selectedValues[1] - this.searchParam.endTime = value.selectedValues[0] + "-" + value.selectedValues[1]; + this.date.endTime = value.selectedValues[0] + "/" + value.selectedValues[1] + "/" + value.selectedValues[2] + this.searchParam.endTime = value.selectedValues[0] + "-" + value.selectedValues[1] + "-" + value.selectedValues[2]; ; this.date.showEndDatePicker = false; }, diff --git a/src/views/enterprise/compaint/compaintBase.vue b/src/views/enterprise/compaint/compaintBase.vue new file mode 100644 index 0000000..f1b5d41 --- /dev/null +++ b/src/views/enterprise/compaint/compaintBase.vue @@ -0,0 +1,195 @@ + + + + + \ No newline at end of file diff --git a/src/views/enterprise/compaint/compaintDetailIndex.vue b/src/views/enterprise/compaint/compaintDetailIndex.vue new file mode 100644 index 0000000..6788828 --- /dev/null +++ b/src/views/enterprise/compaint/compaintDetailIndex.vue @@ -0,0 +1,204 @@ + + + + + \ No newline at end of file diff --git a/src/views/enterprise/compaint/registrationListView.vue b/src/views/enterprise/compaint/registrationListView.vue new file mode 100644 index 0000000..8e1dbae --- /dev/null +++ b/src/views/enterprise/compaint/registrationListView.vue @@ -0,0 +1,599 @@ + + + + + diff --git a/src/views/enterprise/complaint.vue b/src/views/enterprise/complaint.vue index f9f0ebe..262966d 100644 --- a/src/views/enterprise/complaint.vue +++ b/src/views/enterprise/complaint.vue @@ -86,7 +86,7 @@
- 入企不扫码投诉 + diff --git a/src/views/enterprise/complaintDetailView.vue b/src/views/enterprise/complaintDetailView.vue index 170a920..c3c8613 100644 --- a/src/views/enterprise/complaintDetailView.vue +++ b/src/views/enterprise/complaintDetailView.vue @@ -11,7 +11,6 @@ placeholder="请选择" readonly clickable - is-link /> @@ -20,7 +19,6 @@ label="投诉类型" readonly clickable - is-link /> { @@ -244,6 +248,7 @@ return true; } onMounted(() => { + console.log(props.id); submitData.relId = route?.query?.id; submitData.lawEnforcementIncidentText = route?.query?.lawEnforcementItemText; data.isSelect = route?.query?.isSelect; diff --git a/src/views/enterprise/complaintList.vue b/src/views/enterprise/complaintList.vue index b23a8bf..1fe4646 100644 --- a/src/views/enterprise/complaintList.vue +++ b/src/views/enterprise/complaintList.vue @@ -1,644 +1,648 @@ diff --git a/src/views/enterprise/complaintNoScan.vue b/src/views/enterprise/complaintNoScan.vue index 9674b67..6003757 100644 --- a/src/views/enterprise/complaintNoScan.vue +++ b/src/views/enterprise/complaintNoScan.vue @@ -30,6 +30,8 @@ label="投诉类型" placeholder="请选择" readonly + required + :rules="[{ required: true, message: '请选择投诉事项' }]" /> + + + + @@ -132,8 +151,9 @@ columns: [], selectTypeValue: ref[0], isSelect: false, - isCheckedon: false, - isCheckedoff: true + isCheckedon: false, + isCheckedoff: true, + showTimePicker:false }); //保存参数 const submitData = reactive({ @@ -162,6 +182,8 @@ fileList: [], //vant组件上传照片列表 fileListObj: [], + //投诉时间 + complaintTime:"", }) diff --git a/src/views/enterprise/enterpriseInspectionNotice.vue b/src/views/enterprise/enterpriseInspectionNotice.vue index f5f958b..eaa2317 100644 --- a/src/views/enterprise/enterpriseInspectionNotice.vue +++ b/src/views/enterprise/enterpriseInspectionNotice.vue @@ -21,7 +21,7 @@ - +
@@ -62,10 +62,11 @@ ], }); - const check = (index) => { - console.log("点击切换tab", index); + const check = (e) => { + console.log("点击切换tab",e); data.TabId = index; }; + const onClickTab = ({ title }) => console.log(title); onMounted(() => {