Skip to content

Z
zh-baseversion-project
Commit 9c424292 authored by lizhichao's avatar lizhichao
Browse files
Options

增加企业信息详情、是否有许可证筛选

parent c5db42dd
Hide whitespace changes
Inline Side-by-side
Showing with 172 additions and 10 deletions
zh-baseversion-system/src/main/java/com/zehong/system/domain/TEnterpriseInfo.java
View file @ 9c424292
......@@ -56,6 +56,17 @@ public class TEnterpriseInfo extends BaseEntity
@Excel(name = "许可证编号")
private String licenseKey;
public String getHaslicenseKey() {
return haslicenseKey;
}
public void setHaslicenseKey(String haslicenseKey) {
this.haslicenseKey = haslicenseKey;
}
//是否有许可证
private String haslicenseKey;
/** 许可证有效期 */
@Excel(name = "许可证有效期")
private String licenseValidityTime;
......
zh-baseversion-system/src/main/resources/mapper/system/TEnterpriseInfoMapper.xml
View file @ 9c424292
......@@ -45,6 +45,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="enterpriseType != null">and enterprise_type =#{enterpriseType}</if>
<if test="legalRepresentative != null and legalRepresentative != ''"> and legal_representative = #{legalRepresentative}</if>
<if test="businessArea != null and businessArea != ''"> and business_area = #{businessArea}</if>
<if test="haslicenseKey != null and haslicenseKey != ''">
<if test="haslicenseKey == 1">and license_key is not null</if>
<if test="haslicenseKey == 0">and license_key is null</if>
</if>
<if test="licenseKey != null and licenseKey != ''"> and license_key = #{licenseKey}</if>
<if test="licenseValidityTime != null and licenseValidityTime != ''"> and license_validity_time = #{licenseValidityTime}</if>
<if test="annualSupervisionInspection != null and annualSupervisionInspection != ''"> and annual_supervision_inspection = #{annualSupervisionInspection}</if>
......
zh-baseversion-system/src/main/resources/mapper/system/TWorkOrderMapper.xml
View file @ 9c424292
......@@ -301,8 +301,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectWorkOrderNum" resultType="java.util.HashMap">
SELECT
IFNULL(SUM(CASE task_type WHEN '1' THEN 1 ELSE 0 END),0) AS typeOne,
IFNULL(SUM(CASE task_type WHEN '2' THEN 1 ELSE 0 END),0) AS typeTwo,
IFNULL(SUM(CASE work_status WHEN 3 THEN 1 ELSE 0 END),0) AS typeOne,
IFNULL(SUM(CASE WHEN work_status &lt; 3 THEN 1 ELSE 0 END),0) AS typeTwo,
(
SELECT COUNT(employed_people_id) FROM t_employed_people_info WHERE is_del = 0
AND beyond_enterprise_id IN
......@@ -331,8 +331,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{enterpriseId}
</foreach>
)AS hiddenBookUnFinish
FROM t_work_task WHERE is_del = 0 and is_report = '1'
AND create_enterprise_id IN
FROM t_work_order WHERE is_del = 0
AND work_assign_enterprose_id IN
<foreach item="enterpriseId" collection="enterpriseIds" open="(" separator="," close=")">
#{enterpriseId}
</foreach>
......
zh-baseversion-web/src/views/regulation/info/DetailInfo.vue 0 → 100644
View file @ 9c424292
<template>
<el-dialog title="企业信息详情" :visible.sync="detailOpen" @closed="dialogClose" @open="dialogOpen" width="1000px" append-to-body>
<el-form label-width="160px">
<el-row class="el-row-table">
<el-col :span="12">
<el-form-item label="企业名称">
<span v-if="detailInfo.enterpriseName">{{ detailInfo.enterpriseName }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="企业类型">
<span v-if="detailInfo.enterpriseType">{{ $parent.enterpriseTypeFormat(detailInfo) }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="注册地址">
<span v-if="detailInfo.registerAddress">{{ detailInfo.registerAddress }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="法定代表人">
<span v-if="detailInfo.legalRepresentative">{{ detailInfo.legalRepresentative }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="许可证有效期">
<span v-if="detailInfo.licenseValidityTime">{{ detailInfo.licenseValidityTime }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="许可证编号">
<span v-if="detailInfo.licenseKey">{{ detailInfo.licenseKey }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="经营区域">
<span v-if="detailInfo.businessArea">{{ detailInfo.businessArea }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="营业执照">
<span class="dbtn" @click="checkFile(detailInfo.doDusiness)" v-if="detailInfo.doDusiness"
>
<i class="el-icon el-icon-view"></i>查看/下载
</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="年度监督检查情况">
<span v-if="detailInfo.annualSupervisionInspection">{{ detailInfo.annualSupervisionInspection }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注">
<span v-if="detailInfo.remarks">{{ detailInfo.remarks }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
</template>
<script>
import Editor from '@/components/Editor/index.vue';
import { getInfo} from "@/api/regulation/info";
let uploadfile = require("@/assets/uploadfile.png");
export default {
name: "detail-info",
components: {
Editor
},
data(){
return{
detailInfo: {},
detailOpen: false,
isOpen:false,
fileList:[],
fileurl:'',
}
},
methods:{
dialogClose(){
this.detailOpen=false;
},
dialogOpen(){
this.detailOpen=true;
},
checkFile(url) {
window.open(url,'_blank');
},
getDetailInfo(id){
getInfo(id).then(res =>{
if(res.code == 200 && res.data){
this.detailInfo = res.data;
this.fileList = [{name: '附件', url:uploadfile}];
this.fileurl = this.detailInfo.iconUrl;
this.detailOpen = true;
}
})
}
}
}
</script>
<style scoped lang="scss">
.division{
display:flex;
flex-direction:row;
justify-content:flex-start;
}
</style>
zh-baseversion-web/src/views/regulation/info/index.vue
View file @ 9c424292
......@@ -10,6 +10,13 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否有许可证" prop="haslicenseKey" label-width="100px">
<el-select v-model="queryParams.haslicenseKey" placeholder="请选择是否有许可证" clearable size="small">
<el-option label="全部" value=""></el-option>
<el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label="许可证编号" prop="licenseKey" label-width="90px">
<el-input
v-model="queryParams.licenseKey"
......@@ -131,6 +138,12 @@
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleDetail(scope.row)"
>详情</el-button>
<el-button
size="mini"
type="text"
......@@ -154,7 +167,7 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<DetailInfo ref="detail"/>
<!-- 添加或修改企业信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="130px">
......@@ -290,10 +303,11 @@
import { listInfo, getInfo, delInfo, addInfo, updateInfo, exportInfo,importTemplate } from "@/api/regulation/info";
import FileUpload from '@/components/FileInfoUpload';
import { getToken } from "@/utils/auth";
import DetailInfo from "./DetailInfo";
export default {
name: "Info",
components: {
FileUpload,
FileUpload,DetailInfo
},
dicts: ['enterprise_type'],
data() {
......@@ -311,7 +325,7 @@ export default {
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
url: process.env.VUE_APP_BASE_API + "/regulation/info/importData" // todo
},
},
//图片
fileList: [],
//头像数据
......@@ -350,6 +364,7 @@ export default {
legalRepresentative: null,
businessArea: null,
licenseKey: null,
haslicenseKey:null,
licenseValidityTime: null,
annualSupervisionInspection: null,
isDel: null,
......@@ -388,7 +403,7 @@ export default {
methods: {
// 任务组名字典翻译
enterpriseTypeFormat(row) {
return this.selectDictLabel(this.options, row.enterpriseType);
return this.selectDictLabel(this.options, row.enterpriseType);
},
handleImport(){
......@@ -401,7 +416,7 @@ export default {
importTemplate().then(response => {
this.download(response.msg);
});
},
},
// 文件上传处理中
handleFileUploadProgress(event,file,fileList) {
......@@ -418,7 +433,7 @@ export default {
},
// 提交上传文件
submitFileForm() {
this.$refs.upload.submit();
this.$refs.upload.submit();
},
/**上传营业执照照片*/
getFileInfo(res){
......@@ -459,6 +474,7 @@ export default {
legalRepresentative: null,
businessArea: null,
licenseKey: null,
haslicenseKey:null,
licenseValidityTime: null,
annualSupervisionInspection: null,
createBy: null,
......@@ -495,6 +511,9 @@ export default {
this.open = true;
this.title = "添加企业信息";
},
handleDetail(row){
this.$refs.detail.getDetailInfo(row.enterpriseId);
},
/** 修改按钮操作 */
handleUpdate(row) {
this.listRemove();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment