-
-
+
+
+
+
+
是否公布该行政检查计划？
+ 是否公开该行政检查计划？
diff --git a/src/views/enforce/enforcementPlanBase.vue b/src/views/enforce/enforcementPlanBase.vue
index 6f280d4..8f8537a 100644
--- a/src/views/enforce/enforcementPlanBase.vue
+++ b/src/views/enforce/enforcementPlanBase.vue
@@ -22,7 +22,7 @@
@@ -496,6 +504,7 @@ import {
queryEnforcementRegistrationById,
queryEnforcementRegistrationUniteById,
getAttr,
+ queryUnionByHour,
} from "@/api/enforce";
import { reactive, ref, nextTick } from "vue";
import { uploadFile } from "@/util/fileUpload";
@@ -533,6 +542,12 @@ const data = reactive({
regList: [],
lawList: [],
arrayLength: 1,
+ allNo: 'circle',
+ union_checked: '0', // 联合检查选择
+ auth_checked: false, // 委托执法选择
+ union_datas: [], // 联合检查用的分组list
+ check_union_no: '', // 选中的联合检查编号
+ radio_flag: 'circle', // 联合检查单选按钮的选择标识
});
//保存参数
const submitData = reactive({
@@ -859,14 +874,11 @@ const queryRegUniteById = () => {
queryEnforcementRegistrationUniteById(
route?.query?.id,
(success) => {
- convertReg(success.data["regResults"])
- .then(() => {
+ convertReg(success.data["regResults"]).then(() => {
return convertLaw(success.data["lawResults"]);
- })
- .then(() => {
+ }).then(() => {
data.regList[0].downShow = true;
data.regList[data.regList.length - 1].upShow = true;
- console.log(success.data);
//评价信息
submitData.isEvaluate = success.data["regResults"][0].isEvaluate;
if (
@@ -936,6 +948,11 @@ const convertReg = (regs) => {
return new Promise((res) => {
var proFlag = 0;
for (var k = 0; k < regs.length; k++) {
+ // 因为下面的小箭头隐藏了, 所以这里要把自己移动到第一位 放出来的话删掉 start
+ if (regs[k].id != route?.query?.id) {
+ continue
+ }
+ // 因为下面的小箭头隐藏了, 所以这里要把自己移动到第一位 放出来的话删掉 end
let dt = regs[k];
let obj = {};
obj.id = dt.id;
@@ -947,6 +964,7 @@ const convertReg = (regs) => {
obj.lawEnforcementId = dt.lawEnforcementId;
obj.lawEnforcementItem = dt.lawEnforcementItem;
obj.lawEnforcementItemText = dt.lawEnforcementItemText;
+ data.auth_checked = dt.hasAuto==0?false:true;
obj.lawEnforcer = nameCorrect(dt.lawEnforcer);
obj.remark = dt.remark;
obj.enforce = dt.enforceReason;
diff --git a/src/views/enterprise/registrationEdit.vue b/src/views/enterprise/registrationEdit.vue
index 4ff759b..09507fb 100644
--- a/src/views/enterprise/registrationEdit.vue
+++ b/src/views/enterprise/registrationEdit.vue
@@ -233,14 +233,39 @@
/>-->
+
-
+ 否
+ 是
+
+
-
+
+
+
+
+
+
-
+
{console.log(error)});
+ }
+ const getUnionByHour = (enterpriseNumber, checkCss, enforcementTime, unionNo) => {
+ // data.union_datas =
+ queryUnionByHour(enterpriseNumber, checkCss, enforcementTime, unionNo, success => {
+ if(success.success) {
+ console.log('---G: ',success.data)
+ data.union_datas = success.data;
+
+ // 设置被选择
+ nextTick(() => { // 确保dom渲染完成
+ setUnionChecked(submitData.id);
+ });
}
- },error=>{});
+ }, error => { console.log(error); })
+ }
+
+ const setUnionChecked = (id) => {
+ for (let index = 0; index < data.union_datas.length; index++) {
+ const rawObj = JSON.parse(JSON.stringify(data.union_datas[index]));
+ Object.keys(rawObj).forEach(key => {
+ if (key === id) {
+ check_radio(submitData.unionNo, index)
+ }
+ });
+ }
}
const dataFillIn = () => {
@@ -801,11 +874,11 @@
tapBad();
}
submitData.fileList = [];
- submitData.fileListObj = [];
+ data.fileListObj = [];
// showSuccessToast('保存成功');
console.log(success.data.fileList);
//图片回显
- // submitData.fileListObj.push(
+ // data.fileListObj.push(
// {
// url: 'https://example.com/image.jpg', // 替换为你的图片地址
// status: 'done', // 图片状态，'uploading'、'done'或者'failed'
@@ -818,6 +891,25 @@
})
}
+ const check_radio = (unio_no, index) => {
+ console.log('---> : ', radio_fales.value)
+ for(var i=0; i {
showSuccessToast('临时保存');
submitData.userId = useCommon.userId;
@@ -831,18 +923,21 @@
data.overlayShow = true; // 遮罩层
submitData.userId = useCommon.userId;
submitData.isUnite = 0;
- if (data.checked) { submitData.isUnite = 1; }
+ // if (data.checked) { submitData.isUnite = 1; } // 原来的联合检查, 忘记咋用了, 就没用了.
//联合检查
-
+ if (data.union_checked == 1) {submitData.hasUnion = 1;} else {submitData.unionNo = null;}
+ // 是否委托检查
+ if (data.auth_checked) {submitData.hasAuto = 1;}
// 处理回显附件
- if (null != data.fileListObj) {
- for (var k = 0; k < data.fileListObj.length; k++) {
- var url = data.fileListObj[k].url;
- if (null != url) {
- submitData.fileList.push(url);
- }
- }
- }
+ // if (null != data.fileListObj) {
+ // for (var k = 0; k < data.fileListObj.length; k++) {
+ // var url = data.fileListObj[k].url;
+ // console.log("-------------------------------------------->>>>>>", url)
+ // if (null != url) {
+ // submitData.fileList.push(url);
+ // }
+ // }
+ // }
// 执法依据
submitData.lawEnforcementBasis = "";
@@ -896,6 +991,11 @@
submitData.isSubmit = type;
submitData.userId = useCommon.userId;
+ //联合检查
+ if (data.union_checked == 1) {submitData.hasUnion = 1;} else {submitData.unionNo = null;}
+ // 是否委托检查
+ if (data.auth_checked) {submitData.hasAuto = 1;}
+
// 执法依据
submitData.lawEnforcementBasis = "";
submitData.lawEnforcementBasisText = "";
@@ -916,6 +1016,16 @@
submitData.lawEnforcerIdTwo = submitData.lawEnforcerIdTwo.substring(0, submitData.lawEnforcerIdTwo.length - 1);
submitData.lawEnforcerTwo = submitData.lawEnforcerTwo.substring(0, submitData.lawEnforcerTwo.length - 1);
+ // 处理回显附件
+ // if (null != data.fileListObj) {
+ // for (var k = 0; k < data.fileListObj.length; k++) {
+ // var url = data.fileListObj[k].url;
+ // if (null != url) {
+ // submitData.fileList.push(url);
+ // }
+ // }
+ // }
+
form.value.validate().then(() => {
editEnforcementRegistration(submitData, success => {
//跳转首页
@@ -1285,6 +1395,34 @@
line-height: 1.25;
}
+ .dept-inspect {
+ margin: 2% 0;
+ padding: 0 2%;
+ width: calc(100% - 1rem);
+ background: #f3f4f5;
+ color: #666;
+ }
+
+ .dept-inspect p {
+ margin: 3% 0;
+ padding: 0;
+ }
+
+ .item-inspect {
+ display: flex;
+ justify-content: space-between;
+ }
+
+ .item-inspect > i {
+ margin: 5% 2% 0 0;
+ color: #dfdddd;
+ font-size: 0.5rem;
+ }
+
+ .item-inspect > i.van-icon-checked {
+ color: #1367fe;
+ }
+
/deep/ .mult-line .van-field__label {
padding-right: 0.3rem;
width: 2.3rem;
diff --git a/src/views/enterprise/registrationList.vue b/src/views/enterprise/registrationList.vue
index 5e51550..a282dc6 100644
--- a/src/views/enterprise/registrationList.vue
+++ b/src/views/enterprise/registrationList.vue
@@ -102,7 +102,7 @@
diff --git a/src/views/enterprise/systemNotice.vue b/src/views/enterprise/systemNotice.vue
new file mode 100644
index 0000000..f53f08d
--- /dev/null
+++ b/src/views/enterprise/systemNotice.vue
@@ -0,0 +1,549 @@
+
+
+
+
+
+
+
+ {{item2.bureauDeptName}}
+
+
+
+
+ 开启新的联合检查
+{{nameCorrect(item.userName)}} @@ -256,7 +281,7 @@ (不多于 8张)
{{ file.name }}
@@ -319,7 +344,7 @@
import 'vant/es/toast/style';
import {addEnforcementRegistration, editEnforcementRegistration, editEnforcementRegistration2, getRegByUserIdAndZero, getByUserIdAndEnterpriseNumber, queryUserInfo} from '../../api/enforce'
import {getEnterpriseInformation} from '../../api/enterprise'
- import {queryEnforcementRegistrationById, getAttr} from '@/api/enforce'
+ import {queryEnforcementRegistrationById, queryUnionByHour, getAttr} from '@/api/enforce'
import { reactive, ref } from "vue";
import {nameCorrect, uploadFile} from "../../util/fileUpload";
import {formattedTime} from "@/util/util";
@@ -338,9 +363,12 @@
getByUserIdAndZero,
queryEnterpriseLawEnforcementList
} from "../../api/administrative";
+ import { baseUrl } from "@/config/env";
const { useCommon,useMy } = $globalStore
+ const radio_fales = ref([]);
+
const router = useRouter();
//路由参数
const route = useRoute();
@@ -378,6 +406,14 @@
checked: false,
deptChecked: false,
deptContent: '',
+ //vant组件上传照片列表
+ fileListObj:[],
+ allNo: 'circle',
+ union_checked: '0', // 联合检查选择
+ auth_checked: false, // 委托执法选择
+ union_datas: [], // 联合检查用的分组list
+ check_union_no: '', // 选中的联合检查编号
+ radio_flag: 'circle', // 联合检查单选按钮的选择标识
});
var fileSize = 0;
//保存参数
@@ -385,12 +421,14 @@
// id
id:"",
//执法部门
- lawEnforcement:"",
- lawEnforcementId:"",
+ lawEnforcement:"联合执法H",
+ lawEnforcementId:"405",
+ bureauDeptId:"405",
+ bureauDeptName:"联合执法H",
//执法人员1
- lawEnforcer:"",
- lawEnforcerId:"",
- lawCertificateNumText:"",
+ lawEnforcer:"1818",
+ lawEnforcerId:"1818",
+ lawCertificateNumText:"1818",
//执法人员2
@@ -422,10 +460,14 @@
enforcementTime:formattedTime(new Date()),
//后台保存图片列表
fileList:[],
- //vant组件上传照片列表
- fileListObj:[],
// 数据保存或提交 0 保存 1提交
isSubmit: 0,
+ // 选择的联合检查编号
+ unionNo: '',
+ // 联合检查选择
+ hasUnion: 0,
+ // 委托执法选择
+ hasAuto: 0,
lawId: "",
lawText: "",
uniteCheck: "",
@@ -440,8 +482,6 @@
deptObjs: [],
userObjs: [],
isUnite: 0,
- bureauDeptId:"",
- bureauDeptName:"",
})
const tapGood = () => {
@@ -561,7 +601,6 @@
}
},error=>{});
-
})
// 返回
@@ -578,15 +617,16 @@
const uploadFiles = (file) =>{
uploadFile(file,(res) =>{
+ console.log("32323")
submitData.fileList.push(res.url)
});
}
const deleteFile = (file,index) =>{
- // submitData.fileListObj.filter((item, indexs) => {
+ // data.fileListObj.filter((item, indexs) => {
// if (index.index == indexs) {
- // submitData.fileListObj.splice(indexs, 1);//splice 删除
+ // data.fileListObj.splice(indexs, 1);//splice 删除
// }
// });
submitData.fileList.filter((item, indexs) => {
@@ -650,6 +690,11 @@
// 检查时间
// submitData.enforcementTime = formattedTimeYYYYmmdd(success.data.enforcementTime);
submitData.enforcementTime = success.data.enforcementTime;
+ submitData.hasUnion = success.data.hasUnion;
+ data.union_checked = String(success.data.hasUnion);
+ submitData.hasAuto = success.data.hasAuto;
+ data.auth_checked = success.data.hasAuto==0?false:true;
+ submitData.unionNo = success.data.unionNo;
//评价信息
submitData.isEvaluate = success.data.isEvaluate;
if (null != success.data.enterpriseEvaluate && "" != success.data.enterpriseEvaluate) {
@@ -701,54 +746,82 @@
// setLinkageItem(submitData.lawEnforcementItem);
// setLinkageGA(submitData.lawEnforcementBasis);
- if(success.data.uniteCheck!= null && success.data.uniteCheck != ''){
- selectRegistrationList({"uniteCheck":success.data.uniteCheck},success =>{
- console.log(success.data);
- for (let index = 0; index < success.data.length; index++) {
- const element = success.data[index];
- var arr = [];
- // arr.push(nameCorrect(element.lawEnforcer));
- // let tow = element.lawEnforcerTwo.split(",");
- // for (const key in tow) {
- // arr.push(nameCorrect(tow[key]));
- // }
- for (const key in element.lawEnforcer2List) {
- arr.push(nameCorrect(element.lawEnforcer2List[key]));
- }
- var obj = {
- "deptName": element.bureauDeptName,
- "deptId": element.bureauDeptId,
- "userList": arr
- }
- data.dataList.push(obj)
- }
- },error =>{
-
- })
+ // 老版本的关联联合检查
+ // if(success.data.uniteCheck!= null && success.data.uniteCheck != ''){
+ // selectRegistrationList({"uniteCheck":success.data.uniteCheck},success =>{
+ // console.log(success.data);
+ // for (let index = 0; index < success.data.length; index++) {
+ // const element = success.data[index];
+ // var arr = [];
+ // // arr.push(nameCorrect(element.lawEnforcer));
+ // // let tow = element.lawEnforcerTwo.split(",");
+ // // for (const key in tow) {
+ // // arr.push(nameCorrect(tow[key]));
+ // // }
+ // for (const key in element.lawEnforcer2List) {
+ // arr.push(nameCorrect(element.lawEnforcer2List[key]));
+ // }
+ // var obj = {
+ // "deptName": element.bureauDeptName,
+ // "deptId": element.bureauDeptId,
+ // "userList": arr
+ // }
+ // data.dataList.push(obj)
+ // }
+ // },error =>{
+
+ // })
+ // }
+ // 新版本管理的关联联合检查
+ if (null != submitData.enterpriseName) {
+ getUnionByHour(submitData.enterpriseNumber, 'edit', submitData.enforcementTime, submitData.unionNo);
}
console.log(data.dataList)
},error=>{})
}
const setAttr = () =>{
- // 查询检查要求字典信息
- getAttr(route?.query?.id, success => {
+ // 附件回显
+ submitData.fileList = [];
+ getAttr(route?.query?.id, (success) => {
if (success.data.filePreview != null) {
- if(success.data.filePreview.fileList != null) {
- for (var i=0; i{{ nameCorrect(item.lawEnforcer) }}
- {{ nameCorrect(item)}}
+ {{ nameCorrect(item)}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/enterprise/systemNoticeDetail.vue b/src/views/enterprise/systemNoticeDetail.vue
new file mode 100644
index 0000000..48eb159
--- /dev/null
+++ b/src/views/enterprise/systemNoticeDetail.vue
@@ -0,0 +1,859 @@
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.noticeTitle }}
+
+
+
+
+
+
+ {{ item.bureauDeptNames }} +
+
+
+
+ {{ item.createTime }}
+
+
+
+
+
+
+
+
+
diff --git a/src/views/login.vue b/src/views/login.vue
index 7c5f52e..be4d237 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -45,9 +45,9 @@
testLogin({"secretName": loginParam.secretName, "secretKey": values.secretKey}, success => {
if (success.success) {
//企业端
- router.push({ name: "Home" });
+ // router.push({ name: "Home" });
//执法端
- // router.push({name: "enforceHome"});
+ router.push({name: "enforceHome"});
//设置全局变量
useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
useCommon.SET_USER_ID(success.data.userId);
+
+
+
+
+
+
+
+
+
+
+
+
+ ![预览图片]()
+
+ 第{{ indexImg + 1 }}页
+
+
+