From 999509883ea24a52180fd6f3717c70e76117bf20 Mon Sep 17 00:00:00 2001 From: "452061493@qq.com" <452061493@qq.com> Date: Tue, 3 Sep 2024 19:44:23 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=89=A7=E6=B3=95=E7=99=BB=E8=AE=B0=E5=92=8C?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=EF=BC=9A=E6=B7=BB=E5=8A=A0=E8=81=94?= =?UTF-8?q?=E5=90=88=E6=A3=80=E6=9F=A5=202.bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enforce/enforcementPlan.vue | 6 +- src/views/enforce/enforcementPlanDetailed.vue | 4 + src/views/enforce/sign.vue | 58 ++++++- src/views/enterprise/registrationEdit.vue | 156 ++++++++++++++++-- 4 files changed, 199 insertions(+), 25 deletions(-) diff --git a/src/views/enforce/enforcementPlan.vue b/src/views/enforce/enforcementPlan.vue index 1ceead7..c21f27d 100644 --- a/src/views/enforce/enforcementPlan.vue +++ b/src/views/enforce/enforcementPlan.vue @@ -84,8 +84,8 @@ null!=item.fileObject?item.fileObject.fileName:"" }}

- 发布 - 取消发布 + 发布 + 取消发布
@@ -546,6 +546,6 @@ .btn-list a i { margin: 0 0.12rem; - font-size: 0.4rem; + font-size: 0.37rem; } diff --git a/src/views/enforce/enforcementPlanDetailed.vue b/src/views/enforce/enforcementPlanDetailed.vue index e3b2d8e..99df8b2 100644 --- a/src/views/enforce/enforcementPlanDetailed.vue +++ b/src/views/enforce/enforcementPlanDetailed.vue @@ -123,6 +123,10 @@ onMounted(() => { color: #2b75fd; } + /deep/ .van-field .van-field__control { + color: #666; + } + .fold-div { position: relative; display: flex; diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index a07d4d6..ff294b8 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -237,13 +237,7 @@ - - - + @@ -265,6 +259,7 @@ import {formattedTime, formattedTimeYYYYmmdd} from "@/util/util"; import Compressor from 'compressorjs' //用户筛选弹窗 + import DeptPopup from '../administrative/deptFilter.vue'; import Popup from './userFilter.vue'; import LawPopup from './lawFilter.vue'; import PopupA from './assistUserFilter.vue'; @@ -384,6 +379,13 @@ lawFieldText: "", checkCategory: "", checkCategoryText: "", + userId: useCommon.userId, + deptTexts: "", + deptObjs: [], + userObjs: [], + isUnite: 0, + bureauDeptId:"", + bureauDeptName:"", }) @@ -842,6 +844,27 @@ data.tempDate = times[1] + "月" + times[2] + "号"; } data.showTimePicker = false; + + // 查询设定的检查时间是否有别的企业对该部门进行检查, 如果有这提示可进行联合执法 + if (null != submitData.enterpriseNumber && null != data.tempDate) { + let params = { + enterpriseNumber: submitData.enterpriseNumber, + checkTime: submitData.checkTime, + } + queryEnterpriseLawEnforcementList(params, success => { + var deptName = ""; + for (var i = 0; i < success.data.length; i++) { + deptName += success.data[i].lawEnforcement + ", "; + } + if (success.data.length > 0) { + data.notifyContent = "您在" + data.tempDate + "和" + deptName + "执法部门有相同的执法企业，可以发起联合执法" + data.notifyShow = true; + // setTimeout(() => { + // data.notifyShow = false; + // }, 2000); + } + }); + } } const showPopup = (flag) => { @@ -885,6 +908,27 @@ // submitData.lawEnforcerTwo = item.userName; // submitData.lawCertificateNumTwoText = item.userName + " " + item.lawCertificateNum // submitData.lawEnforcerIdTwo = item.userId; + + // 查询设定的检查时间是否有别的企业对该部门进行检查, 如果有这提示可进行联合执法 + if (null != submitData.enterpriseNumber && null != data.tempDate) { + let params = { + enterpriseNumber: submitData.enterpriseNumber, + checkTime: submitData.checkTime, + } + queryEnterpriseLawEnforcementList(params, success => { + var deptName = ""; + for (var i = 0; i < success.data.length; i++) { + deptName += success.data[i].lawEnforcement + ", "; + } + if (success.data.length > 0) { + data.notifyContent = "您在" + data.tempDate + "和" + deptName + "执法部门有相同的执法企业，可以发起联合执法" + data.notifyShow = true; + setTimeout(() => { + data.notifyShow = false; + }, 2000); + } + }); + } } const reciveData2 = (item) => { submitData.subsidiaryer = item.userName; diff --git a/src/views/enterprise/registrationEdit.vue b/src/views/enterprise/registrationEdit.vue index 688b0e8..2830834 100644 --- a/src/views/enterprise/registrationEdit.vue +++ b/src/views/enterprise/registrationEdit.vue @@ -118,11 +118,7 @@ show-word-limit /> - + + + + @@ -219,6 +222,19 @@ placeholder="请输入备注" show-word-limit />--> + + + + +
+

+ {{item.deptName}}{{item.userName}} +

+
+
@@ -279,6 +295,8 @@ + @@ -293,13 +311,18 @@ import {formattedTime} from "@/util/util"; import Compressor from 'compressorjs' //用户筛选弹窗 + import DeptPopup from '../administrative/deptFilter.vue'; import Popup from '../enforce/userFilter.vue'; import LawPopup from '../enforce/lawFilter.vue'; import PopupA from '../enforce/assistUserFilter.vue'; import Popupzq from '../enforce/zqyjjdmFilter.vue'; import {getDict} from "../../api/Home"; import { queryLinkage, queryLinkageDictByValueAndParentId } from "../../api/linkage"; - import {addEnterpriseLawEnforcement, getByUserIdAndZero} from "../../api/administrative"; + import { + addEnterpriseLawEnforcement, + getByUserIdAndZero, + queryEnterpriseLawEnforcementList + } from "../../api/administrative"; const { useCommon,useMy } = $globalStore @@ -337,6 +360,9 @@ lawFieldText:"", showCheckCategoryPicker: false, checkCategorys: [], + checked: false, + deptChecked: false, + deptContent: '', }); var fileSize = 0; //保存参数 @@ -389,6 +415,13 @@ lawField:"", checkCategory: "", checkCategoryText: "", + userId: useCommon.userId, + deptTexts: "", + deptObjs: [], + userObjs: [], + isUnite: 0, + bureauDeptId:"", + bureauDeptName:"", }) const tapGood = () => { @@ -409,6 +442,25 @@ },error=>{}); } + const checkUnite = () => { + if (data.checked) { + data.deptChecked=true; + } else { + data.deptChecked=false; + } + } + + const reciveDept = (item) => { + submitData.deptTexts = ""; + submitData.deptObjs = []; + submitData.userObjs = []; + for (var i=0; i { // 查询检查要求字典信息 queryLinkage({"dataScopeId": useCommon.userId, "parentId": parentId}, success => { @@ -699,6 +751,36 @@ }); } + const onConfirm = (time) => { + if (time != null) { + var times = time.selectedValues; + submitData.enforcementTime = times[0] + "-" + times[1] + "-" + times[2]; + data.tempDate = times[1] + "月" + times[2] + "号"; + } + data.showTimePicker = false; + + // 查询设定的检查时间是否有别的企业对该部门进行检查, 如果有这提示可进行联合执法 + if (null != submitData.enterpriseNumber && null != data.tempDate) { + let params = { + enterpriseNumber: submitData.enterpriseNumber, + checkTime: submitData.checkTime, + } + queryEnterpriseLawEnforcementList(params, success => { + var deptName = ""; + for (var i = 0; i < success.data.length; i++) { + deptName += success.data[i].lawEnforcement + ", "; + } + if (success.data.length > 0) { + data.notifyContent = "您在" + data.tempDate + "和" + deptName + "执法部门有相同的执法企业，可以发起联合执法" + data.notifyShow = true; + // setTimeout(() => { + // data.notifyShow = false; + // }, 2000); + } + }); + } + } + const showPopup = (flag) =>{ data.lawCerFlag = flag; data.popupVisible = true; @@ -732,6 +814,7 @@ data.popupVisible2 = false; data.popupVisibleqz = false; data.lawChecked = false; + data.deptChecked = false; } const reciveData = (item) =>{ data.lawCer[data.lawCerFlag].id = item.userId; @@ -741,6 +824,27 @@ // submitData.lawEnforcerTwo = item.userName; // submitData.lawCertificateNumTwoText = item.userName + " " + item.lawCertificateNum // submitData.lawEnforcerIdTwo = item.userId; + + // 查询设定的检查时间是否有别的企业对该部门进行检查, 如果有这提示可进行联合执法 + if (null != submitData.enterpriseNumber && null != data.tempDate) { + let params = { + enterpriseNumber: submitData.enterpriseNumber, + checkTime: submitData.checkTime, + } + queryEnterpriseLawEnforcementList(params, success => { + var deptName = ""; + for (var i = 0; i < success.data.length; i++) { + deptName += success.data[i].lawEnforcement + ", "; + } + if (success.data.length > 0) { + data.notifyContent = "您在" + data.tempDate + "和" + deptName + "执法部门有相同的执法企业，可以发起联合执法" + data.notifyShow = true; + setTimeout(() => { + data.notifyShow = false; + }, 2000); + } + }); + } } const reciveData2 = (item) =>{ submitData.subsidiaryer = item.userName; @@ -955,19 +1059,41 @@ } .addbtn { - margin: 3%; - padding: 0 0.35rem; - width: 94%; - font-size: 0.35rem; - color: #1367fe; - line-height: 1.5; + margin: 3% 0; + width: 100%; text-align: right; - box-sizing: border-box; } .addbtn i { - margin-right: -0.1rem; - font-size: 0.4rem; + font-size: 0.5rem; + color: #999; + } + + .add-inspect { + margin: 0 0.425rem; + padding-bottom: 0.3rem; + min-height: 2rem; + font-size: 0.37rem; + color: #323233; + } + + .add-inspect p { + margin: 0.1rem 0; + padding: 0.2rem 0.1rem; + //border-bottom: 1px solid #f4f5f6; + } + + .add-inspect p:nth-child(even) { + background-color: #f3f4f5; + } + + .add-inspect span { + margin-right: 0.2rem; + color: #999; + } + + .add-inspect span.add-dept { + color: #666; } /deep/ .mult-line .van-field__label {