elink-star
/
epmet-work-pc
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

场所类型接口更换,巡查记录联调

V4.3.1^2
mk 2 years ago
parent
96c9672eaa
commit
98ac470d23
2 changed files with 109 additions and 95 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 178
      src/views/modules/resourceManagement/enterprise/addForm.vue
  2. 26
      src/views/modules/resourceManagement/enterprise/index.vue

178
src/views/modules/resourceManagement/enterprise/addForm.vue
View File

@ -85,7 +85,7 @@
<div class="div_btn"> <div class="div_btn">
<el-button size="small" type="primary " @click="patrolAddd()">新增</el-button> <el-button size="small" type="primary " @click="patrolAddd()">新增</el-button>
</div> </div>
<el-row v-for="(item, index) in tableData" :key="index" :gutter="20" style="margin-bottom: 20px;"> <el-row v-for="(item, index) in tableData" :key="index" :gutter="20" style="margin-bottom: 20px;" v-if="tableData">
<el-row style="margin-top: 20px;"> <el-row style="margin-top: 20px;">
<el-col :span="24"> <el-col :span="24">
<el-tag type="primary" effect="plain" class="custom-tag">●</el-tag>{{item.checkTime}} <el-tag type="primary" effect="plain" class="custom-tag">●</el-tag>{{item.checkTime}}
@ -96,18 +96,24 @@
<el-col :span="6" style="padding-left: 65px;"> <span style="color: #888; ">检查人员:</span> {{ <el-col :span="6" style="padding-left: 65px;"> <span style="color: #888; ">检查人员:</span> {{
item.checkPersons }}</el-col> item.checkPersons }}</el-col>
<el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">检查结论:</span> {{ <el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">检查结论:</span> {{
item.checkResultFlag }}</el-col> item.checkResultFlag === 1?'合格':'不合格' }}</el-col>
<el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">拟复查时间: </span> {{ <el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">拟复查时间: </span> {{
item.reviewTime }}</el-col> item.reviewTime || '--' }}</el-col>
</el-row> </el-row>
<el-row style="margin-top: 15px;"> <el-row style="margin-top: 15px;">
<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">{{item.hazardDetails.findIndex(item=>item.hazardStatus === 2) === -1?'已整改隐患':'隐患明细'}}: </span> <el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">{{item.flag?'已整改隐患':'隐患明细'}}: </span>
<p style="margin-left: 60px;" v-for="(itemC,index) in item.hazardDetails.filter(item=>item.hazardStatus ==1)" >{{index+1}}.{{itemC.hazardDesc}}</p> <div v-if="item.hazardDetails">
<p style="margin-left: 60px;" v-for="(itemC,index) in item.hazardDetails.filter(item=>item.hazardStatus ==1)" >{{index+1}}.{{itemC.hazardDesc}}</p>
</div>
<span>--</span>
</el-col> </el-col>
</el-row> </el-row>
<el-row style="margin-top: 15px;" v-if="item.hazardDetails.findIndex(item=>item.hazardStatus === 2) === -1"> <el-row style="margin-top: 15px;" v-if="item.flag">
<el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">未整改隐患: </span> <el-col :span="24" style="padding-left: 65px;"><span style="color: #888; ">未整改隐患: </span>
<p style="margin-left: 60px;" v-for="(itemC,index) in item.hazardDetails.filter(item=>item.hazardStatus == 0)" >{{index+1}}.{{itemC.hazardDesc}}</p> <div v-if="item.hazardDetails">
<p style="margin-left: 60px;" v-for="(itemC,index) in item.hazardDetails.filter(item=>item.hazardStatus == 0)" >{{index+1}}.{{itemC.hazardDesc}}</p>
</div>
<span>--</span>
</el-col> </el-col>
</el-row> </el-row>
<el-row style="margin-top: 15px;" v-else> <el-row style="margin-top: 15px;" v-else>
@ -120,9 +126,12 @@
<el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">附件: </span>{{ <el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">附件: </span>{{
item.attachmentUrl }}</el-col> item.attachmentUrl }}</el-col>
<el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">备注: </span>{{ <el-col :span="6" style="padding-left: 65px;"><span style="color: #888; ">备注: </span>{{
item.remark }}</el-col> item.remark || '--' }}</el-col>
</el-row> </el-row>
</el-row> </el-row>
<div style="width:100%;height:300px;display:flex;align-items:center;justify-content: center;" v-if="tableData.length === 0&& !patrolAdd">
<span>暂无数据~</span>
</div>
<!-- 巡查记录新增 --> <!-- 巡查记录新增 -->
<el-form :inline="true" :model="patrolForm" ref="form3" :rules="patrolRule" :label-width="'105px'" <el-form :inline="true" :model="patrolForm" ref="form3" :rules="patrolRule" :label-width="'105px'"
v-if="patrolAdd"> v-if="patrolAdd">
@ -299,72 +308,72 @@ export default {
hazardDetails:[], hazardDetails:[],
tableData: [ tableData: [
{ // {
checkTime: '2019-04-22 09:30', // checkTime: '2019-04-22 09:30',
checkPersons: '张三，李四', // checkPersons: '张三，李四',
checkResultFlag: '不合格', // checkResultFlag: '不合格',
reviewTime: '2019-04-22 09:30', // reviewTime: '2019-04-22 09:30',
hazardDetails:[ // hazardDetails:[
{ // {
"id": "hd1111", // "id": "hd1111",
"customerId": "45687aa479955f9d06204d415238f7cc", // "customerId": "45687aa479955f9d06204d415238f7cc",
"companyId": "c1111", // "companyId": "c1111",
"recordId": "r1111", // "recordId": "r1111",
"hazardStatus": 0, // "hazardStatus": 0,
"hazardDesc": "小马哥请原谅我", // "hazardDesc": "小马哥请原谅我",
"delFlag": null, // "delFlag": null,
"revision": 0, // "revision": 0,
"createdBy": "zxc", // "createdBy": "zxc",
"createdTime": "2024-05-03 16:26:37", // "createdTime": "2024-05-03 16:26:37",
"updatedBy": "zxc", // "updatedBy": "zxc",
"updatedTime": "2024-05-03 16:26:49" // "updatedTime": "2024-05-03 16:26:49"
}, // },
{ // {
"id": "hd1112", // "id": "hd1112",
"customerId": "45687aa479955f9d06204d415238f7cc", // "customerId": "45687aa479955f9d06204d415238f7cc",
"companyId": "c1111", // "companyId": "c1111",
"recordId": "r1111", // "recordId": "r1111",
"hazardStatus": 1, // "hazardStatus": 1,
"hazardDesc": "小马哥喝一点酒太亢奋", // "hazardDesc": "小马哥喝一点酒太亢奋",
"delFlag": null, // "delFlag": null,
"revision": 2, // "revision": 2,
"createdBy": "zxc", // "createdBy": "zxc",
"createdTime": "2024-05-03 16:26:37", // "createdTime": "2024-05-03 16:26:37",
"updatedBy": "zxc", // "updatedBy": "zxc",
"updatedTime": "2024-05-03 16:26:49" // "updatedTime": "2024-05-03 16:26:49"
}, // },
{ // {
"id": "hd1113", // "id": "hd1113",
"customerId": "45687aa479955f9d06204d415238f7cc", // "customerId": "45687aa479955f9d06204d415238f7cc",
"companyId": "c1111", // "companyId": "c1111",
"recordId": "r1111", // "recordId": "r1111",
"hazardStatus": 2, // "hazardStatus": 2,
"hazardDesc": "我不想这样做，但是找不到更好的原因了，抱歉小马哥", // "hazardDesc": "我不想这样做，但是找不到更好的原因了，抱歉小马哥",
"delFlag": null, // "delFlag": null,
"revision": 0, // "revision": 0,
"createdBy": "zxc", // "createdBy": "zxc",
"createdTime": "2024-05-03 16:26:37", // "createdTime": "2024-05-03 16:26:37",
"updatedBy": "zxc", // "updatedBy": "zxc",
"updatedTime": "2024-05-03 16:26:49" // "updatedTime": "2024-05-03 16:26:49"
} // }
], // ],
attachmentUrl: '123456789.jPg', // attachmentUrl: '123456789.jPg',
remark: '请相关负责人尽快处理' // remark: '请相关负责人尽快处理'
}, // },
{ // {
checkTime: '2019-04-22 09:30', // checkTime: '2019-04-22 09:30',
checkPersons: '张三，李四', // checkPersons: '张三，李四',
checkResultFlag: '不合格', // checkResultFlag: '不合格',
reviewTime: '2019-04-22 09:30', // reviewTime: '2019-04-22 09:30',
hazardDetails:[ // hazardDetails:[
{ // {
hazardStatus:1, // hazardStatus:1,
hazardDesc:'卫生没整好2' // hazardDesc:'卫生没整好2'
} // }
], // ],
attachmentUrl: '123456789.jPg', // attachmentUrl: '123456789.jPg',
remark: '请相关负责人尽快处理' // remark: '请相关负责人尽快处理'
}, // },
], ],
btnDisable: false, btnDisable: false,
user: '', user: '',
@ -426,6 +435,9 @@ export default {
if (this.pageType != 'add' && this.pageType != 'patrol') { if (this.pageType != 'add' && this.pageType != 'patrol') {
this.getDetail(); this.getDetail();
}else if(this.pageType == 'patrol') { }else if(this.pageType == 'patrol') {
if(this.checkResultFlag ===1){
delete this.patrolRule.reviewTime
}
this.getCompanyDetail() this.getCompanyDetail()
this.getStafflist() this.getStafflist()
}else { }else {
@ -480,10 +492,9 @@ export default {
}, },
//场所类型 //场所类型
async loadplaceType() { async loadplaceType() {
const url = '/gov/org/coverage/dict-select-list/enterprise_patrol'; const url = '/sys/dict/data/dictlist';
let params = { let params = {
// agencyId: this.agencyId, dictType: "nine_small_places"
// purpose: 'query'
}; };
const { data, code, msg } = await requestPost(url, params); const { data, code, msg } = await requestPost(url, params);
if (code === 0) { if (code === 0) {
@ -495,9 +506,17 @@ export default {
// 巡查记录 // 巡查记录
async getCompanyDetail(){ async getCompanyDetail(){
const url = `/actual/base/companyInfo/showRecord`; const url = `/actual/base/companyInfo/showRecord`;
const { data, code, msg } = await requestPost(url,{companyId:this.detailId}); const { data, code, msg } = await requestPost(url,{id:this.detailId});
if (code === 0) { if (code === 0) {
// this.tableData = data; data.forEach(item=>{
if(!item.hiddenDangeList){
item.flag = true;
}else{
item.flag = item.hazardDetails.findIndex(item=>item.hazardStatus === 2) === -1;
}
})
console.log(data);
this.tableData = data;
} else { } else {
this.$message.error(msg); this.$message.error(msg);
} }
@ -512,7 +531,6 @@ export default {
}; };
this.$http.post("data/aggregator/org/stafflist", parms).then((resp) => { this.$http.post("data/aggregator/org/stafflist", parms).then((resp) => {
this.stafflist = resp.data.data.staffList; this.stafflist = resp.data.data.staffList;
console.log("stafflist", resp.data);
}); });
}, },
async getDetail() { async getDetail() {

26
src/views/modules/resourceManagement/enterprise/index.vue
View File

@ -214,18 +214,17 @@ export default {
}, },
//场所类型 //场所类型
async loadplaceType() { async loadplaceType() {
const url = '/gov/org/coverage/dict-select-list/enterprise_patrol'; const url = '/sys/dict/data/dictlist';
let params = { let params = {
// agencyId: this.agencyId, dictType: "nine_small_places"
// purpose: 'query' };
}; const { data, code, msg } = await requestPost(url, params);
const { data, code, msg } = await requestPost(url, params); if (code === 0) {
if (code === 0) { this.placeTypeList = data;
this.placeTypeList = data; } else {
} else { this.$message.error(msg);
this.$message.error(msg); }
} },
},
//设备类型 //设备类型
async loadCategory() { async loadCategory() {
const url = '/sys/dict/data/dictlist'; const url = '/sys/dict/data/dictlist';
@ -241,9 +240,6 @@ export default {
this.$message.error(msg); this.$message.error(msg);
} }
}, },
async handleImport() {
// 导入
},
async handleExport() { async handleExport() {
// 导出 // 导出
const url = '/actual/base/companyInfo/export'; const url = '/actual/base/companyInfo/export';

Write Preview
Loading…
Cancel
Save