督导检查bug修改,系统bug修改
This commit is contained in:
parent
6509ec2820
commit
2da64dca74
|
|
@ -35,7 +35,14 @@
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="right-profile">
|
||||||
|
<span class="zyt" @click="skipPage"><i>综合执法一张图</i></span>
|
||||||
|
<i class="iconfont icon-zngzt_zfdc" v-if="projectName == 'gzt'" title="编辑桌面"></i>
|
||||||
|
<i class="iconfont icon-zngzt_syfw" v-if="projectName != 'gzt'" @click="handleTo({ path: 'gzt' })" title="首页"></i>
|
||||||
|
<NotificationBell/>
|
||||||
|
<public-full-screen></public-full-screen>
|
||||||
|
<i class="iconfont icon-zngzt_tcdl" @click="handleLogout" title="退出"></i>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script setup>
|
<script setup>
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ const baseRoutes = [
|
||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
path: 'index',
|
path: 'index',
|
||||||
|
name: 'SviIndex',
|
||||||
component: () => import('@views/main/svi.vue'),
|
component: () => import('@views/main/svi.vue'),
|
||||||
meta: {
|
meta: {
|
||||||
title: '首页',
|
title: '首页',
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,13 @@ const state = reactive({
|
||||||
rules: {
|
rules: {
|
||||||
industryType: [{ required: true, message: '监管行业不能为空', trigger: 'blur' }],
|
industryType: [{ required: true, message: '监管行业不能为空', trigger: 'blur' }],
|
||||||
unitName: [{ required: true, message: '生产经营单位名称不能为空', trigger: 'blur' }],
|
unitName: [{ required: true, message: '生产经营单位名称不能为空', trigger: 'blur' }],
|
||||||
uired: true, message: '属地不能为空', trigger: 'blur' }],
|
shortName: [{ required: true, message: '单位简称不能为空', trigger: 'blur' }],
|
||||||
|
unifiedSocialCode: [{ required: true, message: '社会统一信用代码不能为空', trigger: 'blur' }],
|
||||||
|
businessStatus: [{ required: true, message: '营业状态不能为空', trigger: 'blur' }],
|
||||||
|
orgCode: [{ required: false, message: '所属机构不能为空', trigger: 'blur' }],
|
||||||
|
legalRepresentative: [{ required: true, message: '法定代表人(经营者)姓名不能为空', trigger: 'blur' }],
|
||||||
|
contactPhone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
|
||||||
|
agency: [{ required: true, message: '属地不能为空', trigger: 'blur' }],
|
||||||
legalPhone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
|
legalPhone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
|
||||||
legalDuty: [{ required: true, message: '法定代表人(经营者)职位不能为空', trigger: 'blur' }],
|
legalDuty: [{ required: true, message: '法定代表人(经营者)职位不能为空', trigger: 'blur' }],
|
||||||
regulatedIndustry: [{ required: true, message: '国民经济行业分类不能为空', trigger: 'blur' }],
|
regulatedIndustry: [{ required: true, message: '国民经济行业分类不能为空', trigger: 'blur' }],
|
||||||
|
|
|
||||||
|
|
@ -60,6 +60,9 @@
|
||||||
<el-table-column prop="infoAccessMsg" label="资料上报" min-width="100"/>
|
<el-table-column prop="infoAccessMsg" label="资料上报" min-width="100"/>
|
||||||
<el-table-column prop="permitAccessMsg" label="许可信息" min-width="100"/>
|
<el-table-column prop="permitAccessMsg" label="许可信息" min-width="100"/>
|
||||||
|
|
||||||
|
<template #tableControlColumn="{ data: r }">
|
||||||
|
<el-link type="primary" @click="handDistribution(r.data.row)" title="在线巡查">在线巡查</el-link>
|
||||||
|
</template>
|
||||||
|
|
||||||
<template #dialog>
|
<template #dialog>
|
||||||
<el-dialog class="business-dialog" v-model="dialogConfig.show" :show-close="false" :append-to-body="true"
|
<el-dialog class="business-dialog" v-model="dialogConfig.show" :show-close="false" :append-to-body="true"
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,7 @@
|
||||||
const hashUrl = window.location.hash.slice(1)
|
const hashUrl = window.location.hash.slice(1)
|
||||||
if (hashUrl && hashUrl === '/') {
|
if (hashUrl && hashUrl === '/') {
|
||||||
//route.push('/svi/index')
|
//route.push('/svi/index')
|
||||||
|
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
handleLogin()
|
handleLogin()
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,9 @@ public class Zfzbgl extends BaseModel {
|
||||||
@Comment("属地代码")
|
@Comment("属地代码")
|
||||||
private String sddm;
|
private String sddm;
|
||||||
|
|
||||||
|
@Column(length = 200)
|
||||||
|
@Comment("属地名称")
|
||||||
|
private String sdmc;
|
||||||
|
|
||||||
|
|
||||||
@Column(length = 200)
|
@Column(length = 200)
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,8 @@ public class OnlinePatrolDto {
|
||||||
private MultipartFile[] files;//附件
|
private MultipartFile[] files;//附件
|
||||||
private String createUserId;//录入人id
|
private String createUserId;//录入人id
|
||||||
private String createUserName;//录入人名称
|
private String createUserName;//录入人名称
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private LocalDateTime createTime;//录入时间
|
||||||
|
|
||||||
private String approvalStatus;//审批状态
|
private String approvalStatus;//审批状态
|
||||||
private String approvalUserId;//审批人id
|
private String approvalUserId;//审批人id
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,6 @@ public class ZsfzglService {
|
||||||
return zsfzglRepository.findAll(buildQueryCondition(query));
|
return zsfzglRepository.findAll(buildQueryCondition(query));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public Page<Zsfzgl> page(ZsfzglQuery query, RemoteUserInfo user) {
|
public Page<Zsfzgl> page(ZsfzglQuery query, RemoteUserInfo user) {
|
||||||
Integer _psize = Optional.ofNullable(query.pageSize()).filter(f -> f > 0).orElse(20);
|
Integer _psize = Optional.ofNullable(query.pageSize()).filter(f -> f > 0).orElse(20);
|
||||||
Integer _page = Optional.ofNullable(query.page()).filter(f -> f > 0).map(f -> f - 1).orElse(0);
|
Integer _page = Optional.ofNullable(query.page()).filter(f -> f > 0).map(f -> f - 1).orElse(0);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue