cxc/rn-bms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

第一次提交

Browse Source
This commit is contained in:
熊丽君
2021-04-15 14:29:44 +08:00
parent 6255eb9246
commit ad4e8e33c8
12 changed files with 1656 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/api/work/order.js
View File

@ -23,3 +23,18 @@ export function modify(data) {
data
});
}
// 派单选择指派人
export function getUser(params) {
return request({
url: '/order/getUser',
params
});
}
// 批量派单
export function startOrder(data) {
return request({
url: '/order/startOrder',
method:'POST',
data
});
}

46
src/api/work/orderHandle.js Normal file
View File

@ -0,0 +1,46 @@
import request from '@/utils/request';
// 批量放弃工单
export function orderClose(data) {
return request({
url: '/order/close',
method: 'POST',
data
});
}
// 工人查询所有工单 分页查询
export function getOrderList(params) {
return request({
url: '/order/getOrderList',
params
});
}
// 工人查询具体的工单 分页查询
export function getStartList(params) {
return request({
url: '/order/getStartList',
params
});
}
// 获取工人具体信息是否填写
export function getWriteStatus(params) {
return request({
url: '/order/getWriteStatus',
params
});
}
// 填写表单
export function writeForm(data) {
return request({
url: '/order/writeForm',
method: 'POST',
data
});
}
// 表单的回显
export function getWriteForm(params) {
return request({
url: '/order/getWriteForm',
params
});
}

15
src/api/work/orderHistory.js Normal file
View File

@ -0,0 +1,15 @@
import request from '@/utils/request';
// 查询所有弃单 分页查询
export function giveUpList(params) {
return request({
url: '/order/giveUpList',
params
});
}
// 查询弃单的详情/说明
export function giveUpNote(params) {
return request({
url: '/order/giveUpNote',
params
});
}

194
src/views/workOrderManage/orderApproval/detail.vue Normal file
View File

@ -0,0 +1,194 @@
<template>
<section class="app-container">
<el-row>
<!-- 地区 -->
<el-col :span="4">
<region
@selectdRegionCode="selectdRegionCode"
:currentNodeKey.sync="queryParams.provinceCode"
></region>
</el-col>
<!-- form表单 -->
<el-col :span="20">
<el-row style="margin-bottom:20px">
<el-button type="primary" @click="approvalAssign()">通过</el-button>
<el-button type="primary" @click="approvalDelete">驳回</el-button>
</el-row>
<!-- 表格区域 -->
<!-- default-expand-all 展开所有行-->
<el-table :data="tableData" style="width: 100%">
<el-table-column type="expand">
<template slot-scope="props">
<el-form label-position="left" inline class="demo-table-expand">
<el-form-item label="处理结果：">
<span>{{ props.row.workCode }}</span>
</el-form-item>
<el-form-item label="是否修复：">
<span>{{ props.row.workCode }}</span>
</el-form-item>
<el-form-item label="是否返厂：">
<span>{{ props.row.workCode }}</span>
</el-form-item>
<el-form-item label="返厂数量：">
<span>{{ props.row.workCode }}</span>
</el-form-item>
<el-form-item label="返厂单号：">
<span>{{ props.row.workCode }}</span>
</el-form-item>
</el-form>
</template>
</el-table-column>
<el-table-column
align="center"
label="序号"
type="index"
width="55"
></el-table-column>
<el-table-column align="center" label="地区" min-width="150">
<template slot-scope="scope">
{{ scope.row.proName + scope.row.cityName + scope.row.disName }}
</template>
</el-table-column>
<el-table-column
prop="workCode"
align="center"
label="工单编号"
min-width="180"
>
</el-table-column>
<el-table-column
prop="warningLevel"
align="center"
label="告警等级"
min-width="100"
>
<template slot-scope="scope">
{{ scope.row.warningLevel | toChinaNum }}级
</template>
</el-table-column>
<el-table-column
prop="warningName"
align="center"
label="告警名称"
min-width="150"
></el-table-column>
<el-table-column
prop="productName"
label="产品名称"
align="center"
min-width="100"
></el-table-column>
<el-table-column
prop="nickName"
align="center"
label="所属客户"
></el-table-column>
<el-table-column
prop="projectName"
align="center"
label="所属项目"
></el-table-column>
<el-table-column
prop="deviceSn"
align="center"
label="设备SN"
min-width="100"
></el-table-column>
<el-table-column align="center" label="建单时间" min-width="180">
<template slot-scope="scope">
{{ scope.row.createTime | formatDate }}
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<!-- <pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/> -->
</el-col>
</el-row>
</section>
</template>
<script>
import Region from '@/components/Region';
export default {
name: 'detail',
components: {
Region
},
data() {
return {
queryParams: {
id:null,
pageNum: 1,
pageSize: 100,
},
total:0,
tableData: []
};
},
methods: {
selectdRegionCode({ code }) {
this.queryParams.provinceCode = code;
this.approvalQuery();
},
orderApproval(){},
approvalDelete() {
this.$prompt('备注', '驳回备注填写', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPattern: /\S/,
inputErrorMessage: '请输入内容'
})
.then(({ value }) => {
this.$message.success(value);
// orderClose({ ids, note: value }).then(
// ({ code, data, message }) => {
// if (code !== 200){
// return this.$message.error(message);
// }
// this.$message.success(message);
// this.getList();
// }
// );
})
.catch(() => {
this.$message({
type: 'info',
message: '您已取消操作'
});
});
},
},
created() {
let { id } = this.$route.query;
if (!id) {
this.msgError('无工单ID');
this.$router.go(-1);
return;
}
this.queryParams.id = id;
this.tableData = JSON.parse(localStorage.getItem('selectList'));
// this.getDetail()
}
};
</script>
<style lang="scss" scoped>
.demo-table-expand {
font-size: 0;
}
.demo-table-expand label {
width: 90px;
color: #99a9bf;
}
.demo-table-expand .el-form-item {
margin-right: 0;
margin-bottom: 0;
width: 100%;
}
</style>

