diff --git a/src/api/Inventory/CreatePickingList.js b/src/api/Inventory/CreatePickingList.js index e4176c32..a42e8610 100644 --- a/src/api/Inventory/CreatePickingList.js +++ b/src/api/Inventory/CreatePickingList.js @@ -42,8 +42,8 @@ export function searchTable(...params) { data: { type: '1', name: '车间装配管理_领料单_三表_查询数据', - param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&名称_check=${params[4]}&名称=${params[5]}&型号_check=${params[6]}&型号=${params[7]}&规格_check=${params[8]}&规格=${params[9]}&领料情况_check=${params[10]}&领料情况=${params[11]}&零件类型=${params[14]}`, - Pagination: params[12] + '&' + params[13] + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&名称_check=${params[4]}&名称=${params[5]}&领料情况_check=${params[6]}&领料情况=${params[7]}&零件类型=${params[10]}`, + Pagination: params[8] + '&' + params[9] } }) } @@ -54,20 +54,20 @@ export function searchPart(...params) { data: { type: '1', name: '库存管理_离线外购件_出库查询', - param: `物料名称_check=${params[0]}&物料名称=${params[1]}&物料规格_check=${params[2]}&物料规格=${params[3]}&物料型号_check=${params[4]}&物料型号=${params[5]}`, - Pagination: params[6] + '&' + params[7] + param: `物料名称_check=${params[0]}&物料名称=${params[1]}`, + Pagination: params[2] + '&' + params[3] } }) } // 领料单查询 -export function searchList(pageCurrent, pageSize, listNumber_check, listNumber, isElectrical) { +export function searchList(pageCurrent, pageSize, listPeople_check, listPeople, isElectrical, check1, time1, time2) { return request({ url: '', method: 'post', data: { type: '1', name: '车间装配管理_领料单_查询数据', - param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber + '&是否电气=' + isElectrical, + param: '制单人_check=' + listPeople_check + '&制单人=' + listPeople + '&是否电气=' + isElectrical + '&时间段_check=' + check1 + '&开始时间=' + time1 + '&结束时间=' + time2, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/Inventory/MaterialOut.js b/src/api/Inventory/MaterialOut.js index 797881b9..81fd68f8 100644 --- a/src/api/Inventory/MaterialOut.js +++ b/src/api/Inventory/MaterialOut.js @@ -35,14 +35,14 @@ export function searchgroup(num) { }) } // 领料单查询 -export function searchList(pageCurrent, pageSize, listNumber_check, listNumber) { +export function searchList(pageCurrent, pageSize, listPeople_check, listPeople, check1, time1, time2) { return request({ url: '', method: 'post', data: { type: '1', name: '车间装配管理_领料单_查询数据', - param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber + '&是否审批=1', + param: '制单人_check=' + listPeople_check + '&制单人=' + listPeople + '&时间段_check=' + check1 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&是否审批=1', Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/ManufacturingCenter/ContractDetailsInquiry.js b/src/api/ManufacturingCenter/ContractDetailsInquiry.js index e69de29b..a4aa8bb5 100644 --- a/src/api/ManufacturingCenter/ContractDetailsInquiry.js +++ b/src/api/ManufacturingCenter/ContractDetailsInquiry.js @@ -0,0 +1,40 @@ +import request from '@/utils/request' + +// 初始化 项目名称 +export function initProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_项目名称_查询数据_总计划' + } + }) +} + +// 查询机床 +export function initMachine(projectNum) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床名称_查询数据2', + param: `项目流水号=${projectNum}` + } + }) +} + +// 查询项目详情 +export function searchatabledata(projectNum, machineValue, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '项目工时统计_合同详情查询_工时综合查询', + param: `项目流水号=${projectNum}&机床流水号=${machineValue}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js index 26bacdb0..b9c2393e 100644 --- a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js +++ b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js @@ -1,74 +1,38 @@ import request from '@/utils/request' -// 初始化 外协厂商 -export function initOutHelp() { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '车间生产管理工艺_基础表_外协厂家_查询数据' - } - }) -} // 查询表格数据 -export function searchtable(num2, ManufacturerName, num10, ManufacturerAbbreviation, num3, address, num4, roleName, phNumber, Fax, pageCurrent, pageSize) { +export function searchtable(check1, ManufacturerAbbreviation, check2, starttime, endTime, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', - name: '车间生产管理_外协加工任务单_查询数据_付款计划', - param: '外协加工任务单_check=0&外协加工任务单流水号=0&表单号_check=' + num2 + '&表单号=' + ManufacturerName + '&外协厂家_check=' + num10 + '&外协厂家=' + ManufacturerAbbreviation + '&任务下达日期时间_check=' + num3 + '&开始时间=' + address + '&结束时间=' + num4 + '&实际付款时间段_check=' + roleName + '&实际付款开始时间=' + phNumber + '&实际付款结束时间=' + Fax + '&外协计划员编号_check=0&外协计划员编号=0', + name: '车间生产管理工艺_外协付款_查询', + param: '外协厂家_check=' + check1 + '&外协厂家=' + ManufacturerAbbreviation + '&时间_check=' + check2 + '&开始时间=' + starttime + '&结束时间=' + endTime, Pagination: pageCurrent + '&' + pageSize } }) } -// 修改实际付款日期 -export function payTime(num, time) { - return request({ - url: '', - method: 'post', - data: { - type: '2', - name: '车间生产管理_外协加工任务单_修改数据_实际付款时间', - param: '外协加工任务单流水号=' + num + '&实际付款时间=' + time - } - }) -} -// 修改扣款数据、扣款说明 -export function WithdrawingEdit(num, quality, Explain) { - return request({ - url: '', - method: 'post', - data: { - type: '2', - name: '车间生产管理_外协扣款_编辑数据', - param: '外协加工任务单流水号=' + num + '&扣款_质量=' + quality + '&扣款说明=' + Explain - } - }) -} -// 单据状态： 1 未成交 2 成交 3 作废 -export function payment(num) { - return request({ - url: '', - method: 'post', - data: { - type: '2', - name: '车间生产管理_外协加工任务单_修改数据_作废', - param: '外协加工任务单流水号=' + num + '&单据状态=3' - } - }) -} -// 查询零件信息 -export function getParts(check, Number, pageCurrent, pageSize) { +export function getInvoice(Number, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', name: '车间生产管理工艺_外协发票管理_查询数据', - param: '外协厂家流水号_check=' + check + '&外协厂家流水号=' + Number + '=int', + param: '外协厂家流水号_check=1&外协厂家流水号=' + Number, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +export function getPayment(Number, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_外协付款记录_查询数据', + param: '外协厂家流水号=' + Number, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/Outsourcing/OutsourcingTaskExecution.js b/src/api/Outsourcing/OutsourcingTaskExecution.js index c267573e..39b5918c 100644 --- a/src/api/Outsourcing/OutsourcingTaskExecution.js +++ b/src/api/Outsourcing/OutsourcingTaskExecution.js @@ -12,14 +12,14 @@ export function initOutHelp() { }) } // 初始化获取已生成的外协加工任务单 -export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize, documentStatus, num3) { +export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize, documentStatus, num3, check) { return request({ url: '', method: 'post', data: { type: '1', - name: '车间生产管理_外协加工任务单_查询数据', - param: '外协加工任务单_check=0&外协加工任务单流水号=null&表单号_check=' + checked + '&表单号=' + contractNumber + '&外协厂家_check=' + checked1 + '&外协厂家=' + manufacturers + '&任务下达日期_时间段=' + checked2 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&单据状态_check=' + num3 + '&单据状态=' + documentStatus + '&外协员编号_check=0&外协员编号=' + num, + name: '车间生产管理_外协加工任务单_查询数据_2020', + param: '外协加工任务单_check=0&外协加工任务单流水号=null&表单号_check=' + checked + '&表单号=' + contractNumber + '&外协厂家_check=' + checked1 + '&外协厂家=' + manufacturers + '&任务下达日期_时间段=' + checked2 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&单据状态_check=' + num3 + '&单据状态=' + documentStatus + '&外协员编号_check=0&外协员编号=' + num + '&查询历史_check=' + check, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/WorkshopProcurement/OfflineProcurement.js b/src/api/WorkshopProcurement/OfflineProcurement.js index 5ff7f799..8d17501e 100644 --- a/src/api/WorkshopProcurement/OfflineProcurement.js +++ b/src/api/WorkshopProcurement/OfflineProcurement.js @@ -49,15 +49,14 @@ export function deletePurchaseOrder(PurchaseOrderNameValue) { }) } // 查询采购单 -export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check3, name2) { +export function searchPurchaseOrder(check1, num, check3, name2) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_离线采购计划_查询数据', - param: `离线采购计划编号_check=${check1}&离线采购计划编号=${num}&供应商流水号_check=${check3}&供应商流水号=${name2}`, - Pagination: pageCurrent + '&' + pageSize + param: `离线采购计划编号_check=${check1}&离线采购计划编号=${num}&供应商流水号_check=${check3}&供应商流水号=${name2}` } }) } @@ -109,15 +108,14 @@ export function getGroups(stepNumber) { }) } -export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, pageCurrent, pageSize, ordername, order) { +export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, ordername, order) { return request({ url: '', method: 'post', data: { type: '1', name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_横向赋值新建存储过程_新', - param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m + '&排序名称=' + ordername + '&排序方式=' + order, - Pagination: pageCurrent + '&' + pageSize + param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m + '&排序名称=' + ordername + '&排序方式=' + order } }) } diff --git a/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js b/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js index af080a0d..24fa5f45 100644 --- a/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js +++ b/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js @@ -13,27 +13,29 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c }) } // 查询备料 -export function searchTable(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, pageSize, pageCurrent) { +export function searchTable(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, check3, starttime, endtime, ordername, order, pageSize, pageCurrent) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_外购备料_综合查询数据', - param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue, + param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue + + '&下单时间_check=' + check3 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order, Pagination: pageCurrent + '&' + pageSize } }) } // 导出 -export function searchTablesheet(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, pageSize, pageCurrent) { +export function searchTablesheet(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, check3, starttime, endtime, ordername, order) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_外购备料_综合查询数据', - param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue + param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue + + '&下单时间_check=' + check3 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order } }) } diff --git a/src/assets/img/blueTWinkle.gif b/src/assets/img/blueTWinkle.gif new file mode 100644 index 00000000..42deff1d Binary files /dev/null and b/src/assets/img/blueTWinkle.gif differ diff --git a/src/assets/img/grayTwinkle.gif b/src/assets/img/grayTwinkle.gif new file mode 100644 index 00000000..9a11d358 Binary files /dev/null and b/src/assets/img/grayTwinkle.gif differ diff --git a/src/assets/img/greenTwinkle.gif b/src/assets/img/greenTwinkle.gif new file mode 100644 index 00000000..0dda29f2 Binary files /dev/null and b/src/assets/img/greenTwinkle.gif differ diff --git a/src/assets/img/yellowTwinkle.gif b/src/assets/img/yellowTwinkle.gif new file mode 100644 index 00000000..7e277d09 Binary files /dev/null and b/src/assets/img/yellowTwinkle.gif differ diff --git a/src/assets/img/设备监控.psd b/src/assets/img/设备监控.psd new file mode 100644 index 00000000..4b0d797b Binary files /dev/null and b/src/assets/img/设备监控.psd differ diff --git a/src/utils/curd.js b/src/utils/curd.js index 664ddb7e..5bbc55eb 100644 --- a/src/utils/curd.js +++ b/src/utils/curd.js @@ -5,6 +5,30 @@ Created by hedekun import { type } from './tool' // type判断传入值的类型，比typeof更详细 export default { install(Vue) { + Vue.prototype.CreateData = function(type, name, data, pageSize, pageList) { + var paramStr = '' + var paramarray = [] + if (data !== undefined) { + for (let i = 0; i < data.length; i++) { + paramarray.push({ + name: data[i][0], + value: data[i][1], + type: data[i][2], + output: data[i][3] + }) + } + paramStr = JSON.stringify(paramarray) + } + var obj = [] + obj[0] = {} + obj[0].type = type + obj[0].name = name + obj[0].param = paramStr + obj[0].pageSize = pageSize + obj[0].pageList = pageList + var numn = JSON.stringify(obj[0]) + return numn + } // 用于打开增加框，方法能重置表单，并使表单内容回到初始化状态。 // 传入参数 // 1）表单名称，字符串形式如'form'，必须 diff --git a/src/utils/request.js b/src/utils/request.js index 7d0dbbf6..1840b290 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -6,8 +6,6 @@ export const name1 = `OP1000` export const name3 = `OP2000` export const name4 = `OP9999` -// 创建axios实例 - export const readFile = `http://123.56.95.229:8010/webpage/file/` // invoice export const readImg = `http://123.56.95.229:8010/webpage/img/` // delivery/MS/performancebond export const upload = `http://123.56.95.229:8010/submit/uploadFile.ashx` // ContractInformationManagement diff --git a/src/views/Assembly/AssemblyQualityInspection/index.vue b/src/views/Assembly/AssemblyQualityInspection/index.vue index 50c4c7f8..602840bf 100644 --- a/src/views/Assembly/AssemblyQualityInspection/index.vue +++ b/src/views/Assembly/AssemblyQualityInspection/index.vue @@ -12,21 +12,21 @@
{{ item.name }}
- + - + - + - + @@ -78,6 +78,16 @@ {{ scope.row.检测项明细 }} + + + + + + - + @@ -90,7 +88,7 @@ {{ scope.row.组号 }} - + @@ -100,12 +98,12 @@ {{ scope.row.零件名称 }} - + - + @@ -115,22 +113,22 @@ {{ scope.row.工艺名称 }} - - - + + + + + - + - + @@ -155,7 +153,7 @@ {{ scope.row.备注 }} - + - 形位 + 形位 - + - 尺寸 + 尺寸 - + - 外观 + 外观 - + - + @@ -340,16 +348,16 @@ {{ scope.row.出库数量1 }} - - - + + + + + + @@ -358,7 +366,7 @@ - + @@ -384,7 +392,7 @@ - + { if (res.data[0].result === '1') { this.$message.success('操作成功') - this.pickingListNumber = '' this.searchList() } else { this.$message.error('操作失败') @@ -580,67 +588,68 @@ export default { }, // 标准件 searchTable0() { - let check1, check2, check3, check4, check5, check6 + let check1, check2, check3 this.machineNumberValue ? check1 = 1 : check1 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0 this.Name ? check3 = 1 : check3 = 0 - this.materialModel ? check4 = 1 : check4 = 0 - this.materialSpec ? check5 = 1 : check5 = 0 - if (this.PickingValue !== 0 && this.PickingValue !== 1) { - check6 = 0 + console.log(this.PickingValue, 111) + if (this.PickingValue === false) { + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 0, this.pageCurrent0, this.pageSize0, 1).then(response => { + this.tableData0 = response.data.rows + this.total0 = response.data.total + }) } else { - check6 = 1 + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 1, this.pageCurrent0, this.pageSize0, 1).then(response => { + this.tableData0 = response.data.rows + this.total0 = response.data.total + }) } - searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, check6, this.PickingValue, this.pageCurrent0, this.pageSize0, 1).then(response => { - this.tableData0 = response.data.rows - this.total0 = response.data.total - }) }, // 外购件 searchTable1() { - let check1, check2, check3, check4, check5, check6 + let check1, check2, check3 this.machineNumberValue ? check1 = 1 : check1 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0 this.Name ? check3 = 1 : check3 = 0 - this.materialModel ? check4 = 1 : check4 = 0 - this.materialSpec ? check5 = 1 : check5 = 0 - if (this.PickingValue !== 0 && this.PickingValue !== 1) { - check6 = 0 + console.log(this.PickingValue, 111) + if (this.PickingValue === false) { + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 0, this.pageCurrent1, this.pageSize1, 2).then(response => { + this.tableData0 = response.data.rows + this.total0 = response.data.total + }) } else { - check6 = 1 + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 1, this.pageCurrent1, this.pageSize1, 2).then(response => { + this.tableData0 = response.data.rows + this.total0 = response.data.total + }) } - searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, check6, this.PickingValue, this.pageCurrent1, this.pageSize1, 2).then(response => { - this.tableData1 = response.data.rows - this.total1 = response.data.total - }) }, // 基本件 searchTable2() { - let check1, check2, check3, check4, check5, check6 + let check1, check2, check3 this.machineNumberValue ? check1 = 1 : check1 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0 this.Name ? check3 = 1 : check3 = 0 - this.materialModel ? check4 = 1 : check4 = 0 - this.materialSpec ? check5 = 1 : check5 = 0 - if (this.PickingValue !== 0 && this.PickingValue !== 1) { - check6 = 0 + console.log(this.PickingValue, 111) + if (this.PickingValue === false) { + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 0, this.pageCurrent2, this.pageSize2, 3).then(response => { + this.tableData0 = response.data.rows + this.total0 = response.data.total + }) } else { - check6 = 1 + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 1, this.pageCurrent2, this.pageSize2, 3).then(response => { + this.tableData0 = response.data.rows + this.total0 = response.data.total + }) } - searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, check6, this.PickingValue, this.pageCurrent2, this.pageSize2, 3).then(response => { - this.tableData2 = response.data.rows - this.total2 = response.data.total - }) }, // 离线采购件 searchTable4() { this.listLoading = true this.tableDataBasic = [] - let check1, check2, check3 + let check1 this.Name ? check1 = 1 : check1 = 0 - this.materialSpec ? check2 = 1 : check2 = 0 - this.materialModel ? check3 = 1 : check3 = 0 - searchPart(check1, this.Name, check2, this.materialSpec, check3, this.materialModel, this.pageCurrent4, this.pageSize4).then(response => { + searchPart(check1, this.Name, this.pageCurrent4, this.pageSize4).then(response => { this.tableDataBasic = response.data.rows this.total4 = response.data.total this.listLoading = false @@ -689,10 +698,11 @@ export default { }, // 查询领料单列表 searchList() { - let check, isElectrical - this.pickingListNumber ? check = 1 : check = 0 + let check, isElectrical, check1 + this.pickingListPeople ? check = 1 : check = 0 + this.startTime ? check1 = 1 : (check1 = 0, this.startTime = '') Number(this.token) === 37 || Number(this.token) === 36 || Number(this.token) === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长 37电气副部长 - searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber, isElectrical).then(response => { + searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListPeople, isElectrical, check1, this.startTime[0], this.startTime[1]).then(response => { this.pickListTable1 = response.data.rows this.total3 = response.data.total }) @@ -754,7 +764,6 @@ export default { request(param).then(res => { if (res.data[0].result === '1') { this.$message.success('操作成功') - this.pickingListNumber = '' this.searchList() } else { this.$message.error('操作失败') @@ -793,6 +802,9 @@ export default { handleSelectionChange(val) { this.multipleSelection = val }, + handleSelectionChange1(val) { + this.multipleSelection1 = val + }, // 选入 selectInto() { if (this.PartType === '离线采购件') { diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue index b730652a..b9199e7f 100644 --- a/src/views/Inventory/MaterialOut/index.vue +++ b/src/views/Inventory/MaterialOut/index.vue @@ -4,7 +4,7 @@
领料单编号: - 查询 + 查询 领料确认
diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue index 57c42f58..dd0f8609 100644 --- a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue +++ b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue @@ -17,106 +17,111 @@ :label="item.label" :value="item.value"/> - 分组 - - - - 规格及型号 - + + + + + + + + + + 加工总工时（小时）: 计划总工时（小时）: - 查询 + 查询 - - + + - + - + - + - + - + - + - + - + - + - - - - + - + - + - + +
+ +
+ + diff --git a/src/views/WorkshopProcurement/OfflineProcurement/index.vue b/src/views/WorkshopProcurement/OfflineProcurement/index.vue index c81b7196..a749ec80 100644 --- a/src/views/WorkshopProcurement/OfflineProcurement/index.vue +++ b/src/views/WorkshopProcurement/OfflineProcurement/index.vue @@ -58,30 +58,30 @@ -
- -
+ + + + + + + + + + + 离线备料单号: 供应商: - + - 查询 + 查询 创建采购计划单 @@ -137,17 +137,17 @@ -
- -
+ + + + + + + + + + + @@ -402,7 +402,7 @@ export default { }) } }) - this.getTableData() + // this.getTableData() } }, // 获取组号 getGroup() { @@ -415,7 +415,7 @@ export default { value: response.data[i].组件流水号 }) } - this.Group = response.data[0].组件流水号 + // this.Group = response.data[0].组件流水号 }) this.getTableData() }, @@ -442,6 +442,10 @@ export default { // 按条件查询 getTableData() { this.tableData10 = [] + if (!this.Machine && !this.Group && !this.number) { + this.$message.error('请输入筛选条件！') + return + } if (this.Machine === '') { this.checkbox_Machine = 0 } else { @@ -457,21 +461,20 @@ export default { } else { this.checkbox_number = 1 } - getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, '', '', this.pageCurrent10, this.pageSize10, this.ordername, this.order).then(response => { - if (response.data.rows.length !== 0) { - for (let i = 0; i < response.data.rows.length; i++) { + getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, '', '', this.ordername, this.order).then(response => { + if (response.data.length !== 0) { + for (let i = 0; i < response.data.length; i++) { this.tableData10.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[i].工艺计划流水号, + 机床图号: response.data[i].机床图号, + 组号: response.data[i].组号, + 零件图号: response.data[i].零件图号, + 零件名称: response.data[i].零件名称, + 批次数量: response.data[i].批次数量, + 材料: response.data[i].材料 }) } } - this.total10 = response.data.total this.loading = false }) }, @@ -492,11 +495,16 @@ export default { } }, searchTable() { + this.tableData = [] + if (!this.purchasingOrder && !this.supplierName) { + this.$message.error('请输入筛选条件！') + return + } this.purchasingOrder ? this.check3 = 1 : this.check3 = 0 this.supplierName ? this.check4 = 1 : this.check4 = 0 - searchPurchaseOrder(this.pageCurrent2, this.pageSize2, this.check3, this.purchasingOrder, this.check4, this.supplierName).then(response => { - this.tableData = response.data.rows - this.total2 = response.data.total + searchPurchaseOrder(this.check3, this.purchasingOrder, this.check4, this.supplierName).then(response => { + this.tableData = response.data + // this.total2 = response.data.total }) }, handleSizeChange2(val) { // 采购单列表分页 diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue index ba585e0b..2d16abbb 100644 --- a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue +++ b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue @@ -1,6 +1,6 @@ - + @@ -122,6 +144,37 @@ export default { name: 'Index', data() { return { + ordername: '', + order: '', + dateRange: '', + expands: [], + pickerOptions: { + shortcuts: [{ + text: '上季度', + onClick(picker) { + const end = new Date() + const start = new Date() + start.setTime(end.getTime() - 3600 * 1000 * 24 * 30 * 3) + picker.$emit('pick', [start, end]) + } + }, { + text: '过去半年', + onClick(picker) { + const end = new Date() + const start = new Date() + start.setTime(end.getTime() - 3600 * 1000 * 24 * 366 / 2) + picker.$emit('pick', [start, end]) + } + }, { + text: '过去一年', + onClick(picker) { + const end = new Date() + const start = new Date() + start.setTime(end.getTime() - 3600 * 1000 * 24 * 365) + picker.$emit('pick', [start, end]) + } + }] + }, supplierNameValue: '', supplierNames: [], partNumber: '', @@ -145,7 +198,7 @@ export default { }, created() { this.fetchData() - this.getTableData() + // this.getTableData() }, methods: { formatJson(filterVal, jsonData) { @@ -154,7 +207,8 @@ export default { })) }, exportExcel() { - let check, check1, check2 + let check, check1, check2, check3 + this.dateRange ? check3 = 1 : (check3 = 0, this.dateRange = '') this.supplierNameValue ? check = 1 : check = 0 this.partNumber ? check1 = 1 : check1 = 0 if (this.MaterialsValue !== '' && this.MaterialsValue !== null) { @@ -162,11 +216,11 @@ export default { } else { check2 = 0 } - searchTablesheet(check, this.supplierNameValue, check1, this.partNumber, check2, this.MaterialsValue).then(res => { + searchTablesheet(check, this.supplierNameValue, check1, this.partNumber, check2, this.MaterialsValue, check3, this.dateRange[0], this.dateRange[1], this.ordername, this.order).then(res => { console.log(res.data, 11) import('@/vendor/Export2Excel').then(excel => { - const tHeader = ['备料状态', '供应商', '物料编码', '物料名称', '材料', '备件件数', '备料时间', '到货件数', '到货时间', '结算时间'] - const filterVal = ['是否到货', '供应商名称', '物料编码', '零件名称', '材料', '采购数量', '下单日期', '到货数量', '日期', '开票时间'] + const tHeader = ['备料状态', '供应商', '物料编码', '物料名称', '材料', '备料件数', '备料时间', '到货件数', '到货时间', '结算时间'] + const filterVal = ['备料状态', '供应商名称', '物料编码', '零件名称', '材料', '采购数量', '下单日期', '到货数量', '日期', '开票时间'] const list = res.data const data = this.formatJson(filterVal, list) excel.export_json_to_excel({ @@ -189,9 +243,31 @@ export default { } }) }, + // 按供应商名称，下单日期，零件名称，材料 + sortChange(column) { + console.log(column + '-' + column.prop + '-' + column.order, 11111) + if (column.prop === '供应商名称') { + this.ordername = 1 + } else if (column.prop === '零件名称') { + this.ordername = 2 + } else if (column.prop === '材料') { + this.ordername = 3 + } else if (column.prop === '下单日期') { + this.ordername = 4 + } else { + this.ordername = '' + } + if (column.order === 'ascending') { + this.order = 1 + } else if (column.order === 'descending') { this.order = 2 } else { + this.order = '' + } + this.getTableData() + }, getTableData() { this.loading = true - let check, check1, check2 + let check, check1, check2, check3 + this.dateRange ? check3 = 1 : (check3 = 0, this.dateRange = '') this.supplierNameValue ? check = 1 : check = 0 this.partNumber ? check1 = 1 : check1 = 0 if (this.MaterialsValue !== '' && this.MaterialsValue !== null) { @@ -199,8 +275,8 @@ export default { } else { check2 = 0 } - console.log(this.MaterialsValue, check2, 123) - searchTable(check, this.supplierNameValue, check1, this.partNumber, check2, this.MaterialsValue, this.pageSize, this.pageCurrent).then(response => { + searchTable(check, this.supplierNameValue, check1, this.partNumber, check2, this.MaterialsValue, check3, this.dateRange[0], this.dateRange[1], this.ordername, this.order, this.pageSize, this.pageCurrent).then(response => { + console.log(response) this.tableData = response.data.rows this.total = response.data.total this.loading = false diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue index 0790b283..83587c30 100644 --- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue +++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue @@ -300,7 +300,7 @@ export default { this.searchTable1() }, requestFund() { // 请款 - this.searchTable01() + // this.searchTable01() this.dialogVisible2 = true this.supplierValue = '' this.fetchData() // 重新获取供应商 @@ -333,7 +333,7 @@ export default { } else { this.$message.error('请款失败') } }) } else { - this.$message.error('请选择需要请款的合同') + this.$message.error('请选择供应商及对应请款合同') } }, searchTable02(row) { // 查看详情（请款信息包含的合同）