From 17d72c3eae23f13917928928531fe43b3e3c351a Mon Sep 17 00:00:00 2001 From: liushuai Date: Mon, 9 Dec 2019 12:14:57 +0800 Subject: [PATCH 1/6] =?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/views/Inventory/OfflinePartOut/index.vue | 1 - .../PurchasingEfficiencyAnalysis/index.vue | 19 +++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue index 903b4535..2e547f59 100644 --- a/src/views/Inventory/OfflinePartOut/index.vue +++ b/src/views/Inventory/OfflinePartOut/index.vue @@ -347,7 +347,6 @@ export default { }, // 打开表单 parOut(row) { - this.form.department = '装配车间' this.locateNumber = row.货位流水号 this.materialNumber = row.物料流水号 this.partnumber = row.货位存量 diff --git a/src/views/PurchasingCenter/PurchasingEfficiencyAnalysis/index.vue b/src/views/PurchasingCenter/PurchasingEfficiencyAnalysis/index.vue index e7383d2c..e0f6a9c3 100644 --- a/src/views/PurchasingCenter/PurchasingEfficiencyAnalysis/index.vue +++ b/src/views/PurchasingCenter/PurchasingEfficiencyAnalysis/index.vue @@ -19,7 +19,7 @@ value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"/> - 查询 + 查询
@@ -33,8 +33,8 @@ export default { data() { return { tableData: [], - data1: '', - data2: '' + date1: '', + date2: '' } }, mounted() {}, @@ -57,12 +57,15 @@ export default { }) }, getTableData1(row) { + console.log(row, 1) for (let i = 0; i < row.length; i++) { getData1(row[i].采购合同流水号).then(response => { + console.log(response.data, 2) this.tableData[i].平均分配日期 = response.data[0].平均分配日期 this.tableData[i].平均采购时间 = response.data[0].平均采购时间 }) } + console.log(this.tableData, 3) }, // 绘制图形 drawLine() { @@ -70,8 +73,8 @@ export default { const xData = [] const lineData = [] for (let i = 0; i < this.tableData.length; i++) { - xData.push(this.tableData[i].采购合同编号.split(' ')[0]) - lineData.push(this.tableData[i].平均采购时间.toFixed(2)) + xData.push(this.tableData[i].采购合同编号) + lineData.push(this.tableData[i].平均采购时间) } myChart.clear() myChart.setOption({ @@ -94,13 +97,17 @@ export default { data: xData, axisPointer: { type: 'shadow' + }, + axisLabel: { + interval: 0, + rotate: 40 } } ], yAxis: [ { type: 'value', - name: '采购用时' + name: '采购用时(H)' } ], series: [ From 53b8b6c813fde4cb91eb35609569b93df7b35af3 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 12 Dec 2019 08:43:25 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=9D=E5=85=BB=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../maintainInformation.js | 47 +++ .../maintainInformation/index.vue | 309 +++++++++++++++++- 2 files changed, 352 insertions(+), 4 deletions(-) diff --git a/src/api/ManufacturingCenter/maintainInformation.js b/src/api/ManufacturingCenter/maintainInformation.js index 546892c5..652a2aa4 100644 --- a/src/api/ManufacturingCenter/maintainInformation.js +++ b/src/api/ManufacturingCenter/maintainInformation.js @@ -117,3 +117,50 @@ export function submit2(num1, num2, num3) { } }) } +export function exportOut(num1, num2, num3) { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: `SELECT * + ,case when [FN1] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN1]) else '' end as [姓名1] + ,case when [FN2] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN2]) else '' end as [姓名2] + ,case when [FN3] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN3]) else '' end as [姓名3] + ,case when [FN4] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN4]) else '' end as [姓名4] + ,case when [FN5] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN5]) else '' end as [姓名5] + ,case when [FN6] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN6]) else '' end as [姓名6] + ,case when [FN7] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN7]) else '' end as [姓名7] + ,case when [FN8] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN8]) else '' end as [姓名8] + ,case when [FN9] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN9]) else '' end as [姓名9] + ,case when [FN10] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN10]) else '' end as [姓名10] + ,case when [FN11] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN11]) else '' end as [姓名11] + ,case when [FN12] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN12]) else '' end as [姓名12] + ,case when [FN13] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN13]) else '' end as [姓名13] + ,case when [FN14] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN14]) else '' end as [姓名14] + ,case when [FN15] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN15]) else '' end as [姓名15] + ,case when [FN16] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN16]) else '' end as [姓名16] + ,case when [FN17] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN17]) else '' end as [姓名17] + ,case when [FN18] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN18]) else '' end as [姓名18] + ,case when [FN19] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN19]) else '' end as [姓名19] + ,case when [FN20] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN20]) else '' end as [姓名20] + ,case when [FN21] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN21]) else '' end as [姓名21] + ,case when [FN22] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN22]) else '' end as [姓名22] + ,case when [FN23] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN23]) else '' end as [姓名23] + ,case when [FN24] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN24]) else '' end as [姓名24] + ,case when [FN25] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN25]) else '' end as [姓名25] + ,case when [FN26] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN26]) else '' end as [姓名26] + ,case when [FN27] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN27]) else '' end as [姓名27] + ,case when [FN28] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN28]) else '' end as [姓名28] + ,case when [FN29] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN29]) else '' end as [姓名29] + ,case when [FN30] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN30]) else '' end as [姓名30] + ,case when [FN31] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN31]) else '' end as [姓名31] + FROM + [基础数据_设备工位点检表] inner join [工位日点检任务记录] + on [基础数据_设备工位点检表].工位号 = [工位日点检任务记录].工位号 + inner join [基础数据_点检内容] + on [工位日点检任务记录].点检任务编号 = [基础数据_点检内容].点检任务编号 + where [基础数据_设备工位点检表].工位号 = '${num1}' and 年 = '${num2}' and 月 = '${num3}' order by [工位日点检任务记录].点检任务编号` + } + }) +} diff --git a/src/views/ManufacturingCenter/maintainInformation/index.vue b/src/views/ManufacturingCenter/maintainInformation/index.vue index ad39056d..b01f763c 100644 --- a/src/views/ManufacturingCenter/maintainInformation/index.vue +++ b/src/views/ManufacturingCenter/maintainInformation/index.vue @@ -103,6 +103,275 @@ + + 导出 +
+
设备保养点检记录表
+
+ 设备名称： + {{ 设备名称 }} + 设备编号： + {{ 设备编号 }} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
点 检 人（操作工）
+
{{ tableData[0] ? tableData[0].姓名1 : '' }}
+
{{ tableData[0] ? tableData[0].姓名2 : '' }}
+
{{ tableData[0] ? tableData[0].姓名3 : '' }}
+
{{ tableData[0] ? tableData[0].姓名4 : '' }}
+
{{ tableData[0] ? tableData[0].姓名5 : '' }}
+
{{ tableData[0] ? tableData[0].姓名6 : '' }}
+
{{ tableData[0] ? tableData[0].姓名7 : '' }}
+
{{ tableData[0] ? tableData[0].姓名8 : '' }}
+
{{ tableData[0] ? tableData[0].姓名9 : '' }}
+
{{ tableData[0] ? tableData[0].姓名10 : '' }}
+
{{ tableData[0] ? tableData[0].姓名11 : '' }}
+
{{ tableData[0] ? tableData[0].姓名12 : '' }}
+
{{ tableData[0] ? tableData[0].姓名13 : '' }}
+
{{ tableData[0] ? tableData[0].姓名14 : '' }}
+
{{ tableData[0] ? tableData[0].姓名15 : '' }}
+
{{ tableData[0] ? tableData[0].姓名16 : '' }}
+
{{ tableData[0] ? tableData[0].姓名17 : '' }}
+
{{ tableData[0] ? tableData[0].姓名18 : '' }}
+
{{ tableData[0] ? tableData[0].姓名19 : '' }}
+
{{ tableData[0] ? tableData[0].姓名20 : '' }}
+
{{ tableData[0] ? tableData[0].姓名21 : '' }}
+
{{ tableData[0] ? tableData[0].姓名22 : '' }}
+
{{ tableData[0] ? tableData[0].姓名23 : '' }}
+
{{ tableData[0] ? tableData[0].姓名24 : '' }}
+
{{ tableData[0] ? tableData[0].姓名25 : '' }}
+
{{ tableData[0] ? tableData[0].姓名26 : '' }}
+
{{ tableData[0] ? tableData[0].姓名27 : '' }}
+
{{ tableData[0] ? tableData[0].姓名28 : '' }}
+
{{ tableData[0] ? tableData[0].姓名29 : '' }}
+
{{ tableData[0] ? tableData[0].姓名30 : '' }}
+
{{ tableData[0] ? tableData[0].姓名31 : '' }}
+
+ @@ -139,7 +408,8 @@ - From 49f4eccd99c381531861997f378d9e79aa7e9115 Mon Sep 17 00:00:00 2001 From: liushuai Date: Thu, 12 Dec 2019 12:49:13 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasingCenter/CreateInquirySheet.js | 8 +- .../CreatePurchaseContract.js | 4 +- .../CreatingPurchasingMaterials.js | 19 ++++- src/views/Inventory/StockInquiry/index.vue | 21 ++---- .../CreateInquirySheet/index.vue | 73 ++++++++++--------- .../CreatePurchaseContract/index.vue | 7 +- .../PurchasingEfficiencyAnalysis/index.vue | 52 +++++++++++-- .../CreatingPurchasingMaterials/index.vue | 38 ++++++++-- .../NewArrivalList/index.vue | 8 +- .../OutsourcingMaterialsSearch/index.vue | 2 +- .../ProcurementContractEnquiry/index.vue | 2 +- 11 files changed, 152 insertions(+), 82 deletions(-) diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js index 0538d1d9..1388878c 100644 --- a/src/api/PurchasingCenter/CreateInquirySheet.js +++ b/src/api/PurchasingCenter/CreateInquirySheet.js @@ -88,27 +88,27 @@ export function changeNum(num, num1, num2, num3, num4) { }) } // 查询分配后的标准件和外购件 -export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10) { +export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10, check8, val11) { return request({ url: '', method: 'post', data: { type: '1', name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存_创建询价单', - param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`, + param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}&供货商_check=${check8}&供货商=${val11}`, Pagination: pageCurrent + '&' + pageSize } }) } // 查询分配后的基本件 -export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10) { +export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10, check8, val11) { return request({ url: '', method: 'post', data: { type: '1', name: '采购管理_采购部采购_查询物料_基本件_分配后_创建询价单', - param: `物料状态编号=${num1}&零件图号_check=${check1}&零件图号=${val1}&零件名称_check=${check2}&零件名称=${val2}&零件规格_check=${check3}&零件规格=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`, + param: `物料状态编号=${num1}&零件图号_check=${check1}&零件图号=${val1}&零件名称_check=${check2}&零件名称=${val2}&零件规格_check=${check3}&零件规格=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}&供货商_check=${check8}&供货商=${val11}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/api/PurchasingCenter/CreatePurchaseContract.js index 9e36ac4b..e617e381 100644 --- a/src/api/PurchasingCenter/CreatePurchaseContract.js +++ b/src/api/PurchasingCenter/CreatePurchaseContract.js @@ -18,7 +18,7 @@ export function initSupplier11(num) { data: { type: '3', name: ` SELECT distinct 供应商流水号,供应商名称 - FROM 采购管理_询价单_视图 + FROM 采购管理_询价单_视图_新 where not EXISTS (select * from 采购管理_采购合同_采购部 where 是否启用 = 1 and (是否未通过 is null or 是否未通过 <> 1) and 询价单编号 = 采购合同编号) and 采购员流水号 = ${num}` } }) @@ -30,7 +30,7 @@ export function searchInquirySheet(check2, value2, check3, id, check4, supplier) method: 'post', data: { type: '1', - name: '采购管理_询价单_查询数据', + name: '采购管理_询价单_查询数据_创建合同', param: `询价单编号_check=${check2}&询价单编号=${value2}&采购员流水号_check=${check3}&采购员流水号=${id}&供应商流水号_check=${check4}&供应商流水号=${supplier}` } }) diff --git a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js index 03f4eeb4..ef771d11 100644 --- a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js +++ b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js @@ -26,14 +26,14 @@ export function addMateriel2(num1, num2) { }) } // 保存重量和备注 -export function saveWeight(num1, num2, num3, num4, num5, num6, num7) { +export function saveWeight(num1, num2, num3, num4, num8) { return request({ url: '', method: 'post', data: { type: '2', name: '备料管理_采购计划明细_保存重量和备注_9745', - param: `采购计划流水号=${num1}&成品尺寸=${num2}&备注=${num3}&单位=${num4}&零件图号=${num5}&材料=${num6}&零件名称=${num7}` + param: `采购计划明细流水号=${num1}&成品尺寸=${num2}&备注=${num3}&单位=${num4}&采购数量=${num8}` } }) } @@ -124,15 +124,26 @@ export function searchMateriel(num) { } }) } +export function searchMateriel1(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_采购计划明细_查询数据_新', + param: `采购计划流水号=${num}` + } + }) +} // 增加采购计划明细 -export function addMateriel(num1, num2) { +export function addMateriel(num1, num2, num3) { return request({ url: '', method: 'post', data: { type: '2', name: '备料管理_采购计划明细_增加数据', - param: `采购计划流水号=${num1}&工艺计划流水号组=${num2}` + param: `采购计划流水号=${num1}&工艺计划流水号组=${num2}&数量组=${num3}` } }) } diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue index c8b92807..42d65808 100644 --- a/src/views/Inventory/StockInquiry/index.vue +++ b/src/views/Inventory/StockInquiry/index.vue @@ -210,21 +210,9 @@ export default { getTableData() { this.listLoading1 = true this.listLoading2 = true - if (this.Machine === '') { - this.checkbox_Machine = 0 - } else { - this.checkbox_Machine = 1 - } - if (this.Group === '') { - this.checkbox_Group = 0 - } else { - this.checkbox_Group = 1 - } - if (this.number === '') { - this.checkbox_number = 0 - } else { - this.checkbox_number = 1 - } + this.Machine ? this.checkbox_Machine = 1 : this.checkbox_Machine = 0 + this.Group ? this.checkbox_Group = 1 : this.checkbox_Group = 0 + this.number ? this.checkbox_number = 1 : this.checkbox_number = 0 this.tableData1 = [] this.tableData0 = [] getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.pageCurrent, this.pageSize).then(response => { @@ -249,10 +237,13 @@ export default { handleSizeChange(val) { this.pageCurrent = 1 this.pageSize = val + this.pageCurrent0 = 1 + this.pageSize0 = val this.getTableData() }, handleCurrentChange(val) { this.pageCurrent = val + this.pageCurrent0 = val this.getTableData() } } diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index c1da8bed..a58ba796 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -47,6 +47,7 @@ + + end-placeholder="结束日期"/>
@@ -109,7 +109,7 @@ --> + + end-placeholder="结束日期"/> 调整采购任务 + + diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue index b8aa40d0..2b8d5423 100644 --- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue +++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue @@ -98,7 +98,7 @@