69
src/views/workOrderManage/orderApproval/index.vue Normal file
View File

@ -0,0 +1,69 @@
<template>
<div class="app-container">
<el-table :data="tableData" style="width: 100%">
<el-table-column
prop="workCode"
align="center"
label="派单编号"
min-width="180"
>
</el-table-column>
<el-table-column align="center" label="派单时间" min-width="180">
<template slot-scope="scope">
{{ scope.row.createTime | formatDate }}
</template>
</el-table-column>
<el-table-column align="center" label="派单备注" min-width="180">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="openDialog('派单备注')"
>详情</el-button
>
</template>
</el-table-column>
<el-table-column align="center" label="驳回备注" min-width="180">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="openDialog('驳回备注')"
>详情</el-button
>
</template>
</el-table-column>
<el-table-column
prop="warningLevel"
align="center"
label="处理人"
min-width="100"
>
</el-table-column>
<el-table-column align="center" label="提交时间" min-width="180">
<template slot-scope="scope">
{{ scope.row.createTime | formatDate }}
</template>
</el-table-column>
<el-table-column align="center" label="操作" min-width="180">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="approvalDetail(scope.row.id)"
>工单审批</el-button
>
</template>
</el-table-column>
</el-table>
</div>
</template>
<script>
export default {
name: 'orderApproval',
data(){
return {
tableData: JSON.parse(sessionStorage.getItem('selectList'))
}
},
methods:{
approvalDetail(id){
this.$router.push({path:'/workOrderManage/orderApproval/detail',query:{id}});
},
}
}
</script>
<style lang="scss" scoped>
</style>

308
src/views/workOrderManage/orderHandle/detail.vue Normal file
View File

@ -0,0 +1,308 @@
<template>
<section class="app-container">
<el-row>
<!-- 地区 -->
<el-col :span="4">
<region
@selectdRegionCode="selectdRegionCode"
:currentNodeKey.sync="queryParams.cityId"
></region>
</el-col>
<!-- form表单 -->
<el-col :span="20">
<el-row style="margin-bottom:20px">
<el-button type="primary" @click="onSubmitOrder"
>提交结果</el-button
>
</el-row>
<!-- 表格区域 -->
<el-table v-loading="loading" :data="tableData" style="width: 100%">
<el-table-column
align="center"
label="编号"
prop="id"
width="55"
></el-table-column>
<el-table-column align="center" label="地区" min-width="150">
<template slot-scope="scope">
{{ scope.row.proName + scope.row.cityName + scope.row.disName }}
</template>
</el-table-column>
<el-table-column
prop="workCode"
align="center"
label="工单编号"
min-width="180"
>
</el-table-column>
<el-table-column
prop="warningLevel"
align="center"
label="告警等级"
min-width="100"
>
<template slot-scope="scope">
{{ scope.row.warningLevel | toChinaNum }}级
</template>
</el-table-column>
<el-table-column
prop="warningName"
align="center"
label="告警名称"
min-width="150"
></el-table-column>
<el-table-column
prop="productName"
label="产品名称"
align="center"
min-width="100"
></el-table-column>
<el-table-column
prop="nickName"
align="center"
label="所属客户"
></el-table-column>
<el-table-column
prop="projectName"
align="center"
label="所属项目"
></el-table-column>
<el-table-column
prop="deviceSn"
align="center"
label="设备SN"
min-width="100"
></el-table-column>
<el-table-column align="center" label="建单时间" min-width="180">
<template slot-scope="scope">
{{ scope.row.createTime | formatDate }}
</template>
</el-table-column>
<el-table-column align="center" label="操作">
<template slot-scope="scope">
<el-button
type="primary"
size="mini"
@click="openFormDialog(scope.row.id)"
>填写表单</el-button
>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<!-- <pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/> -->
</el-col>
</el-row>
<!-- 填写表单的弹窗 -->
<el-dialog
title="表单填写"
:visible.sync="dialogVisible"
width="30%"
:close-on-click-modal="false"
:before-close="handleClose"
>
<el-form
:rules="rules"
ref="formData"
:model="formData"
label-width="80px"
>
<el-form-item label="处理结果" prop="resultNote">
<el-input
type="textarea"
v-model="formData.resultNote"
maxlength="500"
:autosize="{ minRows: 2, maxRows: 5 }"
show-word-limit
></el-input>
</el-form-item>
<el-form-item label="是否修复">
<el-select v-model="formData.isOk" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否返厂">
<el-select v-model="formData.isReturn" placeholder="请选择">
<el-option
v-for="item in options2"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<section v-if="formData.isReturn == 1">
<el-form-item l-form-item label="返厂数量" prop="returnNum">
<el-input v-model="formData.returnNum"></el-input>
</el-form-item>
<el-form-item label="返厂单号" prop="returnOrder">
<el-input v-model="formData.returnOrder"></el-input>
</el-form-item>
</section>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="resetForm">重 置</el-button>
<el-button type="primary" @click="onSubmit">确 定</el-button>
</span>
</el-dialog>
</section>
</template>
<script>
import Region from '@/components/Region';
import {
getStartList,
writeForm,
getWriteForm,
getWriteStatus
} from '@/api/work/orderHandle';
const formQuery = {
resultNote: '',
isOk: 1,
isReturn: 2
};
export default {
name: 'detail',
components: {
Region
},
data() {
return {
queryParams: {
id: null,
pageNum: 1,
pageSize: 100
},
// 遮罩层
loading: true,
total: 0,
tableData: [],
tableDataStatus:[],
dialogVisible: false, // 表单填写dialog的状态
formData: Object.assign({}, formQuery),
options: [
{
value: 2,
label: '否'
},
{
value: 1,
label: '是'
}
],
options2: [
{
value: 2,
label: '否'
},
{
value: 1,
label: '是'
}
],
rules: {
resultNote: [
{ required: true, message: '请填写处理结果', trigger: 'blur' }
],
returnNum: [
{ required: true, message: '请填写返厂数量', trigger: 'blur' }
],
returnOrder: [
{ required: true, message: '请填写返厂单号', trigger: 'blur' }
]
}
};
},
methods: {
// 地区
selectdRegionCode({ code }) {
this.queryParams.cityId = code;
this.getHandleDetail();
},
getHandleDetail() {
this.loading = true;
getStartList(this.queryParams).then(({ code, data, message }) => {
if (code !== 200) return this.$message.error(message);
getWriteStatus({ id: this.queryParams.id }).then(
({ code: code1, data: data1, message: message1 }) => {
if (code1 !== 200) return this.$message.error(message1);
this.tableData = data.list
this.tableDataStatus = data1
this.total = data.total
this.loading = false;
}
);
});
},
openFormDialog(id) {
this.loading = true;
this.formData.warningId = id;
getWriteForm({ id }).then(({ code, data, message }) => {
if (code !== 200) return this.$message.error(message);
if (data) {
this.formData = data;
this.dialogVisible = true;
} else {
this.dialogVisible = true;
}
this.loading = false;
});
},
// 提交所有
onSubmitOrder(){
if(!this.tableDataStatus.length) return false
const status = this.tableDataStatus.find(item=>{
return !item.status
})
if(status) return this.$message.info('还有未填写的，编号为：'+status.warningId);
this.$message.success('ok');
},
onSubmit() {
this.$refs.formData.validate(async valid => {
if (!valid) {
return this.$message.info('请填写完整表单信息');
}
writeForm(this.formData).then(({ code, data, message }) => {
if (code !== 200) return this.$message.error(message);
this.$message.success(message);
this.getHandleDetail();
this.resetForm();
this.dialogVisible = false;
});
});
},
resetForm() {
this.formData = Object.assign({}, formQuery);
},
handleClose(done) {
this.resetForm();
done();
}
},
created() {
let { id } = this.$route.query;
if (!id) {
this.msgError('无ID');
this.$router.go(-1);
return;
}
this.queryParams.id = id;
this.getHandleDetail();
}
};
</script>
<style lang="scss" scoped></style>

166
src/views/workOrderManage/orderHandle/index.vue Normal file
View File

