From 04a2ba0676cfc9dc25abbf46bf6b874f4e48e305 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Wed, 27 Mar 2024 13:14:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/user.js | 4 + src/views/administrative/appointment.vue | 2 +- src/views/administrative/appointmentList.vue | 14 +- src/views/enforce/earlyWarning.vue | 8 +- src/views/enforce/sign.vue | 288 ++++++++++++------- src/views/enforce/userFilter.vue | 236 +++++++++++++++ 6 files changed, 434 insertions(+), 118 deletions(-) create mode 100644 src/api/user.js create mode 100644 src/views/enforce/userFilter.vue diff --git a/src/api/user.js b/src/api/user.js new file mode 100644 index 0000000..72b8078 --- /dev/null +++ b/src/api/user.js @@ -0,0 +1,4 @@ +import { _get, _post,_form,_delete } from "../http/index"; + +//查询用户列表 +export const queryUsers = (params, success, error) => _post("/system/user/listApp",params,success,error) diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue index 8876c25..bf9c18a 100644 --- a/src/views/administrative/appointment.vue +++ b/src/views/administrative/appointment.vue @@ -104,7 +104,7 @@ import {addEnterpriseLawEnforcement} from '../../api/administrative' import {queryUserInfo} from '../../api/enforce' import { reactive, ref } from "vue"; import {uploadFile} from "../../util/fileUpload"; -const { useMy } = $globalStore +const { useMy, useCommon, useShopCard } = $globalStore; const router = useRouter(); let queryaddressId = ref(""); diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue index 841db79..7241d20 100644 --- a/src/views/administrative/appointmentList.vue +++ b/src/views/administrative/appointmentList.vue @@ -3,7 +3,7 @@
- +
diff --git a/src/views/enforce/earlyWarning.vue b/src/views/enforce/earlyWarning.vue index 98ba98b..5447988 100644 --- a/src/views/enforce/earlyWarning.vue +++ b/src/views/enforce/earlyWarning.vue @@ -3,7 +3,7 @@
- +
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index 39c2a9a..47cbe98 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -5,93 +5,95 @@
-
+
-
执法信息
- - - - - - - - - - + +
执法信息
+ + + + + + + + + + -
-
-
相关附件 (不多于9份)
-
-
- - - + -
+
+
+ (不多于9张) +
+ + + +
+ + + -
-
企业信息
+
企业信息
 -
-
提交 -
- - - - - - - + +
@@ -132,6 +125,9 @@ import {addEnforcementRegistration,queryUserInfo} from '../../api/enforce' import {getEnterpriseInformation} from '../../api/enterprise' import { reactive, ref } from "vue"; import {uploadFile} from "../../util/fileUpload"; +//用户筛选弹窗 +import Popup from './userFilter.vue'; + const { useMy } = $globalStore const router = useRouter(); @@ -140,8 +136,14 @@ const route = useRoute(); let queryaddressId = ref(""); const data = reactive({ showLawEnforcerFlag:false, + currentPage: 1, good:"#7FFFD4", bad:"#D3D3D3", + + popupVisible: false, + popupContent: '', + popupVisible2: false, + popupContent2: '', }); //保存参数 const submitData = reactive({ @@ -189,18 +191,22 @@ const tapBad = () => { onMounted(() =>{ //查询企业信息 getEnterpriseInformation(route?.query?.enterpriseNumber,success =>{ - console.log(success.data) - submitData.enterpriseName = success.data.enterpriseName - submitData.enterpriseNumber = success.data.enterpriseNumber + console.log(success.data) + if (null != success.data) { + submitData.enterpriseName = success.data.enterpriseName + submitData.enterpriseNumber = success.data.enterpriseNumber + } },error=>{ }) - //查询企业信息 + //查询执法部门信息 queryUserInfo({},success =>{ - console.log(success.data) - submitData.lawEnforcer = success.data.userName - submitData.lawEnforcement = success.data.dept.deptName; - submitData.lawEnforcementId = success.data.dept.deptId; + if (null != success.data) { + submitData.lawEnforcer = success.data.userName + submitData.lawEnforcerId = success.data.userId + submitData.lawEnforcement = success.data.dept.deptName; + submitData.lawEnforcementId = success.data.dept.deptId; + } },error=>{ }) @@ -240,26 +246,56 @@ const deleteFile = (file,index) =>{ const submit = () =>{ addEnforcementRegistration(submitData,success =>{ - console.log(success) - //跳转企业二维码地址 + //跳转首页 if(success.success){ - console.log("登记成功"); + showSuccessToast('登记成功'); + router.push({ path: "/home" }); } },error=>{ console.log("登记失败") }) } +const showPopup = () =>{ + data.popupVisible = true; +} +const showPopup2 = () =>{ + data.popupVisible2 = true; +} +const closePopup = () =>{ + data.popupVisible = false; + data.popupVisible2 = false; +} +const reciveData = (item) =>{ + submitData.lawEnforcerTwo = item.userName; + submitData.lawEnforcerIdTwo = item.userId; +} +const reciveData2 = (item) =>{ + submitData.subsidiaryer = item.userName; + submitData.subsidiaryerId = item.userId; +} + diff --git a/src/views/enforce/userFilter.vue b/src/views/enforce/userFilter.vue new file mode 100644 index 0000000..81256c3 --- /dev/null +++ b/src/views/enforce/userFilter.vue @@ -0,0 +1,236 @@ + + + + + \ No newline at end of file