diff --git a/src/api/Assembly/AssemblyQualityInspection.js b/src/api/Assembly/AssemblyQualityInspection.js index 7644efc4..b6647b03 100644 --- a/src/api/Assembly/AssemblyQualityInspection.js +++ b/src/api/Assembly/AssemblyQualityInspection.js @@ -35,7 +35,7 @@ export function searchgroup(num) { }) } // 质检管理_质量情况_查询数据 -export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, pageCurrent, pageSize) { +export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4) { return request({ url: '', method: 'post', @@ -43,8 +43,7 @@ export function selecttable(check1, value1, check2, value2, check3, value3, chec type: '1', name: '质检管理_装配质检_质检情况_查询数据', param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&检测项_check=' + check3 + '&检测项流水号=' + value3 + - '&质检情况_check=' + check4 + '&质检情况=' + value4, - Pagination: pageCurrent + '&' + pageSize + '&质检情况_check=' + check4 + '&质检情况=' + value4 } }) } diff --git a/src/api/Assembly/QualityInspectionInformationInquiry.js b/src/api/Assembly/QualityInspectionInformationInquiry.js index cf9639fd..c38ed0fb 100644 --- a/src/api/Assembly/QualityInspectionInformationInquiry.js +++ b/src/api/Assembly/QualityInspectionInformationInquiry.js @@ -95,25 +95,23 @@ export function searchTableDetail(...params) { } }) } -export function searchData(pageSize, pageCurrent) { +export function searchData() { return request({ url: '', method: 'post', data: { type: '1', - name: '车间生产管理工艺_加工顺序调整_查询正在加工零件工序_NEW', - Pagination: pageCurrent + '&' + pageSize + name: '车间生产管理工艺_加工顺序调整_查询正在加工零件工序_NEW' } }) } -export function searchData1(pageSize, pageCurrent) { +export function searchData1() { return request({ url: '', method: 'post', data: { type: '1', - name: 'MES_机加工MES_记录零件待加工显示_NEW', - Pagination: pageCurrent + '&' + pageSize + name: 'MES_机加工MES_记录零件待加工显示_NEW' } }) } diff --git a/src/api/BasicData/PartsNumberMaintenance.js b/src/api/BasicData/PartsNumberMaintenance.js index 1233566a..f730742e 100644 --- a/src/api/BasicData/PartsNumberMaintenance.js +++ b/src/api/BasicData/PartsNumberMaintenance.js @@ -34,27 +34,25 @@ export function groupSelect(machineValue) { } }) } -export function searchTable5(pageCurrent, pageSize, projectCheck, project, machineCheck, machine, groupCheck, group) { +export function searchTable5(projectCheck, project, machineCheck, machine, groupCheck, group) { return request({ url: '', method: 'post', data: { type: '1', name: 'PDM_零件明细表_外购件和标准件_临时表数据查询', - param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}`, - Pagination: pageCurrent + '&' + pageSize + param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}` } }) } -export function searchTable6(pageCurrent, pageSize, projectCheck, project, machineCheck, machine, groupCheck, group) { +export function searchTable6(projectCheck, project, machineCheck, machine, groupCheck, group) { return request({ url: '', method: 'post', data: { type: '1', name: 'PDM_零件明细表_基本件_临时表数据查询', - param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}`, - Pagination: pageCurrent + '&' + pageSize + param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}` } }) } @@ -70,27 +68,25 @@ export function searchTable7(pageCurrent, pageSize, projectCheck, project, machi } }) } -export function basicPartsData(project_check, project, machine_check, machine, group_check, group, pageSize, pageCurrent) { +export function basicPartsData(project_check, project, machine_check, machine, group_check, group) { return request({ url: '', method: 'post', data: { type: '1', name: 'PDM_零件明细表_基本件_查询数据_综合gj', - param: `项目流水号_check=${project_check}&项目流水号=${project}&机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}`, - Pagination: pageCurrent + '&' + pageSize + param: `项目流水号_check=${project_check}&项目流水号=${project}&机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}` } }) } -export function purchasePartsData(num, pageCurrent, pageSize) { +export function purchasePartsData(num) { return request({ url: '', method: 'post', data: { type: '1', name: 'PDM_零件明细表_标准件和外购件_查询数据', - param: `组件流水号=${num}`, - pagination: pageCurrent + '&' + pageSize + param: `组件流水号=${num}` } }) } @@ -204,15 +200,14 @@ export function editBasicParts(num, num1) { } }) } -export function getTable(num, pageList, pageSize) { +export function getTable(num) { return request({ url: '', method: 'post', data: { type: '1', name: '车间生产管理工艺_零件工艺计划_已投产_按组查', - param: '组件流水号=' + num + '=int', - Pagination: pageList + '&' + pageSize + param: '组件流水号=' + num + '=int' } }) } @@ -227,15 +222,14 @@ export function editProductNum(num, num1) { } }) } -export function getTable1(num, a, b, c, d, e, f, g, pageList, pageSize) { +export function getTable1(num, a, b, c, d, e, f, g) { return request({ url: '', method: 'post', data: { type: '1', name: '车间生产管理工艺_新排产算法_能力平衡_查询数据_要平衡的零件', - param: '项目流水号_check=' + num + '=string&项目流水号=' + a + '=int&机床流水号_check=' + b + '=string&机床流水号=' + c + '=int&组件流水号_check=' + d + '=string&组件流水号=' + e + '=int&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=1=int&考核状态=5=int', - Pagination: pageList + '&' + pageSize + param: '项目流水号_check=' + num + '=string&项目流水号=' + a + '=int&机床流水号_check=' + b + '=string&机床流水号=' + c + '=int&组件流水号_check=' + d + '=string&组件流水号=' + e + '=int&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=1=int&考核状态=5=int' } }) } @@ -258,8 +252,7 @@ export function searchTable1(...params) { data: { type: '1', name: '采购管理_采购部采购_查询物料_数量维护', - param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&机床流水号_check=${params[4]}&机床流水号=${params[5]}&组件流水号_check=${params[6]}&组件流水号=${params[7]}&物料状态=1`, - Pagination: params[0] + '&' + params[1] + param: `项目流水号_check=${params[0]}&项目流水号=${params[1]}&机床流水号_check=${params[2]}&机床流水号=${params[3]}&组件流水号_check=${params[4]}&组件流水号=${params[5]}&物料状态=1` } }) } @@ -271,8 +264,7 @@ export function searchTable2(...params) { data: { type: '1', name: '采购管理_采购部采购_查询物料_基本件_数量维护', - param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&机床流水号_check=${params[4]}&机床流水号=${params[5]}&组件流水号_check=${params[6]}&组件流水号=${params[7]}&物料状态=1`, - Pagination: params[0] + '&' + params[1] + param: `项目流水号_check=${params[0]}&项目流水号=${params[1]}&机床流水号_check=${params[2]}&机床流水号=${params[3]}&组件流水号_check=${params[4]}&组件流水号=${params[5]}&物料状态=1` } }) } diff --git a/src/api/BasicData/SystemRrolemaintenance.js b/src/api/BasicData/SystemRrolemaintenance.js index df3b93e5..c7d85663 100644 --- a/src/api/BasicData/SystemRrolemaintenance.js +++ b/src/api/BasicData/SystemRrolemaintenance.js @@ -1,13 +1,12 @@ import request from '@/utils/request' -export function InitRolefunction(pageCurrent, pageSize) { +export function InitRolefunction() { return request({ url: '', method: 'post', data: { type: '1', - name: '菜单系统模块_项目角色_查询数据_MESWORK', - Pagination: pageCurrent + '&' + pageSize + name: '菜单系统模块_项目角色_查询数据_MESWORK' } }) } diff --git a/src/api/BasicData/WorkshopPersonnelRoleMana.js b/src/api/BasicData/WorkshopPersonnelRoleMana.js index d287983e..c3b5d0f0 100644 --- a/src/api/BasicData/WorkshopPersonnelRoleMana.js +++ b/src/api/BasicData/WorkshopPersonnelRoleMana.js @@ -136,15 +136,14 @@ export function initOrderType() { } }) } -export function searchTable(check1, staffName, check2, systemAdministrator, pageCurrent, pageSize) { +export function searchTable(check1, staffName, check2, systemAdministrator) { return request({ url: '', method: 'post', data: { type: '1', name: '菜单系统模块_项目角色员工综合_查询数据', - param: '姓名_check=' + check1 + '=int&姓名=' + staffName + '=string&角色编号_check=' + check2 + ' =int&角色编号=' + systemAdministrator + '=int', - Pagination: pageCurrent + '&' + pageSize + param: '姓名_check=' + check1 + '=int&姓名=' + staffName + '=string&角色编号_check=' + check2 + ' =int&角色编号=' + systemAdministrator + '=int' } }) } diff --git a/src/api/ManufacturingCenter/ActualWorkQuery.js b/src/api/ManufacturingCenter/ActualWorkQuery.js new file mode 100644 index 00000000..dd40a1b1 --- /dev/null +++ b/src/api/ManufacturingCenter/ActualWorkQuery.js @@ -0,0 +1,14 @@ +import request from '@/utils/request' +// 查询加工工时统计表 +export function searchTable(num1, num2, num3, num4, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_工时统计_当日过程工时查询', + param: `加工开始时间_check=${num1}&加工开始时间=${num2}&工作者姓名_check=${num3}&工作者姓名=${num4}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/api/ManufacturingCenter/EquipmentConditionAnalysis.js b/src/api/ManufacturingCenter/EquipmentConditionAnalysis.js index 9d5837f6..b9da9f53 100644 --- a/src/api/ManufacturingCenter/EquipmentConditionAnalysis.js +++ b/src/api/ManufacturingCenter/EquipmentConditionAnalysis.js @@ -1,14 +1,13 @@ import request from '@/utils/request' -export function getData(num, num1, pageCurrent, pageSize) { +export function getData(num, num1) { return request({ url: '', method: 'post', data: { type: '1', name: '车间生产管理_设备运行情况_查询数据', - param: '工位号=' + num + '&日期=' + num1, - pagination: pageCurrent + '&' + pageSize + param: '工位号=' + num + '&日期=' + num1 } }) } diff --git a/src/api/ManufacturingCenter/GroupMatching.js b/src/api/ManufacturingCenter/GroupMatching.js index 582033f8..bc448266 100644 --- a/src/api/ManufacturingCenter/GroupMatching.js +++ b/src/api/ManufacturingCenter/GroupMatching.js @@ -98,8 +98,8 @@ export function searchTable01(...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]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}`, + Pagination: params[4] + '&' + params[5] } }) } diff --git a/src/api/ManufacturingCenter/ManHourStatistics.js b/src/api/ManufacturingCenter/ManHourStatistics.js new file mode 100644 index 00000000..2655363b --- /dev/null +++ b/src/api/ManufacturingCenter/ManHourStatistics.js @@ -0,0 +1,25 @@ +import request from '@/utils/request' + +// 查询人员总工工时 +export function searchtable(num1, num2, num3, num4, num5) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_工时统计_查询数据2', + param: '操作者_check=' + num1 + '&姓名=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5 + } + }) +} +export function searchTable2(pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: 'SELECT 零件图号,零件名称,工序顺序,工艺名称,单件定额工时,准结定额工时 FROM 车间生产管理工艺_零件工序_视图 where 工艺编号 is not null and 工艺计划流水号 = 1235', + pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/api/ManufacturingCenter/ProcessPlanningNew.js b/src/api/ManufacturingCenter/ProcessPlanningNew.js new file mode 100644 index 00000000..c4da0966 --- /dev/null +++ b/src/api/ManufacturingCenter/ProcessPlanningNew.js @@ -0,0 +1,539 @@ +import request from '@/utils/request' + +// 查询零件未编制（包含借用件） +export function getPartnames3(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工艺计划_编制工艺_按人员机床组号或图号查', + param: '工艺人员编号=' + num1 + '&机床组号或图号=' + num2 + } + }) +} +// 查询零件已编制（包含借用件） +export function getPartnames4(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工艺计划_查询已完成工艺制定零件_按人员机床组号或图号查', + param: '工艺人员编号=' + num1 + '&机床组号或图号=' + num2 + } + }) +} +// 典艺查询<高精原有数据> +export function searchProcess11(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_原零件工艺查询_MESWORK', + param: '零件图号=' + num + } + }) +} +// 典艺查询<高精原有数据> +export function numChange(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_原零件工艺明细查询_MESWORK', + param: '典艺流水号=' + num + } + }) +} +// 保存主表工艺 +export function selectRequest(num0, num1, num2, num3, request0) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_修改数据_根据工序流水号和工艺计划流水号', + param: '工序流水号=' + num0 + '&工艺计划流水号=' + num1 + '&工艺编号=' + num2 + '&工艺顺序=' + num3 + '&工艺要求=' + request0 + } + }) +} +// 初始化 工艺员A +export function initCraftmen() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + param: '考核部门编号=20' + } + }) +} +// 查询 未编制 零件号 +export function getPartnames1(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工艺计划_编制工艺_按人员查', + param: '工艺人员编号=' + num1 + '&零件图号=' + num2 + } + }) +} +// 初始化 已编制 零件号 +export function getPartnames2(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工艺计划_查询已完成工艺制定零件', + param: '工艺人员编号=' + num1 + '&零件图号=' + num2 + } + }) +} +// 零件详细信息 +export function detailInfo(serialNum) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工艺计划_查已投产零件信息', + param: '工艺计划流水号=' + serialNum + '=int' + } + }) +} +// 初始化材质 +export function getMaterial(pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_材质表_查询数据', + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 根据材质名称查材质 +export function searchMaterial(pageCurrent, pageSize, name) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_材质表_查询数据_根据材料名称', + param: '材料名称=' + name, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 典型工艺选择零件分类A +export function typicalProcess() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_基础表_典型工艺名称_分类_查询数据' + } + }) +} +// 典型工艺选择零件名称、工艺号、备注 +export function FcK(serialNum) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_基础表_典型工艺名称_查询数据_查典型工艺名称', + param: '典型工艺名称分类流水号=' + serialNum + '=int' + } + }) +} +// 典型工艺查询 +export function searchProcess(check1, a, check2, b, check3, c) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_基础表_典型工艺名称_查询数据_综合查询', + param: '典型工艺名称分类流水号_check=' + check1 + '=bit&典型工艺名称分类流水号=' + a + '=int&典型工艺流水号_check=' + check2 + '=bit&典型工艺流水号=' + b + '=int&典型工艺流水号1_check=' + check3 + '=bit&典型工艺流水号1=' + c + '=int' + } + }) +} +// 初始化工艺名称 +export function processNameClick() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_基础表_工艺分类名称_查询数据_零件工艺制定专用' + } + }) +} +// 工艺名称查询 +export function processNameSelect(val) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_基础表_工艺名称_查询数据', + param: '工艺分类流水号_check=1=bit&工艺分类流水号=' + val + '=int' + } + }) +} +// 工艺要求查询 +export function processRequestSelect(val) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理_基础表_工艺要求_查询数据', + param: '工艺编号=' + val + '=int' + } + }) +} +// 初始化公差A +export function initTolerance() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_基础表_公差对照表_查询数据' + } + }) +} +// 公差查询 +export function searchTolerance(val1, val2) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_基础表_公差对照表_公差_查询数据', + param: '输入数值=' + val1 + '&参数=' + val2 + } + }) +} +// 工艺定额人员查询 +export function initPerson() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + param: '考核部门编号=9' + } + }) +} +// 完艺工艺查询 +export function searchWYgongyi(check1, tuhao, check2, bianhao, check3, start, end, check4, name) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工艺计划_查询数据_根据零件图号查询已投产的工艺计划流水号', + param: '零件图号_check=' + check1 + '&零件图号=' + tuhao + '&工艺员编号_check=' + check2 + '&工艺员编号=' + bianhao + '&工艺时间_check=' + check3 + '&工艺开始时间=' + start + '=datetime&工艺结束时间=' + end + '=datetime&零件名称_check=' + check4 + '&零件名称=' + name + } + }) +} +// 完艺工艺要求查询 +export function gongyiYQ(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工艺计划_查询数据', + param: '工艺计划流水号=' + num + } + }) +} +// 完艺工艺拷贝 +export function gongyiCopy(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工序_工艺拷贝_工艺计划流水号', + param: '工艺计划流水号_完成工艺=' + num1 + '=int&工艺计划流水号_被拷工艺=' + num2 + '=int' + } + }) +} +// 主界面选择零件号查主表 +export function mainTable(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工序_查询工序信息', + param: '工艺计划流水号=' + num + '=int' + } + }) +} +// 主界面主表难度等级修改 +export function hardEdit(num, hard) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_修改数据_工艺难度等级', + param: '工序流水号=' + num + '=int&工艺难度等级=' + hard + } + }) +} +// 主界面主表工艺要求修改 +export function requestEdit(num, request0) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_修改数据_工艺要求_根据工序流水号', + param: '工序流水号=' + num + '=int&工艺要求=' + request0 + } + }) +} +// 主界面主表插入功能 +export function insertOne(num0, num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_修改数据_工艺计划流水号和工序流水号', + param: '工艺计划流水号=' + num0 + '=int&工序流水号=' + num1 + '=int' + } + }) +} +// 主界面主表删除功能 +export function deleteOne(num0, num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_删除数据_工序流水号', + param: '工艺计划流水号=' + num0 + '=int&工序流水号=' + num1 + '=int' + } + }) +} +// 主界面主表上移功能 +export function upOne(num0, num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_修改数据_上移工序', + param: '工艺计划流水号=' + num0 + '=int&工序流水号=' + num1 + '=int' + } + }) +} +// 主界面主表下移功能 +export function downOne(num0, num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_修改数据_下移工序', + param: '工艺计划流水号=' + num0 + '=int&工序流水号=' + num1 + '=int' + } + }) +} +// 保存变更材质 +export function saveMaterial(num0, num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工艺计划_修改零件材料', + param: '工艺计划流水号=' + num0 + '&材料流水号=' + num1 + } + }) +} +// 核准保存 +export function saveApprove(num0, num1, request0, spec, num2, outhelp, num3, num4, weight, area, num5, level) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_增加数据_同时修改工艺计划', + param: '工艺计划流水号=' + num0 + '&工艺编号=' + num1 + '&工艺要求=' + request0 + '&原材料规格=' + spec + '&工序顺序=' + num2 + '&工序间是否外协=' + outhelp + '&工序流水号=' + num3 + '&材料流水号=' + num4 + '&重量=' + weight + '&面积=' + area + '&工艺人员编号=' + num5 + '&工艺难度等级=' + level + } + }) +} + +// 粘贴 +export function pasteTable(oldNum, newNum) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工艺计划_拷贝零件工艺', + param: '工艺计划流水号旧=' + oldNum + '&工艺计划流水号新=' + newNum + } + }) +} +// 删除 +export function deleteTable(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_删除零件工艺', + param: '工艺计划流水号=' + num + } + }) +} +// 在制零件工艺修改 +export function returnEdit(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_在制零件工艺调整_修改工艺', + param: '工艺计划流水号=' + num + } + }) +} +// 查询工艺记录 +export function searchRecord(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_在制零件工艺调整_查询工艺', + param: '工艺计划流水号=' + num + } + }) +} +// 重量拷贝 +export function WeightCopy(num, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_重量拷贝_工艺计划流水号', + param: '工艺计划流水号=' + num + '&重量信息=' + num2 + } + }) +} +// 保存变更材质 +export function saveWeight(num0, num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工艺计划_修改零件重量', + param: '工艺计划流水号=' + num0 + '&重量=' + num1 + } + }) +} +// 单件工时改变 +export function singleChange(val1, val2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_单件准结定额_修改数据', + param: '工序流水号=' + val1 + '&单件定额工时=' + val2 + } + }) +} +// 准结工时改变 +export function readyChange(val1, val2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_单件准结定额_修改数据', + param: '工序流水号=' + val1 + '&准结定额工时=' + val2 + } + }) +} +// 未编制定额保存 +export function TableAddLi1(a, b) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_定额任务分配_保存数据', + param: '工艺计划流水号=' + a + '=string&人员编号=' + b + '=string' + } + }) +} +// 已编制定额保存 +export function TableAddLi(a, b, c, num0, num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_增加数据_修改数据', + param: '单件定额工时=' + a + '=string&准结定额工时=' + b + '=string&零件图号=' + c + '=string&工序流水号=' + num0 + '=int&工艺计划流水号=' + num1 + '=int' + } + }) +} +// 修改备注 +export function modifyRemark(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工艺计划_工艺修改记录_增加数据', + param: `修改人员编号=${params[0]}&修改备注=${params[1]}&工艺计划流水号=${params[2]}` + } + }) +} +export function editGongyi(num, num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_修改数据_2027zdyNew', + param: `工艺计划流水号=${num}&工艺编号=${num1}` + } + }) +} +export function dropGongyi(num, num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_删除数据_2027zdyNew', + param: `工艺计划流水号=${num}&工序流水号=${num1}` + } + }) +} diff --git a/src/api/ManufacturingCenter/ProcessingStatusNew.js b/src/api/ManufacturingCenter/ProcessingStatusNew.js new file mode 100644 index 00000000..4f33aa89 --- /dev/null +++ b/src/api/ManufacturingCenter/ProcessingStatusNew.js @@ -0,0 +1,51 @@ +import request from '@/utils/request' + +// 机床名称 +export function getMachines() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_机床名称_根据机床查询', + param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int' + } + }) +} +// 获取组号 +export function getGroups(stepNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组', + param: '机床流水号=' + stepNumber + '=int' + } + }) +} +export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, pageCurrent, pageSize) { + 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, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 获取组号 +export function gettabledata1(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_加工进度查询_查询_New', + param: '工艺计划流水号=' + num + '=int' + } + }) +} + diff --git a/src/api/ManufacturingCenter/ScheduleCompletionDetails.js b/src/api/ManufacturingCenter/ScheduleCompletionDetails.js new file mode 100644 index 00000000..c06d4713 --- /dev/null +++ b/src/api/ManufacturingCenter/ScheduleCompletionDetails.js @@ -0,0 +1,28 @@ +import request from '@/utils/request' + +// 查询人员总工工时 +export function searchtable(num2, num3, num4, num5, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_工时统计_查询数据2_新', + param: '操作者_check=0&姓名=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询人员具体工序 +export function searchtable2(num1, num2, num3, num4, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_工时统计按人员查询_查询数据2_新', + param: '工作者编号=' + num1 + '&时间_check=' + num2 + '&开始时间=' + num3 + '&结束时间=' + num4, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/api/ManufacturingCenter/ShopScheduling.js b/src/api/ManufacturingCenter/ShopScheduling.js new file mode 100644 index 00000000..5cadceb2 --- /dev/null +++ b/src/api/ManufacturingCenter/ShopScheduling.js @@ -0,0 +1,86 @@ +import request from '@/utils/request' + +// 初始化工艺 +export function getPerson() { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: 'SELECT 姓名,人员编号 FROM 人事档案管理_人员名单 inner join dbo.人事档案管理_基础表_部门 on 人事档案管理_人员名单.考核部门编号=人事档案管理_基础表_部门.考核部门编号 where 人事档案管理_人员名单.考核部门编号=12 and 人员编号 <> 82 order by 姓名 ' + } + }) +} +export function getParts(pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_车间排产_零件查询', + Pagination: pageCurrent + '&' + pageSize + } + }) +} +export function getGongxu(num) { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: `select 姓名,排产时间,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态 from dbo.车间生产管理工艺_插件排产查询_视图 where 工艺编号 is not null and 工艺编号<>0 and 考核状态 = 6 and 工艺计划流水号=${num} order by 工序顺序` + } + }) +} +export function searchTableData2(num) { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: `select 工艺计划流水号,姓名,零件图号,零件名称,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态 from dbo.车间生产管理工艺_插件排产查询_视图 where 排产人员=${num} and 工序状态<>4 order by 工序顺序` + } + }) +} +export function XuanRu(num, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '4', + name: `update 车间生产管理工艺_零件工序 set 排产人员=${num},排产时间= GETDATE() where 工序流水号=${num2}` + } + }) +} +export function XuanChu(num) { + return request({ + url: '', + method: 'post', + data: { + type: '4', + name: `update 车间生产管理工艺_零件工序 set 排产人员= null,排产时间= null where 工序流水号=${num}` + } + }) +} +export function panDuan(num) { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: ` select 状态,工艺计划流水号 from + ( + select 工艺计划流水号,零件名称,投产数量,机床图号,组号,(零件图号+' '+规格) as 图号及规格 + ,计划开始时间,计划结束时间,排产人员,排产时间, + (case when SUM(CASE WHEN 排产人员 IS NULL THEN 1 ELSE 0 END) = 0 then 2 else + case when COUNT(*) > SUM(CASE WHEN 排产人员 IS NULL THEN 1 ELSE 0 END) then 1 else 0 end end) as 状态 + from dbo.车间生产管理工艺_插件排产查询_视图 + where 工艺编号 is not null and 工艺编号<>0 and 工艺计划流水号 is not null and 考核状态 =6 + group by 工艺计划流水号,零件名称,投产数量,机床图号,组号,零件图号,规格,计划开始时间,计划结束时间,排产人员,排产时间 + ) as a + where 工艺计划流水号=${num} + order by 图号及规格 + ` + } + }) +} diff --git a/src/api/ManufacturingCenter/StatusQuery.js b/src/api/ManufacturingCenter/StatusQuery.js index e27efdec..d7f4f7ed 100644 --- a/src/api/ManufacturingCenter/StatusQuery.js +++ b/src/api/ManufacturingCenter/StatusQuery.js @@ -44,15 +44,14 @@ export function searchgroup(num, pageCurrent, pageSize) { } }) } -export function searchTable(check, entryNameValue, check1, machine, check2, groupNum, check3, partNumber, check4, partStateValue, check5, partTypeValue, pageSize, pageCurrent) { +export function searchTable(check, entryNameValue, check1, machine, check2, groupNum, check3, partNumber, check4, partStateValue, check5, partTypeValue) { return request({ url: '', method: 'post', data: { type: '1', name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新_MESWORK', - param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int', - pagination: pageCurrent + '&' + pageSize + param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int' } }) } diff --git a/src/api/ManufacturingCenter/machiningHoursStatistics.js b/src/api/ManufacturingCenter/machiningHoursStatistics.js index ee02ffc3..78dd29ee 100644 --- a/src/api/ManufacturingCenter/machiningHoursStatistics.js +++ b/src/api/ManufacturingCenter/machiningHoursStatistics.js @@ -62,15 +62,14 @@ export function initProject() { }) } // 车间生产管理工艺_工时统计_机床查询_查询数据 -export function searchtable4(num1, num2, pageCurrent, pageSize) { +export function searchtable4(num1, num2) { return request({ url: '', method: 'post', data: { type: '1', name: '车间生产管理工艺_工时统计_机床查询_查询数据', - param: '机床流水号_check=' + num1 + '&机床流水号=' + num2, - Pagination: pageCurrent + '&' + pageSize + param: '机床流水号_check=' + num1 + '&机床流水号=' + num2 } }) } @@ -87,15 +86,14 @@ export function searchtable44(num1, num2) { }) } // 车间生产管理工艺_工时统计_组号查询_查询数据 -export function searchtable5(num1, pageCurrent, pageSize) { +export function searchtable5(num1) { return request({ url: '', method: 'post', data: { type: '1', name: '车间生产管理工艺_工时统计_组号查询_查询数据', - param: '机床流水号=' + num1, - Pagination: pageCurrent + '&' + pageSize + param: '机床流水号=' + num1 } }) } diff --git a/src/api/Outsourcing/OutsourcingQCSearch.js b/src/api/Outsourcing/OutsourcingQCSearch.js index 53d65092..762e3e5b 100644 --- a/src/api/Outsourcing/OutsourcingQCSearch.js +++ b/src/api/Outsourcing/OutsourcingQCSearch.js @@ -8,8 +8,7 @@ export function searchTable1(...params) { data: { type: '1', name: '车间生产管理_外协到货单_查询数据', - param: `外协到货单号_check=${params[2]}&外协到货单号=${params[3]}&外协厂家_check=${params[4]}&外协厂家=${params[5]}`, - Pagination: params[0] + '&' + params[1] + param: `外协到货单号_check=${params[0]}&外协到货单号=${params[1]}&外协厂家_check=${params[2]}&外协厂家=${params[3]}` } }) } diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js index ab95d0a1..60b8c4a6 100644 --- a/src/api/PurchasingCenter/CreateInquirySheet.js +++ b/src/api/PurchasingCenter/CreateInquirySheet.js @@ -353,7 +353,7 @@ export function searchMerge(num) { } }) } -export function getPerson(num) { +export function getPerson() { return request({ url: '', method: 'post', @@ -387,3 +387,38 @@ export function tiaozheng2(num1, num2) { } }) } +// 查询时间@change修改 +export function timeChange1(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_创建询价单_外购件时间修改', + param: '外购件开始时间=' + num1 + '&外购件结束时间=' + num2 + } + }) +} +// 查询时间@change修改 +export function timeChange2(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_创建询价单_基本件时间修改', + param: '基本件开始时间=' + num1 + '&基本件结束时间=' + num2 + } + }) +} +// 查询时间初始化查询 +export function timeSearch() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_创建询价单_时间查询' + } + }) +} diff --git a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js index c7d93675..03f4eeb4 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) { +export function saveWeight(num1, num2, num3, num4, num5, num6, num7) { return request({ url: '', method: 'post', data: { type: '2', - name: '备料管理_采购计划明细_保存重量和备注', - param: `采购计划明细流水号=${num1}&成品尺寸=${num2}&备注=${num3}&单价=${num4}` + name: '备料管理_采购计划明细_保存重量和备注_9745', + param: `采购计划流水号=${num1}&成品尺寸=${num2}&备注=${num3}&单位=${num4}&零件图号=${num5}&材料=${num6}&零件名称=${num7}` } }) } @@ -52,27 +52,26 @@ export function initPartDrawing(check1, name) { }) } // 查询外购备料 -export function searchPurchasedMaterials(pageCurrent, pageSize, check1, name) { +export function searchPurchasedMaterials(check1, name) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_外购备料_查询数据', - param: `零件图号_check=${check1}&零件图号=${name}`, - Pagination: pageCurrent + '&' + pageSize + param: `零件图号_check=${check1}&零件图号=${name}` } }) } // 查询采购单 -export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name) { +export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name, check3, name2) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_采购计划_查询数据', - param: `采购单号_check=${check1}&采购单号=${num}&供应商名称_check=${check2}&供应商名称=${name}`, + param: `采购单号_check=${check1}&采购单号=${num}&供应商名称_check=${check2}&供应商名称=${name}&供应商流水号_check=${check3}&供应商流水号=${name2}`, Pagination: pageCurrent + '&' + pageSize } }) @@ -161,14 +160,14 @@ export function saveMateriel1(num1) { }) } // 删除采购计划明细 -export function deleteMateriel(num, num1) { +export function deleteMateriel(num, num1, num2, num3) { return request({ url: '', method: 'post', data: { type: '2', name: '备料管理_外购备料_移出数据', - param: `采购计划明细流水号=${num}&工艺计划流水号=${num1}` + param: `采购计划流水号=${num}&零件图号=${num1}&材料=${num2}&零件名称=${num3}` } }) } diff --git a/src/api/WorkshopProcurement/NewArrivalList.js b/src/api/WorkshopProcurement/NewArrivalList.js index e8cec860..3a1598d6 100644 --- a/src/api/WorkshopProcurement/NewArrivalList.js +++ b/src/api/WorkshopProcurement/NewArrivalList.js @@ -37,14 +37,14 @@ export function searchMateriel(num, num1) { }) } // 查询到货单 -export function searchArriveOrder(num, num1, num2, num3, num5, num6, num7, pageCurrent, pageSize) { +export function searchArriveOrder(num, num1, num8, num9, num2, num3, num5, num6, num7, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_到货单查询_新', - param: `供应商名称_check=${num}&供应商名称=${num1}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}&是否关联_check=${num6}&是否关联=${num7}`, + param: `供应商名称_check=${num}&供应商名称=${num1}&供应商名称_check=${num8}&供应商名称=${num9}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}&是否关联_check=${num6}&是否关联=${num7}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/icons/svg/ActualWorkQuery.svg b/src/icons/svg/ActualWorkQuery.svg new file mode 100644 index 00000000..232d82de --- /dev/null +++ b/src/icons/svg/ActualWorkQuery.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ManHourStatistics.svg b/src/icons/svg/ManHourStatistics.svg new file mode 100644 index 00000000..70b918bf --- /dev/null +++ b/src/icons/svg/ManHourStatistics.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ProcessPlanningNew.svg b/src/icons/svg/ProcessPlanningNew.svg new file mode 100644 index 00000000..f8bdb9e0 --- /dev/null +++ b/src/icons/svg/ProcessPlanningNew.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ProcessingStatusNew.svg b/src/icons/svg/ProcessingStatusNew.svg new file mode 100644 index 00000000..5c5be1e0 --- /dev/null +++ b/src/icons/svg/ProcessingStatusNew.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.sfont.cn + + \ No newline at end of file diff --git a/src/icons/svg/ShopScheduling.svg b/src/icons/svg/ShopScheduling.svg new file mode 100644 index 00000000..399e3967 --- /dev/null +++ b/src/icons/svg/ShopScheduling.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index cc10a203..b6a6d57b 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -48,11 +48,12 @@ .hover-row td{ background: RGB(236 245 255)!important; } - .el-table td, .is-leaf{ - background-color: rgb(255, 255, 255); - color: black; - font-weight:400 - } + //表格行颜色9745 + //.el-table td, .is-leaf{ + // background-color: rgb(255, 255, 255); + // color: black; + // font-weight:400 + //} .el-table--striped .el-table__body tr.el-table__row--striped td{ background-color: #d8dde6;/*修改斑马线表格背景*/ } diff --git a/src/styles/index.scss b/src/styles/index.scss index 6af05507..8187b825 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -109,7 +109,7 @@ el-form-item__content{ //background-color: #2e296a!important; } .el-card__body{ - padding: 10px !important; + padding: 0 10px 0 10px !important; margin: 0px !important; } .app-container{ @@ -275,3 +275,18 @@ h3 { color: white; } } +.el-tabs--border-card>.el-tabs__content { + padding: 15px 15px 0px 15px!important; +} +//.el-table__header-wrapper { +// height: 25px!important; +//} +/* 设置表主体的高度 */ +.el-table__body td,.el-table__body th{ + padding:1px!important; + height: 25px!important; +} +/* 设置表头的高度 */ +.el-table__header td,.el-table__header th{ + padding:0px!important; +} diff --git a/src/utils/request.js b/src/utils/request.js index 0228e528..cc410d30 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -18,7 +18,6 @@ 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.0.109:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 export const ExcelDownLoad = 'http://192.168.1.231:8411/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 diff --git a/src/utils/tool.js b/src/utils/tool.js index ba0f89ff..08823c69 100644 --- a/src/utils/tool.js +++ b/src/utils/tool.js @@ -41,7 +41,7 @@ function zeroFill(i) { return i } } -// 获取当前时间 +// 获取当前时间(yyyy-mm-dd hh:mm:ss) export function getNowTime() { const date = new Date() const month = zeroFill(date.getMonth() + 1) @@ -52,7 +52,14 @@ export function getNowTime() { const time = date.getFullYear() + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second return time } - +// 获取当前时间(yyyy-mm-dd) +export function getNowShotTime() { + const date = new Date() + const month = zeroFill(date.getMonth() + 1) + const day = zeroFill(date.getDate()) + const time = date.getFullYear() + '-' + month + '-' + day + return time +} // 判断类型 export function type(target) { const ret = typeof (target) diff --git a/src/views/Assembly/AssemblyQualityInspection/index.vue b/src/views/Assembly/AssemblyQualityInspection/index.vue index 44c6d4ca..50c4c7f8 100644 --- a/src/views/Assembly/AssemblyQualityInspection/index.vue +++ b/src/views/Assembly/AssemblyQualityInspection/index.vue @@ -2,7 +2,7 @@
- + {{ item.name }}
- + - + - + - - + + - + - + - + - + - + @@ -84,16 +84,16 @@ -
- -
+ + + + + + + + + + @@ -119,10 +119,10 @@ export default { label: '不合格' } ], - tableData1: [], - total: 0, // 总条数 - pageSize: 10, // 每页显示条数 - pageCurrent: 1 // 后台获取页 + tableData1: [] + // total: 0, // 总条数 + // pageSize: 10, // 每页显示条数 + // pageCurrent: 1 // 后台获取页 } }, created() { @@ -198,23 +198,20 @@ export default { if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 } if (this.TestValue !== '' && this.TestValue !== null) { this.check3 = 1 } else { this.check3 = 0 } if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check4 = 1 } else { this.check4 = 0 } - selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.TestValue, this.check4, this.qualityInspectionValue, this.pageCurrent, this.pageSize).then(response => { - console.log(response.data.rows, 111) - this.tableData1 = response.data.rows - this.total = response.data.total - console.log(this.tableData1) + selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.TestValue, this.check4, this.qualityInspectionValue).then(response => { + this.tableData1 = response.data }) - }, - // 分页 - handleSizeChange(val) { - this.pageCurrent = 1 - this.pageSize = val - this.selecttable() - }, - handleCurrentChange(val) { - this.pageCurrent = val - this.selecttable() } + // 分页 + // handleSizeChange(val) { + // this.pageCurrent = 1 + // this.pageSize = val + // this.selecttable() + // }, + // handleCurrentChange(val) { + // this.pageCurrent = val + // this.selecttable() + // } } } diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue index 431b6412..74dc3854 100644 --- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue +++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue @@ -61,7 +61,7 @@ :label="item.label" :value="item.value"/> - 查询 + 查询 导出 @@ -254,29 +254,29 @@ -

