AGV配置修改
This commit is contained in:
parent
ddfd2280cd
commit
8edef770ce
@ -111,20 +111,8 @@
|
||||
label="AGV线路编码"
|
||||
width="120"
|
||||
align="center"
|
||||
key="lineCode"
|
||||
prop="lineCode"
|
||||
v-if="1"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
@click="handleView(scope.row)"
|
||||
v-hasPermi="['mes:dv:route']"
|
||||
>{{ scope.row.lineCode }}</el-button
|
||||
>
|
||||
</template>
|
||||
</el-table-column>
|
||||
/>
|
||||
<el-table-column label="AGV线路名称" align="center" prop="lineName" />
|
||||
<el-table-column label="所属车间" align="center" prop="workshopName" />
|
||||
<el-table-column label="是否启用" align="center" prop="enableFlag">
|
||||
@ -213,19 +201,18 @@
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="所属车间" prop="workshopName">
|
||||
<el-form-item label="所属车间" prop="workshopId">
|
||||
<el-select
|
||||
v-model="form.workshopName"
|
||||
v-model="form.workshopId"
|
||||
placeholder="请选择车间"
|
||||
style="width: 100%"
|
||||
value-key="workshopId"
|
||||
@change="handleAccompanyId"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in workshopOptions"
|
||||
:key="item.workshopId"
|
||||
:label="item.workshopName"
|
||||
:value="item"
|
||||
:value="item.workshopId"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
@ -300,14 +287,7 @@ export default {
|
||||
//车间选项
|
||||
workshopOptions: [],
|
||||
// 表单参数
|
||||
form: {
|
||||
proAgvlineId: "",
|
||||
lineCode: "",
|
||||
lineName: "",
|
||||
workshopId: "",
|
||||
enableFlag: "Y",
|
||||
remark: "",
|
||||
},
|
||||
form: {},
|
||||
whetherEnabled: [
|
||||
{
|
||||
value: "Y",
|
||||
@ -323,7 +303,7 @@ export default {
|
||||
lineCode: [
|
||||
{ required: true, message: "AGV线路编码不能为空", trigger: "blur" },
|
||||
],
|
||||
workshopName: [
|
||||
workshopId: [
|
||||
{ required: true, message: "所属车间不能为空", trigger: "blur" },
|
||||
],
|
||||
lineName: [
|
||||
@ -356,18 +336,20 @@ export default {
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
this.getList();
|
||||
this.open = false;
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
proAgvlineId: "",
|
||||
lineCode: "",
|
||||
lineName: "",
|
||||
workshopId: "",
|
||||
subjectId: null,
|
||||
proAgvlineId: null,
|
||||
lineCode: null,
|
||||
lineName: null,
|
||||
workshopId: null,
|
||||
enableFlag: "Y",
|
||||
remark: "",
|
||||
remark: null,
|
||||
};
|
||||
this.autoGenFlag = true;
|
||||
this.resetForm("form");
|
||||
@ -399,12 +381,6 @@ export default {
|
||||
this.form.lineCode = response.data.lineCode;
|
||||
});
|
||||
},
|
||||
//选择车间
|
||||
handleAccompanyId(val) {
|
||||
this.form.workshopCode = val.workshopCode;
|
||||
this.form.workshopName = val.workshopName;
|
||||
this.form.workshopId = val.workshopId;
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
console.log(row);
|
||||
@ -413,7 +389,7 @@ export default {
|
||||
this.form = row;
|
||||
this.form.subjectId = row.proAgvlineId;
|
||||
this.open = true;
|
||||
this.title = "修改代码";
|
||||
this.title = "修改AGV线路";
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
@ -449,19 +425,6 @@ export default {
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
// console.log(row);
|
||||
// const subjectIds = row.proAgvlineId || this.id;
|
||||
// this.$modal
|
||||
// .confirm("是否确认删除当前的数据项?")
|
||||
// .then(function () {
|
||||
// return deleteProAgvline(subjectIds);
|
||||
// })
|
||||
// .then(() => {
|
||||
// this.getList();
|
||||
// this.$modal.msgSuccess("删除成功");
|
||||
// })
|
||||
// .catch(() => {});
|
||||
|
||||
deleteProAgvline({ proAgvlineId: row.proAgvlineId }).then((response) => {
|
||||
this.$modal
|
||||
.confirm("是否确认删除当前的数据项?")
|
||||
|
@ -126,7 +126,7 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="AGV站点名称" align="center" prop="siteName" />
|
||||
<el-table-column label="所属线路" align="center" prop="workshopName" />
|
||||
<el-table-column label="所属线路" align="center" prop="agvlineName" />
|
||||
<el-table-column label="是否启用" align="center" prop="enableFlag">
|
||||
<template slot-scope="scope">
|
||||
<span class="el-table-column-span" v-if="scope.row.enableFlag == 'Y'"
|
||||
@ -151,7 +151,6 @@
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['mes:dv:dvsubject:edit']"
|
||||
>修改</el-button
|
||||
>
|
||||
<el-button
|
||||
@ -159,7 +158,6 @@
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['mes:dv:dvsubject:remove']"
|
||||
>删除</el-button
|
||||
>
|
||||
</template>
|
||||
@ -213,19 +211,18 @@
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="所属线路" prop="lineName">
|
||||
<el-form-item label="所属线路" prop="agvlineId">
|
||||
<el-select
|
||||
v-model="form.lineName"
|
||||
v-model="form.agvlineId"
|
||||
placeholder="请选择所属线路"
|
||||
style="width: 100%"
|
||||
value-key="proAgvlineId"
|
||||
@change="handleAccompanyId"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in workshopOptions"
|
||||
:key="item.proAgvlineId"
|
||||
:label="item.lineName"
|
||||
:value="item"
|
||||
:value="item.proAgvlineId"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
@ -294,7 +291,7 @@ export default {
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 设备点检保养项目表格数据
|
||||
// 列表
|
||||
dvsubjectList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
@ -311,11 +308,11 @@ export default {
|
||||
workshopOptions: [],
|
||||
// 表单参数
|
||||
form: {
|
||||
proAgvlineId: "",
|
||||
proAgvsiteId: "",
|
||||
siteCode: "",
|
||||
siteName: "",
|
||||
agvlineId: "",
|
||||
lineName: "",
|
||||
agvlineName: "",
|
||||
enableFlag: "Y",
|
||||
remark: "",
|
||||
},
|
||||
@ -334,7 +331,7 @@ export default {
|
||||
siteCode: [
|
||||
{ required: true, message: "AGV站点编码不能为空", trigger: "blur" },
|
||||
],
|
||||
lineName: [
|
||||
agvlineId: [
|
||||
{ required: true, message: "所属线路不能为空", trigger: "blur" },
|
||||
],
|
||||
siteName: [
|
||||
@ -367,19 +364,21 @@ export default {
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
this.getList();
|
||||
this.open = false;
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
proAgvlineId: "",
|
||||
siteCode: "",
|
||||
siteName: "",
|
||||
agvlineId: "",
|
||||
subjectId: null,
|
||||
proAgvsiteId: null,
|
||||
siteCode: null,
|
||||
siteName: null,
|
||||
agvlineId: null,
|
||||
enableFlag: "Y",
|
||||
remark: "",
|
||||
lineName: "",
|
||||
remark: null,
|
||||
agvlineName: null,
|
||||
};
|
||||
this.autoGenFlag = true;
|
||||
this.resetForm("form");
|
||||
@ -396,7 +395,7 @@ export default {
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.id = selection.map((item) => item.proAgvlineId);
|
||||
this.id = selection.map((item) => item.proAgvsiteId);
|
||||
this.single = selection.length !== 1;
|
||||
this.multiple = !selection.length;
|
||||
},
|
||||
@ -405,27 +404,21 @@ export default {
|
||||
this.reset();
|
||||
this.getWorkshops();
|
||||
this.open = true;
|
||||
this.title = "新增AGV线路";
|
||||
this.title = "新增AGV站点";
|
||||
findSiteCode().then((response) => {
|
||||
console.log(response);
|
||||
this.form.siteCode = response.data.siteCode;
|
||||
});
|
||||
},
|
||||
//选择线路
|
||||
handleAccompanyId(val) {
|
||||
console.log(val);
|
||||
this.form.lineName = val.lineName;
|
||||
this.form.agvlineId = val.proAgvlineId;
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
console.log(row);
|
||||
this.reset();
|
||||
this.getWorkshops();
|
||||
this.form = row;
|
||||
this.form.subjectId = row.proAgvlineId;
|
||||
this.form.subjectId = row.proAgvsiteId;
|
||||
this.open = true;
|
||||
this.title = "修改代码";
|
||||
this.title = "修改AGV站点";
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
@ -461,7 +454,8 @@ export default {
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
deleteProAgvsite({ proAgvlineId: row.proAgvlineId }).then((response) => {
|
||||
console.log(row);
|
||||
deleteProAgvsite({ proAgvsiteId: row.proAgvsiteId }).then((response) => {
|
||||
this.$modal
|
||||
.confirm("是否确认删除当前的数据项?")
|
||||
.then(() => {
|
||||
|
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-row :gutter="10" v-if="optType !='view'" class="mb8">
|
||||
<el-row :gutter="10" v-if="optType != 'view'" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
@ -9,7 +9,8 @@
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['mes:pro:proroute:add']"
|
||||
>新增</el-button>
|
||||
>新增</el-button
|
||||
>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
@ -20,7 +21,8 @@
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
v-hasPermi="['mes:pro:proroute:edit']"
|
||||
>修改</el-button>
|
||||
>修改</el-button
|
||||
>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
@ -31,40 +33,99 @@
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
v-hasPermi="['mes:pro:proroute:remove']"
|
||||
>删除</el-button>
|
||||
>删除</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="routeprocessList" @selection-change="handleSelectionChange">
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="routeprocessList"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="序号" align="center" fixed prop="orderNum" />
|
||||
<el-table-column label="工序编码" width="120px" fixed align="center" prop="processCode" />
|
||||
<el-table-column label="工序名称" width="150px" fixed align="center" prop="processName" />
|
||||
<el-table-column label="下一道工序" width="150px" align="center" prop="nextProcessName" />
|
||||
<el-table-column label="与下一道工序关系" width="150px" align="center" prop="linkType">
|
||||
<el-table-column
|
||||
label="工序编码"
|
||||
width="120px"
|
||||
fixed
|
||||
align="center"
|
||||
prop="processCode"
|
||||
/>
|
||||
<el-table-column
|
||||
label="工序名称"
|
||||
width="150px"
|
||||
fixed
|
||||
align="center"
|
||||
prop="processName"
|
||||
/>
|
||||
<el-table-column
|
||||
label="下一道工序"
|
||||
width="150px"
|
||||
align="center"
|
||||
prop="nextProcessName"
|
||||
/>
|
||||
<el-table-column
|
||||
label="与下一道工序关系"
|
||||
width="150px"
|
||||
align="center"
|
||||
prop="linkType"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.mes_link_type" :value="scope.row.linkType"/>
|
||||
<dict-tag
|
||||
:options="dict.type.mes_link_type"
|
||||
:value="scope.row.linkType"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="关键工序" width="100px" align="center" prop="keyFlag">
|
||||
<el-table-column
|
||||
label="关键工序"
|
||||
width="100px"
|
||||
align="center"
|
||||
prop="keyFlag"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.keyFlag"/>
|
||||
<dict-tag
|
||||
:options="dict.type.sys_yes_no"
|
||||
:value="scope.row.keyFlag"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="质检确认" width="100px" align="center" prop="isCheck">
|
||||
<el-table-column
|
||||
label="质检确认"
|
||||
width="100px"
|
||||
align="center"
|
||||
prop="isCheck"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isCheck"/>
|
||||
<dict-tag
|
||||
:options="dict.type.sys_yes_no"
|
||||
:value="scope.row.isCheck"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="准备时间" align="center" prop="defaultPreTime" />
|
||||
<el-table-column label="等待时间" align="center" prop="defaultSufTime" />
|
||||
<el-table-column label="甘特图显示颜色" align="center" prop="colorCode" >
|
||||
<el-table-column label="甘特图显示颜色" align="center" prop="colorCode">
|
||||
<template slot-scope="scope">
|
||||
<el-color-picker v-model="scope.row.colorCode" disabled></el-color-picker>
|
||||
<el-color-picker
|
||||
v-model="scope.row.colorCode"
|
||||
disabled
|
||||
></el-color-picker>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" fixed="right" width="150px" v-if="optType !='view'" class-name="small-padding fixed-width">
|
||||
<el-table-column
|
||||
label="操作"
|
||||
align="center"
|
||||
fixed="right"
|
||||
width="150px"
|
||||
v-if="optType != 'view'"
|
||||
class-name="small-padding fixed-width"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
@ -72,20 +133,22 @@
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['mes:pro:proroute:edit']"
|
||||
>修改</el-button>
|
||||
>修改</el-button
|
||||
>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['mes:pro:proroute:remove']"
|
||||
>删除</el-button>
|
||||
>删除</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"
|
||||
@ -93,119 +156,231 @@
|
||||
/>
|
||||
|
||||
<!-- 添加或修改工艺组成对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="1100px" append-to-body>
|
||||
<el-dialog
|
||||
:title="title"
|
||||
:visible.sync="open"
|
||||
width="1100px"
|
||||
append-to-body
|
||||
>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="150px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="序号" prop="orderNum">
|
||||
<el-input-number :min="1" v-model="form.orderNum" placeholder="请输入序号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="工序" prop="processId">
|
||||
<el-select v-model="form.processId" placeholder="请选择工序">
|
||||
<el-option
|
||||
v-for="item in processOptions"
|
||||
:key="item.processId"
|
||||
:label="item.processName"
|
||||
:value="item.processId"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="序号" prop="orderNum">
|
||||
<el-input-number
|
||||
:min="1"
|
||||
v-model="form.orderNum"
|
||||
placeholder="请输入序号"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="工序" prop="processId">
|
||||
<el-select v-model="form.processId" placeholder="请选择工序">
|
||||
<el-option
|
||||
v-for="item in processOptions"
|
||||
:key="item.processId"
|
||||
:label="item.processName"
|
||||
:value="item.processId"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="与下一道工序关系" prop="linkType">
|
||||
<el-tooltip effect="dark" placement="right">
|
||||
<div slot="content">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="与下一道工序关系" prop="linkType">
|
||||
<el-tooltip effect="dark" placement="right">
|
||||
<div slot="content">
|
||||
F-to-S:当前工序结束生产,下一道工序才可开始生产 </br>
|
||||
S-to-F:当前工序开始生产,下一道工序才可结束生产 </br>
|
||||
F-to-F:当前工序结束生产,下一道工序才可结束生产 </br>
|
||||
S-to-S:当前工序开始生产,下一道工序才可开始生产 </br>
|
||||
</div>
|
||||
<el-select v-model="form.linkType" placeholder="请选择与下一道工序关系">
|
||||
<el-option
|
||||
v-for="dict in dict.type.mes_link_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<el-form-item label="甘特图显示颜色" prop="colorCode">
|
||||
<el-color-picker v-model="form.colorCode"></el-color-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="7">
|
||||
<el-input v-model="form.colorCode" maxlength="7" placeholder="请输入颜色编码在左侧选择颜色" />
|
||||
</el-col>
|
||||
<el-select
|
||||
v-model="form.linkType"
|
||||
placeholder="请选择与下一道工序关系"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in dict.type.mes_link_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<el-form-item label="甘特图显示颜色" prop="colorCode">
|
||||
<el-color-picker v-model="form.colorCode"></el-color-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="7">
|
||||
<el-input
|
||||
v-model="form.colorCode"
|
||||
maxlength="7"
|
||||
placeholder="请输入颜色编码在左侧选择颜色"
|
||||
/>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="是否关键工序" prop="keyFlag">
|
||||
<el-tooltip effect="dark" placement="right">
|
||||
<div slot="content">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="是否关键工序" prop="keyFlag">
|
||||
<el-tooltip effect="dark" placement="right">
|
||||
<div slot="content">
|
||||
是:整个工单的生产进度将根据当前工序的生产报工数量进行更新</br>
|
||||
每个工艺流程只能有一个关键工序
|
||||
</div>
|
||||
<el-select v-model="form.keyFlag">
|
||||
<el-option
|
||||
v-for="dict in dict.type.sys_yes_no"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="是否需要质检确认" prop="isCheck">
|
||||
<el-tooltip effect="dark" placement="right">
|
||||
<div slot="content">
|
||||
<el-select v-model="form.keyFlag">
|
||||
<el-option
|
||||
v-for="dict in dict.type.sys_yes_no"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="是否需要质检确认" prop="isCheck">
|
||||
<el-tooltip effect="dark" placement="right">
|
||||
<div slot="content">
|
||||
是:当前工序报工时需要进行质检确认</br>
|
||||
质检合格数量作为最终生产数量
|
||||
</div>
|
||||
<el-select v-model="form.isCheck">
|
||||
<el-option
|
||||
v-for="dict in dict.type.sys_yes_no"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-select v-model="form.isCheck">
|
||||
<el-option
|
||||
v-for="dict in dict.type.sys_yes_no"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="准备时间" prop="defaultPreTime">
|
||||
<el-tooltip effect="dark" content="当前系统支持的最小时间粒度为1小时" placement="right">
|
||||
<el-input-number :min="0" :step="1" v-model="form.defaultPreTime" placeholder="请输入准备时间" />
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="等待时间" prop="defaultSufTime">
|
||||
<el-input-number :min="0" :step="1" v-model="form.defaultSufTime" placeholder="请输入等待时间" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="准备时间" prop="defaultPreTime">
|
||||
<el-tooltip
|
||||
effect="dark"
|
||||
content="当前系统支持的最小时间粒度为1小时"
|
||||
placement="right"
|
||||
>
|
||||
<el-input-number
|
||||
:min="0"
|
||||
:step="1"
|
||||
v-model="form.defaultPreTime"
|
||||
placeholder="请输入准备时间"
|
||||
/>
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="等待时间" prop="defaultSufTime">
|
||||
<el-input-number
|
||||
:min="0"
|
||||
:step="1"
|
||||
v-model="form.defaultSufTime"
|
||||
placeholder="请输入等待时间"
|
||||
/>
|
||||
</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-col :span="12">
|
||||
<el-form-item label="选择设备类型" prop="machineryTypeId">
|
||||
<treeselect
|
||||
v-model="form.machineryTypeId"
|
||||
:options="machineryTypeOptions"
|
||||
:normalizer="normalizer"
|
||||
placeholder="请选择设备类型"
|
||||
:disable-branch-nodes="true"
|
||||
@select="handleNodeClick"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="代码上传" prop="">
|
||||
<el-upload
|
||||
ref="codeName"
|
||||
class="upload-demo"
|
||||
:headers="this.headers"
|
||||
action="/prod-api/common/uploadMinio"
|
||||
:before-remove="beforeRemove"
|
||||
:on-change="customUploadChangeImage2"
|
||||
:before-upload="beforeUpload"
|
||||
:on-exceed="handleExceedImage1"
|
||||
accept=".PDF"
|
||||
name="file"
|
||||
multiple
|
||||
:limit="1"
|
||||
:file-list="fileList"
|
||||
>
|
||||
<el-button size="small" type="primary" icon="el-icon-upload2"
|
||||
>点击上传</el-button
|
||||
>
|
||||
<el-button type="primary" size="small" @click.stop="previewFile"
|
||||
> 预览文件</el-button
|
||||
>
|
||||
</el-upload>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="选择线路" prop="lineId">
|
||||
<el-select
|
||||
v-model="form.lineId"
|
||||
placeholder="请选择线路"
|
||||
style="width: 100%"
|
||||
value-key="proAgvlineId"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in workshopOptions"
|
||||
:key="item.proAgvlineId"
|
||||
:label="item.lineName"
|
||||
:value="item.proAgvlineId"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="选择点位" prop="lineId">
|
||||
<el-select
|
||||
v-model="form.pointId"
|
||||
placeholder="请选择点位"
|
||||
style="width: 100%"
|
||||
value-key="proAgvsiteId"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dvsubjectList"
|
||||
:key="item.proAgvsiteId"
|
||||
:label="item.siteName"
|
||||
:value="item.proAgvsiteId"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</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>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
|
||||
<el-button type="primary" @click="cancel" v-if="optType == 'view'"
|
||||
>返回</el-button
|
||||
>
|
||||
<el-button type="primary" @click="submitForm" v-else>确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
@ -214,13 +389,28 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listRouteprocess, getRouteprocess, delRouteprocess, addRouteprocess, updateRouteprocess } from "@/api/mes/pro/routeprocess";
|
||||
import {listAllProcess} from "@/api/mes/pro/process";
|
||||
import { findProAgvline } from "@/api/mes/dv/route";
|
||||
import { findProAgvsite } from "@/api/mes/dv/siteConfiguration";
|
||||
import {
|
||||
listRouteprocess,
|
||||
getRouteprocess,
|
||||
delRouteprocess,
|
||||
addRouteprocess,
|
||||
updateRouteprocess,
|
||||
} from "@/api/mes/pro/routeprocess";
|
||||
import { listAllProcess } from "@/api/mes/pro/process";
|
||||
import { getToken } from "@/utils/auth";
|
||||
import { listMachinerytype } from "@/api/mes/dv/machinerytype";
|
||||
import Treeselect from "@riophae/vue-treeselect";
|
||||
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
||||
export default {
|
||||
name: "Routeprocess",
|
||||
dicts: ['mes_link_type','sys_yes_no'],
|
||||
dicts: ["mes_link_type", "sys_yes_no"],
|
||||
components: { Treeselect },
|
||||
data() {
|
||||
return {
|
||||
// 设置上传的请求头部
|
||||
headers: { Authorization: "Bearer " + getToken() },
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
@ -236,7 +426,7 @@ export default {
|
||||
// 工艺组成表格数据
|
||||
routeprocessList: [],
|
||||
//工序选项
|
||||
processOptions:[],
|
||||
processOptions: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
@ -258,57 +448,167 @@ export default {
|
||||
defaultSufTime: null,
|
||||
colorCode: null,
|
||||
},
|
||||
// 设备类型树选项
|
||||
machineryTypeOptions: [],
|
||||
fileList: [],
|
||||
//车间线路
|
||||
workshopOptions: [],
|
||||
// 站点
|
||||
dvsubjectList: [],
|
||||
lineName:"",
|
||||
pointName:"",
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
routeId: [
|
||||
{ required: true, message: "工艺路线ID不能为空", trigger: "blur" }
|
||||
{ required: true, message: "工艺路线ID不能为空", trigger: "blur" },
|
||||
],
|
||||
processId: [
|
||||
{ required: true, message: "工序ID不能为空", trigger: "blur" }
|
||||
{ required: true, message: "工序ID不能为空", trigger: "blur" },
|
||||
],
|
||||
nextProcessId: [
|
||||
{ required: true, message: "工序ID不能为空", trigger: "blur" }
|
||||
{ required: true, message: "工序ID不能为空", trigger: "blur" },
|
||||
],
|
||||
keyFlag: [
|
||||
{ required: true, message: "请指定当前工序是否关键工序", trigger: "blur" }
|
||||
{
|
||||
required: true,
|
||||
message: "请指定当前工序是否关键工序",
|
||||
trigger: "blur",
|
||||
},
|
||||
],
|
||||
isCheck: [
|
||||
{ required: true, message: "请指定当前工序是否需要质检确认", trigger: "blur" }
|
||||
]
|
||||
}
|
||||
{
|
||||
required: true,
|
||||
message: "请指定当前工序是否需要质检确认",
|
||||
trigger: "blur",
|
||||
},
|
||||
],
|
||||
},
|
||||
};
|
||||
},
|
||||
props :{
|
||||
routeId: undefined,
|
||||
optType: undefined
|
||||
props: {
|
||||
routeId: undefined,
|
||||
optType: undefined,
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
this.getProcess();
|
||||
this.getTreeselect();
|
||||
this.getWorkshops();
|
||||
},
|
||||
methods: {
|
||||
/** 查询工艺组成列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listRouteprocess(this.queryParams).then(response => {
|
||||
listRouteprocess(this.queryParams).then((response) => {
|
||||
this.routeprocessList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
//查询工序信息
|
||||
getProcess(){
|
||||
listAllProcess().then( response =>{
|
||||
getProcess() {
|
||||
listAllProcess().then((response) => {
|
||||
this.processOptions = response.data;
|
||||
});
|
||||
},
|
||||
getWorkshops() {
|
||||
findProAgvline().then((response) => {
|
||||
this.workshopOptions = response.rows;
|
||||
});
|
||||
findProAgvsite().then((response) => {
|
||||
this.dvsubjectList = response.rows;
|
||||
});
|
||||
},
|
||||
/** 查询设备类型下拉树结构 */
|
||||
getTreeselect() {
|
||||
listMachinerytype().then((response) => {
|
||||
this.machineryTypeOptions = [];
|
||||
const data = this.handleTree(
|
||||
response.data,
|
||||
"machineryTypeId",
|
||||
"parentTypeId"
|
||||
)[0];
|
||||
this.machineryTypeOptions.push(data);
|
||||
});
|
||||
},
|
||||
/** 转换设备类型数据结构 */
|
||||
normalizer(node) {
|
||||
if (node.children && !node.children.length) {
|
||||
delete node.children;
|
||||
}
|
||||
return {
|
||||
id: node.machineryTypeId,
|
||||
label: node.machineryTypeName,
|
||||
children: node.children,
|
||||
};
|
||||
},
|
||||
// 节点单击事件
|
||||
handleNodeClick(data) {
|
||||
console.log(data);
|
||||
this.form.machineryTypeName = data.machineryTypeName;
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
beforeUpload(e) {
|
||||
// console.log(e);
|
||||
this.files = e;
|
||||
},
|
||||
customUploadChangeImage2(files) {
|
||||
console.log(files);
|
||||
if (files.status === "ready") return;
|
||||
if (files.status === "success") {
|
||||
const res = files.response || {};
|
||||
if (res && res.code === 200) {
|
||||
this.form.url = files.response.url;
|
||||
this.form.originalName = files.response.originalFileName;
|
||||
this.$message({
|
||||
type: "success",
|
||||
message: "上传成功!",
|
||||
});
|
||||
this.uploadVisible = false;
|
||||
} else {
|
||||
this.$message.error("上传失败!");
|
||||
this.fileList = [];
|
||||
}
|
||||
} else {
|
||||
this.$message.error("上传失败!");
|
||||
this.fileList = [];
|
||||
}
|
||||
},
|
||||
|
||||
// 删除文件
|
||||
beforeRemove(files, fileList) {
|
||||
return this.$confirm(`确定移除 ${files.name}?`);
|
||||
},
|
||||
|
||||
// 上传按钮 限制图文件大小和类型
|
||||
handleChangeUpload(file, fileList) {
|
||||
const isLt2M = file.size / 1024 / 1024 < 10;
|
||||
if (!isLt2M) {
|
||||
this.$message.error("上传图片大小不能超过 10MB!");
|
||||
return false;
|
||||
}
|
||||
},
|
||||
handleExceedImage1(file, fileList) {
|
||||
// console.log(file);
|
||||
this.$message.warning(`当前限制上传 1 个文件,以上传 ${file.length} 个`);
|
||||
},
|
||||
|
||||
//预览文件
|
||||
previewFile() {
|
||||
console.log(this.form);
|
||||
if (this.form.url != undefined && this.form.url != "") {
|
||||
var url = this.form.url;
|
||||
window.open(url);
|
||||
} else {
|
||||
this.$message.warning(`请上传文件`);
|
||||
}
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
@ -317,7 +617,7 @@ export default {
|
||||
processId: null,
|
||||
processCode: null,
|
||||
processName: null,
|
||||
isCheck: 'N',
|
||||
isCheck: "N",
|
||||
orderNum: 1,
|
||||
nextProcessId: null,
|
||||
nextProcessCode: null,
|
||||
@ -325,7 +625,7 @@ export default {
|
||||
linkType: null,
|
||||
defaultPreTime: 0,
|
||||
defaultSufTime: 0,
|
||||
colorCode: '#00AEF3',
|
||||
colorCode: "#00AEF3",
|
||||
remark: null,
|
||||
attr1: null,
|
||||
attr2: null,
|
||||
@ -334,8 +634,9 @@ export default {
|
||||
createBy: null,
|
||||
createTime: null,
|
||||
updateBy: null,
|
||||
updateTime: null
|
||||
updateTime: null,
|
||||
};
|
||||
this.fileList = []
|
||||
this.resetForm("form");
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
@ -350,23 +651,29 @@ export default {
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.recordId)
|
||||
this.single = selection.length!==1
|
||||
this.multiple = !selection.length
|
||||
this.ids = selection.map((item) => item.recordId);
|
||||
this.single = selection.length !== 1;
|
||||
this.multiple = !selection.length;
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.title = "添加工艺组成";
|
||||
var arr = Object.values(this.routeprocessList).pop()
|
||||
this.form.orderNum = arr.orderNum + 1;
|
||||
listRouteprocess(this.queryParams).then((response) => {
|
||||
this.form.orderNum = response.total + 1;
|
||||
});
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset();
|
||||
const recordId = row.recordId || this.ids
|
||||
getRouteprocess(recordId).then(response => {
|
||||
var name = {};
|
||||
if (row.originalName != undefined && row.originalName != "") {
|
||||
this.$set(name, "name", row.originalName);
|
||||
this.fileList.push(name);
|
||||
}
|
||||
const recordId = row.recordId || this.ids;
|
||||
getRouteprocess(recordId).then((response) => {
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "修改工艺组成";
|
||||
@ -374,16 +681,16 @@ export default {
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
this.$refs["form"].validate((valid) => {
|
||||
if (valid) {
|
||||
if (this.form.recordId != null) {
|
||||
updateRouteprocess(this.form).then(response => {
|
||||
updateRouteprocess(this.form).then((response) => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
} else {
|
||||
addRouteprocess(this.form).then(response => {
|
||||
addRouteprocess(this.form).then((response) => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
@ -395,19 +702,27 @@ export default {
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const recordIds = row.recordId || this.ids;
|
||||
this.$modal.confirm('是否确认删除工艺组成编号为"' + recordIds + '"的数据项?').then(function() {
|
||||
return delRouteprocess(recordIds);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
this.$modal
|
||||
.confirm('是否确认删除工艺组成编号为"' + recordIds + '"的数据项?')
|
||||
.then(function () {
|
||||
return delRouteprocess(recordIds);
|
||||
})
|
||||
.then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
})
|
||||
.catch(() => {});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('mes/pro/routeprocess/export', {
|
||||
...this.queryParams
|
||||
}, `routeprocess_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
}
|
||||
this.download(
|
||||
"mes/pro/routeprocess/export",
|
||||
{
|
||||
...this.queryParams,
|
||||
},
|
||||
`routeprocess_${new Date().getTime()}.xlsx`
|
||||
);
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
Loading…
Reference in New Issue
Block a user