@ -0,0 +1,166 @@
<template>
<div class="app-container">
<el-form
:size="size"
:model="queryParams"
:inline="true"
ref="queryForm"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="处理状态">
<el-select
v-model="queryParams.status"
clearable
placeholder="请选择"
>
<el-option
v-for="item in handleStatusList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type="cyan"
icon="el-icon-search"
size="mini"
@click="getHandleList"
>
查询
</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<right-toolbar
class="mb8"
:showSearch.sync="showSearch"
@queryTable="getHandleList"
></right-toolbar>
<el-table v-loading="loading" :data="handleList" style="width: 100%">
<el-table-column
prop="id"
align="center"
label="派单编号"
min-width="180"
>
</el-table-column>
<el-table-column align="center" label="派单时间" min-width="180">
<template slot-scope="scope">
{{ scope.row.createTime | formatDate }}
</template>
</el-table-column>
<el-table-column align="center" label="派单备注" min-width="180">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="openDialog('派单备注',scope.row.note)"
>详情</el-button
>
</template>
</el-table-column>
<el-table-column align="center" label="驳回备注" min-width="180">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="openDialog('驳回备注',scope.row.rejectNote)" v-if="scope.row.rejectNote">详情</el-button
>
</template>
</el-table-column>
<el-table-column align="center" label="处理状态" min-width="180">
<template slot-scope="scope">
{{ scope.row.status==1?'处理中':scope.row.status==2?'审核中':'审批驳回'}}
</template>
</el-table-column>
<el-table-column align="center" label="操作" min-width="180">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleDetail(scope.row.id)"
>工单处理</el-button
>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getHandleList"
/>
<!-- 备注弹窗 -->
<el-dialog
:title="str"
:visible.sync="dialogVisible"
width="30%"
:before-close="handleClose"
>
<span>{{strNote}}</span>
</el-dialog>
</div>
</template>
<script>
import { getOrderList } from '@/api/work/orderHandle';
export default {
name: 'orderHandle',
data() {
return {
str: '派单备注',
strNote:'',
queryParams: {
pageNum: 1,
pageSize: 10,
},
// 遮罩层
loading: true,
total:0,
handleStatusList: [
{ label: '处理中', value: '1' },
{ label: '审核中', value: '2' },
{ label: '审批驳回', value: '3' }
],
handleList:[],
dialogVisible: false, // 备注说明弹窗状态
// 显示搜索条件
showSearch: true
};
},
methods: {
// 获取所有派单
getHandleList() {
this.loading = true;
getOrderList(this.queryParams).then(({code,data,message})=>{
if (code !== 200) return this.$message.error(message);
this.handleList = data.list
this.total = data.total
this.loading = false;
})
},
// 重置按钮操作
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 10
};
// this.resetForm('queryForm');
this.getHandleList();
},
handleDetail(id){
this.$router.push({path:'/workOrderManage/orderHandle/detail',query:{id}});
},
openDialog(val,note) {
this.str = val;
this.strNote = note
this.dialogVisible = true;
},
handleClose(done) {
done();
}
},
created() {
this.getHandleList();
}
};
</script>
<style lang="scss" scoped></style>

184
src/views/workOrderManage/orderHistory/detail.vue Normal file
View File

@ -0,0 +1,184 @@
<template>
<section class="app-container">
<el-form
ref="formData"
:inline="true"
:model="tableData"
label-width="85px"
>
<el-row :gutter="20">
<el-col :span="4" class="grid-content">
<el-form-item label="派单编号：">
133666912
</el-form-item>
</el-col>
<el-col :span="4" class="grid-content">
<el-form-item label="派单时间：">
2020-02-10 10:00
</el-form-item>
</el-col>
<el-col :span="4" class="grid-content">
<el-form-item label="处理人：">
张三
</el-form-item>
</el-col>
<el-col :span="4" class="grid-content">
<el-form-item label="提交时间：">
2020-02-10 10:00
</el-form-item>
</el-col>
<el-col :span="4" class="grid-content">
<el-form-item label="通过时间：">
2020-02-10 10:00
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="派单备注：">
派单的备注...
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
<el-button type="primary">报表导出</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item label="驳回备注：">
驳回的备注...
</el-form-item>
</el-row>
</el-form>
<!-- 表格区域 -->
<!-- default-expand-all 展开所有行-->
<el-table :data="tableData" style="width: 100%">
<el-table-column type="expand">
<template slot-scope="props">
<el-form label-position="left" inline class="demo-table-expand">
<el-form-item label="处理结果：">
<span>{{ props.row.workCode }}</span>
</el-form-item>
<el-form-item label="是否修复：">
<span>{{ props.row.workCode }}</span>
</el-form-item>
<el-form-item label="是否返厂：">
<span>{{ props.row.workCode }}</span>
</el-form-item>
<el-form-item label="返厂数量：">
<span>{{ props.row.workCode }}</span>
</el-form-item>
<el-form-item label="返厂单号：">
<span>{{ props.row.workCode }}</span>
</el-form-item>
</el-form>
</template>
</el-table-column>
<el-table-column
align="center"
label="序号"
type="index"
width="55"
></el-table-column>
<el-table-column align="center" label="地区" min-width="150">
<template slot-scope="scope">
{{ scope.row.proName + scope.row.cityName + scope.row.disName }}
</template>
</el-table-column>
<el-table-column
prop="workCode"
align="center"
label="工单编号"
min-width="180"
>
</el-table-column>
<el-table-column
prop="warningLevel"
align="center"
label="告警等级"
min-width="100"
>
<template slot-scope="scope">
{{ scope.row.warningLevel | toChinaNum }}级
</template>
</el-table-column>
<el-table-column
prop="warningName"
align="center"
label="告警名称"
min-width="150"
></el-table-column>
<el-table-column
prop="productName"
label="产品名称"
align="center"
min-width="100"
></el-table-column>
<el-table-column
prop="nickName"
align="center"
label="所属客户"
></el-table-column>
<el-table-column
prop="projectName"
align="center"
label="所属项目"
></el-table-column>
<el-table-column
prop="deviceSn"
align="center"
label="设备SN"
min-width="100"
></el-table-column>
<el-table-column align="center" label="建单时间" min-width="180">
<template slot-scope="scope">
{{ scope.row.createTime | formatDate }}
</template>
</el-table-column>
</el-table>
</section>
</template>
<script>
export default {
name: 'detail',
data() {
return {
queryParams: {},
tableData: []
};
},
methods: {},
created() {
let { id } = this.$route.query;
if (!id) {
this.msgError('无ID');
this.$router.go(-1);
return;
}
this.id = id;
this.tableData = JSON.parse(localStorage.getItem('selectList'));
// this.getDetail()
}
};
</script>
<style lang="scss" scoped>
.demo-table-expand {
font-size: 0;
}
.demo-table-expand label {
width: 90px;
color: #99a9bf;
}
.demo-table-expand .el-form-item {
margin-right: 0;
margin-bottom: 0;
width: 100%;
}
/deep/.el-form--inline .el-form-item {
margin-right: 0;
margin-bottom: 0;
}
</style>

