|
|
@@ -1,51 +1,86 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
|
|
|
- <el-form-item label="维修单编号" prop="repairCode">
|
|
|
+ <el-form
|
|
|
+ :model="queryParams"
|
|
|
+ ref="queryForm"
|
|
|
+ size="small"
|
|
|
+ :inline="true"
|
|
|
+ v-show="showSearch"
|
|
|
+ label-width="100px"
|
|
|
+ >
|
|
|
+ <el-form-item label="硬件编码" prop="repairCode">
|
|
|
<el-input
|
|
|
v-model="queryParams.repairCode"
|
|
|
- placeholder="请输入维修单编号"
|
|
|
+ placeholder="请输入硬件编码"
|
|
|
clearable
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="维修单名称" prop="repairName">
|
|
|
+ <el-form-item label="硬件名称" prop="repairName">
|
|
|
<el-input
|
|
|
v-model="queryParams.repairName"
|
|
|
- placeholder="请输入维修单名称"
|
|
|
+ placeholder="请输入硬件名称"
|
|
|
clearable
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
- <el-form-item label="设备编码" prop="machineryCode">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.machineryCode"
|
|
|
- placeholder="请输入设备编码"
|
|
|
+
|
|
|
+ <el-form-item label="状态" prop="status">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.status"
|
|
|
+ placeholder="请选择硬件状态"
|
|
|
clearable
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="dict in dict.type.mes_order_status"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="设备名称" prop="machineryName">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.machineryName"
|
|
|
- placeholder="请输入设备名称"
|
|
|
+
|
|
|
+ <el-form-item label="硬件类型" prop="status">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.status"
|
|
|
+ placeholder="请选择硬件类型"
|
|
|
clearable
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="维修结果" prop="repairResult">
|
|
|
- <el-select v-model="queryParams.repairResult" placeholder="请选择维修结果" clearable>
|
|
|
+ >
|
|
|
<el-option
|
|
|
- v-for="dict in dict.type.mes_repair_result"
|
|
|
+ v-for="dict in dict.type.mes_order_status"
|
|
|
:key="dict.value"
|
|
|
:label="dict.label"
|
|
|
:value="dict.value"
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="单据状态" prop="status">
|
|
|
- <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
|
|
|
+
|
|
|
+ <el-form-item label="规格型号" prop="machineryCode">
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams.machineryCode"
|
|
|
+ placeholder="请输入规格型号"
|
|
|
+ clearable
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="创建时间" prop="machineryName">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="value2"
|
|
|
+ type="datetimerange"
|
|
|
+ :picker-options="pickerOptions"
|
|
|
+ range-separator="-"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
+ align="right"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="所属车间" prop="status">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.status"
|
|
|
+ placeholder="请选择所属车间"
|
|
|
+ clearable
|
|
|
+ >
|
|
|
<el-option
|
|
|
v-for="dict in dict.type.mes_order_status"
|
|
|
:key="dict.value"
|
|
|
@@ -54,9 +89,18 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</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-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>
|
|
|
|
|
|
@@ -68,10 +112,11 @@
|
|
|
icon="el-icon-plus"
|
|
|
size="mini"
|
|
|
@click="handleAdd"
|
|
|
- v-hasPermi="['mes:dv:repair:add']"
|
|
|
- >新增</el-button>
|
|
|
+ v-hasPermi="['mes:hw:information:add']"
|
|
|
+ >新增</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
- <el-col :span="1.5">
|
|
|
+ <!-- <el-col :span="1.5">
|
|
|
<el-button
|
|
|
type="success"
|
|
|
plain
|
|
|
@@ -80,8 +125,9 @@
|
|
|
:disabled="single"
|
|
|
@click="handleUpdate"
|
|
|
v-hasPermi="['mes:dv:repair:edit']"
|
|
|
- >修改</el-button>
|
|
|
- </el-col>
|
|
|
+ >修改</el-button
|
|
|
+ >
|
|
|
+ </el-col> -->
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
type="danger"
|
|
|
@@ -90,67 +136,93 @@
|
|
|
size="mini"
|
|
|
:disabled="multiple"
|
|
|
@click="handleDelete"
|
|
|
- v-hasPermi="['mes:dv:repair:remove']"
|
|
|
- >删除</el-button>
|
|
|
+ v-hasPermi="['mes:hw:information:remove']"
|
|
|
+ >批量删除</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
+ <right-toolbar
|
|
|
+ :showSearch.sync="showSearch"
|
|
|
+ @queryTable="getList"
|
|
|
+ ></right-toolbar>
|
|
|
</el-row>
|
|
|
|
|
|
- <el-table v-loading="loading" :data="repairList" @selection-change="handleSelectionChange">
|
|
|
+ <el-table
|
|
|
+ v-loading="loading"
|
|
|
+ :data="repairList"
|
|
|
+ @selection-change="handleSelectionChange"
|
|
|
+ >
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
- <el-table-column label="维修单编号" width="120px" align="center" prop="repairCode" />
|
|
|
- <el-table-column label="维修单名称" width="150px" align="center" prop="repairName" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column label="设备编码" align="center" prop="machineryCode" />
|
|
|
- <el-table-column label="设备名称" align="center" prop="machineryName" />
|
|
|
- <el-table-column label="报修日期" align="center" prop="requireDate" width="120">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ parseTime(scope.row.requireDate, '{y}-{m}-{d}') }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="维修完成日期" align="center" prop="finishDate" width="120">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ parseTime(scope.row.finishDate, '{y}-{m}-{d}') }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="验收日期" align="center" prop="confirmDate" width="120">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ parseTime(scope.row.confirmDate, '{y}-{m}-{d}') }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="维修结果" align="center" prop="repairResult">
|
|
|
+ <el-table-column
|
|
|
+ label="硬件编码"
|
|
|
+ width="120px"
|
|
|
+ align="center"
|
|
|
+ prop="repairCode"
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ label="硬件名称"
|
|
|
+ width="150px"
|
|
|
+ align="center"
|
|
|
+ prop="repairName"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
+ />
|
|
|
+ <el-table-column label="硬件类型" align="center" prop="machineryCode" />
|
|
|
+ <el-table-column label="规格型号" align="center" prop="machineryName" />
|
|
|
+ <el-table-column label="所属车间" align="center" prop="machineryName" />
|
|
|
+ <el-table-column label="硬件状态" align="center" prop="acceptedBy" />
|
|
|
+ <el-table-column
|
|
|
+ label="创建时间"
|
|
|
+ align="center"
|
|
|
+ prop="requireDate"
|
|
|
+ width="120"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
- <dict-tag :options="dict.type.mes_repair_result" :value="scope.row.repairResult"/>
|
|
|
+ <span>{{ parseTime(scope.row.requireDate, "{y}-{m}-{d}") }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="维修人员" align="center" prop="acceptedBy" />
|
|
|
- <el-table-column label="验收人员" align="center" prop="confirmBy" />
|
|
|
- <el-table-column label="单据状态" align="center" prop="status">
|
|
|
+ <el-table-column
|
|
|
+ label="启用时间"
|
|
|
+ align="center"
|
|
|
+ prop="finishDate"
|
|
|
+ width="120"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
- <dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
|
|
|
+ <span>{{ parseTime(scope.row.finishDate, "{y}-{m}-{d}") }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
+ <el-table-column label="可用次数" align="center" prop="machineryName" />
|
|
|
+ <el-table-column label="可用寿命" align="center" prop="machineryName" />
|
|
|
+ <el-table-column label="已用次数" align="center" prop="machineryName" />
|
|
|
+ <el-table-column label="已用寿命" align="center" prop="machineryName" />
|
|
|
+ <el-table-column
|
|
|
+ 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="['mes:dv:repair:edit']"
|
|
|
- >修改</el-button>
|
|
|
+ v-hasPermi="['mes:hw:information:edit']"
|
|
|
+ >编辑</el-button
|
|
|
+ >
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-delete"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
- v-hasPermi="['mes:dv:repair:remove']"
|
|
|
- >删除</el-button>
|
|
|
+ v-hasPermi="['mes:hw:information:remove']"
|
|
|
+ >删除</el-button
|
|
|
+ >
|
|
|
+ <el-button size="mini" type="text">预览</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
-
|
|
|
+
|
|
|
<pagination
|
|
|
- v-show="total>0"
|
|
|
+ v-show="total > 0"
|
|
|
:total="total"
|
|
|
:page.sync="queryParams.pageNum"
|
|
|
:limit.sync="queryParams.pageSize"
|
|
|
@@ -160,123 +232,115 @@
|
|
|
<!-- 添加或修改设备维修单对话框 -->
|
|
|
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
|
|
- <el-row>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="维修单编号" prop="repairCode">
|
|
|
- <el-input v-model="form.repairCode" placeholder="请输入维修单编号" />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="4">
|
|
|
- <el-form-item label-width="80">
|
|
|
- <el-switch v-model="autoGenFlag"
|
|
|
- active-color="#13ce66"
|
|
|
- active-text="自动生成"
|
|
|
- @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
|
|
|
- </el-switch>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="维修单名称" prop="repairName">
|
|
|
- <el-input v-model="form.repairName" placeholder="请输入维修单名称" />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- <el-row>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="设备编号" prop="machineryCode">
|
|
|
- <el-input v-model="form.machineryCode" placeholder="请选择设备" disabled >
|
|
|
- <el-button style="border-color: #46a6ff; background-color: #46a6ff;color: white;" slot="append" @click="handleMachineryAdd" icon="el-icon-search"></el-button>
|
|
|
- </el-input>
|
|
|
- </el-form-item>
|
|
|
- <MachinerySelectSingle ref="machinerySelect" @onSelected="onMachineryAdd"></MachinerySelectSingle>
|
|
|
- </el-col>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="设备名称" prop="machineryName">
|
|
|
- <el-input v-model="form.machineryName" placeholder="请选择设备" disabled />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="品牌" prop="machineryBrand">
|
|
|
- <el-input v-model="form.machineryBrand" placeholder="请选择设备" disabled/>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- <el-row>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="报修日期" prop="requireDate">
|
|
|
- <el-date-picker clearable
|
|
|
- v-model="form.requireDate"
|
|
|
- style="width: 187px"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="请选择报修日期">
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="维修完成日期" v-if="form.status =='APPROVING' || form.status=='FINISHED' || form.status=='CONFIRMED' " prop="finishDate">
|
|
|
- <el-date-picker clearable
|
|
|
- v-model="form.finishDate"
|
|
|
- style="width: 187px"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="请选择维修完成日期">
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="验收日期" v-if="form.status=='FINISHED' || form.status=='CONFIRMED' " prop="confirmDate">
|
|
|
- <el-date-picker clearable
|
|
|
- v-model="form.confirmDate"
|
|
|
- style="width: 187px"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="请选择验收日期">
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- <el-row>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="维修结果" v-if="form.status =='APPROVING' || form.status=='FINISHED' || form.status=='CONFIRMED' ">
|
|
|
- <el-radio-group v-model="form.repairResult">
|
|
|
- <el-radio
|
|
|
- v-for="dict in dict.type.mes_repair_result"
|
|
|
- :key="dict.value"
|
|
|
- :label="dict.value"
|
|
|
- >{{dict.label}}</el-radio>
|
|
|
- </el-radio-group>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="维修人员" prop="acceptedName" v-if="form.status =='APPROVING' || form.status=='FINISHED' || form.status=='CONFIRMED' ">
|
|
|
- <el-input v-model="form.acceptedName" readonly="readonly"/>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="验收人员" prop="confirmName" v-if="form.status=='FINISHED' || form.status=='CONFIRMED' ">
|
|
|
- <el-input v-model="form.confirmName" readonly="readonly"/>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- <el-row>
|
|
|
- <el-col :span="24">
|
|
|
- <el-form-item label="备注" prop="remark">
|
|
|
- <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- </el-form>
|
|
|
- <el-divider v-if="form.repairId !=null" content-position="center">维修内容</el-divider>
|
|
|
- <el-card shadow="always" v-if="form.repairId !=null" class="box-card">
|
|
|
- <Repairline ref="line" :repairId="form.repairId" :optType="optType"></Repairline>
|
|
|
- </el-card>
|
|
|
+ <el-form-item label="硬件编码" prop="repairCode">
|
|
|
+ <el-input v-model="form.repairCode" placeholder="请输入硬件编码" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="硬件类型" prop="status">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.status"
|
|
|
+ placeholder="请选择硬件类型"
|
|
|
+ clearable
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="dict in dict.type.mes_order_status"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="硬件名称" prop="repairName">
|
|
|
+ <el-input v-model="form.repairName" placeholder="请输入硬件名称" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="规格型号" prop="repairName">
|
|
|
+ <el-input v-model="form.repairName" placeholder="请输入规格型号" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="启用日期" prop="requireDate">
|
|
|
+ <el-date-picker
|
|
|
+ clearable
|
|
|
+ v-model="form.requireDate"
|
|
|
+ style="width: 187px"
|
|
|
+ type="date"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ placeholder="请选择启用日期"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="所属车间" prop="status">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.status"
|
|
|
+ placeholder="请选择所属车间"
|
|
|
+ clearable
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="dict in dict.type.mes_order_status"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
|
|
|
+ <el-form-item label="可用次数" prop="acceptedName">
|
|
|
+ <el-input
|
|
|
+ v-model="form.acceptedName"
|
|
|
+ readonly="readonly"
|
|
|
+ placeholder="请输入可用次数"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="已用次数" prop="acceptedName">
|
|
|
+ <el-input
|
|
|
+ v-model="form.acceptedName"
|
|
|
+ readonly="readonly"
|
|
|
+ placeholder="请输入已用次数"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="可用寿命" prop="acceptedName">
|
|
|
+ <el-input
|
|
|
+ v-model="form.acceptedName"
|
|
|
+ readonly="readonly"
|
|
|
+ placeholder="请输入可用寿命"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="已用寿命" prop="acceptedName">
|
|
|
+ <el-input
|
|
|
+ v-model="form.acceptedName"
|
|
|
+ readonly="readonly"
|
|
|
+ placeholder="请输入已用寿命"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ <!-- <el-form-item
|
|
|
+ label="状态"
|
|
|
+ prop="acceptedName"
|
|
|
+ >
|
|
|
+
|
|
|
+ </el-form-item> -->
|
|
|
+ </el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button type="primary" v-if="form.status =='PREPARE' && optType !='view'" @click="submitForm">提 交</el-button>
|
|
|
- <el-button type="primary" v-if="form.status == 'APPROVING' && optType !='view'" @click="finish">完成维修</el-button>
|
|
|
- <el-button type="success" v-if="form.status == 'FINISHED' && optType !='view'" @click="confirm">验收通过</el-button>
|
|
|
- <el-button type="danger" v-if="form.status == 'FINISHED' && optType !='view'" @click="unconfirm">不通过</el-button>
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ v-if="form.status == 'PREPARE' && optType != 'view'"
|
|
|
+ @click="submitForm"
|
|
|
+ >提 交</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ v-if="form.status == 'APPROVING' && optType != 'view'"
|
|
|
+ @click="finish"
|
|
|
+ >完成维修</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ type="success"
|
|
|
+ v-if="form.status == 'FINISHED' && optType != 'view'"
|
|
|
+ @click="confirm"
|
|
|
+ >验收通过</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ type="danger"
|
|
|
+ v-if="form.status == 'FINISHED' && optType != 'view'"
|
|
|
+ @click="unconfirm"
|
|
|
+ >不通过</el-button
|
|
|
+ >
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
@@ -284,17 +348,22 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { listRepair, getRepair, delRepair, addRepair, updateRepair } from "@/api/mes/dv/repair";
|
|
|
-import MachinerySelectSingle from "@/components/machinerySelect/single.vue";
|
|
|
-import Repairline from './line.vue'
|
|
|
-import {genCode} from "@/api/system/autocode/rule"
|
|
|
+import {
|
|
|
+ listRepair,
|
|
|
+ getRepair,
|
|
|
+ delRepair,
|
|
|
+ addRepair,
|
|
|
+ updateRepair,
|
|
|
+} from "@/api/mes/dv/repair";
|
|
|
+// import MachinerySelectSingle from "@/components/machinerySelect/single.vue";
|
|
|
+import { genCode } from "@/api/system/autocode/rule";
|
|
|
export default {
|
|
|
name: "Repair",
|
|
|
- dicts: ['mes_repair_result', 'mes_order_status'],
|
|
|
- components: {Repairline,MachinerySelectSingle},
|
|
|
+ dicts: ["mes_repair_result", "mes_order_status"],
|
|
|
+ // components: { Repairline, MachinerySelectSingle },
|
|
|
data() {
|
|
|
return {
|
|
|
- autoGenFlag:false,
|
|
|
+ autoGenFlag: false,
|
|
|
optType: undefined,
|
|
|
// 遮罩层
|
|
|
loading: true,
|
|
|
@@ -339,21 +408,54 @@ export default {
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
repairCode: [
|
|
|
- { required: true, message: "维修单编号不能为空", trigger: "blur" }
|
|
|
+ { required: true, message: "维修单编号不能为空", trigger: "blur" },
|
|
|
],
|
|
|
machineryId: [
|
|
|
- { required: true, message: "设备ID不能为空", trigger: "blur" }
|
|
|
+ { required: true, message: "设备ID不能为空", trigger: "blur" },
|
|
|
],
|
|
|
machineryCode: [
|
|
|
- { required: true, message: "设备编码不能为空", trigger: "blur" }
|
|
|
+ { required: true, message: "设备编码不能为空", trigger: "blur" },
|
|
|
],
|
|
|
machineryName: [
|
|
|
- { required: true, message: "设备名称不能为空", trigger: "blur" }
|
|
|
+ { required: true, message: "设备名称不能为空", trigger: "blur" },
|
|
|
],
|
|
|
requireDate: [
|
|
|
- { required: true, message: "请选择报修日期", trigger: "blur" }
|
|
|
+ { required: true, message: "请选择报修日期", trigger: "blur" },
|
|
|
],
|
|
|
- }
|
|
|
+ },
|
|
|
+ // 日期选择
|
|
|
+ pickerOptions: {
|
|
|
+ shortcuts: [
|
|
|
+ {
|
|
|
+ text: "最近一周",
|
|
|
+ onClick(picker) {
|
|
|
+ const end = new Date();
|
|
|
+ const start = new Date();
|
|
|
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
|
|
|
+ picker.$emit("pick", [start, end]);
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ text: "最近一个月",
|
|
|
+ onClick(picker) {
|
|
|
+ const end = new Date();
|
|
|
+ const start = new Date();
|
|
|
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
|
|
|
+ picker.$emit("pick", [start, end]);
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ text: "最近三个月",
|
|
|
+ onClick(picker) {
|
|
|
+ const end = new Date();
|
|
|
+ const start = new Date();
|
|
|
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
|
|
|
+ picker.$emit("pick", [start, end]);
|
|
|
+ },
|
|
|
+ },
|
|
|
+ ],
|
|
|
+ },
|
|
|
+ value2: "",
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -363,7 +465,7 @@ export default {
|
|
|
/** 查询设备维修单列表 */
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
|
- listRepair(this.queryParams).then(response => {
|
|
|
+ listRepair(this.queryParams).then((response) => {
|
|
|
this.repairList = response.rows;
|
|
|
this.total = response.total;
|
|
|
this.loading = false;
|
|
|
@@ -392,7 +494,7 @@ export default {
|
|
|
repairResult: "",
|
|
|
acceptedBy: null,
|
|
|
confirmBy: null,
|
|
|
- status: 'PREPARE',
|
|
|
+ status: "PREPARE",
|
|
|
remark: null,
|
|
|
attr1: null,
|
|
|
attr2: null,
|
|
|
@@ -401,9 +503,9 @@ export default {
|
|
|
createBy: null,
|
|
|
createTime: null,
|
|
|
updateBy: null,
|
|
|
- updateTime: null
|
|
|
+ updateTime: null,
|
|
|
};
|
|
|
- this.autoGenFlag= false;
|
|
|
+ this.autoGenFlag = false;
|
|
|
this.resetForm("form");
|
|
|
},
|
|
|
/** 搜索按钮操作 */
|
|
|
@@ -418,38 +520,38 @@ export default {
|
|
|
},
|
|
|
// 多选框选中数据
|
|
|
handleSelectionChange(selection) {
|
|
|
- this.ids = selection.map(item => item.repairId)
|
|
|
- this.single = selection.length!==1
|
|
|
- this.multiple = !selection.length
|
|
|
+ this.ids = selection.map((item) => item.repairId);
|
|
|
+ this.single = selection.length !== 1;
|
|
|
+ this.multiple = !selection.length;
|
|
|
},
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd() {
|
|
|
this.reset();
|
|
|
this.open = true;
|
|
|
- this.title = "添加设备维修单";
|
|
|
+ this.title = "新增硬件信息";
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
|
|
this.reset();
|
|
|
- const repairId = row.repairId || this.ids
|
|
|
- getRepair(repairId).then(response => {
|
|
|
+ const repairId = row.repairId || this.ids;
|
|
|
+ getRepair(repairId).then((response) => {
|
|
|
this.form = response.data;
|
|
|
this.open = true;
|
|
|
- this.title = "修改设备维修单";
|
|
|
+ this.title = "编辑硬件信息";
|
|
|
});
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
|
submitForm() {
|
|
|
- this.$refs["form"].validate(valid => {
|
|
|
+ this.$refs["form"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
if (this.form.repairId != null) {
|
|
|
- updateRepair(this.form).then(response => {
|
|
|
+ updateRepair(this.form).then((response) => {
|
|
|
this.$modal.msgSuccess("修改成功");
|
|
|
this.open = false;
|
|
|
this.getList();
|
|
|
});
|
|
|
} else {
|
|
|
- addRepair(this.form).then(response => {
|
|
|
+ addRepair(this.form).then((response) => {
|
|
|
this.$modal.msgSuccess("新增成功");
|
|
|
this.open = false;
|
|
|
this.getList();
|
|
|
@@ -461,41 +563,49 @@ export default {
|
|
|
/** 删除按钮操作 */
|
|
|
handleDelete(row) {
|
|
|
const repairIds = row.repairId || this.ids;
|
|
|
- this.$modal.confirm('是否确认删除设备维修单编号为"' + repairIds + '"的数据项？').then(function() {
|
|
|
- return delRepair(repairIds);
|
|
|
- }).then(() => {
|
|
|
- this.getList();
|
|
|
- this.$modal.msgSuccess("删除成功");
|
|
|
- }).catch(() => {});
|
|
|
+ this.$modal
|
|
|
+ .confirm('是否确认删除设备维修单编号为"' + repairIds + '"的数据项？')
|
|
|
+ .then(function () {
|
|
|
+ return delRepair(repairIds);
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ this.getList();
|
|
|
+ this.$modal.msgSuccess("删除成功");
|
|
|
+ })
|
|
|
+ .catch(() => {});
|
|
|
},
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
|
|
- this.download('dv/repair/export', {
|
|
|
- ...this.queryParams
|
|
|
- }, `repair_${new Date().getTime()}.xlsx`)
|
|
|
+ this.download(
|
|
|
+ "dv/repair/export",
|
|
|
+ {
|
|
|
+ ...this.queryParams,
|
|
|
+ },
|
|
|
+ `repair_${new Date().getTime()}.xlsx`
|
|
|
+ );
|
|
|
},
|
|
|
//设备资源选择弹出
|
|
|
- handleMachineryAdd(){
|
|
|
+ handleMachineryAdd() {
|
|
|
this.$refs.machinerySelect.showFlag = true;
|
|
|
},
|
|
|
//设备资源选择回调
|
|
|
- onMachineryAdd(row){
|
|
|
+ onMachineryAdd(row) {
|
|
|
this.form.machineryId = row.machineryId;
|
|
|
this.form.machineryTypeId = row.machineryTypeId;
|
|
|
this.form.machineryCode = row.machineryCode;
|
|
|
this.form.machineryName = row.machineryName;
|
|
|
this.form.machineryBrand = row.machineryBrand;
|
|
|
},
|
|
|
- //自动生成编码
|
|
|
- handleAutoGenChange(autoGenFlag){
|
|
|
- if(autoGenFlag){
|
|
|
- genCode('REPAIR_CODE').then(response =>{
|
|
|
+ //自动生成编码
|
|
|
+ handleAutoGenChange(autoGenFlag) {
|
|
|
+ if (autoGenFlag) {
|
|
|
+ genCode("REPAIR_CODE").then((response) => {
|
|
|
this.form.repairCode = response;
|
|
|
});
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
this.form.repairCode = null;
|
|
|
}
|
|
|
- }
|
|
|
- }
|
|
|
+ },
|
|
|
+ },
|
|
|
};
|
|
|
</script>
|
