Skip to content

M
mes-ui
Commit 936914c5 authored by 沈翠玲's avatar 沈翠玲
Browse files
Options

编排单、生产版本增加字段

parent 68a58609
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 16 deletions
src/views/mes/pro/arrangeRule/index.vue
View file @ 936914c5
......@@ -88,7 +88,7 @@
<el-table-column label="产品类别名称" align="center" width="150" prop="itemTypeName" />
<el-table-column label="工序名称" align="center" prop="processName" />
<el-table-column label="交期间隔天数" align="center" prop="requestDateInterval" />
<el-table-column label="工单间隔最大量" align="center" prop="requestDateIntervalMinNum" />
<el-table-column label="编排单最大数曩" align="center" prop="requestDateIntervalMinNum" />
<el-table-column label="工艺路线" align="center" prop="routeCode" >
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.routeCode"/>
......@@ -129,14 +129,14 @@
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.processCode"/>
</template>
</el-table-column>
<el-table-column label="上下间距" align="center" prop="spacing" >
<el-table-column label="跳距" align="center" prop="skipDistance" >
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.spacing"/>
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.skipDistance"/>
</template>
</el-table-column>
<el-table-column label="正面颜色" align="center" prop="frontImg" >
<el-table-column label="正面颜色" align="center" prop="frontAndBackcolors" >
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.frontImg"/>
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.frontAndBackcolors"/>
</template>
</el-table-column>
<el-table-column label="版具" align="center" prop="toolList" >
......@@ -247,7 +247,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工单间隔最大量" prop="requestDateIntervalMinNum" label-width="130px">
<el-form-item label="编排单最大数曩" prop="requestDateIntervalMinNum" label-width="130px">
<el-input-number v-model="form.requestDateIntervalMinNum" :min="0" />
</el-form-item>
</el-col>
......@@ -404,15 +404,15 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="上下间距" label-width="120px">
<el-radio-group v-model="form.spacing" disabled v-if="optType=='view'">
<el-form-item label="跳距" label-width="120px">
<el-radio-group v-model="form.skipDistance" disabled v-if="optType=='view'">
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
<el-radio-group v-model="form.spacing" v-else>
<el-radio-group v-model="form.skipDistance" v-else>
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
......@@ -424,15 +424,15 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="正面颜色" label-width="120px">
<el-radio-group v-model="form.frontImg" disabled v-if="optType=='view'">
<el-form-item label="正反底印刷" label-width="120px">
<el-radio-group v-model="form.frontAndBackcolors" disabled v-if="optType=='view'">
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
<el-radio-group v-model="form.frontImg" v-else>
<el-radio-group v-model="form.frontAndBackcolors" v-else>
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
......@@ -652,8 +652,8 @@ export default {
width: null,
productMaterial: null,
processCode: null,
spacing: null,
frontImg: null,
skipDistance: null,
frontAndBackcolors: null,
toolList: null,
shape: null,
inlay: null,
......@@ -718,8 +718,8 @@ export default {
requestDateInterval: 0,
productMaterial: null,
processCode: null,
spacing: null,
frontImg: null,
skipDistance: null,
frontAndBackcolors: null,
toolList: null,
shape: null,
inlay: null,
......
src/views/mes/pro/productionSolution/components/ProogingSpecificationSheet.vue
View file @ 936914c5
......@@ -175,6 +175,14 @@
<el-input v-model="form.oppositeColorName" placeholder> </el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12">
<el-form-item label="印底/印字" prop="printBottom">
<el-select v-model="form.printBottom" disabled>
<el-option label="印底" value="印底"></el-option>
<el-option label="印字" value="印字"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="仓库" prop="storePlace">
<el-input v-model="form.storePlace" placeholder> </el-input>
......@@ -377,6 +385,18 @@
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="跳距" prop="skipDistance">
<el-radio-group v-model="form.skipDistance">
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="排版行数" prop="rowNum"
><el-input
......@@ -730,12 +750,14 @@ export default {
length: "",
storePlace: "",
isAddSimple: "",
printBottom: "",
isUniqueCode: "",
isConsiderColor: "",
formula: "",
productMaterial: "",
coldoubleCutspacing: "",
rowdoubleCutspacing: "",
skipDistance: "",
isFillet: "",
isAllotype: "",
isRightAngle: "",
......@@ -831,12 +853,14 @@ export default {
length: "",
storePlace: "",
isAddSimple: "",
printBottom: '',
isUniqueCode: "",
isConsiderColor: "",
formula: "",
productMaterial: "",
coldoubleCutspacing: "",
rowdoubleCutspacing: "",
skipDistance: "",
isFillet: "",
isAllotype: "",
isRightAngle: "",
......
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