Commit aeaf3799 authored by renjintao's avatar renjintao

aps/plan

parent 9d3a9bf5
<template> <template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90"> <Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row> <Row>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('upId')" prop="upId"> <FormItem :label="l('upId')" prop="upId">
...@@ -138,10 +138,7 @@ ...@@ -138,10 +138,7 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('isSupportingFinish')" prop="isSupportingFinish"> <FormItem :label="l('isSupportingFinish')" prop="isSupportingFinish">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.is_supporting_finish" v-model="entity.isSupportingFinish"></Dictionary>
code="mes_xingchi_plan.mes_order.is_supporting_finish"
v-model="entity.isSupportingFinish"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
...@@ -191,10 +188,7 @@ ...@@ -191,10 +188,7 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('orderQuotationStatus')" prop="orderQuotationStatus"> <FormItem :label="l('orderQuotationStatus')" prop="orderQuotationStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.order_quotation_status" v-model="entity.orderQuotationStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.order_quotation_status"
v-model="entity.orderQuotationStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
...@@ -233,10 +227,7 @@ ...@@ -233,10 +227,7 @@
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem <FormItem :label="l('productingPreparationFinishDate')" prop="productingPreparationFinishDate">
:label="l('productingPreparationFinishDate')"
prop="productingPreparationFinishDate"
>
<DatePicker type="date" v-model="entity.productingPreparationFinishDate"></DatePicker> <DatePicker type="date" v-model="entity.productingPreparationFinishDate"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
...@@ -292,34 +283,22 @@ ...@@ -292,34 +283,22 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('mainRoutingSetStatus')" prop="mainRoutingSetStatus"> <FormItem :label="l('mainRoutingSetStatus')" prop="mainRoutingSetStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.main_routing_set_status" v-model="entity.mainRoutingSetStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.main_routing_set_status"
v-model="entity.mainRoutingSetStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('majorRoutingSetStatus')" prop="majorRoutingSetStatus"> <FormItem :label="l('majorRoutingSetStatus')" prop="majorRoutingSetStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.major_routing_set_status" v-model="entity.majorRoutingSetStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.major_routing_set_status"
v-model="entity.majorRoutingSetStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('materialBillSetStatus')" prop="materialBillSetStatus"> <FormItem :label="l('materialBillSetStatus')" prop="materialBillSetStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.material_bill_set_status" v-model="entity.materialBillSetStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.material_bill_set_status"
v-model="entity.materialBillSetStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('routingDataSetStatus')" prop="routingDataSetStatus"> <FormItem :label="l('routingDataSetStatus')" prop="routingDataSetStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.routing_data_set_status" v-model="entity.routingDataSetStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.routing_data_set_status"
v-model="entity.routingDataSetStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
...@@ -329,18 +308,12 @@ ...@@ -329,18 +308,12 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('mainRoutingExecuteStatus')" prop="mainRoutingExecuteStatus"> <FormItem :label="l('mainRoutingExecuteStatus')" prop="mainRoutingExecuteStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.main_routing_execute_status" v-model="entity.mainRoutingExecuteStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.main_routing_execute_status"
v-model="entity.mainRoutingExecuteStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('majorRoutingExecuteStatus')" prop="majorRoutingExecuteStatus"> <FormItem :label="l('majorRoutingExecuteStatus')" prop="majorRoutingExecuteStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.major_routing_execute_status" v-model="entity.majorRoutingExecuteStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.major_routing_execute_status"
v-model="entity.majorRoutingExecuteStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
...@@ -385,10 +358,7 @@ ...@@ -385,10 +358,7 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('isPreschedule')" prop="isPreschedule"> <FormItem :label="l('isPreschedule')" prop="isPreschedule">
<Dictionary <Dictionary code="aps.plan.ispreschedule" v-model="entity.isPreschedule"></Dictionary>
code="mes_xingchi_plan.mes_order.is_preschedule"
v-model="entity.isPreschedule"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
...@@ -416,9 +386,11 @@ ...@@ -416,9 +386,11 @@
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button> <Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
</Form> </Form>
</template> </template>
<script>
<script>
import Api from "./api"; import Api from "./api";
export default { export default {
name: "Add", name: "Add",
...@@ -426,7 +398,11 @@ export default { ...@@ -426,7 +398,11 @@ export default {
return { return {
entity: {}, entity: {},
rules: { rules: {
name: [{ required: true, message: "必填", trigger: "blur" }], name: [{
required: true,
message: "必填",
trigger: "blur"
}],
}, },
}; };
}, },
......
<template> <template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90"> <Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row> <Row>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('upId')" prop="upId"> <FormItem :label="l('upId')" prop="upId">
...@@ -138,10 +138,7 @@ ...@@ -138,10 +138,7 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('isSupportingFinish')" prop="isSupportingFinish"> <FormItem :label="l('isSupportingFinish')" prop="isSupportingFinish">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.is_supporting_finish" v-model="entity.isSupportingFinish"></Dictionary>
code="mes_xingchi_plan.mes_order.is_supporting_finish"
v-model="entity.isSupportingFinish"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
...@@ -191,10 +188,7 @@ ...@@ -191,10 +188,7 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('orderQuotationStatus')" prop="orderQuotationStatus"> <FormItem :label="l('orderQuotationStatus')" prop="orderQuotationStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.order_quotation_status" v-model="entity.orderQuotationStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.order_quotation_status"
v-model="entity.orderQuotationStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
...@@ -233,10 +227,7 @@ ...@@ -233,10 +227,7 @@
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem <FormItem :label="l('productingPreparationFinishDate')" prop="productingPreparationFinishDate">
:label="l('productingPreparationFinishDate')"
prop="productingPreparationFinishDate"
>
<DatePicker type="date" v-model="entity.productingPreparationFinishDate"></DatePicker> <DatePicker type="date" v-model="entity.productingPreparationFinishDate"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
...@@ -292,34 +283,22 @@ ...@@ -292,34 +283,22 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('mainRoutingSetStatus')" prop="mainRoutingSetStatus"> <FormItem :label="l('mainRoutingSetStatus')" prop="mainRoutingSetStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.main_routing_set_status" v-model="entity.mainRoutingSetStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.main_routing_set_status"
v-model="entity.mainRoutingSetStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('majorRoutingSetStatus')" prop="majorRoutingSetStatus"> <FormItem :label="l('majorRoutingSetStatus')" prop="majorRoutingSetStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.major_routing_set_status" v-model="entity.majorRoutingSetStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.major_routing_set_status"
v-model="entity.majorRoutingSetStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('materialBillSetStatus')" prop="materialBillSetStatus"> <FormItem :label="l('materialBillSetStatus')" prop="materialBillSetStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.material_bill_set_status" v-model="entity.materialBillSetStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.material_bill_set_status"
v-model="entity.materialBillSetStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('routingDataSetStatus')" prop="routingDataSetStatus"> <FormItem :label="l('routingDataSetStatus')" prop="routingDataSetStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.routing_data_set_status" v-model="entity.routingDataSetStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.routing_data_set_status"
v-model="entity.routingDataSetStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
...@@ -329,18 +308,12 @@ ...@@ -329,18 +308,12 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('mainRoutingExecuteStatus')" prop="mainRoutingExecuteStatus"> <FormItem :label="l('mainRoutingExecuteStatus')" prop="mainRoutingExecuteStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.main_routing_execute_status" v-model="entity.mainRoutingExecuteStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.main_routing_execute_status"
v-model="entity.mainRoutingExecuteStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('majorRoutingExecuteStatus')" prop="majorRoutingExecuteStatus"> <FormItem :label="l('majorRoutingExecuteStatus')" prop="majorRoutingExecuteStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.major_routing_execute_status" v-model="entity.majorRoutingExecuteStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.major_routing_execute_status"
v-model="entity.majorRoutingExecuteStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
...@@ -385,10 +358,7 @@ ...@@ -385,10 +358,7 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('isPreschedule')" prop="isPreschedule"> <FormItem :label="l('isPreschedule')" prop="isPreschedule">
<Dictionary <Dictionary code="aps.plan.ispreschedule" v-model="entity.isPreschedule"></Dictionary>
code="mes_xingchi_plan.mes_order.is_preschedule"
v-model="entity.isPreschedule"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
...@@ -416,8 +386,9 @@ ...@@ -416,8 +386,9 @@
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button> <Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
</Form> </Form>
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
export default { export default {
...@@ -426,7 +397,11 @@ export default { ...@@ -426,7 +397,11 @@ export default {
return { return {
entity: {}, entity: {},
rules: { rules: {
name: [{ required: true, message: "必填", trigger: "blur" }], name: [{
required: true,
message: "必填",
trigger: "blur"
}],
}, },
}; };
}, },
...@@ -435,7 +410,9 @@ export default { ...@@ -435,7 +410,9 @@ export default {
}, },
methods: { methods: {
load(v) { load(v) {
Api.get({ id: v }).then((r) => { Api.get({
id: v
}).then((r) => {
this.entity = r.result; this.entity = r.result;
this.$emit("on-load"); this.$emit("on-load");
}); });
......
...@@ -266,6 +266,14 @@ export default { ...@@ -266,6 +266,14 @@ export default {
high: true, high: true,
hide: true, hide: true,
}, },
{
key: "isPreschedule",
title: this.l("isPreschedule"),
align: "center",
width: 100,
high: true,
code: "aps.plan.ispreschedule",
},
{ {
key: "demandStart", key: "demandStart",
title: this.l("demandStart"), title: this.l("demandStart"),
......
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