xins
/
HwMes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 工艺路线已经关联生产工单不能修改和删除

Browse Source
master
yinq 1 year ago
parent 96afc3985f
commit 9a2df9f62f
1 changed files with 73 additions and 45 deletions
Show Stats Download Patch File Download Diff File

118
hw-ui/src/views/mes/baseRoute/index.vue
Unescape Escape View File

@ -24,7 +24,8 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['mes:baseRoute:add']" v-hasPermi="['mes:baseRoute:add']"
>新增</el-button> >新增
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -35,7 +36,8 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['mes:baseRoute:edit']" v-hasPermi="['mes:baseRoute:edit']"
>修改</el-button> >修改
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -46,7 +48,8 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['mes:baseRoute:remove']" v-hasPermi="['mes:baseRoute:remove']"
>删除</el-button> >删除
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -56,17 +59,18 @@
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['mes:baseRoute:export']" v-hasPermi="['mes:baseRoute:export']"
>导出</el-button> >导出
</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="baseRouteList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="baseRouteList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="工艺路线ID" align="center" prop="routeId" v-if="columns[0].visible"/> <el-table-column label="工艺路线ID" align="center" prop="routeId" v-if="columns[0].visible"/>
<el-table-column label="工艺路线名称" align="center" prop="routeName" v-if="columns[1].visible"/> <el-table-column label="工艺路线名称" align="center" prop="routeName" v-if="columns[1].visible"/>
<el-table-column label="工艺路线说明" align="center" prop="routeDesc" v-if="columns[2].visible"/> <el-table-column label="工艺路线说明" align="center" prop="routeDesc" v-if="columns[2].visible"/>
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[3].visible" > <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[3].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.active_flag" :value="scope.row.activeFlag"/> <dict-tag :options="dict.type.active_flag" :value="scope.row.activeFlag"/>
</template> </template>
@ -75,31 +79,32 @@
<el-table-column label="创建人" align="center" prop="createBy" v-if="columns[5].visible"/> <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[5].visible"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[6].visible"> <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[6].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[7].visible"/> <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[7].visible"/>
<el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[8].visible"> <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[8].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-button--> <!-- <el-button-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- type="text"--> <!-- type="text"-->
<!-- icon="el-icon-edit"--> <!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"--> <!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['mes:baseRoute:edit']"--> <!-- v-hasPermi="['mes:baseRoute:edit']"-->
<!-- >修改</el-button>--> <!-- >修改</el-button>-->
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="routeProcessUpdate(scope.row)" @click="routeProcessUpdate(scope.row)"
v-hasPermi="['mes:baseRoute:edit']" v-hasPermi="['mes:baseRoute:edit']"
>工艺步骤</el-button> >工艺步骤
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -116,10 +121,10 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="110px"> <el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-form-item label="工艺路线名称" prop="routeName"> <el-form-item label="工艺路线名称" prop="routeName">
<el-input v-model="form.routeName" placeholder="请输入工艺路线名称" /> <el-input v-model="form.routeName" placeholder="请输入工艺路线名称"/>
</el-form-item> </el-form-item>
<el-form-item label="工艺路线说明" prop="routeDesc"> <el-form-item label="工艺路线说明" prop="routeDesc">
<el-input v-model="form.routeDesc" placeholder="请输入工艺路线说明" /> <el-input v-model="form.routeDesc" placeholder="请输入工艺路线说明"/>
</el-form-item> </el-form-item>
<el-form-item label="激活标识" prop="activeFlag"> <el-form-item label="激活标识" prop="activeFlag">
<el-radio-group v-model="form.activeFlag"> <el-radio-group v-model="form.activeFlag">
@ -127,11 +132,12 @@
v-for="dict in dict.type.active_flag" v-for="dict in dict.type.active_flag"
:key="dict.value" :key="dict.value"
:label="dict.value" :label="dict.value"
>{{dict.label}}</el-radio> >{{ dict.label }}
</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -149,23 +155,31 @@
<el-divider content-position="center">工艺路线组成信息</el-divider> <el-divider content-position="center">工艺路线组成信息</el-divider>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddMesBaseRouteProcess">添加</el-button> <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddMesBaseRouteProcess"
>添加
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteMesBaseRouteProcess">删除</el-button> <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteMesBaseRouteProcess"
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<span v-show="tagShow">提示:该工艺路线已关联生产工单，无法修改！</span>
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="mesBaseRouteProcessList" :row-class-name="rowMesBaseRouteProcessIndex" @selection-change="handleMesBaseRouteProcessSelectionChange" ref="mesBaseRouteProcess"> <el-table :data="mesBaseRouteProcessList" :row-class-name="rowMesBaseRouteProcessIndex"
<el-table-column type="selection" width="50" align="center" /> @selection-change="handleMesBaseRouteProcessSelectionChange" ref="mesBaseRouteProcess">
<el-table-column type="selection" width="50" align="center"/>
<el-table-column label="序号" align="center" prop="index" v-if="false"/> <el-table-column label="序号" align="center" prop="index" v-if="false"/>
<el-table-column label="工艺路线顺序" prop="processOrder" width="100"> <el-table-column label="工艺路线顺序" prop="processOrder" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.processOrder" /> <el-input v-model="scope.row.processOrder"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工序" prop="processId"> <el-table-column label="工序" prop="processId">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.processId" filterable placeholder="请选择工序" clearable> <el-select v-model="scope.row.processId" filterable placeholder="请选择工序" clearable>
<el-option <el-option
v-for="item in processList" v-for="item in processList"
:key="item.processId" :key="item.processId"
@ -179,7 +193,7 @@
</el-table> </el-table>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm" v-show="submitShow">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -195,6 +209,7 @@ import {
updateBaseRoute updateBaseRoute
} from "@/api/mes/baseRoute"; } from "@/api/mes/baseRoute";
import {findProcessList} from "@//api/mes/processInfo"; import {findProcessList} from "@//api/mes/processInfo";
import {listProductOrder} from "@//api/mes/productOrder";
export default { export default {
name: "BaseRoute", name: "BaseRoute",
@ -215,6 +230,10 @@ export default {
multiple: true, multiple: true,
// 显示搜索条件 // 显示搜索条件
showSearch: true, showSearch: true,
// 显示工艺步骤添加
submitShow: true,
// 显示工艺步骤提示
tagShow: true,
// 总条数 // 总条数
total: 0, total: 0,
// 工艺路线表格数据 // 工艺路线表格数据
@ -244,22 +263,22 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
routeName: [ routeName: [
{ required: true, message: "工艺路线名称不能为空", trigger: "blur" } {required: true, message: "工艺路线名称不能为空", trigger: "blur"}
], ],
activeFlag: [ activeFlag: [
{ required: true, message: "激活标识不能为空", trigger: "change" } {required: true, message: "激活标识不能为空", trigger: "change"}
], ],
}, },
columns: [ columns: [
{ key: 0, label: `工艺路线ID`, visible: true }, {key: 0, label: `工艺路线ID`, visible: true},
{ key: 1, label: `工艺路线名称`, visible: true }, {key: 1, label: `工艺路线名称`, visible: true},
{ key: 2, label: `工艺路线说明`, visible: true }, {key: 2, label: `工艺路线说明`, visible: true},
{ key: 3, label: `激活标识`, visible: true }, {key: 3, label: `激活标识`, visible: true},
{ key: 4, label: `备注`, visible: true }, {key: 4, label: `备注`, visible: true},
{ key: 5, label: `创建人`, visible: true }, {key: 5, label: `创建人`, visible: true},
{ key: 6, label: `创建时间`, visible: true }, {key: 6, label: `创建时间`, visible: true},
{ key: 7, label: `更新人`, visible: true }, {key: 7, label: `更新人`, visible: true},
{ key: 8, label: `更新时间`, visible: true }, {key: 8, label: `更新时间`, visible: true},
], ],
//工序选项 //工序选项
processList: [], processList: [],
@ -317,7 +336,7 @@ export default {
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.routeId) this.ids = selection.map(item => item.routeId)
this.idNames = selection.map(item => item.routeName) this.idNames = selection.map(item => item.routeName)
this.single = selection.length!==1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
@ -345,6 +364,14 @@ export default {
routeProcessUpdate(row) { routeProcessUpdate(row) {
this.reset(); this.reset();
const routeId = row.routeId || this.ids const routeId = row.routeId || this.ids
this.submitShow = true;
this.tagShow = false;
listProductOrder({dispatchId: row.routeId}).then(res => {
if (res.rows.length > 0) {
this.submitShow = false;
this.tagShow = true;
}
})
getBaseRoute(routeId).then(response => { getBaseRoute(routeId).then(response => {
this.form = response.data; this.form = response.data;
this.mesBaseRouteProcessList = response.data.mesBaseRouteProcessList; this.mesBaseRouteProcessList = response.data.mesBaseRouteProcessList;
@ -378,15 +405,16 @@ export default {
handleDelete(row) { handleDelete(row) {
const routeIds = row.routeId || this.ids; const routeIds = row.routeId || this.ids;
const routeNames = row.routeName || this.idNames; const routeNames = row.routeName || this.idNames;
this.$modal.confirm('是否确认删除工艺路线名称为"' + routeNames + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除工艺路线名称为"' + routeNames + '"的数据项？').then(function () {
return delBaseRoute(routeIds); return delBaseRoute(routeIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); }).catch(() => {
});
}, },
/** 工艺路线组成信息序号 */ /** 工艺路线组成信息序号 */
rowMesBaseRouteProcessIndex({ row, rowIndex }) { rowMesBaseRouteProcessIndex({row, rowIndex}) {
row.index = rowIndex + 1; row.index = rowIndex + 1;
row.processOrder = (rowIndex + 1) * 10; row.processOrder = (rowIndex + 1) * 10;
}, },
@ -409,7 +437,7 @@ export default {
} else { } else {
const mesBaseRouteProcessList = this.mesBaseRouteProcessList; const mesBaseRouteProcessList = this.mesBaseRouteProcessList;
const checkedMesBaseRouteProcess = this.checkedMesBaseRouteProcess; const checkedMesBaseRouteProcess = this.checkedMesBaseRouteProcess;
this.mesBaseRouteProcessList = mesBaseRouteProcessList.filter(function(item) { this.mesBaseRouteProcessList = mesBaseRouteProcessList.filter(function (item) {
return checkedMesBaseRouteProcess.indexOf(item.index) == -1 return checkedMesBaseRouteProcess.indexOf(item.index) == -1
}); });
} }

Write Preview
Loading…
Cancel
Save