Commit 3dda0835 authored by chenzj's avatar chenzj

Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

parents 30598894 a3938166
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
v-if="showFlag" v-if="showFlag"
:visible.sync="showFlag" :visible.sync="showFlag"
:modal="true" :modal="true"
width="700" width="900"
append-to-body
center center
> >
<el-form <el-form
......
...@@ -5,13 +5,14 @@ ...@@ -5,13 +5,14 @@
:visible.sync="showFlag" :visible.sync="showFlag"
:modal="true" :modal="true"
width="80%" width="80%"
append-to-body
center center
> >
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="small"
:inline="true" inline
v-show="showSearch" v-show="showSearch"
label-width="110px" label-width="110px"
> >
......
...@@ -15,12 +15,12 @@ ...@@ -15,12 +15,12 @@
v-if="mode != 'info'" v-if="mode != 'info'"
label="操作" label="操作"
align="center" align="center"
width="150" width="300"
fixed="right"
> >
<template slot-scope="{ row, $index }"> <template slot-scope="{ row, $index }">
<el-button <el-button
type="text" type="text"
icon="el-icon-edit"
size="small" size="small"
@click="openSetProd(row, $index)" @click="openSetProd(row, $index)"
> >
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
icon="el-icon-edit"
size="small" size="small"
@click="openSetQrindex(row, $index)" @click="openSetQrindex(row, $index)"
> >
...@@ -36,7 +35,6 @@ ...@@ -36,7 +35,6 @@
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
icon="el-icon-edit"
size="small" size="small"
@click="openSetTool(row, $index)" @click="openSetTool(row, $index)"
> >
...@@ -44,7 +42,6 @@ ...@@ -44,7 +42,6 @@
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
icon="el-icon-edit"
size="small" size="small"
@click="updateRow(row, $index)" @click="updateRow(row, $index)"
>修改</el-button >修改</el-button
......
...@@ -228,7 +228,7 @@ import { ...@@ -228,7 +228,7 @@ import {
export default { export default {
components: { ProogingBom, ProogingProcess, ItemSelect, RoutesProcessSelect }, components: { ProogingBom, ProogingProcess, ItemSelect, RoutesProcessSelect },
dicts: ['pro_proof_form','pro_distribution_profing'], dicts: ["pro_proof_form", "pro_distribution_profing"],
provide() { provide() {
return { return {
mode: this.mode, mode: this.mode,
...@@ -352,8 +352,13 @@ export default { ...@@ -352,8 +352,13 @@ export default {
this.loading = false; this.loading = false;
this.$modal.msgSuccess("提交成功!"); this.$modal.msgSuccess("提交成功!");
// 关闭页签 this.$nextTick(() => {
tabPlugins.closeOpenPage(); // 关闭页签
tabPlugins.closeOpenPage();
this.$router.replace({
path: '/mes/proofing/query'
})
})
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
......
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