-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
@@ -58,32 +79,157 @@
- {{ formData.equipmentName }}
+ {{ formData.equipmentName }}
+
+
+ {{ formData.equipmentNum }}
+
+
+ {{ formData.principalName }}
- {{ formData.equipmentNum }}
+ {{ formData.contactNum }}
- {{ formData.principalName }}
+ {{ formData.contactNum }}
- {{ formData.contactNum }}
+ {{ formData.mobile }}
- {{ formData.location }}
+ {{ formData.location
+ }}
+
+
+ 新增
+
+
+
+
+ ●{{ item.datereviewTime}}
+
+
+
+
+ 检查人员: {{
+ item.checkPersons }}
+ 检查结论: {{
+ item.checkResultFlag }}
+ 拟复查时间: {{
+ item.reviewTime }}
+
+
+ 隐患明细: {{
+ item.hazardDetails }}
+
+
+ 整改要求: {{
+ item.requirements }}
+
+
+ 附件: {{
+ item.attachmentUrl }}
+ 备注: {{
+ item.remark }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ option.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -96,6 +242,8 @@ import { Loading } from 'element-ui'; // 引入Loading服务
import { requestPost, requestGet } from '@/js/dai/request';
import daiMap from '@/utils/dai-map';
import nextTick from 'dai-js/tools/nextTick';
+// import UploadImage from '@/views/modules/plugins/rent/rentcontractinfo-add-or-update'
+import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
let loading; // 加载动画
let map;
var search;
@@ -142,7 +290,47 @@ export default {
callback();
}
};
+ let orgOptionProps = {
+ multiple: false,
+ value: 'agencyId',
+ label: 'agencyName',
+ children: 'subAgencyList',
+ checkStrictly: true
+ }
+
return {
+ orgOptions:[],
+ orgOptionProps,
+ inputList: [{ value: '' }],//隐患输入框
+ fileList:[],
+ patrolAdd: false,
+ radioOptions: [
+ { label: 'Option 1', value: 'option1' },
+ { label: 'Option 2', value: 'option2' },
+ { label: '已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患', value: '已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患已整改隐患' },
+ ],
+ tableData: [
+ {
+ datereviewTime: '2019-04-22 09:30',
+ checkPersons: '张三，李四',
+ checkResultFlag: '不合格',
+ reviewTime: '2019-04-22 09:30',
+ issues: ['1、生产配件机械设备到达年间', '2、配件工艺未达标需要年检机械设备、配件'],
+ requirements: ['1、第1条安全一定要过关', '2、第2条，设备需要保养'],
+ attachmentUrl: '123456789.jPg',
+ remark: '请相关负责人尽快处理'
+ },
+ {
+ datereviewTime: '2019-04-22 09:30',
+ checkPersons: '张三，李四',
+ checkResultFlag: '不合格',
+ reviewTime: '2019-04-22 09:30',
+ issues: ['1、生产配件机械设备到达年间', '2、配件工艺未达标需要年检机械设备、配件'],
+ requirements: ['1、第1条安全一定要过关', '2、第2条，设备需要保养'],
+ attachmentUrl: '123456789.jPg',
+ remark: '请相关负责人尽快处理'
+ },
+ ],
detailIdcopy:this.detailId,
btnDisable: false,
user: '',
@@ -153,18 +341,24 @@ export default {
equipmentCategoryCodeArray: [],
list: {},
formData: {
- equipmentName: '',
- equipmentCategoryCode: '',
- principalName: '',
- location: '',
- contactNum: ''
+ agencyId:'',
+ name:'',
+ address:'',
+ scale:'',
+ chargePerson:'',
+ mobile:'',
+ nineSmallPlacesFlag:'',
+ nineSmallPlacesCategory:''
},
dataRule: {
- equipmentName: [{ required: true, message: '设备名称不能为空', trigger: 'bulr' }],
- equipmentNum: [{ required: true, message: '设备编号不能为空', trigger: 'bulr' }],
- principalName: [{ required: true, message: '负责人不能为空', trigger: 'bulr' }],
- contactNum: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
- location: [{ required: true, message: '所处位置不能为空', trigger: 'blur' }]
+ agencyId: [{ required: true, message: '所属组织必选', trigger: 'blur' }],
+ name: [{ required: true, message: '企业名称不能为空', trigger: 'blur' }],
+ address: [{ required: true, message: '企业地址不能为空', trigger: 'blur' }],
+ scale: [{ required: true, message: '规模不能为空', trigger: 'blur' }],
+ chargePerson: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+ mobile: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
+ nineSmallPlacesCategory: [{ required: true, message: '九小场所类型不能为空', trigger: 'blur' }],
+ nineSmallPlacesFlag: [{ required: true, message: '九小场所类型不能为空', trigger: 'blur' }],
},
//地图
loading: false,
@@ -173,9 +367,10 @@ export default {
};
},
watch: {},
- components: { },
+ components: { UploadImage },
created() {},
async mounted() {
+ this.getOrgTreeList();
console.log('detailId', this.detailId);
this.user = this.$store.state.user;
this.agencyId = this.user.agencyId;
@@ -193,6 +388,55 @@ export default {
},
methods: {
+ handleChangeAgency(val) {
+ this.sarr = []
+ const map = new Map();
+ this.getLastItem(
+ this.orgOptions,
+ val,
+ "agencyId"
+ );
+ this.level = this.sarr[this.sarr.length - 1].level
+ },
+ getOrgTreeList() {
+ this.$http
+ .post('/gov/org/customeragency/agencygridtree', {})
+ .then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ } else {
+ console.log('获取组织树成功', res.data)
+ this.orgOptions = []
+ this.orgOptions.push(res.data)
+ }
+ })
+ .catch(() => {
+ return this.$message.error('网络错误')
+ })
+ },
+ addInput() {
+ this.inputList.push({ value: '' }); // 新增一个输入框，对应一个新的对象
+ },
+ removeInput(index) {
+ this.inputList.splice(index, 1); // 删除对应索引的输入框
+ },
+ onChangeFileList(e, rowIndex = 0) {
+ console.log('onChangeFileList', e)
+ if (e.length > 0) {
+ this.fileList = []
+ e.forEach(item => {
+ let ob = {
+ fileType: '0',
+ fileUrl: item.response.data.url
+ }
+ this.fileList.push(ob)
+ })
+ }
+ },
+
+ patrolAddd(){
+ this.patrolAdd=true
+ },
async loadCategory() {
const url = '/sys/dict/data/dictlist';
@@ -423,4 +667,11 @@ export default {
.el-dialog__body {
padding: 30px 80px;
}
+.div_btn {
+ display: flex;
+}
+.custom-tag {
+ font-size: 16px; /* 设置圆点大小 */
+ border: none; /* 去掉边框 */
+}
diff --git a/src/views/modules/resourceManagement/enterprise/index.vue b/src/views/modules/resourceManagement/enterprise/index.vue
index 16d010050..b4add0cdc 100644
--- a/src/views/modules/resourceManagement/enterprise/index.vue
+++ b/src/views/modules/resourceManagement/enterprise/index.vue
@@ -4,38 +4,45 @@
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
+
+
+
+
+
-
+
-
-
+
@@ -72,11 +79,11 @@
@selection-change="handleSelectionChange" :height="maxTableHeight">
-
-
+
-
@@ -95,7 +102,7 @@
type="text">
编辑
-
巡查记录
@@ -136,17 +143,23 @@ export default {
user: '',
agencyId: '',
formData: {
- equipmentName: '',
- equipmentCategoryCode: '',
- principalName: '',
- contactNum: '',
- address: ''
+ orderDate:'',
+ checkResultFlag:'',
+ nineSmallPlacesCategory:'',
+ nineSmallPlacesFlag:'',
+ mobile:'',
+ linkPerson:'',
+ chargePerson:'',
+ scale:'',
+ address:'',
+ name:''
},
pageType: 'list', // 列表list 新增add 处理dispose 详情info
gridList: [], //所属网格list--场所区域
placeTypeList: [], //场所类型
tableData: [],
resultArray: [{ value: '1', label: '合格' }, { value: '0', label: '不合格' }],
+ nineArray: [{ value: '1', label: '是' }, { value: '0', label: '否' }],
equipmentCategoryCodeArray: [],
pageNo: 1,
pageSize: window.localStorage.getItem('pageSize') || 20,
@@ -176,8 +189,29 @@ export default {
this.loadplaceType();
this.loadCategory();
this.getTableData();
+ this.loadTable();
},
methods: {
+ async loadTable() {
+ // this.tableLoading = true
+
+ const url = "/actual/base/companyInfo/page"
+ // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
+ let params = {
+ agencyId: this.agencyId,
+ pageSize: this.pageSize,
+ pageNo: this.pageNo,
+ ...this.formData
+ }
+ const { data, code, msg } = await requestPost(url, params)
+ if (code === 0) {
+ console.log('坎坎坷坷喀喀喀喀喀喀',data)
+ this.total = data.total
+ this.tableData = data.list
+ } else {
+ this.$message.error(msg)
+ }
+ },
handleSelectionChange(val) {
this.multipleSelection = [];
val.forEach(element => {