Commit 103c9d95 authored by 耿迪迪's avatar 耿迪迪

商业安检

parent 4a590d7c
......@@ -212,7 +212,7 @@ public class TTaskServiceImpl implements ITTaskService
*/
@Override
public List<TTask> selectTaskByType(Map<String,Object> param){
return tTaskMapper.selectCurrentTaskByType(param);
return tTaskMapper.selectTaskByType(param);
}
......
......@@ -189,6 +189,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="inspector != null and inspector != ''"> and us.nick_name like concat('%',#{inspector},'%')</if>
<if test="taskType != null and taskType != ''">and industry.task_type = #{taskType}</if>
</where>
order by taskInspect.create_time desc
order by taskInspect.status
</select>
</mapper>
\ No newline at end of file
......@@ -104,7 +104,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="表具品牌">
<span v-if="detailInfo.meterModel">{{ $parent.meterModelCompanyFormatter(detailInfo) }}</span>
<span v-if="detailInfo.meterCompany > -1">{{ $parent.meterModelCompanyFormatter(detailInfo) }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
......@@ -113,7 +113,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="表具型号">
<span v-if="detailInfo.meterModel">{{ $parent.branchFormat(detailInfo,null) }}</span>
<span v-if="detailInfo.meterModel">{{ $parent.meterModelFormatter(detailInfo,null) }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
......@@ -202,7 +202,7 @@
getBusiness(businessId).then(response => {
this.detailInfo = response.data;
this.title = "商业用户信息详情";
this.gasUseDevice = JSON.parse(this.detailInfo.device);
//this.gasUseDevice = JSON.parse(this.detailInfo.device);
this.open = true;
this.initMap();
});
......
......@@ -780,7 +780,7 @@ export default {
if(this.form.street){
this.getStree(this.form.county);
}
this.gasUseDevice = JSON.parse(this.form.device);
//this.gasUseDevice = JSON.parse(this.form.device);
this.open = true;
this.title = "修改商业用户";
});
......@@ -789,7 +789,7 @@ export default {
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.form.device = JSON.stringify(this.gasUseDevice);
//this.form.device = JSON.stringify(this.gasUseDevice);
if (this.form.id != null) {
updateBusiness(this.form).then(response => {
this.msgSuccess("修改成功");
......
......@@ -8,211 +8,189 @@
<div id="inspect" v-if="checkType == 2 && jsondata.obj" >
<div style="text-align: center;font-size: 26px;margin-bottom: 18px;">餐饮用户检查表</div>
<el-row>
<el-col :span="8">
用户姓名:{{detailInfo.username }}
</el-col>
<!--<el-row>-->
<!--<el-col :span="8">-->
<!--用户单位:-->
<!--</el-col>-->
<el-col :span="5">
联系电话:{{detailInfo.phone}}
</el-col>
<!--<el-col :span="8">-->
<!--检查时间:-->
<!--</el-col>-->
<el-col :span="6">
地址:{{detailInfo.address}}
</el-col>
<!--<el-col :span="8">-->
<!--检查人:-->
<!--</el-col>-->
<!--</el-row>-->
<el-col :span="5">
燃气表号:{{detailInfo.usernum}}
</el-col>
</el-row>
<table class="inspect" border="1" cellspacing="0" cellpadding="0">
<tr>
<td rowspan="3" colspan="2" style="writing-mode: vertical-lr;width: 100px">客户资料</td>
<td colspan="2" style="width: 100px;height: 60px">单位名称</td>
<td colspan="5" width="250px">{{detailInfo.company}}</td>
<td colspan="2" width="100px">合同号</td>
<td colspan="3">{{detailInfo.contract}}</td>
<td>安检位置</td>
<td colspan="2">安检内容</td>
<td>安检结果</td>
</tr>
<tr>
<td colspan="2" style="width: 100px;height: 60px">详细地址</td>
<td colspan="5">{{ detailInfo.address }}</td>
<td colspan="2">表号</td>
<td colspan="3">{{ detailInfo.usernum }}</td>
<td rowspan="2">户外管道</td>
<td colspan="2">是否存在管道锈蚀、防腐不到位的现象</td>
<td>
<input v-model="jsondata.obj.huwaiguandao.valueArr2[0]" type="checkbox" class="input-disabled"/>
</td>
</tr>
<tr>
<td colspan="2" style="height: 50px">联系人</td>
<td colspan="5">{{ detailInfo.username }}</td>
<td colspan="2">电话</td>
<td colspan="3">{{ detailInfo.phone }}</td>
<td colspan="2">是否存在多余或未使用燃气接口的现象</td>
<td>
<input v-model="jsondata.obj.huwaiguandao.valueArr2[1]" type="checkbox" class="input-disabled"/>
</td>
</tr>
<tr>
<td rowspan="2">燃气表</td>
<td colspan="2">是否存在锁闭阀启闭、内漏异常的现象</td>
<td>
<input v-model="jsondata.obj.ranqibiao.valueArr2[0]" type="checkbox" class="input-disabled"/>
</td>
</tr>
<tr>
<td rowspan="2" colspan="2" width="">表具类型</td>
<td rowspan="2" colspan="2">型号</td>
<td rowspan="2" colspan="3" width="">生产厂家</td>
<td rowspan="2" colspan="2" >进气方向</td>
<td colspan="5" >累计购气量 M³</td>
<td colspan="2">是否存在燃气表计量异常、表封损坏的现象</td>
<td>
<input v-model="jsondata.obj.ranqibiao.valueArr2[1]" type="checkbox" class="input-disabled"/>
</td>
</tr>
<tr>
<td rowspan="2">入户管道</td>
<td colspan="2">是否存在燃气设施包封在橱柜内等封闭现象</td>
<td>
<input v-model="jsondata.obj.ruhuguandao.valueArr2[0]" type="checkbox" class="input-disabled"/>
</td>
</tr>
<tr>
<td colspan="5">子轮数 M³</td>
<td colspan="2">是否存在燃气管道、阀门及其他设备未使用专用材质</td>
<td>
<input v-model="jsondata.obj.ruhuguandao.valueArr2[1]" type="checkbox" class="input-disabled"/>
</td>
</tr>
<tr>
<td rowspan="2" colspan="2">
<input type="checkbox" :checked="detailInfo.meterType == 1" class="input-disabled"/>皮膜
<input type="checkbox" :checked="detailInfo.meterType == 2" class="input-disabled"/>超声
<td rowspan="3">燃气灶</td>
<td colspan="2">是否存在未安装自闭阀或报警连锁装置的现象</td>
<td>
<input v-model="jsondata.obj.ranqizao.valueArr2[0]" type="checkbox" class="input-disabled"/>
</td>
<td rowspan="2" colspan="2">
<input type="checkbox" :checked="detailInfo.meterModel == 1" class="input-disabled"/>G1.5
<input type="checkbox" :checked="detailInfo.meterModel == 2" class="input-disabled"/>G2.5
<input type="checkbox" :checked="detailInfo.meterModel == 3" class="input-disabled"/>G4
</tr>
<tr>
<td colspan="2">是否存在使用不具有熄火保护燃气专用灶具的现象</td>
<td>
<input v-model="jsondata.obj.ranqizao.valueArr2[1]" type="checkbox" class="input-disabled"/>
</td>
<td rowspan="2" colspan="3">
<input type="checkbox" :checked="detailInfo.meterCompany == 1" class="input-disabled"/>金卡
<input type="checkbox" :checked="detailInfo.meterCompany == 2" class="input-disabled"/>秦川
</tr>
<tr>
<td colspan="2">是否使用不合格“瓶、灶、阀门、管”等情况</td>
<td>
<input v-model="jsondata.obj.ranqizao.valueArr2[2]" type="checkbox" class="input-disabled"/>
</td>
<td rowspan="2" colspan="2">
<input type="checkbox" :checked="detailInfo.direction == 1" class="input-disabled"/>
<input type="checkbox" :checked="detailInfo.direction == 2" class="input-disabled"/>
</tr>
<tr>
<td rowspan="9">其他</td>
<td colspan="2">是否存在以营利为目的使用天然气且未商用登记的</td>
<td>
<input v-model="jsondata.obj.qita.valueArr2[0]" type="checkbox" class="input-disabled"/>
</td>
<td colspan="5" >液晶数 M³</td>
</tr>
<tr>
<td colspan="5">卡内余额 元</td>
<td colspan="2">是否在用餐场所使用或存放气瓶</td>
<td>
<input v-model="jsondata.obj.qita.valueArr2[1]" type="checkbox" class="input-disabled"/>
</td>
</tr>
<tr>
<td width="50px">燃气用具</td>
<td rowspan="1" width="50px">双眼灶</td>
<td rowspan="1" width="50px">单眼灶</td>
<td rowspan="1" width="50px">多眼灶</td>
<td rowspan="1" width="50px">大锅灶</td>
<td rowspan="1" width="50px">民用灶</td>
<td rowspan="1" width="50px">烧烤灶</td>
<td rowspan="1" width="50px">低汤灶</td>
<td rowspan="1" width="50px">煲仔炉</td>
<td rowspan="1" width="50px">矮仔炉</td>
<td rowspan="1" width="50px">烤箱(炉)</td>
<td rowspan="1" width="50px">蒸汽炉(箱)</td>
<td rowspan="1" width="50px">煮面桶</td>
<td rowspan="1" width="50px">壁挂炉</td>
<td colspan="2">是否存在偷盗气、破坏燃气设施等违法行为</td>
<td>
<input v-model="jsondata.obj.qita.valueArr2[2]" type="checkbox" class="input-disabled"/>
</td>
</tr>
<tr>
<td width="50px">数量</td>
<td rowspan="1" width="50px">{{device.bothEyes}}</td>
<td rowspan="1" width="50px">{{device.singleEyes}}</td>
<td rowspan="1" width="50px">{{device.manyEyes}}</td>
<td rowspan="1" width="50px">{{device.cauldron}}</td>
<td rowspan="1" width="50px">{{device.civil}}</td>
<td rowspan="1" width="50px">{{device.barbecue}}</td>
<td rowspan="1" width="50px">{{device.lowSoup}}</td>
<td rowspan="1" width="50px">{{device.clayPot}}</td>
<td rowspan="1" width="50px">{{device.dwarf}}</td>
<td rowspan="1" width="50px">{{device.oven}}</td>
<td rowspan="1" width="50px">{{device.steamer}}</td>
<td rowspan="1" width="50px">{{device.barrel}}</td>
<td rowspan="1" width="50px">{{device.wall}}</td>
<td colspan="2">是否存在漏气现象</td>
<td>
<input v-model="jsondata.obj.qita.valueArr2[3]" type="checkbox" class="input-disabled"/>
</td>
</tr>
<tr>
<td colspan="14">安全隐患及存在问题</td>
<td colspan="2">是否存在带电、电气接地、安全间距小于300毫米</td>
<td>
<input v-model="jsondata.obj.qita.valueArr2[4]" type="checkbox" class="input-disabled"/>
</td>
</tr>
<tr>
<td colspan="14" style="text-align: left;padding-left: 20px">
<div class="contendiv">
1<input type="checkbox" :checked="jsondata.obj.yi.valueArr2[0]" class="input-disabled"/>未安装燃气报警及切断阀;
<input type="checkbox" :checked="jsondata.obj.yi.valueArr2[1]" class="input-disabled"/>燃气报警器、切断阀故障或未通电;
<input type="checkbox" :checked="jsondata.obj.yi.valueArr2[2]" class="input-disabled"/>燃气报警器未定期检验;
</div>
<div class="contendiv">
2<input type="checkbox" :checked="jsondata.obj.er.valueArr2[0]" class="input-disabled"/>燃气管道及燃气设施泄漏;
</div>
<div class="contendiv">
3<input type="checkbox" :checked="jsondata.obj.san.valueArr2[0]" class="input-disabled"/>拆装改动燃气管道或增加燃气设备;
</div>
<div class="contendiv">
4<input type="checkbox" :checked="jsondata.obj.si.valueArr2[0]" class="input-disabled"/>燃气管道阀门损坏;
</div>
<div class="contendiv">
5<input type="checkbox" :checked="jsondata.obj.wu.valueArr2[0]" class="input-disabled"/>室内燃气管道设施严重锈蚀(管道及设施表面锈蚀达50%及以上,且处于潮湿环境);
</div>
<div class="contendiv">
6<input type="checkbox" :checked="jsondata.obj.liu.valueArr2[0]" class="input-disabled"/>双火源、双气源隐患
</div>
<div class="contendiv">
7<input type="checkbox" :checked="jsondata.obj.qi.valueArr2[0]" class="input-disabled"/>未使用不锈钢波纹管;
不锈钢波纹管存在
<input type="checkbox" :checked="jsondata.obj.qi.valueArr2[1]" class="input-disabled"/>老化;
<input type="checkbox" :checked="jsondata.obj.qi.valueArr2[2]" class="input-disabled"/>超过2米;
<input type="checkbox" :checked="jsondata.obj.qi.valueArr2[3]" class="input-disabled"/>有三通;
<input type="checkbox" :checked="jsondata.obj.qi.valueArr2[4]" class="input-disabled"/>有接口;
<input type="checkbox" :checked="jsondata.obj.qi.valueArr2[5]" class="input-disabled"/>暗敷;
<input type="checkbox" :checked="jsondata.obj.qi.valueArr2[6]" class="input-disabled"/>穿墙;
<input type="checkbox" :checked="jsondata.obj.qi.valueArr2[7]" class="input-disabled"/>穿越吊顶隐患;
</div>
<div class="contendiv">
8<input type="checkbox" :checked="jsondata.obj.ba.valueArr2[0]" class="input-disabled"/>操作间存在
<input type="checkbox" :checked="jsondata.obj.ba.valueArr2[1]" class="input-disabled"/>搭挂重物、电源线、接地线
<input type="checkbox" :checked="jsondata.obj.ba.valueArr2[2]" class="input-disabled"/>封包燃气管道设施;
</div>
<div class="contendiv">
9<input type="checkbox" :checked="jsondata.obj.jiu.valueArr2[0]" class="input-disabled"/>室内燃气管道设施一般锈蚀;
</div>
<div class="contendiv">
10<input type="checkbox" :checked="jsondata.obj.shi.valueArr2[0]" class="input-disabled"/>室内燃气管道缺失固定支架;
</div>
<div class="contendiv">
11<input type="checkbox" :checked="jsondata.obj.shiyi.valueArr2[0]" class="input-disabled"/>燃气管道与电线平行净距少于25cm;
<input type="checkbox" :checked="jsondata.obj.shiyi.valueArr2[0]" class="input-disabled"/>燃气管道设施与电线交叉净距少于10cm;
<input type="checkbox" :checked="jsondata.obj.shiyi.valueArr2[0]" class="input-disabled"/>燃气管道设施与用电设施净距少于30cm
</div>
<div class="contendiv">
12<input type="checkbox" :checked="jsondata.obj.shier.valueArr2[0]" class="input-disabled"/>燃气设备与计量装置安全间距不符合规范;
</div>
<div class="contendiv">
13<input type="checkbox" :checked="jsondata.obj.shisan.valueArr2[0]" class="input-disabled"/>燃气计量表具损坏或不能正常计量(仪表外表损坏、过气不走字和仪表铅封损坏等;
</div>
<div class="contendiv">
14<input type="checkbox" :checked="jsondata.obj.shisi.valueArr2[0]" class="input-disabled"/>室外燃气表箱受外力破损;
</div>
<div class="contendiv">
15<input type="checkbox" :checked="jsondata.obj.shiwu.valueArr2[0]" class="input-disabled"/>无独立厨房;
<input type="checkbox" :checked="jsondata.obj.shiwu.valueArr2[0]" class="input-disabled"/>□在用餐场所使用燃烧器具;
</div>
<td colspan="2">是否在地下室、半地下室及密闭空间中使用燃气</td>
<td>
<input v-model="jsondata.obj.qita.valueArr2[5]" type="checkbox" class="input-disabled"/>
</td>
</tr>
<tr>
<td colspan="2">安全特别提示</td>
<td colspan="12" style="padding: 7px">依据燃气相关法律法规规定,用户及时对以上( 自动填充 )处不合格项隐患问题按照整改要求进行整改,限期( 手动填写)天内整改完成,如用户需由燃气公司协助整改,费用由用户承担。未按要求整改完成, 一切后果责任由用户自行承担(可增加备注)</td>
<td colspan="2">是否存在使用不合格或软管、波纹管超2米、穿墙等</td>
<td>
<input v-model="jsondata.obj.qita.valueArr2[6]" type="checkbox" class="input-disabled"/>
</td>
</tr>
<tr>
<td colspan="2">用户意见建议</td>
<td colspan="12" style="height: 50px"></td>
<td colspan="2">是否存放超过100公斤气瓶,但未设专用气瓶间</td>
<td>
<input v-model="jsondata.obj.qita.valueArr2[7]" type="checkbox" class="input-disabled"/>
</td>
</tr>
<tr>
<td colspan="2">燃气公司建议</td>
<td colspan="12" style="padding: 7px">
1.依据《中华人民共和国安全生产法》《城镇燃气管理条例》、《河北省燃气管理条例》《唐山市燃气管理办法》,请贵单位规范使用天然气,并建立健全的燃气安全管理制度,明确责任人。<br>
2.为了安全使用天然气,请贵单位安装燃气防护报警装置,并由法定的计量机构定期校验,保证其使用正常。<br>
3.请贵单位详细阅读用户须知,正确使用天然气。<br>
4.如贵单位不能按照要求正确使用天然气,将有可能带来人员及财产损失,后果由贵单位自行负责。
<td colspan="2">是否存在私自改动燃气设施等现象</td>
<td>
<input v-model="jsondata.obj.qita.valueArr2[8]" type="checkbox" class="input-disabled"/>
</td>
</tr>
<tr>
<td colspan="2">提示</td>
<td colspan="12" style="padding: 7px">
唐山天华天然气有限公司<span style="font-size: 20px">24小时客服热线及投诉电话0315-6530022/6530023。</span>
<td>检查人签字</td>
<td>{{map.username}}</td>
<td>用户签字</td>
<td>
<div style="width: 90px;height: 26px;">
<el-image
v-if="jsondata.qmUrl"
:src="jsondata.qmUrl"
:preview-src-list="[jsondata.qmUrl]"
:z-index="9999"
style="width: 26px;height: 90px;transform: rotate(-90deg);top: -29px;left: 29px;"
>
</el-image>
<span v-else>-</span>
</div>
</td>
</tr>
<tr>
<td colspan="2">安检员</td>
<td colspan="2" style="height: 50px">{{map.username}}</td>
<td colspan="2">安检时间</td>
<td colspan="3" > {{map.createTime.substr(0,10)}}</td>
<td colspan="2">用户签字</td>
<td colspan="3" style="position: relative"> <img class="qianm" :src="jsondata.qmUrl"/></td>
<td>日期</td>
<td colspan="3">{{map.createTime.substr(0,4)}}{{ map.createTime.substr(5,2) }}{{ map.createTime.substr(8,2) }}</td>
</tr>
</table>
<!--<div style="margin: 10px">客户签字:</div>-->
</div>
......
......@@ -25,14 +25,17 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="用户编号">
<el-form-item label="表具编号">
<span>{{ detailInfo.usernum || "-" }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="表计类型">
<span>{{ typeFormat(this.detailInfo) || "-" }}</span>
<el-form-item label="用户类型">
<!--<span>{{ typeFormat(this.detailInfo) || "-" }}</span>-->
<span v-if="detailInfo.contract == '1'">小商业</span>
<span v-else-if="detailInfo.contract == '2'">大商业</span>
<span v-else>-</span>
</el-form-item>
</el-col>
......@@ -61,25 +64,21 @@
<el-col :span="8">
<el-form-item label="表具类型">
<span v-if="detailInfo.meterType == 1">皮膜</span>
<span v-if="detailInfo.meterType == 2">超声</span>
<span v-if="detailInfo.meterType == null">-</span>
<span v-if="detailInfo.meterType">{{ typeFormatter(detailInfo) }}</span>
<span>-</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="表具厂家">
<span v-if="detailInfo.meterCompany == 1">金卡</span>
<span v-if="detailInfo.meterCompany == 2">秦川</span>
<span v-if="detailInfo.meterCompany == null">-</span>
<el-form-item label="表具品牌">
<span v-if="detailInfo.meterCompany > -1">{{ meterModelCompanyFormatter(detailInfo) }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="表具型号">
<span v-if="detailInfo.meterModel == 1">G1.5</span>
<span v-if="detailInfo.meterModel == 2">G2.5</span>
<span v-if="detailInfo.meterModel == 3">G4</span>
<span v-if="detailInfo.meterModel == null">-</span>
<span v-if="detailInfo.meterModel">{{ meterModelFormatter(detailInfo,null) }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -95,11 +94,11 @@
</el-form-item>
</el-col>
<el-col :span="24">
<!--<el-col :span="24">
<el-form-item label="用气设施">
<span>{{ sheshiFormat(this.detailInfo) || "-" }}</span>
</el-form-item>
</el-col>
</el-col>-->
</el-form>
<el-form v-if="userType == 1" label-width="100px">
......@@ -514,6 +513,9 @@ export default {
barrel: "煮面桶",
wall: "壁挂炉",
},
meterCompany: [],
meterType: [],
meterModelOptional: []
};
},
watch: {
......@@ -536,6 +538,14 @@ export default {
this.getDicts("t_user_scene").then((response) => {
this.sceneOptions = response.data;
});
this.getDicts("t_business_factory_meter_type").then((response) => {
this.meterCompany = response.data;
});
this.getMeterType();
this.getMeterCompany();
this.getDicts("t_business_meter_model").then((response) => {
this.meterModelOptional = response.data;
});
},
methods: {
getDetailInfo(userId) {
......@@ -558,7 +568,7 @@ export default {
nickName: response.data.username,
iconType: "19",
});
this.gasUseDevice = JSON.parse(this.detailInfo.device);
//this.gasUseDevice = JSON.parse(this.detailInfo.device);
});
},
//获取地址信息
......@@ -633,16 +643,14 @@ export default {
//详情
handleDetail(row) {
console.log(row);
console.log("--", JSON.parse(row.content));
this.$refs.cyRecordDetail.open = true;
this.$refs.cyRecordDetail.checkType = row.type;
this.$refs.cyRecordDetail.map = row;
this.$refs.cyRecordDetail.jsondata = JSON.parse(row.content);
this.$refs.cyRecordDetail.detailInfo = this.detailInfo;
console.log(">>>>>>>>>>>>>>",JSON.parse(row.content))
if (row.type == 2) {
/*if (row.type == 2) {
this.$refs.cyRecordDetail.device = JSON.parse(this.detailInfo.device);
}
}*/
},
// 表单重置
reset() {
......@@ -827,6 +835,35 @@ export default {
this.$refs.cover.viewCoverPhoto(row.meterImg?row.meterImg:row.meterData);
},
//表计类型
typeFormatter(row){
return this.selectDictLabel(
this.meterType,
row.type
);
},
meterModelFormatter(row){
return this.selectDictLabel(
this.meterModelOptional,
row.meterModel
);
},
meterModelCompanyFormatter(row){
return this.selectDictLabel(
this.meterCompany,
row.meterCompany
);
},
getMeterType(){
this.getDicts("t_meter_type").then((response) => {
this.meterType = response.data;
});
},
getMeterCompany(){
this.getDicts("t_business_factory_meter_type").then((response) => {
this.meterCompany = response.data;
});
},
},
};
</script>
......
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