From 79252ba5841a2b0fb2e55e6fcde142cf890e3156 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Tue, 4 Jun 2024 17:40:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AFbug=E6=B8=85=E4=B8=80?= =?UTF-8?q?=E9=81=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enforce/earlyWarning.vue | 1 + src/views/enforce/enforceNotice.vue | 14 +- src/views/enforce/enforcementPlanAdd.vue | 710 ++++++++++++----------- src/views/enforce/historyCheck.vue | 1 + src/views/enforce/sign.vue | 4 +- src/views/enterprise/complaint.vue | 3 + src/views/enterprise/complaintNoScan.vue | 5 + src/views/login.vue | 4 +- 8 files changed, 392 insertions(+), 350 deletions(-) diff --git a/src/views/enforce/earlyWarning.vue b/src/views/enforce/earlyWarning.vue index d75c972..9544309 100644 --- a/src/views/enforce/earlyWarning.vue +++ b/src/views/enforce/earlyWarning.vue @@ -99,6 +99,7 @@ let totalPrice = ref(0); // 总钱数 let searchParam = reactive({ + "dataScopeId": useCommon.userId, //执法事件 // lawEnforcementIncident:"", //执法部门 diff --git a/src/views/enforce/enforceNotice.vue b/src/views/enforce/enforceNotice.vue index 8c07d4f..1e51bcf 100644 --- a/src/views/enforce/enforceNotice.vue +++ b/src/views/enforce/enforceNotice.vue @@ -29,8 +29,14 @@
- {{ item.enforcementDepartment }} - {{ item.createTime }} + {{ item.planName }} + + +
+
{{ item.enforcementDepartment }}
+
{{ item.createTime }}
+
+
@@ -231,11 +237,11 @@ const searchComplaint = (val) =>{ const toPdfView = (url) =>{ console.log(url) router.push( - { + { path: "/pdfView", query: { url: url - } + } }); } diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue index 1c54b22..111250c 100644 --- a/src/views/enforce/enforcementPlanAdd.vue +++ b/src/views/enforce/enforcementPlanAdd.vue @@ -1,380 +1,406 @@ diff --git a/src/views/enforce/historyCheck.vue b/src/views/enforce/historyCheck.vue index 6f79bda..09ab9b7 100644 --- a/src/views/enforce/historyCheck.vue +++ b/src/views/enforce/historyCheck.vue @@ -106,6 +106,7 @@ let searchParam = reactive({ userId: useCommon.userId, + "dataScopeId": useCommon.userId, //执法事件 // lawEnforcementIncident:"", //执法部门 diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index 0d25803..cc2fb36 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -112,9 +112,9 @@
- (不多于3张) + (不多于9张)
- + diff --git a/src/views/enterprise/complaint.vue b/src/views/enterprise/complaint.vue index 8b20870..983ea54 100644 --- a/src/views/enterprise/complaint.vue +++ b/src/views/enterprise/complaint.vue @@ -162,6 +162,8 @@ linkman: "", //联系方式 linkmanTel: "", + // 是否授权 + authorization: 1, //后台保存图片列表 fileList: [], //vant组件上传照片列表 @@ -225,6 +227,7 @@ // console.log(data) } const selectCh =(val) => { + submitData.authorization = val; if(val == 0) { data.isCheckedon = false; data.isCheckedoff = true; diff --git a/src/views/enterprise/complaintNoScan.vue b/src/views/enterprise/complaintNoScan.vue index ecadb23..8b18ab0 100644 --- a/src/views/enterprise/complaintNoScan.vue +++ b/src/views/enterprise/complaintNoScan.vue @@ -106,6 +106,8 @@ const data = reactive({ columns: [], selectTypeValue : ref[0], isSelect: false, + isCheckedon: true, + isCheckedoff: false }); //保存参数 const submitData = reactive({ @@ -128,6 +130,8 @@ const submitData = reactive({ linkman:"", //联系方式 linkmanTel:"", + // 是否授权 + authorization: 1, //后台保存图片列表 fileList:[], //vant组件上传照片列表 @@ -193,6 +197,7 @@ const selectType = () =>{ const selectCh =(val) => { + submitData.authorization = val; if(val == 0) { data.isCheckedon = false; data.isCheckedoff = true; diff --git a/src/views/login.vue b/src/views/login.vue index dab66d9..c1afc4c 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -43,8 +43,8 @@ const onSubmit = async (values) => { // return; userLogin(values,success=>{ console.log(success); - router.push({ name: "Home" }); - // router.push({ name: "enforceHome" }); + // router.push({ name: "Home" }); + router.push({ name: "enforceHome" }); //设置全局变量 useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString()); useCommon.SET_USER_ID(success.data.userId);