Skip to content

M
mes-ui
Commit f0a0aaf6 authored by 周远喜's avatar 周远喜
Browse files
Options

参数设置接口处理成功。

parent bda9e48b
Hide whitespace changes
Inline Side-by-side
Showing with 388 additions and 153 deletions
i18n/locale/zh-CN.js
View file @ f0a0aaf6
......@@ -1045,7 +1045,7 @@ export default {
insert_flag: '插单',
important_flag:"插单",
outside_time: '外协时间',
discrete_percent: '离散百分比%',
discrete_percent: '离散度',
taskseq_des: '',
workshopcode: '',
routing_detail_id: '',
......
pages/aps/aps/add.vue
View file @ f0a0aaf6
<template>
<div class="parameter">
<Form ref="form" :model="entity" :rules="rules" :label-width="100">
<Form ref="form" :model="entity" :label-width="100">
<Row :gutter="20">
<Col span="12">
<div class="filedset">
<p class="title">参数设置</p>
<FormItem :label="l('plan_method')" prop="planMethod">
<i-switch v-model="entity.planMethod" size="large">
<span slot="open">平行</span>
<span slot="close">重叠</span>
</i-switch>
</FormItem>
<FormItem :label="l('calId')" prop="calId">
<Select v-model="entity.calId" style="width:150px">
<Option
v-for="(item,index) in listCal"
:key="index"
:value="item.calid"
:label="item.calname"
></Option>
</Select>
</FormItem>
<Divider />
<FormItem :label="l('overTime')" prop="overTime">
<i-switch v-model="entity.overTime" size="large">
<span slot="open">加班</span>
<span slot="close">不加班</span>
</i-switch>
</FormItem>
<FormItem :label="l('efficiencyValue')" prop="efficiencyValue">
<InputNumber v-model="entity.efficiencyValue" :step="0.1"></InputNumber >
</FormItem>
<Divider />
<FormItem :label="l('isDiscrete')" prop="isDiscrete">
<i-switch v-model="entity.isDiscrete" size="large">
<span slot="open">是</span>
<span slot="close">否</span>
</i-switch>
</FormItem>
<FormItem :label="l('discrete')" prop="discrete">
<InputNumber v-model="entity.discrete"></InputNumber>
</FormItem>
<FormItem :label="l('discrete_percent')" prop="discrete_percent">
<InputNumber v-model="entity.discrete_percent"></InputNumber>
</FormItem>
</div>
<div class="filedset">
<p class="title">参数级别</p>
<p class="title">快速设置</p>
<div class="icon">
<Dropdown trigger="click" >
<a href="javascript:void(0)" @click="handleOpen">
<Dropdown trigger="hover">
<a href="javascript:void(0)">
<Icon type="md-git-compare" />
</a>
<DropdownMenu slot="list" style="text-align: center;">
......@@ -77,39 +35,37 @@
</a>
<span>是否离散</span>
</DropdownItem>
<div style="margin:10px;">
<Button type="primary" @click="handleOk">确定</Button>
<Button type="primary" @click="handle">关闭</Button>
</div>
<!-- <div>
<Button type="text" class="ib" @click="handleOk">确定</Button><Button type="text" class="ib" @click="handle">关闭</Button>
</div>-->
</DropdownMenu>
</Dropdown>
</div>
<div class="slider">
<Slider v-model="entity.level" :step="1" :min="1" :max="5" :marks="{1:'慢',5:'块'}" show-stops></Slider>
<Slider
v-model="entity.level"
:step="1"
:min="1"
:max="5"
:marks="{1:'慢',5:'快'}"
show-stops
></Slider>
</div>
</div>
</Col>
<Col span="12">
<div class="filedset">
<div class="filedset" style="height:238px">
<p class="title">多台分配设置</p>
<div class="duo">
<Row>
<Col :span="12">
<FormItem :label="l('multi_machine')" prop="multipleEquip">
<i-switch v-model="entity.multipleEquip" size="large">
<span slot="open">是</span>
<span slot="close">否</span>
</i-switch>
</FormItem>
</Col>
<Col :span="12">
<FormItem label="多台数量" prop="multipleCount">
<InputNumber v-model="entity.multipleCount"></InputNumber>
</FormItem>
</Col>
</Row>
<FormItem label="生产设备">
<EquipSelect v-model="entity.multipleEquipIds"> </EquipSelect>
<FormItem :label="l('multi_machine')" prop="multipleEquip">
<i-switch v-model="entity.multipleEquip" size="large">
<span slot="open">是</span>
<span slot="close">否</span>
</i-switch>
</FormItem>
<FormItem label="多台数量" prop="multipleCount">
<InputNumber v-model="entity.multipleCount"></InputNumber>
</FormItem>
<FormItem label="生产设备">
<EquipSelect v-model="entity.multipleEquipIds"></EquipSelect>
</FormItem>
<!-- <div class="check-box">
<CheckboxGroup v-model="entity.fruit">
......@@ -122,16 +78,60 @@
<Checkbox label="10985553333（数控车床 车工班）"></Checkbox>
<br />
</CheckboxGroup>
</div> -->
</div>-->
</div>
</div>
<div class="filedset">
<p class="title">参数应用</p>
<p class="title">应用范围</p>
<div class="slider">
<Slider v-model="entity.flog" :step="1" :min="1" :max="5" :marks="marks" size="large"></Slider>
<Slider v-model="entity.flog" :step="1" :min="1" :max="5" :marks="marks" size="large"></Slider>
</div>
</div>
</Col>
<Col span="12">
<div class="filedset">
<p class="title">参数设置</p>
<FormItem :label="l('plan_method')" prop="planMethod">
<i-switch v-model="entity.plan" size="large">
<span slot="open">平行</span>
<span slot="close">重叠</span>
</i-switch>
</FormItem>
<FormItem :label="l('calId')" prop="calId">
<Select v-model="entity.calId">
<Option
v-for="(item,index) in listCal"
:key="index"
:value="item.id"
:label="item.calname"
></Option>
</Select>
</FormItem>
<Divider />
<FormItem :label="l('overTime')" prop="overTime">
<i-switch v-model="entity.over" size="large">
<span slot="open">加班</span>
<span slot="close">不加班</span>
</i-switch>
</FormItem>
<FormItem :label="l('efficiencyValue')" prop="efficiencyValue">
<InputNumber v-model="entity.efficiencyValue" :step="0.1"></InputNumber>
</FormItem>
<Divider />
<FormItem :label="l('isDiscrete')" prop="isDiscrete">
<i-switch v-model="entity.lisan" size="large">
<span slot="open">是</span>
<span slot="close">否</span>
</i-switch>
</FormItem>
<FormItem :label="l('discrete')" prop="discrete">
<InputNumber v-model="entity.discrete"></InputNumber>
</FormItem>
<FormItem :label="l('discrete_percent')" prop="discrete_percent">
<InputNumber v-model="entity.discrete_percent"></InputNumber>
</FormItem>
</div>
</Col>
</Row>
<FormItem class="click-btn">
<Button type="primary" @click="handleSubmit">确定</Button>
......@@ -146,35 +146,303 @@ export default {
data() {
return {
entity: {
flog: 0, //参数应用
planMethod: "转序规则", // 平行 重叠
partTaskPk: 0,
opTaskPk: 0,
taskSeq: "",
flog: 0, //参数应用范围
level: 0, //参数规则ID
planState: true,
calId: null,
planMethod: "重叠", // 平行 重叠
over: false,
overTime: "不加班", //"六日加班", 不加班 加班
efficiencyValue: 11, // 效率系数, 必须大于 0
shopId: null,
level: 1,
value2: 100,
fruit: []
lisan: true,
isDiscrete: "否",
discrete: 1, //离散数值 必须大于 1
multiple: false,
multipleEquip: "是", //"是否多台安排设备", 否 是
multipleCount: 1, //多台数量
multipleEquipPks: [],
multipleEquipIds: "" //"设备id", 用英文逗号分隔
},
levelRules:[],
levelRules2: [
{
level: 0,
prams: [
{
parameterLevel: "0",
parameterName: "转序规则",
parametersCode: "PlanMethod",
parameterValue: "重叠",
parametersState: "1",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 1
},
{
parameterLevel: "0",
parameterName: "六日加班",
parametersCode: "OverTime",
parameterValue: "加班",
parametersState: "1",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 2
},
{
parameterLevel: "0",
parameterName: "是否离散",
parametersCode: "Discrete",
parameterValue: "0",
parametersState: "0",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 3
}
]
},
{
level: 1,
prams: [
{
parameterLevel: "1",
parameterName: "转序规则",
parametersCode: "PlanMethod",
parameterValue: "平行",
parametersState: "1",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 4
},
{
parameterLevel: "1",
parameterName: "六日加班",
parametersCode: "OverTime",
parameterValue: "加班",
parametersState: "0",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 5
},
{
parameterLevel: "1",
parameterName: "是否离散",
parametersCode: "Discrete",
parameterValue: "0",
parametersState: "0",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 6
}
]
},
{
level: 2,
prams: [
{
parameterLevel: "2",
parameterName: "转序规则",
parametersCode: "PlanMethod",
parameterValue: "重叠",
parametersState: "1",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 7
},
{
parameterLevel: "2",
parameterName: "六日加班",
parametersCode: "OverTime",
parameterValue: "加班",
parametersState: "1",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 8
},
{
parameterLevel: "2",
parameterName: "是否离散",
parametersCode: "Discrete",
parameterValue: "0",
parametersState: "1",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 9
}
]
},
{
level: 3,
prams: [
{
parameterLevel: "3",
parameterName: "转序规则",
parametersCode: "PlanMethod",
parameterValue: "平行",
parametersState: "1",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 10
},
{
parameterLevel: "3",
parameterName: "六日加班",
parametersCode: "OverTime",
parameterValue: "加班",
parametersState: "1",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 11
},
{
parameterLevel: "3",
parameterName: "是否离散",
parametersCode: "Discrete",
parameterValue: "0",
parametersState: "0",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 12
}
]
},
{
level: 4,
prams: [
{
parameterLevel: "4",
parameterName: "转序规则",
parametersCode: "PlanMethod",
parameterValue: "重叠",
parametersState: "0",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 13
},
{
parameterLevel: "4",
parameterName: "六日加班",
parametersCode: "OverTime",
parameterValue: "加班",
parametersState: "1",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 14
},
{
parameterLevel: "4",
parameterName: "是否离散",
parametersCode: "Discrete",
parameterValue: "0",
parametersState: "0",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 15
}
]
},
{
level: 5,
prams: [
{
parameterLevel: "5",
parameterName: "转序规则",
parametersCode: "PlanMethod",
parameterValue: "平行",
parametersState: "1",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 16
},
{
parameterLevel: "5",
parameterName: "六日加班",
parametersCode: "OverTime",
parameterValue: "加班",
parametersState: "1",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 17
},
{
parameterLevel: "5",
parameterName: "是否离散",
parametersCode: "Discrete",
parameterValue: "0",
parametersState: "0",
isDeleted: false,
creationTime: "2010-04-01 00:00:00",
creatorUserId: 1,
id: 18
}
]
}
],
list: [],
data1: [],
marks:{
1:'工序',
2:'计划',
3:'零件',
4:'批次',
5:'所有',
marks: {
1: "工序",
2: "计划",
3: "零件",
4: "批次",
5: "所有"
},
listCal: [],
visible: false,
rules: {
businessName: [{ required: true, message: "必填", trigger: "blur" }],
businessCode: [{ required: true, message: "必填", trigger: "blur" }]
}
visible: false
// rules: {
// businessName: [{ required: true, message: "必填", trigger: "blur" }],
// businessCode: [{ required: true, message: "必填", trigger: "blur" }]
// }
};
},
mounted() {
props: {
opTaskPk: {
//工单ID
type: Number,
default: 0
},
partTaskPk: {
//生产计划ID
type: Number,
default: 0
},
taskSeq: {
//工序编号
type: String,
default: ""
},
count: {
//生产计划数量
type: Number,
default: 0
}
},
created() {
this.getCal(); //获取连班策略
this.apsGet(); //获取参数级别和转序等的关系
this.initTree(); //获取当前登录人所在车间下的所有部门
},
mounted() {},
methods: {
getCal() {
Api.getallcal().then(res => {
......@@ -185,8 +453,9 @@ export default {
},
apsGet() {
Api.apsGetall().then(res => {
// if (res.success) {
// }
if (res.success) {
this.levelRules = res.result;
}
});
},
......@@ -194,63 +463,19 @@ export default {
this.$refs.form.validate(valid => {
if (valid) {
Api.apsschedulupdateparameter(this.entity).then(res => {
if (res.success) {
if (res.result.state) {
this.$Message.success(res.result.msg);
this.$emit("on-parameter-ok");
}else{
this.$Message.error(res.result.msg);
}
});
} else {
this.$Message.error("Fail!");
}
});
},
initTree() {
var sumData = [];
Api.userdepartmentsofworkshop()
.then(r => {
if (r.result) {
this.data1 = r.result;
} else {
this.$Message.error("加载部门失败!");
}
})
.catch(err => {});
},
renderContent(h, { root, node, data }) {
//渲染树的样式
return h(
"span",
{
style: {
cursor: "pointer"
},
on: {
click: () => {
this.handleSelect(data); //手动选择树节点
}
}
},
data.title
);
},
handleSelect(data) {
let obj = {
label: data.title,
value: data.value
};
this.list = [];
this.list.push(obj);
alert(this.list[0].value)
this.entity.shopId = this.list[0].value;
},
handleClose() {
this.$emit("on-close");
},
handle() {
this.visible = false;
},
handleOk() {},
l(key) {
let vkey = "mes_op_task_plan_simulate" + "." + key;
return this.$t(vkey) || key;
......@@ -258,13 +483,13 @@ export default {
}
};
</script>
<style lang="less" scoped>
<style lang="less">
.parameter {
margin: 10px;
.filedset {
position: relative;
border: 1px solid #e0e0e0;
padding: 25px 0;
padding: 25px 10px 0 10px;
margin-bottom: 20px;
.title {
display: inline-block;
......@@ -275,13 +500,18 @@ export default {
left: 25px;
color: #2680eb;
}
.icon{
.icon {
position: absolute;
right: -10px;
top:10px;
right: 10px;
top: 10px;
}
.slider{
padding: 0 20px;
.slider {
padding: 20px 20px;
.ivu-slider-marks-item {
width: 60px;
text-align: center;
// margin-right: -20px;
}
}
}
.click-btn {
......
pages/aps/aps/components/edit.vue
View file @ f0a0aaf6
......@@ -66,7 +66,12 @@ export default {
}
},
props: {
eid: Number
row: {
type:Object,
default:()=>{
return null
}
}
},
methods: {
load(v) {
......@@ -84,7 +89,7 @@ export default {
this.disabled = false
if (r.success) {
this.$Message.success('保存成功')
this.$emit('on-ok')
this.$emit('on-option-ok')
} else {
this.$Message.error('保存失败')
}
......
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