chenrui
/
zdxtLawEnforcementCodeView
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

联合检查

v4
蟑螂恶霸 1 year ago
parent
543131793e
commit
acca99c6ab
4 changed files with 150 additions and 80 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/api/enforce.js
  2. 10
      src/views/administrative/appointment.vue
  3. 176
      src/views/administrative/appointmentRelaunch.vue
  4. 34
      src/views/enforce/sign.vue

10
src/api/enforce.js
View File

@ -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)

10
src/views/administrative/appointment.vue
View File

@ -184,12 +184,12 @@
/>-->
<!-- <van-divider class="divdsty" />-->
<!--应客户要求暂时隐藏”联合检查“功能-->
<!-- <van-cell center title="开启联合检查">
<!-- <van-cell center title="开启联合检查">
<template #right-icon>
<van-switch v-model="data.checked" @click="!data.checked"/>-->
<!-- <van-switch v-model="data.checked" @click="checkUnite"/>-->
<!-- </template>
</van-cell>-->
<van-switch v-model="data.checked" @click="!data.checked"/>
<van-switch v-model="data.checked" @click="checkUnite"/>
</template>
</van-cell> -->
<!-- <van-field-->
<!-- v-if="data.checked"-->
<!-- v-model="submitData.deptTexts"-->

176
src/views/administrative/appointmentRelaunch.vue
View File

@ -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<success.data.deptObjs.length; i++) {
// submitData.deptTexts += success.data.deptObjs[i].deptName+";";
// submitData.deptObjs.push({ deptId: success.data.deptObjs[i].deptId, deptName: success.data.deptObjs[i].deptName });
// }
submitData.userObjs = [];
console.log("success.data.userObjs : ", success.data.userObjs);
for (var i=0; i<success.data.userObjs.length; i++) {
submitData.userObjs.push({ strUserId: success.data.userObjs[i].strUserId, userName: success.data.userObjs[i].userName, deptId: success.data.userObjs[i].deptId, deptName: success.data.userObjs[i].deptName });
// 企业名称
submitData.enterpriseName = success.data.enterpriseName;
// 联系人
submitData.linkMan = success.data.linkMan;
// 联系电话
submitData.linkTel = success.data.linkTel;
// 检查时间
submitData.checkTime = success.data.checkTime;
// 检查时段
if(success.data.checkTimeOrder == 1) {
submitData.checkTimeOrderText = "9:00 ~ 12:00"
} else {
submitData.checkTimeOrderText = "14:00 ~ 17:00"
}
submitData.checkTimeOrder = success.data.checkTimeOrder;
// 检查事项
submitData.checkItemText = success.data.checkItemText;
// 检查要求
submitData.checkRequireText = success.data.checkRequireText;
// 执法部门
submitData.bureauDeptName = success.data.bureauDeptName;
// 执法人员
submitData.lawEnforcerTwoId = success.data['lawEnforcerTwoId'];
submitData.lawEnforcerTwo = success.data['lawEnforcerTwo'];
var lawEnforcer2ShowStr = success.data['lawEnforcer2Show'];
if ((null != submitData.lawEnforcerTwoId && submitData.lawEnforcerTwoId.length > 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<success.data.userObjs.length; i++) {
var userInfo_tmp = success.data.userObjs[i]
data.lawCer.push({ id: userInfo_tmp.strUserId, text: userInfo_tmp.userName, num: userInfo_tmp.lawCertificateNum, show: userInfo_tmp.userName +" "+ userInfo_tmp.lawCertificateNum });
}
//查询当前登录人员信息
// 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=>{});
// }
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<success.data.deptObjs.length; i++) {
// // submitData.deptTexts += success.data.deptObjs[i].deptName+";";
// // submitData.deptObjs.push({ deptId: success.data.deptObjs[i].deptId, deptName: success.data.deptObjs[i].deptName });
// // }
// submitData.userObjs = [];
// console.log("success.data.userObjs : ", success.data.userObjs);
// for (var i=0; i<success.data.userObjs.length; i++) {
// submitData.userObjs.push({ strUserId: success.data.userObjs[i].strUserId, userName: success.data.userObjs[i].userName, deptId: success.data.userObjs[i].deptId, deptName: success.data.userObjs[i].deptName });
// }
// // 执法人员
// submitData.lawEnforcerTwoId = success.data['lawEnforcerTwoId'];
// submitData.lawEnforcerTwo = success.data['lawEnforcerTwo'];
// var lawEnforcer2ShowStr = success.data['lawEnforcer2Show'];
// if ((null != submitData.lawEnforcerTwoId && submitData.lawEnforcerTwoId.length > 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 = () => {

34
src/views/enforce/sign.vue
View File

@ -153,12 +153,17 @@
<van-divider class="divdsty" />
<!-- <van-cell center title="开启联合检查">
<van-cell center title="开启联合检查">
<template #right-icon>
<van-switch v-model="data.checked" @click="!data.checked"/> -->
<!-- <van-switch v-model="data.checked" @click="checkUnite"/>-->
<!-- </template>
</van-cell> -->
<van-switch v-model="data.union_checked" @click="!data.union_checked"/>
</template>
</van-cell>
<van-cell center title="是否委托检查">
<template #right-icon>
<van-switch v-model="data.auth_checked" @click="!data.auth_checked"/>
</template>
</van-cell>
<div class="add-inspect" v-if="data.checked">
<!-- <p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p>-->
@ -259,6 +264,9 @@
<DeptPopup :visible="data.deptChecked" :content="data.deptContent" @close="closePopup"
@reciveData="reciveDept"/>
<!-- 联合执法选择 -->
<van-popup v-model:show="data.union_checked" position="bottom" :style="{ height: '30%' }" />
</div>
</template>
@ -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);

Write Preview
Loading…
Cancel
Save