212
src/views/workOrderManage/orderHistory/index.vue Normal file
View File

@ -0,0 +1,212 @@
<template>
<div class="app-container">
<el-tabs v-model="activeName" type="card" @tab-click="historyClick">
<el-tab-pane label="完成工单" name="first">
<el-table :data="orderList" style="width: 100%">
<el-table-column
prop="workCode"
align="center"
label="派单编号"
min-width="180"
>
</el-table-column>
<el-table-column align="center" label="派单时间" min-width="180">
<template slot-scope="scope">
{{ scope.row.createTime | formatDate }}
</template>
</el-table-column>
<el-table-column align="center" label="派单备注" min-width="180">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="openDialog('派单备注')"
>详情</el-button
>
</template>
</el-table-column>
<el-table-column align="center" label="驳回备注" min-width="180">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="openDialog('驳回备注')"
>详情</el-button
>
</template>
</el-table-column>
<el-table-column
prop="warningLevel"
align="center"
label="处理人"
min-width="100"
>
</el-table-column>
<el-table-column align="center" label="提交时间" min-width="180">
<template slot-scope="scope">
{{ scope.row.createTime | formatDate }}
</template>
</el-table-column>
<el-table-column align="center" label="通过时间" min-width="180">
<template slot-scope="scope">
{{ scope.row.createTime | formatDate }}
</template>
</el-table-column>
<el-table-column align="center" label="操作" min-width="180">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="historyDetail(scope.row.id)"
>详情</el-button
>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="放弃工单" name="second">
<el-table :data="orderList" style="width: 100%">
<el-table-column align="center" label="地区" min-width="150">
<template slot-scope="scope">
{{ scope.row.proName + scope.row.cityName + scope.row.disName }}
</template>
</el-table-column>
<el-table-column
prop="workCode"
align="center"
label="工单编号"
min-width="180"
>
</el-table-column>
<el-table-column
prop="warningLevel"
align="center"
label="告警等级"
min-width="100"
>
<template slot-scope="scope">
{{ scope.row.warningLevel | toChinaNum }}级
</template>
</el-table-column>
<el-table-column
prop="warningName"
align="center"
label="告警名称"
min-width="150"
></el-table-column>
<el-table-column
prop="productName"
label="产品名称"
align="center"
min-width="100"
></el-table-column>
<el-table-column
prop="nickName"
align="center"
label="所属客户"
></el-table-column>
<el-table-column
prop="projectName"
align="center"
label="所属项目"
></el-table-column>
<el-table-column
prop="deviceSn"
align="center"
label="设备SN"
min-width="100"
></el-table-column>
<el-table-column align="center" label="建单时间" min-width="180">
<template slot-scope="scope">
{{ scope.row.createTime | formatDate }}
</template>
</el-table-column>
<el-table-column align="center" label="弃单说明" min-width="180">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="openDialog('弃单说明',scope.row.id)"
>详情</el-button
>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
<!-- 分页 -->
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="historyClick"
/>
<!-- 备注说明弹窗 -->
<el-dialog
:title="str"
:visible.sync="dialogVisible"
width="30%"
:before-close="historyClose"
>
<span>{{strNote}}</span>
</el-dialog>
</div>
</template>
<script>
import { getOrderList } from '@/api/work/orderHandle';
import { giveUpList,giveUpNote } from '@/api/work/orderHistory';
export default {
name: 'orderHistory',
data() {
return {
str: '派单备注',
strNote:'',
queryParams: {
pageNum: 1,
pageSize: 10
},
total:0,
tableData: [], // 完成工单数据
orderList: [], // 放弃工单数据
activeName: 'first',
dialogVisible: false // 备注说明弹窗状态
};
},
methods: {
historyClick(tab) {
switch (tab.name) {
case 'first':
this.getCompleteOrder();
break;
case 'second':
this.getGiveOrder();
break;
}
},
// 获取完成工单
getCompleteOrder() {
getOrderList(Object.assign({},this.queryParams,{status:4})).then(({code,data,message})=>{
if(code!==200) return this.$message.error(message);
this.tableData = data.list
this.total = data.total
})
},
historyDetail(id){
this.$router.push({path:'/workOrderManage/orderHistory/detail',query:{id}});
},
// 获取放弃工单
getGiveOrder() {
// this.orderList = JSON.parse(localStorage.getItem('selectList'));
giveUpList(this.queryParams).then(({code,data,message}) => {
if(code!==200) return this.$message.error(message);
this.orderList = data.list
this.total = data.total
});
},
openDialog(val,id) {
this.str = val;
giveUpNote({id}).then(({code,data,message})=>{
if(code!==200) return this.$message.error(message);
this.strNote = data
})
this.dialogVisible = true;
},
historyClose(done) {
done();
}
},
created() {
this.getCompleteOrder();
}
};
</script>
<style lang="scss" scoped></style>

