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 { ...@@ -1045,7 +1045,7 @@ export default {
insert_flag: '插单', insert_flag: '插单',
important_flag:"插单", important_flag:"插单",
outside_time: '外协时间', outside_time: '外协时间',
discrete_percent: '离散百分比%', discrete_percent: '离散度',
taskseq_des: '', taskseq_des: '',
workshopcode: '', workshopcode: '',
routing_detail_id: '', routing_detail_id: '',
......
pages/aps/aps/add.vue
View file @ f0a0aaf6
<template> <template>
<div class="parameter"> <div class="parameter">
<Form ref="form" :model="entity" :rules="rules" :label-width="100"> <Form ref="form" :model="entity" :label-width="100">
<Row :gutter="20"> <Row :gutter="20">
<Col span="12"> <Col span="12">
<div class="filedset"> <div class="filedset">
<p class="title">参数设置</p> <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>
<div class="icon"> <div class="icon">
<Dropdown trigger="click" > <Dropdown trigger="hover">
<a href="javascript:void(0)" @click="handleOpen"> <a href="javascript:void(0)">
<Icon type="md-git-compare" /> <Icon type="md-git-compare" />
</a> </a>
<DropdownMenu slot="list" style="text-align: center;"> <DropdownMenu slot="list" style="text-align: center;">
...@@ -77,39 +35,37 @@ ...@@ -77,39 +35,37 @@
</a> </a>
<span>是否离散</span> <span>是否离散</span>
</DropdownItem> </DropdownItem>
<div style="margin:10px;"> <!-- <div>
<Button type="primary" @click="handleOk">确定</Button> <Button type="text" class="ib" @click="handleOk">确定</Button><Button type="text" class="ib" @click="handle">关闭</Button>
<Button type="primary" @click="handle">关闭</Button> </div>-->
</div>
</DropdownMenu> </DropdownMenu>
</Dropdown> </Dropdown>
</div> </div>
<div class="slider"> <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>
</div> </div>
</Col> <div class="filedset" style="height:238px">
<Col span="12">
<div class="filedset">
<p class="title">多台分配设置</p> <p class="title">多台分配设置</p>
<div class="duo"> <div class="duo">
<Row> <FormItem :label="l('multi_machine')" prop="multipleEquip">
<Col :span="12"> <i-switch v-model="entity.multipleEquip" size="large">
<FormItem :label="l('multi_machine')" prop="multipleEquip"> <span slot="open">是</span>
<i-switch v-model="entity.multipleEquip" size="large"> <span slot="close">否</span>
<span slot="open">是</span> </i-switch>
<span slot="close">否</span> </FormItem>
</i-switch> <FormItem label="多台数量" prop="multipleCount">
</FormItem> <InputNumber v-model="entity.multipleCount"></InputNumber>
</Col> </FormItem>
<Col :span="12"> <FormItem label="生产设备">
<FormItem label="多台数量" prop="multipleCount"> <EquipSelect v-model="entity.multipleEquipIds"></EquipSelect>
<InputNumber v-model="entity.multipleCount"></InputNumber>
</FormItem>
</Col>
</Row>
<FormItem label="生产设备">
<EquipSelect v-model="entity.multipleEquipIds"> </EquipSelect>
</FormItem> </FormItem>
<!-- <div class="check-box"> <!-- <div class="check-box">
<CheckboxGroup v-model="entity.fruit"> <CheckboxGroup v-model="entity.fruit">
...@@ -122,16 +78,60 @@ ...@@ -122,16 +78,60 @@
<Checkbox label="10985553333（数控车床 车工班）"></Checkbox> <Checkbox label="10985553333（数控车床 车工班）"></Checkbox>
<br /> <br />
</CheckboxGroup> </CheckboxGroup>
</div> --> </div>-->
</div> </div>
</div> </div>
<div class="filedset"> <div class="filedset">
<p class="title">参数应用</p> <p class="title">应用范围</p>
<div class="slider"> <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>
</div> </div>
</Col> </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> </Row>
<FormItem class="click-btn"> <FormItem class="click-btn">
<Button type="primary" @click="handleSubmit">确定</Button> <Button type="primary" @click="handleSubmit">确定</Button>
...@@ -146,35 +146,303 @@ export default { ...@@ -146,35 +146,303 @@ export default {
data() { data() {
return { return {
entity: { entity: {
flog: 0, //参数应用 partTaskPk: 0,
planMethod: "转序规则", // 平行 重叠 opTaskPk: 0,
taskSeq: "",
flog: 0, //参数应用范围
level: 0, //参数规则ID
planState: true,
calId: null,
planMethod: "重叠", // 平行 重叠
over: false,
overTime: "不加班", //"六日加班", 不加班 加班
efficiencyValue: 11, // 效率系数, 必须大于 0
shopId: null, shopId: null,
level: 1, lisan: true,
value2: 100, isDiscrete: "否",
fruit: [] 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: [], list: [],
data1: [], data1: [],
marks:{ marks: {
1:'工序', 1: "工序",
2:'计划', 2: "计划",
3:'零件', 3: "零件",
4:'批次', 4: "批次",
5:'所有', 5: "所有"
}, },
listCal: [], listCal: [],
visible: false, visible: false
rules: { // rules: {
businessName: [{ required: true, message: "必填", trigger: "blur" }], // businessName: [{ required: true, message: "必填", trigger: "blur" }],
businessCode: [{ 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.getCal(); //获取连班策略
this.apsGet(); //获取参数级别和转序等的关系 this.apsGet(); //获取参数级别和转序等的关系
this.initTree(); //获取当前登录人所在车间下的所有部门
}, },
mounted() {},
methods: { methods: {
getCal() { getCal() {
Api.getallcal().then(res => { Api.getallcal().then(res => {
...@@ -185,8 +453,9 @@ export default { ...@@ -185,8 +453,9 @@ export default {
}, },
apsGet() { apsGet() {
Api.apsGetall().then(res => { Api.apsGetall().then(res => {
// if (res.success) { if (res.success) {
// } this.levelRules = res.result;
}
}); });
}, },
...@@ -194,63 +463,19 @@ export default { ...@@ -194,63 +463,19 @@ export default {
this.$refs.form.validate(valid => { this.$refs.form.validate(valid => {
if (valid) { if (valid) {
Api.apsschedulupdateparameter(this.entity).then(res => { 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() { handleClose() {
this.$emit("on-close"); this.$emit("on-close");
}, },
handle() {
this.visible = false;
},
handleOk() {},
l(key) { l(key) {
let vkey = "mes_op_task_plan_simulate" + "." + key; let vkey = "mes_op_task_plan_simulate" + "." + key;
return this.$t(vkey) || key; return this.$t(vkey) || key;
...@@ -258,13 +483,13 @@ export default { ...@@ -258,13 +483,13 @@ export default {
} }
}; };
</script> </script>
<style lang="less" scoped> <style lang="less">
.parameter { .parameter {
margin: 10px; margin: 10px;
.filedset { .filedset {
position: relative; position: relative;
border: 1px solid #e0e0e0; border: 1px solid #e0e0e0;
padding: 25px 0; padding: 25px 10px 0 10px;
margin-bottom: 20px; margin-bottom: 20px;
.title { .title {
display: inline-block; display: inline-block;
...@@ -275,13 +500,18 @@ export default { ...@@ -275,13 +500,18 @@ export default {
left: 25px; left: 25px;
color: #2680eb; color: #2680eb;
} }
.icon{ .icon {
position: absolute; position: absolute;
right: -10px; right: 10px;
top:10px; top: 10px;
} }
.slider{ .slider {
padding: 0 20px; padding: 20px 20px;
.ivu-slider-marks-item {
width: 60px;
text-align: center;
// margin-right: -20px;
}
} }
} }
.click-btn { .click-btn {
......
pages/aps/aps/components/edit.vue
View file @ f0a0aaf6
...@@ -66,7 +66,12 @@ export default { ...@@ -66,7 +66,12 @@ export default {
} }
}, },
props: { props: {
eid: Number row: {
type:Object,
default:()=>{
return null
}
}
}, },
methods: { methods: {
load(v) { load(v) {
...@@ -84,7 +89,7 @@ export default { ...@@ -84,7 +89,7 @@ export default {
this.disabled = false this.disabled = false
if (r.success) { if (r.success) {
this.$Message.success('保存成功') this.$Message.success('保存成功')
this.$emit('on-ok') this.$emit('on-option-ok')
} else { } else {
this.$Message.error('保存失败') 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