|
@@ -20,6 +20,22 @@
|
|
<el-option value="3" label="已处理:未通过"></el-option>
|
|
<el-option value="3" label="已处理:未通过"></el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
+ <el-form-item label="执行班组">
|
|
|
|
+ <el-select
|
|
|
|
+ v-model="queryParams.teamId"
|
|
|
|
+ placeholder="请选择执行班组"
|
|
|
|
+ size="small"
|
|
|
|
+ style="width:160px"
|
|
|
|
+ >
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="dict in teamList"
|
|
|
|
+ :key="dict.id"
|
|
|
|
+ :label="dict.teamName"
|
|
|
|
+ :value="dict.id"
|
|
|
|
+
|
|
|
|
+ />
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
<el-form-item>
|
|
<el-form-item>
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
@@ -80,6 +96,7 @@
|
|
<span :class="scope.row.clzt == 1 ? 'color3' : scope.row.clzt == 2 ? 'color4' : 'color2'">{{scope.row.clzt == 1 ? "未处理" : scope.row.clzt == 2 ? "已处理:通过" : "已处理:未通过"}}</span>
|
|
<span :class="scope.row.clzt == 1 ? 'color3' : scope.row.clzt == 2 ? 'color4' : 'color2'">{{scope.row.clzt == 1 ? "未处理" : scope.row.clzt == 2 ? "已处理:通过" : "已处理:未通过"}}</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
|
+ <el-table-column label="执行班组" align="center" prop="teamName" show-overflow-tooltip />
|
|
<el-table-column label="处置内容" align="center" prop="clnr" show-overflow-tooltip />
|
|
<el-table-column label="处置内容" align="center" prop="clnr" show-overflow-tooltip />
|
|
<el-table-column label="处理人" align="center" prop="czPeople" show-overflow-tooltip/>
|
|
<el-table-column label="处理人" align="center" prop="czPeople" show-overflow-tooltip/>
|
|
<el-table-column label="处理时间" align="center" prop="czTime" show-overflow-tooltip />
|
|
<el-table-column label="处理时间" align="center" prop="czTime" show-overflow-tooltip />
|
|
@@ -122,9 +139,25 @@
|
|
<el-col :span="12" >
|
|
<el-col :span="12" >
|
|
<el-form-item label="工单类型" prop="workOrderType">
|
|
<el-form-item label="工单类型" prop="workOrderType">
|
|
<el-select v-model="form.workOrderType" size="small">
|
|
<el-select v-model="form.workOrderType" size="small">
|
|
- <el-option value="1" label="告警"></el-option>
|
|
|
|
- <el-option value="2" label="故障"></el-option>
|
|
|
|
- <el-option value="3" label="其它"></el-option>
|
|
|
|
|
|
+ <el-option value="1" label="消防告警"></el-option>
|
|
|
|
+ <el-option value="2" label="巡检计划"></el-option>
|
|
|
|
+ <el-option value="3" label="厕位故障"></el-option>
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-col>
|
|
|
|
+ <el-col :span="12">
|
|
|
|
+ <el-form-item label="执行班组" prop="teamId">
|
|
|
|
+ <el-select
|
|
|
|
+ v-model="form.teamId"
|
|
|
|
+ placeholder="请选择执行班组"
|
|
|
|
+ size="small"
|
|
|
|
+ >
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="dict in teamList"
|
|
|
|
+ :key="dict.id"
|
|
|
|
+ :label="dict.teamName"
|
|
|
|
+ :value="dict.id"
|
|
|
|
+ />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
@@ -161,6 +194,23 @@
|
|
<el-input v-model="form.addTime" :disabled="true" />
|
|
<el-input v-model="form.addTime" :disabled="true" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
|
|
+ <el-col :span="12">
|
|
|
|
+ <el-form-item label="执行班组" prop="teamId">
|
|
|
|
+ <el-select
|
|
|
|
+ v-model="form.teamId"
|
|
|
|
+ placeholder="请选择执行班组"
|
|
|
|
+ size="small"
|
|
|
|
+ :disabled="true"
|
|
|
|
+ >
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="dict in teamList"
|
|
|
|
+ :key="dict.id"
|
|
|
|
+ :label="dict.teamName"
|
|
|
|
+ :value="dict.id"
|
|
|
|
+ />
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-col>
|
|
|
|
|
|
</el-row>
|
|
</el-row>
|
|
<el-row :gutter="20">
|
|
<el-row :gutter="20">
|
|
@@ -185,7 +235,6 @@
|
|
<el-button @click="cancel">取 消</el-button>
|
|
<el-button @click="cancel">取 消</el-button>
|
|
</div>
|
|
</div>
|
|
</el-dialog>
|
|
</el-dialog>
|
|
-
|
|
|
|
<pagination
|
|
<pagination
|
|
v-show="total>0"
|
|
v-show="total>0"
|
|
:total="total"
|
|
:total="total"
|
|
@@ -198,7 +247,8 @@
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
<script>
|
|
<script>
|
|
-import { addWorkOrder, delWorkOrder, updateWorkOrder, getWorkOrder, exportWorkOrder, collectWorkOrder } from "@/api/business/OM/workMange";
|
|
|
|
|
|
+import { addWorkOrder, delWorkOrder, updateWorkOrder, getWorkOrder, exportWorkOrder, collectWorkOrder, workOrderOne } from "@/api/business/OM/workMange";
|
|
|
|
+import { getDevopsTeam } from "@/api/business/OM/MochaITOM/crew";
|
|
import { listChannel } from "@/api/system/product";
|
|
import { listChannel } from "@/api/system/product";
|
|
import { BASEPATH } from "@/assets/js/common.js";
|
|
import { BASEPATH } from "@/assets/js/common.js";
|
|
export default {
|
|
export default {
|
|
@@ -224,7 +274,7 @@ export default {
|
|
current: 1,
|
|
current: 1,
|
|
size: 10,
|
|
size: 10,
|
|
name: undefined,
|
|
name: undefined,
|
|
- type:2
|
|
|
|
|
|
+ status:undefined,
|
|
},
|
|
},
|
|
// 日期范围
|
|
// 日期范围
|
|
dateRange: [],
|
|
dateRange: [],
|
|
@@ -235,11 +285,18 @@ export default {
|
|
//综合数据
|
|
//综合数据
|
|
collectList:[],
|
|
collectList:[],
|
|
loading2:true,
|
|
loading2:true,
|
|
|
|
+ //班组
|
|
|
|
+ teamList:[],
|
|
};
|
|
};
|
|
},
|
|
},
|
|
created() {
|
|
created() {
|
|
- this.getList();//初始化table
|
|
|
|
this.init()//初始化
|
|
this.init()//初始化
|
|
|
|
+ if(JSON.stringify(this.$route.query) !="{}"){ //跳转至工单查询
|
|
|
|
+ console.log(this.$route.query)
|
|
|
|
+ this.workOrderOne(this.$route.query.id,this.$route.query.type)
|
|
|
|
+ }else{
|
|
|
|
+ this.getList();//初始化table
|
|
|
|
+ }
|
|
// this.company();//初始化单位选项
|
|
// this.company();//初始化单位选项
|
|
// this.facilityType();//初始化类别选项
|
|
// this.facilityType();//初始化类别选项
|
|
},
|
|
},
|
|
@@ -261,7 +318,7 @@ export default {
|
|
name:undefined,
|
|
name:undefined,
|
|
current:1,
|
|
current:1,
|
|
size:10,
|
|
size:10,
|
|
- type:2
|
|
|
|
|
|
+ status:undefined
|
|
}
|
|
}
|
|
this.resetForm("queryForm");
|
|
this.resetForm("queryForm");
|
|
this.handleQuery();
|
|
this.handleQuery();
|
|
@@ -276,6 +333,14 @@ export default {
|
|
this.queryParams.current = 1;
|
|
this.queryParams.current = 1;
|
|
this.getList();
|
|
this.getList();
|
|
},
|
|
},
|
|
|
|
+ //班组
|
|
|
|
+ getDevopsTeam(){
|
|
|
|
+ getDevopsTeam(this.queryParams).then(response => {
|
|
|
|
+ if(response.data.records.length>0){
|
|
|
|
+ this.teamList = response.data.records;
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ },
|
|
/** 查询参数列表 */
|
|
/** 查询参数列表 */
|
|
getList() {
|
|
getList() {
|
|
this.loading = true;
|
|
this.loading = true;
|
|
@@ -291,6 +356,17 @@ export default {
|
|
this.total = response.data.total;
|
|
this.total = response.data.total;
|
|
this.loading = false;
|
|
this.loading = false;
|
|
});
|
|
});
|
|
|
|
+ this.getDevopsTeam()
|
|
|
|
+ },
|
|
|
|
+ /** 工单详情查询 */
|
|
|
|
+ workOrderOne(id,type){
|
|
|
|
+ this.getDevopsTeam()
|
|
|
|
+ workOrderOne({"businessId":id,"type":type}).then(res=>{
|
|
|
|
+ console.log(res)
|
|
|
|
+ // this.adminList = response.data.records;
|
|
|
|
+ // this.total = response.data.total;
|
|
|
|
+ // this.loading = false;
|
|
|
|
+ })
|
|
},
|
|
},
|
|
/** 修改按钮操作 */
|
|
/** 修改按钮操作 */
|
|
handleUpdate(row) {
|
|
handleUpdate(row) {
|
|
@@ -316,7 +392,6 @@ export default {
|
|
if (valid) {
|
|
if (valid) {
|
|
this.loading = true
|
|
this.loading = true
|
|
if (this.form.id != undefined) {
|
|
if (this.form.id != undefined) {
|
|
- this.form.alarmStatus = 1
|
|
|
|
updateWorkOrder(this.form).then(response => {
|
|
updateWorkOrder(this.form).then(response => {
|
|
this.loading = false,
|
|
this.loading = false,
|
|
this.msgSuccess("修改成功");
|
|
this.msgSuccess("修改成功");
|
|
@@ -327,9 +402,10 @@ export default {
|
|
this.open2 = false;
|
|
this.open2 = false;
|
|
})
|
|
})
|
|
}else{
|
|
}else{
|
|
|
|
+ this.form.clzt = 1
|
|
addWorkOrder(this.form).then(response => {
|
|
addWorkOrder(this.form).then(response => {
|
|
this.loading = false,
|
|
this.loading = false,
|
|
- this.msgSuccess("修改成功");
|
|
|
|
|
|
+ this.msgSuccess("新增成功");
|
|
this.open1 = false;
|
|
this.open1 = false;
|
|
this.getList();
|
|
this.getList();
|
|
}).catch(()=>{
|
|
}).catch(()=>{
|