From e565fd61f1c0d4604ba52f9ee0f2e0169fa7dfb6 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Fri, 12 Apr 2024 15:37:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=99=BB=E8=AE=B0+=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=E9=A2=84=E7=BA=A6:=20=E6=89=A7=E6=B3=95=E4=BE=9D?= =?UTF-8?q?=E6=8D=AE/=E6=A3=80=E6=9F=A5=E8=A6=81=E6=B1=82=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E9=80=89=E6=8B=A9;=20=E6=89=A7=E6=B3=95=E4=BA=BA?= =?UTF-8?q?=E5=91=982/=E8=BE=85=E5=8A=A9=E4=BA=BA=E5=91=98=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9C=AA=E4=B8=8A=E6=95=B0=E6=8D=AE=E5=BA=93bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/administrative/appointment.vue | 59 ++++- src/views/administrative/appointmentList.vue | 22 +- src/views/administrative/userFilter.vue | 236 ++++++++++++++++++ src/views/enforce/sign.vue | 43 +++- src/views/enforce/userFilter.vue | 4 +- .../enterprise/enterpriseInspectionDetail.vue | 15 ++ src/views/enterprise/registrationDetail.vue | 19 +- 7 files changed, 384 insertions(+), 14 deletions(-) create mode 100644 src/views/administrative/userFilter.vue diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue index 4680109..80f394f 100644 --- a/src/views/administrative/appointment.vue +++ b/src/views/administrative/appointment.vue @@ -39,11 +39,13 @@ @click="data.showTimePicker = true" /> + --> + + + + @@ -111,6 +123,10 @@ import {addEnterpriseLawEnforcement} from '../../api/administrative' import {queryUserInfo} from '../../api/enforce' import { queryEnterpriseInfoList } from '../../api/enterprise' import { reactive, ref } from "vue"; +import { getDict } from "../../api/Home"; +import {uploadFile} from "../../util/fileUpload"; +//用户筛选弹窗 +import Popup from './userFilter.vue'; const { useMy, useCommon, useShopCard } = $globalStore; const router = useRouter(); @@ -118,6 +134,11 @@ let queryaddressId = ref(""); const data = reactive({ showLawEnforcerFlag:false, showTimePicker:false, + popupVisible: false, + popupContent: '', + showGA:false, + checkItemText:"", + ga_columns: [], }); //保存参数 const submitData = reactive({ @@ -169,6 +190,31 @@ const onFailed = (errorInfo) => { console.log('failed', errorInfo); }; + +const showPopup = () =>{ + data.popupVisible = true; +} +const closePopup = () =>{ + data.popupVisible = false; +} +const reciveData = (item) =>{ + submitData.lawEnforcerTwo = item.userName; + submitData.lawEnforcerIdTwo = item.userId; +} + +/* 检查要求 start */ +const gaConfirm = ({ selectedOptions }) => { + data.checkItemText = selectedOptions[0].text; + submitData.checkItem = selectedOptions[0].value; + data.showGA = false; +}; +const gaChange = ({ selectedValues }) => { +}; +const gaCancel = () => { + data.showGA = false; +} +/* 检查要求 end */ + // 返回 const goBack = () => { router.go(-1); @@ -198,9 +244,14 @@ onMounted(() =>{ submitData.lawEnforcerId = success.data.userId submitData.lawEnforcement = success.data.dept.deptName; submitData.lawEnforcementId = success.data.dept.deptId; - },error=>{ - - }) + },error=>{}); + + // 查询检查要求字典信息 + getDict({"dictType": "checkRequire"}, success => { + for(var i=0; i{}); }) const reciveData = (item) =>{ diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue index 238f08b..4927a09 100644 --- a/src/views/administrative/appointmentList.vue +++ b/src/views/administrative/appointmentList.vue @@ -83,6 +83,7 @@ import { showToast } from "vant"; import {queryEnterpriseLawEnforcementList} from '../../api/administrative'; import { setGoodsNum } from "@/util/util"; + import {getDict} from "../../api/Home"; const { useCommon, useShopCard } = $globalStore; const router = useRouter(); @@ -117,17 +118,36 @@ minDate: new Date(2020, 0, 1), maxDate: new Date(2125, 5, 1), columnsType :['year', 'month'], + ga_columns: [], }); // 设置初始值为当前时间 onMounted(() => { // getCard(); searchParam.enterpriseNumber = useCommon.enterpriseNumber; - queryList(); + + // 查询检查要求字典信息 + getDict({"dictType": "checkRequire"}, success => { + for(var i=0; i{}); + + // queryList(); data.dateSearch = nowDate(new Date()); }); const queryList = () =>{ queryEnterpriseLawEnforcementList(searchParam,success =>{ + for (var i=0; i{ diff --git a/src/views/administrative/userFilter.vue b/src/views/administrative/userFilter.vue new file mode 100644 index 0000000..7bd043f --- /dev/null +++ b/src/views/administrative/userFilter.vue @@ -0,0 +1,236 @@ + + + + + \ No newline at end of file diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index a3b0cfd..240682d 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -43,12 +43,14 @@ placeholder="必填 执法事项" /> + + + + + @@ -127,6 +138,7 @@ import { reactive, ref } from "vue"; import {uploadFile} from "../../util/fileUpload"; //用户筛选弹窗 import Popup from './userFilter.vue'; +import {getDict} from "../../api/Home"; const { useMy } = $globalStore @@ -144,6 +156,10 @@ const data = reactive({ popupContent: '', popupVisible2: false, popupContent2: '', + + showGA:false, + lawEnforcementBasisText:"", + ga_columns: [], }); //保存参数 const submitData = reactive({ @@ -192,7 +208,6 @@ const tapBad = () => { onMounted(() =>{ //查询企业信息 getEnterpriseInformation(route?.query?.enterpriseNumber,success =>{ - console.log(success.data) if (null != success.data) { submitData.enterpriseName = success.data.enterpriseName submitData.enterpriseNumber = success.data.enterpriseNumber @@ -211,6 +226,13 @@ onMounted(() =>{ },error=>{ }) + + // 查询检查要求字典信息 + getDict({"dictType": "lawEnforcementBasis"}, success => { + for(var i=0; i{}); }) // 返回 @@ -222,15 +244,12 @@ const goBack = () => { const uploadFiles = (file) =>{ uploadFile(file,(res) =>{ - console.log(res); submitData.fileList.push(res.url) - console.log(submitData.fileList); }); } const deleteFile = (file,index) =>{ - console.log(index); submitData.fileListObj.filter((item, indexs) => { if (index.index == indexs) { submitData.fileListObj.splice(indexs, 1);//splice 删除 @@ -241,10 +260,22 @@ const deleteFile = (file,index) =>{ submitData.fileList.splice(indexs, 1);//splice 删除 } }); - console.log(submitData.fileList); return true; } +/* 执法依据 start */ +const gaConfirm = ({ selectedOptions }) => { + data.lawEnforcementBasisText = selectedOptions[0].text; + submitData.lawEnforcementBasis = selectedOptions[0].value; + data.showGA = false; +}; +const gaChange = ({ selectedValues }) => { +}; +const gaCancel = () => { + data.showGA = false; +} +/* 执法依据 end */ + const submit = () =>{ addEnforcementRegistration(submitData,success =>{ //跳转首页 diff --git a/src/views/enforce/userFilter.vue b/src/views/enforce/userFilter.vue index 81256c3..76b663c 100644 --- a/src/views/enforce/userFilter.vue +++ b/src/views/enforce/userFilter.vue @@ -8,7 +8,7 @@
- +
@@ -19,7 +19,7 @@
{{ item.userName }}
{{ item.phonenumber }}
-
{{ item.loginName }}
+
{{ item.lawCertificateNum }}
diff --git a/src/views/enterprise/enterpriseInspectionDetail.vue b/src/views/enterprise/enterpriseInspectionDetail.vue index da2a8ff..6931908 100644 --- a/src/views/enterprise/enterpriseInspectionDetail.vue +++ b/src/views/enterprise/enterpriseInspectionDetail.vue @@ -107,6 +107,7 @@ import {getEnterpriseLawEnforcement} from '../../api/administrative' import { reactive, ref } from "vue"; +import {getDict} from "../../api/Home"; const router = useRouter(); const route = useRoute(); @@ -168,6 +169,18 @@ const goBack = () => { router.go(-1); }; +const setDict = () =>{ + // 查询检查要求字典信息 + getDict({"dictType": "checkRequire"}, success => { + for(var i=0; i{}); +} + //初始化参数，获取扫码的企业统一信用编码 onMounted(() =>{ getEnterpriseLawEnforcement(route?.query?.id,success =>{ @@ -184,6 +197,8 @@ onMounted(() =>{ submitData.linkTel = success.data.linkTel; submitData.checkTime = success.data.checkTime; submitData.remark = success.data.remark; + + setDict(); } },error=>{ console.log("登记失败") diff --git a/src/views/enterprise/registrationDetail.vue b/src/views/enterprise/registrationDetail.vue index 41e3d11..5b3a159 100644 --- a/src/views/enterprise/registrationDetail.vue +++ b/src/views/enterprise/registrationDetail.vue @@ -139,6 +139,7 @@ import { showSuccessToast,showImagePreview } from 'vant'; import {queryEnforcementRegistrationById} from '../../api/enforce' import { reactive, ref } from "vue"; import {uploadFile} from "../../util/fileUpload"; +import {getDict} from "../../api/Home"; //用户筛选弹窗 // import Popup from './userFilter.vue'; @@ -208,15 +209,29 @@ const imagePreview = (index) =>{ startPosition: index, }); } + +const setDict = () =>{ + // 查询检查要求字典信息 + getDict({"dictType": "lawEnforcementBasis"}, success => { + for(var i=0; i{}); +} + //3a0096181c184e5aa56f70923680856d$6e74ceda1463c165fd43eeeadce4f7cd //初始化参数，获取扫码的企业统一信用编码 onMounted(() =>{ //查询执法登记信息 queryEnforcementRegistrationById(route?.query?.id,success =>{ - console.log(success.data); submitData.enterpriseName = success.data.enterpriseName; submitData.enterpriseNumber = success.data.enterpriseNumber; submitData.lawEnforcement = success.data.lawEnforcement; + submitData.lawEnforcerTwo = success.data.lawEnforcerTwo; + submitData.subsidiaryer = success.data.subsidiaryer; submitData.lawEnforcementId = success.data.lawEnforcementId; submitData.lawEnforcementItem = success.data.lawEnforcementItem; submitData.lawEnforcementBasis = success.data.lawEnforcementBasis; @@ -230,6 +245,8 @@ onMounted(() =>{ data.good = "#D3D3D3"; data.bad = "#7FFFD4"; } + + setDict(); },error=>{ })