From da9a5636d89307f06b129e7c0251e40888f4d1c2 Mon Sep 17 00:00:00 2001 From: liushuai Date: Tue, 29 Jan 2019 15:06:26 +0800 Subject: [PATCH 01/35] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- .../ImportParts/specificationData.vue | 1 - .../TechnologyCenter/QueryParts/index.vue | 1 + .../DepartmentBuyerRequestFund/index.vue | 27 +++++++++++-------- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 554b1f2b..f997ba78 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -20,7 +20,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 // 请求超时时间 diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue index a62636bd..32bf7368 100644 --- a/src/views/TechnologyCenter/ImportParts/specificationData.vue +++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue @@ -122,7 +122,6 @@ :data="tableData10" :cell-class-name="cell" style="width: 100%" - height="440" size="mini" highlight-current-row border> diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue index 60b377d3..5c56c35e 100644 --- a/src/views/TechnologyCenter/QueryParts/index.vue +++ b/src/views/TechnologyCenter/QueryParts/index.vue @@ -131,6 +131,7 @@ border> diff --git a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue index afa3b525..97e20d1a 100644 --- a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue +++ b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue @@ -331,17 +331,22 @@ export default { this.searchTable1() }, requestFund(row) { // 请款 - const day1 = new Date() - const day2 = day1.getFullYear() + '-' + (day1.getMonth() + 1) + '-' + day1.getDate() - requestFund(row.采购合同流水号, row.本次应请款, day2, this.id).then(response => { - if (response.data[0].result === '1') { - this.$message.success('请款成功') - this.searchTable1() - this.startRequestDate = '' - this.endRequestDate = '' - this.tableData2 = [] - } else { this.$message.error('请款失败') } - }) + console.log(row.本次应请款) + if (row.本次应请款 !== '') { + const day1 = new Date() + const day2 = day1.getFullYear() + '-' + (day1.getMonth() + 1) + '-' + day1.getDate() + requestFund(row.采购合同流水号, row.本次应请款, day2, this.id).then(response => { + if (response.data[0].result === '1') { + this.$message.success('请款成功') + this.searchTable1() + this.startRequestDate = '' + this.endRequestDate = '' + this.tableData2 = [] + } else { this.$message.error('请款失败') } + }) + } else { + this.$message.warning('请输入金额') + } }, cancelRequestFund(row) { // 取消请款 console.log(row) From 345e24b43f5d868f9daeb50aa289625b81f9f864 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Tue, 29 Jan 2019 15:06:27 +0800 Subject: [PATCH 02/35] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=B7=A5=E8=89=BA?= =?UTF-8?q?=E5=88=B6=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/ProcessPlanning.js | 49 +++-- .../ProcessingStatusEdit.js | 2 +- .../ProcessPlanning/index.vue | 181 +++++------------- 3 files changed, 82 insertions(+), 150 deletions(-) diff --git a/src/api/ManufacturingCenter/ProcessPlanning.js b/src/api/ManufacturingCenter/ProcessPlanning.js index e2f5e2d7..8275846b 100644 --- a/src/api/ManufacturingCenter/ProcessPlanning.js +++ b/src/api/ManufacturingCenter/ProcessPlanning.js @@ -1,5 +1,41 @@ import request from '@/utils/request' +// 典艺查询<高精原有数据> +export function searchProcess11(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_原零件工艺查询_MESWORK', + param: '零件图号=' + num + } + }) +} +// 典艺查询<高精原有数据> +export function numChange(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_原零件工艺明细查询_MESWORK', + param: '典艺流水号=' + num + } + }) +} +// 保存主表工艺 +export function selectRequest(num0, num1, num2, num3, request0) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_修改数据_根据工序流水号和工艺计划流水号', + param: '工序流水号=' + num0 + '&工艺计划流水号=' + num1 + '&工艺编号=' + num2 + '&工艺顺序=' + num3 + '&工艺要求=' + request0 + } + }) +} // 初始化 工艺员A export function initCraftmen() { return request({ @@ -322,18 +358,7 @@ export function saveApprove(num0, num1, request0, spec, num2, outhelp, num3, num } }) } -// 选择工艺要求 -export function selectRequest(num0, num1, num2, num3, request0) { - return request({ - url: '', - method: 'post', - data: { - type: '2', - name: '车间生产管理工艺_零件工序_修改数据_根据工序流水号和工艺计划流水号', - param: '工序流水号=' + num0 + '&工艺计划流水号=' + num1 + '&工艺编号=' + num2 + '&工艺顺序=' + num3 + '&工艺要求=' + request0 - } - }) -} + // 粘贴 export function pasteTable(oldNum, newNum) { return request({ diff --git a/src/api/ManufacturingCenter/ProcessingStatusEdit.js b/src/api/ManufacturingCenter/ProcessingStatusEdit.js index 539d1ef1..913bdf76 100644 --- a/src/api/ManufacturingCenter/ProcessingStatusEdit.js +++ b/src/api/ManufacturingCenter/ProcessingStatusEdit.js @@ -17,7 +17,7 @@ export function getMachines() { method: 'post', data: { type: '1', - name: '车间生产管理工艺_传递后_机床名称_根据机床查询', + name: '车间生产管理工艺_传递后_机床名称_加工进度修改模块查询', param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int' } }) diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue index dcfe4c35..53cefd83 100644 --- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue @@ -82,8 +82,8 @@ 长度: 计算重量 - ∮ ° # □ ∥ ± × Ⅰ Ⅱ Ⅲ ⊥ ％ ■ ∠ mm ◎ ○ δ μm ／ ◇ () - 计算重量 + + @@ -144,16 +144,11 @@ 计算公差 粘贴 - 典艺 - - 完艺 - - 删除 - - 复制并保存 - - 保存 - + 原有 + 完艺 + 删除 + 复制并保存 + 保存 - + - - - - - + + + + 查询 - - - - - - - - - 查询 - - - - + + + + 工艺拷贝 - - - - - - - 工艺拷贝 - @@ -472,12 +424,7 @@ 工艺拷贝 - + + From db36852ac6ef3b03cee3e89a46bb1c459673f692 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 15 Feb 2019 16:19:05 +0800 Subject: [PATCH 18/35] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/WorkshopEquipmentManagement/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue index 85f1a436..8d273457 100644 --- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue +++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue @@ -311,7 +311,6 @@ export default { type: 'success' }) this.dialogFormVisible = false - this.title = '' this.fetchData() } else { this.$message.error('信息添加失败') From b4dd09e66f2e273c54b3cd85b511700d545e19a8 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Mon, 18 Feb 2019 09:43:35 +0800 Subject: [PATCH 19/35] a --- .../ManufacturingCenter/ProductionCapacityBalance/index.vue | 1 - .../ManufacturingCenter/WorkshopEquipmentManagement/index.vue | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue index 2369f17c..0a7a50fc 100644 --- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue +++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue @@ -1202,7 +1202,6 @@ export default { if (this.零件图号.length !== 0) { for (let i = 0; i < this.零件图号.length; i++) { selection2(this.工艺计划流水号[i]).then(response => { - console.log(response.data, 2) for (let k = 0; k < response.data.length; k++) { this.process[i][k] = response.data[k].工艺名称简称 this.planDate[i][k] = response.data[k].计划日期_短 diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue index 8d273457..f2855422 100644 --- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue +++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue @@ -111,7 +111,7 @@ - + Date: Tue, 19 Feb 2019 09:08:44 +0800 Subject: [PATCH 20/35] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/TechnologyCenter/CreatePackingList.js | 10 +- src/api/TechnologyCenter/ImportParts.js | 12 - src/utils/request.js | 4 +- .../CreatePackingList/index.vue | 217 +++++++++++++++++- .../ImportParts/specificationData.vue | 77 +------ 5 files changed, 225 insertions(+), 95 deletions(-) diff --git a/src/api/TechnologyCenter/CreatePackingList.js b/src/api/TechnologyCenter/CreatePackingList.js index 7e9efae5..7189ec4b 100644 --- a/src/api/TechnologyCenter/CreatePackingList.js +++ b/src/api/TechnologyCenter/CreatePackingList.js @@ -184,7 +184,7 @@ export function getSpareData(num) { data: { type: '1', name: 'PDM_装箱单_备件_查询数据', - param: `装箱单编号=${num}` + param: `项目流水号=${num}&机床流水号=${num}` } }) } @@ -201,26 +201,26 @@ export function deleteSpareData(num) { }) } -export function editSpareData(name, specification, unit, number, remark, num) { +export function editSpareData(MapNumber, name, specification, unit, number, remark, num) { return request({ url: '', method: 'post', data: { type: '2', name: 'PDM_装箱单_备件_修改数据', - param: `名称=${name}&规格=${specification}&数量=${number}&单位=${unit}&备注=${remark}&备件编号=${num}` + param: `图号=${MapNumber}&名称=${name}&规格=${specification}&数量=${number}&单位=${unit}&备注=${remark}&备件编号=${num}` } }) } -export function addSpareData(name, specification, unit, number, remark, num) { +export function addSpareData(MapNumber, name, specification, unit, number, remark, num, num1, num2) { return request({ url: '', method: 'post', data: { type: '2', name: 'PDM_装箱单_备件_增加数据', - param: `名称=${name}&规格=${specification}&数量=${number}&单位=${unit}&备注=${remark}&装箱单编号=${num}` + param: `图号=${MapNumber}&名称=${name}&规格=${specification}&数量=${number}&单位=${unit}&备注=${remark}&装箱单编号=${num}&项目流水号=${num1}&机床流水号=${num2}` } }) } diff --git a/src/api/TechnologyCenter/ImportParts.js b/src/api/TechnologyCenter/ImportParts.js index 78f6b224..65480ad3 100644 --- a/src/api/TechnologyCenter/ImportParts.js +++ b/src/api/TechnologyCenter/ImportParts.js @@ -242,18 +242,6 @@ export function searchMachine(project) { } }) } - -export function searchMachine2(project) { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: 'PDM_零件明细表_外购件和标准件_数据导入保存_机床_查询数据gj', - param: `项目=${project}` - } - }) -} // 查询组号 export function searchGroupNum(project, name) { return request({ diff --git a/src/utils/request.js b/src/utils/request.js index c4edcdbc..bb056595 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -18,8 +18,8 @@ const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // 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://192.168.1.231: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 // 请求超时时间 diff --git a/src/views/TechnologyCenter/CreatePackingList/index.vue b/src/views/TechnologyCenter/CreatePackingList/index.vue index 5b683f91..43ce1c0c 100644 --- a/src/views/TechnologyCenter/CreatePackingList/index.vue +++ b/src/views/TechnologyCenter/CreatePackingList/index.vue @@ -10,7 +10,7 @@ :value="item.value"/> 增加 - 导出 + 导出
总装箱单
- + + + + + + @@ -418,11 +423,170 @@ 确定 +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

