|
|
@@ -82,10 +82,18 @@
|
|
|
</el-row>
|
|
|
<el-table v-loading="loading" :data="adminList" style="margin-top:20px;" height="calc(100vh - 34vh)" >
|
|
|
<el-table-column label="id" align="center" prop="id" show-overflow-tooltip />
|
|
|
- <el-table-column label="单位名称" align="center" prop="companyName" show-overflow-tooltip />
|
|
|
- <el-table-column label="工单名称" align="center" prop="workOrderName" show-overflow-tooltip />
|
|
|
+ <el-table-column label="单位名称" align="center" prop="companyName" show-overflow-tooltip >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{scope.row.companyName || "东信智慧园区"}}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="工单名称" align="center" prop="workOrderContent" show-overflow-tooltip />
|
|
|
<el-table-column label="工单内容" align="center" prop="workOrderName" show-overflow-tooltip />
|
|
|
- <el-table-column label="工单类型" align="center" prop="workOrderName" />
|
|
|
+ <el-table-column label="工单类型" align="center" prop="workOrderType" >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{scope.row.workOrderType == "1" ? "消防告警" : scope.row.workOrderType == "2" ? "巡检计划" : scope.row.workOrderType == "3" ? "厕位故障" : ""}}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="上报时间" align="center" prop="addTime" show-overflow-tooltip />
|
|
|
<el-table-column label="处理状态" align="center" prop="clzt" >
|
|
|
<template slot-scope="scope">
|
|
|
@@ -140,8 +148,6 @@
|
|
|
<el-input v-model="form.workOrderContent" placeholder="请输入工单内容"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- </el-row>
|
|
|
- <el-row :gutter="20">
|
|
|
<el-col :span="12" >
|
|
|
<el-form-item label="工单类型" prop="workOrderType">
|
|
|
<el-select v-model="form.workOrderType" size="small" placeholder="请选择工单类型">
|
|
|
@@ -282,6 +288,10 @@ export default {
|
|
|
name: "WorkOrder",
|
|
|
data() {
|
|
|
return {
|
|
|
+ // 页面注解
|
|
|
+ // 1.formData 接收1消防（有误报）、2巡检、3侧位调整的数据
|
|
|
+ // 2.跳转过来或点击处置根据formRow.clzt (0未处理1处理通过2处理未通过)对处置框内容做限制
|
|
|
+ // 3.新增1消防（有误报）
|
|
|
companyList:[],
|
|
|
piliang:false,
|
|
|
exportLoading:false,
|
|
|
@@ -345,9 +355,8 @@ export default {
|
|
|
{id:1,name:"已处理：通过"},
|
|
|
{id:2,name:"已处理：未通过"},
|
|
|
],
|
|
|
- formData:[],
|
|
|
- piliang:false,
|
|
|
- formRow:{}
|
|
|
+ formData:[],//接收跳转参数
|
|
|
+ formRow:{},//clone form数据
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -443,7 +452,6 @@ export default {
|
|
|
}else{
|
|
|
this.handleUpdate(res.data)
|
|
|
this.adminList.push(res.data);
|
|
|
- console.log(this.adminList)
|
|
|
this.loading = false;
|
|
|
}
|
|
|
|
|
|
@@ -453,7 +461,6 @@ export default {
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
|
|
- console.log(row)
|
|
|
if(row.isAlarm === true){
|
|
|
row.isAlarm = true
|
|
|
}else{
|
|
|
@@ -462,7 +469,6 @@ export default {
|
|
|
this.title = "处置";
|
|
|
this.form = JSON.parse(JSON.stringify(row))
|
|
|
this.formRow = JSON.parse(JSON.stringify(row))
|
|
|
- console.log(this.formRow)
|
|
|
//this.form.clzt = 1 //默认处置通过
|
|
|
|
|
|
if(this.formData.type == "1"){
|
|
|
@@ -495,13 +501,11 @@ export default {
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
|
submitForm(row) {
|
|
|
- console.log(this.form)
|
|
|
this.$refs["form"].validate(valid => {
|
|
|
if (valid) {
|
|
|
this.loading = true
|
|
|
if (this.form.id != undefined) {
|
|
|
let type = this.formData.type
|
|
|
- console.log(type)
|
|
|
if(type=="1"){
|
|
|
this.form.clzt = 1
|
|
|
updateWorkOrder(this.form).then(response => {
|
|
|
@@ -512,7 +516,7 @@ export default {
|
|
|
|
|
|
}
|
|
|
if(type=="2"){
|
|
|
- console.log(2,this.form)
|
|
|
+ this.form.workOrderContent = this.form.clnr
|
|
|
maintianLogUpdate(this.form).then(response => {
|
|
|
this.loading = false,
|
|
|
this.msgSuccess("修改成功");
|
|
|
@@ -529,7 +533,7 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
}else{
|
|
|
- this.form.clzt = 1
|
|
|
+ this.form.clzt = 0
|
|
|
addWorkOrder(this.form).then(response => {
|
|
|
this.loading = false,
|
|
|
this.msgSuccess("新增成功");
|
|
|
@@ -595,3 +599,4 @@ export default {
|
|
|
};
|
|
|
</script>
|
|
|
|
|
|
+
|
wangtao