Skip to content

P
pda-ui
Commit 326aec3f authored by 赵汉亭's avatar 赵汉亭
Browse files
Options

生产版本修改,工单字段添加

parent 286aaeee
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 964 additions and 91 deletions
src/views/mes/pro/productionSolution/components/ProogingProcess.vue
View file @ 326aec3f
......@@ -194,6 +194,23 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="副单位" prop="deputyUnitOfMeasure">
<el-input
v-model="form.deputyUnitOfMeasure"
placeholder="请输入副单位"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="单位转换比例" prop="unitConvert">
<el-input
type="number"
v-model="form.unitConvert"
placeholder="请输入主副单位转换比例"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="雇员数量" prop="employeesNum">
<el-input
......@@ -292,68 +309,11 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="吹膜宽度" prop="blownFilmWidth">
<el-input
type="number"
v-model="form.blownFilmWidth"
placeholder="请输入吹膜宽度"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="吹膜厚度" prop="blownFilmThickness">
<el-input
type="number"
v-model="form.blownFilmThickness"
placeholder="请输入吹膜厚度"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="印数宽度" prop="printingWidth">
<el-input
type="number"
v-model="form.printingWidth"
placeholder="请输入印数宽度"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="形状" prop="shape">
<el-select
v-model="form.shape"
clearable
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 :span="12">
<el-form-item label="Inlay" prop="inlay">
<el-input v-model="form.inlay" placeholder="Inlay"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="印张长度" prop="printLength">
<el-input
type="number"
v-model="form.printLength"
placeholder="请输入印张长度"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="印张宽度" prop="printWidth">
<el-form-item label="备注" prop="remark">
<el-input
type="number"
v-model="form.printWidth"
placeholder="请输入印张宽度"
type="textarea"
v-model="form.remark"
placeholder="请输入工序备注"
></el-input>
</el-form-item>
</el-col>
......@@ -421,19 +381,13 @@ export default {
stdWorkingTime: "",
lineBreakTime: "",
stdWorkingTimeUom: "",
controlCode: "",
procurementInformationId: "",
vendorSubjectId: "",
netPrice: "",
procurementOrganization: "",
remark: "",
blownFilmWidth: "",
blownFilmThickness: "",
printingWidth: "",
shape: "",
inlay: "",
printLength: "",
printWidth: "",
deputyUnitOfMeasure: "",
unitConvert: "",
},
currentRow: {},
currentRowIndex: undefined,
......@@ -536,19 +490,13 @@ export default {
stdWorkingTime: "",
lineBreakTime: "",
stdWorkingTimeUom: "",
controlCode: "",
procurementInformationId: "",
vendorSubjectId: "",
netPrice: "",
procurementOrganization: "",
remark: "",
blownFilmWidth: "",
blownFilmThickness: "",
printingWidth: "",
shape: "",
inlay: "",
printLength: "",
printWidth: "",
deputyUnitOfMeasure: "",
unitConvert: "",
};
},
/**重置组件状态 */
......
src/views/mes/pro/productionSolution/proofingInfo.vue
View file @ 326aec3f
......@@ -59,6 +59,15 @@
</el-select>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="生产用途" prop="usageName">
<el-input
v-model="form.usageName"
disabled
placeholder
></el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="产品名称" prop="itemName">
<el-input v-model="form.itemName" disabled placeholder></el-input>
......@@ -74,8 +83,8 @@
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="生产用途" prop="usageId">
<el-select v-model="form.usageId" placeholder="请选择用途">
<el-form-item label="SAP生产用途" prop="sapUsageId">
<el-select v-model="form.sapUsageId" placeholder="请选择SAP用途">
<el-option
v-for="dict in dict.type.production_solution_usage"
:key="dict.value"
......@@ -159,15 +168,22 @@
<el-tab-pane label="工艺">
<ProogingProcess ref="ProogingProcessRef" :bomList="bomList" />
</el-tab-pane>
<el-tab-pane label="规格书">
<ProogingSpecificationSheet
ref="ProogingSpecificationSheetRef"
:specificationSheet="specificationSheet"
/>
</el-tab-pane>
</el-tabs>
</PageWrapper>
</div>
</template>
<script>
import { genCode } from "@/api/system/autocode/rule";
// import { genCode } from "@/api/system/autocode/rule";
import ProogingBom from "./components/ProogingBom.vue";
import ProogingProcess from "./components/ProogingProcess.vue";
import ProogingSpecificationSheet from "./components/ProogingSpecificationSheet.vue";
import ItemSelect from "@/components/itemSelect/single.vue";
import RoutesProcessSelect from "@/components/routesProcessSelect/index.vue";
import { listRouteprocess } from "@/api/mes/pro/routeprocess";
......@@ -181,7 +197,13 @@ import {
} from "@/api/mes/pro/productionSolution";
export default {
components: { ProogingBom, ProogingProcess, ItemSelect, RoutesProcessSelect },
components: {
ProogingBom,
ProogingProcess,
ItemSelect,
RoutesProcessSelect,
ProogingSpecificationSheet,
},
dicts: ["production_solution_type", "production_solution_usage"],
provide() {
return {
......@@ -216,6 +238,7 @@ export default {
status: "",
sapItemCode: "",
factoryCode: "",
sapUsageId: "",
remark: "",
createBy: "",
createTime: "",
......@@ -261,6 +284,8 @@ export default {
this.$refs["ProogingBomRef"].form2 = data.bomHead;
this.$refs["ProogingBomRef"].tableData = data.bomHead.bomItemList;
this.$refs["ProogingProcessRef"].tableData = data.processList;
this.$refs["ProogingSpecificationSheetRef"].form =
data.specificationSheet;
})
.finally(() => {
this.loading = false;
......@@ -305,10 +330,13 @@ export default {
saveForm() {
const bomHead = this.$refs.ProogingBomRef.getComData();
const processList = this.$refs.ProogingProcessRef.getComData();
const specificationSheet =
this.$refs.ProogingSpecificationSheetRef.getComData();
const params = {
...this.form,
bomHead,
processList,
specificationSheet,
};
this.loading = true;
if (this.mode == "apply") {
......@@ -364,9 +392,11 @@ export default {
createTime: "",
updateBy: "",
updateTime: "",
sapUsageId: "",
};
this.$refs["ProogingBomRef"].resetState();
this.$refs["ProogingProcessRef"].resetState();
this.$refs["ProogingSpecificationSheetRef"].resetState();
this.gCode();
},
},
......
src/views/mes/pro/workorder/proofingInfo.vue
View file @ 326aec3f
......@@ -196,10 +196,10 @@
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="按指令包装" prop="packByDirective">
<el-select v-model="form.packByDirective" placeholder="请选择类型">
<el-form-item label="包装类型" prop="packType">
<el-select v-model="form.packType" placeholder="请选择类型">
<el-option
v-for="dict in dict.type.sys_yes_no"
v-for="dict in dict.type.pro_pack_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
......@@ -208,10 +208,24 @@
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="按size包装" prop="packBySize">
<el-select v-model="form.packBySize" placeholder="请选择类型">
<el-form-item label="包装单位" prop="packUnitOfMeasure">
<el-input
v-model="form.packUnitOfMeasure"
placeholder="请输入包装单位"
/>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item
label="LOSS数是否单独包装"
prop="lossIndividuallyWrap"
>
<el-select
v-model="form.lossIndividuallyWrap"
placeholder="请选择是否单独包装"
>
<el-option
v-for="dict in dict.type.sys_yes_no"
v-for="dict in dict.type.sap_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
......@@ -297,6 +311,8 @@ export default {
"mes_workorder_sourcetype",
"mes_workorder_type",
"sys_yes_no",
"pro_pack_type",
"sap_yes_no",
],
provide() {
return {
......@@ -345,8 +361,9 @@ export default {
createTime: null,
updateBy: null,
updateTime: null,
packBySize: null,
packByDirective: null,
packType: null,
packUnitOfMeasure: null,
lossIndividuallyWrap: null,
packNum: null,
},
// 表单校验
......@@ -626,8 +643,9 @@ export default {
createTime: null,
updateBy: null,
updateTime: null,
packBySize: null,
packByDirective: null,
packType: null,
packUnitOfMeasure: null,
lossIndividuallyWrap: null,
packNum: null,
};
this.$refs["ProogingBomRef"].resetState();
......
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