Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0
This commit is contained in:
bryan sun
@@ -11,14 +11,13 @@ export function projectSelect() {
|
||||
})
|
||||
}
|
||||
|
||||
export function machineSelect(projectValue) {
|
||||
export function machineSelect() {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: 'PDM_机床名称_查询数据2',
|
||||
param: `项目流水号=${projectValue}`
|
||||
name: 'PDM_项目名称_查询数据'
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -34,48 +33,36 @@ export function groupSelect(machineValue) {
|
||||
}
|
||||
})
|
||||
}
|
||||
export function searchTable5(projectCheck, project, machineCheck, machine, groupCheck, group) {
|
||||
export function searchTable5(machineCheck, machine, groupCheck, group) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: 'PDM_零件明细表_外购件和标准件_临时表数据查询',
|
||||
param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}`
|
||||
param: `机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}`
|
||||
}
|
||||
})
|
||||
}
|
||||
export function searchTable6(projectCheck, project, machineCheck, machine, groupCheck, group) {
|
||||
export function searchTable6(machineCheck, machine, groupCheck, group) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: 'PDM_零件明细表_基本件_临时表数据查询',
|
||||
param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}`
|
||||
param: `机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}`
|
||||
}
|
||||
})
|
||||
}
|
||||
export function searchTable7(pageCurrent, pageSize, 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
|
||||
}
|
||||
})
|
||||
}
|
||||
export function basicPartsData(project_check, project, machine_check, machine, group_check, group) {
|
||||
export function basicPartsData(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}`
|
||||
param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}`
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -123,14 +110,14 @@ export function deleteBasicParts5(basicNum) {
|
||||
}
|
||||
})
|
||||
}
|
||||
export function alldeleteBasicParts5(project, machine, group) {
|
||||
export function alldeleteBasicParts5(machine, group) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: 'PDM_零件明细表_外购件和标准件_临时表_全部删除',
|
||||
param: `项目=${project}&机床=${machine}&组号=${group}`
|
||||
param: `机床=${machine}&组号=${group}`
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -145,14 +132,14 @@ export function deleteBasicParts6(basicNum) {
|
||||
}
|
||||
})
|
||||
}
|
||||
export function alldeleteBasicParts6(project, machine, group) {
|
||||
export function alldeleteBasicParts6(machine, group) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: 'PDM_零件明细表_基本件_临时表_全部删除',
|
||||
param: `项目=${project}&机床=${machine}&组号=${group}`
|
||||
param: `机床=${machine}&组号=${group}`
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -228,8 +215,8 @@ export function getTable1(num, a, b, c, d, e, f, g) {
|
||||
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'
|
||||
name: '车间生产管理工艺_新排产算法_能力平衡_查询数据_要平衡的零件_数量维护',
|
||||
param: '机床流水号_check=' + b + '=string&机床流水号=' + c + '=int&组件流水号_check=' + d + '=string&组件流水号=' + e + '=int&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=1=int&考核状态=5=int'
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -252,7 +239,7 @@ export function searchTable1(...params) {
|
||||
data: {
|
||||
type: '1',
|
||||
name: '采购管理_采购部采购_查询物料_数量维护',
|
||||
param: `项目流水号_check=${params[0]}&项目流水号=${params[1]}&机床流水号_check=${params[2]}&机床流水号=${params[3]}&组件流水号_check=${params[4]}&组件流水号=${params[5]}&物料状态=1`
|
||||
param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&物料状态=1`
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -264,7 +251,7 @@ export function searchTable2(...params) {
|
||||
data: {
|
||||
type: '1',
|
||||
name: '采购管理_采购部采购_查询物料_基本件_数量维护',
|
||||
param: `项目流水号_check=${params[0]}&项目流水号=${params[1]}&机床流水号_check=${params[2]}&机床流水号=${params[3]}&组件流水号_check=${params[4]}&组件流水号=${params[5]}&物料状态=1`
|
||||
param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&物料状态=1`
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
13
src/api/ManufacturingCenter/MonthEndHourAccounting.js
Normal file
13
src/api/ManufacturingCenter/MonthEndHourAccounting.js
Normal file
@@ -0,0 +1,13 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
export function searchTable(time, time1) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '工艺月底工时核算_查询数据',
|
||||
param: '开始时间=' + time + '&结束时间=' + time1
|
||||
}
|
||||
})
|
||||
}
|
||||
551
src/api/ManufacturingCenter/OnlineProcessChange.js
Normal file
551
src/api/ManufacturingCenter/OnlineProcessChange.js
Normal file
@@ -0,0 +1,551 @@
|
||||
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(num2) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_零件工艺计划_查询已完成工艺制定零件_按机床组号或图号查_更改',
|
||||
param: '机床组号或图号=' + 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 saveUpadate(num, num1) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: '车间生产管理工艺_零件工序_更改保存',
|
||||
param: '工艺计划流水号=' + num + '&工序流水号=' + num1
|
||||
}
|
||||
})
|
||||
}
|
||||
// 主界面主表插入功能
|
||||
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}`
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -1,27 +1,27 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询人员总工工时
|
||||
export function searchtable(num2, num3, num4, num5, pageCurrent, pageSize) {
|
||||
export function searchtable(num1, num2, pageCurrent, pageSize) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_工时统计_查询数据2_新',
|
||||
param: '操作者_check=0&姓名=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5,
|
||||
name: '车间生产管理工艺_工时统计_设备工时_Vue',
|
||||
param: '开始时间=' + num1 + '&结束时间=' + num2,
|
||||
Pagination: pageCurrent + '&' + pageSize
|
||||
}
|
||||
})
|
||||
}
|
||||
// 查询人员具体工序
|
||||
export function searchtable2(num1, num2, num3, num4, pageCurrent, pageSize) {
|
||||
export function searchtable2(num1, num2, num3, pageCurrent, pageSize) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_工时统计按人员查询_查询数据2_新',
|
||||
param: '工作者编号=' + num1 + '&时间_check=' + num2 + '&开始时间=' + num3 + '&结束时间=' + num4,
|
||||
name: '车间生产管理工艺_工时统计_设备工时_Vue_详细',
|
||||
param: '人员编号=' + num1 + '&开始时间=' + num2 + '&结束时间=' + num3,
|
||||
Pagination: pageCurrent + '&' + pageSize
|
||||
}
|
||||
})
|
||||
|
||||
@@ -31,7 +31,7 @@ export function searchTable1(...params) {
|
||||
data: {
|
||||
type: '1',
|
||||
name: '采购管理_采购部采购_查询物料_分配后_加供应商_新',
|
||||
param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}&物料名称_check=${params[7]}&物料名称=${params[8]}&物料规格_check=${params[9]}&物料规格=${params[10]}&物料型号_check=${params[11]}&物料型号=${params[12]}`,
|
||||
param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}&物料名称_check=${params[7]}&物料名称=${params[8]}&物料规格_check=${params[9]}&物料规格=${params[10]}&物料型号_check=${params[11]}&物料型号=${params[12]}&时间_check=${params[13]}&开始时间=${params[14]}&结束时间=${params[15]}`,
|
||||
Pagination: params[4] + '&' + params[5]
|
||||
}
|
||||
})
|
||||
@@ -44,7 +44,7 @@ export function searchTable2(...params) {
|
||||
data: {
|
||||
type: '1',
|
||||
name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商_新',
|
||||
param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件名称_check=${params[6]}&零件名称=${params[7]}&零件规格_check=${params[8]}&零件规格=${params[9]}&零件图号_check=${params[10]}&零件图号=${params[11]}`,
|
||||
param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件名称_check=${params[6]}&零件名称=${params[7]}&零件规格_check=${params[8]}&零件规格=${params[9]}&零件图号_check=${params[10]}&零件图号=${params[11]}&时间_check=${params[12]}&开始时间=${params[13]}&结束时间=${params[14]}`,
|
||||
Pagination: params[4] + '&' + params[5]
|
||||
}
|
||||
})
|
||||
@@ -57,7 +57,7 @@ export function searchTable1Export(...params) {
|
||||
data: {
|
||||
type: '1',
|
||||
name: '采购管理_采购部采购_查询物料_分配后_加供应商',
|
||||
param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[4]}`
|
||||
param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[4]}&时间_check=${params[5]}&开始时间=${params[6]}&结束时间=${params[7]}`
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -69,7 +69,7 @@ export function searchTable2Export(...params) {
|
||||
data: {
|
||||
type: '1',
|
||||
name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商',
|
||||
param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}`
|
||||
param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&时间_check=${params[4]}&开始时间=${params[5]}&结束时间=${params[6]}`
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
|
||||
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
|
||||
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
|
||||
const service = axios.create({
|
||||
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
|
||||
baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
|
||||
timeout: 1500000 // 请求超时时间
|
||||
})
|
||||
export default service
|
||||
|
||||
@@ -1,14 +1,6 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-card>
|
||||
<span>项目名称</span>
|
||||
<el-select v-model="projectValue" placeholder="请选择项目名称" style="margin: 0px 20px 0px 0px" filterable size="small">
|
||||
<el-option
|
||||
v-for="item in project"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span>机床图号</span>
|
||||
<el-select v-model="machineValue" placeholder="请选择机床图号" style="margin: 0px 20px 0px 0px" filterable size="small">
|
||||
<el-option
|
||||
@@ -646,13 +638,12 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { alldeleteWB, alldelete, projectSelect, machineSelect, groupSelect, basicPartsData, deleteBasicParts, deleteBasicParts5, deleteBasicParts6, alldeleteBasicParts5, alldeleteBasicParts6, purchasePartsData, deletePurchaseData, editPurchaseData, editBasicParts, getTable, editProductNum, getTable1, editProduceNum, searchTable1, searchTable2, searchTable5, searchTable6, searchTable7, editGroupBasicPartNum, editGroupPartNum } from '@/api/BasicData/PartsNumberMaintenance'
|
||||
import { alldeleteWB, alldelete, machineSelect, groupSelect, basicPartsData, deleteBasicParts, deleteBasicParts5, deleteBasicParts6, alldeleteBasicParts5, alldeleteBasicParts6, purchasePartsData, deletePurchaseData, editPurchaseData, editBasicParts, getTable, editProductNum, getTable1, editProduceNum, searchTable1, searchTable2, searchTable5, searchTable6, editGroupBasicPartNum, editGroupPartNum } from '@/api/BasicData/PartsNumberMaintenance'
|
||||
export default {
|
||||
name: 'Index',
|
||||
data() {
|
||||
return {
|
||||
activeName: '1',
|
||||
projectValue: '',
|
||||
projectName: '',
|
||||
BasicParts: '',
|
||||
PurchaseData: '',
|
||||
@@ -662,7 +653,6 @@ export default {
|
||||
groupPartNum: '',
|
||||
groupBasicPartNum: '',
|
||||
type: '',
|
||||
project: [],
|
||||
machineValue: '',
|
||||
machineName: '',
|
||||
machine: [],
|
||||
@@ -685,7 +675,6 @@ export default {
|
||||
tableData4: [],
|
||||
tableData5: [],
|
||||
tableData6: [],
|
||||
tableData7: [],
|
||||
tableDataWB: [],
|
||||
// pageCurrent: 1,
|
||||
// pageSize: 10,
|
||||
@@ -725,25 +714,6 @@ export default {
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
project(val) {
|
||||
if (val.length > 0) {
|
||||
this.projectValue = val[0].value
|
||||
}
|
||||
},
|
||||
projectValue(val) {
|
||||
for (let i = 0; i < this.project.length; i++) {
|
||||
if (this.project[i].value === this.projectValue) {
|
||||
this.projectName = this.project[i].label
|
||||
}
|
||||
}
|
||||
this.machineValue = ''
|
||||
this.machine = []
|
||||
this.groupValue = ''
|
||||
this.group = []
|
||||
if (val) {
|
||||
this.getMachineSelect(val)
|
||||
}
|
||||
},
|
||||
machine(val) {
|
||||
if (val.length > 0) {
|
||||
this.machineValue = val[0].value
|
||||
@@ -755,6 +725,12 @@ export default {
|
||||
}
|
||||
},
|
||||
machineValue(val) {
|
||||
for (let i = 0; i < this.machine.length; i++) {
|
||||
if (val === this.machine[i].value) {
|
||||
this.machineName = this.machine[i].label
|
||||
}
|
||||
}
|
||||
console.log(val, 11, this.machineName)
|
||||
this.groupValue = ''
|
||||
this.group = []
|
||||
if (val) {
|
||||
@@ -788,10 +764,8 @@ export default {
|
||||
},
|
||||
methods: {
|
||||
fetchData() {
|
||||
this.getSelect(projectSelect, ['项目名称', '项目流水号'], 'project')
|
||||
},
|
||||
getMachineSelect(val) {
|
||||
this.getSelect(machineSelect, ['机床图号', '机床流水号'], 'machine', val)
|
||||
this.getSelect(machineSelect, ['机床图号', '机床流水号'], 'machine')
|
||||
console.log(this.machine)
|
||||
},
|
||||
getGroupSelect(val) {
|
||||
this.getSelect(groupSelect, ['组号', '组件流水号'], 'group', val)
|
||||
@@ -867,11 +841,10 @@ export default {
|
||||
})
|
||||
},
|
||||
getTableData() {
|
||||
const project_check = this.projectValue ? 1 : 0
|
||||
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).then(response => {
|
||||
basicPartsData(machine_check, this.machineValue, group_check, this.groupValue).then(response => {
|
||||
this.loading = false
|
||||
const res = response.data
|
||||
this.total = res.total
|
||||
@@ -959,59 +932,44 @@ export default {
|
||||
})
|
||||
},
|
||||
searchTable1() { // 查询标准件和外购件
|
||||
let check0, check1, check2
|
||||
this.projectValue ? check2 = 1 : check2 = 0
|
||||
let check0, check1
|
||||
this.machineValue ? check0 = 1 : check0 = 0
|
||||
this.groupValue ? check1 = 1 : check1 = 0
|
||||
searchTable1(check2, this.projectValue, check0, this.machineValue, check1, this.groupValue).then(response => {
|
||||
searchTable1(check0, this.machineValue, check1, this.groupValue).then(response => {
|
||||
this.tableData3 = response.data
|
||||
this.total3 = response.data.total
|
||||
})
|
||||
},
|
||||
searchTable2() { // 查询基本件
|
||||
let check0, check1, check2
|
||||
this.projectValue ? check2 = 1 : check2 = 0
|
||||
let check0, check1
|
||||
this.machineValue ? check0 = 1 : check0 = 0
|
||||
this.groupValue ? check1 = 1 : check1 = 0
|
||||
searchTable2(check2, this.projectValue, check0, this.machineValue, check1, this.groupValue).then(response => {
|
||||
searchTable2(check0, this.machineValue, check1, this.groupValue).then(response => {
|
||||
this.tableData4 = response.data
|
||||
this.total4 = response.data.total
|
||||
})
|
||||
},
|
||||
searchTable5() { // 查询标准件
|
||||
let check0, check1, check2
|
||||
this.projectName ? check2 = 1 : check2 = 0
|
||||
let check0, check1
|
||||
this.machineName ? check0 = 1 : check0 = 0
|
||||
this.groupName ? check1 = 1 : check1 = 0
|
||||
searchTable5(check2, this.projectName, check0, this.machineName, check1, this.groupName).then(response => {
|
||||
searchTable5(check0, this.machineName, check1, this.groupName).then(response => {
|
||||
console.log(response, 5, this.activeName)
|
||||
this.tableData5 = response.data
|
||||
this.total5 = response.data.total
|
||||
})
|
||||
},
|
||||
searchTable6() { // 查询基本件
|
||||
let check0, check1, check2
|
||||
this.projectName ? check2 = 1 : check2 = 0
|
||||
let check0, check1
|
||||
this.machineName ? check0 = 1 : check0 = 0
|
||||
this.groupName ? check1 = 1 : check1 = 0
|
||||
// console.log(this.projectName, this.machineName, this.groupName, 44)
|
||||
searchTable6(check2, this.projectName, check0, this.machineName, check1, this.groupName).then(response => {
|
||||
searchTable6(check0, this.machineName, check1, this.groupName).then(response => {
|
||||
console.log(response, 6)
|
||||
this.tableData6 = response.data
|
||||
this.total6 = response.data.total
|
||||
})
|
||||
},
|
||||
searchTable7() { // 查询外购件
|
||||
let check0, check1, check2
|
||||
this.projectName ? check2 = 1 : check2 = 0
|
||||
this.machineName ? check0 = 1 : check0 = 0
|
||||
this.groupName ? check1 = 1 : check1 = 0
|
||||
searchTable7(this.pageCurrent7, this.pageSize7, check2, this.projectName, check0, this.machineName, check1, this.groupName).then(response => {
|
||||
console.log(response, 7)
|
||||
this.tableData7 = response.data.rows
|
||||
this.total7 = response.data.total
|
||||
})
|
||||
},
|
||||
handleEdit(row) {
|
||||
this.BasicParts = ''
|
||||
this.PurchaseData = ''
|
||||
@@ -1125,7 +1083,7 @@ export default {
|
||||
this.searchTable6()
|
||||
})
|
||||
}
|
||||
},
|
||||
}
|
||||
// handleSizeChanges(val) {
|
||||
// this.pageCurrent = 1
|
||||
// this.pageSize = val
|
||||
@@ -1198,15 +1156,6 @@ export default {
|
||||
// this.pageCurrent6 = val
|
||||
// this.searchTable6()
|
||||
// },
|
||||
handleSizeChange7(val) {
|
||||
this.pageSize7 = val
|
||||
this.pageCurrent7 = 1
|
||||
this.searchTable7()
|
||||
},
|
||||
handleCurrentChange7(val) {
|
||||
this.pageCurrent7 = val
|
||||
this.searchTable7()
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -11,15 +11,6 @@
|
||||
<el-tooltip :open-delay="1200" effect="dark" content="将所有机床零件入库" placement="top">
|
||||
<el-button type="warning" size="small" class="el-icon-success" style="margin: 0 0 0 10px" plain @click="Innumber">入库</el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip :open-delay="1200" effect="dark" content="清除该条零件信息" placement="top">
|
||||
<el-button
|
||||
size="small"
|
||||
type="danger"
|
||||
style="float: right; margin-right: 10px;margin-top: 12px"
|
||||
plain
|
||||
class="el-icon-delete"
|
||||
@click="handleDelete()">移除</el-button>
|
||||
</el-tooltip>
|
||||
</el-row>
|
||||
</el-card>
|
||||
|
||||
@@ -27,7 +18,6 @@
|
||||
<el-table
|
||||
v-loading="listLoading"
|
||||
:data="tableDataNum"
|
||||
:row-class-name="tableRowClassName"
|
||||
stripe
|
||||
highlight-current-row
|
||||
border
|
||||
@@ -80,6 +70,16 @@
|
||||
<el-input v-model="tableData[scope.$index].note" clearable size="mini"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" min-width="100" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
:disabled="scope.row.是否禁用"
|
||||
size="mini"
|
||||
type="danger"
|
||||
class="el-icon-delete"
|
||||
@click="handleDelete(scope.$index, scope.row)">移除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</div>
|
||||
@@ -122,17 +122,9 @@ export default {
|
||||
},
|
||||
methods: {
|
||||
// 移除
|
||||
handleDelete() {
|
||||
this.tableDataNum.splice(this.NUM, 1)
|
||||
this.tableData.splice(this.NUM, 1)
|
||||
this.NUM = ''
|
||||
},
|
||||
tableRowClassName({ row, rowIndex }) {
|
||||
console.log(rowIndex)
|
||||
this.NUM = rowIndex
|
||||
},
|
||||
searchData(index) {
|
||||
this.NUM = index
|
||||
handleDelete(index, row) {
|
||||
this.tableDataNum.splice(index, 1)
|
||||
this.tableData.splice(index, 1)
|
||||
},
|
||||
// 获取人员编号
|
||||
getpeopleid() {
|
||||
|
||||
159
src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
Normal file
159
src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
Normal file
@@ -0,0 +1,159 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-card>
|
||||
<el-date-picker
|
||||
v-model="startTime"
|
||||
size="small"
|
||||
type="daterange"
|
||||
align="center"
|
||||
value-format="yyyy-MM-dd"
|
||||
format="yyyy-MM-dd"
|
||||
range-separator="～"
|
||||
style="width:250px;margin-left: 5px;margin-top: 10px;margin-bottom: 10px"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"/>
|
||||
<el-button size="small" type="success" icon="el-icon-search" style="margin-left: 5px" @click="searchTable">查询</el-button>
|
||||
<el-button size="small" type="primary" icon="el-icon-download" @click="exportExcel">导出</el-button>
|
||||
</el-card>
|
||||
<el-card>
|
||||
<el-table :data="tableData" size="mini" style="max-height: 720px" height="720px" border>
|
||||
<el-table-column align="center" label="姓名" width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.姓名 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="图号" width="170px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件图号_短 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="跟单号" width="120px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.跟单号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="序号" width="50px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.工序顺序 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="工序名称" width="80px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.工艺名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="录入准结工时" width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.修补准结工时 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="实际工时" width="80px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.设备工时 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="合格品" width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.合格数 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="废品" width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.不合格数 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="备注" width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.备注 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="日期" width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.操作时间 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="计划准结工时" width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.准结定额工时 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="计划定额工时" width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.单件定额工时 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="项目名称" width="130px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.项目名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="机床号" width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="组号" width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="设计" width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.设计者 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="材料" width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.材料 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import { searchTable } from '@/api/ManufacturingCenter/MonthEndHourAccounting'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
tableData: [],
|
||||
startTime: ''
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
formatJson(filterVal, jsonData) {
|
||||
return jsonData.map(v => filterVal.map(j => {
|
||||
return v[j]
|
||||
}))
|
||||
},
|
||||
exportExcel() {
|
||||
if (this.tableData.length === 0) {
|
||||
this.$message.warning('请查询出要导出的数据')
|
||||
return
|
||||
}
|
||||
import('@/vendor/Export2Excel').then(excel => {
|
||||
const tHeader = ['姓名', '图号', '跟单号', '序号', '工序名称', '录入准结工时', '实际工时', '合格数', '不合格数', '备注', '日期', '计划准结工时', '计划定额工时', '项目名称', '机床图号', '组号', '设计', '材料']
|
||||
const filterVal = ['姓名', '零件图号_短', '跟单号', '工序顺序', '工艺名称', '修补准结工时', '设备工时', '合格数', '不合格数', '备注', '操作时间', '准结定额工时', '单件定额工时', '项目名称', '机床图号', '组号', '设计者', '材料']
|
||||
const list = this.tableData
|
||||
const data = this.formatJson(filterVal, list)
|
||||
excel.export_json_to_excel({
|
||||
header: tHeader,
|
||||
data,
|
||||
filename: '月工时核算表',
|
||||
autoWidth: true,
|
||||
bookType: 'xlsx'
|
||||
})
|
||||
})
|
||||
},
|
||||
searchTable() {
|
||||
if (this.startTime[0] && this.startTime[1]) {
|
||||
searchTable(this.startTime[0], this.startTime[1]).then(response => {
|
||||
this.tableData = response.data
|
||||
})
|
||||
} else {
|
||||
this.$message.warning('请选择时间段')
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
1676
src/views/ManufacturingCenter/OnlineProcessChange/index.vue
Normal file
1676
src/views/ManufacturingCenter/OnlineProcessChange/index.vue
Normal file
File diff suppressed because it is too large
Load Diff
@@ -404,7 +404,6 @@
|
||||
size="mini"
|
||||
style="width: 97%;max-height: 300px"
|
||||
height="400"
|
||||
stripe
|
||||
highlight-current-row
|
||||
border>
|
||||
<el-table-column align="center" label="零件图号">
|
||||
@@ -476,7 +475,6 @@
|
||||
size="mini"
|
||||
style="width: 97%;max-height: 300px"
|
||||
height="400"
|
||||
stripe
|
||||
highlight-current-row
|
||||
border>
|
||||
<el-table-column align="center" label="物料名称">
|
||||
|
||||
@@ -17,24 +17,11 @@
|
||||
type="date"
|
||||
placeholder="选择加工完成日期"/>
|
||||
<el-button type="success" class="el-icon-search" size="small" style="margin:0px 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
|
||||
<!-- <el-tooltip :open-delay="1000" content="导出人员工时统计表" placement="right">-->
|
||||
<!-- <el-button type="primary" size="small" icon="el-icon-download" style="margin:0px 10px" @click="exportUninquirySheet1()">导出</el-button>-->
|
||||
<!-- </el-tooltip>-->
|
||||
</el-card>
|
||||
<el-row>
|
||||
<el-col style="width: 350px">
|
||||
<el-col :span="9">
|
||||
<el-card>
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="tableData"
|
||||
highlight-current-row
|
||||
size="mini"
|
||||
stripe
|
||||
style="width: 100%;"
|
||||
height="700px"
|
||||
border
|
||||
element-loading-text="拼命加载中"
|
||||
@row-click="searchTable2">
|
||||
<el-table v-loading="loading" :data="tableData" highlight-current-row size="mini" style="width: 100%;" height="700px" border element-loading-text="拼命加载中" @row-click="searchTable2">
|
||||
<el-table-column label="操作者" align="center" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.姓名 }}
|
||||
@@ -42,17 +29,27 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="计划工时" align="center" width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.理论加工时间段 }}
|
||||
{{ scope.row.定额总工时 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="实际工时" align="center" width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.设备工时 }}
|
||||
{{ scope.row.设备总工时 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="录入准结工时" align="center" width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.修补准结总工时 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="完成数量" align="center" width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.完成数量 }}
|
||||
{{ scope.row.总数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="扫码工时" align="center" width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.扫码总工时 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -66,9 +63,9 @@
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col style="margin-left: 0px;width: 860px">
|
||||
<el-col :span="15">
|
||||
<el-card>
|
||||
<el-table v-loading="loading2" :data="tableData2" size="mini" stripe highlight-current-row style="width: 100%;" height="700px" border element-loading-text="拼命加载中">
|
||||
<el-table v-loading="loading2" :data="tableData2" size="mini" stripe style="width: 100%;" height="700px" border element-loading-text="拼命加载中">
|
||||
<el-table-column label="零件图号" align="center" width="140px" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件图号 }}
|
||||
@@ -89,34 +86,29 @@
|
||||
{{ scope.row.完成数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="序间质检" align="center" width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.质检结果 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!--<el-table-column label="不合格数" align="center" width="70px">-->
|
||||
<!--<template slot-scope="scope">-->
|
||||
<!--{{ scope.row.不合格数量 }}-->
|
||||
<!--</template>-->
|
||||
<!--</el-table-column>-->
|
||||
<el-table-column label="计划工时" align="center" width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.理论加工时间段 }}
|
||||
{{ scope.row.工时总额 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="加工工时" align="center" width="70px">
|
||||
<el-table-column label="实际工时" align="center" width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.设备工时 ? scope.row.设备工时 : 0 }}
|
||||
{{ scope.row.设备工时 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="加工开始" align="center" width="135px">
|
||||
<el-table-column label="录入准结工时" align="center" width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.加工开始时间 }}
|
||||
{{ scope.row.修补准结工时 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="加工完成" align="center" width="135px">
|
||||
<el-table-column label="加工时间" align="center" width="135px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.加工完成时间 }}
|
||||
{{ scope.row.操作时间 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="扫码工时" align="center" width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.扫码工时 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -168,12 +160,8 @@ export default {
|
||||
this.tableData = []
|
||||
this.tableData2 = []
|
||||
this.total2 = 0
|
||||
if (this.startTime !== '' && this.startTime !== null && this.endTime !== null && this.endTime !== null) {
|
||||
this.timeCheck = 1
|
||||
} else {
|
||||
this.timeCheck = 0
|
||||
}
|
||||
searchtable(this.operater, this.timeCheck, this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => {
|
||||
searchtable(this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => {
|
||||
console.log(response.data, 111)
|
||||
if (response.data.total === 0) {
|
||||
this.loading = false
|
||||
} else {
|
||||
@@ -188,23 +176,10 @@ export default {
|
||||
this.loading2 = true
|
||||
this.tableData2 = []
|
||||
this.pageCurrent2 = 1
|
||||
searchtable2(row.人员编号, this.timeCheck, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => {
|
||||
searchtable2(row.人员编号, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => {
|
||||
console.log(response.data, 222)
|
||||
if (response.data.rows.length !== 0) {
|
||||
for (let i = 0; i < response.data.rows.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.rows[i].理论加工时间段,
|
||||
实际加工时间段: response.data.rows[i].实际加工时间段,
|
||||
加工开始时间: response.data.rows[i].加工开始时间 ? response.data.rows[i].加工开始时间 : '',
|
||||
加工完成时间: response.data.rows[i].加工完成时间 ? response.data.rows[i].加工完成时间 : ''
|
||||
})
|
||||
}
|
||||
this.tableData2 = response.data.rows
|
||||
}
|
||||
this.loading2 = false
|
||||
this.total2 = response.data.total
|
||||
|
||||
@@ -653,7 +653,7 @@ export default {
|
||||
物料型号: '',
|
||||
计量单位流水号: '',
|
||||
物料来源流水号: '',
|
||||
GonghuoshangValue: ''
|
||||
GonghuoshangValue: 1
|
||||
},
|
||||
rules: {
|
||||
物料名称: [{ required: true, message: '请输入物料名称', trigger: 'blur' }],
|
||||
|
||||
@@ -22,6 +22,17 @@
|
||||
<el-input v-model="Name" placeholder="名称规格型号" size="small" clearable/>
|
||||
<!-- <el-input v-model="spec" placeholder="规格" size="small" clearable/>-->
|
||||
<!-- <el-input v-model="model" placeholder="型号" size="small" clearable/>-->
|
||||
<el-date-picker
|
||||
v-model="startTime"
|
||||
size="small"
|
||||
type="daterange"
|
||||
align="center"
|
||||
value-format="yyyy-MM-dd"
|
||||
format="yyyy-MM-dd"
|
||||
range-separator="～"
|
||||
style="width:250px;margin-left: 5px"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"/>
|
||||
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable()">查询</el-button>
|
||||
<el-tooltip :open-delay="1000" effect="dark" content="将全部采购件导出到表格" placement="top">
|
||||
<el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 15px" @click="exportDetail()">导出</el-button>
|
||||
@@ -116,6 +127,11 @@
|
||||
{{ scope.row.备注 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="下达任务时间" min-width="100px" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block">
|
||||
<el-pagination
|
||||
@@ -215,6 +231,11 @@
|
||||
{{ scope.row.备注 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="下达任务时间" min-width="100px" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block">
|
||||
<el-pagination
|
||||
@@ -321,6 +342,11 @@
|
||||
{{ scope.row.备注 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="下达任务时间" min-width="100px" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block">
|
||||
<el-pagination
|
||||
@@ -345,6 +371,7 @@ export default {
|
||||
name: '', // 采购件采购查询
|
||||
data() {
|
||||
return {
|
||||
startTime: '',
|
||||
Name: '',
|
||||
spec: '',
|
||||
model: '',
|
||||
@@ -381,17 +408,18 @@ export default {
|
||||
methods: {
|
||||
// 导出采购物料执行情况
|
||||
exportDetail() {
|
||||
let check1, check2
|
||||
let check1, check2, check3
|
||||
this.machineNumberValue ? check1 = 1 : check1 = 0
|
||||
this.groupNumberValue ? check2 = 1 : check2 = 0
|
||||
searchTable1Export(check1, this.machineNumberValue, check2, this.groupNumberValue, 1).then(res1 => { // 标准件
|
||||
searchTable1Export(check1, this.machineNumberValue, check2, this.groupNumberValue, 2).then(res2 => { // 外购件
|
||||
searchTable2Export(check1, this.machineNumberValue, check2, this.groupNumberValue).then(res3 => { // 基本件
|
||||
this.startTime ? check3 = 1 : (check3 = 0, this.startTime = '')
|
||||
searchTable1Export(check1, this.machineNumberValue, check2, this.groupNumberValue, 1, check3, this.startTime[0], this.startTime[1]).then(res1 => { // 标准件
|
||||
searchTable1Export(check1, this.machineNumberValue, check2, this.groupNumberValue, 2, check3, this.startTime[0], this.startTime[1]).then(res2 => { // 外购件
|
||||
searchTable2Export(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.startTime[0], this.startTime[1]).then(res3 => { // 基本件
|
||||
import('./Export2Excel').then(excel => {
|
||||
const dataGroup = []
|
||||
const filterVal1 = ['机床图号', '组号', '物料名称', '物料型号', '物料规格', '零件数量', ['数量', '离线采购数量'], ['已到货数量', '离线到货数量'], ['供应商名称', '离线合同供应商名称'], ['采购合同编号', '离线合同编号'], '姓名', '供货商', '备注'] // tableData0里的属性名
|
||||
const filterVal2 = ['机床图号', '组号', '物料名称', '物料型号', '物料规格', '零件数量', ['数量', '离线采购数量'], ['已到货数量', '离线到货数量'], ['供应商名称', '离线合同供应商名称'], ['采购合同编号', '离线合同编号'], '姓名', '供货商', '备注'] // tableData1里的属性名
|
||||
const filterVal3 = ['机床图号', '组号', '零件名称', '零件图号', '规格', '材料', '零件数量', '数量', '已到货数量', '供应商名称', '采购合同编号', '姓名', '供货商', '备注'] // tableData2里的属性名
|
||||
const filterVal1 = ['机床图号', '组号', '物料名称', '物料型号', '物料规格', '零件数量', ['数量', '离线采购数量'], ['已到货数量', '离线到货数量'], ['供应商名称', '离线合同供应商名称'], ['采购合同编号', '离线合同编号'], '姓名', '供货商', '操作日期', '备注'] // tableData0里的属性名
|
||||
const filterVal2 = ['机床图号', '组号', '物料名称', '物料型号', '物料规格', '零件数量', ['数量', '离线采购数量'], ['已到货数量', '离线到货数量'], ['供应商名称', '离线合同供应商名称'], ['采购合同编号', '离线合同编号'], '姓名', '供货商', '操作日期', '备注'] // tableData1里的属性名
|
||||
const filterVal3 = ['机床图号', '组号', '零件名称', '零件图号', '规格', '材料', '零件数量', '数量', '已到货数量', '供应商名称', '采购合同编号', '姓名', '供货商', '操作日期', '备注'] // tableData2里的属性名
|
||||
const data1 = res1.data.map(v => filterVal1.map(j => {
|
||||
if (typeof (j) === 'string') {
|
||||
return v[j] || '—'
|
||||
@@ -402,13 +430,13 @@ export default {
|
||||
data1.map(v => {
|
||||
v.push('') // 物料状态
|
||||
if (v[10] === '—') {
|
||||
v[13] = '未分配'
|
||||
v[14] = '未分配'
|
||||
} else if (v[6] === '—') {
|
||||
v[13] = '未采购'
|
||||
v[14] = '未采购'
|
||||
} else if (v[6] !== '—' && v[6] !== v[7]) {
|
||||
v[13] = '未全部到货'
|
||||
v[14] = '未全部到货'
|
||||
} else if (v[6] !== '—' && v[6] === v[7]) {
|
||||
v[13] = '全部到货'
|
||||
v[14] = '全部到货'
|
||||
}
|
||||
})
|
||||
dataGroup.push(data1)
|
||||
@@ -422,13 +450,13 @@ export default {
|
||||
data2.map(v => {
|
||||
v.push('') // 物料状态
|
||||
if (v[10] === '—') {
|
||||
v[13] = '未分配'
|
||||
v[14] = '未分配'
|
||||
} else if (v[6] === '—') {
|
||||
v[13] = '未采购'
|
||||
v[14] = '未采购'
|
||||
} else if (v[6] !== '—' && v[6] !== v[7]) {
|
||||
v[13] = '未全部到货'
|
||||
v[14] = '未全部到货'
|
||||
} else if (v[6] !== '—' && v[6] === v[7]) {
|
||||
v[13] = '全部到货'
|
||||
v[14] = '全部到货'
|
||||
}
|
||||
})
|
||||
dataGroup.push(data2)
|
||||
@@ -442,19 +470,19 @@ export default {
|
||||
data3.map(v => {
|
||||
v.push('') // 物料状态
|
||||
if (v[11] === '—') {
|
||||
v[14] = '未分配'
|
||||
v[15] = '未分配'
|
||||
} else if (v[7] === '—') {
|
||||
v[14] = '未采购'
|
||||
v[15] = '未采购'
|
||||
} else if (v[7] !== '—' && v[7] !== v[8]) {
|
||||
v[14] = '未全部到货'
|
||||
v[15] = '未全部到货'
|
||||
} else if (v[7] !== '—' && v[7] === v[8]) {
|
||||
v[14] = '全部到货'
|
||||
v[15] = '全部到货'
|
||||
}
|
||||
})
|
||||
dataGroup.push(data3)
|
||||
const headerGroup = [['机床号', '组号', '名称', '图号或型号', '规格', '技术下达数量', '合同采购数量', '到货数量', '供应商', '合同编号', '采购员', '供货商', '备注', '物料状态'],
|
||||
['机床号', '组号', '名称', '图号或型号', '规格', '技术下达数量', '合同采购数量', '到货数量', '供应商', '合同编号', '采购员', '供货商', '备注', '物料状态'],
|
||||
['机床号', '组号', '名称', '图号或型号', '规格', '材料', '技术下达数量', '合同采购数量', '到货数量', '供应商', '合同编号', '采购员', '供货商', '备注', '物料状态']]
|
||||
const headerGroup = [['机床号', '组号', '名称', '图号或型号', '规格', '技术下达数量', '合同采购数量', '到货数量', '供应商', '合同编号', '采购员', '供货商', '下达任务时间', '备注', '物料状态'],
|
||||
['机床号', '组号', '名称', '图号或型号', '规格', '技术下达数量', '合同采购数量', '到货数量', '供应商', '合同编号', '采购员', '供货商', '下达任务时间', '备注', '物料状态'],
|
||||
['机床号', '组号', '名称', '图号或型号', '规格', '材料', '技术下达数量', '合同采购数量', '到货数量', '供应商', '合同编号', '采购员', '供货商', '下达任务时间', '备注', '物料状态']]
|
||||
const sheetGroup = ['标准件', '外购件', '基本件']
|
||||
excel.export_json_to_excel({
|
||||
headerGroup: headerGroup,
|
||||
@@ -529,13 +557,15 @@ export default {
|
||||
this.searchTable2()
|
||||
},
|
||||
searchTable0() { // 查询标准件
|
||||
let check1, check2, check3, check4, check5
|
||||
this.tableData0 = []
|
||||
let check1, check2, check3, check4, check5, check6
|
||||
this.machineNumberValue ? check1 = 1 : check1 = 0
|
||||
this.groupNumberValue ? check2 = 1 : check2 = 0
|
||||
this.Name ? check3 = 1 : check3 = 0
|
||||
this.spec ? check4 = 1 : check4 = 0
|
||||
this.model ? check5 = 1 : check5 = 0
|
||||
searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1, check3, this.Name, check4, this.spec, check5, this.model).then(response => {
|
||||
this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '')
|
||||
searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1]).then(response => {
|
||||
console.log(this.tableData0)
|
||||
if (response.data.rows.length !== 0) {
|
||||
for (let i = 0; i < response.data.rows.length; i++) {
|
||||
@@ -561,7 +591,8 @@ export default {
|
||||
备注: response.data.rows[i].备注,
|
||||
采购数量: Number(response.data.rows[i].询价状态编号) === 1 && response.data.rows[i].人员编号 !== '' ? '—' : response.data.rows[i].数量 || response.data.rows[i].离线采购数量 || '—',
|
||||
到货数量: Number(response.data.rows[i].询价状态编号) === 1 && response.data.rows[i].人员编号 !== '' ? '—' : response.data.rows[i].已到货数量 || response.data.rows[i].离线到货数量 || '—',
|
||||
不合格数量: response.data.rows[i].不合格数量
|
||||
不合格数量: response.data.rows[i].不合格数量,
|
||||
操作日期: response.data.rows[i].操作日期
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -569,13 +600,15 @@ export default {
|
||||
})
|
||||
},
|
||||
searchTable1() { // 查询外购件
|
||||
let check1, check2, check3, check4, check5
|
||||
this.tableData1 = []
|
||||
let check1, check2, check3, check4, check5, check6
|
||||
this.machineNumberValue ? check1 = 1 : check1 = 0
|
||||
this.groupNumberValue ? check2 = 1 : check2 = 0
|
||||
this.Name ? check3 = 1 : check3 = 0
|
||||
this.spec ? check4 = 1 : check4 = 0
|
||||
this.model ? check5 = 1 : check5 = 0
|
||||
searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2, check3, this.Name, check4, this.spec, check5, this.model).then(response => {
|
||||
this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '')
|
||||
searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1]).then(response => {
|
||||
this.total1 = response.data.total
|
||||
if (response.data.rows.length !== 0) {
|
||||
for (let i = 0; i < response.data.rows.length; i++) {
|
||||
@@ -601,7 +634,8 @@ export default {
|
||||
备注: response.data.rows[i].备注,
|
||||
采购数量: Number(response.data.rows[i].询价状态编号) === 1 && response.data.rows[i].人员编号 !== '' ? '—' : response.data.rows[i].数量 || response.data.rows[i].离线采购数量 || '—',
|
||||
到货数量: Number(response.data.rows[i].询价状态编号) === 1 && response.data.rows[i].人员编号 !== '' ? '—' : response.data.rows[i].已到货数量 || response.data.rows[i].离线到货数量 || '—',
|
||||
不合格数量: response.data.rows[i].不合格数量
|
||||
不合格数量: response.data.rows[i].不合格数量,
|
||||
操作日期: response.data.rows[i].操作日期
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -609,13 +643,14 @@ export default {
|
||||
})
|
||||
},
|
||||
searchTable2() { // 查询基本件
|
||||
let check1, check2, check3, check4, check5
|
||||
let check1, check2, check3, check4, check5, check6
|
||||
this.machineNumberValue ? check1 = 1 : check1 = 0
|
||||
this.groupNumberValue ? check2 = 1 : check2 = 0
|
||||
this.Name ? check3 = 1 : check3 = 0
|
||||
this.spec ? check4 = 1 : check4 = 0
|
||||
this.model ? check5 = 1 : check5 = 0
|
||||
searchTable2(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2, check3, this.Name, check4, this.spec, check5, this.model).then(response => {
|
||||
this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '')
|
||||
searchTable2(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1]).then(response => {
|
||||
this.tableData2 = response.data.rows
|
||||
this.total2 = response.data.total
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user