diff --git a/src/api/enforce.js b/src/api/enforce.js index e209967..dc93240 100644 --- a/src/api/enforce.js +++ b/src/api/enforce.js @@ -173,3 +173,13 @@ export const getDeptListToPerson = (params,success,error) =>_get("/app/enforceme * @returns */ export const whole = (params,success,error) =>_get("/app/appComprehensiveAnalysis/whole",params,success,error) + + +/** + * 查询一小时内的联合检查信息 + * @param {企业统一信用码} enterpriseNumber + * @param {*} success + * @param {*} error + * @returns + */ +export const queryUnionByHour = (enterpriseNumber, success, error) => _get("/app/code/registration/queryUnionByHour/"+enterpriseNumber, null,success,error) \ No newline at end of file diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue index 780c75a..0f4d33a 100644 --- a/src/views/administrative/appointment.vue +++ b/src/views/administrative/appointment.vue @@ -184,12 +184,12 @@ />--> - - - + + + + --> diff --git a/src/views/administrative/appointmentRelaunch.vue b/src/views/administrative/appointmentRelaunch.vue index d1782a9..965a5e2 100644 --- a/src/views/administrative/appointmentRelaunch.vue +++ b/src/views/administrative/appointmentRelaunch.vue @@ -372,6 +372,7 @@ data.deptChecked = false; } const reciveVisible = (item) =>{ + console.log(item) data.lawCer[data.lawCerFlag].id = item.userId; data.lawCer[data.lawCerFlag].text = item.userName; data.lawCer[data.lawCerFlag].num = item.lawCertificateNum; @@ -441,84 +442,121 @@ } const dataFillIn = (id) => { - getByIdToDataFillIn(id,success =>{ + getByIdToDataFillIn(id, success =>{ console.log("getByIdToDataFillIn : ", success); - //跳转企业二维码地址 + // 回显 if(success.success){ - data.mainDeputyOrder = success.data.mainDeputyOrder; - Object.keys(submitData).forEach((item) => { - submitData[item] = success.data[item] ? success.data[item] : ""; - }) - data.checkItemText =success.data['params'].checkItemText; - 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']; - - let nowDate = formattedTimeYYYYmmdd(new Date()) - submitData.checkTime = nowDate; - - let dateArr = nowDate.split("-"); - console.log(dateArr) - // data.minDate = [dateArr[0],dateArr[1],dateArr[2]]; - var now = new Date(); - let year = now.getFullYear(); - let mon = now.getMonth() + 1; - let day = now.getDate(); - - mon = (mon < 10 ? ('0' + mon) : mon); - day = (day < 10 ? ('0' + day) : day); - data.minDate = ref(new Date(year, mon - 1, day)); - // data.minDate = ref(new Date(dateArr[0],dateArr[1]+1,dateArr[2])); - // 是否联合执法 - if (success.data.userObjs.length > 1) { - data.checked = true; - } - // submitData.deptTexts = ""; - // submitData.deptObjs = []; - // for (var i=0; i 0) - && (null != submitData.lawEnforcerTwo && submitData.lawEnforcerTwo.length > 0)) { - var tmpEnforceId = submitData.lawEnforcerTwoId.split(','); - var tmpEnforceText = submitData.lawEnforcerTwo.split(','); - var lawEnforcer2Show = lawEnforcer2ShowStr.split(','); - data.lawCer = []; - for (var i = 0; i < tmpEnforceId.length; i++) { - data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: lawEnforcer2Show[i]}); - } + submitData.lawEnforcerText = success.data.lawEnforcement; + console.log(success.data.userObjs) + for (var i=0; i{ - 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=>{}); - // } + data.lawCer.splice(0, 1); } - },error=>{ console.log("保存失败") }) + // getByIdToDataFillIn(id,success =>{ + // console.log("getByIdToDataFillIn : ", success); + // //跳转企业二维码地址 + // if(success.success){ + // data.mainDeputyOrder = success.data.mainDeputyOrder; + // Object.keys(submitData).forEach((item) => { + // submitData[item] = success.data[item] ? success.data[item] : ""; + // }) + // data.checkItemText =success.data['params'].checkItemText; + // 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']; + + // let nowDate = formattedTimeYYYYmmdd(new Date()) + // submitData.checkTime = nowDate; + + // let dateArr = nowDate.split("-"); + // console.log(dateArr) + // // data.minDate = [dateArr[0],dateArr[1],dateArr[2]]; + // var now = new Date(); + // let year = now.getFullYear(); + // let mon = now.getMonth() + 1; + // let day = now.getDate(); + + // mon = (mon < 10 ? ('0' + mon) : mon); + // day = (day < 10 ? ('0' + day) : day); + // data.minDate = ref(new Date(year, mon - 1, day)); + // // data.minDate = ref(new Date(dateArr[0],dateArr[1]+1,dateArr[2])); + // // 是否联合执法 + // if (success.data.userObjs.length > 1) { + // data.checked = true; + // } + // // submitData.deptTexts = ""; + // // submitData.deptObjs = []; + // // for (var i=0; i 0) + // && (null != submitData.lawEnforcerTwo && submitData.lawEnforcerTwo.length > 0)) { + // var tmpEnforceId = submitData.lawEnforcerTwoId.split(','); + // var tmpEnforceText = submitData.lawEnforcerTwo.split(','); + // var lawEnforcer2Show = lawEnforcer2ShowStr.split(','); + // data.lawCer = []; + // for (var i = 0; i < tmpEnforceId.length; i++) { + // data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: lawEnforcer2Show[i]}); + // } + // } + + // //查询当前登录人员信息 + // // 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("保存失败") + // }) } const tmpSave = () => { diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index 987fcc3..3673696 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -153,12 +153,17 @@ - - - + + + + + + +
@@ -258,6 +263,9 @@ + + +
@@ -272,7 +280,8 @@ editEnforcementRegistration, getRegByUserIdAndZero, getByUserIdAndEnterpriseNumber, - queryUserInfo + queryUserInfo, + queryUnionByHour } from '@/api/enforce' import {getEnterpriseInformation} from '../../api/enterprise' import {reactive, ref} from "vue"; @@ -350,6 +359,8 @@ checked: false, deptChecked: false, deptContent: '', + union_checked: false, // 联合检查选择 + auth_checked: false, // 委托执法选择 }); var fileSize = 0; //保存参数 @@ -511,6 +522,8 @@ if (null != success.data) { submitData.enterpriseName = success.data.enterpriseName submitData.enterpriseNumber = success.data.enterpriseNumber + // 查询是否有关联的执法记录 + getUnionByHour(submitData.enterpriseNumber); } }, error => { @@ -564,6 +577,15 @@ data.showBl = true; }) + const getUnionByHour = (enterpriseNumber) => { + console.log('----------> start : getUnionByHour: '+ enterpriseNumber) + queryUnionByHour(enterpriseNumber, success => { + console.log("------------------------------>") + console.log(success) + console.log("<------------------------------") + }, error => { console.log(error); }) + } + // 返回 const goBack = () => { router.go(-1);