diff --git a/src/api/Outsourcing/OutsourcingPartsQuery.js b/src/api/Outsourcing/OutsourcingPartsQuery.js index f0a94fb9..210226ee 100644 --- a/src/api/Outsourcing/OutsourcingPartsQuery.js +++ b/src/api/Outsourcing/OutsourcingPartsQuery.js @@ -13,15 +13,27 @@ export function getprocedure(processPlan, single) { }) } // 查询外协零件 -export function searchTable(check, supplierNameValue, check1, MaterialsValue, pageSize, pageCurrent) { +export function searchTable(check, supplierNameValue, check1, MaterialsValue, check2, time1, time2, pageSize, pageCurrent) { return request({ url: '', method: 'post', data: { type: '1', name: '车间生产管理_外协零件_查询数据', - param: '外协厂家_check=' + check + '&外协厂家=' + supplierNameValue + '&外协状态_check=' + check1 + '&外协状态=' + MaterialsValue, + param: '外协厂家_check=' + check + '&外协厂家=' + supplierNameValue + '&外协状态_check=' + check1 + '&外协状态=' + MaterialsValue + '&时间_check=' + check2 + '&开始时间=' + time1 + '&结束时间=' + time2, Pagination: pageCurrent + '&' + pageSize } }) } +// 查询外协零件 +export function getExport(check, supplierNameValue, check1, MaterialsValue, check2, time1, time2, pageSize, pageCurrent) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理_外协零件_查询数据', + param: '外协厂家_check=' + check + '&外协厂家=' + supplierNameValue + '&外协状态_check=' + check1 + '&外协状态=' + MaterialsValue + '&时间_check=' + check2 + '&开始时间=' + time1 + '&结束时间=' + time2 + } + }) +} diff --git a/src/api/PurchasingCenter/PurchaseSituationSearch.js b/src/api/PurchasingCenter/PurchaseSituationSearch.js index 0445867b..acf2f13b 100644 --- a/src/api/PurchasingCenter/PurchaseSituationSearch.js +++ b/src/api/PurchasingCenter/PurchaseSituationSearch.js @@ -30,7 +30,7 @@ export function searchTable1(...params) { method: 'post', data: { type: '1', - name: '采购管理_采购部采购_查询物料_分配后_加供应商', + name: '采购管理_采购部采购_查询物料_分配后_加供应商_新', param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}&物料名称_check=${params[7]}&物料名称=${params[8]}&物料规格_check=${params[9]}&物料规格=${params[10]}&物料型号_check=${params[11]}&物料型号=${params[12]}`, Pagination: params[4] + '&' + params[5] } diff --git a/src/utils/request.js b/src/utils/request.js index fc41e22d..f07767cc 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,8 +17,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` -export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel +export const url = `http://192.168.0.101:8074/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.0.101:8074/submit/downloadFile.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 export const ServerIP = `http://192.168.1.231:8411/webpage/file/` export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 @@ -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.101:8074/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue index dc6e2491..8131551c 100644 --- a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue +++ b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue @@ -3,7 +3,9 @@
外协厂家 - + + 外协日期 + 外协状态 查询 + 导出
- + + + +
import { searchTable, getprocedure } from '@/api/Outsourcing/OutsourcingPartsQuery' + export default { name: 'Index', data() { return { + timer: '', supplierNameValue: '', loading: false, total: 0, @@ -114,24 +125,105 @@ export default { tableData: [], procedure: [], pageCurrent: 1, - pageSize: 50 + pageSize: 50, + tableData1: [] } }, created() { this.getTableData() }, methods: { - getTableData() { - this.tableData = [] - this.loading = true - let check, check1 + formatJson(filterVal, jsonData) { + return jsonData.map(v => filterVal.map(j => { + return v[j] + })) + }, + exportExcel() { + this.tableData1 = [] + let check, check1, check2 this.supplierNameValue ? check = 1 : check = 0 if (this.MaterialsValue !== '' && this.MaterialsValue !== null) { check1 = 1 } else { check1 = 0 } - searchTable(check, this.supplierNameValue, check1, this.MaterialsValue, this.pageSize, this.pageCurrent).then(response => { + if (this.timer === null) { + this.timer = '' + } + if (this.timer[1] === undefined || this.timer[0] === undefined || this.timer[1] === null || this.timer[0] === null) { + check2 = 0 + } else { + check2 = 1 + } + searchTable(check, this.supplierNameValue, check1, this.MaterialsValue, check2, this.timer[0], this.timer[1], 100000000, this.pageCurrent).then(response => { + for (let i = 0; i < response.data.rows.length; i++) { + this.tableData1.push({ + 到货状态: response.data.rows[i].到货状态, + 项目名称: response.data.rows[i].项目名称, + 零件图号: response.data.rows[i].零件图号, + 零件名称: response.data.rows[i].零件名称, + 批次数量: response.data.rows[i].批次数量, + 外协厂家名称: response.data.rows[i].外协厂家名称, + 表单号: response.data.rows[i].表单号, + 工艺计划流水号: response.data.rows[i].工艺计划流水号, + 单件是否外协: response.data.rows[i].单件是否外协, + 任务下达日期: response.data.rows[i].任务下达日期, + 外协工序: '' + }) + } + for (let i = 0; i < this.tableData1.length; i++) { + getprocedure(this.tableData1[i].工艺计划流水号, this.tableData1[i].单件是否外协).then(response => { + this.procedure[i] = '' + for (let j = 0; j < response.data.length; j++) { + this.procedure[i] = this.procedure[i] + ' ' + response.data[j].工艺名称简称 + } + this.tableData1[i].外协工序 = this.procedure[i] + }) + } + }).then(() => { + setTimeout(this.exportExcel1, 500) + }) + }, + exportExcel1() { + console.log(this.tableData1, 232332) + import('@/vendor/Export2Excel').then(excel => { + const tHeader = ['外协状态', '项目名称', '零件图号', '零件名称', '数量', '外协工序', '外协厂家', '外协单号', '外协日期'] + const filterVal = ['到货状态', '项目名称', '零件图号', '零件名称', '批次数量', '外协工序', '外协厂家名称', '表单号', '任务下达日期'] + const list = this.tableData1 + const data = this.formatJson(filterVal, list) + excel.export_json_to_excel({ + header: tHeader, + data, + filename: '外协零件表', + autoWidth: true, + bookType: 'xlsx' + }) + }) + }, + getTableData() { + // console.log(this.timer[0], 1) + // console.log(this.timer[1], 2) + this.tableData = [] + this.loading = true + let check, check1, check2 + this.supplierNameValue ? check = 1 : check = 0 + if (this.MaterialsValue !== '' && this.MaterialsValue !== null) { + check1 = 1 + } else { + check1 = 0 + } + // this.timer === null ? (check2 = 0, this.timer = '') : check2 = 1 + if (this.timer === null) { + this.timer = '' + console.log(this.timer, 123) + } + if (this.timer[1] === undefined || this.timer[0] === undefined || this.timer[1] === null || this.timer[0] === null) { + check2 = 0 + } else { + check2 = 1 + } + console.log(check2, 4564688) + searchTable(check, this.supplierNameValue, check1, this.MaterialsValue, check2, this.timer[0], this.timer[1], this.pageSize, this.pageCurrent).then(response => { for (let i = 0; i < response.data.rows.length; i++) { this.tableData.push({ 到货状态: response.data.rows[i].到货状态, @@ -143,6 +235,7 @@ export default { 表单号: response.data.rows[i].表单号, 工艺计划流水号: response.data.rows[i].工艺计划流水号, 单件是否外协: response.data.rows[i].单件是否外协, + 任务下达日期: response.data.rows[i].任务下达日期, 外协工序: '' }) } diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue index 9d46b708..71da21c7 100644 --- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue +++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue @@ -77,12 +77,23 @@ + + + + + + @@ -165,12 +176,23 @@ + + + + + + @@ -258,14 +280,27 @@ + + + + + +