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 1/4] =?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 }}
+
+
{{ null==item.fileObject?'':item.fileObject.fileName }}
@@ -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); From d014cf2e0527486f3a244be0e605189934bc4f6b Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Tue, 4 Jun 2024 18:15:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=81=9A=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enforce/enforcementPlanAdd.vue | 18 ++---------------- src/views/enterprise/complaint.vue | 22 +++++++++++++++++++++- src/views/enterprise/complaintNoScan.vue | 16 +++++++++++++++- 3 files changed, 38 insertions(+), 18 deletions(-) diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue index 111250c..a7fd82c 100644 --- a/src/views/enforce/enforcementPlanAdd.vue +++ b/src/views/enforce/enforcementPlanAdd.vue @@ -11,7 +11,7 @@
- + - 提交 + 提交
@@ -158,20 +158,6 @@ router.go(-1); }; - const submit123 = () => { - addEnforcementInspectionProgram(submitData, success => { - console.log(success) - //跳转企业二维码地址 - if (success.success) { - console.log("保存成功"); - showSuccessToast('保存成功'); - goBack(); - } - }, error => { - console.log("保存失败") - }) - } - const submit = () => { showConfirmDialog({ title: '公布执法计划', diff --git a/src/views/enterprise/complaint.vue b/src/views/enterprise/complaint.vue index 983ea54..d25e0a4 100644 --- a/src/views/enterprise/complaint.vue +++ b/src/views/enterprise/complaint.vue @@ -12,6 +12,7 @@
入企不扫码投诉 + @@ -63,6 +68,8 @@ type="textarea" maxlength="300" placeholder="请输入" + required + :rules="[{ required: true, message: '请输入诉求内容' }]" show-word-limit /> @@ -92,6 +99,8 @@ label="涉事地址" type="textarea" placeholder="请填写详细地址" + required + :rules="[{ required: true, message: '请填写详细地址' }]" show-word-limit /> @@ -100,11 +109,15 @@ v-model="submitData.linkman" label="联系人" placeholder="必填 联系人" + required + :rules="[{ required: true, message: '请填写联系人' }]" />
是否授权 @@ -113,8 +126,10 @@
- + + 提交 +
@@ -176,6 +191,11 @@ router.go(-1); }; + const validator = (val) => /^1[34578]\d{9}$/.test(val); + + const onFailed = (errorInfo) => { + console.log('failed', errorInfo); + }; const submit = () => { // console.log(submitData); diff --git a/src/views/enterprise/complaintNoScan.vue b/src/views/enterprise/complaintNoScan.vue index 8b18ab0..40fadc8 100644 --- a/src/views/enterprise/complaintNoScan.vue +++ b/src/views/enterprise/complaintNoScan.vue @@ -11,6 +11,7 @@
+ + 提交 +
@@ -144,6 +153,11 @@ const goBack = () => { router.go(-1); }; +const validator = (val) => /^1[34578]\d{9}$/.test(val); + +const onFailed = (errorInfo) => { + console.log('failed', errorInfo); +}; const submit = () =>{ // console.log(submitData); From 174537fb7eadd308d0c9c81636a8a43833ce0195 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Tue, 4 Jun 2024 18:47:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=8D=A2=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/env.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/env.js b/src/config/env.js index bfe2987..d2e3a64 100644 --- a/src/config/env.js +++ b/src/config/env.js @@ -1,6 +1,7 @@ //本地环境 // let baseUrl="http://139.186.135.156:86"; -let baseUrl="http://10.132.108.3:85"; +// let baseUrl="http://10.132.108.3:85"; +let baseUrl="http://jdm.szssfj.cn/jdmApi"; // let baseUrl="http://127.0.0.1:85"; // let wsUrl='ws://10.76.108.1:9326'; export { From d7375f4bf984d1193c7e5f0cfcbd02485984c6a9 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Wed, 5 Jun 2024 11:03:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=BE=85=E5=8A=A9=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/user.js | 1 + src/views/HomeWx.vue | 325 ++++++++++++++++++++++ src/views/enforce/assistUserFilter.vue | 244 ++++++++++++++++ src/views/enforce/sign.vue | 3 +- src/views/enterprise/registrationEdit.vue | 3 +- 5 files changed, 574 insertions(+), 2 deletions(-) create mode 100644 src/views/HomeWx.vue create mode 100644 src/views/enforce/assistUserFilter.vue diff --git a/src/api/user.js b/src/api/user.js index 8ad34eb..174645c 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -2,3 +2,4 @@ import { _get, _post,_form,_delete } from "../http/index"; //查询用户列表 export const queryUsers = (params, success, error) => _get("/app/listApp",params,success,error) +export const queryAUsers = (params, success, error) => _get("/app/listAApp",params,success,error) diff --git a/src/views/HomeWx.vue b/src/views/HomeWx.vue new file mode 100644 index 0000000..cbd9a73 --- /dev/null +++ b/src/views/HomeWx.vue @@ -0,0 +1,325 @@ + + + + + diff --git a/src/views/enforce/assistUserFilter.vue b/src/views/enforce/assistUserFilter.vue new file mode 100644 index 0000000..6a291f0 --- /dev/null +++ b/src/views/enforce/assistUserFilter.vue @@ -0,0 +1,244 @@ + + + + + \ No newline at end of file diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index cc2fb36..026f23a 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -150,7 +150,7 @@ - + @@ -182,6 +182,7 @@ import {uploadFile} from "../../util/fileUpload"; import {formattedTime} from "@/util/util"; //用户筛选弹窗 import Popup from './userFilter.vue'; +import PopupA from './assistUserFilter.vue'; import {getDict} from "../../api/Home"; import { queryLinkage, queryLinkageDictByValueAndParentId } from "../../api/linkage"; import {addEnterpriseLawEnforcement, getByUserIdAndZero} from "../../api/administrative"; diff --git a/src/views/enterprise/registrationEdit.vue b/src/views/enterprise/registrationEdit.vue index 2c02650..c678d6a 100644 --- a/src/views/enterprise/registrationEdit.vue +++ b/src/views/enterprise/registrationEdit.vue @@ -134,7 +134,7 @@ - + @@ -166,6 +166,7 @@ import {formattedTime} from "@/util/util"; //用户筛选弹窗 import Popup from '../enforce/userFilter.vue'; + import PopupA from '../enforce/assistUserFilter.vue'; import {getDict} from "../../api/Home"; import { queryLinkage, queryLinkageDictByValueAndParentId } from "../../api/linkage"; import {addEnterpriseLawEnforcement, getByUserIdAndZero} from "../../api/administrative";