Skip to content

M
mes-ui
Commit bd1c4d8b authored by kangzhenfei's avatar kangzhenfei
Browse files
Options

Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product

parents 1a97ca47 0601ef31
Hide whitespace changes
Inline Side-by-side
Showing with 192 additions and 357 deletions
pages/aps/aps/add.vue
View file @ bd1c4d8b
<template>
<div class="parameter">
<Form ref="form" :model="entity" :label-width="100">
<Form ref="form" :model="entity" :rules="rules" :label-width="100">
<Row :gutter="20">
<Col span="12">
<div class="filedset" style="height:238px">
<p class="title">多台分配设置</p>
<div class="duo">
<FormItem :label="l('multi_machine')" prop="multiple">
<i-switch v-model="entity.multiple" 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.multipleEquipPks" multiple></EquipSelect>
</FormItem>
</div>
</div>
<div class="filedset">
<p class="title">快速设置</p>
<div class="icon">
......@@ -42,57 +59,31 @@
</Dropdown>
</div>
<div class="slider">
<h3 v-text="entity.level"></h3>
<Slider
v-model="entity.level"
:step="1"
:min="1"
:max="5"
:marks="{1:'慢',5:'快'}"
:min="0"
:max="levelRules.length-1"
:marks="levelMarks"
show-stops
@on-change="setParameter"
></Slider>
</div>
</div>
<div class="filedset" style="height:238px">
<p class="title">多台分配设置</p>
<div class="duo">
<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">
<Checkbox label="10985553333（数控车床 车工班）"></Checkbox>
<br />
<Checkbox label="10985553333（数控车床 车工班）"></Checkbox>
<br />
<Checkbox label="10985553333（数控车床 车工班）"></Checkbox>
<br />
<Checkbox label="10985553333（数控车床 车工班）"></Checkbox>
<br />
</CheckboxGroup>
</div>-->
</div>
</div>
<div class="filedset">
<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="0" :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">
<FormItem :label="l('plan_method')" prop="planState">
<i-switch v-model="entity.planState" size="large">
<span slot="open">平行</span>
<span slot="close">重叠</span>
</i-switch>
......@@ -108,7 +99,7 @@
</Select>
</FormItem>
<Divider />
<FormItem :label="l('overTime')" prop="overTime">
<FormItem :label="l('overTime')" prop="over">
<i-switch v-model="entity.over" size="large">
<span slot="open">加班</span>
<span slot="close">不加班</span>
......@@ -118,7 +109,7 @@
<InputNumber v-model="entity.efficiencyValue" :step="0.1"></InputNumber>
</FormItem>
<Divider />
<FormItem :label="l('isDiscrete')" prop="isDiscrete">
<FormItem :label="l('isDiscrete')" prop="lisan">
<i-switch v-model="entity.lisan" size="large">
<span slot="open">是</span>
<span slot="close">否</span>
......@@ -151,8 +142,8 @@ export default {
taskSeq: "",
flog: 0, //参数应用范围
level: 0, //参数规则ID
planState: true,
calId: null,
planState: true,
planMethod: "重叠", // 平行 重叠
over: false,
overTime: "不加班", //"六日加班", 不加班 加班
......@@ -161,250 +152,29 @@ export default {
lisan: true,
isDiscrete: "否",
discrete: 1, //离散数值 必须大于 1
multiple: false,
multiple: true,
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
}
]
}
],
levelMarks: {
0: "慢",
5: "快"
},
rules: {
// calId: [
// { required: true, message: "必填", type: "number", trigger: "change" }
// ]
},
list: [],
data1: [],
marks: {
1: "工序",
2: "计划",
3: "零件",
0: "工序",
1: "计划",
2: "产品",
3: "项目",
4: "批次",
5: "所有"
},
......@@ -454,22 +224,54 @@ export default {
apsGet() {
Api.apsGetall().then(res => {
if (res.success) {
console.log(res.result)
this.levelRules = res.result;
let max=this.levelRules.length-1;
// let marks = `{0:"慢", ${max}:"快"}`;
// marks = marks.replace(/(\d+):/g,"\"$1\":");
// this.levelMarks = JSON.parse(marks);
// this.entity.level=0;
}
});
},
setParameter(v) {
// alert(v)
let parameters = this.levelRules[v].prams;
parameters.map(u => {
if (u.parametersCode == "PlanMethod") {
this.entity.planState = u.parameterValue == "平行";
this.entity.planMethod = u.parameterValue;
} else if (u.parametersCode == "OverTime") {
this.entity.over = u.OverTime == "不加班";
this.entity.overTime = u.parameterValue;
} else if (u.parametersCode == "Discrete") {
this.entity.lisan = u.parameterValue == "是";
this.entity.isDiscrete = u.parameterValue;
}
console.log(u);
});
},
handleSubmit() {
this.$refs.form.validate(valid => {
if (valid) {
Api.apsschedulupdateparameter(this.entity).then(res => {
if (res.result.state) {
this.$Message.success(res.result.msg);
this.$emit("on-parameter-ok");
}else{
this.$Message.error(res.result.msg);
}
});
this.entity.multipleEquipIds = this.entity.multipleEquipPks.join();
this.entity.planMethod = this.entity.planState ? "重叠" : "平行";
this.entity.overTime = this.entity.over ? "不加班" : "加班";
this.entity.isDiscrete = this.entity.lisan ? "是" : "否";
this.entity.multipleEquip = this.entity.multiple ? "是" : "否";
Api.apsschedulupdateparameter(this.entity)
.then(res => {
if (res.result.state) {
this.$Message.success(res.result.msg);
this.$emit("on-parameter-ok");
} else {
this.$Message.error(res.result.msg);
}
})
.catch(e => {
this.$Message.error("数据异常！");
});
}
});
},
......
pages/processManage/Process/supporting.vue
View file @ bd1c4d8b
......@@ -156,7 +156,8 @@ export default {
title: this.l('materialType'),
align: 'left',
easy: true,
high: true
high: true,
slot:"materialType"
},
{
key: 'brand',
......
pages/processManage/setProcess/components/orderMaterial.vue
View file @ bd1c4d8b
......@@ -54,7 +54,7 @@
<state
code="mes_xingchi_resource.material.materialReType"
type="text"
:value="row.materialType"
:value="row.material_type"
></state>
</template>
</Table>
......@@ -67,13 +67,7 @@
width="830px"
:footer-hide="isview"
>
<Form
ref="formprocessValidate"
:model="formprocessValidate"
:label-width="120"
inline
>
<Form ref="formprocessValidate" :model="formprocessValidate" :label-width="120" inline>
<Row>
<Col :span="12">
<FormItem :label="l('materialNumber')" prop="materialNumber">
......@@ -82,7 +76,7 @@
</Col>
<Col :span="12">
<FormItem :label="l('nameMaterial')" prop="nameMaterial">
<Input v-model="formprocessValidate.nameMaterial"></Input>
<Input v-model="formprocessValidate.name"></Input>
</FormItem>
</Col>
<Col :span="12">
......@@ -95,18 +89,18 @@
<FormItem :label="l('materialType')" prop="materialType">
<Dictionary
code="mes_xingchi_resource.material.materialReType"
v-model="formprocessValidate.materialType"
v-model="formprocessValidate.material_type"
></Dictionary>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('brand')" prop="brand">
<Input v-model="formprocessValidate.brand"></Input>
<Input v-model="formprocessValidate.pate_number"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('specifications')" prop="specifications">
<Input v-model="formprocessValidate.specifications"></Input>
<Input v-model="formprocessValidate.spec"></Input>
</FormItem>
</Col>
<Col :span="12">
......@@ -150,7 +144,7 @@ export default {
Modeltitle: "料单",
dataTop: [],
isview: false,
newModel:false,
newModel: false,
columnTop: [
{
......@@ -259,25 +253,33 @@ export default {
},
formValidate1: [],
formprocessValidate: {
id: 0,
materialbillId: 0,
material_type: 0,
name: "",
pate_number: "",
spec: "",
categories: "",
quantity: 0,
singlequantity: 0,
quantity_unit: "",
estimated_part_height: 0,
height_unit: "",
lower_basal_plate: 0,
plate_unit: "",
use_equip: "",
remarks: "",
extend: "",
actual_quantity: 0,
routingHeaderId: 0,
routingDetailId: 0,
routingStepId: 0,
quantity: 0,
materialId: 0,
materialType: "",
supportingID: 0,
materialNumber: "",
nameMaterial: "",
state: 0,
extend: "",
remark: "",
brand: "",
specifications: "",
xhgg: "",
texture: "",
procurementStandards: "",
qualityGrade: "",
id: 0
qualityGrade: ""
},
column1: [
{ title: "序号", type: "index", width: "70", align: "center" },
......@@ -289,7 +291,7 @@ export default {
high: true
},
{
key: "nameMaterial",
key: "name",
title: this.l("nameMaterial"),
align: "left",
easy: true,
......@@ -303,21 +305,22 @@ export default {
},
{
key: "materialType",
key: "material_type",
title: this.l("materialType"),
align: "left",
easy: true,
high: true
high: true,
slot: "materialType"
},
{
key: "brand",
key: "pate_number",
title: this.l("brand"),
align: "left",
easy: true,
high: true
},
{
key: "specifications",
key: "spec",
title: this.l("specifications"),
align: "left",
easy: true,
......@@ -416,11 +419,10 @@ export default {
label: val
});
},
l(key) {
key = "RoutingSupporting" + "." + key;
return this.$t(key)
}
,
l(key) {
key = "RoutingSupporting" + "." + key;
return this.$t(key);
},
loaddata() {
if (this.formValidate.id != 0) {
var url =
......@@ -512,12 +514,10 @@ export default {
this.formValidate.ordercodes = mesCodes.toString(",");
service
.post(
`${url}`,{
orderMaterial: this.formValidate,
orderMaterialList: this.formValidate1
}
)
.post(`${url}`, {
orderMaterial: this.formValidate,
orderMaterialList: this.formValidate1
})
.then(response => {
let itemId = response.result.orderMaterial.id;
// let idIteme = this.$parent.$parent.dataListRetrunNew.idList
......@@ -558,33 +558,58 @@ export default {
return;
}
var url = `${designUrl}/ordermateriallist/createorupdate`;
service
.post(`${url}`, this.formprocessValidate)
.then(response => {
if (response.success) {
this.$Message.success("保存成功");
this.newModel = false;
this.cleardata();
this.loaddata();
}
})
.catch(error => {
this.$Message.error("保存失败");
});
if (this.formValidate.id == 0) {
this.formValidate1.push(this.formprocessValidate);
} else {
var url = `${designUrl}/ordermateriallist/createorupdate`;
service
.post(`${url}`, this.formprocessValidate)
.then(response => {
if (response.success) {
this.$Message.success("保存成功");
this.newModel = false;
this.cleardata();
this.loaddata();
}
})
.catch(error => {
this.$Message.error("保存失败");
});
}
},
editFun(params) {
this.formprocessValidate.id = params.row.id;
this.formprocessValidate.quantity = params.row.quantity;
this.formprocessValidate.materialbillId = params.row.materialbillId;
this.formprocessValidate.material_type = params.row.material_type;
this.formprocessValidate.name = params.row.name;
this.formprocessValidate.spec = params.row.spec;
this.formprocessValidate.pate_number = params.row.pate_number;
this.formprocessValidate.categories = params.row.categories;
this.formprocessValidate.materialId = params.row.materialId;
this.formprocessValidate.materialType = params.row.materialType;
this.formprocessValidate.materialNumber = params.row.materialNumber;
this.formprocessValidate.nameMaterial = params.row.nameMaterial;
this.formprocessValidate.brand = params.row.brand;
this.formprocessValidate.specifications = params.row.specifications;
this.formprocessValidate.quantity = params.row.quantity;
this.formprocessValidate.singlequantity = params.row.singlequantity;
this.formprocessValidate.quantity_unit = params.row.quantity_unit;
this.formprocessValidate.estimated_part_height =
params.row.estimated_part_height;
this.formprocessValidate.height_unit = params.row.height_unit;
this.formprocessValidate.lower_basal_plate = params.row.lower_basal_plate;
this.formprocessValidate.plate_unit = params.row.plate_unit;
this.formprocessValidate.use_equip = params.row.use_equip;
this.formprocessValidate.remarks = params.row.remarks;
this.formprocessValidate.extend = params.row.extend;
this.formprocessValidate.actual_quantity = params.row.actual_quantity;
this.formprocessValidate.routingHeaderId = params.row.routingHeaderId;
this.formprocessValidate.routingDetailId = params.row.routingDetailId;
this.formprocessValidate.routingStepId = params.row.routingStepId;
this.formprocessValidate.supportingID = params.row.supportingID;
this.formprocessValidate.xhgg = params.row.xhgg;
this.formprocessValidate.texture = params.row.texture;
this.formprocessValidate.procurementStandards =
......@@ -598,20 +623,27 @@ export default {
title: "提示",
content: "确定要删除当前行？",
onOk: () => {
var url = `${designUrl}/ordermateriallist/delete?id=` + params.row.id;
service
.delete(`${url}`)
.then(response => {
if (response.success) {
this.$Message.success("删除成功");
this.loaddata();
} else {
if (this.formValidate.id == 0) {
this.formValidate1.push(this.formprocessValidate);
} else {
var url =
`${designUrl}/ordermateriallist/delete?id=` + params.row.id;
service
.delete(`${url}`)
.then(response => {
if (response.success) {
this.$Message.success("删除成功");
} else {
this.$Message.error("删除失败");
}
})
.catch(error => {
this.$Message.error("删除失败");
}
})
.catch(error => {
this.$Message.error("删除失败");
});
});
}
},
onCancel: () => {}
});
......
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