数 控 轧 辊 铣 扁 专机

装          箱          单

GJR1322-ZD
+ +

出厂编号：

中   华   人   民   共   和   国

江   苏   高   精   机   电   装   备   有   限   公   司

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
装        箱        单{{ receiptName }}
本装箱单所列的包装品开箱后应立即清点
箱号 + 箱体尺寸
 +
毛中净重
一、主机
序号
代号名称数量
备注
{{ list.序号 }}{{ list.代号 }}{{ list.名称 }}{{ list.数量 }}{{ list.备注 }}
二、机床所属部件
序号代号名称
规格数量备注
{{ list.序号 }}{{ list.代号 }}{{ list.名称 }}{{ list.规格 }}{{ list.数量 }}{{ list.备注 }}
三、随机供应备件
序号
名称代号
数量
备注
{{ index + 1 }}{{ list.名称 }}{{ list.代号 }}{{ list.数量 }}{{ list.备注 }}
四、随机技术文件
序号
名称
代号数量备注
{{ index + 1 }}{{ list.名称 }}{{ list.代号 }}{{ list.数量 }}{{ list.备注 }}
标记
处数
更改文件号
签字
日期
 +
+ + + + + +
+
+ + From 43e223a2b534708c8f546ac84b5962d8b3030616 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 27 Feb 2019 11:01:00 +0800 Subject: [PATCH 25/35] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=B7=A5=E8=89=BA=E5=88=B6=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectPlanningManagement.js | 44 ++- src/icons/svg/ProjectPlanningManagement.svg | 1 + .../ProcessPlanning/index.vue | 4 +- .../ProjectPlanningManagement/index.vue | 300 ++++++++++-------- 4 files changed, 222 insertions(+), 127 deletions(-) create mode 100644 src/icons/svg/ProjectPlanningManagement.svg diff --git a/src/api/ManufacturingCenter/ProjectPlanningManagement.js b/src/api/ManufacturingCenter/ProjectPlanningManagement.js index 173acf88..52ab573a 100644 --- a/src/api/ManufacturingCenter/ProjectPlanningManagement.js +++ b/src/api/ManufacturingCenter/ProjectPlanningManagement.js @@ -1,6 +1,48 @@ import request from '@/utils/request' -export function getNames() { +export function getProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改' + } + }) +} +export function getCustomerName() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改' + } + }) +} +export function getToolNum() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改' + } + }) +} +export function searchtable(num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '项目计划管理_项目总计划_查询数据', + param: `项目流水号_check=` + num1 + '&项目流水号=' + num2 + '&机床流水号_check=' + num3 + '&@机床流水号=' + num4 + '&客户名称_check=' + num5 + '&客户名称=' + num6 + '&签订日期_check=' + num7 + '&签订日期开始时间=' + num8 + '&签订日期结束时间=' + num9 + '&交货期_check=' + num10 + '&交货期开始时间=' + num11 + '&交货期结束时间=' + num12, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +export function searchtable2() { return request({ url: '', method: 'post', diff --git a/src/icons/svg/ProjectPlanningManagement.svg b/src/icons/svg/ProjectPlanningManagement.svg new file mode 100644 index 00000000..033a4a6b --- /dev/null +++ b/src/icons/svg/ProjectPlanningManagement.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue index 4bc1f9f8..d986a464 100644 --- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue @@ -266,7 +266,7 @@ - + - + - 零件图号: - + 项目名称: + + + + 机床名称: + + + + 客户名称: + + + + + + 签订日期: + ~ + + 交货期: + ~ + 查询 - 查询全部 - 导出备料单 - 导出完成 - + - + - + + + + + + - + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -67,55 +152,25 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
GAOJING备料单
零件名称零件图号材料原材料规格批次数量备料
{{ list.零件名称 }}{{ list.零件图号 }}{{ list.材料 }}{{ list.原材料规格 }}{{ list.批次数量 }}{{ list.工艺要求 }}
-
-