正在加工零件列表

+ 正在加工零件列表 - + - + - + - + - + @@ -286,17 +286,17 @@ {{ scope.row.批次数量 }} - + - + - + @@ -312,41 +312,41 @@ -
- -
+ + + + + + + + + + -

待加工零件列表

+ 待加工零件列表 - + - + - + - + - + @@ -356,17 +356,17 @@ {{ scope.row.批次数量 }} - + - + - + @@ -382,16 +382,16 @@ -
- -
+ + + + + + + + + + @@ -402,7 +402,7 @@ { - this.tableData10 = response.data.rows + searchData().then(response => { + this.tableData10 = response.data this.total1 = response.data.total }) }, fetchData1() { - searchData1(this.pageSize2, this.pageCurrent2).then(response => { + searchData1().then(response => { console.log(response) - this.tableData20 = response.data.rows + this.tableData20 = response.data this.total2 = response.data.total }) }, @@ -672,25 +672,25 @@ export default { handleCurrentChange(val) { this.pageCurrent = val this.selecttable() - }, - handleSizeChange1(val) { - this.pageCurrent1 = 1 - this.pageSize1 = val - this.fetchData() - }, - handleCurrentChange1(val) { - this.pageCurrent1 = val - this.fetchData() - }, - handleSizeChange2(val) { - this.pageCurrent2 = 1 - this.pageSize2 = val - this.fetchData1() - }, - handleCurrentChange2(val) { - this.pageCurrent2 = val - this.fetchData1() } + // handleSizeChange1(val) { + // this.pageCurrent1 = 1 + // this.pageSize1 = val + // this.fetchData() + // }, + // handleCurrentChange1(val) { + // this.pageCurrent1 = val + // this.fetchData() + // }, + // handleSizeChange2(val) { + // this.pageCurrent2 = 1 + // this.pageSize2 = val + // this.fetchData1() + // }, + // handleCurrentChange2(val) { + // this.pageCurrent2 = val + // this.fetchData1() + // } } } diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue index afa13d52..cfb78bea 100644 --- a/src/views/Assembly/SparePartsOutStockRecord/index.vue +++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue @@ -46,27 +46,27 @@ - + - + - + - + - + diff --git a/src/views/BasicData/PartsNumberMaintenance/index.vue b/src/views/BasicData/PartsNumberMaintenance/index.vue index 25233287..572c2ff5 100644 --- a/src/views/BasicData/PartsNumberMaintenance/index.vue +++ b/src/views/BasicData/PartsNumberMaintenance/index.vue @@ -2,7 +2,7 @@
项目名称 - + 机床图号 - + 组号 - + 基本件三表数量 - 全部删除 + 全部删除
-
- -
+ + + + + + + + + +
外购件和标准件三表数量 - 全部删除 + 全部删除
-
- -
+ + + + + + + + + +
@@ -303,17 +303,17 @@ -
- -
+ + + + + + + + + + +
@@ -362,17 +362,17 @@ -
- -
+ + + + + + + + + + +
未分配采购零件数量
@@ -433,17 +433,17 @@ -
- -
+ + + + + + + + + + + @@ -496,17 +496,17 @@ -
- -
+ + + + + + + + + + + @@ -515,7 +515,7 @@ 临时表 全部删除 - + @@ -562,17 +562,17 @@ -
- -
+ + + + + + + + + + + @@ -615,17 +615,17 @@ -
- -
+ + + + + + + + + + + @@ -677,7 +677,7 @@ export default { dialogFormVisible3: false, loading: false, loadingWB: false, - total: 0, + // total: 0, tableData: [], tableData1: [], tableData2: [], @@ -687,32 +687,32 @@ export default { tableData6: [], tableData7: [], tableDataWB: [], - pageCurrent: 1, - pageSize: 10, - pageCurrent1: 1, - pageSize1: 10, - total1: 0, - pageCurrent2: 1, - pageSize2: 10, - total2: 0, - pageCurrent3: 1, - pageSize3: 10, - total3: 0, - pageCurrent4: 1, - pageSize4: 10, - total4: 0, - pageCurrent5: 1, - pageSize5: 10, - total5: 0, - pageCurrent6: 1, - pageSize6: 10, - total6: 0, + // pageCurrent: 1, + // pageSize: 10, + // pageCurrent1: 1, + // pageSize1: 10, + // total1: 0, + // pageCurrent2: 1, + // pageSize2: 10, + // total2: 0, + // pageCurrent3: 1, + // pageSize3: 10, + // total3: 0, + // pageCurrent4: 1, + // pageSize4: 10, + // total4: 0, + // pageCurrent5: 1, + // pageSize5: 10, + // total5: 0, + // pageCurrent6: 1, + // pageSize6: 10, + // total6: 0, pageCurrent7: 1, pageSize7: 10, - total7: 0, - pageCurrentWB: 1, - pageSizeWB: 10, - totalWB: 0 + total7: 0 + // pageCurrentWB: 1, + // pageSizeWB: 10, + // totalWB: 0 } }, computed: { @@ -871,12 +871,12 @@ export default { const machine_check = this.machineValue ? 1 : 0 const group_check = this.groupValue ? 1 : 0 this.loading = true - basicPartsData(project_check, this.projectValue, machine_check, this.machineValue, group_check, this.groupValue, this.pageSize, this.pageCurrent).then(response => { + basicPartsData(project_check, this.projectValue, machine_check, this.machineValue, group_check, this.groupValue).then(response => { this.loading = false const res = response.data this.total = res.total // console.log(this.tableData) - this.tableData = res.rows.map(item => { + this.tableData = res.map(item => { if (item.整改类型 === '1') { item.整改类型 = '新增' } else if (item.整改类型 === '2') { @@ -888,11 +888,11 @@ export default { }) }) this.loadingWB = true - purchasePartsData(this.groupValue, this.pageCurrentWB, this.pageSizeWB).then(response => { + purchasePartsData(this.groupValue).then(response => { this.loadingWB = false const data = response.data this.totalWB = data.total - this.tableDataWB = data.rows.map(item => { + this.tableDataWB = data.map(item => { console.log(item) item.零件类型 = item.零件类型 === '2' ? '外购件' : '标准件' return item @@ -901,22 +901,22 @@ export default { }, getTable() { this.tableData1 = [] - getTable(this.groupValue, this.pageCurrent1, this.pageSize1).then(response => { + getTable(this.groupValue).then(response => { this.total1 = parseInt(response.data.total) this.tableData1 = [] - for (let i = 0; i < response.data.rows.length; i++) { + for (let i = 0; i < response.data.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].数据类型, - 材料流水号: 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].零件类型名称, + 组件零件基本件流水号: response.data[i].组件零件基本件流水号, + 投产类型流水号: response.data[i].投产类型流水号, + 数据类型: response.data[i].数据类型, + 材料流水号: response.data[i].材料流水号 }) } }) @@ -939,21 +939,21 @@ export default { } else { this.checked_partNumber = false } - getTable1(this.checked_entryName, '', this.checked_toolNum, this.machineValue, this.checked_Num, this.groupValue, this.checked_partNumber, this.partNumber, this.pageCurrent2, this.pageSize2).then(response => { - for (let i = 0; i < response.data.rows.length; i++) { - response.data.rows[i].机加工开始时间_长日期 = response.data.rows[i].机加工开始时间_长日期.substring(0, response.data.rows[i].机加工开始时间_长日期.indexOf(' ')) - response.data.rows[i].机加工结束时间_长日期 = response.data.rows[i].机加工结束时间_长日期.substring(0, response.data.rows[i].机加工结束时间_长日期.indexOf(' ')) + getTable1(this.checked_entryName, '', this.checked_toolNum, this.machineValue, this.checked_Num, this.groupValue, this.checked_partNumber, this.partNumber).then(response => { + for (let i = 0; i < response.data.length; i++) { + response.data[i].机加工开始时间_长日期 = response.data[i].机加工开始时间_长日期.substring(0, response.data[i].机加工开始时间_长日期.indexOf(' ')) + response.data[i].机加工结束时间_长日期 = response.data[i].机加工结束时间_长日期.substring(0, response.data[i].机加工结束时间_长日期.indexOf(' ')) } this.total2 = parseInt(response.data.total) - for (let i = 0; i < response.data.rows.length; i++) { + for (let i = 0; i < response.data.length; i++) { this.tableData2.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].工艺计划流水号 }) } }) @@ -963,8 +963,8 @@ export default { this.projectValue ? check2 = 1 : check2 = 0 this.machineValue ? check0 = 1 : check0 = 0 this.groupValue ? check1 = 1 : check1 = 0 - searchTable1(this.pageCurrent3, this.pageSize3, check2, this.projectValue, check0, this.machineValue, check1, this.groupValue).then(response => { - this.tableData3 = response.data.rows + searchTable1(check2, this.projectValue, check0, this.machineValue, check1, this.groupValue).then(response => { + this.tableData3 = response.data this.total3 = response.data.total }) }, @@ -973,8 +973,8 @@ export default { this.projectValue ? check2 = 1 : check2 = 0 this.machineValue ? check0 = 1 : check0 = 0 this.groupValue ? check1 = 1 : check1 = 0 - searchTable2(this.pageCurrent4, this.pageSize4, check2, this.projectValue, check0, this.machineValue, check1, this.groupValue).then(response => { - this.tableData4 = response.data.rows + searchTable2(check2, this.projectValue, check0, this.machineValue, check1, this.groupValue).then(response => { + this.tableData4 = response.data this.total4 = response.data.total }) }, @@ -983,9 +983,9 @@ export default { this.projectName ? check2 = 1 : check2 = 0 this.machineName ? check0 = 1 : check0 = 0 this.groupName ? check1 = 1 : check1 = 0 - searchTable5(this.pageCurrent6, this.pageSize6, check2, this.projectName, check0, this.machineName, check1, this.groupName).then(response => { + searchTable5(check2, this.projectName, check0, this.machineName, check1, this.groupName).then(response => { console.log(response, 5, this.activeName) - this.tableData5 = response.data.rows + this.tableData5 = response.data this.total5 = response.data.total }) }, @@ -995,9 +995,9 @@ export default { this.machineName ? check0 = 1 : check0 = 0 this.groupName ? check1 = 1 : check1 = 0 // console.log(this.projectName, this.machineName, this.groupName, 44) - searchTable6(this.pageCurrent6, this.pageSize6, check2, this.projectName, check0, this.machineName, check1, this.groupName).then(response => { + searchTable6(check2, this.projectName, check0, this.machineName, check1, this.groupName).then(response => { console.log(response, 6) - this.tableData6 = response.data.rows + this.tableData6 = response.data this.total6 = response.data.total }) }, @@ -1126,78 +1126,78 @@ export default { }) } }, - handleSizeChanges(val) { - this.pageCurrent = 1 - this.pageSize = val - this.getTableData() - }, - handleCurrentChanges(val) { - this.pageCurrent = val - this.getTableData() - }, - handleSizeChangeWB(val) { - this.pageCurrentWB = 1 - this.pageSizeWB = val - this.getTableData() - }, - handleCurrentChangeWB(val) { - this.pageCurrentWB = val - this.getTableData() - }, - handleSizeChange1(val) { - this.pageCurrent1 = 1 - this.pageSize1 = val - this.getTable() - }, - handleCurrentChange1(val) { - this.pageCurrent1 = val - this.getTable() - }, - handleSizeChange2(val) { - this.pageSize2 = val - this.pageCurrent2 = 1 - this.getTable1() - }, - handleCurrentChange2(val) { - this.pageCurrent2 = val - this.getTable1() - }, - handleSizeChange3(val) { - this.pageSize3 = val - this.pageCurrent3 = 1 - this.searchTable1() - }, - handleCurrentChange3(val) { - this.pageCurrent3 = val - this.searchTable1() - }, - handleSizeChange4(val) { - this.pageSize4 = val - this.pageCurrent4 = 1 - this.searchTable2() - }, - handleCurrentChange4(val) { - this.pageCurrent4 = val - this.searchTable2() - }, - handleSizeChange5(val) { - this.pageSize5 = val - this.pageCurrent5 = 1 - this.searchTable5() - }, - handleCurrentChange5(val) { - this.pageCurrent5 = val - this.searchTable5() - }, - handleSizeChange6(val) { - this.pageSize6 = val - this.pageCurrent6 = 1 - this.searchTable6() - }, - handleCurrentChange6(val) { - this.pageCurrent6 = val - this.searchTable6() - }, + // handleSizeChanges(val) { + // this.pageCurrent = 1 + // this.pageSize = val + // this.getTableData() + // }, + // handleCurrentChanges(val) { + // this.pageCurrent = val + // this.getTableData() + // }, + // handleSizeChangeWB(val) { + // this.pageCurrentWB = 1 + // this.pageSizeWB = val + // this.getTableData() + // }, + // handleCurrentChangeWB(val) { + // this.pageCurrentWB = val + // this.getTableData() + // }, + // handleSizeChange1(val) { + // this.pageCurrent1 = 1 + // this.pageSize1 = val + // this.getTable() + // }, + // handleCurrentChange1(val) { + // this.pageCurrent1 = val + // this.getTable() + // }, + // handleSizeChange2(val) { + // this.pageSize2 = val + // this.pageCurrent2 = 1 + // this.getTable1() + // }, + // handleCurrentChange2(val) { + // this.pageCurrent2 = val + // this.getTable1() + // }, + // handleSizeChange3(val) { + // this.pageSize3 = val + // this.pageCurrent3 = 1 + // this.searchTable1() + // }, + // handleCurrentChange3(val) { + // this.pageCurrent3 = val + // this.searchTable1() + // }, + // handleSizeChange4(val) { + // this.pageSize4 = val + // this.pageCurrent4 = 1 + // this.searchTable2() + // }, + // handleCurrentChange4(val) { + // this.pageCurrent4 = val + // this.searchTable2() + // }, + // handleSizeChange5(val) { + // this.pageSize5 = val + // this.pageCurrent5 = 1 + // this.searchTable5() + // }, + // handleCurrentChange5(val) { + // this.pageCurrent5 = val + // this.searchTable5() + // }, + // handleSizeChange6(val) { + // this.pageSize6 = val + // this.pageCurrent6 = 1 + // this.searchTable6() + // }, + // handleCurrentChange6(val) { + // this.pageCurrent6 = val + // this.searchTable6() + // }, handleSizeChange7(val) { this.pageSize7 = val this.pageCurrent7 = 1 @@ -1212,7 +1212,7 @@ export default { diff --git a/src/views/BasicData/ShiftManagement/index.vue b/src/views/BasicData/ShiftManagement/index.vue index f1f56607..9c4d1c72 100644 --- a/src/views/BasicData/ShiftManagement/index.vue +++ b/src/views/BasicData/ShiftManagement/index.vue @@ -1,7 +1,7 @@ -
- -
+ + + + + + + + + + @@ -327,9 +327,9 @@ export default { }, dialogFormVisible1: false, dialogFormVisible2: false, - pageCurrent: 1, - pageSize: 10, - total: 0, + // pageCurrent: 1, + // pageSize: 10, + // total: 0, rules2: { // 表单验证规则 value: [{ required: true, message: '请选择时间', trigger: 'blur' }], value2: [{ required: true, message: '请选择时间', trigger: 'blur' }], @@ -456,16 +456,16 @@ export default { this.form1 = {} this.dialogFormVisible2 = false this.form2 = {} - }, - handleSizeChange(val) { - this.pageSize = val - this.pageCurrent = 1 - this.searchTable() - }, - handleCurrentChange(val) { - this.pageCurrent = val - this.searchTable() } + // handleSizeChange(val) { + // this.pageSize = val + // this.pageCurrent = 1 + // this.searchTable() + // }, + // handleCurrentChange(val) { + // this.pageCurrent = val + // this.searchTable() + // } } } diff --git a/src/views/BasicData/SystemRrolemaintenance/index.vue b/src/views/BasicData/SystemRrolemaintenance/index.vue index 3f4c889e..595fea12 100644 --- a/src/views/BasicData/SystemRrolemaintenance/index.vue +++ b/src/views/BasicData/SystemRrolemaintenance/index.vue @@ -1,8 +1,8 @@ -
- -
+ + + + + + + + + + @@ -126,8 +127,8 @@ export default { }, methods: { fetchData() { - InitRolefunction(this.pageCurrent, this.pageSize).then(response => { // 初始化 - this.tableData = response.data.rows + InitRolefunction().then(response => { // 初始化 + this.tableData = response.data this.total = response.data.total }) }, @@ -140,15 +141,15 @@ export default { console.log(response.data) }) }, - handleSizeChange(val) { - this.pageCurrent = 1 - this.pageSize = val - this.fetchData() - }, - handleCurrentChange(val) { - this.pageCurrent = val - this.fetchData() - }, + // handleSizeChange(val) { + // this.pageCurrent = 1 + // this.pageSize = val + // this.fetchData() + // }, + // handleCurrentChange(val) { + // this.pageCurrent = val + // this.fetchData() + // }, handleEdit(row) { if (this.$refs['form2'] !== undefined) { this.$refs['form2'].resetFields() diff --git a/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue b/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue index 88b60d6f..ede3a0eb 100644 --- a/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue +++ b/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue @@ -3,22 +3,22 @@ - 员工姓名: - - 角色名称: - + + + + - 查询 + 查询 增加 - + -
- -
+ + + + + + + + + +
@@ -232,9 +232,9 @@ export default { staffNum: '', personnelNumber: '', personnelStream: '', - pageCurrent1: 1, - pageSize1: 10, - total1: null, + // pageCurrent1: 1, + // pageSize1: 10, + // total1: null, roleName: null, roleNames: [], rybh: '', @@ -283,9 +283,9 @@ export default { } else { this.check2 = 0 } - searchTable(this.check1, this.staffName, this.check2, this.roleName, this.pageCurrent1, this.pageSize1).then(response => { + searchTable(this.check1, this.staffName, this.check2, this.roleName).then(response => { console.log(response) - this.tableData = response.data.rows + this.tableData = response.data this.total1 = response.data.total }) }, @@ -304,15 +304,15 @@ export default { }) this.searchData() }, - handleSizeChange1(val) { - this.pageCurrent1 = 1 - this.pageSize1 = val - this.searchData() - }, - handleCurrentChange1(val) { - this.pageCurrent1 = val - this.searchData() - }, + // handleSizeChange1(val) { + // this.pageCurrent1 = 1 + // this.pageSize1 = val + // this.searchData() + // }, + // handleCurrentChange1(val) { + // this.pageCurrent1 = val + // this.searchData() + // }, submitAdd1() { this.$refs['form1'].validate((valid) => { if (valid) { diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue index 07c735fe..6b152024 100644 --- a/src/views/Inventory/CreatePickingList/index.vue +++ b/src/views/Inventory/CreatePickingList/index.vue @@ -262,36 +262,31 @@ 删除领料单 选中领料单：{{ pickingListNumberShow }} 领料人：{{ peopleName }} + 移除领料明细
- + - + - + - + - + - - -
-
- +
+ - + - + - + - + - + - + @@ -347,20 +342,20 @@ {{ scope.row.出库数量1 }} - + - + - + @@ -556,11 +550,12 @@ export default { }) }, tableRowClassName({ row }) { - if (row.是否审批 === 1) { - return 'shenpi-row' - } else { - return '' - } + return '.warning-row' + // if (row.是否审批 === 1) { + // return '.warning-row' + // } else { + // return '' + // } }, selectable(row, index) { // 控制某行是否可选 console.log(row) @@ -889,9 +884,6 @@ export default { + - diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue index b60372b0..cfc9a359 100644 --- a/src/views/Inventory/InventoryCheck/index.vue +++ b/src/views/Inventory/InventoryCheck/index.vue @@ -32,32 +32,32 @@
- + - + - + - + - + - + diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue index b7603138..88bd1880 100644 --- a/src/views/Inventory/MaterialOut/index.vue +++ b/src/views/Inventory/MaterialOut/index.vue @@ -9,7 +9,7 @@

领料单

- + @@ -19,7 +19,7 @@ {{ scope.row.操作日期.split(' ')[0] }} - + @@ -62,22 +62,22 @@ - + - + - + - + diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue index 23ef6d2b..5bbd2eee 100644 --- a/src/views/Inventory/OfflinePartOut/index.vue +++ b/src/views/Inventory/OfflinePartOut/index.vue @@ -15,22 +15,22 @@ - + - + - + - + diff --git a/src/views/Inventory/OfflinePartsStorage/index.vue b/src/views/Inventory/OfflinePartsStorage/index.vue index 4d311402..cd7432ce 100644 --- a/src/views/Inventory/OfflinePartsStorage/index.vue +++ b/src/views/Inventory/OfflinePartsStorage/index.vue @@ -26,12 +26,12 @@ {{ scope.row.离线合同编号 }} - + - + diff --git a/src/views/Inventory/OutPartSelect/index.vue b/src/views/Inventory/OutPartSelect/index.vue index fbc58e6b..5d513a9f 100644 --- a/src/views/Inventory/OutPartSelect/index.vue +++ b/src/views/Inventory/OutPartSelect/index.vue @@ -40,12 +40,12 @@ align="center" width="55" type="index"/> - + - + @@ -55,22 +55,22 @@ {{ scope.row.出库数量 }} - + - + - + - + diff --git a/src/views/Inventory/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue index 5c096ba6..d9a6b969 100644 --- a/src/views/Inventory/PurchaseInRecord/index.vue +++ b/src/views/Inventory/PurchaseInRecord/index.vue @@ -50,17 +50,17 @@

采购合同入库

- + - + - + @@ -70,12 +70,12 @@ {{ scope.row.入库数量 }} - + - + @@ -94,17 +94,17 @@

离线合同入库

- + - + - + @@ -114,12 +114,12 @@ {{ scope.row.入库数量 }} - + - + diff --git a/src/views/Inventory/PurchasePartsStorage/index.vue b/src/views/Inventory/PurchasePartsStorage/index.vue index 887fcdf9..648df99e 100644 --- a/src/views/Inventory/PurchasePartsStorage/index.vue +++ b/src/views/Inventory/PurchasePartsStorage/index.vue @@ -30,17 +30,12 @@ - - - - - - + diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue index c45fc70c..b3f064ab 100644 --- a/src/views/Inventory/StockInquiry/index.vue +++ b/src/views/Inventory/StockInquiry/index.vue @@ -40,12 +40,12 @@ align="center" width="55" type="index"/> - + - + @@ -55,12 +55,12 @@ {{ scope.row.入库数量 }} - + - + @@ -70,12 +70,12 @@ {{ scope.row.仓库名称 }} - + - + diff --git a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue index 01f763f2..73e02633 100644 --- a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue +++ b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue @@ -59,12 +59,12 @@ style="width: 100%;" border> - + - + @@ -74,12 +74,12 @@ {{ scope.row.完成数量 }} - + - + @@ -115,12 +115,12 @@ {{ scope.row.修补工时 }} - + - + @@ -319,7 +319,7 @@ export default { submitAdd() { this.$refs['form'].validate((valid) => { if (valid) { - submitAdd(this.form.technology, this.form.timeNumber, this.form.number, this.id).then(res => { + submitAdd(this.form.technology, this.form.timeNumber, this.form.number, this.id, this.form.opNum).then(res => { if (res.data[0].result === '1') { this.dialogFormVisible = false this.$message.success('操作成功') diff --git a/src/views/ManufacturingCenter/ActualWorkQuery/index.vue b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue new file mode 100644 index 00000000..27a87767 --- /dev/null +++ b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue @@ -0,0 +1,174 @@ + + + + + diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index 9e30f3c8..b39857da 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -27,18 +27,18 @@ type="selection" width="55" align="center"/> - + - + - + diff --git a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue index ac0edbed..e7ef503c 100644 --- a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue +++ b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue @@ -1,8 +1,8 @@ - + - - - - - - - - - - - - - - - - - - - - - - - -
- 打回 @@ -219,7 +191,8 @@ + prop="零件名称" + label="零件名称" >
-
@@ -425,11 +398,11 @@ export default { gongyijihua: '', radio: 0, // 第一组 total: 0, // 总条数 - pageSize: 10, // 每页显示条数 + pageSize: 10000, // 每页显示条数 pageList: 1, // 后台获取页 currentPage: 1, // 显示当前页 total3: 0, // 总条数 - pageSize3: 10, // 每页显示条数 + pageSize3: 10000, // 每页显示条数 pageList3: 1, // 后台获取页 currentPage3: 1, // 显示当前页 listLoading: false, @@ -724,7 +697,7 @@ export default { this.listLoading1 = false }) this.total = 0 - this.pageSize = 10 + this.pageSize = 10000 this.pageList = 1 this.getTable() } else { @@ -787,7 +760,7 @@ export default { this.checked_baitu = false this.checked_gaonandu = false this.total = 0 - this.pageSize = 10 + this.pageSize = 10000 this.pageList = 1 this.shijiancuo1 = 0 this.shijiancuo = 0 @@ -999,7 +972,7 @@ export default { message: '打回档案成功!' }) this.total = 0 - this.pageSize = 10 + this.pageSize = 10000 this.pageList = 1 this.getTable() } else { diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue index facb157f..be0b4cd9 100644 --- a/src/views/ManufacturingCenter/InventoryQuery/index.vue +++ b/src/views/ManufacturingCenter/InventoryQuery/index.vue @@ -13,27 +13,27 @@ - + - + - + - + - + diff --git a/src/views/ManufacturingCenter/ManHourStatistics/Export2Excel.js b/src/views/ManufacturingCenter/ManHourStatistics/Export2Excel.js new file mode 100644 index 00000000..a4a80fd7 --- /dev/null +++ b/src/views/ManufacturingCenter/ManHourStatistics/Export2Excel.js @@ -0,0 +1,224 @@ +/* eslint-disable */ +require('script-loader!file-saver'); +// import XLSX from 'xlsx' +import XLSX from 'xlsx-style' +function generateArray(table) { + var out = []; + var rows = table.querySelectorAll('tr'); + var ranges = []; + for (var R = 0; R < rows.length; ++R) { + var outRow = []; + var row = rows[R]; + var columns = row.querySelectorAll('td'); + for (var C = 0; C < columns.length; ++C) { + var cell = columns[C]; + var colspan = cell.getAttribute('colspan'); + var rowspan = cell.getAttribute('rowspan'); + var cellValue = cell.innerText; + if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue; + + //Skip ranges + ranges.forEach(function (range) { + if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) { + for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null); + } + }); + + //Handle Row Span + if (rowspan || colspan) { + rowspan = rowspan || 1; + colspan = colspan || 1; + ranges.push({ + s: { + r: R, + c: outRow.length + }, + e: { + r: R + rowspan - 1, + c: outRow.length + colspan - 1 + } + }); + }; + + //Handle Value + outRow.push(cellValue !== "" ? cellValue : null); + + //Handle Colspan + if (colspan) + for (var k = 0; k < colspan - 1; ++k) outRow.push(null); + } + out.push(outRow); + } + return [out, ranges]; +}; + +function datenum(v, date1904) { + if (date1904) v += 1462; + var epoch = Date.parse(v); + return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000); +} + +function sheet_from_array_of_arrays(data, opts) { + var ws = {}; + var range = { + s: { + c: 10000000, + r: 10000000 + }, + e: { + c: 0, + r: 0 + } + }; + for (var R = 0; R != data.length; ++R) { + for (var C = 0; C != data[R].length; ++C) { + if (range.s.r > R) range.s.r = R; + if (range.s.c > C) range.s.c = C; + if (range.e.r < R) range.e.r = R; + if (range.e.c < C) range.e.c = C; + var cell = { + v: data[R][C] + }; + if (cell.v == null) continue; + var cell_ref = XLSX.utils.encode_cell({ + c: C, + r: R + }); + + if (typeof cell.v === 'number') cell.t = 'n'; + else if (typeof cell.v === 'boolean') cell.t = 'b'; + else if (cell.v instanceof Date) { + cell.t = 'n'; + cell.z = XLSX.SSF._table[14]; + cell.v = datenum(cell.v); + } else cell.t = 's'; + + ws[cell_ref] = cell; + } + } + if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range); + return ws; +} + +function Workbook() { + if (!(this instanceof Workbook)) return new Workbook(); + this.SheetNames = []; + this.Sheets = {}; +} + +function s2ab(s) { + var buf = new ArrayBuffer(s.length); + var view = new Uint8Array(buf); + for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF; + return buf; +} + +export function export_table_to_excel(id) { + var theTable = document.getElementById(id); + var oo = generateArray(theTable); + var ranges = oo[1]; + + /* original data */ + var data = oo[0]; + var ws_name = "SheetJS"; + + var wb = new Workbook(), + ws = sheet_from_array_of_arrays(data); + + /* add ranges to worksheet */ + // ws['!cols'] = ['apple', 'banan']; + ws['!merges'] = ranges; + + /* add worksheet to workbook */ + wb.SheetNames.push(ws_name); + wb.Sheets[ws_name] = ws; + + var wbout = XLSX.write(wb, { + bookType: 'xlsx', + bookSST: false, + type: 'binary' + }); + + saveAs(new Blob([s2ab(wbout)], { + type: "application/octet-stream" + }), "test.xlsx") +} + +export function export_json_to_excel({ + headerGroup, + dataGroup, + sheetGroup, + filename, + autoWidth = true, + bookType= 'xlsx' +} = {}) { + var wb = new Workbook() + for (let i = 0; i < dataGroup.length; i++) { + /* original data */ + let data = dataGroup[i] + filename = filename || 'excel-list' + data = [...data] + data.unshift(headerGroup[i]); + var ws_name = sheetGroup[i]; + var ws = sheet_from_array_of_arrays(data); + + if (autoWidth) { + /*设置worksheet每列的最大宽度*/ + const colWidth = data.map(row => row.map(val => { + /*先判断是否为null/undefined*/ + if (val == null) { + return { + 'wch': 10 + }; + } + /*再判断是否为中文*/ + else if (val.toString().charCodeAt(0) > 255) { + return { + 'wch': val.toString().length * 2 + }; + } else { + return { + 'wch': val.toString().length + }; + } + })) + /*以第一行为初始值*/ + let result = colWidth[0]; + for (let i = 1; i < colWidth.length; i++) { + for (let j = 0; j < colWidth[i].length; j++) { + if (result[j]['wch'] < colWidth[i][j]['wch']) { + result[j]['wch'] = colWidth[i][j]['wch']; + } + } + } + ws['!cols'] = result; + } + let R = 0; + data.map(item => { + let C = 0; + item.map(itm => { + var cell_ref = XLSX.utils.encode_cell({c:C,r:R}); + var cell = {v: itm } + cell.s= { + alignment: { + horizontal: "center" + } + } + ws[cell_ref] = cell; + C++; + }) + R++; + }) + /* add worksheet to workbook */ + wb.SheetNames.push(ws_name); + wb.Sheets[ws_name] = ws; + } + var wbout = XLSX.write(wb, { + bookType: bookType, + bookSST: false, + type: 'binary' + }); + saveAs(new Blob([s2ab(wbout)], { + type: "application/octet-stream" + }), `${filename}.${bookType}`); +} diff --git a/src/views/ManufacturingCenter/ManHourStatistics/index.vue b/src/views/ManufacturingCenter/ManHourStatistics/index.vue new file mode 100644 index 00000000..0f39d45d --- /dev/null +++ b/src/views/ManufacturingCenter/ManHourStatistics/index.vue @@ -0,0 +1,231 @@ + + + + diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue index cd4b55bd..c80b5024 100644 --- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue +++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue @@ -35,12 +35,12 @@ - + - + @@ -78,12 +78,12 @@ - + - + @@ -175,7 +175,7 @@ export default { }, created() { this.getMachine() - this.searchTable() + // this.searchTable() this.searchTable2() }, methods: { diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index 4fa96189..442fb7c0 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -2,8 +2,8 @@
- 机床编号: - + + {{ item.name }}
 - 组号: - + + - + - + - + - + - + @@ -196,13 +196,13 @@ value-format="yyyy-MM-dd" placeholder="选择日期"/> - 制造部采购 + 制造部采购 - 采购部门采购 + 采购部门采购 - 车间生产 + 车间生产 diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue index bc74c422..8df6ee89 100644 --- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue +++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue @@ -53,22 +53,22 @@ type="selection" align="center" width="55"/> - + - + - + - + @@ -78,7 +78,7 @@ {{ scope.row.批次数量 }} - + diff --git a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue new file mode 100644 index 00000000..5d5720e0 --- /dev/null +++ b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue @@ -0,0 +1,1661 @@ + + + + + + diff --git a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue index a99bdaa5..9452dd73 100644 --- a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue +++ b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue @@ -341,7 +341,6 @@ - @@ -396,7 +395,6 @@ - @@ -471,7 +469,6 @@ - diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue index a9bb6204..b2166e5e 100644 --- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue +++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue @@ -40,12 +40,12 @@ stripe @selection-change="handleSelectionChange"> - + - + diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue new file mode 100644 index 00000000..7fb8cb49 --- /dev/null +++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue @@ -0,0 +1,348 @@ + + + + + diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue index 7cee2dd8..b65efc54 100644 --- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue +++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue @@ -48,7 +48,7 @@ style="top: 1px;" placeholder="选择开始日期"/> - 零件计划变更 + 零件计划变更 导出Excel - + - + @@ -134,24 +134,25 @@
- 选入 + 选入 - 全部选入 + 全部选入
- + + diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue new file mode 100644 index 00000000..78b7a2aa --- /dev/null +++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue @@ -0,0 +1,306 @@ + + + + diff --git a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue index 65232652..765ff781 100644 --- a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue +++ b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue @@ -49,14 +49,14 @@ @current-change="fetchTableData2"> diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue index 08cedc2f..dbc730b1 100644 --- a/src/views/ManufacturingCenter/StatusQuery/index.vue +++ b/src/views/ManufacturingCenter/StatusQuery/index.vue @@ -2,11 +2,11 @@
- 项目名称: + - 机床图号: - + + - 组号: - + + - - - 零件图号: - - 零件状态: - + + + + --> 查询 + + --> -
- -
+ + + + + + + + + + @@ -272,8 +272,8 @@ export default { partState: [], // 零件状态数组 partTypeValue: null, // 零件类型 num: null, - pageCurrent: 1, - pageSize: 20, + // pageCurrent: 1, + // pageSize: 20, pageCurrent1: 1, pageSize1: 20, pageCurrent2: 1, @@ -282,7 +282,7 @@ export default { tableData6: [], tableData: [], state: null, - total: null, + // total: null, total1: null, total2: null, title: '', @@ -352,16 +352,15 @@ export default { this.check5 = 0 } this.loading0 = true - searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.partNumber, this.check4, this.partStateValue, this.check5, this.partTypeValue, this.pageSize, this.pageCurrent).then(response => { - for (let i = 0; i < response.data.rows.length; i++) { - response.data.rows[i].考核状态 = parseInt(response.data.rows[i].考核状态) - 2 - if (response.data.rows[i].传递时间 !== undefined || response.data.rows[i].hasOwnProperty('传递时间')) { - response.data.rows[i].传递时间 = response.data.rows[i].传递时间.split(' ', 2)[0] + searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.partNumber, this.check4, this.partStateValue, this.check5, this.partTypeValue).then(response => { + for (let i = 0; i < response.data.length; i++) { + response.data[i].考核状态 = parseInt(response.data[i].考核状态) - 2 + if (response.data[i].传递时间 !== undefined || response.data[i].hasOwnProperty('传递时间')) { + response.data[i].传递时间 = response.data[i].传递时间.split(' ', 2)[0] } } this.loading0 = false - this.tableData = response.data.rows - this.total = parseInt(response.data.total) + this.tableData = response.data }) }, getList() { // 初始化项目名称 @@ -454,14 +453,14 @@ export default { cancel() { // 取消 this.dialogFormVisible4 = false }, - handleSizeChange(val) { - this.pageSize = val - this.searchData() - }, - handleCurrentChange(val) { - this.pageCurrent = val - this.searchData() - }, + // handleSizeChange(val) { + // this.pageSize = val + // this.searchData() + // }, + // handleCurrentChange(val) { + // this.pageCurrent = val + // this.searchData() + // }, handleSizeChange1(val) { this.pageSize1 = val this.SearchMachine() diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue index 6cf4fa72..98f8ef2d 100644 --- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue +++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue @@ -11,17 +11,17 @@ - + - + - + @@ -32,7 +32,7 @@ - -
- -
+ + + + + + + + + +
@@ -214,7 +213,7 @@ export default { loading: false, tableData: [], // 表格数据 total: null, // 总条数 - pageSize: 10, // 每页显示条数 + pageSize: 1000, // 每页显示条数 pageCurrent: 1, // 后台获取页 gongzuozhebianhao: '', machinenumber: '', @@ -224,17 +223,17 @@ export default { loading2: false, tableData2: [], // 表格数据 total2: null, // 总条数 - pageSize2: 10, // 每页显示条数 + pageSize2: 1000, // 每页显示条数 pageCurrent2: 1, // 后台获取页 loading3: false, tableData3: [], // 表格数据 total3: null, // 总条数 - pageSize3: 10, // 每页显示条数 + pageSize3: 1000, // 每页显示条数 pageCurrent3: 1, // 后台获取页 loading4: false, tableData4: [], // 表格数据 total4: null, // 总条数 - pageSize4: 10, // 每页显示条数 + pageSize4: 1000, // 每页显示条数 pageCurrent4: 1 // 后台获取页 } }, @@ -414,12 +413,12 @@ export default { this.tableData4 = [] this.total3 = 0 if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check1 = 1 } else { this.check1 = 0 } - searchtable4(this.check1, this.machineNumberValue, this.pageCurrent, this.pageSize).then(response => { + searchtable4(this.check1, this.machineNumberValue).then(response => { if (response.data.total === 0) { this.loading3 = false } else { this.total3 = response.data.total - this.tableData3 = response.data.rows + this.tableData3 = response.data } }).then(() => { this.loading3 = false @@ -430,12 +429,12 @@ export default { this.tableData4 = [] this.pageCurrent4 = 1 this.machineNumberValue = parseInt(row.机床流水号) - searchtable5(this.machineNumberValue, this.pageCurrent4, this.pageSize4).then(response => { + searchtable5(this.machineNumberValue).then(response => { if (response.data.total === 0) { this.loading4 = false } else { this.total4 = response.data.total - this.tableData4 = response.data.rows + this.tableData4 = response.data } }).then(() => { this.loading4 = false @@ -473,26 +472,26 @@ export default { handleCurrentChange2(val) { this.pageCurrent2 = val this.searchTable3() - }, - // 分页 - handleSizeChange3(val) { - this.pageCurrent3 = 1 - this.pageSize3 = val - this.searchTable4() - }, - handleCurrentChange3(val) { - this.pageCurrent3 = val - this.searchTable4() - }, - handleSizeChange4(val) { - this.pageCurrent4 = 1 - this.pageSize4 = val - this.searchTable6() - }, - handleCurrentChange4(val) { - this.pageCurrent4 = val - this.searchTable6() } + // 分页 + // handleSizeChange3(val) { + // this.pageCurrent3 = 1 + // this.pageSize3 = val + // this.searchTable4() + // }, + // handleCurrentChange3(val) { + // this.pageCurrent3 = val + // this.searchTable4() + // }, + // handleSizeChange4(val) { + // this.pageCurrent4 = 1 + // this.pageSize4 = val + // this.searchTable6() + // }, + // handleCurrentChange4(val) { + // this.pageCurrent4 = val + // this.searchTable6() + // } } } diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue index e2de0028..9e13f41f 100644 --- a/src/views/MarketingCenter/BidBond/index.vue +++ b/src/views/MarketingCenter/BidBond/index.vue @@ -2,40 +2,31 @@
- - - 招标企业: - - 保金类型: - + + - 投标人: - - - 开始日期: - - 结束日期: - - 查询 - 新增 - + + + + 查询 + 新增 @@ -49,7 +40,7 @@ border stripe size="mini"> - + - + @@ -103,7 +94,7 @@ 未收回 - + diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue index 70c67dcd..286a3aec 100644 --- a/src/views/MarketingCenter/CRM/index.vue +++ b/src/views/MarketingCenter/CRM/index.vue @@ -107,7 +107,7 @@ 新增客户 - + diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue index a690f13c..371991a0 100644 --- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue +++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue @@ -2,32 +2,25 @@
- 项目名称： - + - 机床型号： - - 营销经理： - - - - 开始日期： + + - 结束日期： - + - + @@ -108,12 +101,12 @@ {{ scope.row.安装调试节点&&scope.row.安装调试节点!=='1900/1/1' ? scope.row.安装调试节点 : '-' }} - + - + diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue index 7f10c2ca..7e7e4ba4 100644 --- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue +++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue @@ -24,7 +24,7 @@ :expand-row-keys="expands" :data="tableData1" style="width: 100%;" - height="500px" + height="600px" highlight-current-row border stripe @@ -52,12 +52,12 @@ - + - + @@ -94,12 +94,12 @@
- + - + diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue index dfc50c05..06681715 100644 --- a/src/views/MarketingCenter/ContractInformationManagement/index.vue +++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue @@ -2,32 +2,25 @@
- 项目名称： - + - 机床型号： - - 营销经理： - -
-
- 开始日期： + + - 结束日期： - + - + - + - + diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue index 8c046a71..2436c3c7 100644 --- a/src/views/MarketingCenter/InvoiceRecord/index.vue +++ b/src/views/MarketingCenter/InvoiceRecord/index.vue @@ -3,30 +3,24 @@ - 项目名称： - + - 营销经理： - - - - 开始日期： + - 结束日期： - + - + @@ -88,7 +82,7 @@ - + diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue index c888689c..f03eab2c 100644 --- a/src/views/MarketingCenter/PerformanceBond/index.vue +++ b/src/views/MarketingCenter/PerformanceBond/index.vue @@ -32,19 +32,19 @@ - + - + @@ -59,12 +59,12 @@ {{ scope.row.合同签订日期 }} - + - + @@ -79,12 +79,12 @@ {{ scope.row.电话 }} - + - + - + - + @@ -80,7 +80,7 @@ {{ scope.row.电话 }} - + diff --git a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue index 7589ec6f..26d63a9c 100644 --- a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue +++ b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue @@ -55,22 +55,22 @@ type="index" align="center" width="50"/> - + - + - + - + diff --git a/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue b/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue index dd4513cb..ab434ab5 100644 --- a/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue +++ b/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue @@ -33,6 +33,7 @@ diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue index 22e9faf8..48ff366a 100644 --- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue +++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue @@ -62,34 +62,34 @@ align="center" fixed="left" width="50"/> - + - + - + - + - + - + @@ -216,12 +216,12 @@ - + - + diff --git a/src/views/Outsourcing/OutsourcingQCSearch/index.vue b/src/views/Outsourcing/OutsourcingQCSearch/index.vue index 80c1f1bc..e6caf6e8 100644 --- a/src/views/Outsourcing/OutsourcingQCSearch/index.vue +++ b/src/views/Outsourcing/OutsourcingQCSearch/index.vue @@ -1,19 +1,19 @@ -
- -
- + + + + + + + + + + + + -
+
- + - + - + - + diff --git a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue index 062a27e9..2fb0105d 100644 --- a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue +++ b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue @@ -14,22 +14,22 @@

采购件列表

- + - + - + - + @@ -83,22 +83,22 @@

滞货件列表

- + - + - + - + diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index e25ae23e..345097fd 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -38,46 +38,35 @@ - - 项目名称: - + + - 机床图号: - + - 组号: - + - - - 物料状态: - - 物料名称: + - 物料变更: - - 物料规格: + - 物料型号: - 时间段: + end-placeholder="结束日期" + @change="timeChange1()"/> 查询 导出未询价物料清单 @@ -105,7 +95,7 @@ 调整采购任务 - + - + @@ -169,17 +159,17 @@ - + - + - + @@ -239,58 +229,48 @@ - -
- -
+
+ +
+ - - 项目名称: - + + - 机床图号: - + - 组号: - + - - - 物料状态: - - 零件图号: + - 零件名称: - 零件规格: - 时间段: + end-placeholder="结束日期" + @change="timeChange2()"/> 查询 导出未询价物料清单 @@ -422,6 +403,185 @@ @current-change="handleCurrentChange12"/>
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -907,7 +1067,7 @@ diff --git a/src/views/TechnologyCenter/ProcurementInquiry/index.vue b/src/views/TechnologyCenter/ProcurementInquiry/index.vue index ab080500..626f50b1 100644 --- a/src/views/TechnologyCenter/ProcurementInquiry/index.vue +++ b/src/views/TechnologyCenter/ProcurementInquiry/index.vue @@ -2,12 +2,12 @@
- 名称: - - 规格: - - 型号: - + + + + + + 查询 @@ -35,7 +35,7 @@ - + - + - - - - - - + @@ -310,7 +312,7 @@ {{ list.零件名称 }} {{ list.材料 }} {{ list.单位 }} - {{ list.批次数量 }} + {{ list.总数量 }} {{ list.成品尺寸 }} {{ list.备注1 }} @@ -354,6 +356,7 @@ export default { purchasingOrder: '', // 采购单号 purchasingOrderNumber: '', // 采购计划流水号 supplierName0: '', // 供应商名称（外面的） + supplierName0s: [], // 供应商名称（外面的） supplierName: '', // 供应商名称 tableData2: [], total2: 0, @@ -435,6 +438,10 @@ export default { label: response.data[i].供应商名称, value: response.data[i].供应商流水号 }) + this.supplierName0s.push({ + label: response.data[i].供应商名称, + value: response.data[i].供应商流水号 + }) } }) searchRawMaterial(this.RawMaterialName, this.pageCurrent, this.pageSize).then(response => { @@ -467,19 +474,19 @@ export default { } }, saveWeight(index, row) { - saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单价) + saveWeight(row.采购计划流水号, row.成品尺寸, row.备注1, row.单位, row.零件图号, row.材料, row.零件名称) }, saveMoney(index, row) { - var reg = /^[0-9]*$/ - if (!reg.test(row.单价)) { - this.$message.error('请输入正确的单价') - row.单价 = '' - } else { - saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单位) - } + saveWeight(row.采购计划流水号, row.成品尺寸, row.备注1, row.单位, row.零件图号, row.材料, row.零件名称) + // var reg = /^[0-9]*$/ + // if (!reg.test(row.单价)) { + // this.$message.error('请输入正确的单价') + // row.单价 = '' + // } else { + // } }, saveRemarks(index, row) { - saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单位) + saveWeight(row.采购计划流水号, row.成品尺寸, row.备注1, row.单位, row.零件图号, row.材料, row.零件名称) }, // ///////////////////////////////////////////////////////////////////////////////////////0529新加↑ useqrcode(contractNum) { @@ -509,8 +516,9 @@ export default { searchTable1() { // 查询外购备料 this.loading1 = true this.partDrawingNumber ? this.check1 = 1 : this.check1 = 0 - searchPurchasedMaterials(this.pageCurrent1, this.pageSize1, this.check1, this.partDrawingNumber).then(response => { - this.tableData1 = response.data.rows + // this.pageCurrent1, this.pageSize1, + searchPurchasedMaterials(this.check1, this.partDrawingNumber).then(response => { + this.tableData1 = response.data this.total1 = response.data.total this.loading1 = false }) @@ -533,7 +541,7 @@ export default { searchTable2() { // 查询采购单列表 this.purchasingOrder ? this.check3 = 1 : this.check3 = 0 this.supplierName0 ? this.check4 = 1 : this.check4 = 0 - searchPurchaseOrder(this.pageCurrent2, this.pageSize2, this.check3, this.purchasingOrder, this.check4, this.supplierName0).then(response => { + searchPurchaseOrder(this.pageCurrent2, this.pageSize2, this.check3, this.purchasingOrder, 0, 0, this.check4, this.supplierName0).then(response => { this.tableData2 = response.data.rows this.total2 = response.data.total }) @@ -692,7 +700,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - deleteMateriel(row.采购计划明细流水号, row.工艺计划流水号).then(response => { + deleteMateriel(row.采购计划流水号, row.零件图号, row.材料, row.零件名称).then(response => { if (response.data[0].result === '1') { this.$message.success('移除成功') this.searchTable1() diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue index 6f3c19ae..ce49071b 100644 --- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue +++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue @@ -42,12 +42,12 @@ - + - + @@ -57,17 +57,17 @@ {{ scope.row.发票金额 }} - + - + - + @@ -77,7 +77,7 @@ {{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }} - + @@ -87,7 +87,7 @@ {{ scope.row.审批2时间 ? scope.row.审批2时间 : '—' }} - + diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue index 715dcbaf..eb3938b9 100644 --- a/src/views/WorkshopProcurement/NewArrivalList/index.vue +++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue @@ -3,7 +3,14 @@
供应商: - + + + + 时间段: 未结算 - + - + @@ -99,7 +106,7 @@ size="mini" @row-click="searchTable6"> - + @@ -155,17 +162,17 @@ stripe style="margin: 3px 0" size="mini"> - + - + - + @@ -420,6 +427,8 @@ import { mapGetters } from 'vuex' export default { data() { return { + supplierNameValue: '', + supplierName: [], // 供应商 Cailiao: [], purchasingOrder: '', ArrivalOrderNumber: '', @@ -503,10 +512,21 @@ export default { ]) }, created() { + this.fetchdata() this.searchTable2() this.searchTable4() }, methods: { + fetchdata() { + searchSupplier(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => { + for (let i = 0; i < response.data.length; i++) { + this.supplierName.push({ + label: response.data[i].供应商名称, + value: response.data[i].供应商流水号 + }) + } + }) + }, searchCailiao() { this.Cailiao = [] searchCailiao(this.供应商111).then(response => { @@ -637,14 +657,14 @@ export default { searchTable4() { this.tableData5 = [] this.tableData6 = [] - this.Name ? this.check = 1 : this.check = 0 + this.supplierNameValue ? this.check = 1 : this.check = 0 this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '') if (this.PickingValue === 0 || this.PickingValue === 1) { this.check2 = 1 } else { this.check2 = 0 } - searchArriveOrder(this.check, this.Name, this.check1, this.dateRange[0], this.dateRange[1], this.check2, this.PickingValue, this.pageCurrent4, this.pageSize4).then(response => { + searchArriveOrder(0, 0, this.check, this.supplierNameValue, this.check1, this.dateRange[0], this.dateRange[1], this.check2, this.PickingValue, this.pageCurrent4, this.pageSize4).then(response => { this.tableData4 = response.data.rows this.total4 = response.data.total }) diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue index 57c29347..2bd67020 100644 --- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue +++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue @@ -100,7 +100,7 @@ {{ scope.row.发票号 }} - + @@ -110,7 +110,7 @@ {{ scope.row.开票金额 }} - + diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue index ee0d84a3..293c3b67 100644 --- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue +++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue @@ -1,35 +1,36 @@ - + diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index c47317c7..af1da6c7 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -31,6 +31,7 @@ import { searchTable1 } from '@/api/PurchasingCenter/PurchaseContractApproval' import { getMaterial, getMaterial_NOTES, setChakan } from '@/api/PurchasingCenter/MaterialManagement' import { initApproval, initApprovalOffline } from '@/api/PurchasingCenter/FundApproval' import { searchTable1 as searchTableInvoice } from '@/api/PurchasingCenter/InvoiceSettlementApprove' +import { searchRequestFund } from '@/api/PurchasingCenter/PurchaseContractRequestFund' export default { components: { Breadcrumb, @@ -39,7 +40,12 @@ export default { data() { return { timer: '', - noticeContract: null, + noticeContract1: null, + noticeContract2: null, + noticeContract3: null, + noticeContract4: null, + noticeContract5: null, + noticeContract6: null, noticeFund: null, noticeInvoice: null } @@ -73,31 +79,82 @@ export default { comfirmMaterial_CG() { getMaterial_NOTES().then(res => { if (res.data.length) { - this.noticeContract = null - this.noticeContract = this.$notify.success({ + this.noticeContract1 = null + this.noticeContract1 = this.$notify.success({ title: '提示', message: '有新采购物料审批结果，点击查看', onClick: () => { setChakan().then(res => { this.$router.push({ path: '/PurchasingCenter/MaterialMProcure' }) - setTimeout(this.noticeContract.close(), 1000) + setTimeout(this.noticeContract1.close(), 1000) }) }, duration: 1000 * 60 }) } }) + if (this.token.toString() === '2') { + searchRequestFund(1, 9999, 0, 0, 0, 0, 0).then(res => { + if (res.data.length) { + this.noticeContract2 = null + this.noticeContract2 = this.$notify.success({ + title: '提示', + message: '有合同请款申请审批结果，点击查看', + onClick: () => { + setChakan().then(res => { + this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' }) + setTimeout(this.noticeContract2.close(), 1000) + }) + }, + duration: 1000 * 60 + }) + } + }) + initApproval(1, 999, 1).then(res => { + if (res.data.rows.length) { + this.noticeContract3 = null + this.noticeContract3 = this.$notify.success({ + title: '提示', + message: '有合同请款申请待审批，点击查看', + onClick: () => { + setChakan().then(res => { + this.$router.push({ path: '/PurchasingCenter/FundApproval1' }) + setTimeout(this.noticeContract3.close(), 1000) + }) + }, + duration: 1000 * 60 + }) + } + }) + } else if (this.token.toString() === '3') { + searchRequestFund(1, 99999, 0, 0, 0, 0, 0).then(res => { + if (res.data.length) { + this.noticeContract4 = null + this.noticeContract4 = this.$notify.success({ + title: '提示', + message: '有合同请款申请审批结果，点击查看', + onClick: () => { + setChakan().then(res => { + this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' }) + setTimeout(this.noticeContract4.close(), 1000) + }) + }, + duration: 1000 * 60 + }) + } + }) + } }, comfirmMaterial() { getMaterial().then(res => { if (res.data.length) { - this.noticeContract = null - this.noticeContract = this.$notify.success({ + this.noticeContract5 = null + this.noticeContract5 = this.$notify.success({ title: '提示', message: '您有采购物料申请待审批，请及时处理，点击查看', onClick: () => { this.$router.push({ path: '/PurchasingCenter/MaterialManagement' }) - setTimeout(this.noticeContract.close(), 1000) + setTimeout(this.noticeContract5.close(), 1000) }, duration: 1000 * 60 }) @@ -107,13 +164,13 @@ export default { checkApproval() { searchTable1(1, 999, 0, null, null, 0, 0, 0, 0, 0, 0).then(res => { if (res.data.total) { - this.noticeContract = null - this.noticeContract = this.$notify.success({ + this.noticeContract6 = null + this.noticeContract6 = this.$notify.success({ title: '提示', message: '您有采购合同待审批，请及时处理，点击查看', onClick: () => { this.$router.push({ path: '/PurchasingCenter/PurchaseContractApproval' }) - setTimeout(this.noticeContract.close(), 1000) + setTimeout(this.noticeContract6.close(), 1000) }, duration: 1000 * 60 })