Skip to content

M
mes-ui
Commit 80973e73 authored by 康振飞's avatar 康振飞
Browse files
Options

Merge branch 'master' into kk_mes

parents 42449cb2 8930155a
Hide whitespace changes
Inline Side-by-side
Showing with 167 additions and 355 deletions
components/page/dataGrid.vue
View file @ 80973e73
......@@ -496,6 +496,11 @@ export default {
})
return cols
}
},
watch:{
"data.length"(){
this.list=this.data;
}
}
}
</script>
......
pages/aps/aps/components/excute.vue
View file @ 80973e73
......@@ -4,7 +4,6 @@
style="margin-top:-25px;margin-bottom:-25px"
:columns="columns"
ref="grid"
:action="action"
:easy="false"
:high="false"
:set="false"
......@@ -330,110 +329,7 @@ export default {
}
}
],
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",
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",
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",
insert_flag: 0,
outside_time: "04/06/2020",
taskseq_des: "",
workshopcode: "",
routing_detail_id: "",
routing_header_id: "",
comb_param: "",
rule_qty: ""
}
],
data1: [],
insertTItle: "插单"
};
},
......@@ -449,9 +345,8 @@ export default {
let params = {
id: expendId
}
Api.getbyorderid(params).then(res => {
if (res.sucess) {
this.data1 = [];
Api.getbyorderid(params).then((res) => {
if (res.success) {
this.data1 = res.result;
}
});
......
pages/aps/aps/index.vue
View file @ 80973e73
......@@ -40,11 +40,11 @@
</div>
</template>
<script>
import Api from './api'
import Add from './add'
import Expand from './components/excute'
import Api from "./api";
import Add from "./add";
import Expand from "./components/excute";
export default {
name: 'list',
name: "list",
components: {
Add,
Expand
......@@ -53,252 +53,248 @@ export default {
return {
action: Api.index,
easySearch: {
keys: { op: 'notes', value: null }
keys: { op: "notes", value: null }
},
addModal: false,
editModal: false,
detailModal: false,
deletelModal: false,
apsModal: false,
list: [
],
list: [],
curId: 0,
columns: [
{
key: 'move',
title: ' ',
key: "move",
title: " ",
hide: false,
align: 'center',
align: "center",
width: 30,
render: (h, params) => {
return h('Icon', {
return h("Icon", {
attrs: {
type: 'md-more',
type: "md-more",
size: 18
},
class: 'drag'
})
class: "drag"
});
}
},
{
type: 'expand',
type: "expand",
width: 50,
render: (h, params) => {
return h(Expand, {
props: {
rowId: params.row.id
rowId: params.row.part_task_pk
}
})
});
}
},
{
key: 'selection',
type: 'selection',
key: "selection",
type: "selection",
width: 50,
align: 'center'
align: "center"
},
{
key: 'id',
title: this.l('id'),
key: "id",
title: this.l("id"),
hide: true,
align: 'left',
align: "left",
sortable: true,
width: 50
},
{
key: 'insert_flag',
title: this.l('insert_flag'),
align: 'center',
key: "insert_flag",
title: this.l("insert_flag"),
align: "center",
width: 70,
high: true,
code: 'aps.aps.insert_flag',
category: 'icon'
code: "aps.aps.insert_flag",
category: "icon"
},
{
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
},
{
key: 'priority',
title: this.l('priority'),
align: 'left',
key: "priority",
title: this.l("priority"),
align: "left",
high: true
},
{
key: 'plan_qty',
title: this.l('plan_qty'),
align: 'left',
key: "plan_qty",
title: this.l("plan_qty"),
align: "left",
high: true,
sortable: true
},
{
key: 'spare_qty',
title: this.l('spare_qty'),
align: 'left',
key: "spare_qty",
title: this.l("spare_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,
resizable: 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,
sortable: true,
resizable: true,
width: 140
},
{
key: 'notes',
title: this.l('notes'),
align: 'left',
key: "notes",
title: this.l("notes"),
align: "left",
easy: true,
high: true,
hide: true
},
{
key: 'demand_start',
title: this.l('demand_start'),
align: 'center',
key: "demand_start",
title: this.l("demand_start"),
align: "center",
hide: true,
resizable: true,
width: 100
},
{
key: 'demand_finish',
title: this.l('demand_finish'),
align: 'center',
key: "demand_finish",
title: this.l("demand_finish"),
align: "center",
high: true,
resizable: true,
width: 140
},
{
key: 'badjustflag',
title: this.l('badjustflag'),
align: 'left',
key: "badjustflag",
title: this.l("badjustflag"),
align: "left",
high: true
},
{
title: '操作',
key: 'action',
title: "操作",
key: "action",
width: 140,
align: 'center',
align: "center",
// fixed:"right",
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: 'md-return-left',
type: 'icon',
title: '移出排产池',
oprate: 'delete',
msg: '确认要移出排产吗？'
icon: "md-return-left",
type: "icon",
title: "移出排产池",
oprate: "delete",
msg: "确认要移出排产吗？"
},
on: { click: () => this.remove(params.row.id) }
}),
h('op', {
h("op", {
attrs: {
icon: 'md-refresh',
type: 'icon',
title: '恢复工序',
oprate: 'delete',
msg: '确认要恢复工序吗？'
icon: "md-refresh",
type: "icon",
title: "恢复工序",
oprate: "delete",
msg: "确认要恢复工序吗？"
},
on: { click: () => this.remove(params.row.id) }
})
])
]);
}
}
]
}
};
},
mounted() {
this.loadList()
this.loadList();
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
//排产池加载数据列表
loadList()
{
Api.getall().then((res)=>{
if(res.success)
{
this.list=res.result
loadList() {
Api.getall().then(res => {
if (res.success) {
this.list = res.result;
}
})
});
},
addOk() {
this.$refs.grid.load()
this.addModal = false
this.detailModal = false
this.editModal = false
this.curId = 0
this.$refs.grid.load();
this.addModal = false;
this.detailModal = false;
this.editModal = false;
this.curId = 0;
},
detail(id) {
this.detailModal = true
this.curId = id
this.detailModal = true;
this.curId = id;
},
edit(id) {
this.editModal = true
this.curId = id
this.editModal = true;
this.curId = id;
},
remove(id) {
this.deletelModal = true
this.curId = id
this.deletelModal = true;
this.curId = id;
},
onSelect(a, b) {},
removeOk() {
Api.delete({ id: this.curId }).then((r) => {
Api.delete({ id: this.curId }).then(r => {
if (r.success) {
this.$refs.grid.load()
this.deletelModal = false
this.$Message.success('删除成功')
this.$refs.grid.load();
this.deletelModal = false;
this.$Message.success("删除成功");
}
})
});
},
removeCancel() {
this.deletelModal = false
this.deletelModal = false;
},
cancel() {
this.curId = 0
this.addModal = false
this.detailModal = false
this.editModal = false
this.deletedlModal = false
this.apsModal = false
this.curId = 0;
this.addModal = false;
this.detailModal = false;
this.editModal = false;
this.deletedlModal = false;
this.apsModal = false;
},
onDragDrop(a, b) {
this.list.splice(b, 1, ...this.list.splice(a, 1, this.list[b]))
this.list.splice(b, 1, ...this.list.splice(a, 1, this.list[b]));
},
openParms(id) {
this.addModal = true
this.addModal = true;
},
l(key) {
let vkey = 'mes_part_task_plan_simulate' + '.' + key
return this.$t(vkey) || key
let vkey = "mes_part_task_plan_simulate" + "." + key;
return this.$t(vkey) || key;
}
}
}
};
</script>
<style lang="less">
.drag {
......
pages/aps/plan/index.vue
View file @ 80973e73
......@@ -457,10 +457,6 @@ export default {
}
}
});
this.$router.push({
name: "aps-aps"
// params: { customerId: id }
});
},
addOk() {
this.$refs.grid.load();
......
pages/processManage/Process/detailfiles.vue
View file @ 80973e73
......@@ -103,9 +103,9 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
routingFile: dataValidate
})
}
)
.then((response) => {
if (response.success) {
......
pages/processManage/Process/index.vue
View file @ 80973e73
......@@ -226,7 +226,7 @@ export default {
doUpload: '/api/up/file',
tableHeight: '',
myloading: true,
gymodaltitle: '创建主工艺',
gymodaltitle: '创建工艺',
processviewModal: false,
isview: false,
issendAudit: false,
......@@ -672,10 +672,10 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
routingHeaderEntity: a.formValidate,
FileList: filelist
})
}
)
.then((response) => {
if (response.success) {
......
pages/processManage/Process/processNew.vue
View file @ 80973e73
......@@ -544,9 +544,9 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
routingDetail: this.formprocessValidate
})
}
)
.then((response) => {
if (response.success) {
......
pages/processManage/Process/stepModel.vue
View file @ 80973e73
......@@ -171,9 +171,9 @@ let isvalidate = false;
service
.post(
`${url}`,
JSON.stringify({
{
routingStep: this.newModeldata
})
}
)
.then((response) => {
if (response.success) {
......
pages/processManage/Process/supporting.vue
View file @ 80973e73
......@@ -304,7 +304,7 @@ export default {
var url = `${designUrl}/routingsupporting/createorupdate`
service
.post(`${url}`, JSON.stringify(this.formprocessValidate))
.post(`${url}`, this.formprocessValidate)
.then((response) => {
if (response.success) {
this.$Message.success('保存成功')
......
pages/processManage/Process/testingModel.vue
View file @ 80973e73
......@@ -353,9 +353,9 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
routingQcCard: this.cardModeldata
})
}
)
.then((response) => {
if (response.success) {
......
pages/processManage/setProcess/index.vue
View file @ 80973e73
......@@ -389,7 +389,7 @@ export default {
list: [],
data2: [],
tabstatus: '1', //暂存tab状态（）主工艺||专业工艺
gymodaltitle: '创建主工艺',
gymodaltitle: '创建工艺',
selectdata: [],
value1: false,
drawerShow: false,
......@@ -1076,9 +1076,7 @@ export default {
saveHeader(next) {
var a = this.$refs.processMain
if (a.formValidate.routingType == 1) {
this.savebill()
}
var filelist = a.getfile()
let isvalidate = false
......@@ -1107,10 +1105,10 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
routingHeaderEntity: a.formValidate,
FileList: filelist
})
}
)
.then((response) => {
if (response.success) {
......@@ -1209,9 +1207,7 @@ export default {
this.$refs.processNew.formprocessValidate.routing_header_id = this.headerid
this.$refs.processNew.loaddata()
} else {
if (this.addpdefm.formValidate.routingType == 1) {
this.savebill()
}
var a = this.addpdefm
this.headerid = this.addpdefm.formValidate.id
......@@ -1231,9 +1227,9 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
orderRouting: orderRoutingobj
})
}
)
.then((response) => {
if (response.success) {
......@@ -1296,15 +1292,12 @@ export default {
modalShowCancel() {
this.modalShow = false
},
savebill() {
this.$refs.modelTable.$refs.quotationBox2.saveData()
this.$refs.modelTable.$refs.quotationBox3.saveData()
},
saveOK() {
var url = `${PlanUrl}/OrderMaterial/createorupdate`
// JSON.stringify({Process:this.formValidate})
service
.post(`${url}`, JSON.stringify({ orderMaterial: this.formValidate }))
.post(`${url}`, { orderMaterial: this.formValidate })
.then((response) => {
if (response.success) {
this.$Message.success('保存成功')
......@@ -1334,7 +1327,7 @@ export default {
let ordercombid = 0
this.createtype = 1
if (routingType == 1) {
this.gymodaltitle = '设置主工艺规程'
this.gymodaltitle = '设置工艺规程'
for (let i = 0; i < this.data1.length; i++) {
let obj1 = this.data1[i]
......@@ -1346,24 +1339,14 @@ export default {
}
}
this.$refs.modelTable.issetProcess1 = true
this.$refs.modelTable.selectFault = 'greateArt'
this.$refs.modelTable.$refs.quotationBox2.loadData(
orderids.toString(',')
)
this.$refs.modelTable.$refs.quotationBox3.loadData(
orderids.toString(',')
)
this.$refs.modelTable.$refs.quotationBox2.isview = this.isview
this.$refs.modelTable.$refs.quotationBox3.isview = this.isview
} else {
this.$refs.modelTable.issetProcess1 = false
this.gymodaltitle = '设置专业工艺规程'
ordercombid = params.row.specialtyOrderCombID
if (ordercombid != 0) {
this.$refs.modelTable.issetProcess1 = false
this.addpdefm.formValidate.ordercombid = ordercombid
for (let i = 0; i < this.data1.length; i++) {
let obj = this.data1[i]
......@@ -1450,16 +1433,9 @@ export default {
let orderids = new Array()
let orderlist = new Array()
if (routingType == 1) {
// ordercombid = params.row.orderCombID
this.$refs.modelTable.issetProcess1 = true
this.$refs.modelTable.$refs.quotationBox2.isview = this.isview
this.$refs.modelTable.$refs.quotationBox3.isview = this.isview
} else {
// ordercombid = params.row.specialtyOrderCombID
this.$refs.modelTable.issetProcess1 = false
}
ordercombid = params.row.orderCombID
this.addpdefm.formValidate.ordercombid = ordercombid
if (orders == null) {
for (let i = 0; i < this.data1.length; i++) {
......@@ -1493,13 +1469,8 @@ export default {
this.addpdefm.dataTop = orderlist
if (routingType == 1) {
this.$refs.modelTable.$refs.quotationBox2.loadData(
orderids.toString(',')
)
this.$refs.modelTable.$refs.quotationBox3.loadData(
orderids.toString(',')
)
this.$refs.modelTable.selectFault = 'greateArt'
}
if (routingType == 1) {
this.gymodaltitle = '设置工艺规程'
......@@ -1539,13 +1510,9 @@ export default {
let orderids = new Array()
let orderlist = new Array()
let ordercombid = 0
if (routingType == 1) {
ordercombid = params.row.orderCombID
this.$refs.modelTable.issetProcess1 = true
} else {
ordercombid = params.row.specialtyOrderCombID
this.$refs.modelTable.issetProcess1 = false
}
this.addpdefm.formValidate.ordercombid = ordercombid
for (let i = 0; i < this.data1.length; i++) {
let obj = this.data1[i]
......@@ -1568,22 +1535,10 @@ export default {
}
this.addpdefm.dataTop = orderlist
if (routingType == 1) {
this.$refs.modelTable.$refs.quotationBox2.loadData(
orderids.toString(',')
)
this.$refs.modelTable.$refs.quotationBox3.loadData(
orderids.toString(',')
)
this.$refs.modelTable.selectFault = 'greateArt'
this.$refs.modelTable.$refs.quotationBox2.isview = this.isview
this.$refs.modelTable.$refs.quotationBox3.isview = this.isview
}
if (routingType == 1) {
this.gymodaltitle = '查看工艺规程'
} else {
this.gymodaltitle = '查看工艺规程'
}
var url = `${designUrl}/routingheader/getbyid?id=` + RoutingID
service.get(`${url}`).then((response) => {
this.addpdefm.formValidate = response.result
......@@ -1613,9 +1568,7 @@ export default {
this.addpdefm.formValidate = this.headerInfo
this.addpdefm.isview = this.isview
this.$refs.modelTable.$refs.quotationBox2.isview = this.isview
this.$refs.modelTable.$refs.quotationBox3.isview = this.isview
this.addpdefm.ProductName = this.headerInfo.productName
this.addpdefm.ProductCode = this.headerInfo.productCode
......
pages/processManage/setProcess/processMain.vue
View file @ 80973e73
......@@ -445,36 +445,7 @@ export default {
this.$refs.refFile.routing_header_id = 0;
this.$refs.refFile.intFiles();
},
LoadprocessList() {
this.processList = [];
let url = `${designUrl}/routingheader/getlistbyids?` + this.Mianids,
that = this;
service.get(`${url}`).then(res => {
let selectdata = res.result;
selectdata.forEach(item => {
this.processList.push({
value: item.id,
name: item.code,
ver: item.version
});
});
this.formValidate.up_id = this.processList[0].value;
this.MianVer = this.processList[0].ver;
this.MianCode = this.processList[0].name;
});
},
MainProcess_selected(val) {
//这里的val默认拿到的是：value绑定的那个
this.formValidate.up_id = val;
this.processList.forEach(item => {
if (val == item.value) {
this.MianVer = item.ver;
}
});
},
quotationBox() {
this.$refs.generateQuotation.modalShow = true;
},
......@@ -558,9 +529,10 @@ export default {
});
},
setparentcreatetype(type, headerid) {
this.$parent.$parent.createtype = type
this.$parent.$parent.headerid = headerid
this.$parent.$parent.$parent.createtype = type;
this.$parent.$parent.$parent.headerid = headerid;
},
......@@ -575,11 +547,9 @@ export default {
});
},
setshow() {
if (this.formValidate.routingType == 2) {
this.isshow = true;
} else {
this.isshow = false;
}
if (this.formValidate.id != 0) {
this.isedit = true;
......@@ -590,14 +560,11 @@ export default {
this.Loadfile(0);
}
if (this.Mianids != "") {
this.LoadprocessList();
}
this.createtype = "1";
this.selectpdefmid = 0;
this.RoutingList = [];
this.calcplatesnum();
// this.calcplatesnum();
}
}
};
......
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