Skip to content

M
mes-ui
Commit bccd89cc authored by 赵汉亭's avatar 赵汉亭
Browse files
Options

打样最终版1

parent 6cfa0a8e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 290 additions and 465 deletions
src/views/mes/pro/prototypeMake/prototypeMakeInfo.vue
View file @ bccd89cc
......@@ -38,15 +38,16 @@
<el-input
v-model="form.itemName"
readonly
disabled
placeholder="请选择产品"
>
<el-button
/>
<!-- <el-button
slot="append"
icon="el-icon-search"
@click="$refs['ItemSelectRef'].showFlag = true"
></el-button>
</el-input>
<ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
<ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />-->
</el-form-item>
</el-col>
<el-col :md="8" :xs="12" style="height: 50.5px">
......@@ -54,9 +55,10 @@
<el-input
v-model="form.routeName"
readonly
disabled
placeholder="请选择工艺路线"
>
<el-button
/>
<!-- <el-button
slot="append"
icon="el-icon-search"
@click="$refs['RoutesProcessSelectRef'].showFlag = true"
......@@ -65,7 +67,7 @@
<RoutesProcessSelect
ref="RoutesProcessSelectRef"
@onSelected="onRoutesProcessSelect"
/>
/> -->
</el-form-item>
</el-col>
</el-row>
......@@ -75,6 +77,7 @@
<el-input
v-model="form.abbreviation"
placeholder="请输入简称"
disabled
></el-input>
</el-form-item>
</el-col>
......@@ -83,12 +86,17 @@
<el-input
v-model="form.enName"
placeholder="请输入样品英文名称"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="样品数量" prop="num">
<el-input v-model="form.num" placeholder="请输入样品数量">
<el-input
v-model="form.num"
placeholder="请输入样品数量"
disabled
>
<template slot="suffix">{{ form.unit }}</template>
</el-input>
</el-form-item>
......@@ -98,6 +106,7 @@
<el-input
v-model="form.type"
placeholder="请选择打样形式"
disabled
></el-input>
</el-form-item>
</el-col>
......@@ -106,6 +115,7 @@
<el-input
v-model="form.modality"
placeholder="请选择分配方式"
disabled
></el-input>
</el-form-item>
</el-col>
......@@ -114,6 +124,7 @@
<el-input
v-model="form.surfaceTreatment"
placeholder="请输入表面处理"
disabled
></el-input>
</el-form-item>
</el-col>
......@@ -122,6 +133,7 @@
<el-input
v-model="form.ngReason"
placeholder="请输入NG原因"
disabled
></el-input>
</el-form-item>
</el-col>
......@@ -131,6 +143,7 @@
value-format="yyyy-MM-dd"
v-model="form.plannedFinishDate"
placeholder="请输入计划完成日期"
disabled
></el-date-picker>
</el-form-item>
</el-col>
......@@ -140,6 +153,7 @@
value-format="yyyy-MM-dd"
v-model="form.plannedLayoutDate"
placeholder="请输入版面需求时间"
disabled
></el-date-picker>
</el-form-item>
</el-col>
......@@ -148,12 +162,121 @@
<el-input
v-model="form.testStandard"
placeholder="测试标准"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="网版目数" prop="screenItem">
<el-input
v-model="form.screenItem"
placeholder="请输入网版目数"
/>
</el-form-item>
</el-col>
<el-col :md="8" :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-form-item label="模切版目数" prop="diecuttingItem">
<el-input
v-model="form.diecuttingItem"
placeholder="请输入模切版目数"
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="标准色号" prop="standardColor">
<el-input
v-model="form.standardColor"
placeholder="请输入标准色号"
/>
</el-form-item>
</el-col>
<el-col :md="8" :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-form-item label="列" prop="col">
<el-input v-model="form.col" placeholder="请输入列" />
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="行" prop="row">
<el-input v-model="form.row" placeholder="请输入行" />
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="搭板数" prop="buttstrapNum">
<el-input
v-model="form.buttstrapNum"
placeholder="请输入搭板数"
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="列双刀位" prop="coldoubleCutspacing">
<el-input
v-model="form.coldoubleCutspacing"
placeholder="请输入列双刀位"
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="行双刀位" prop="rowdoubleCutspacing">
<el-input
v-model="form.rowdoubleCutspacing"
placeholder="请输入行双刀位"
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="派工倍数" prop="sendworkMultiple">
<el-input
v-model="form.sendworkMultiple"
placeholder="请输入派工倍数"
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="印张长度" prop="printingPaperlenth">
<el-input
v-model="form.printingPaperlenth"
placeholder="请输入印张长度"
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="印张宽度" prop="printPaperwidth">
<el-input
v-model="form.printPaperwidth"
placeholder="请输入印张宽度"
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="印刷正面颜色" prop="frontColorId">
<el-input
v-model="form.frontColorId"
placeholder="请输入印刷正面颜色"
/>
</el-form-item>
</el-col>
<el-col :md="8" :xs="12">
<el-form-item label="印刷反面颜色" prop="oppositeColorId">
<el-input
v-model="form.oppositeColorId"
placeholder="请输入印刷反面颜色"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="8" :xs="12">
<el-col :md="8" :xs="12" span="24">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
......
src/views/mes/proofing/proofingApply.vue
View file @ bccd89cc
......@@ -322,6 +322,7 @@ export default {
prototypeRequestStatus: null,
},
options: [
// { value: null, label: "全部订单" },
{ value: 0, label: "审批中" },
{ value: 1, label: "待制作" },
{ value: 2, label: "打样中" },
......@@ -376,7 +377,7 @@ export default {
ngReason: null,
plannedFinishDate: null,
plannedLayoutDate: null,
prototypeRequestStatus: "0",
prototypeRequestStatus: null,
testStandard: null,
remark: null,
createBy: null,
......@@ -477,7 +478,7 @@ export default {
// 审批
handleFinish(row) {
row.prototypeRequestStatus = 1
row.prototypeRequestStatus = 1;
this.$modal
.confirm("确认通过样品申请单？一旦完成，此工单将无法继续修改")
.then(function () {
......@@ -493,7 +494,10 @@ export default {
// 生成制作单
generate(row) {
// 跳转到制作单界面
this.$router.push("/mes/proofing/apply");
const prototypeRequestId = row.prototypeRequestId || this.ids;
this.$router.push(
"/mes/pro/prototypeMake/apply?prototypeRequestId=" + prototypeRequestId
);
return;
},
};
......
src/views/mes/proofing/proofingInfo.vue
View file @ bccd89cc
......@@ -153,7 +153,7 @@
</el-col>
</el-row>
<el-row>
<el-col :md="8" :xs="12">
<el-col :md="24" :xs="12">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
......
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