152
src/views/workOrderManage/orderList/assign.vue Normal file
View File

@ -0,0 +1,152 @@
<template>
<div class="app-container">
<el-form
:rules="rules"
ref="form"
:model="form"
label-width="100px"
label-position="top"
>
<el-form-item label="指派工单列表">
<el-table :data="orderList" style="width: 100%">
<el-table-column align="center" label="地区" min-width="150">
<template slot-scope="scope">
{{ scope.row.proName + scope.row.cityName + scope.row.disName }}
</template>
</el-table-column>
<el-table-column
prop="workCode"
align="center"
label="工单编号"
min-width="180"
>
</el-table-column>
<el-table-column
prop="warningLevel"
align="center"
label="告警等级"
min-width="100"
>
<template slot-scope="scope">
{{ scope.row.warningLevel | toChinaNum }}级
</template>
</el-table-column>
<el-table-column
prop="warningName"
align="center"
label="告警名称"
min-width="150"
></el-table-column>
<el-table-column
prop="productName"
label="产品名称"
align="center"
min-width="100"
></el-table-column>
<el-table-column
prop="nickName"
align="center"
label="所属客户"
></el-table-column>
<el-table-column
prop="projectName"
align="center"
label="所属项目"
></el-table-column>
<el-table-column
prop="deviceSn"
align="center"
label="设备SN"
min-width="100"
></el-table-column>
<el-table-column align="center" label="建单时间" min-width="180">
<template slot-scope="scope">
{{ scope.row.createTime | formatDate }}
</template>
</el-table-column>
</el-table>
</el-form-item>
<el-form-item label="选择指派人" prop="workerId">
<el-select v-model="form.workerId" placeholder="选择指派人">
<el-option
v-for="item in userList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="指派备注">
<el-input
type="textarea"
v-model="form.note"
maxlength="300"
show-word-limit
></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">派单</el-button>
<!-- <el-button @click="$router.go(-1)">取消</el-button> -->
</el-form-item>
</el-form>
</div>
</template>
<script>
import { getUser, startOrder } from '@/api/work/order';
export default {
name: 'assign',
data() {
return {
orderList: [],
userList: [],
form: {},
rules: {
workerId: [{ required: true, message: '请选择指派人', trigger: 'blur' }]
}
};
},
methods: {
onSubmit() {
this.$refs.form.validate(async valid => {
if (!valid) {
return this.$message.info('请填写完整表单信息');
}
startOrder(this.form).then(({ code, data, message }) => {
if (code !== 200) return this.$message.error(message);
this.$message.success(message);
sessionStorage.removeItem('selectList')
this.$router.go(-1);
});
});
}
},
created() {
if (
sessionStorage.getItem('selectList') == '' ||
!JSON.parse(sessionStorage.getItem('selectList'))
)
return this.$router.go(-1);
this.orderList = JSON.parse(sessionStorage.getItem('selectList'));
let ids = [];
for (let i = 0; i < this.orderList.length; i++) {
ids.push(this.orderList[i].id);
}
this.form.warningIds = ids;
getUser().then(({ code, data, message }) => {
if (code !== 200) return this.$message.error(message);
this.userList = data;
});
// if (typeof this.$route.query.id == 'number') {
// this.ids = [this.$route.query.id];
// } else {
// this.ids = this.$route.query.id.split(',');
// // this.ids = this.$route.query.id.split(',').map(Number);
// }
// console.log(this.ids);
// console.log(JSON.parse(sessionStorage.getItem('ids')));
}
};
</script>
<style lang="scss" scoped></style>

322
src/views/workOrderManage/orderList/index.vue
View File

