Skip to content

P
pda-ui
Commit 70407814 authored by 鲁鑫's avatar 鲁鑫
Browse files
Options

产品外观增加是否直角、是否异型、圆角字段；尺码组bug修改

parent b1769456
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 29 deletions
src/views/mes/md/product/components/look.vue
View file @ 70407814
......@@ -31,7 +31,7 @@
<el-input v-model="form.weight" type="number" :precision="2" placeholder="请输入成品克重" />
</el-form-item>
</el-col>
<el-col :span="8">
<!--<el-col :span="8">
<el-form-item label="角型" prop="angleType">
<el-select v-model="form.angleType" placeholder="请选择角型">
<el-option
......@@ -42,6 +42,40 @@
></el-option>
</el-select>
</el-form-item>
</el-col>-->
<el-col :span="8">
<el-form-item label="单重(KG)" prop="singleWeight">
<el-input v-model="form.singleWeight" type="number" :precision="2" placeholder="请输入单重" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="圆角" prop="fillet">
<el-input v-model="form.fillet" type="number" :precision="2" placeholder="请输入圆角" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否异型" prop="fillet">
<el-radio-group v-model="form.isAllotype" >
<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 :span="8">
<el-form-item :span="8" label="是否直角" prop="isRightAngle">
<el-radio-group v-model="form.isRightAngle">
<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-row>
<el-row>
......@@ -62,11 +96,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="单重(KG)" prop="singleWeight">
<el-input v-model="form.singleWeight" type="number" :precision="2" placeholder="请输入单重" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="层数" prop="layerNum">
<el-input v-model="form.layerNum" type="number" :precision="2" placeholder="请输入层数" />
......@@ -74,37 +104,33 @@
</el-col>
<el-col :span="8">
<el-form-item label="是否防霉" prop="isMould">
<el-select v-model="form.isMould" placeholder="请选择是否防霉">
<el-option
<el-radio-group v-model="form.isMould" >
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="是否写码" prop="isCoding">
<el-select v-model="form.isCoding" placeholder="请选择是否写码">
<el-option
<el-radio-group v-model="form.isCoding" >
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="体系认证" prop="certification">
<el-input v-model="form.certification" placeholder="请输入体系认证" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="样品形状" prop="shape">
<el-select v-model="form.shape" placeholder="请选择样品形状">
......@@ -188,6 +214,9 @@ export default {
thick: '',
weight: '',
angleType: '',
isAllotype:'',
isRightAngle:'',
fillet:'',
angle: '',
aperture: '',
singleLayerThick: '',
......@@ -245,6 +274,9 @@ export default {
thick: null,
weight: null,
angleType: null,
isAllotype:null,
isRightAngle:null,
fillet:null,
angle: null,
aperture: null,
singleLayerThick: null,
......
src/views/mes/md/sizegroup/index.vue
View file @ 70407814
......@@ -92,7 +92,11 @@
<dict-tag :options="dict.type.size_type" :value="scope.row.sizeType"/>
</template>
</el-table-column>
<el-table-column label="是否启用" align="center" prop="enableFlag" />
<el-table-column label="是否启用" align="center" prop="enableFlag" >
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
......@@ -140,9 +144,14 @@
</el-col>
<el-col :span="10">
<el-form-item label="是否启用" label-width="100px" prop="enableFlag">
<el-input v-model="form.enableFlag" placeholder="请输入是否启用" />
<el-radio-group v-model="form.enableFlag" >
<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-row>
</el-row>
......@@ -160,7 +169,7 @@
</el-row>
</el-form>
<SizeGroupItem v-if="form.sizeGroupId" />
<SizeGroupItem v-if="form.sizeGroupId" :sizeGroupId="form.sizeGroupId"/>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
......@@ -174,7 +183,7 @@ import { listGroup, getGroup, delGroup, addGroup, updateGroup } from "@/api/mes/
import SizeGroupItem from './item/index.vue'
export default {
name: "Group",
dicts:['size_type'],
dicts:['size_type','sys_yes_no'],
components: {SizeGroupItem},
data() {
return {
......
src/views/mes/md/sizegroup/item/index.vue
View file @ 70407814
......@@ -227,7 +227,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
sizeGroupId: null,
sizeGroupId: this.sizeGroupId,
sizeIndex: null,
sizeName: null,
sizeDisplayName: null,
......@@ -238,6 +238,10 @@ export default {
rules: {},
};
},
props: {
optType: undefined,
sizeGroupId: undefined,
},
created() {
this.getList();
},
......@@ -260,7 +264,7 @@ export default {
reset() {
this.form = {
sizeGroupItemId: null,
sizeGroupId: null,
sizeGroupId: this.sizeGroupId,
sizeIndex: null,
sizeName: null,
sizeDisplayName: null,
......
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