Skip to content

M
mes-ui
Commit c9dac1a3 authored by zhuli's avatar zhuli
Browse files
Options

添加工单记录查看

parent a85774de
Hide whitespace changes
Inline Side-by-side
Showing with 625 additions and 4 deletions
src/api/mes/pro/workorderRecord.js 0 → 100644
View file @ c9dac1a3
import request from '@/utils/request'
// 查询工单变更记录列表
export function listRecord(query) {
return request({
url: '/md/record/list',
method: 'get',
params: query
})
}
// 查询工单变更记录详细
export function getRecord(id) {
return request({
url: '/md/record/' + id,
method: 'get'
})
}
// 新增工单变更记录
export function addRecord(data) {
return request({
url: '/md/record',
method: 'post',
data: data
})
}
// 修改工单变更记录
export function updateRecord(data) {
return request({
url: '/md/record',
method: 'put',
data: data
})
}
// 删除工单变更记录
export function delRecord(id) {
return request({
url: '/md/record/' + id,
method: 'delete'
})
}
src/components/workorderRecordSelect/index.vue 0 → 100644
View file @ c9dac1a3
<template>
<el-dialog
title="工单变更记录"
v-if="showFlag"
:visible.sync="showFlag"
:modal="true"
width="80%"
append-to-body
center
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<!-- <el-form-item label="工单id" prop="workorderId">
<el-input
v-model="queryParams.workorderId"
placeholder="请输入工单id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="工单名称" prop="workorderName">
<el-input
v-model="queryParams.workorderName"
placeholder="请输入工单名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工单编码" prop="workorderCode">
<el-input
@keyup.enter.native="handleQuery"
v-model="queryParams.workorderCode"
placeholder="请输入工单编码"
clearable
/>
</el-form-item>
<el-form-item label="请求类型" prop="actionType">
<el-select v-model="queryParams.actionType" placeholder="请选择请求类型" clearable>
<el-option label="请选择字典生成" value="" />
</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-form-item>
</el-form>
<el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="工单名称" align="center" prop="workorderName" />
<el-table-column label="工单编码" align="center" prop="workorderCode" />
<el-table-column label="请求类型" align="center" prop="actionType" />
<el-table-column label="更新时间" align="center" prop="createTime" />
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-dialog>
</template>
<script>
import { listRecord, getRecord, delRecord, addRecord, updateRecord } from "@/api/md/record";
export default {
name: "Record",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 工单变更记录表格数据
recordList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
workorderId: null, workorderName: null, workorderCode: null, actionType: null, requestBody: null, },
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询工单变更记录列表 */
getList() {
this.loading = true;
listRecord(this.queryParams).then(response => {
this.recordList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null, workorderId: null, workorderName: null, workorderCode: null, actionType: null, requestBody: null, createTime: null, createBy: null, updateTime: null, updateBy: 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.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加工单变更记录";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getRecord(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改工单变更记录";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateRecord(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addRecord(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除工单变更记录编号为"' + ids + '"的数据项？').then(function() {
return delRecord(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('md/record/export', {
...this.queryParams
}, `record_${new Date().getTime()}.xlsx`)
}
}
};
</script>
src/components/workorderRecordSelect2/index.vue 0 → 100644
View file @ c9dac1a3
<template>
<el-dialog
title="工单更新记录"
v-if="showFlag"
:visible.sync="showFlag"
:modal="true"
width="80%"
append-to-body
center
>
<el-form
:model="queryParams"
ref="queryForm"
size="small"
inline
v-show="showSearch"
label-width="110px"
>
<el-form-item label="工单名称" prop="workorderName">
<el-input
v-model="queryParams.workorderName"
placeholder="请输入工单名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工单编码" prop="workorderCode">
<el-input
@keyup.enter.native="handleQuery"
v-model="queryParams.workorderCode"
placeholder="请输入工单编码"
clearable
/>
</el-form-item>
<el-form-item label="请求类型" prop="actionType">
<el-select v-model="queryParams.actionType" placeholder="请选择请求类型" clearable>
<el-option
v-for="dict in dict.type.sap_action_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
>
</el-option> </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-form-item>
</el-form>
<el-table
v-loading="loading"
:data="processRoutesList"
highlight-current-row
@current-change="handleCurrent"
@row-dblclick="handleRowDbClick"
height="400"
>
<el-table-column label="工单名称" align="center" prop="workorderName" />
<el-table-column label="工单编码" align="center" prop="workorderCode" />
<el-table-column label="请求类型" align="center" prop="actionType" />
<el-table-column label="更新时间" align="center" prop="createTime" />
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<div slot="footer" class="dialog-footer">
<!-- <el-button type="primary" @click="confirmSelect">确 定</el-button> -->
<el-button @click="showFlag = false">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { listProroute } from "@/api/mes/pro/proroute";
import { listRouteprocess } from "@/api/mes/pro/routeprocess";
import { listRecord, getRecord, delRecord, addRecord, updateRecord } from "@/api/mes/pro/workorderRecord";
export default {
name: "RoutesProcessSelectSingle",
components: {},
dicts: [
"sap_action_type"
], data() {
return {
showFlag: false,
// 选中数组
selectedRouteId: undefined,
selectedRows: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
processList: [],
// 品牌表格数据
processRoutesList: [],
// // 品牌名称
// brandName: undefined,
defaultProps: {
children: "children",
label: "label",
},
processLoading: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
routeCode: null,
routeName: null,
routeDesc: null,
enableFlag: null,
},
};
},
created() {
this.getList();
},
methods: {
/** 查询工厂列表 */
getList() {
this.loading = true;
listRecord(this.queryParams).then((response) => {
this.processRoutesList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
handleCurrent(row) {
const params = {
pageNum: 1,
pageSize: 1000,
routeId: row.routeId,
};
this.processLoading = true;
listRouteprocess(params)
.then(({ rows }) => {
this.processList = rows;
this.processLoading = false;
})
.catch(() => {
this.processLoading = false;
});
if (row) {
this.selectedRows = row;
}
},
getProcess() {},
// 单选选中数据
handleRowChange(row) {
if (row) {
this.selectedRows = row;
}
},
//双击选中
handleRowDbClick(row) {
if (row) {
this.selectedRows = row;
this.$emit("onSelected", this.selectedRows);
this.showFlag = false;
}
},
//确定选中
confirmSelect() {
if (this.selectedRouteId == null || this.selectedRouteId == 0) {
this.$notify({
title: "提示",
type: "warning",
message: "请至少选择一条数据!",
});
return;
}
this.$emit("onSelected", this.selectedRows);
this.showFlag = false;
},
},
};
</script>
src/views/mes/pro/workorder/changerecord/index.vue 0 → 100644
View file @ c9dac1a3
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<!-- <el-form-item label="工单id" prop="workorderId">
<el-input
v-model="queryParams.workorderId"
placeholder="请输入工单id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="工单名称" prop="workorderName">
<el-input
v-model="queryParams.workorderName"
placeholder="请输入工单名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工单编码" prop="workorderCode">
<el-input
v-model="queryParams.workorderCode"
placeholder="请输入工单编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="请求类型" prop="actionType">
<el-select v-model="queryParams.actionType" placeholder="请选择请求类型" clearable>
<el-option label="请选择字典生成" value="" />
</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-form-item>
</el-form>
<el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="工单名称" align="center" prop="workorderName" />
<el-table-column label="工单编码" align="center" prop="workorderCode" />
<el-table-column label="请求类型" align="center" prop="actionType" />
<el-table-column label="更新时间" align="center" prop="createTime" />
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</template>
<script>
import { listRecord, getRecord, delRecord, addRecord, updateRecord } from "@/api/mes/pro/workorderRecord";
export default {
name: "Record",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 工单变更记录表格数据
recordList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
workorderId: null, workorderName: null, workorderCode: null, actionType: null, requestBody: null, },
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询工单变更记录列表 */
getList() {
this.loading = true;
listRecord(this.queryParams).then(response => {
this.recordList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 表单重置
reset() {
this.form = {
id: null, workorderId: null, workorderName: null, workorderCode: null, actionType: null, requestBody: null, createTime: null, createBy: null, updateTime: null, updateBy: 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.id)
this.single = selection.length!==1
this.multiple = !selection.length
}}
};
</script>
\ No newline at end of file
src/views/mes/pro/workorder/indexApply.vue
View file @ c9dac1a3
......@@ -142,6 +142,7 @@
</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
......@@ -232,7 +233,7 @@
>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
......@@ -242,9 +243,8 @@
@click="handleDofinish"
v-hasPermi="['mes:pro:workorder:dofinish']"
>生成任务单
</el-button
>
</el-col>
</el-button>
</el-col> -->
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
......@@ -464,6 +464,15 @@
>修改
</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-search"
@click="$refs['RoutesProcessSelectRef2'].showFlag = true"
>查看更新记录
</el-button>
<el-button
size="mini"
type="text"
......@@ -806,10 +815,20 @@
@close="getList">
<ArrangeInfo :group-code="groupCode" :addBtn="false"></ArrangeInfo>
</el-dialog>
<WorkorderRecordSelect
ref="RoutesProcessSelectRef2"
@onSelected="onWorkorderRecordSelect"
/>
</div>
</template>
<script>
import RoutesProcessSelect from "@/components/routesProcessSelect/index.vue";
import WorkorderRecordSelect from "@/components/workorderRecordSelect2/index.vue";
import { listRouteprocess } from "@/api/mes/pro/routeprocess";
import {listRecord} from "@/api/mes/pro/workorderRecord";
import {
listWorkorder,
getWorkorder,
......@@ -819,7 +838,9 @@ import {
dofinish,
doCheckToolNum
} from "@/api/mes/pro/workorder";
import {addProtaskList} from "@/api/mes/pro/protask";
import Workorderbom from "./bom/bom.vue";
import WorkorderItemList from "./items/item.vue";
import ItemSelect from "@/components/itemSelect/single.vue";
......@@ -845,6 +866,8 @@ export default {
ArrangeInfo,
CombinationInfos,
Treeselect,
RoutesProcessSelect,
WorkorderRecordSelect,
ItemSelect,
ClientSelect,
VendorSelect,
......@@ -1224,6 +1247,33 @@ export default {
// this.single = selection.length!==1
// this.multiple = !selection.length
// },
// 查询记录
handleSelectChangerecord(){
this.reset();
this.$router.push("/mes/pro/workorder/changerecord");
},
onWorkorderRecordSelect(row) {
if (row != undefined && row != null) {
// this.form.routeId = row.routeId;
// this.form.routeName = row.routeName;
const params2 = {
pageNum: 1,
pageSize: 1000,
routeId: row.routeId,
};
const params = {};
listRecord(params).then(({ rows }) => {
this.$refs["ProogingProcessRef"].setList(rows);
});
}
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment