From afe082938a1238a12f07c88efea12de429ae788c Mon Sep 17 00:00:00 2001 From: Chendy <596813911@qq.com> Date: Fri, 12 Sep 2025 17:45:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=A7=E6=B3=95=E9=A2=84?= =?UTF-8?q?=E5=91=8A=E6=97=B6=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/administrative/appointment.vue | 63 +++++++++----- .../administrative/appointmentDetail.vue | 8 +- src/views/administrative/appointmentEdit.vue | 72 +++++++++++----- src/views/administrative/appointmentList.vue | 9 +- .../administrative/appointmentRelaunch.vue | 82 +++++++++++-------- .../enterprise/enterpriseInspectionDetail.vue | 7 +- .../enterprise/enterpriseInspectionList.vue | 9 +- 7 files changed, 152 insertions(+), 98 deletions(-) diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue index 9bbb074..19b16b7 100644 --- a/src/views/administrative/appointment.vue +++ b/src/views/administrative/appointment.vue @@ -51,14 +51,22 @@ @click="data.showTimePicker = true" /> + @@ -267,11 +275,16 @@ - - + + + + @@ -341,11 +354,13 @@ lawCerFlag: 0, lawCer:[{ text:"", id:"", show:"", num:"" }], - checkTimePicker: ref(false), - checkTimeColumns: [ - { text: '9:00 ~ 12:00', value: '1' }, - { text: '14:00 ~ 17:00', value: '2' }, - ], + hourStartPicker: ref(false), + hourEndPicker: ref(false), + currentHour:ref(['00','00']), + checkHourType:ref(['hour', 'minute']), + checkHourStart:"", + checkHourEnd:"" + // lawCer:[], }); //保存参数 @@ -402,6 +417,8 @@ */ checkTimeOrder: 0, checkTimeOrderText:"", + checkHourStart:"", + checkHourEnd:"" }) const currentDate =() => { @@ -446,12 +463,14 @@ /** * 执法时间 时段选择 */ - const checkTimeOnConfirm = ({ selectedOptions }) => { - data.checkTimePicker = false; - console.log(selectedOptions[0].text); - console.log(selectedOptions[0].value); - submitData.checkTimeOrderText = selectedOptions[0].text; - submitData.checkTimeOrder = selectedOptions[0].value; + const hourStartConfirm = ({ selectedOptions }) => { + data.hourStartPicker = false; + data.checkHourStart = selectedOptions[0].value+":"+selectedOptions[1].value; + }; + + const hourEndConfirm = ({ selectedOptions }) => { + data.hourEndPicker = false; + data.checkHourEnd = selectedOptions[0].value+":"+selectedOptions[1].value;; }; const validator = (val) => /^1[34578]\d{9}$/.test(val); @@ -599,6 +618,8 @@ submitData.lawEnforcerTwoId = submitData.lawEnforcerTwoId.substring(0, submitData.lawEnforcerTwoId.length - 1); submitData.lawEnforcerTwo = submitData.lawEnforcerTwo.substring(0, submitData.lawEnforcerTwo.length - 1); submitData.lawCertificateNum = submitData.lawCertificateNum.substring(0, submitData.lawCertificateNum.length - 1); + submitData.checkHourStart=data.checkHourStart; + submitData.checkHourEnd=data.checkHourEnd; addEnterpriseLawEnforcement(submitData, success => { data.overlayShow = false; //跳转企业二维码地址 @@ -640,6 +661,8 @@ submitData.lawEnforcerTwoId = submitData.lawEnforcerTwoId.substring(0, submitData.lawEnforcerTwoId.length - 1); submitData.lawEnforcerTwo = submitData.lawEnforcerTwo.substring(0, submitData.lawEnforcerTwo.length - 1); submitData.lawCertificateNum = submitData.lawCertificateNum.substring(0, submitData.lawCertificateNum.length - 1); + submitData.checkHourStart=data.checkHourStart; + submitData.checkHourEnd=data.checkHourEnd; editEnterpriseLawEnforcement(submitData, success => { data.overlayShow = false; //跳转企业二维码地址 diff --git a/src/views/administrative/appointmentDetail.vue b/src/views/administrative/appointmentDetail.vue index 8d32f60..abcf4d1 100644 --- a/src/views/administrative/appointmentDetail.vue +++ b/src/views/administrative/appointmentDetail.vue @@ -278,6 +278,8 @@ /** 状态 0:正常;1:取消 */ status:1, checkTimeOrderText:"", + checkHourStart:"", + checkHourEnd:"" }) const onConfirm = (time) => { @@ -414,11 +416,7 @@ let tmplawno = null == userInfo_tmp.lawCertificateNum?'':userInfo_tmp.lawCertificateNum; data.lawCer.push({ id: userInfo_tmp.strUserId, text: userInfo_tmp.userName, num: userInfo_tmp.lawCertificateNum, show: userInfo_tmp.userName +" "+ tmplawno }); } - if(success.data.checkTimeOrder == 1){ - submitData.checkTime = submitData.checkTime + " 上午 9:00~12:00"; - }else{ - submitData.checkTime = submitData.checkTime + " 下午 14:00~17:00"; - } + submitData.checkTime = submitData.checkTime +" "+submitData.checkHourStart+"~"+submitData.checkHourEnd // 执法人员 submitData.lawEnforcerTwoId = success.data['lawEnforcerTwoId']; submitData.lawEnforcerTwo = success.data['lawEnforcerTwo']; diff --git a/src/views/administrative/appointmentEdit.vue b/src/views/administrative/appointmentEdit.vue index 216ebaf..aa4cf32 100644 --- a/src/views/administrative/appointmentEdit.vue +++ b/src/views/administrative/appointmentEdit.vue @@ -31,14 +31,6 @@ label="联系人电话" :rules="[{ validator, message: '请输入正确内容' }]" /> -
+
@@ -240,11 +241,16 @@ - - + + + + @@ -295,11 +301,12 @@ mainDeputyOrder: 1, lawCerFlag: 0, lawCer:[{ text:"", id:"", show:"", num:"" }], - checkTimePicker: false, - checkTimeColumns: [ - { text: '9:00 ~ 12:00', value: '1' }, - { text: '14:00 ~ 17:00', value: '2' }, - ], + hourStartPicker: ref(false), + hourEndPicker: ref(false), + currentHour:ref(['00','00']), + checkHourType:ref(['hour', 'minute']), + checkHourStart:"", + checkHourEnd:"" }); //保存参数 const submitData = reactive({ @@ -357,8 +364,23 @@ */ checkTimeOrder: 0, checkTimeOrderText:"", + checkHourStart:"", + checkHourEnd:"" }) + /** + * 执法时间 时段选择 + */ + const hourStartConfirm = ({ selectedOptions }) => { + data.hourStartPicker = false; + data.checkHourStart = selectedOptions[0].value+":"+selectedOptions[1].value; + }; + + const hourEndConfirm = ({ selectedOptions }) => { + data.hourEndPicker = false; + data.checkHourEnd = selectedOptions[0].value+":"+selectedOptions[1].value;; + }; + const onConfirm = (time) => { console.log(time) if(time != null) { @@ -470,6 +492,8 @@ console.log("getByIdToDataFillIn : ", success); //跳转企业二维码地址 if(success.success){ + data.checkHourStart=success.data['checkHourStart']; + data.checkHourEnd=success.data['checkHourEnd']; data.mainDeputyOrder = success.data.mainDeputyOrder; Object.keys(submitData).forEach((item) => { submitData[item] = success.data[item] ? success.data[item] : ""; @@ -571,6 +595,8 @@ submitData.lawEnforcerTwoId = submitData.lawEnforcerTwoId.substring(0, submitData.lawEnforcerTwoId.length - 1); submitData.lawEnforcerTwo = submitData.lawEnforcerTwo.substring(0, submitData.lawEnforcerTwo.length - 1); submitData.lawCertificateNum = submitData.lawCertificateNum.substring(0, submitData.lawCertificateNum.length - 1); + submitData.checkHourStart=data.checkHourStart; + submitData.checkHourEnd=data.checkHourEnd; addEnterpriseLawEnforcement(submitData,success =>{ data.overlayShow = false; // 遮罩层 //跳转企业二维码地址 @@ -615,6 +641,8 @@ submitData.lawEnforcerTwoId = submitData.lawEnforcerTwoId.substring(0, submitData.lawEnforcerTwoId.length - 1); submitData.lawEnforcerTwo = submitData.lawEnforcerTwo.substring(0, submitData.lawEnforcerTwo.length - 1); submitData.lawCertificateNum = submitData.lawCertificateNum.substring(0, submitData.lawCertificateNum.length - 1); + submitData.checkHourStart=data.checkHourStart; + submitData.checkHourEnd=data.checkHourEnd; if(data.mainDeputyOrder == 0) { editEnterpriseLawEnforcementDeputyOrder(submitData,success =>{ data.overlayShow = false; // 遮罩层 diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue index 81a3597..840da67 100644 --- a/src/views/administrative/appointmentList.vue +++ b/src/views/administrative/appointmentList.vue @@ -58,12 +58,9 @@

