-
+
+ v-if="pageType != 'patrol'">
-
@@ -27,7 +27,7 @@
+ class="list_item_width_1" size="small" clearable placeholder="请输入">
@@ -40,7 +40,7 @@
-
@@ -51,19 +51,19 @@
+ class="list_item_width_1" size="small" clearable placeholder="请输入">
+ class="list_item_width_1" size="small" clearable placeholder="请输入">
+ class="list_item_width_1" size="small" clearable placeholder="请输入">
@@ -80,33 +80,6 @@
-
-
-
- {{ formData.equipmentName }}
-
-
- {{ formData.name }}
-
-
- {{ formData.nineSmallPlacesCategory }}
-
-
- {{ formData.scale }}
-
-
- {{ formData.chargePerson }}
-
-
- {{ formData.mobile }}
-
-
- {{ formData.address
- }}
-
-
-
-
@@ -115,7 +88,7 @@
- ●{{ item.datereviewTime}}
+ ●{{item.checkTime}}
@@ -128,14 +101,20 @@
item.reviewTime }}
- 隐患明细: {{itemC.hazardDesc}}
+ {{item.hazardDetails.findIndex(item=>item.hazardStatus === 2) === -1?'已整改隐患':'隐患明细'}}:
+ {{index+1}}.{{itemC.hazardDesc}}
+
-
- 隐患明细: {{itemC.hazardDesc}}
+
+ 未整改隐患:
+ {{index+1}}.{{itemC.hazardDesc}}
+
-
- 整改要求: {{
- item.requirements }}
+
+ 整改要求:
+ {{index+1}}.{{item.hazardDetails.find(item=>item.hazardStatus == 2).hazardDesc}}
+
+
附件: {{
@@ -145,20 +124,19 @@
-
-
-
+
-
-
+
@@ -170,7 +148,7 @@
-
@@ -179,30 +157,28 @@
-
-
+
-
+
-
-
-
+
+
+
{{ option.label }}
-
-
+
+
-
+
@@ -213,17 +189,24 @@
+
+
+
+
+
+
+
-
-
+
@@ -273,15 +256,14 @@ export default {
type: String,
default: ''
},
- detailData: {
- type: Object,
- default: null
- },
disabled: {
type: Boolean,
default: false
},
-
+ checkResultFlag:{
+ type:Number,
+ default:0
+ }
},
data() {
@@ -309,28 +291,68 @@ export default {
inputList: [{ value: '' }],//隐患输入框
fileList:[],
patrolAdd: false,
- radioOptions: [
+ checkboxOptions: [
{ label: 'Option 1', value: 'option1' },
{ label: 'Option 2', value: 'option2' },
- { label: '已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患', value: '已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患' },
+ { label: '已整改患', value: '已整改隐患' },
],
+ hazardDetails:[],
+
tableData: [
{
- datereviewTime: '2019-04-22 09:30',
+ checkTime: '2019-04-22 09:30',
checkPersons: '张三，李四',
checkResultFlag: '不合格',
reviewTime: '2019-04-22 09:30',
hazardDetails:[
- {
- hazardStatus:0,
- hazardDesc:'卫生没整好'
- }
+ {
+ "id": "hd1111",
+ "customerId": "45687aa479955f9d06204d415238f7cc",
+ "companyId": "c1111",
+ "recordId": "r1111",
+ "hazardStatus": 0,
+ "hazardDesc": "小马哥请原谅我",
+ "delFlag": null,
+ "revision": 0,
+ "createdBy": "zxc",
+ "createdTime": "2024-05-03 16:26:37",
+ "updatedBy": "zxc",
+ "updatedTime": "2024-05-03 16:26:49"
+ },
+ {
+ "id": "hd1112",
+ "customerId": "45687aa479955f9d06204d415238f7cc",
+ "companyId": "c1111",
+ "recordId": "r1111",
+ "hazardStatus": 1,
+ "hazardDesc": "小马哥喝一点酒太亢奋",
+ "delFlag": null,
+ "revision": 2,
+ "createdBy": "zxc",
+ "createdTime": "2024-05-03 16:26:37",
+ "updatedBy": "zxc",
+ "updatedTime": "2024-05-03 16:26:49"
+ },
+ {
+ "id": "hd1113",
+ "customerId": "45687aa479955f9d06204d415238f7cc",
+ "companyId": "c1111",
+ "recordId": "r1111",
+ "hazardStatus": 2,
+ "hazardDesc": "我不想这样做，但是找不到更好的原因了，抱歉小马哥",
+ "delFlag": null,
+ "revision": 0,
+ "createdBy": "zxc",
+ "createdTime": "2024-05-03 16:26:37",
+ "updatedBy": "zxc",
+ "updatedTime": "2024-05-03 16:26:49"
+ }
],
attachmentUrl: '123456789.jPg',
remark: '请相关负责人尽快处理'
},
{
- datereviewTime: '2019-04-22 09:30',
+ checkTime: '2019-04-22 09:30',
checkPersons: '张三，李四',
checkResultFlag: '不合格',
reviewTime: '2019-04-22 09:30',
@@ -369,7 +391,23 @@ export default {
chargePerson: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
mobile: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
nineSmallPlacesCategory: [{ required: true, message: '九小场所类型不能为空', trigger: 'blur' }],
- nineSmallPlacesFlag: [{ required: true, message: '九小场所类型不能为空', trigger: 'blur' }],
+ nineSmallPlacesFlag: [{ required: true, message: '九小场所不能为空', trigger: 'blur' }],
+ },
+ patrolForm:{
+ companyId:null,
+ checkTime:null,
+ checkPersonsIdList:null,
+ checkResultFlag:null,
+ reviewTime:null,
+ hazardDetails:null,
+ attachmentUrl:null,
+ remark:null,
+ },
+ patrolRule:{
+ checkTime: [{ required: true, message: '巡查时间不能为空', trigger: 'blur' }],
+ checkPersonsIdList: [{ required: true, message: '检查人员不能为空', trigger: 'blur' }],
+ checkResultFlag: [{ required: true, message: '检查结论不能为空', trigger: 'blur' }],
+ reviewTime: [{ required: true, message: '拟复查时间不能为空', trigger: 'blur' }],
},
//地图
loading: false,
@@ -428,8 +466,9 @@ export default {
this.fileList = []
e.forEach(item => {
let ob = {
- fileType: '0',
- fileUrl: item.response.data.url
+ fileType: item.raw.type,
+ fileUrl: item.response.data.url,
+ fileName:item.response.data.fileName
}
this.fileList.push(ob)
})
@@ -477,8 +516,8 @@ export default {
});
},
async getDetail() {
- const url = `/actual/base/companyInfo/companyDetail`;
- const { data, code, msg } = await requestPost(url,{companyId:this.detailId});
+ const url = `/actual/base/companyInfo/companyDetail/${this.detailId}`;
+ const { data, code, msg } = await requestPost(url);
if (code === 0) {
console.log('详情数据', data);
this.formData = { ...data };
@@ -497,7 +536,7 @@ export default {
}
});
}else if(this.pageType === 'patrol'){
- this.$refs['form2'].validate(valid => {
+ this.$refs['form3'].validate(valid => {
if (valid){
this.save();
}
@@ -511,10 +550,17 @@ export default {
var params = {};
if (this.pageType == 'add') {
url = '/actual/base/companyInfo/saveCompanyInfo';
+ params = { ...this.formData };
} else if (this.pageType == 'edit'){
url = '/actual/base/companyInfo/updateCompany';
+ params = { ...this.formData };
+ }else if(this.pageType == 'patrol'){
+ url = '/actual/base/companyInfo/addRecord';
+ params = { ...this.patrolForm };
+ params.companyId = this.detailId;
+ params.attachmentUrl = this.fileList[0];
}
- params = { ...this.formData };
+
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
this.$message.success('操作成功');
@@ -523,12 +569,14 @@ export default {
this.$message.error(msg);
}
},
+
handleCancle() {
this.resetData();
this.$emit('handleClose');
},
resetData() {
- this.$refs.form.resetFields();
+ let form = this.pageType === 'add' ||this.pageType === 'edit'||this.pageType === 'view'?'form':this.pageType === 'patrol'?'form2':'form';
+ this.$refs[form].resetFields();
},
// 开启加载动画
startLoading() {
diff --git a/src/views/modules/resourceManagement/enterprise/index.vue b/src/views/modules/resourceManagement/enterprise/index.vue
index d6b6d2a74..dcdd7c023 100644
--- a/src/views/modules/resourceManagement/enterprise/index.vue
+++ b/src/views/modules/resourceManagement/enterprise/index.vue
@@ -76,7 +76,7 @@
导出
@@ -167,12 +173,7 @@ export default {
pageSize:20,
total: 1,
detailId: '',
- detailData: {},
- multipleSelection: [],
- rowObj: {},
- option: [
- {}
- ]
+ checkResultFlag:false
};
},
components: { addForm },
@@ -193,12 +194,6 @@ export default {
this.getTableData();
},
methods: {
- handleSelectionChange(val) {
- this.multipleSelection = [];
- val.forEach(element => {
- this.multipleSelection.push(element.icEventId);
- });
- },
handleSearch(val) {
console.log(this.formData);
this.pageNo = 1;
@@ -285,6 +280,7 @@ export default {
handleAdd(row, type) {
if (row.id) {
this.detailId = row.id;
+ this.checkResultFlag = row.checkResultFlag;
}
this.pageType = type;
if (type == 'view') {