Skip to content

P
pda-ui
Commit 3dda0835 authored by chenzj's avatar chenzj
Browse files
Options

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

parents 30598894 a3938166
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 64 deletions
src/components/TmTool/index.vue
View file @ 3dda0835
......@@ -4,7 +4,8 @@
v-if="showFlag"
:visible.sync="showFlag"
:modal="true"
width="700"
width="900"
append-to-body
center
>
<el-form
......
src/components/routesProcessSelect/index.vue
View file @ 3dda0835
......@@ -5,13 +5,14 @@
:visible.sync="showFlag"
:modal="true"
width="80%"
append-to-body
center
>
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
inline
v-show="showSearch"
label-width="110px"
>
......
src/views/mes/pro/prototypeMake/prototypeMakeInfo.vue
View file @ 3dda0835
......@@ -16,15 +16,15 @@
<PageWrapper>
<el-form
class="page-form"
:model="form"
ref="form"
size="small"
:inline="true"
label-width="8em"
>
>
<el-row>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="制作单编码" prop="prototypeMakeCode">
<el-input
disabled
......@@ -34,25 +34,24 @@
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="申请单编码" prop="prototypeRequestCode">
<el-input
v-model="form.prototypeRequestCode"
readonly
disabled
:placeholder="mode=='edit' ? '':'请输入申请单编码'"
<el-input
v-model="form.prototypeRequestCode"
readonly
disabled
:placeholder="mode == 'edit' ? '' : '请输入申请单编码'"
>
</el-input>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12" style="height: 50.5px">
<el-col :lg="6" :md="8" :sm="12" :xs="12" style="height: 50.5px">
<el-form-item label="产品" prop="itemId">
<el-input
v-model="form.itemName"
readonly
disabled
:placeholder="mode=='edit' ? '':'请选择产品'"
:placeholder="mode == 'edit' ? '' : '请选择产品'"
/>
<!-- <el-button
slot="append"
......@@ -63,15 +62,13 @@
<ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />-->
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="8" :xs="12" style="height: 50.5px">
<el-col :lg="6" :md="8" :sm="12" :xs="12" style="height: 50.5px">
<el-form-item label="工艺路线" prop="routeId">
<el-input
v-model="form.routeName"
readonly
disabled
:placeholder="mode=='edit' ? '':'请选择工艺路线'"
:placeholder="mode == 'edit' ? '' : '请选择工艺路线'"
/>
<!-- <el-button
slot="append"
......@@ -85,64 +82,64 @@
/> -->
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="简称" prop="abbreviation">
<el-input
v-model="form.abbreviation"
disabled
:placeholder="mode=='edit' ? '':'请输入简称'"
:placeholder="mode == 'edit' ? '' : '请输入简称'"
></el-input>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="样品英文名" prop="enName">
<el-input
v-model="form.enName"
readonly
:placeholder="mode=='edit' ? '':'请输入样品英文名称'"
:placeholder="mode == 'edit' ? '' : '请输入样品英文名称'"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="样品数量" prop="num">
<el-input
v-model="form.num"
:placeholder="mode=='edit' ? '':'请输入样品数量'"
:placeholder="mode == 'edit' ? '' : '请输入样品数量'"
disabled
>
<template slot="suffix">{{ form.unit }}</template>
</el-input>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="打样形式" prop="type">
<el-input
v-model="form.type"
:placeholder="mode=='edit' ? '':'请选择打样形式'"
:placeholder="mode == 'edit' ? '' : '请选择打样形式'"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="分配方式" prop="modality">
<el-input
v-model="form.modality"
:placeholder="mode=='edit' ? '':'请选择分配方式'"
:placeholder="mode == 'edit' ? '' : '请选择分配方式'"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="表面处理" prop="surfaceTreatment">
<el-input
v-model="form.surfaceTreatment"
:placeholder="mode=='edit' ? '':'请输入表面处理'"
:placeholder="mode == 'edit' ? '' : '请输入表面处理'"
disabled
></el-input>
</el-form-item>
</el-col>
<!-- <el-col :md="8" :xs="12">
<!-- <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="NG原因" prop="ngReason">
<el-input
v-model="form.ngReason"
......@@ -151,36 +148,36 @@
></el-input>
</el-form-item>
</el-col> -->
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="计划完成日期" prop="plannedFinishDate">
<el-date-picker
value-format="yyyy-MM-dd"
v-model="form.plannedFinishDate"
:placeholder="mode=='edit' ? '':'请输入计划完成日期'"
:placeholder="mode == 'edit' ? '' : '请输入计划完成日期'"
disabled
></el-date-picker>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="版面需求时间" prop="plannedLayoutDate">
<el-date-picker
value-format="yyyy-MM-dd"
v-model="form.plannedLayoutDate"
:placeholder="mode=='edit' ? '':'请输入版面需求时间'"
:placeholder="mode == 'edit' ? '' : '请输入版面需求时间'"
disabled
></el-date-picker>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="测试标准" prop="testStandard">
<el-input
v-model="form.testStandard"
:placeholder="mode=='edit' ? '':'测试标准'"
:placeholder="mode == 'edit' ? '' : '测试标准'"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="网版目数" prop="screenItem">
<el-input
v-model="form.screenItem"
......@@ -188,12 +185,12 @@
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="啤版目数" prop="pibanItem">
<el-input v-model="form.pibanItem" placeholder="请输入啤版目数" />
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="模切版目数" prop="diecuttingItem">
<el-input
v-model="form.diecuttingItem"
......@@ -201,7 +198,7 @@
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="标准色号" prop="standardColor">
<el-input
v-model="form.standardColor"
......@@ -209,22 +206,22 @@
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="模数" prop="module">
<el-input v-model="form.module" placeholder="请输入模数" />
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="列" prop="colNum">
<el-input v-model="form.colNum" placeholder="请输入列" />
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="行" prop="rowNum">
<el-input v-model="form.rowNum" placeholder="请输入行" />
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="搭板数" prop="buttstrapNum">
<el-input
v-model="form.buttstrapNum"
......@@ -232,7 +229,7 @@
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="列双刀位" prop="coldoubleCutspacing">
<el-input
v-model="form.coldoubleCutspacing"
......@@ -240,7 +237,7 @@
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="行双刀位" prop="rowdoubleCutspacing">
<el-input
v-model="form.rowdoubleCutspacing"
......@@ -248,7 +245,7 @@
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="派工倍数" prop="sendworkMultiple">
<el-input
v-model="form.sendworkMultiple"
......@@ -256,7 +253,7 @@
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="印张长度" prop="printingPaperlenth">
<el-input
v-model="form.printingPaperlenth"
......@@ -264,7 +261,7 @@
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="印张宽度" prop="printPaperwidth">
<el-input
v-model="form.printPaperwidth"
......@@ -272,7 +269,7 @@
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="印刷正面颜色" prop="frontColorId">
<el-input
v-model="form.frontColorName"
......@@ -292,7 +289,7 @@
</ColorSelect>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="印刷反面颜色" prop="oppositeColorId">
<el-input
v-model="form.oppositeColorName"
......@@ -314,7 +311,7 @@
</el-col>
</el-row>
<el-row>
<el-col :md="8" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
......@@ -346,7 +343,7 @@ import ProogingProcess from "./components/ProogingProcess.vue";
import ItemSelect from "@/components/itemSelect/single.vue";
import RoutesProcessSelect from "@/components/routesProcessSelect/index.vue";
import { listRouteprocess } from "@/api/mes/pro/routeprocess";
import { closeOpenPage } from "@/plugins/tab";
import tabPlugins from "@/plugins/tab";
import {
listPrototypeMake,
getPrototypeMake,
......@@ -530,8 +527,13 @@ export default {
this.loading = false;
this.$modal.msgSuccess("提交成功！");
// 关闭页签
closeOpenPage();
this.$nextTick(() => {
// 关闭页签
tabPlugins.closeOpenPage();
this.$router.replace({
path: '/mes/pro/prototypeMake/query'
})
})
})
.catch(() => {
this.loading = false;
......
src/views/mes/proofing/components/ProogingProcess.vue
View file @ 3dda0835
......@@ -15,12 +15,12 @@
v-if="mode != 'info'"
label="操作"
align="center"
width="150"
width="300"
fixed="right"
>
<template slot-scope="{ row, $index }">
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="openSetProd(row, $index)"
>
......@@ -28,7 +28,6 @@
</el-button>
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="openSetQrindex(row, $index)"
>
......@@ -36,7 +35,6 @@
</el-button>
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="openSetTool(row, $index)"
>
......@@ -44,7 +42,6 @@
</el-button>
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="updateRow(row, $index)"
>修改</el-button
......
src/views/mes/proofing/proofingInfo.vue
View file @ 3dda0835
......@@ -228,7 +228,7 @@ import {
export default {
components: { ProogingBom, ProogingProcess, ItemSelect, RoutesProcessSelect },
dicts: ['pro_proof_form','pro_distribution_profing'],
dicts: ["pro_proof_form", "pro_distribution_profing"],
provide() {
return {
mode: this.mode,
......@@ -352,8 +352,13 @@ export default {
this.loading = false;
this.$modal.msgSuccess("提交成功！");
// 关闭页签
tabPlugins.closeOpenPage();
this.$nextTick(() => {
// 关闭页签
tabPlugins.closeOpenPage();
this.$router.replace({
path: '/mes/proofing/query'
})
})
})
.catch(() => {
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