Skip to content

M
mes-ui
Commit cd1745d4 authored by 鲁鑫's avatar 鲁鑫
Browse files
Options

打样-样品制作单增加产品外观、排版参数、产品图片等字段; 

打样-样品申请增加产品外观、产品图片、产品颜色字段
parent 6effd279
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 573 additions and 73 deletions
src/views/mes/pro/productiorequest/requestInfoAdd.vue
View file @ cd1745d4
......@@ -146,31 +146,6 @@
</el-form-item>
</el-col> -->
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
:rows="3"
v-model="form.remark"
placeholder="备注"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="鞋图" prop="shoeImg">
<ImageUpload
:limit="1"
:value="form.shoeImg"
:fileSize="5"
@onUploaded="handleImgUploaded"
@onRemoved="handleImgRemoved"
></ImageUpload>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="长度cm" prop="length">
......@@ -187,13 +162,13 @@
<el-input v-model="form.height" type="number" :precision="2" placeholder="请输入高度" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="厚度mm" prop="thick">
<el-input v-model="form.thick" type="number" :precision="2" placeholder="请输入厚度" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="成品克重g" prop="weight">
<el-input v-model="form.weight" type="number" :precision="2" placeholder="请输入成品克重" />
......@@ -204,8 +179,6 @@
<el-input v-model="form.singleWeight" type="number" :precision="2" placeholder="请输入单重" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="圆角" prop="fillet">
<el-input v-model="form.fillet" type="number" :precision="2" placeholder="请输入圆角" />
......@@ -222,6 +195,8 @@
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item :lg="6" :md="8" :sm="12" :xs="12" label="是否直角" prop="isRightAngle">
<el-radio-group v-model="form.isRightAngle">
......@@ -233,8 +208,6 @@
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="角度(mm)" prop="angle">
<el-input v-model="form.angle" type="number" :precision="2" placeholder="请输入角度" />
......@@ -252,7 +225,6 @@
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="层数" prop="layerNum">
<el-input v-model="form.layerNum" type="number" :precision="2" placeholder="请输入层数" />
......@@ -280,13 +252,13 @@
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="体系认证" prop="certification">
<el-input v-model="form.certification" placeholder="请输入体系认证" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="样品形状" prop="shape">
<el-select v-model="form.shape" placeholder="请选择样品形状">
......@@ -305,6 +277,31 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
:rows="3"
v-model="form.remark"
placeholder="备注"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="鞋图" prop="shoeImg">
<ImageUpload
:limit="1"
:value="form.shoeImg"
:fileSize="5"
@onUploaded="handleImgUploaded"
@onRemoved="handleImgRemoved"
></ImageUpload>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-tabs type="border-card" @tab-click="tabClick">
......
src/views/mes/pro/productiorequest/requestInfoEdit.vue
View file @ cd1745d4
......@@ -154,32 +154,6 @@
</el-form-item>
</el-col> -->
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
:rows="3"
v-model="form.remark"
placeholder="备注"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="鞋图" prop="shoeImg">
<ImageUpload
:limit="1"
:value="form.shoeImg"
:fileSize="5"
@onUploaded="handleImgUploaded"
@onRemoved="handleImgRemoved"
></ImageUpload>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="长度cm" prop="length">
......@@ -196,13 +170,13 @@
<el-input v-model="form.height" type="number" :precision="2" placeholder="请输入高度" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="厚度mm" prop="thick">
<el-input v-model="form.thick" type="number" :precision="2" placeholder="请输入厚度" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="成品克重g" prop="weight">
<el-input v-model="form.weight" type="number" :precision="2" placeholder="请输入成品克重" />
......@@ -213,8 +187,6 @@
<el-input v-model="form.singleWeight" type="number" :precision="2" placeholder="请输入单重" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="圆角" prop="fillet">
<el-input v-model="form.fillet" type="number" :precision="2" placeholder="请输入圆角" />
......@@ -231,6 +203,8 @@
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item :lg="6" :md="8" :sm="12" :xs="12" label="是否直角" prop="isRightAngle">
<el-radio-group v-model="form.isRightAngle">
......@@ -242,8 +216,6 @@
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="角度(mm)" prop="angle">
<el-input v-model="form.angle" type="number" :precision="2" placeholder="请输入角度" />
......@@ -261,7 +233,6 @@
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="层数" prop="layerNum">
<el-input v-model="form.layerNum" type="number" :precision="2" placeholder="请输入层数" />
......@@ -289,13 +260,13 @@
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="体系认证" prop="certification">
<el-input v-model="form.certification" placeholder="请输入体系认证" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="样品形状" prop="shape">
<el-select v-model="form.shape" placeholder="请选择样品形状">
......@@ -314,6 +285,31 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
:rows="3"
v-model="form.remark"
placeholder="备注"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="鞋图" prop="shoeImg">
<ImageUpload
:limit="1"
:value="form.shoeImg"
:fileSize="5"
@onUploaded="handleImgUploaded"
@onRemoved="handleImgRemoved"
></ImageUpload>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-tabs type="border-card" @tab-click="tabClick">
......
src/views/mes/pro/prototypeMake/prototypeMakeInfo.vue
View file @ cd1745d4
......@@ -310,6 +310,137 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="长度cm" prop="length">
<el-input v-model="form.length" type="number" :precision="2" placeholder="请输入长度" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="宽度cm" prop="width">
<el-input v-model="form.width" type="number" :precision="2" placeholder="请输入宽度" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="高度cm" prop="height">
<el-input v-model="form.height" type="number" :precision="2" placeholder="请输入高度" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="厚度mm" prop="thick">
<el-input v-model="form.thick" type="number" :precision="2" placeholder="请输入厚度" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="成品克重g" prop="weight">
<el-input v-model="form.weight" type="number" :precision="2" placeholder="请输入成品克重" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<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 :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="圆角" prop="fillet">
<el-input v-model="form.fillet" type="number" :precision="2" placeholder="请输入圆角" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<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-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item :lg="6" :md="8" :sm="12" :xs="12" 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-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="角度(mm)" prop="angle">
<el-input v-model="form.angle" type="number" :precision="2" placeholder="请输入角度" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="孔径(mm)" prop="aperture">
<el-input v-model="form.aperture" type="number" :precision="2" placeholder="请输入孔径" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="单层厚(丝)" prop="singleLayerThick">
<el-input v-model="form.singleLayerThick" type="number" :precision="2" placeholder="请输入单层厚(单位丝)" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="层数" prop="layerNum">
<el-input v-model="form.layerNum" type="number" :precision="2" placeholder="请输入层数" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="是否防霉" prop="isMould">
<el-radio-group v-model="form.isMould" >
<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="isCoding">
<el-radio-group v-model="form.isCoding" >
<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="certification">
<el-input v-model="form.certification" placeholder="请输入体系认证" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="样品形状" prop="shape">
<el-select v-model="form.shape" placeholder="请选择样品形状">
<el-option
v-for="dict in dict.type.product_shape"
:key="dict.value"
:label="dict.label"
:value="dict.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="shapeSize">
<el-input v-model="form.shapeSize" type="number" :precision="4" placeholder="请输入样品形状大小" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="备注" prop="remark">
......@@ -322,6 +453,30 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="产品正面" prop="frontImg">
<ImageUpload
:limit="1"
:value="form.frontImg"
:fileSize="5"
@onUploaded="handleFrontImgUploaded"
@onRemoved="handleFrontImgRemoved"
></ImageUpload>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="产品背面" prop="backImg">
<ImageUpload
:limit="1"
:value="form.backImg"
:fileSize="5"
@onUploaded="handleBackImgUploaded"
@onRemoved="handleBackImgRemoved"
></ImageUpload>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-tabs type="border-card" @tab-click="tabClick">
......@@ -363,7 +518,7 @@ export default {
RoutesProcessSelect,
ColorSelect,
},
dicts: [],
dicts: ["sys_yes_no","product_shape"],
provide() {
return {
mode: this.mode,
......@@ -410,9 +565,29 @@ export default {
printPaperwidth: null,
frontColorId: null,
oppositeColorId: null,
ngReason: null,
frontColorName: null,
oppositeColorName: null,
length: null,
width: null,
height: null,
thick: null,
weight: null,
angleType: null,
isAllotype:null,
isRightAngle:null,
fillet:null,
angle: null,
aperture: null,
singleLayerThick: null,
singleWeight: null,
layerNum: null,
isMould: null,
isCoding: null,
certification: null,
shape: null,
shapeSize: null,
frontImg:null,
backImg:null,
},
rules: {},
};
......@@ -587,6 +762,27 @@ export default {
oppositeColorId: "",
frontColorName: "",
oppositeColorName: "",
length: '',
width: '',
height: '',
thick: '',
weight: '',
angleType: '',
isAllotype:'',
isRightAngle:'',
fillet:'',
angle: '',
aperture: '',
singleLayerThick: '',
singleWeight: '',
layerNum: '',
isMould: '',
isCoding: '',
certification: '',
shape: '',
shapeSize: '',
frontImg:'',
backImg:'',
};
this.$refs["ProogingBomRef"].resetState();
this.$refs["ProogingProcessRef"].resetState();
......@@ -623,6 +819,20 @@ export default {
});
}
},
//图片上传成功
handleFrontImgUploaded(imgUrl) {
this.form.frontImg = imgUrl;
},
handleBackImgUploaded(imgUrl) {
this.form.backImg = imgUrl;
},
//图片移除
handleFrontImgRemoved(imgUrl) {
this.form.frontImg = null;
},
handleBackImgRemoved(imgUrl) {
this.form.backImg = null;
},
},
};
</script>
......
src/views/mes/proofing/proofingInfo.vue
View file @ cd1745d4
This diff is collapsed.
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