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