Skip to content

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

aps

parent 588b5f35
Show whitespace changes
Inline Side-by-side
Showing with 347 additions and 286 deletions
pages/aps/aps/api.js
View file @ 0200adfc
import Api from '@/plugins/request'
export default {
index:`${resourceUrl}mesparttaskplansimulate/paged`,
paged(params){
return Api.post(`${resourceUrl}mesparttaskplansimulate/paged`,params);
index: `${resourceUrl}mesparttaskplansimulate/paged`,
paged(params) {
return Api.post(`${resourceUrl}mesparttaskplansimulate/paged`, params);
},
get(params){
return Api.get(`${resourceUrl}mesparttaskplansimulate/get`,params);
get(params) {
return Api.get(`${resourceUrl}mesparttaskplansimulate/get`, params);
},
create(params){
return Api.post(`${resourceUrl}mesparttaskplansimulate/create`,params);
create(params) {
return Api.post(`${resourceUrl}mesparttaskplansimulate/create`, params);
},
update(params){
return Api.post(`${resourceUrl}mesparttaskplansimulate/update`,params);
update(params) {
return Api.post(`${resourceUrl}mesparttaskplansimulate/update`, params);
},
//删除：
delete(params) {
return Api.delete(`${resourceUrl}mesparttaskplansimulate/delete`,{params:params});
return Api.delete(`${resourceUrl}mesparttaskplansimulate/delete`, {
params: params
});
},
}
\ No newline at end of file
//获取排产池数据列表
getall() {
return Api.get(`${aps}/Mes_part_task_plan_simulate/getall`);
},
//点开排产池列表查看对应的工序
getbyorderid(params) {
return Api.get(`${aps}/mes_op_task_plan_simulate/getbyorderid`, params);
},
//订单优先级
orderpriority(params) {
return Api.post(`${aps}/apspoolappservices/orderpriority`, params);
},
//删除工序
removeoptasksimluate(params) {
return Api.post(`${aps}/apspoolappservices/removeoptasksimluate`, params);
},
//恢复工艺
recoveryoptasksimluate(params) {
return Api.post(`${aps}/apspoolappservices/recoveryoptasksimluate`, params);
},
//移出排产池
shiftoutapspool(params) {
return Api.post(`${aps}/apspoolappservices/shiftoutapspool`, params);
},
//排产计算
apsprepareandcalc(params) {
return Api.post(`${aps}/apspoolappservices/apsprepareandcalc`, params);
},
//排产方案下发
processschemedispatch(params) {
return Api.post(`${aps}/apspoolappservices/processschemedispatch`, params);
},
//APS排产前数据合法性校验
recoveryoptasksimluate(params) {
return Api.post(`${aps}/apspoolappservices/apsdatachecked`, params);
},
}
pages/aps/aps/components/excute.vue
View file @ 0200adfc
......@@ -28,24 +28,24 @@
</div>
</template>
<script>
import Api from '../api'
import Edit from './edit'
import Add from '../add'
import Api from "../api";
import Edit from "./edit";
import Add from "../add";
export default {
name: 'list',
name: "list",
components: {
Edit,
Add
},
props: {
row: { type: Number }
rowId: { type: Number }
},
data() {
return {
action: Api.index,
easySearch: {
keys: {
op: 'task_seq',
op: "task_seq",
value: null
}
},
......@@ -57,397 +57,407 @@ export default {
rowIndex: null,
curId: 0,
columns: [
{ key: 'id', title: this.l('id'), hide: true, align: 'left' },
{ title: ' ', width: 130 },
{ key: "id", title: this.l("id"), hide: true, align: "left" },
{ title: " ", width: 130 },
{
key: 'insert_flag',
title: this.l('insert_flag'),
align: 'center',
key: "insert_flag",
title: this.l("insert_flag"),
align: "center",
high: true,
width: 60,
render: (h, params) => {
return h('Icon', {
return h("Icon", {
attrs: {
type:
params.row.insert_flag == 1 ? 'ios-flag' : 'ios-flag-outline',
params.row.insert_flag == 1 ? "ios-flag" : "ios-flag-outline",
size: 20,
color: params.row.insert_flag == 1 ? '#2680EB' : '#aaa'
color: params.row.insert_flag == 1 ? "#2680EB" : "#aaa"
},
on: { click: () => this.changeFlag(params.row.id, params.index) }
})
});
}
},
{
key: 'task_seq',
title: this.l('task_seq'),
align: 'left',
key: "task_seq",
title: this.l("task_seq"),
align: "left",
easy: true,
high: true
},
{
key: 'op_task_pk',
title: this.l('op_task_pk'),
align: 'left',
key: "op_task_pk",
title: this.l("op_task_pk"),
align: "left",
high: true,
hide: true
},
{
key: 'task_name',
title: this.l('task_name'),
align: 'left',
key: "task_name",
title: this.l("task_name"),
align: "left",
easy: true,
high: true
},
{
key: 'part_task_pk',
title: this.l('part_task_pk'),
align: 'left',
key: "part_task_pk",
title: this.l("part_task_pk"),
align: "left",
high: true,
hide: true
},
{
key: 'put_into_qty',
title: this.l('put_into_qty'),
align: 'left',
key: "put_into_qty",
title: this.l("put_into_qty"),
align: "left",
high: true
},
{
key: 'plan_start',
title: this.l('plan_start'),
align: 'center',
key: "plan_start",
title: this.l("plan_start"),
align: "center",
high: true,
width: 140
},
{
key: 'plan_finish',
title: this.l('plan_finish'),
align: 'center',
key: "plan_finish",
title: this.l("plan_finish"),
align: "center",
high: true,
width: 140
},
{
key: 'setup_time',
title: this.l('setup_time'),
align: 'right',
key: "setup_time",
title: this.l("setup_time"),
align: "right",
high: true
},
{
key: 'run_time',
title: this.l('run_time'),
align: 'right',
key: "run_time",
title: this.l("run_time"),
align: "right",
high: true
},
{
key: 'outside_time',
title: this.l('outside_time'),
align: 'center',
key: "outside_time",
title: this.l("outside_time"),
align: "center",
high: true,
width: 140
},
{
key: 'transport_time',
title: this.l('transport_time'),
align: 'right',
key: "transport_time",
title: this.l("transport_time"),
align: "right",
high: true,
hide: true
},
{
key: 'check_time',
title: this.l('check_time'),
align: 'right',
key: "check_time",
title: this.l("check_time"),
align: "right",
high: true,
hide: true
},
{
key: 'efficiency_value',
title: this.l('efficiency_value'),
align: 'right',
key: "efficiency_value",
title: this.l("efficiency_value"),
align: "right",
high: true
},
{
key: 'machine_rule',
title: this.l('machine_rule'),
align: 'left',
key: "machine_rule",
title: this.l("machine_rule"),
align: "left",
easy: true,
high: true,
width: 140
},
{
key: 'singleout',
title: this.l('singleout'),
align: 'left',
key: "singleout",
title: this.l("singleout"),
align: "left",
high: true,
hide: true
},
{
key: 'first_equip',
title: this.l('first_equip'),
align: 'left',
key: "first_equip",
title: this.l("first_equip"),
align: "left",
easy: true,
high: true,
hide: true
},
{
key: 'equip_type',
title: this.l('equip_type'),
align: 'left',
key: "equip_type",
title: this.l("equip_type"),
align: "left",
easy: true,
high: true,
hide: true
},
{
key: 'cal_id',
title: this.l('cal_id'),
align: 'left',
key: "cal_id",
title: this.l("cal_id"),
align: "left",
easy: true,
high: true
},
{
key: 'plan_method',
title: this.l('plan_method'),
align: 'left',
key: "plan_method",
title: this.l("plan_method"),
align: "left",
easy: true,
high: true
},
{
key: 'over_time',
title: this.l('over_time'),
align: 'left',
key: "over_time",
title: this.l("over_time"),
align: "left",
easy: true,
high: true
},
{
key: 'isdiscrete',
title: this.l('isdiscrete'),
align: 'left',
key: "isdiscrete",
title: this.l("isdiscrete"),
align: "left",
easy: true,
high: true
},
{
key: 'discrete_value',
title: this.l('discrete_value'),
align: 'left',
key: "discrete_value",
title: this.l("discrete_value"),
align: "left",
high: true
},
{
key: 'multi_machine',
title: this.l('multi_machine'),
align: 'left',
key: "multi_machine",
title: this.l("multi_machine"),
align: "left",
easy: true,
high: true
},
{
key: 'notes',
title: this.l('notes'),
align: 'left',
key: "notes",
title: this.l("notes"),
align: "left",
easy: true,
high: true,
hide: true
},
{
key: 'taskseq_des',
title: this.l('taskseq_des'),
align: 'left',
key: "taskseq_des",
title: this.l("taskseq_des"),
align: "left",
easy: true,
high: true,
hide: true
},
{
key: 'workshopcode',
title: this.l('workshopcode'),
align: 'left',
key: "workshopcode",
title: this.l("workshopcode"),
align: "left",
easy: true,
high: true,
hide: true
},
{
key: 'routing_detail_id',
title: this.l('routing_detail_id'),
align: 'left',
key: "routing_detail_id",
title: this.l("routing_detail_id"),
align: "left",
high: true,
hide: true
},
{
key: 'routing_header_id',
title: this.l('routing_header_id'),
align: 'left',
key: "routing_header_id",
title: this.l("routing_header_id"),
align: "left",
high: true,
hide: true
},
{
key: 'comb_param',
title: this.l('comb_param'),
align: 'left',
key: "comb_param",
title: this.l("comb_param"),
align: "left",
easy: true,
high: true,
hide: true
},
{
key: 'rule_qty',
title: this.l('rule_qty'),
align: 'left',
key: "rule_qty",
title: this.l("rule_qty"),
align: "left",
high: true,
hide: true
},
{
title: '操作',
key: 'action',
title: "操作",
key: "action",
width: 140,
align: 'center',
align: "center",
render: (h, params) => {
return h('div', { class: 'action' }, [
h('op', {
return h("div", { class: "action" }, [
h("op", {
attrs: {
icon: 'md-options',
type: 'icon',
title: '工序参数设置'
icon: "md-options",
type: "icon",
title: "工序参数设置"
},
on: { click: () => this.openParms(params.row.id) }
}),
h('op', {
h("op", {
attrs: {
icon: 'ios-create',
type: 'icon',
title: '編輯工序',
oprate: 'edit',
msg: '确认要移出排产吗？'
icon: "ios-create",
type: "icon",
title: "編輯工序",
oprate: "edit",
msg: "确认要移出排产吗？"
},
on: { click: () => this.edit(params.row.id) }
}),
h('op', {
h("op", {
attrs: {
icon: 'ios-trash',
type: 'icon',
title: '删除工序',
oprate: 'delete',
msg: '确认要刪除工序吗？'
icon: "ios-trash",
type: "icon",
title: "删除工序",
oprate: "delete",
msg: "确认要刪除工序吗？"
},
on: { click: () => this.remove(params.row.id, params.index) }
})
])
]);
}
}
],
data1: [
{
id: '1',
op_task_pk: '001',
part_task_pk: '001',
task_seq: '1',
task_name: '测试工序1',
put_into_qty: '10',
plan_start: '04/05/2020',
plan_finish: '06/05/2020',
setup_time: '5',
run_time: '1',
transport_time: '1',
check_time: '1',
efficiency_value: '0.5',
singleout: '2',
first_equip: 'NTY-0012',
equip_type: '加工设备',
cal_id: '日历id',
machine_rule: '优先',
plan_method: '是',
over_time: '1',
isdiscrete: '是',
discrete_value: '1.2',
multi_machine: '5',
notes: '暂无备注信息test',
id: "1",
op_task_pk: "001",
part_task_pk: "001",
task_seq: "1",
task_name: "测试工序1",
put_into_qty: "10",
plan_start: "04/05/2020",
plan_finish: "06/05/2020",
setup_time: "5",
run_time: "1",
transport_time: "1",
check_time: "1",
efficiency_value: "0.5",
singleout: "2",
first_equip: "NTY-0012",
equip_type: "加工设备",
cal_id: "日历id",
machine_rule: "优先",
plan_method: "是",
over_time: "1",
isdiscrete: "是",
discrete_value: "1.2",
multi_machine: "5",
notes: "暂无备注信息test",
insert_flag: 1,
outside_time: '04/06/2020',
taskseq_des: '',
workshopcode: '',
routing_detail_id: '',
routing_header_id: '',
comb_param: '',
rule_qty: ''
},
{
id: '2',
op_task_pk: '002',
part_task_pk: '002',
task_seq: '2',
task_name: '测试工序2',
put_into_qty: '10',
plan_start: '04/05/2020',
plan_finish: '06/05/2020',
setup_time: '5',
run_time: '1',
transport_time: '1',
check_time: '1',
efficiency_value: '0.5',
singleout: '2',
first_equip: 'NTY-0012',
equip_type: '加工设备',
cal_id: '日历id',
machine_rule: '优先',
plan_method: '是',
over_time: '1',
isdiscrete: '是',
discrete_value: '1.2',
multi_machine: '5',
notes: '暂无备注信息test',
outside_time: "04/06/2020",
taskseq_des: "",
workshopcode: "",
routing_detail_id: "",
routing_header_id: "",
comb_param: "",
rule_qty: ""
},
{
id: "2",
op_task_pk: "002",
part_task_pk: "002",
task_seq: "2",
task_name: "测试工序2",
put_into_qty: "10",
plan_start: "04/05/2020",
plan_finish: "06/05/2020",
setup_time: "5",
run_time: "1",
transport_time: "1",
check_time: "1",
efficiency_value: "0.5",
singleout: "2",
first_equip: "NTY-0012",
equip_type: "加工设备",
cal_id: "日历id",
machine_rule: "优先",
plan_method: "是",
over_time: "1",
isdiscrete: "是",
discrete_value: "1.2",
multi_machine: "5",
notes: "暂无备注信息test",
insert_flag: 0,
outside_time: '04/06/2020',
taskseq_des: '',
workshopcode: '',
routing_detail_id: '',
routing_header_id: '',
comb_param: '',
rule_qty: ''
},
{
id: '3',
op_task_pk: '003',
part_task_pk: '003',
task_seq: '3',
task_name: '测试工序3',
put_into_qty: '10',
plan_start: '04/05/2020',
plan_finish: '06/05/2020',
setup_time: '5',
run_time: '1',
transport_time: '1',
check_time: '1',
efficiency_value: '0.5',
singleout: '2',
first_equip: 'NTY-0012',
equip_type: '加工设备',
cal_id: '日历id',
machine_rule: '优先',
plan_method: '是',
over_time: '1',
isdiscrete: '是',
discrete_value: '1.2',
multi_machine: '5',
notes: '暂无备注信息test',
outside_time: "04/06/2020",
taskseq_des: "",
workshopcode: "",
routing_detail_id: "",
routing_header_id: "",
comb_param: "",
rule_qty: ""
},
{
id: "3",
op_task_pk: "003",
part_task_pk: "003",
task_seq: "3",
task_name: "测试工序3",
put_into_qty: "10",
plan_start: "04/05/2020",
plan_finish: "06/05/2020",
setup_time: "5",
run_time: "1",
transport_time: "1",
check_time: "1",
efficiency_value: "0.5",
singleout: "2",
first_equip: "NTY-0012",
equip_type: "加工设备",
cal_id: "日历id",
machine_rule: "优先",
plan_method: "是",
over_time: "1",
isdiscrete: "是",
discrete_value: "1.2",
multi_machine: "5",
notes: "暂无备注信息test",
insert_flag: 0,
outside_time: '04/06/2020',
taskseq_des: '',
workshopcode: '',
routing_detail_id: '',
routing_header_id: '',
comb_param: '',
rule_qty: ''
outside_time: "04/06/2020",
taskseq_des: "",
workshopcode: "",
routing_detail_id: "",
routing_header_id: "",
comb_param: "",
rule_qty: ""
}
],
insertTItle: '插单'
}
insertTItle: "插单"
};
},
mounted() {
this.loadData(this.row)
this.loadData(this.rowId);
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
//根据点击副组件传过来id进行加载数据
loadData(id) {
loadData(expendId) {
let params = {
id: expendId
}
Api.getbyorderid(params).then(res => {
if (res.sucess) {
this.data1 = [];
this.data1 = res.result;
}
});
//加载数据
//alert(id)
//alert(id);
// let arr1 = {
// id: '1',
// op_task_pk: '001',
......@@ -487,52 +497,52 @@ export default {
//插单事件start----
changeFlag(id, index) {
this.rowIndex = index
this.rowIndex = index;
if (this.data1[this.rowIndex].insert_flag == 1) {
this.insertTItle = '取消插单'
this.insertTItle = "取消插单";
} else {
this.insertTItle = '插单'
this.insertTItle = "插单";
}
this.insertlModal = true
this.insertlModal = true;
},
insertOk() {
//this.loadData(this.row)
if (this.data1[this.rowIndex].insert_flag == 1) {
//根据插单数据状态进行插单或取消插单操作
this.data1[this.rowIndex].insert_flag = 0
this.data1[this.rowIndex].insert_flag = 0;
} else {
this.data1[this.rowIndex].insert_flag = 1
this.data1[this.rowIndex].insert_flag = 1;
}
this.setParsModal = false
this.detailModal = false
this.editModal = false
this.insertlModal = false
this.setParsModal = false;
this.detailModal = false;
this.editModal = false;
this.insertlModal = false;
},
//插单事件end----
//单个工序进行参设置start----
openParms(id) {
this.setParsModal=true
this.setParsModal = true;
},
//单个工序进行参数设置end----
//编辑工序start----
edit(id) {
this.editModal = true
this.curId = Number(id)
this.editModal = true;
this.curId = Number(id);
},
//编辑工序end----
//删除工序事件start-----
remove(id, index) {
this.deletelModal = true
this.curId = Number(id)
this.rowIndex = index
this.deletelModal = true;
this.curId = Number(id);
this.rowIndex = index;
},
removeOk() {
alert(this.rowIndex)
this.data1.splice(this.rowIndex, 1)
alert(this.rowIndex);
this.data1.splice(this.rowIndex, 1);
// Api.delete({ id: this.curId }).then((r) => {
// if (r.success) {
// this.$refs.grid.load()
......@@ -542,23 +552,23 @@ export default {
// })
},
removeCancel() {
this.deletelModal = false
this.deletelModal = false;
},
//删除工序时间end-----
cancel() {
this.curId = 0
this.setParsModal = false
this.detailModal = false
this.editModal = false
this.deletedlModal = false
this.insertlModal = false
this.curId = 0;
this.setParsModal = false;
this.detailModal = false;
this.editModal = false;
this.deletedlModal = false;
this.insertlModal = false;
},
l(key) {
let vkey = 'mes_op_task_plan_simulate' + '.' + key
return this.$t(vkey) || key
let vkey = "mes_op_task_plan_simulate" + "." + key;
return this.$t(vkey) || key;
}
}
}
};
</script>
<style lang="less">
</style>
\ No newline at end of file
pages/aps/aps/index.vue
View file @ 0200adfc
......@@ -128,7 +128,7 @@ export default {
render: (h, params) => {
return h(Expand, {
props: {
row: params.row.id
rowId: params.row.id
}
})
}
......@@ -272,11 +272,22 @@ export default {
},
mounted() {
console.log(this)
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
},
methods: {
//排产池加载数据列表
loadList()
{
Api.getall().then((res)=>{
if(res.success)
{
// this.list=res.result
}
})
},
addOk() {
this.$refs.grid.load()
this.addModal = false
......@@ -284,9 +295,6 @@ export default {
this.editModal = false
this.curId = 0
},
search() {
this.$refs.grid.reload(this.easySearch)
},
detail(id) {
this.detailModal = true
this.curId = id
......
pages/aps/plan/index.vue
View file @ 0200adfc
......@@ -444,7 +444,7 @@ export default {
},
//跳转到aps排产池（有判断）
goAps() {
Api.moveintoaps().then((res) => {
Api.moveintoaps().then(res => {
if (res.success) {
if (res.result.res) {
this.$router.push({
......@@ -456,6 +456,10 @@ export default {
}
}
});
this.$router.push({
name: "aps-aps"
// params: { customerId: id }
});
},
addOk() {
this.$refs.grid.load();
......
static/config.js
View file @ 0200adfc
......@@ -47,7 +47,7 @@ const systemApi = {
window.certificateUrl = `http://${address}:10090/api/services/app`; //Process-api
window.crmUrl = `http://${address}:10100/api/services/app`; //crm客户、合同、项目管理
window.iconImg = `http://${hostAddress}:3000/imgicon/`; //待办任务图标路径
window.aps = `http://${apsUrl}:10091/api/services/app`;//aps手工排产
window.aps = `http://${apsUrl}:10110/api/services/app`;//aps手工排产
//oidc配置：
window.authConfig = {
authority: `http://${address}:10010`,
......
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