Skip to content

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

打样修改

parent c86f8b69
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 527 additions and 80 deletions
src/views/mes/pro/productionMake/productionMakeApply.vue
View file @ 742119af
...@@ -32,6 +32,17 @@ ...@@ -32,6 +32,17 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['mes:pro:productionMake:add']"
>新增</el-button
>
</el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
......
src/views/mes/pro/productiorequest/requestInfoAdd.vue
View file @ 742119af
...@@ -33,7 +33,24 @@ ...@@ -33,7 +33,24 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="样品制作单编号" prop="prototypeMakeCode">
<el-input
v-model="form.prototypeMakeCode"
readonly
placeholder="请选择样品制作单编号"
>
<el-button
slot="append"
icon="el-icon-search"
@click="$refs['PrototypeMakeCodeSelectRef'].showFlag = true"
></el-button>
</el-input>
<ItemSelect ref="PrototypeMakeCodeSelectRef" @onSelected="onPrototypeMakeCodeSelect" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="产品" prop="itemId"> <el-form-item label="产品" prop="itemId">
<el-input <el-input
...@@ -88,6 +105,7 @@ ...@@ -88,6 +105,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<!-- <el-col :lg="6" :md="8" :sm="12" :xs="12"> <!-- <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="仓库" prop="warehouse"> <el-form-item label="仓库" prop="warehouse">
<el-input <el-input
...@@ -104,6 +122,7 @@ ...@@ -104,6 +122,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="是否要鞋图" prop="isNeedShoeImg"> <el-form-item label="是否要鞋图" prop="isNeedShoeImg">
<el-select v-model="form.isNeedShoeImg" placeholder="请选择"> <el-select v-model="form.isNeedShoeImg" placeholder="请选择">
...@@ -276,6 +295,46 @@ ...@@ -276,6 +295,46 @@
<el-input v-model="form.shapeSize" type="number" :precision="4" placeholder="请输入样品形状大小" /> <el-input v-model="form.shapeSize" type="number" :precision="4" placeholder="请输入样品形状大小" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="印刷正面颜色" prop="frontColorId">
<el-input
v-model="form.frontColorName"
readonly
placeholder="请输入印刷正面颜色"
>
<el-button
slot="append"
icon="el-icon-search"
@click="$refs['colorFrontSelect'].showFlag = true"
></el-button>
</el-input>
<ColorSelect
ref="colorFrontSelect"
@onSelected="onColorFrontSelected"
>
</ColorSelect>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="印刷反面颜色" prop="oppositeColorId">
<el-input
v-model="form.oppositeColorName"
readonly
placeholder="请输入印刷反面颜色"
>
<el-button
slot="append"
icon="el-icon-search"
@click="$refs['colorOppositeSelect'].showFlag = true"
></el-button>
</el-input>
<ColorSelect
ref="colorOppositeSelect"
@onSelected="onColorOppositeSelected"
>
</ColorSelect>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
...@@ -291,13 +350,24 @@ ...@@ -291,13 +350,24 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="鞋图" prop="shoeImg"> <el-form-item label="产品正面" prop="frontImg">
<ImageUpload <ImageUpload
:limit="1" :limit="1"
:value="form.shoeImg" :value="form.frontImg"
:fileSize="5" :fileSize="5"
@onUploaded="handleImgUploaded" @onUploaded="handleFrontImgUploaded"
@onRemoved="handleImgRemoved" @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> ></ImageUpload>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -332,16 +402,18 @@ import { ...@@ -332,16 +402,18 @@ import {
} from "@/api/mes/pro/productionRequest"; } from "@/api/mes/pro/productionRequest";
import { getPrototypeMake } from "@/api/mes/pro/prototypeMake"; import { getPrototypeMake } from "@/api/mes/pro/prototypeMake";
import ColorSelect from "@/components/colorSelect/index.vue";
export default { export default {
components: { components: {
ColorSelect,
ProogingBom, ProogingBom,
ProogingProcess, ProogingProcess,
ItemSelect, ItemSelect,
RoutesProcessSelect, RoutesProcessSelect,
FactorySelect, FactorySelect,
}, },
dicts: ['product_shape'], dicts: ['product_shape',"sys_yes_no"],
provide() { provide() {
return { return {
mode: this.mode, mode: this.mode,
...@@ -391,6 +463,12 @@ export default { ...@@ -391,6 +463,12 @@ export default {
certification: '', certification: '',
shape: '', shape: '',
shapeSize: '', shapeSize: '',
frontImg:"",
backImg:"",
frontColorId: "",
oppositeColorId: "",
frontColorName: "",
oppositeColorName: "",
}, },
rules: {}, rules: {},
}; };
...@@ -451,6 +529,25 @@ export default { ...@@ -451,6 +529,25 @@ export default {
this.form.itemId = row.itemId; this.form.itemId = row.itemId;
this.form.itemName = row.itemName; this.form.itemName = row.itemName;
this.form.unit = row.unitOfMeasure; this.form.unit = row.unitOfMeasure;
this.form.length = row.length;
this.form.width = row.width;
this.form.height = row.height;
this.form.thick = row.thick;
this.form.weight = row.weight;
this.form.angleType = row.angleType;
this.form.isAllotype = row.isAllotype;
this.form.isRightAngle = row.isRightAngle;
this.form.fillet = row.fillet;
this.form.fillet = row.angle;
this.form.aperture = row.aperture;
this.form.singleLayerThick = row.singleLayerThick;
this.form.singleWeight = row.singleWeight;
this.form.layerNum = row.layerNum;
this.form.isMould = row.isMould;
this.form.isCoding = row.isCoding;
this.form.certification = row.certification;
this.form.shape = row.shape;
this.form.shapeSize = row.shapeSize;
} }
}, },
onRoutesProcessSelect(row) { onRoutesProcessSelect(row) {
...@@ -551,18 +648,48 @@ export default { ...@@ -551,18 +648,48 @@ export default {
certification: '', certification: '',
shape: '', shape: '',
shapeSize: '', shapeSize: '',
frontImg:"",
backImg:"",
frontColorId: "",
oppositeColorId: "",
frontColorName: "",
oppositeColorName: "",
}; };
this.$refs["ProogingBomRef"].resetState(); this.$refs["ProogingBomRef"].resetState();
this.$refs["ProogingProcessRef"].resetState(); this.$refs["ProogingProcessRef"].resetState();
this.gCode(); this.gCode();
}, },
//图片上传成功 //图片上传成功
handleImgUploaded(imgUrl) { handleFrontImgUploaded(imgUrl) {
this.form.shoeImg = imgUrl; this.form.frontImg = imgUrl;
},
handleBackImgUploaded(imgUrl) {
this.form.backImg = imgUrl;
}, },
//图片移除 //图片移除
handleImgRemoved(imgUrl) { handleFrontImgRemoved(imgUrl) {
this.form.shoeImg = null; this.form.frontImg = null;
},
handleBackImgRemoved(imgUrl) {
this.form.backImg = null;
},
onColorFrontSelected(obj) {
this.form.itemId = this.itemId;
if (obj != undefined && obj != null) {
obj.forEach((element) => {
this.form.frontColorId = element.colorId;
this.form.frontColorName = element.colorName;
});
}
},
onColorOppositeSelected(obj) {
this.form.itemId = this.itemId;
if (obj != undefined && obj != null) {
obj.forEach((element) => {
this.form.oppositeColorId = element.colorId;
this.form.oppositeColorName = element.colorName;
});
}
}, },
}, },
}; };
......
src/views/mes/pro/prototypeMake/prototypeMakeApply.vue
View file @ 742119af
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
plain plain
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
v-hasPermi="['mes:pro:prototypeMake:add']" v-hasPermi="['mes:pro:prototypeMake:add']"
>新增</el-button >新增</el-button
> >
</el-col> --> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
......
src/views/mes/pro/prototypeMake/prototypeMakeInfo.vue
View file @ 742119af
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"> <!-- <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="申请单编码" prop="prototypeRequestCode"> <el-form-item label="申请单编码" prop="prototypeRequestCode">
<el-input <el-input
v-model="form.prototypeRequestCode" v-model="form.prototypeRequestCode"
...@@ -44,22 +44,21 @@ ...@@ -44,22 +44,21 @@
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>-->
<el-col :lg="6" :md="8" :sm="12" :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-form-item label="产品" prop="itemId">
<el-input <el-input
v-model="form.itemName" v-model="form.itemName"
readonly readonly
disabled placeholder="请选择产品"
:placeholder="mode == 'edit' ? '' : '请选择产品'" >
/> <el-button
<!-- <el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
@click="$refs['ItemSelectRef'].showFlag = true" @click="$refs['ItemSelectRef'].showFlag = true"
></el-button> ></el-button>
</el-input> </el-input>
<ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />--> <ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12" style="height: 50.5px"> <el-col :lg="6" :md="8" :sm="12" :xs="12" style="height: 50.5px">
...@@ -67,10 +66,9 @@ ...@@ -67,10 +66,9 @@
<el-input <el-input
v-model="form.routeName" v-model="form.routeName"
readonly readonly
disabled placeholder="请选择工艺路线"
:placeholder="mode == 'edit' ? '' : '请选择工艺路线'" >
/> <el-button
<!-- <el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
@click="$refs['RoutesProcessSelectRef'].showFlag = true" @click="$refs['RoutesProcessSelectRef'].showFlag = true"
...@@ -79,15 +77,14 @@ ...@@ -79,15 +77,14 @@
<RoutesProcessSelect <RoutesProcessSelect
ref="RoutesProcessSelectRef" ref="RoutesProcessSelectRef"
@onSelected="onRoutesProcessSelect" @onSelected="onRoutesProcessSelect"
/> --> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="简称" prop="abbreviation"> <el-form-item label="简称" prop="abbreviation">
<el-input <el-input
v-model="form.abbreviation" v-model="form.abbreviation"
disabled placeholder="请输入简称"
:placeholder="mode == 'edit' ? '' : '请输入简称'"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -96,8 +93,7 @@ ...@@ -96,8 +93,7 @@
<el-input <el-input
v-model="form.enName" v-model="form.enName"
readonly readonly
:placeholder="mode == 'edit' ? '' : '请输入样品英文名称'" placeholder="请输入样品英文名称"
disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -105,37 +101,41 @@ ...@@ -105,37 +101,41 @@
<el-form-item label="样品数量" prop="num"> <el-form-item label="样品数量" prop="num">
<el-input <el-input
v-model="form.num" v-model="form.num"
:placeholder="mode == 'edit' ? '' : '请输入样品数量'" placeholder="请输入样品数量"
disabled
> >
<template slot="suffix">{{ form.unit }}</template> <template slot="suffix">{{ form.unit }}</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"> <el-col :span="6">
<el-form-item label="打样形式" prop="type"> <el-form-item label="打样形式" prop="type">
<el-input <el-select v-model="form.type" placeholder="请选择打样形式">
v-model="form.type" <el-option
:placeholder="mode == 'edit' ? '' : '请选择打样形式'" v-for="dict in dict.type.pro_proof_form"
disabled :key="dict.value"
></el-input> :label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"> <el-col :span="6">
<el-form-item label="分配方式" prop="modality"> <el-form-item label="分配方式" prop="modality">
<el-input <el-select v-model="form.modality" placeholder="请选择分配方式">
v-model="form.modality" <el-option
:placeholder="mode == 'edit' ? '' : '请选择分配方式'" v-for="dict in dict.type.pro_distribution_profing"
disabled :key="dict.value"
></el-input> :label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="表面处理" prop="surfaceTreatment"> <el-form-item label="表面处理" prop="surfaceTreatment">
<el-input <el-input
v-model="form.surfaceTreatment" v-model="form.surfaceTreatment"
:placeholder="mode == 'edit' ? '' : '请输入表面处理'" placeholder="请输入表面处理"
disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -153,8 +153,7 @@ ...@@ -153,8 +153,7 @@
<el-date-picker <el-date-picker
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
v-model="form.plannedFinishDate" v-model="form.plannedFinishDate"
:placeholder="mode == 'edit' ? '' : '请输入计划完成日期'" placeholder="请输入计划完成日期"
disabled
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -164,7 +163,6 @@ ...@@ -164,7 +163,6 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
v-model="form.plannedLayoutDate" v-model="form.plannedLayoutDate"
:placeholder="mode == 'edit' ? '' : '请输入版面需求时间'" :placeholder="mode == 'edit' ? '' : '请输入版面需求时间'"
disabled
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -173,7 +171,6 @@ ...@@ -173,7 +171,6 @@
<el-input <el-input
v-model="form.testStandard" v-model="form.testStandard"
:placeholder="mode == 'edit' ? '' : '测试标准'" :placeholder="mode == 'edit' ? '' : '测试标准'"
disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -511,6 +508,7 @@ import { getPrototypeRequest } from "@/api/mes/pro/prototypeRequest"; ...@@ -511,6 +508,7 @@ import { getPrototypeRequest } from "@/api/mes/pro/prototypeRequest";
import ColorSelect from "@/components/colorSelect/index.vue"; import ColorSelect from "@/components/colorSelect/index.vue";
export default { export default {
name:"/mes/pro/prototypeMake/query",
components: { components: {
ProogingBom, ProogingBom,
ProogingProcess, ProogingProcess,
...@@ -518,7 +516,7 @@ export default { ...@@ -518,7 +516,7 @@ export default {
RoutesProcessSelect, RoutesProcessSelect,
ColorSelect, ColorSelect,
}, },
dicts: ["sys_yes_no","product_shape"], dicts: ["pro_proof_form", "pro_distribution_profing","sys_yes_no","product_shape"],
provide() { provide() {
return { return {
mode: this.mode, mode: this.mode,
...@@ -608,8 +606,11 @@ export default { ...@@ -608,8 +606,11 @@ export default {
return titles[this.mode]; return titles[this.mode];
}, },
}, },
created() { activated() {
this.getFormInfo(); this.getFormInfo();
},
created() {
if (this.mode == "apply") { if (this.mode == "apply") {
this.gCode(); this.gCode();
} }
...@@ -617,7 +618,7 @@ export default { ...@@ -617,7 +618,7 @@ export default {
methods: { methods: {
/** 根据 id 获取页面数据 */ /** 根据 id 获取页面数据 */
getFormInfo() { getFormInfo() {
if (this.mode == "apply") { /*if (this.mode == "apply") {
const id = this.$route.query.prototypeRequestId; const id = this.$route.query.prototypeRequestId;
this.loading = true; this.loading = true;
getPrototypeRequest(id) getPrototypeRequest(id)
...@@ -632,24 +633,26 @@ export default { ...@@ -632,24 +633,26 @@ export default {
.finally(() => { .finally(() => {
this.loading = false; this.loading = false;
}); });
} else { } else {*/
if (this.mode != "apply") {
const id = this.$route.query.prototypeMakeId; const id = this.$route.query.prototypeMakeId;
this.loading = true; this.loading = true;
getPrototypeMake(id) getPrototypeMake(id)
.then(({ data }) => { .then(({data}) => {
Object.assign(this.form, data); Object.assign(this.form, data);
this.bomList = data.bomList; this.bomList = data.bomList;
// 设置组件数据 // 设置组件数据
this.$refs["ProogingBomRef"].tableData = data.bomList; this.$refs["ProogingBomRef"].tableData = data.bomList;
this.$refs["ProogingProcessRef"].tableData = data.processList; this.$refs["ProogingProcessRef"].tableData = data.processList;
this.prototypeRequestId = data.prototypeRequestId; /*this.prototypeRequestId = data.prototypeRequestId;
getPrototypeRequest(prototypeRequestId).then(({ data }) => { getPrototypeRequest(prototypeRequestId).then(({ data }) => {
Object.assign(this.form, data); Object.assign(this.form, data);
}); });*/
}) })
.finally(() => { .finally(() => {
this.loading = false; this.loading = false;
}); });
//}
} }
}, },
/** 生成编码 */ /** 生成编码 */
...@@ -669,6 +672,25 @@ export default { ...@@ -669,6 +672,25 @@ export default {
this.form.itemId = row.itemId; this.form.itemId = row.itemId;
this.form.itemName = row.itemName; this.form.itemName = row.itemName;
this.form.unit = row.unitOfMeasure; this.form.unit = row.unitOfMeasure;
this.form.length = row.length;
this.form.width = row.width;
this.form.height = row.height;
this.form.thick = row.thick;
this.form.weight = row.weight;
this.form.angleType = row.angleType;
this.form.isAllotype = row.isAllotype;
this.form.isRightAngle = row.isRightAngle;
this.form.fillet = row.fillet;
this.form.fillet = row.angle;
this.form.aperture = row.aperture;
this.form.singleLayerThick = row.singleLayerThick;
this.form.singleWeight = row.singleWeight;
this.form.layerNum = row.layerNum;
this.form.isMould = row.isMould;
this.form.isCoding = row.isCoding;
this.form.certification = row.certification;
this.form.shape = row.shape;
this.form.shapeSize = row.shapeSize;
} }
}, },
onRoutesProcessSelect(row) { onRoutesProcessSelect(row) {
......
src/views/system/dept/index.vue
View file @ 742119af
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}" :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
> >
<el-table-column prop="deptName" label="部门名称" width="260"></el-table-column> <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
<el-table-column prop="deptId" label="部门id" width="260"></el-table-column>
<el-table-column prop="orderNum" label="排序" width="200"></el-table-column> <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
<el-table-column prop="status" label="状态" width="100"> <el-table-column prop="status" label="状态" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
......
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