From d6ca9c498f53972f3a749a36ee24939ef015a0ef Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Fri, 2 Aug 2024 19:06:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E8=81=94=E5=90=88=E6=89=A7?= =?UTF-8?q?=E6=B3=95=E9=87=8D=E5=81=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/administrative.js | 6 + src/views/administrative/appointment.vue | 53 +++++--- src/views/administrative/appointmentEdit.vue | 127 ++++++++++++------ src/views/administrative/appointmentList.vue | 3 +- src/views/administrative/deptFilter.vue | 4 +- src/views/enforce/sign.vue | 44 +++++- .../enterprise/enterpriseInspectionDetail.vue | 2 +- 7 files changed, 174 insertions(+), 65 deletions(-) diff --git a/src/router/administrative.js b/src/router/administrative.js index b1024ce..038aefe 100644 --- a/src/router/administrative.js +++ b/src/router/administrative.js @@ -17,6 +17,12 @@ const routes = [ name: "appointmentEdit", component: () => import("@/views/administrative/appointmentEdit.vue"), }, + // 行政检查预约详情 + { + path: "/appointmentDetail", + name: "appointmentDetail", + component: () => import("@/views/administrative/appointmentDetail.vue"), + }, ]; export { routes }; diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue index 447a655..c21f827 100644 --- a/src/views/administrative/appointment.vue +++ b/src/views/administrative/appointment.vue @@ -128,27 +128,27 @@ - -
-

深圳市财政局执法人员1执法人员2

-

深圳市发展和改革委员会执法人员1执法人员2

-

深圳市水务局执法人员1执法人员2

-
+ + + + + + + + + + + + + +
+

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

+
@@ -297,6 +297,7 @@ userId: useCommon.userId, deptTexts: "", deptObjs: [], + userObjs: [], isUnite: 0, bureauDeptId:"", bureauDeptName:"" @@ -338,7 +339,7 @@ } }); } - }; + } const validator = (val) => /^1[34578]\d{9}$/.test(val); @@ -370,12 +371,22 @@ // submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo } + 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 - + - + + + + + + + + + + + + + + +
+

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

