-
新增
-
-
-
-
-
-
-
-
-
-
-
- {{scope.row.reviewTime}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{scope.row.placePatrolTeamName}}
-
-
-
-
-
-
-
-
- {{item.name}}
-
-
-
- {{scope.row.inspectorsNames}}
-
-
-
-
-
-
-
-
-
-
- {{scope.row.reviewResult==='0'?'合格':'不合格'}}
-
-
-
-
-
- 保存
- 修改
-
- 删除
-
-
-
-
+
@@ -141,252 +43,119 @@ import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // 引入Loading服务
import { requestPost } from '@/js/dai/request'
+import Tinymce from '@c/tinymce2/index.vue'
+
let loading // 加载动画
+
+
export default {
data () {
+
return {
- tableLoading: false,
- placePatrolRecordId: '',
- tableData: [],
+ formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+ btnDisable: false,
+ customerId: '',
+ actId: '',
+
+ formData: {
+ actContent: '',
+ },
+
+
}
},
- components: {},
+ components: { Tinymce },
mounted () {
+ this.customerId = localStorage.getItem('customerId')
},
methods: {
- async initTable (placePatrolRecordId) {
- this.placePatrolRecordId = placePatrolRecordId
- await this.loadTeams()
-
- await this.loadTable()
-
- },
-
-
- //加载分队
- async loadTeams () {
- const url = '/gov/org/placepatrolteam/getlist'
- // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/getlist'
- let params = {
- isPage: false
- }
-
- const { data, code, msg } = await requestPost(url, params)
-
- if (code === 0) {
- this.teamsList = data.list
-
-
- } else {
- this.$message.error(msg)
- }
- },
-
- //点击分队切换人员
- async hancleChangeTeam (row, index, tableIndex) {
- this.tableData[tableIndex].inspectorArray = [...[]]
- let teamId = this.teamsList[index].teamId
- await this.loadInspectors(teamId, tableIndex)
- },
-
- //加载分队下人员
- async loadInspectors (teamId, tableIndex) {
+ async initForm (type, actId) {
+ this.$refs.ref_form.resetFields();
+ this.startLoading()
- const url = '/gov/org/placepatrolteamstaff/getlist'
- // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteamstaff/getlist'
- let params = {
- teamId: teamId
- }
+ this.formType = type
+ if (actId) {
+ this.actId = actId
+ this.formData.actId = actId
- const { data, code, msg } = await requestPost(url, params)
- if (code === 0) {
- // let obj = this.tableData[tableIndex]
- this.tableData[tableIndex].inspectorsList = [...data]
- // this.tableData[tableIndex]=
- // obj.inspectorsList = data
- // this.$set(this.tableData, tableIndex, obj)
- console.log(this.tableData)
- } else {
- this.$message.error(msg)
}
+ this.endLoading()
},
- //加载form
- async loadTable () {
- this.tableLoading = true
- const url = '/gov/org/placepatrolreviewrecord/getlist'
- // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolreviewrecord/getlist'
- let params = {
- placePatrolRecordId: this.placePatrolRecordId
- }
- const { data, code, msg } = await requestPost(url, params)
- this.tableLoading = false
- if (code === 0) {
- if (data.list && data.list.length > 0) {
- data.list.forEach(item => {
- item.isEdit = false
- item.isNew = false
- let arrayInspectors = item.inspectors.split(',')
- item.inspectorArray = [...arrayInspectors]
- let arrayReviewTime = item.reviewTime.split(' ')
- item.reviewTime = arrayReviewTime[0]
- });
- this.tableData = [...data.list]
- } else {
- this.tableData = []
- }
+ async handleComfirm () {
+ console.log(this.formData)
+ // this.btnDisable = true
+ // setTimeout(() => {
+ // this.btnDisable = false
+ // }, 10000)
+ // this.$refs['ref_form'].validate((valid, messageObj) => {
+ // if (!valid) {
+ // app.util.validateRule(messageObj)
+ // this.btnDisable = false
+ // } else {
+ // this.addRecord()
+ // }
- } else {
- this.$message.error(msg)
- }
- },
+ // })
- handleAdd () {
- let obj = {
- isNew: true,//是否新增
- isEdit: true,//是否编辑
- placePatrolRecordId: this.placePatrolRecordId,
- reviewTime: '',
- placePatrolTeamId: '',
- inspectors: '',
- inspectorArray: [],
- inspectorsList: [],
- reviewResult: '',
- }
- this.tableData.push(obj)
},
+ async addRecord () {
+ this.formData.actContent = this.dormatHtml(this.formData.actContent)
- async handleEdit (row, tableIndex) {
- let teamId = row.placePatrolTeamId
- await this.loadInspectors(teamId, tableIndex)
+ let url = "/gov/org/placepatrolrecord/add"
+ // let url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/add"
+ this.formData.inspectors = this.formData.inspectorArray.join(',')
- let rowData = JSON.parse(JSON.stringify(row))
- rowData.isEdit = true
- rowData.isNew = false
- rowData.inspectorArray = rowData.inspectors.split(',')
+ const { data, code, msg } = await requestPost(url, this.formData)
- console.log(rowData)
- this.$set(this.tableData, tableIndex, rowData)
- },
-
- async handleComfirm (row, tableIndex) {
- let valiMsg = this.validata(row)
- if (valiMsg) {
+ if (code === 0) {
this.$message({
- type: 'warning',
- message: valiMsg
+ type: 'success',
+ message: '操作成功'
})
- return false
- }
-
- this.addReview(row, tableIndex)
-
- },
- async addReview (row, tableIndex) {
-
- let url = "/gov/org/placepatrolreviewrecord/add"
- if (row.placePatrolReviewRecordId) {
- url = "/gov/org/placepatrolreviewrecord/edit"
- }
-
- let params = JSON.parse(JSON.stringify(row))
- params.inspectors = params.inspectorArray.join(',')
- params.reviewTime = params.reviewTime + ' 00:00:00'
-
- const { data, code, msg } = await requestPost(url, params)
-
- if (code === 0) {
- let array = data.reviewTime.split(' ')
- data.reviewTime = array[0]
- data.isEdit = false
- data.isNew = false
-
- this.$set(this.tableData, tableIndex, data)
-
+ this.resetData()
+ this.$emit('dialogOk')
+ this.btnDisable = false
} else {
-
+ this.btnDisable = false
this.$message.error(msg)
}
},
- validata (row) {
- let message = ''
- if (row.reviewTime === '') {
- message = message + '复查时间不能为空；'
- }
- if (row.placePatrolTeamId === '') {
- message = message + '分队名称不能为空；'
- }
- if (row.inspectorArray.length === 0) {
- message = message + '检查人员不能为空；'
+ dormatHtml (content) {
+ let c = ''
+ if (content.indexOf('DOCTYPE') != -1) {
+ c = content.slice(45, -16);
}
- if (row.reviewResult === '') {
- message = message + '复查结论不能为空；'
- }
- return message
+ console.log('content', typeof content)
+ return c || content
},
- async handleDelete (row, tableIndex) {
-
- this.$confirm("确认删除?", "提示", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
- .then(() => {
- if (row.placePatrolReviewRecordId) {//存在id，调用服务删除
- this.deleteRecord(row, tableIndex)
- } else {//不存在id，直接删除数组数据
- this.tableData.splice(tableIndex, 1);
- }
-
- })
- .catch(err => {
- if (err == "cancel") {
-
- }
- });
- },
-
- async deleteRecord (row, tableIndex) {
-
- const url = "/gov/org/placepatrolreviewrecord/del"
-
- let params = {
- placePatrolReviewRecordId: row.placePatrolReviewRecordId
- }
- const { data, code, msg } = await requestPost(url, params)
-
- if (code === 0) {
- // this.$message({
- // type: "success",
- // message: "删除成功"
- // });
-
- this.tableData.splice(tableIndex, 1);
- } else {
- this.$message.error(msg)
- }
- },
handleCancle () {
+
+ this.resetData()
this.$emit('dialogCancle')
},
-
+ resetData () {
+ this.formData = {
+ actContent: '',
+ }
+ },
// 开启加载动画
startLoading () {
loading = Loading.service({
@@ -404,47 +173,62 @@ export default {
}
},
computed: {
- tableHeight () {
-
- return (this.clientHeight - 360)
-
+ dataRule () {
+ return {
+
+ gridId: [
+ { required: true, message: '场所网格不能为空', trigger: 'blur' }
+ ],
+ ninePlaceVal: [
+ { required: true, message: '场所类型不能为空', trigger: 'blur' },
+ ],
+ placeOrgId: [
+ { required: true, message: '场所名称不能为空', trigger: 'blur' }
+ ],
+ placePatrolTeamId: [
+ { required: true, message: '分队不能为空', trigger: 'blur' }
+ ],
+
+ inspectorArray: [
+ { required: true, message: '巡检人员不能为空', trigger: 'blur' }
+ ],
+ firstTime: [
+ { required: true, message: '首次巡查时间不能为空', trigger: 'blur' }
+ ],
+ detailed: [
+ { required: true, message: '隐患明细不能为空', trigger: 'blur' }
+ ],
+ firstResult: [
+ { required: true, message: '首次巡查结果不能为空', trigger: 'blur' }
+ ]
+ }
},
- ...mapGetters(['clientHeight'])
-
},
props: {
- resultList: {
- type: Array,
- default: []
- }
}
}
-
+
+
+