Merge remote-tracking branch 'origin/master'

yangwl
zhaoxiaolin 1 year ago
commit 9ecdb64952

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询点检工单列表
export function listSpotInspectionOrder(query) {
return request({
url: '/device/spotInspectionOrder/list',
method: 'get',
params: query
});
}
// 查询点检工单详细
export function getSpotInspectionOrder(orderId) {
return request({
url: '/device/spotInspectionOrder/' + orderId,
method: 'get'
});
}
// 新增点检工单
export function addSpotInspectionOrder(data) {
return request({
url: '/device/spotInspectionOrder',
method: 'post',
data: data
});
}
// 修改点检工单
export function updateSpotInspectionOrder(data) {
return request({
url: '/device/spotInspectionOrder',
method: 'put',
data: data
});
}
// 删除点检工单
export function delSpotInspectionOrder(orderId) {
return request({
url: '/device/spotInspectionOrder/' + orderId,
method: 'delete'
});
}

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询保养工单列表
export function listUpkeepOrder(query) {
return request({
url: '/device/upkeepOrder/list',
method: 'get',
params: query
});
}
// 查询保养工单详细
export function getUpkeepOrder(orderId) {
return request({
url: '/device/upkeepOrder/' + orderId,
method: 'get'
});
}
// 新增保养工单
export function addUpkeepOrder(data) {
return request({
url: '/device/upkeepOrder',
method: 'post',
data: data
});
}
// 修改保养工单
export function updateUpkeepOrder(data) {
return request({
url: '/device/upkeepOrder',
method: 'put',
data: data
});
}
// 删除保养工单
export function delUpkeepOrder(orderId) {
return request({
url: '/device/upkeepOrder/' + orderId,
method: 'delete'
});
}