+
@@ -272,7 +277,9 @@ remark:"", deptTexts: "", deptObjs: [], + userObjs: [], isUnite: 0, + isSubmit: 0, uniteCheck:"", /**局级部门 */ bureauDeptId:"", @@ -316,12 +323,22 @@ // submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo } + 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 { getByIdToDataFillIn(id,success =>{ - console.log(success); + console.log("getByIdToDataFillIn : ", success); //跳转企业二维码地址 if(success.success){ data.mainDeputyOrder = success.data.mainDeputyOrder; @@ -375,19 +392,25 @@ data.checkRequireText =success.data['params'].checkRequireText; submitData.lawEnforcerText =success.data['lawEnforcer']; submitData.lawEnforcerTextTwo =success.data['lawEnforcerTwo']; + submitData.isSubmit =success.data['isSubmit']; submitData.bureauDeptName = success.data['bureauDeptName']; - if (success.data.deptObjs.length > 1) { + // 是否联合执法 + if (success.data.userObjs.length > 1) { data.checked = true; } - submitData.deptTexts = ""; - submitData.deptObjs = []; - for (var i=0; i : ", success.data) submitData.lawEnforcerTwoId = success.data['lawEnforcerTwoId']; submitData.lawEnforcerTwo = success.data['lawEnforcerTwo']; var lawEnforcer2ShowStr = success.data['lawEnforcer2Show']; @@ -401,7 +424,20 @@ data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: lawEnforcer2Show[i]}); } } - // showSuccessToast('保存成功'); + + //查询当前登录人员信息 + if (submitData.isSubmit == 0) { + queryUserInfo(useCommon.userId,success =>{ + console.log("queryUserInfo : ", success.data) + submitData.lawEnforcer = success.data.userName; + submitData.lawCertificateNum = success.data.lawCertificateNum + submitData.lawEnforcerText = submitData.lawEnforcer +" "+ submitData.lawCertificateNum + // submitData.lawEnforcerText = submitData.lawEnforcer + submitData.lawEnforcerId = success.data.userId; + submitData.lawEnforcement = success.data.dept.deptName; + submitData.lawEnforcementId = success.data.dept.deptId; + },error=>{}); + } } },error=>{ console.log("保存失败") @@ -543,17 +579,7 @@ // 数据填充 dataFillIn(route?.query?.id); - //查询当前登录人员信息 - queryUserInfo(useCommon.userId,success =>{ - console.log(success.data) - submitData.lawEnforcer = success.data.userName; - submitData.lawCertificateNum = success.data.lawCertificateNum - submitData.lawEnforcerText = submitData.lawEnforcer +" "+ submitData.lawCertificateNum - // submitData.lawEnforcerText = submitData.lawEnforcer - submitData.lawEnforcerId = success.data.userId; - submitData.lawEnforcement = success.data.dept.deptName; - submitData.lawEnforcementId = success.data.dept.deptId; - },error=>{}); + // getLinkageByValueAndParentId("check_item", "100"); @@ -573,7 +599,6 @@ }) const reciveData = (item) =>{ - console.log(item); submitData.enterpriseName = item.enterpriseName; submitData.linkTel = item.enterpriseTel; submitData.linkMan = item.legalPerson; @@ -656,4 +681,30 @@ margin-right: 0.1rem; } + .add-inspect { + margin: 0 0.425rem 0 3.06rem; + padding-bottom: 0.3rem; + font-size: 0.35rem; + color: #323233; + } + + .add-inspect p { + margin: 0.1rem 0; + padding: 0.2rem 0; + //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: #323233; + } + diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue index 9f0970a..d8d5929 100644 --- a/src/views/administrative/appointmentList.vue +++ b/src/views/administrative/appointmentList.vue @@ -329,7 +329,8 @@ console.log(id) router.push( { - path: "/enterprise/enterpriseInspectionDetail", + // path: "/enterprise/enterpriseInspectionDetail", + path: "/appointmentDetail", query: { id: id, } diff --git a/src/views/administrative/deptFilter.vue b/src/views/administrative/deptFilter.vue index fbceb12..8c16477 100644 --- a/src/views/administrative/deptFilter.vue +++ b/src/views/administrative/deptFilter.vue @@ -52,7 +52,7 @@
- + {{item.userName}}
@@ -149,7 +149,7 @@ let checkeds = JSON.parse(JSON.stringify(this.checked)); for (var i=0; i
+ + + @@ -250,7 +259,11 @@ import PopupA from './assistUserFilter.vue'; import Popupzq from './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 @@ -286,6 +299,10 @@ const data = reactive({ lawFieldShow: false, lawField_columns: [], lawFieldText:"", + currentDate: [], + showTimePicker: false, + minDate:null, + maxDate:null, }); var fileSize = 0; //保存参数 @@ -392,6 +409,11 @@ onMounted(() =>{ submitData.enforce = route?.query?.reason; submitData.checkCss = route?.query?.checkCss; data.isNoScan = route?.query?.isNoScan; + + currentDate(); + // let dateLimit = new Date(); + // data.maxDate = new Date(this.$moment(dateLimit).format('YYYY/MM/DD')); + // 数据填充 dataFillIn(); @@ -625,6 +647,24 @@ const submit = (type) =>{ }); } + +const currentDate =() => { + const now = new Date(); + const year = now.getFullYear(); + const month = (now.getMonth() + 1).toString().padStart(2, '0'); + const day = now.getDate().toString().padStart(2, '0'); + data.currentDate = [year, month, day] +} + +const onConfirm = (time) => { + if (time != null) { + var times = time.selectedValues; + submitData.checkTime = times[0] + "-" + times[1] + "-" + times[2]; + data.tempDate = times[1] + "月" + times[2] + "号"; + } + data.showTimePicker = false; +} + const showPopup = (flag) =>{ data.lawCerFlag = flag; data.popupVisible = true; diff --git a/src/views/enterprise/enterpriseInspectionDetail.vue b/src/views/enterprise/enterpriseInspectionDetail.vue index ff827dd..561feed 100644 --- a/src/views/enterprise/enterpriseInspectionDetail.vue +++ b/src/views/enterprise/enterpriseInspectionDetail.vue @@ -230,7 +230,7 @@ onMounted(() =>{ getEnterpriseLawEnforcement(route?.query?.id,success =>{ //跳转企业二维码地址 if(success.success){ - console.log("===> : ", success.data) + console.log("===> 0 : ", success.data) submitData.lawEnforcementCode = success.data.lawEnforcementCode; submitData.lawEnforcement = success.data.lawEnforcement; submitData.lawEnforcer = success.data.lawEnforcer;