From 4bf0efbaa83919a7b3b84888a22f55e406125971 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sat, 12 Jan 2019 15:15:07 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessingStatusEdit.js | 6 ++-- .../ProcessingStatusEdit/index.vue | 36 ++++++++----------- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/src/api/ManufacturingCenter/ProcessingStatusEdit.js b/src/api/ManufacturingCenter/ProcessingStatusEdit.js index ab5fd66c..539d1ef1 100644 --- a/src/api/ManufacturingCenter/ProcessingStatusEdit.js +++ b/src/api/ManufacturingCenter/ProcessingStatusEdit.js @@ -11,14 +11,14 @@ export function getNames() { }) } -export function getMachines(gongyi) { +export function getMachines() { return request({ url: '', method: 'post', data: { type: '1', - name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床', - param: '项目流水号=' + gongyi + '=int' + name: '车间生产管理工艺_传递后_机床名称_根据机床查询', + param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int' } }) } diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue index 6a326aa4..fc808831 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue @@ -3,21 +3,16 @@ - 项目名称: - - - 机床号: - + + :value="item.value"> +
{{ item.label }}
+
{{ item.value2 }}
+ 组号: @@ -435,7 +430,7 @@ export default { } }, created() { - this.fetchData() + this.getMachine() this.fetchData3() this.getTableData() }, @@ -483,16 +478,15 @@ export default { this.Machines = [] this.Group = '' this.Groups = [] - if (this.project !== '') { - getMachines(this.project).then(response => { - for (let i = 0; i < response.data.length; i++) { - this.Machines.push({ - label: response.data[i].机床图号, - value: response.data[i].机床流水号 - }) - } - }) - } + getMachines().then(response => { + for (let i = 0; i < response.data.length; i++) { + this.Machines.push({ + label: response.data[i].机床图号, + value: response.data[i].机床流水号, + value2: response.data[i].项目名称 + }) + } + }) }, getGroup() { this.Group = '' From fc5ddc54fddfe9472546992c9f7e8d81814f11b7 Mon Sep 17 00:00:00 2001 From: liushuai Date: Mon, 14 Jan 2019 10:40:03 +0800 Subject: [PATCH 02/11] =?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/api/TechnologyCenter/ImportParts.js | 11 +++ .../WorkshopProcurement/ProjectTotalSearch.js | 12 --- .../PartAssignment/index.vue | 37 +++++++- .../ImportChangeParts/specificationData1.vue | 10 +++ .../TechnologyCenter/ImportParts/index.vue | 4 + .../ImportParts/specificationData.vue | 90 ++++++++++++++++++- .../TechnologyCenter/QueryParts/index.vue | 30 ++++++- 7 files changed, 176 insertions(+), 18 deletions(-) diff --git a/src/api/TechnologyCenter/ImportParts.js b/src/api/TechnologyCenter/ImportParts.js index 846a683c..78f6b224 100644 --- a/src/api/TechnologyCenter/ImportParts.js +++ b/src/api/TechnologyCenter/ImportParts.js @@ -325,3 +325,14 @@ export function transferWG(groupNum, materialNum, totalNum, remarks, mark, desig } }) } +export function searchMaterial1(num, name, Specifications) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_零件明细表_标准件和外购件_物料对比', + param: `图号或者型号=${num}&名称=${name}&规格=${Specifications}` + } + }) +} diff --git a/src/api/WorkshopProcurement/ProjectTotalSearch.js b/src/api/WorkshopProcurement/ProjectTotalSearch.js index dcc933bc..eb903600 100644 --- a/src/api/WorkshopProcurement/ProjectTotalSearch.js +++ b/src/api/WorkshopProcurement/ProjectTotalSearch.js @@ -12,18 +12,6 @@ export function initProject() { }) } // 初始化项目金额统计表 -export function searchProjectTotal(num) { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '采购管理_项目总价_明细_查询数据', - param: `项目流水号=${num}` - } - }) -} -// 初始化项目金额统计表 export function searchProjectTotal1(num) { return request({ url: '', diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index edcda24d..a0cc6236 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -105,11 +105,21 @@ {{ scope.row.零件备注 }} + + + + + + + + + + + + + + + + + + + + + @@ -176,7 +211,7 @@ format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择日期"/> - 车间请购 + 制造部采购 采购部门采购 车间生产 diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue index e7c2a055..ead697a4 100644 --- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue +++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue @@ -28,6 +28,11 @@ :row-class-name="tableRowClassName" size="mini" border> + + + +