Skip to content

M
mes-ui
Commit e8758b38 authored by renjintao's avatar renjintao
Browse files
Options

mesplan plan

parent 36095936
Show whitespace changes
Inline Side-by-side
Showing with 299 additions and 305 deletions
pages/aps/plan/index.vue
View file @ e8758b38
...@@ -150,9 +150,9 @@ export default { ...@@ -150,9 +150,9 @@ export default {
modalAccessory: false, modalAccessory: false,
columns: [{ columns: [{
key: "selection", key: "selection",
title: "#", title: '多选',
type: "selection", type: "selection",
width: 70, width: 50,
align: "center", align: "center",
}, },
{ {
...@@ -259,13 +259,13 @@ export default { ...@@ -259,13 +259,13 @@ export default {
high: true, high: true,
hide: true, hide: true,
}, },
{ // {
key: "spareQty", // key: "spareQty",
title: this.l("spareQty"), // title: this.l("spareQty"),
align: "left", // align: "left",
high: true, // high: true,
hide: true, // hide: true,
}, // },
{ {
key: "isPreschedule", key: "isPreschedule",
title: this.l("isPreschedule"), title: this.l("isPreschedule"),
...@@ -274,28 +274,28 @@ export default { ...@@ -274,28 +274,28 @@ export default {
high: true, high: true,
code: "aps.plan.ispreschedule", code: "aps.plan.ispreschedule",
}, },
{ // {
key: "demandStart", // key: "demandStart",
title: this.l("demandStart"), // title: this.l("demandStart"),
align: "left", // align: "left",
high: true, // high: true,
hide: true, // hide: true,
}, // },
{ // {
key: "demandFinish", // key: "demandFinish",
title: this.l("demandFinish"), // title: this.l("demandFinish"),
align: "left", // align: "left",
high: true, // high: true,
hide: true, // hide: true,
}, // },
{ // {
key: "partNamePro", // key: "partNamePro",
title: this.l("partNamePro"), // title: this.l("partNamePro"),
align: "left", // align: "left",
easy: true, // easy: true,
high: true, // high: true,
hide: true, // hide: true,
}, // },
{ {
title: "操作", title: "操作",
key: "action", key: "action",
......
pages/mesPlan/add.vue
View file @ e8758b38
...@@ -106,7 +106,7 @@ export default { ...@@ -106,7 +106,7 @@ export default {
productId: null, //产品id productId: null, //产品id
productName: "", //产品名称 productName: "", //产品名称
drawnNumber: null, //图号 drawnNumber: null, //图号
taskType: null, //任务类型 taskType: 1, //任务类型
quantity: 1, //数量 quantity: 1, //数量
taskRequire: "", //任务接点要求 taskRequire: "", //任务接点要求
demandStartDate: this.getFormatDate(nowDate), //开始时间 demandStartDate: this.getFormatDate(nowDate), //开始时间
...@@ -114,7 +114,7 @@ export default { ...@@ -114,7 +114,7 @@ export default {
remark: "", //备注 remark: "", //备注
projectNumber: "", //项目号 projectNumber: "", //项目号
batchNumber: "", //批次号 batchNumber: "", //批次号
urgencyLevel: null, //紧急程度 urgencyLevel: 1, //紧急程度
bomId: null, bomId: null,
}, },
ruleValidate: { ruleValidate: {
...@@ -147,7 +147,9 @@ export default { ...@@ -147,7 +147,9 @@ export default {
wfstatu: 1, wfstatu: 1,
}; };
}, },
created() {},
mounted() { mounted() {
let params = { let params = {
id: "123327da-42b3-41f6-b785-cf933f137a95", id: "123327da-42b3-41f6-b785-cf933f137a95",
}; };
...@@ -161,8 +163,8 @@ export default { ...@@ -161,8 +163,8 @@ export default {
} }
} }
}); });
this.loadTree(); this.loadTree();
}, },
methods: { methods: {
handleSubmit() { handleSubmit() {
...@@ -173,6 +175,7 @@ export default { ...@@ -173,6 +175,7 @@ export default {
.then((r) => { .then((r) => {
if (r.success) { if (r.success) {
this.$Message.success("保存成功"); this.$Message.success("保存成功");
this.resetFields();
this.$emit("on-ok"); this.$emit("on-ok");
} else { } else {
this.$Message.error("保存失败"); this.$Message.error("保存失败");
...@@ -215,10 +218,11 @@ export default { ...@@ -215,10 +218,11 @@ export default {
}, },
resetFields() { resetFields() {
this.orderSearchForm = { this.orderSearchForm = {
productId: null, //产品id productId: null, //产品id
productName: "", //产品名称 productName: "", //产品名称
drawnNumber: null, //图号 drawnNumber: null, //图号
taskType: null, //任务类型 taskType: 1, //任务类型
quantity: 1, //数量 quantity: 1, //数量
taskRequire: "", //任务接点要求 taskRequire: "", //任务接点要求
demandStartDate: this.getFormatDate(nowDate), //开始时间 demandStartDate: this.getFormatDate(nowDate), //开始时间
...@@ -226,7 +230,7 @@ export default { ...@@ -226,7 +230,7 @@ export default {
remark: "", //备注 remark: "", //备注
projectNumber: "", //项目号 projectNumber: "", //项目号
batchNumber: "", //批次号 batchNumber: "", //批次号
urgencyLevel: null, //紧急程度 urgencyLevel: 1, //紧急程度
}; };
}, },
loadTree() { loadTree() {
......
pages/mesPlan/edit.vue
View file @ e8758b38
...@@ -163,15 +163,16 @@ export default { ...@@ -163,15 +163,16 @@ export default {
.then((r) => { .then((r) => {
if (r.success) { if (r.success) {
this.$Message.success("保存成功"); this.$Message.success("保存成功");
//this.resetFields()
this.$emit("on-ok"); this.$emit("on-ok");
} else { } else {
this.$Message.error("保存失败"); this.$Message.error("保存失败");
} }
}) })
.catch((err) => { // .catch((err) => {
this.$Message.error("保存失败"); // this.$Message.error("保存失败");
console.warn(err); // console.warn(err);
}); // });
} }
}); });
}, },
......
pages/mesPlan/index.vue
View file @ e8758b38
...@@ -141,6 +141,7 @@ export default { ...@@ -141,6 +141,7 @@ export default {
id: "id", id: "id",
columns: [{ columns: [{
key: "selection", key: "selection",
title: '多选',
type: "selection", type: "selection",
width: 50, width: 50,
align: "center" align: "center"
......
pages/mesPlan/split.vue
View file @ e8758b38
<template> <template>
<div style="width:100%;overflow:auto" :style="{height:divHeight}"> <div style="width:100%;overflow:auto" :style="{height:divHeight}">
<Form <Form :model="orderForm" :label-width="80" class="margin-top-20 margin-bottom-50" :rules="ruleValidate" ref="formValidate">
:model="orderForm"
:label-width="80"
class="margin-top-20 margin-bottom-50"
:rules="ruleValidate"
ref="formValidate"
>
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem label="订单编号" style="width:100%"> <FormItem label="订单编号" style="width:100%">
...@@ -50,18 +44,10 @@ ...@@ -50,18 +44,10 @@
<Input type="text" v-model="row.quantity" @on-change="inputOrderCat(row,index)" /> <Input type="text" v-model="row.quantity" @on-change="inputOrderCat(row,index)" />
</template> </template>
<template slot-scope="{ row, index }" slot="slotTime"> <template slot-scope="{ row, index }" slot="slotTime">
<DatePicker <DatePicker v-model="row.demandDate" type="daterange" placeholder="请选择日期" style="width:240px" :transfer="true" :options="optionsDate" @on-change="inputOrderCat(row,index)"></DatePicker>
v-model="row.demandDate"
type="daterange"
placeholder="请选择日期"
style="width:240px"
:transfer="true"
:options="optionsDate"
@on-change="inputOrderCat(row,index)"
></DatePicker>
</template> </template>
</Table> </Table>
</div> </div>
</template> </template>
<script> <script>
...@@ -104,8 +90,7 @@ export default { ...@@ -104,8 +90,7 @@ export default {
splitQuantity: 2, //分解数量 splitQuantity: 2, //分解数量
splitList: [] //分解后产生的列表 splitList: [] //分解后产生的列表
}, },
columns1: [ columns1: [{
{
title: "序号", title: "序号",
type: "index", type: "index",
width: 80, width: 80,
...@@ -133,16 +118,19 @@ export default { ...@@ -133,16 +118,19 @@ export default {
} }
], ],
dataList: [], dataList: [],
dataListRetrun: { id: null, quantity: null, mesCode: "", items: [] }, //确定后返回数据 dataListRetrun: {
id: null,
quantity: null,
mesCode: "",
items: []
}, //确定后返回数据
ruleValidate: { ruleValidate: {
splitQuantity: [ splitQuantity: [{
{
required: true, required: true,
message: "请输入数量", message: "请输入数量",
type: "number", type: "number",
trigger: "change" trigger: "change"
} }]
]
} }
}; };
}, },
...@@ -178,7 +166,7 @@ export default { ...@@ -178,7 +166,7 @@ export default {
//确定增加数量 //确定增加数量
addSplitOrder() { addSplitOrder() {
if (this.orderForm.splitQuantity < 2||this.orderForm.splitQuantity==undefined) { if (this.orderForm.splitQuantity < 2 || this.orderForm.splitQuantity == undefined) {
this.dataList = []; this.dataList = [];
return; return;
} }
...@@ -194,10 +182,8 @@ export default { ...@@ -194,10 +182,8 @@ export default {
let planEndTime = this.orderForm.planEndTime; let planEndTime = this.orderForm.planEndTime;
for (var i = 0; i < splitQuantity; i++) { for (var i = 0; i < splitQuantity; i++) {
this.dataList.push({ this.dataList.push({
mesCode: mesCode: i + 1 < 10 ?
i + 1 < 10 mesCodeSon + "0" + (i + 1) : mesCodeSon + "" + (i + 1),
? mesCodeSon + "0" + (i + 1)
: mesCodeSon + "" + (i + 1),
quantity: "", quantity: "",
demandDate: [planStartTime, planEndTime], demandDate: [planStartTime, planEndTime],
demandStartDate: planStartTime, demandStartDate: planStartTime,
...@@ -265,6 +251,7 @@ export default { ...@@ -265,6 +251,7 @@ export default {
splitQuantity: 2, //分解数量 splitQuantity: 2, //分解数量
splitList: [] //分解后产生的列表 splitList: [] //分解后产生的列表
}; };
this.dataList = []
}, },
watch: { watch: {
row(v) { row(v) {
...@@ -276,6 +263,7 @@ export default { ...@@ -276,6 +263,7 @@ export default {
this.dataListRetrun.id = this.orderForm.id; this.dataListRetrun.id = this.orderForm.id;
this.dataListRetrun.quantity = this.orderForm.quantity; this.dataListRetrun.quantity = this.orderForm.quantity;
this.dataListRetrun.mesCode = this.orderForm.mesCode; this.dataListRetrun.mesCode = this.orderForm.mesCode;
this.dataList = []
} }
} }
} }
......
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