@ -236,7 +236,7 @@
size="mini"
@click="handleAdd"
v-hasPermi="['device:spotCheckPlan:add']"
>新增</el-button>
>添加计划</el-button>
</el-col>
<el-col v-if="false" :span="1.5">
<el-button
@ -1049,7 +1049,7 @@ export default {
//
this.resetQuery();
this.queryEquipment = [];
this.inspectionPlanStep = 0;
this.spotCheckStep = 0;
this.selectPersonList = [];
this.personList = [];
@ -1064,7 +1064,7 @@ export default {
this.reset();
//
this.queryEquipment = [];
this.inspectionPlanStep = 0;
this.spotCheckStep = 0;
this.selectPersonList = [];
this.personList = [];
this.setPerson();

@ -0,0 +1,645 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item v-if="false" label="计划id" prop="planId">
<el-input
v-model="queryParams.planId"
placeholder="请输入计划id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="计划编码" prop="planCode">
<el-input
v-model="queryParams.planCode"
placeholder="请输入计划编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工单号" prop="orderCode">
<el-input
v-model="queryParams.orderCode"
placeholder="请输入工单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="车间编码" prop="planWorkshop">
<el-input
v-model="queryParams.planWorkshop"
placeholder="请输入车间编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item v-if="false" label="产线" prop="planProdLine">
<el-input
v-model="queryParams.planProdLine"
placeholder="请输入产线"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="循环周期" prop="planLoop">
<el-input
v-model="queryParams.planLoop"
placeholder="请输入循环周期"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item v-if="false" label="循环执行时间开始" prop="planLoopStart">
<el-date-picker clearable
v-model="queryParams.planLoopStart"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择循环执行时间开始">
</el-date-picker>
</el-form-item>
<el-form-item v-if="false" label="循环执行时间结束" prop="planLoopEnd">
<el-date-picker clearable
v-model="queryParams.planLoopEnd"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择循环执行时间结束">
</el-date-picker>
</el-form-item>
<el-form-item v-if="false" label="实际开始时间" prop="orderStart">
<el-date-picker clearable
v-model="queryParams.orderStart"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择实际开始时间">
</el-date-picker>
</el-form-item>
<el-form-item v-if="false" label="实际结束时间" prop="orderEnd">
<el-date-picker clearable
v-model="queryParams.orderEnd"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择实际结束时间">
</el-date-picker>
</el-form-item>
<el-form-item v-if="false" label="设备编码" prop="equipmentCode">
<el-input
v-model="queryParams.equipmentCode"
placeholder="请输入设备编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item v-if="false" label="工单费用" prop="orderCost">
<el-input
v-model="queryParams.orderCost"
placeholder="请输入工单费用"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="点检人" prop="planPerson">
<el-input
v-model="queryParams.planPerson"
placeholder="请输入点检人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item v-if="false" label="工单用时" prop="orderCostTime">
<el-input
v-model="queryParams.orderCostTime"
placeholder="请输入工单用时"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item v-if="false" label="签字" prop="orderSignPerson">
<el-input
v-model="queryParams.orderSignPerson"
placeholder="请输入签字"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item v-if="false" label="工厂" prop="factoryCode">
<el-input
v-model="queryParams.factoryCode"
placeholder="请输入工厂"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item v-if="false" label="备用字段1" prop="attr1">
<el-input
v-model="queryParams.attr1"
placeholder="请输入备用字段1"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item v-if="false" label="备用字段2" prop="attr2">
<el-input
v-model="queryParams.attr2"
placeholder="请输入备用字段2"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item v-if="false" label="备用字段3" prop="attr3">
<el-input
v-model="queryParams.attr3"
placeholder="请输入备用字段3"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item v-if="false" label="删除标志" prop="delFlag">
<el-input
v-model="queryParams.delFlag"
placeholder="请输入删除标志"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建人" prop="createBy">
<el-input
v-model="queryParams.createBy"
placeholder="请输入创建人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker clearable
v-model="queryParams.createTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择创建时间">
</el-date-picker>
</el-form-item>
<el-form-item label="更新人" prop="updateBy">
<el-input
v-model="queryParams.updateBy"
placeholder="请输入更新人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="更新时间" prop="updateTime">
<el-date-picker clearable
v-model="queryParams.updateTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择更新时间">
</el-date-picker>
</el-form-item>
<el-form-item>
<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-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col v-if="false" :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['device:spotInspectionOrder:add']"
>新增</el-button>
</el-col>
<el-col v-if="false" :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['device:spotInspectionOrder:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['device:spotInspectionOrder:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['device:spotInspectionOrder:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="spotInspectionOrderList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column v-if="false" label="主键" align="center" prop="orderId" />
<el-table-column v-if="false" label="计划id" align="center" prop="planId" />
<el-table-column label="计划编码" align="center" prop="planCode" />
<el-table-column v-if="false" label="计划类型" align="center" prop="planType" />
<el-table-column label="工单号" align="center" prop="orderCode" />
<el-table-column label="车间编码" align="center" prop="planWorkshop" />
<el-table-column v-if="false" label="产线" align="center" prop="planProdLine" />
<el-table-column label="循环周期" align="center" prop="planLoop" />
<el-table-column label="循环周期类型" align="center" prop="planLoopType" />
<el-table-column label="循环执行时间开始" align="center" prop="planLoopStart" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.planLoopStart, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="循环执行时间结束" align="center" prop="planLoopEnd" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="实际开始时间" align="center" prop="orderStart" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.orderStart, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="实际结束时间" align="center" prop="orderEnd" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="设备编码" align="center" prop="equipmentCode" />
<el-table-column label="工单状态" align="center" prop="orderStatus" />
<el-table-column v-if="false" label="工单费用" align="center" prop="orderCost" />
<el-table-column label="点检人" align="center" prop="planPerson" />
<el-table-column v-if="false" label="工单用时" align="center" prop="orderCostTime" />
<el-table-column v-if="false" label="签字" align="center" prop="orderSignPerson" />
<el-table-column v-if="false" label="工厂" align="center" prop="factoryCode" />
<el-table-column v-if="false" label="备用字段1" align="center" prop="attr1" />
<el-table-column v-if="false" label="备用字段2" align="center" prop="attr2" />
<el-table-column v-if="false" label="备用字段3" align="center" prop="attr3" />
<el-table-column v-if="false" label="删除标志" align="center" prop="delFlag" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy" />
<el-table-column label="更新时间" align="center" prop="updateTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column width="180" label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['device:spotInspectionOrder:edit']"
>填写记录</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['device:spotInspectionOrder:remove']"
>删除</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-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-tabs type="border-card">
<el-tab-pane label="基础信息">
<el-descriptions title="">
<el-descriptions-item label="计划编码">{{ this.form.planCode }}</el-descriptions-item>
<el-descriptions-item label="计划名称">{{ this.form.planName }}</el-descriptions-item>
<el-descriptions-item label="循环周期">{{ this.form.planLoop }}{{ this.form.planLoopType }}
</el-descriptions-item>
<el-descriptions-item label="工单编码">{{ this.form.orderCode }}</el-descriptions-item>
<el-descriptions-item label="车间编码">{{ this.form.planWorkshop }}</el-descriptions-item>
<el-descriptions-item label="工作中心">{{ this.form.workCenterName }}</el-descriptions-item>
</el-descriptions>
</el-tab-pane>
<el-tab-pane label="记录">
<!-- 设备 -->
<el-row>
<el-col :offset="9" :span="6">
<el-form-item label="设备名称:">
{{ this.form.equ.equipmentName }}
</el-form-item>
</el-col>
</el-row>
<div v-for="(detail,detailIndex) in form.equ.detailList" :key="detailIndex">
<!-- 检查项 -->
<el-row>
<el-col :span="6">
<el-form-item label="检查项:">
{{ detail.itemName }}
</el-form-item>
</el-col>
</el-row>
<div v-for="(standard,standardIndex) in detail.standardList" :key="standardIndex">
<div v-if="standard.standardType == 'qualitative' ">
<!-- 标准 -->
<el-row>
<el-col :span="6">
<el-form-item label="标准:">
{{ standard.standardName }}
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="是否达标:">
<el-radio v-model="standard.detailReach" label="0"></el-radio>
<el-radio v-model="standard.detailReach" label="1"></el-radio>
</el-form-item>
</el-col>
</el-row>
</div>
<div v-else>
<!-- 标准 -->
<el-row>
<el-col :span="5">
<el-form-item label="标准:">
{{ standard.standardName }}
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="上限:">
{{ standard.detailUpLimit }}
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="下限:">
{{ standard.detailDownLimit }}
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="单位:">
{{ standard.detailUnit }}
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="实际值:">
<el-input v-model="standard.actualValue" placeholder="请输入实际值"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
</div>
<el-divider></el-divider>
</div>
</el-tab-pane>
<el-tab-pane label="工单信息修改">
<el-row>
<el-col :span="16">
<el-form-item label="巡检时间">
<el-date-picker
v-model="form.timeArray"
type="datetimerange"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="工单状态">
<el-select v-model="form.orderStatus" placeholder="计划状态" clearable>
<el-option
v-for="dict in dict.type.device_order_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-tab-pane>
</el-tabs>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listSpotInspectionOrder, getSpotInspectionOrder, delSpotInspectionOrder, addSpotInspectionOrder, updateSpotInspectionOrder } from "@/api/device/spotInspectionOrder";
import {getDeviceOrder, updateDeviceOrder} from "@/api/device/deviceOrder";
export default {
name: "SpotInspectionOrder",
dicts: ['device_order_status', 'device_loop_type'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
spotInspectionOrderList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
planId: null,
planCode: null,
planType: 'spotInspection',
orderCode: null,
planWorkshop: null,
planProdLine: null,
planLoop: null,
planLoopType: null,
planLoopStart: null,
planLoopEnd: null,
orderStart: null,
orderEnd: null,
equipmentCode: null,
orderStatus: null,
orderCost: null,
planPerson: null,
orderCostTime: null,
orderSignPerson: null,
factoryCode: null,
attr1: null,
attr2: null,
attr3: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
equ: {equipmentName: null},
},
//
form: {
equ: {equipmentName: null},
},
//
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询点检工单列表 */
getList() {
this.loading = true;
listSpotInspectionOrder(this.queryParams).then(response => {
this.spotInspectionOrderList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
orderId: null,
planId: null,
planCode: null,
planType: 'spotInspection',
orderCode: null,
planWorkshop: null,
planProdLine: null,
planLoop: null,
planLoopType: null,
planLoopStart: null,
planLoopEnd: null,
orderStart: null,
orderEnd: null,
equipmentCode: null,
orderStatus: null,
orderCost: null,
planPerson: null,
orderCostTime: null,
orderSignPerson: null,
factoryCode: null,
attr1: null,
attr2: null,
attr3: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
equ: {equipmentName: null},
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.orderId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加点检工单";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const orderCode = row.orderCode || this.ids
getDeviceOrder(orderCode).then(response => {
this.form = response.data;
console.log("这里是回显信息")
console.log(response.data)
this.open = true;
this.title = "填写记录";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.orderId != null) {
updateDeviceOrder(this.form).then(response => {
this.$modal.msgSuccess("提交成功");
this.open = false;
this.getList();
});
} else {
addSpotInspectionOrder(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const orderIds = row.orderId || this.ids;
this.$modal.confirm('是否确认删除点检工单编号为"' + orderIds + '"的数据项?').then(function() {
return delSpotInspectionOrder(orderIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('device/spotInspectionOrder/export', {
...this.queryParams
}, `spotInspectionOrder_${new Date().getTime()}.xlsx`)
}
}
};
</script>

@ -0,0 +1,608 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item v-if="false" label="计划id" prop="planId">
<el-input
v-model="queryParams.planId"
placeholder="请输入计划id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="计划编码" prop="planCode">
<el-input
v-model="queryParams.planCode"
placeholder="请输入计划编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="保养单号" prop="orderCode">
<el-input
v-model="queryParams.orderCode"
placeholder="请输入单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="车间" prop="planWorkshop">
<el-input
v-model="queryParams.planWorkshop"
placeholder="请输入车间"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item v-if="false" label="产线" prop="planProdLine">
<el-input
v-model="queryParams.planProdLine"
placeholder="请输入产线"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="循环周期" prop="planLoop">
<el-input
v-model="queryParams.planLoop"
placeholder="请输入循环周期"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item v-if="false" label="循环执行时间开始" prop="planLoopStart">
<el-date-picker clearable
v-model="queryParams.planLoopStart"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择循环执行时间开始">
</el-date-picker>
</el-form-item>
<el-form-item v-if="false" label="循环执行时间结束" prop="planLoopEnd">
<el-date-picker clearable
v-model="queryParams.planLoopEnd"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择循环执行时间结束">
</el-date-picker>
</el-form-item>
<el-form-item v-if="false" label="实际开始时间" prop="orderStart">
<el-date-picker clearable
v-model="queryParams.orderStart"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择实际开始时间">
</el-date-picker>
</el-form-item>
<el-form-item v-if="false" label="实际结束时间" prop="orderEnd">
<el-date-picker clearable
v-model="queryParams.orderEnd"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择实际结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="设备编码" prop="equipmentCode">
<el-input
v-model="queryParams.equipmentCode"
placeholder="请输入设备编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工单费用" prop="orderCost">
<el-input
v-model="queryParams.orderCost"
placeholder="请输入工单费用"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="保养人" prop="planPerson">
<el-input
v-model="queryParams.planPerson"
placeholder="请输入保养人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item v-if="false" label="工单用时" prop="orderCostTime">
<el-input
v-model="queryParams.orderCostTime"
placeholder="请输入工单用时"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item v-if="false" label="签字" prop="orderSignPerson">
<el-input
v-model="queryParams.orderSignPerson"
placeholder="请输入签字"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item v-if="false" label="工厂" prop="factoryCode">
<el-input
v-model="queryParams.factoryCode"
placeholder="请输入工厂"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item v-if="false" label="备用字段1" prop="attr1">
<el-input
v-model="queryParams.attr1"
placeholder="请输入备用字段1"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item v-if="false" label="备用字段2" prop="attr2">
<el-input
v-model="queryParams.attr2"
placeholder="请输入备用字段2"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item v-if="false" label="备用字段3" prop="attr3">
<el-input
v-model="queryParams.attr3"
placeholder="请输入备用字段3"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item v-if="false" label="删除标志" prop="delFlag">
<el-input
v-model="queryParams.delFlag"
placeholder="请输入删除标志"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建人" prop="createBy">
<el-input
v-model="queryParams.createBy"
placeholder="请输入创建人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker clearable
v-model="queryParams.createTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择创建时间">
</el-date-picker>
</el-form-item>
<el-form-item label="更新人" prop="updateBy">
<el-input
v-model="queryParams.updateBy"
placeholder="请输入更新人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="更新时间" prop="updateTime">
<el-date-picker clearable
v-model="queryParams.updateTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择更新时间">
</el-date-picker>
</el-form-item>
<el-form-item>
<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-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['device:upkeepOrder:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['device:upkeepOrder:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['device:upkeepOrder:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['device:upkeepOrder:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="upkeepOrderList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column v-if="false" label="主键" align="center" prop="orderId" />
<el-table-column v-if="false" label="计划id" align="center" prop="planId" />
<el-table-column label="计划编码" align="center" prop="planCode" />
<el-table-column label="计划类型" align="center" prop="planType" />
<el-table-column label="保养单号" align="center" prop="orderCode" />
<el-table-column label="车间" align="center" prop="planWorkshop" />
<el-table-column v-if="false" label="产线" align="center" prop="planProdLine" />
<el-table-column label="循环周期" align="center" prop="planLoop" />
<el-table-column label="循环周期类型" align="center" prop="planLoopType" />
<el-table-column label="循环执行时间开始" align="center" prop="planLoopStart" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.planLoopStart, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="循环执行时间结束" align="center" prop="planLoopEnd" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="实际开始时间" align="center" prop="orderStart" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.orderStart, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="实际结束时间" align="center" prop="orderEnd" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="设备编码" align="center" prop="equipmentCode" />
<el-table-column label="工单状态" align="center" prop="orderStatus" />
<el-table-column label="工单费用" align="center" prop="orderCost" />
<el-table-column label="保养人" align="center" prop="planPerson" />
<el-table-column label="工单用时" align="center" prop="orderCostTime" />
<el-table-column v-if="false" label="签字" align="center" prop="orderSignPerson" />
<el-table-column v-if="false" label="工厂" align="center" prop="factoryCode" />
<el-table-column v-if="false" label="备用字段1" align="center" prop="attr1" />
<el-table-column v-if="false" label="备用字段2" align="center" prop="attr2" />
<el-table-column v-if="false" label="备用字段3" align="center" prop="attr3" />
<el-table-column v-if="false" label="删除标志" align="center" prop="delFlag" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy" />
<el-table-column label="更新时间" align="center" prop="updateTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['device:upkeepOrder:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['device:upkeepOrder:remove']"
>删除</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-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="计划id" prop="planId">
<el-input v-model="form.planId" placeholder="请输入计划id" />
</el-form-item>
<el-form-item label="计划编码" prop="planCode">
<el-input v-model="form.planCode" placeholder="请输入计划编码" />
</el-form-item>
<el-form-item label="单号" prop="orderCode">
<el-input v-model="form.orderCode" placeholder="请输入单号" />
</el-form-item>
<el-form-item label="车间" prop="planWorkshop">
<el-input v-model="form.planWorkshop" placeholder="请输入车间" />
</el-form-item>
<el-form-item label="产线" prop="planProdLine">
<el-input v-model="form.planProdLine" placeholder="请输入产线" />
</el-form-item>
<el-form-item label="循环周期" prop="planLoop">
<el-input v-model="form.planLoop" placeholder="请输入循环周期" />
</el-form-item>
<el-form-item label="循环执行时间开始" prop="planLoopStart">
<el-date-picker clearable
v-model="form.planLoopStart"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择循环执行时间开始">
</el-date-picker>
</el-form-item>
<el-form-item label="循环执行时间结束" prop="planLoopEnd">
<el-date-picker clearable
v-model="form.planLoopEnd"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择循环执行时间结束">
</el-date-picker>
</el-form-item>
<el-form-item label="实际开始时间" prop="orderStart">
<el-date-picker clearable
v-model="form.orderStart"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择实际开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="实际结束时间" prop="orderEnd">
<el-date-picker clearable
v-model="form.orderEnd"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择实际结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="设备编码" prop="equipmentCode">
<el-input v-model="form.equipmentCode" placeholder="请输入设备编码" />
</el-form-item>
<el-form-item label="工单费用" prop="orderCost">
<el-input v-model="form.orderCost" placeholder="请输入工单费用" />
</el-form-item>
<el-form-item label="责任人" prop="planPerson">
<el-input v-model="form.planPerson" placeholder="请输入责任人" />
</el-form-item>
<el-form-item label="工单用时" prop="orderCostTime">
<el-input v-model="form.orderCostTime" placeholder="请输入工单用时" />
</el-form-item>
<el-form-item label="签字" prop="orderSignPerson">
<el-input v-model="form.orderSignPerson" placeholder="请输入签字" />
</el-form-item>
<el-form-item label="工厂" prop="factoryCode">
<el-input v-model="form.factoryCode" placeholder="请输入工厂" />
</el-form-item>
<el-form-item label="备用字段1" prop="attr1">
<el-input v-model="form.attr1" placeholder="请输入备用字段1" />
</el-form-item>
<el-form-item label="备用字段2" prop="attr2">
<el-input v-model="form.attr2" placeholder="请输入备用字段2" />
</el-form-item>
<el-form-item label="备用字段3" prop="attr3">
<el-input v-model="form.attr3" placeholder="请输入备用字段3" />
</el-form-item>
<el-form-item label="删除标志" prop="delFlag">
<el-input v-model="form.delFlag" placeholder="请输入删除标志" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listUpkeepOrder, getUpkeepOrder, delUpkeepOrder, addUpkeepOrder, updateUpkeepOrder } from "@/api/device/upkeepOrder";
export default {
name: "UpkeepOrder",
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
upkeepOrderList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
planId: null,
planCode: null,
planType: "maintenance",
orderCode: null,
planWorkshop: null,
planProdLine: null,
planLoop: null,
planLoopType: null,
planLoopStart: null,
planLoopEnd: null,
orderStart: null,
orderEnd: null,
equipmentCode: null,
orderStatus: null,
orderCost: null,
planPerson: null,
orderCostTime: null,
orderSignPerson: null,
factoryCode: null,
attr1: null,
attr2: null,
attr3: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
},
//
form: {},
//
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询保养工单列表 */
getList() {
this.loading = true;
listUpkeepOrder(this.queryParams).then(response => {
this.upkeepOrderList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
orderId: null,
planId: null,
planCode: null,
planType: "maintenance",
orderCode: null,
planWorkshop: null,
planProdLine: null,
planLoop: null,
planLoopType: null,
planLoopStart: null,
planLoopEnd: null,
orderStart: null,
orderEnd: null,
equipmentCode: null,
orderStatus: null,
orderCost: null,
planPerson: null,
orderCostTime: null,
orderSignPerson: null,
factoryCode: null,
attr1: null,
attr2: null,
attr3: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.orderId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加保养工单";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const orderId = row.orderId || this.ids
getUpkeepOrder(orderId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改保养工单";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.orderId != null) {
updateUpkeepOrder(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addUpkeepOrder(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const orderIds = row.orderId || this.ids;
this.$modal.confirm('是否确认删除保养工单编号为"' + orderIds + '"的数据项?').then(function() {
return delUpkeepOrder(orderIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('device/upkeepOrder/export', {
...this.queryParams
}, `upkeepOrder_${new Date().getTime()}.xlsx`)
}
}
};
</script>
Loading…
Cancel
Save