From 2c20ebaa6e6b6b29e1a42897216f5c97692308c8 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sat, 9 Mar 2019 16:19:48 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E9=A1=BA=E5=BA=8F?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../MachiningSequenceAdjustment/index.vue | 42 ++++++++++++++++++-
1 file changed, 41 insertions(+), 1 deletion(-)
diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
index 7280d65a..a7fa898f 100644
--- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
+++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
@@ -14,7 +14,7 @@
- 查询
+ 刷新工位
调序权限
@@ -330,9 +330,12 @@
+
+
From 8b5f3569ee83cd39e033a1313477074979f58d6a Mon Sep 17 00:00:00 2001
From: caoxinyu
Date: Mon, 11 Mar 2019 17:35:09 +0800
Subject: [PATCH 3/9] BUG
---
src/utils/request.js | 4 ++--
src/views/MarketingCenter/CRM/index.vue | 28 ++++++++++++-------------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index 81241138..657a98da 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,7 +3,7 @@ import axios from 'axios'
// import store from '../store'
// import { getToken } from '@/utils/auth'
-export const wsuri = `ws://192.168.1.231:61101//WebMoudule//websocket`
+export const wsuri = `ws://192.168.1.232:61101//WebMoudule//websocket`
export const name = `OP8888`
// 创建axios实例
@@ -19,7 +19,7 @@ const service = axios.create({
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
- baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
+ baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间git
diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue
index 1cb22d7b..a414d10f 100644
--- a/src/views/MarketingCenter/CRM/index.vue
+++ b/src/views/MarketingCenter/CRM/index.vue
@@ -53,7 +53,7 @@
添加销售经理
销售经理
-
+
{{ scope.row.省份 }}
@@ -98,67 +98,67 @@
新增客户
客户信息
-
+
{{ scope.row.省份 }}
-
+
{{ scope.row.客户名称 }}
-
+
{{ scope.row.联系人 }}
-
+
{{ scope.row.电话 }}
-
+
{{ scope.row.传真 }}
-
+
{{ scope.row.地址 }}
-
+
{{ scope.row.电子邮箱 }}
-
+
{{ scope.row.税号 }}
-
+
{{ scope.row.开户行 }}
-
+
{{ scope.row.银行账号 }}
-
+
{{ scope.row.价值评估 }}
-
+
{{ scope.row.备注 }}
-
+
Date: Tue, 12 Mar 2019 10:04:40 +0800
Subject: [PATCH 4/9] bugfix
---
src/views/MarketingCenter/CRM/index.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue
index a414d10f..c0506572 100644
--- a/src/views/MarketingCenter/CRM/index.vue
+++ b/src/views/MarketingCenter/CRM/index.vue
@@ -37,7 +37,7 @@
border>
-
+
@@ -348,7 +348,7 @@ export default {
radio: null, // 地区选择框
tableData2: [], // 客户表
pageCurrent: 1,
- pageSize: 10,
+ pageSize: 40,
total: null,
AdressID: null, // 地区流水号
MarketingManagerValue: '', // 营销经理
From 5759ace0e4681507e8a7589d54fbbc178ab99e9c Mon Sep 17 00:00:00 2001
From: caoxinyu
Date: Tue, 12 Mar 2019 15:45:46 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E8=BF=9B=E5=BA=A6?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=97=B4=E6=AE=B5?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ProcessingStatusEdit.js | 4 +--
.../ProcessingStatusEdit/index.vue | 32 ++++++++++++++++++-
2 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/src/api/ManufacturingCenter/ProcessingStatusEdit.js b/src/api/ManufacturingCenter/ProcessingStatusEdit.js
index 967b1234..26adb5f7 100644
--- a/src/api/ManufacturingCenter/ProcessingStatusEdit.js
+++ b/src/api/ManufacturingCenter/ProcessingStatusEdit.js
@@ -34,14 +34,14 @@ export function getGroups(stepNumber) {
})
}
-export function getTable(stepNumber, a, b, c, d, e, f, g, pageCurrent, pageSize) {
+export function getTable(stepNumber, a, b, c, d, e, f, g, h, i, j, k, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_加工进度修改专用',
- param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=0',
+ param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=0&开始时间_check=' + h + '&开始时间=' + i + '&结束时间_check=' + j + '&结束时间=' + k,
Pagination: pageCurrent + '&' + pageSize
}
})
diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
index 6df8260a..c303aba3 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
@@ -24,6 +24,22 @@
零件号:
+ 计划下达时间:
+
+ -
+
查询
@@ -366,6 +382,10 @@ export default {
person: '',
title: '',
Num: '',
+ startTime: '',
+ endTime: '',
+ startTime_check: 0,
+ endTime_check: 0,
form: {
人员: '',
考勤编号: '',
@@ -525,6 +545,16 @@ export default {
} else {
this.checkbox_number = true
}
+ if(this.startTime === '' || this.startTime === null) {
+ this.startTime_check = 0
+ } else {
+ this.startTime_check = 1
+ }
+ if(this.endTime === '' || this.endTime === null) {
+ this.endTime_check = 0
+ } else {
+ this.endTime_check = 1
+ }
this.tableData1 = []
this.零件图号 = []
this.零件名称 = []
@@ -538,7 +568,7 @@ export default {
this.colorCode = [[]]
this.realDate = [[]]
this.length = 0
- getTable(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.pageCurrent, this.pageSize).then(response => {
+ getTable(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.pageCurrent, this.pageSize).then(response => {
if (response.data.rows.length === 0) {
this.listLoading1 = false
} else {
From 26d729f4979e7ccf28add564af74eef666ac93b7 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 12 Mar 2019 16:09:45 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/request.js | 2 +-
.../MachiningSequenceAdjustment/index.vue | 62 +++++++++++++++++--
2 files changed, 58 insertions(+), 6 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index 81241138..f4f36407 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -19,7 +19,7 @@ const service = axios.create({
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
- baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
+ baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间git
diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
index a7fa898f..8afb2c95 100644
--- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
+++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
@@ -21,7 +21,7 @@
-
+
@@ -334,6 +334,9 @@ import { wsuri, name } from '@/utils/request'
export default {
data() {
return {
+ a: 1,
+ b: 1,
+ expands: [],
opname: '', // 用来通知工位刷新数据
msg: '',
num: 0,
@@ -368,6 +371,44 @@ export default {
this.initWebsocket()
},
methods: {
+ getRowKeys(row) {
+ console.log(row)
+ return row.零件图号
+ },
+ selectMachine(row) {
+ this.process = []
+ this.planDate = []
+ this.worker = []
+ this.colorCode = []
+ this.realDate = []
+ this.tableData2 = []
+ getTable2(row.零件图号).then(response => {
+ for (let k = 0; k < response.data.length; k++) {
+ this.process[k] = response.data[k].工艺名称简称
+ this.planDate[k] = response.data[k].计划日期_短
+ this.realDate[k] = response.data[k].完成日期_短
+ if (response.data[k].工艺编号 === 29) {
+ response.data[k].员工姓名 = '备料'
+ }
+ if (response.data[k].工序间是否外协 === 2) {
+ response.data[k].员工姓名 = '外协'
+ }
+ if (response.data[k].员工姓名 === '超级管理员') {
+ response.data[k].员工姓名 = '无'
+ }
+ this.worker[k] = response.data[k].员工姓名
+ if (response.data[k].工序状态 === 5) { // 灰色是已经完成 未入库
+ this.colorCode[k] = 'grey'
+ } else {
+ this.colorCode[k] = response.data[k].进度颜色
+ }
+ if (response.data[k].工序间是否外协 === 2) {
+ this.colorCode[k] = 'lightblue'
+ }
+ }
+ this.tableData2.push(response.data[0])
+ })
+ },
initWebsocket() { // 初始化websocket
this.websock = new WebSocket(wsuri)// 这里面的this都指向vue
this.websock.onopen = this.websocketopen
@@ -377,7 +418,6 @@ export default {
},
websocketopen() { // 打开
console.log('WebSocket连接成功')
- // MessageBox('提示', '连接成功')
this.websock.send('LIN,' + name)
},
websocketonmessage(msg) { // 数据接收
@@ -389,11 +429,8 @@ export default {
},
websocketerror() { // 失败
console.log('WebSocket连接失败')
- // MessageBox('提示', '连接失败');
- // this.socketConnect = false
},
Refresh() {
- // this.initWebsocket()
this.websock.send('TOBS?MES?' + this.MachineValue + '?MES|SequenceAdjustment|' + this.MachineValue + '|1')
},
// 初始化获取工位
@@ -425,6 +462,21 @@ export default {
}
},
searchTable2(row) {
+ if (this.a === 1) {
+ this.expands.push(row.零件图号)
+ this.b = row.零件图号
+ this.a = 0
+ } else {
+ if (this.b === row.零件图号) {
+ this.expands = []
+ this.a = 1
+ } else {
+ this.expands = []
+ this.expands.push(row.零件图号)
+ this.a = 0
+ this.b = row.零件图号
+ }
+ }
this.process = []
this.planDate = []
this.worker = []
From f93c2f99f57722117debd4f54b57ffaba6ea9308 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 12 Mar 2019 16:11:41 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
index c303aba3..4c33cbfe 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
@@ -545,12 +545,12 @@ export default {
} else {
this.checkbox_number = true
}
- if(this.startTime === '' || this.startTime === null) {
+ if (this.startTime === '' || this.startTime === null) {
this.startTime_check = 0
} else {
this.startTime_check = 1
}
- if(this.endTime === '' || this.endTime === null) {
+ if (this.endTime === '' || this.endTime === null) {
this.endTime_check = 0
} else {
this.endTime_check = 1
From 484d071831fa13803e2909e739e9974f92e1d9e4 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 12 Mar 2019 16:51:33 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=83=BD=E5=8A=9B?=
=?UTF-8?q?=E5=B9=B3=E8=A1=A1=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ManufacturingCenter/ProductionCapacityBalance/index.vue | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index 5e853f2b..c0405e35 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -1442,9 +1442,6 @@ export default {
this.bianliang1.push(this.tableData1[i].工艺计划流水号)
}
discharge(this.bianliang1).then(response => {
- this.total1 = 0
- this.pageSize1 = 10
- this.pageList1 = 1
this.Selection1()
})
},
From 604ffa26f293d79e5aff9f8b88065665ed749355 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 13 Mar 2019 09:49:08 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E9=A1=BA=E5=BA=8F?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../MachiningSequenceAdjustment.js | 12 ++++++++++
.../MachiningSequenceAdjustment/index.vue | 23 ++++++++++++++++---
2 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
index e4320d48..9375414f 100644
--- a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
+++ b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
@@ -69,3 +69,15 @@ export function getTable2(stepNumber) {
}
})
}
+// 正在加工零件
+export function searchParts(stepNumber) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '车间生产管理工艺_加工顺序调整_查询正在加工零件工序',
+ param: '终端编号=' + stepNumber
+ }
+ })
+}
diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
index 8afb2c95..6031ff66 100644
--- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
+++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
@@ -3,7 +3,7 @@
工位号:
-
+
刷新工位
+ 加工零件： {{ Parts }};加工工序： {{ gongxu }}
+ 无正在加工零件
调序权限
@@ -329,11 +331,14 @@