From 9a4060c43e989925f110fe17a52c575d9996a523 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Tue, 3 Dec 2019 10:46:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompletionOfWorkshopComponents/index.vue | 11 + .../ContractCapitalManagement/index.vue | 600 +++++++++--------- 2 files changed, 307 insertions(+), 304 deletions(-) diff --git a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue index 13a8076a..75fdae4d 100644 --- a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue +++ b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue @@ -51,6 +51,8 @@ :props="defaultProps" :indent="80" :expand-on-click-node="false" + :render-content="renderContent" + node-key="机床流水号" class="selectTree" default-expand-all @node-click="onClick"/> @@ -181,6 +183,9 @@ export default { }) } }, + renderContent(h, { node, data, store }) { + return ({node.label}) + }, searchTable1(row) { this.tableData1 = [] selectProcedure(row.工艺计划流水号).then(response => { @@ -196,5 +201,11 @@ export default { .el-tree-node__content>.el-tree-node__expand-icon{ display: inline !important; } + .el-tree-node:focus > .el-tree-node__content { + background-color: #ccc !important; + } + } + .treeNotes { + background-color: green; } diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue index 5c887249..fc0f21bf 100644 --- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue +++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue @@ -9,8 +9,6 @@ :label="item.label" :value="item.value"/> - - 客户名称： 查询 - 查看收款信息 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -411,14 +411,6 @@ 姓名： 查询 - - - - - - - -
From f6908d87cc7e3fe432b03b6763b580e0251dc6bb Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Tue, 3 Dec 2019 17:13:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- .../CompletionOfWorkshopComponents/index.vue | 74 ++++++++++++++----- 2 files changed, 55 insertions(+), 21 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index fc41e22d..2cb92ad8 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue index 75fdae4d..76e64941 100644 --- a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue +++ b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue @@ -23,15 +23,14 @@ - - + - + @@ -39,17 +38,22 @@ {{ scope.row.投产数量 }} + + + - + 机床图号：{{ 机床图号 }} 机床名称：{{ 机床名称 }} -
+
- + @@ -159,8 +163,11 @@ export default { firstLevel.children = [] for (let j = 0; j < response.data.length; j++) { firstLevel.children.push({ - label: (response.data[j].零件图号 ? response.data[j].零件图号 : '无零件图号') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].规格 ? response.data[j].规格 : '') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].投产总数量 ? response.data[j].投产总数量 : '') + '..........' + (response.data[j].零件名称 ? response.data[j].零件名称 : '无零件名称'), + label: (response.data[j].零件图号 ? response.data[j].零件图号 : '无零件图号') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].规格 ? response.data[j].规格 : '') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].投产总数量 ? response.data[j].投产总数量 : '') + '..........' + (response.data[j].零件名称 ? response.data[j].零件名称 : '无零件名称') + (response.data[j].零件类型 === 1 ? '' : '\xa0\xa0\xa0\xa0\xa0\xa0外购'), value: response.data[j].工艺计划流水号, + 考核状态: response.data[j].考核状态, + 采购状态: response.data[j].采购状态, + 零件类型: response.data[j].零件类型, father: false }) } @@ -173,18 +180,41 @@ export default { onClick(num) { this.tableData1 = [] this.tableData2 = [] - if (num.father === true) { - selectParts(1, num.value, 0, 0).then(response => { - this.tableData2 = response.data - }) - } else { - selectParts(0, 0, 1, num.value).then(response => { - this.tableData2 = response.data - }) + if (num.father === false) { + if (num.零件类型 === 1) { + selectProcedure(num.value).then(response => { + this.tableData1 = response.data + }) + } } + // if (num.father === true) { + // selectParts(1, num.value, 0, 0).then(response => { + // this.tableData2 = response.data + // }) + // } else { + // selectParts(0, 0, 1, num.value).then(response => { + // this.tableData2 = response.data + // }) + // } }, renderContent(h, { node, data, store }) { - return ({node.label}) + if (node.data.father === false) { + if (node.data.零件类型 === 1) { // 自制 + if (parseInt(node.data.考核状态) > 6) { + return ({node.label}) + } else { + return ({node.label}) + } + } else { // 外购 + if (node.data.采购状态 === '已完成') { + return ({node.label}) + } else { + return ({node.label}) + } + } + } else { + return ({node.label}) + } }, searchTable1(row) { this.tableData1 = [] @@ -205,7 +235,11 @@ export default { background-color: #ccc !important; } } - .treeNotes { - background-color: green; + .treeNotesComplate { + color: black; + background-color: #67C23A; + } + .treeNotesUnComplate { + color: black; }