@ -3,38 +3,81 @@
<el-row>
<!-- 地区 -->
<el-col :span="4">
<region @selectdRegionCode="selectdRegionCode" :currentNodeKey.sync="queryParams.provinceCode"></region>
<region
@selectdRegionCode="selectdRegionCode"
:currentNodeKey.sync="queryParams.provinceCode"
></region>
</el-col>
<!-- form表单 -->
<el-col :span="20">
<el-form :size="size" :model="queryParams" :inline="true" ref="queryForm" v-show="showSearch" label-width="68px">
<el-form
:size="size"
:model="queryParams"
:inline="true"
ref="queryForm"
v-show="showSearch"
label-width="68px"
>
<!-- 第一行 -->
<el-row>
<el-col :span="6">
<el-form-item label="告警等级">
<el-select v-model="queryParams.warningLevel" clearable placeholder="请输入告警等级">
<el-option v-for="item in signalLevelList" :key="item.value" :label="item.label" :value="item.value">
<el-select
v-model="queryParams.warningLevel"
clearable
placeholder="请输入告警等级"
>
<el-option
v-for="item in signalLevelList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="告警名称">
<el-input v-model="queryParams.warningName" placeholder="请输入告警名称" clearable @keyup.enter.native="handleQuery" />
<el-input
v-model="queryParams.warningName"
placeholder="请输入告警名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品名称">
<el-select v-model="queryParams.productId" clearable placeholder="请选择">
<el-option v-for="item in queryProductSelectList" :key="item.id" :label="item.productName" :value="item.productId">
<el-select
v-model="queryParams.productId"
clearable
placeholder="请选择"
>
<el-option
v-for="item in queryProductSelectList"
:key="item.id"
:label="item.productName"
:value="item.productId"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="所属客户">
<el-select v-model="queryParams.userId" clearable placeholder="请选择" @change="queryUserIdChange">
<el-option v-for="item in queryUserSelectList" :key="item.id" :label="item.nickName" :value="item.userId">
<el-select
v-model="queryParams.userId"
clearable
placeholder="请选择"
@change="queryUserIdChange"
>
<el-option
v-for="item in queryUserSelectList"
:key="item.id"
:label="item.nickName"
:value="item.userId"
>
</el-option>
</el-select>
</el-form-item>
@ -44,8 +87,17 @@
<el-row>
<el-col :span="6">
<el-form-item label="所属项目">
<el-select v-model="queryParams.projectId" clearable placeholder="请选择">
<el-option v-for="item in queryProjectSelectList" :key="item.id" :label="item.projectName" :value="item.projectId">
<el-select
v-model="queryParams.projectId"
clearable
placeholder="请选择"
>
<el-option
v-for="item in queryProjectSelectList"
:key="item.id"
:label="item.projectName"
:value="item.projectId"
>
</el-option>
</el-select>
</el-form-item>
@ -57,17 +109,50 @@
</el-col> -->
<el-col :span="6">
<el-form-item label="设备SN">
<el-input v-model="queryParams.deviceSn" placeholder="请输入设备SN" clearable @keyup.enter.native="handleQuery" />
<el-input
v-model="queryParams.deviceSn"
placeholder="请输入设备SN"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<!-- <el-col :span="6">
<el-form-item label="工单编号">
<el-input v-model="queryParams.workCode" placeholder="请输入工单编号" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item>
<el-button
type="cyan"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>
查询
</el-button>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="工单编号">
<el-input v-model="queryParams.workCode" placeholder="请输入工单编号" clearable @keyup.enter.native="handleQuery" />
<el-form-item>
<el-button type="cyan" size="mini" @click="batchAssign">
批量派单
</el-button>
<el-button type="cyan" size="mini" @click="batchDelete"
>批量弃单</el-button
>
</el-form-item>
</el-col>
</el-row>
<!-- 第三行 -->
<el-row>
<!-- <el-row>
<el-col :span="6">
<el-form-item label="工单状态">
<el-select v-model="queryParams.workStatus" clearable placeholder="请选择">
@ -90,11 +175,20 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-col>
</el-row>
</el-row> -->
</el-form>
<right-toolbar class="mb8" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
<right-toolbar
class="mb8"
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
<!-- 表格区域 -->
<el-table v-loading="loading" :data="tableData" style="width: 100%">
<el-table
v-loading="loading"
:data="tableData"
@selection-change="handleSelectionChange"
style="width: 100%"
>
<!-- 省市区 -->
<!-- <el-table-column
prop="proName"
@ -117,45 +211,132 @@
min-width="80"
>
</el-table-column> -->
<el-table-column
align="center"
type="selection"
width="55"
></el-table-column>
<el-table-column align="center" label="地区" min-width="150">
<template slot-scope="scope">
{{ scope.row.proName + scope.row.cityName + scope.row.disName }}
</template>
</el-table-column>
<el-table-column prop="workCode" align="center" label="工单编号" min-width="180">
<template slot-scope="scope">
<el-table-column
prop="workCode"
align="center"
label="工单编号"
min-width="180"
>
<!-- <template slot-scope="scope">
<el-link type="primary" :href="'./detail?id=' + scope.row.id" target="_blank">{{scope.row.workCode}}</el-link>
</template>
</template> -->
</el-table-column>
<el-table-column prop="warningLevel" align="center" label="告警等级" min-width="100">
<el-table-column
prop="warningLevel"
align="center"
label="告警等级"
min-width="100"
>
<template slot-scope="scope">
{{ scope.row.warningLevel | toChinaNum }}级
</template>
</el-table-column>
<el-table-column prop="warningName" align="center" label="告警名称" min-width="150"></el-table-column>
<el-table-column prop="productName" label="产品名称" align="center" min-width="100"></el-table-column>
<el-table-column prop="nickName" align="center" label="所属客户"></el-table-column>
<el-table-column prop="projectName" align="center" label="所属项目"></el-table-column>
<el-table-column
prop="warningName"
align="center"
label="告警名称"
min-width="150"
></el-table-column>
<el-table-column
prop="productName"
label="产品名称"
align="center"
min-width="100"
></el-table-column>
<el-table-column
prop="nickName"
align="center"
label="所属客户"
></el-table-column>
<el-table-column
prop="projectName"
align="center"
label="所属项目"
></el-table-column>
<!-- <el-table-column align="center" label="站址名称"></el-table-column> -->
<!-- <el-table-column prop="deviceName" align="center" label="设备名称"></el-table-column> -->
<el-table-column prop="deviceSn" align="center" label="设备SN" min-width="100"></el-table-column>
<el-table-column
prop="deviceSn"
align="center"
label="设备SN"
min-width="100"
></el-table-column>
<el-table-column prop="status" align="center" label="告警状态"></el-table-column>
<!-- <el-table-column
prop="status"
align="center"
label="告警状态"
></el-table-column>
<el-table-column prop="workStatus" align="center" label="工单状态">
<template slot-scope="scope">
{{ workStatusList.find(v=> v.value == scope.row.workStatus)['label']}}
{{
workStatusList.find(v => v.value == scope.row.workStatus)[
'label'
]
}}
</template>
</el-table-column>
</el-table-column> -->
<el-table-column align="center" label="建单时间" min-width="180">
<template slot-scope="scope">
{{ scope.row.createTime | formatDate }}
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
width="150px"
>
<template slot-scope="scope">
<el-button
v-if="scope.row.status == 2"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleOptionUpdate(scope.row)"
v-hasPermi="['system:signal:option:select']"
>
信号量选项</el-button
>
<!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:signal:save']">派单</el-button> -->
<!-- <el-button class="text-danger" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:signal:remove']">弃单</el-button> -->
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleAssign(scope.row)"
>派单</el-button
>
<el-button
class="text-danger"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete([scope.row.id])"
>弃单</el-button
>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-col>
</el-row>
</section>
@ -163,9 +344,10 @@
<script>
import Region from '@/components/Region';
import { list } from '@/api/work/order';
import { select as productSelect } from "@/api/hardware/product";
import { userSelect } from "@/api/system/user";
import { select as projectSelect } from "@/api/hardware/project";
import { select as productSelect } from '@/api/hardware/product';
import { userSelect } from '@/api/system/user';
import { select as projectSelect } from '@/api/hardware/project';
import { orderClose } from '@/api/work/orderHandle';
export default {
name: 'workOrder',
components: {
@ -173,6 +355,7 @@ export default {
},
data() {
return {
multipleSelection: [], // 勾选的item
queryProductSelectList: [], // 产品名称
queryUserSelectList: [], // 客户
queryProjectSelectList: [], // 项目
@ -185,7 +368,7 @@ export default {
workStatusList: [
{ label: '待接单', value: '1' },
{ label: '待回单', value: '2' },
{ label: '已回单', value: '3' },
{ label: '已回单', value: '3' }
],
queryParams: {
pageNum: 1,
@ -202,6 +385,67 @@ export default {
};
},
methods: {
// 多选状态
handleSelectionChange(val) {
this.multipleSelection = val;
},
// 批量弃单
batchDelete(){
if(!this.multipleSelection.length) return this.$message.info('请先勾选工单');
let ids = [];
for (let i = 0; i < this.multipleSelection.length; i++) {
ids.push(this.multipleSelection[i].id);
}
this.handleDelete(ids)
},
// 弃单操作
handleDelete(ids) {
console.log(ids);
this.$prompt('弃单说明', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPattern: /\S/,
inputErrorMessage: '请输入内容'
})
.then(({ value }) => {
orderClose({ ids, note: value }).then(
({ code, data, message }) => {
if (code !== 200){
return this.$message.error(message);
}
this.$message.success(message);
this.getList();
}
);
})
.catch(() => {
this.$message({
type: 'info',
message: '您已取消操作'
});
});
},
// 批量派单
batchAssign(){
if(!this.multipleSelection.length) return this.$message.info('请先勾选工单');
// let ids = [];
// for (let i = 0; i < this.multipleSelection.length; i++) {
// ids.push(this.multipleSelection[i].id);
// }
// ids=ids.join(',')
this.handleAssign(this.multipleSelection)
},
// 派单操作
handleAssign(rows) {
if(rows.length){
sessionStorage.setItem('selectList',JSON.stringify(rows))
}else{
sessionStorage.setItem('selectList',JSON.stringify([rows]))
}
// sessionStorage.setItem('ids',JSON.stringify(ids))
this.$router.push({path:'/workOrderManage/orderList/assign'});
// this.$router.push({path:'/workOrderManage/orderList/assign',query:{id:ids}});
},
selectdRegionCode({ code }) {
this.queryParams.provinceCode = code;
this.handleQuery();
@ -228,7 +472,7 @@ export default {
} else {
this.$message.error(msg);
}
})
});
},
// 搜索按钮操作
handleQuery() {
@ -257,14 +501,14 @@ export default {
} else {
this.$message.error(msg);
}
})
});
userSelect().then(({ code, msg, select }) => {
if (code == 200) {
this.queryUserSelectList = select;
} else {
this.$message.error(msg);
}
})
});
}
};
</script>

3
vue.config.js
View File

@ -34,7 +34,8 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://192.168.99.118:8080`,
target: `http://192.168.99.239:8080`,
// target: `http://192.168.99.118:8080`,
// target: `http://47.115.73.110:8080`,
// target: `http://121.37.250.170:8080`,
// target: `http://192.168.0.129:8080`,