执法时间：{{ formattedTimeYYYYmmdd(item.checkTime) }} - - 上午 9:00~12:00 - - - 下午 14:00~17:00 - + + {{item.checkHourStart}}~{{item.checkHourEnd}} +

diff --git a/src/views/administrative/appointmentRelaunch.vue b/src/views/administrative/appointmentRelaunch.vue index 3fdb1b9..fa6ffbf 100644 --- a/src/views/administrative/appointmentRelaunch.vue +++ b/src/views/administrative/appointmentRelaunch.vue @@ -35,14 +35,6 @@ :rules="[{ validator, message: '请输入正确内容' }]" readonly /> -
- +
@@ -239,11 +239,16 @@ /> - - + + + + { @@ -672,6 +684,8 @@ submitData.lawEnforcerTwoId = submitData.lawEnforcerTwoId.substring(0, submitData.lawEnforcerTwoId.length - 1); submitData.lawEnforcerTwo = submitData.lawEnforcerTwo.substring(0, submitData.lawEnforcerTwo.length - 1); submitData.lawCertificateNum = submitData.lawCertificateNum.substring(0, submitData.lawCertificateNum.length - 1); + submitData.checkHourStart=data.checkHourStart; + submitData.checkHourEnd=data.checkHourEnd; //默认设置再次发起页面ID为空 submitData.id = ""; editEnterpriseLawEnforcement(submitData, success => { @@ -788,12 +802,14 @@ /** * 执法时间 时段选择 */ - const checkTimeOnConfirm = ({ selectedOptions }) => { - data.checkTimePicker = false; - console.log(selectedOptions[0].text); - console.log(selectedOptions[0].value); - submitData.checkTimeOrderText = selectedOptions[0].text; - submitData.checkTimeOrder = selectedOptions[0].value; + const hourStartConfirm = ({ selectedOptions }) => { + data.hourStartPicker = false; + data.checkHourStart = selectedOptions[0].value+":"+selectedOptions[1].value; + }; + + const hourEndConfirm = ({ selectedOptions }) => { + data.hourEndPicker = false; + data.checkHourEnd = selectedOptions[0].value+":"+selectedOptions[1].value;; };