meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cxy

Browse Source
This commit is contained in:
caoxinyu
2018-12-05 11:03:40 +08:00
parent 60511cf6c3 7cdb10d153
commit 4bfc5961f9
132 changed files with 9929 additions and 1499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/api/BasicData/EquipmentCapabilitySetting.js Normal file
View File

@@ -0,0 +1,63 @@
import request from '@/utils/request'
// 初始化获取工艺
export function getTechnology() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基础表_工艺名称_查询数据',
param: '工艺分类流水号_check=0'
}
})
}
// 查询表格数据
export function searchtable(pageCurrent, pageSize, num1, ManufacturerNumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '设备管理_设备加工能力_查询数据_设备维护',
param: '设备名称_check=' + num1 + '&设备名称=' + ManufacturerNumber,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 增加
export function edittype(ManufacturerNumber, ManufacturerName, ManufacturerAbbreviation, address, phNumber, Fax, Remarks, category, attention, EquipmentCondition) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '设备管理_设备加工能力_增加数据_设备维护New',
param: '设备名称=' + ManufacturerNumber + '&设备型号=' + ManufacturerName + '&设备性能指标=' + ManufacturerAbbreviation + '&设备工时系数=' + address + '&工艺编号=' + phNumber + '&班次类型=' + Fax + '&设备加工能力工时=' + Remarks + '&整改工时系数=' + category + '&设备编号=' + attention + '&预留工时系数=' + EquipmentCondition
}
})
}
// 编辑
export function handlechange(num, ManufacturerNumber, ManufacturerName, ManufacturerAbbreviation, address, phNumber, Fax, Remarks, category, attention, EquipmentCondition) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '设备管理_设备加工能力_修改数据_设备维护New',
param: '设备流水号=' + num + '&设备名称=' + ManufacturerNumber + '&设备型号=' + ManufacturerName + '&设备性能指标=' + ManufacturerAbbreviation + '&设备工时系数=' + address + '&工艺属性代码=' + phNumber + '&班次类型=' + Fax + '&设备加工能力工时=' + Remarks + '&整改工时系数=' + category + '&设备编号=' + attention + '&预留工时系数=' + EquipmentCondition
}
})
}
// 删除
export function handledelete(CoManufacturerFlowNumber) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '设备管理_设备加工能力_删除数据_设备维护',
param: '设备流水号=' + CoManufacturerFlowNumber
}
})
}

47
src/api/BasicData/Materialmaintenance.js Normal file
View File

@@ -0,0 +1,47 @@
import request from '@/utils/request'
export function featchMaterial(num1, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_材质表_查询数据_根据材料名称',
param: '材料名称=' + num1,
pagination: pageCurrent + '&' + pageSize
}
})
}
export function addMaterial(num1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_材质表_增加数据',
param: '材料=' + num1
}
})
}
export function delMaterial(num1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_材质表_删除数据',
param: '材料流水号=' + num1
}
})
}
export function editMaterial(num1, num2) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_材质表_修改数据',
param: '材料流水号=' + num1 + '=int&材料=' + num2
}
})
}

59
src/api/BasicData/SystemRrolemaintenance.js Normal file
View File

@@ -0,0 +1,59 @@
import request from '@/utils/request'
export function InitRolefunction(pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '菜单系统模块_项目角色_查询数据_MESWORK',
Pagination: pageCurrent + '&' + pageSize
}
})
}
export function deleteData(code) {
return request({
url: '',
method: 'post',
data: {
type: 2,
name: '菜单系统模块_项目角色_删除_MESWORK',
param: '角色编号=' + code + '=int'
}
})
}
export function searchTable(num, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '菜单系统模块_项目角色_查询数据_MESWORK',
param: '角色功能=' + num + '=string',
Pagination: pageCurrent + '&' + pageSize
}
})
}
export function addData(code) {
return request({
url: '',
method: 'post',
data: {
type: 2,
name: '菜单系统模块_项目角色_增加_MESWORK',
param: '角色功能=' + code + '=string'
}
})
}
export function addData2(code1, num1) {
return request({
url: '',
method: 'post',
data: {
type: 2,
name: '菜单系统模块_项目角色_修改数据_MESWORK',
param: '角色功能=' + code1 + '&角色编号=' + num1
}
})
}

151
src/api/BasicData/WorkshopPersonnelRoleMana.js Normal file
View File

@@ -0,0 +1,151 @@
import request from '@/utils/request.js'
// 查询项目名称
export function dialogtablevisible() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '人事档案管理_部门关系_查询节点',
param: '子节点=0'
}
})
}
export function dialogtablevisible1() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '人事档案管理_部门关系_查询节点',
param: '子节点=0'
}
})
}
export function addData1(code, groupNum) {
return request({
url: '',
method: 'post',
data: {
type: 2,
name: '菜单系统模块_项目角色员工综合_增加数据',
param: '人员编号=' + code + '=int&角色编号=' + groupNum + '=int&项目编号=10=int'
}
})
}
export function addData2(lsh, code, groupNum) {
return request({
url: '',
method: 'post',
data: {
type: 2,
name: '菜单系统模块_项目角色员工综合_修改数据',
param: '人员角色流水号=' + lsh + '&人员编号=' + code + '&角色编号=' + groupNum
}
})
}
// 初始化科室
export function initDepartment() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '人事档案管理_部门关系_查询节点'
}
})
}
// 初始化人员信息 弹出框
export function getTree() {
return request({
url: '',
method: 'post',
data: {
type: 1,
name: '人事档案管理_部门关系_查询节点',
param: '子节点=0=int'
}
})
}
export function fn(data, pid) {
const result = []
let temp
for (let i = 0; i < data.length; i++) {
if (data[i].父节点 === pid) {
const obj = { label: data[i].节点名称, id: data[i].子节点 }
temp = fn(data, data[i].子节点)
if (temp.length > 0) {
obj.children = temp
}
result.push(obj)
}
}
return result
}
export function getTable8(code) {
return request({
url: '',
method: 'post',
data: {
type: 1,
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=' + code + '=int'
}
})
}
export function handledelete(ryjslsh) {
return request({
url: '',
method: 'post',
data: {
type: 2,
name: '菜单系统模块_项目角色员工综合_删除数据',
param: '人员角色流水号=' + ryjslsh + '=string'
}
})
}
export function deleteData(Number) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '菜单系统模块_项目角色员工综合_删除数据',
param: '人员角色流水号=' + Number + '=int'
}
})
}
export function searchdesigner(num2) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=' + num2 + '=int'
}
})
}
export function initOrderType() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '菜单系统模块_项目角色_查询数据_new'
}
})
}
export function searchTable(check1, staffName, check2, systemAdministrator, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '菜单系统模块_项目角色员工综合_查询数据',
param: '姓名_check=' + check1 + '=int&姓名=' + staffName + '=string&角色编号_check=' + check2 + ' =int&角色编号=' + systemAdministrator + '=int',
Pagination: pageCurrent + '&' + pageSize
}
})
}

157
src/api/BasicData/WorkshopProcessMaintenance.js Normal file
View File

@@ -0,0 +1,157 @@
import request from '@/utils/request'
// 查工艺分类名称
export function searchProcessClassification(ProcessClassification) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基础表_工艺分类名称_查询数据',
param: '工艺分类名称=' + ProcessClassification
}
})
}
// 增加工艺分类
export function addProcessClassification(ProcessClassification) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_基础表_工艺分类名称_增加数据',
param: '工艺分类名称=' + ProcessClassification
}
})
}
// 编辑工艺分类
export function editProcessClassification(ProcessClassificationNum, ProcessClassification) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_基础表_工艺分类名称_修改数据',
param: '工艺分类流水号=' + ProcessClassificationNum + '&工艺分类名称=' + ProcessClassification
}
})
}
// 通过工艺编分类流水号查工艺分类名称
export function searchProcessClassificationOfProcessClassificationNum(ProcessNum) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基础表_工艺分类名称_根据流水号_查询数据_MESWORK',
param: '工艺分类流水号=' + ProcessNum
}
})
}
// 删除工艺分类
export function delProcessClassification(ProcessClassificationNum) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_基础表_工艺分类名称_删除数据',
param: '工艺分类流水号=' + ProcessClassificationNum
}
})
}
// 通过工艺分类流水号查工艺名称
export function searchProcessNameOfProcessClassification(ProcessClassificationNum) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基础表_工艺名称_查询数据_按工艺分类流水号查_MESWORK',
param: '工艺分类流水号=' + ProcessClassificationNum
}
})
}
// 通过工艺编号查工艺要求
export function searchTechnologicalRequirementsOfProcessNum(ProcessNum) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理_基础表_工艺要求_查询数据',
param: '工艺编号=' + ProcessNum
}
})
}
// 增加工艺
export function addProcess(ProcessClassificationNum, ProcessName, ShortName) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'dbo.车间生产管理工艺_基础表_工艺名称_增加数据',
param: '工艺分类流水号=' + ProcessClassificationNum + '&工艺名称=' + ProcessName + '&工艺名称简称=' + ShortName
}
})
}
// 编辑工艺
export function editProcess(ProcessClassificationNum, ProcessName, ShortName) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_基础表_工艺名称_修改名称及简称',
param: '工艺编号=' + ProcessClassificationNum + '&工艺名称=' + ProcessName + '&工艺名称简称=' + ShortName
}
})
}
// 删除工艺
export function delProcess(ProcessNum) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_基础表_工艺名称_删除数据',
param: '工艺编号=' + ProcessNum
}
})
}
// 新增工艺要求
export function addTechnologicalRequirements(ProcessClassificationNum, ProcessName) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理_基础表_工艺要求_增加数据',
param: '工艺编号=' + ProcessClassificationNum + '&工艺要求=' + ProcessName
}
})
}
// 编辑工艺要求
export function editTechnologicalRequirements(ProcessClassificationNum, ProcessName) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理_基础表_工艺要求_修改数据',
param: '工艺要求流水号=' + ProcessClassificationNum + '&工艺要求=' + ProcessName
}
})
}
// 删除工艺要求
export function delTechnologicalRequirements(ProcessClassificationNum) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理_基础表_工艺要求_删除数据',
param: '工艺要求流水号=' + ProcessClassificationNum
}
})
}

97
src/api/BasicData/maintenanceEquipmentPerson.js Normal file
View File

@@ -0,0 +1,97 @@
import request from '@/utils/request'
// 初始化设备名称
export function getEquipment(id, equipmentNum) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '设备管理_设备名称与班次关系_查询数据',
param: `查询代码=${id}=int&设备流水号=${equipmentNum}`
}
})
}
export function getDepartment() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '设备管理_部门查询'
}
})
}
export function getTablePeople(number) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: `考核部门编号=${number}`
}
})
}
export function getTableData(equipmentCheck, equipmentNameValue, operatorCheck, operatorNumber, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '设备管理_设备名称_人员关系_查询数据',
param: `设备流水号_check=${equipmentCheck}&设备流水号=${equipmentNameValue}&操作者编号_check=${operatorCheck}&操作者编号=${operatorNumber}`,
pagination: pageCurrent + '&' + pageSize
}
})
}
export function deleteTable(number) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '设备管理_设备名称_人员关系_删除数据',
param: '设备人员关系流水号=' + number + '=int'
}
})
}
export function getStaff() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '设备管理_基础表_班次表_查询班次'
}
})
}
export function addTable(equipmentNumber, equipment, shift, operator, operatorNumber) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '设备管理_设备名称_人员关系_增加数据',
param: '设备流水号=' + equipmentNumber + '=int&设备名称=' + equipment + '=string&班次代码=' + shift + '=int&操作者=' + operator + '=string&操作者编号=' + operatorNumber + '=int'
}
})
}
export function editTable(equipment, equipmentNumber, shift, operator, operatorNumber, Number) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '设备管理_设备名称_人员关系_修改数据',
param: '设备流水号=' + equipmentNumber + '=int&设备名称=' + equipment + '=string&班次代码=' + shift + '=int&操作者=' + operator + '=string&操作者编号=' + operatorNumber + '=int&设备人员关系流水号=' + Number + '=int'
}
})
}

6
src/api/Inventory/DirectPart.js
View File

@@ -59,14 +59,14 @@ export function searchContractDetail(contractnumber) {
})
}
// 直达件查询
export function searchDirectPart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group, contract) {
export function searchDirectPart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group, contract_check, contract) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_直达件_零件查询',
param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group + '&合同流水号=' + contract,
param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group + '&合同流水号_check=' + contract_check + '&合同流水号=' + contract,
Pagination: pageCurrent + '&' + pageSize
}
})
@@ -79,7 +79,7 @@ export function searchPeople() {
data: {
type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=' + 18
param: '考核部门编号=18'
}
})
}

4
src/api/Inventory/ExchangeApproval.js
View File

@@ -13,14 +13,14 @@ export function searchExchangePart(pageCurrent, pageSize) {
})
}
// 通过交换件
export function approvalExchangepart(data1, data2, data3, data4, data5, data6) {
export function approvalExchangepart(data1, data2, data22, data3, data33, data4, data5, data55, data6) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_交换件_交换件审批通过',
param: '交换单流水号=' + data1 + '&交换件物料流水号=' + data2 + '&交换件组件零件流水号=' + data3 + '&交换件采购合同明细流水号=' + data4 + '&货位流水号=' + data5 + '&交换数量=' + data6
param: '交换单流水号=' + data1 + '&交换件物料流水号=' + data2 + '&被交换件物料流水号=' + data22 + '&交换件组件零件流水号=' + data3 + '&被交换件组件零件流水号=' + data33 + '&交换件采购合同明细流水号=' + data4 + '&货位流水号=' + data5 + '&被货位流水号=' + data55 + '&交换数量=' + data6
}
})
}

20
src/api/Inventory/ExchangePart.js
View File

@@ -73,26 +73,26 @@ export function searchExchangePart(pageCurrent, pageSize) {
})
}
// 增加交换件
export function addExchangepart(data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11) {
export function addExchangepart(data1, data2, data3, data4, data5, data6, data7, data8, data88, data9, data10, data11, data12, data13) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_交换件_交换件增加',
param: '交换单编号=' + data1 + '&交换件组件零件流水号=' + data2 + '&交换件物料流水号=' + data3 + '&交换件采购合同明细流水号=' + data4 + '&被交换件组件零件流水号=' + data5 + '&交换件名称=' + data6 + '&被交换件名称=' + data7 + '&货位流水号=' + data8 + '&交换数量=' + data9 + '&申请人=' + data10 + '&备注=' + data11
param: '交换单编号=' + data1 + '&交换件组件零件流水号=' + data2 + '&交换件物料流水号=' + data3 + '&交换件采购合同明细流水号=' + data4 + '&被交换件组件零件流水号=' + data5 + '&交换件名称=' + data6 + '&被交换件名称=' + data7 + '&货位流水号=' + data8 + '&被交换货位流水号=' + data88 + '&交换数量=' + data9 + '&申请人=' + data10 + '&备注=' + data11 + '&领料单流水号=' + data12 + '&被交换件物料流水号=' + data13
}
})
}
// 删除交换单
export function dropExchangeList(PickingListNumberx, data) {
export function dropExchangeList(PickingListNumberx) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_交换件_交换件删除',
param: '交换单流水号=' + PickingListNumberx + '&交换件组件零件流水号=' + data
param: '交换单流水号=' + PickingListNumberx
}
})
}
@@ -108,3 +108,15 @@ export function editExchangeList(data1, data2, data3, data4) {
}
})
}
// 领料单查询
export function searchList1(listNumber_check, listNumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间装配管理_领料单_领料单查询',
param: '领料单编号_check=' + 0 + '&领料单编号=' + listNumber
}
})
}

48
src/api/Inventory/GenneralPart.js Normal file
View File

@@ -0,0 +1,48 @@
import request from '@/utils/request'
// 查询零件入库情况
export function searchTable(partnumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'MES_机加工MES_库存管理_入库模块_零件基础信息查询_根据零件图号',
param: '零件图号=' + partnumber + '=string'
}
})
}
// 仓库查询
export function getinventory() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_货位主文件_仓库查询'
}
})
}
// 货位查询
export function getlocate(housenumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_货位主文件_查询数据',
param: '仓库流水号=' + housenumber + '=int'
}
})
}
// 修改入库数量
export function insertOne(num0, num1, people, num4, num5, num6, num7) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'MES_机加工MES_库存管理_入库模块_增加入库信息_修改入库数量',
param: '工艺计划流水号=' + num0 + '=int&入库数量=' + num1 + '=int&收件人员编号=' + people + '=int&送件人员编号=1001' + '&漆塑=' + num4 + '&仓库流水号=' + num5 + '&货位流水号=' + num6 + '&备注=' + num7
}
})
}

2
src/api/Inventory/Inboundscanning.js
View File

@@ -7,7 +7,7 @@ export function searchTable(partnumber) {
data: {
type: '1',
name: 'MES_机加工MES_库存管理_入库模块_零件基础信息查询_根据零件图号',
param: '零件图号=' + partnumber + '=string'
param: '工艺计划流水号=' + partnumber + '=string'
}
})
}

27
src/api/Inventory/InventoryCheck.js
View File

@@ -171,4 +171,29 @@ export function searchGeneralPart(pageCurrent, pageSize, project_check, project,
}
})
}
// 车间采购基本件查询
export function searchHourseBasicPart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_库存盘点_车间采购基本件查询',
param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 车间采购外购件查询
export function searchHoursePurchasePart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_库存盘点_车间采购外购件查询',
param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group,
Pagination: pageCurrent + '&' + pageSize
}
})
}

2
src/api/Inventory/InventoryManagement.js
View File

@@ -79,7 +79,7 @@ export function alterLocate(num, num0, num1, num2, num3, num4) {
data: {
type: '2',
name: '库存管理_货位主文件_修改数据',
param: '货位流水号=' + num + '货位名称=' + num0 + '&工作中心=' + num1 + '&仓库流水号=' + num2 + '&永久=' + num3 + '&不可用量=' + num4
param: '货位流水号=' + num + '&货位名称=' + num0 + '&工作中心=' + num1 + '&仓库流水号=' + num2 + '&永久=' + num3 + '&不可用量=' + num4
}
})
}

16
src/api/Inventory/PartOut.js
View File

@@ -1,14 +1,14 @@
import request from '@/utils/request'
// 领料单查询
export function searchList(listNumber) {
export function searchList(listNumber_check, listNumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间装配管理_领料单_领料单查询',
param: '领料单编号=' + listNumber
param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber
}
})
}
@@ -24,6 +24,18 @@ export function searchListDetail(listNumber) {
}
})
}
// 领料单明细出库
export function ListDetailOut(listNumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间装配管理_领料单_领料单明细出库',
param: '领料单明细流水号=' + listNumber
}
})
}
// 外购件零件出库
export function PurchasePart(data1, data2, data3, data4, data5) {
return request({

9
src/api/Inventory/PickingList.js
View File

@@ -75,18 +75,19 @@ export function searchHoursePart(pageCurrent, pageSize, project_check, project,
})
}
// 领料单查询
export function searchList(pageCurrent, pageSize, listNumber) {
export function searchList(pageCurrent, pageSize, listNumber_check, listNumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间装配管理_领料单_领料单查询',
param: '领料单编号=' + listNumber,
param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 领料单明细查询
export function searchListDetail(listNumber) {
return request({
@@ -136,14 +137,14 @@ export function dropListDetail(DetailNumberx) {
})
}
// 增加领料单明细
export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, project, machine, team, materialName, materialNumber, materialType, outNumber, partType, Note, data1, data2, data3, data4, data5, data6) {
export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, project, machine, team, materialName, materialNumber, materialType, outNumber, partType, Note, data1, data2, data3, data4, data5, data6, data7) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间装配管理_领料单_领料单明细增加',
param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&项目名称=' + project + '&机床图号=' + machine + '&组号=' + team + '&物料名称=' + materialName + '&物料型号=' + materialNumber + '&物料规格=' + materialType + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&组件零件流水号=' + data3 + '&采购合同明细流水号=' + data4 + '&货位流水号=' + data5 + '&车间外购=' + data6
param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&项目名称=' + project + '&机床图号=' + machine + '&组号=' + team + '&物料名称=' + materialName + '&物料型号=' + materialNumber + '&物料规格=' + materialType + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&组件零件流水号=' + data3 + '&采购合同明细流水号=' + data4 + '&货位流水号=' + data5 + '&车间外购=' + data6 + '&物料与货位对照流水号=' + data7
}
})
}

5
src/api/Inventory/SubPartCome.js
View File

@@ -1,12 +1,13 @@
import request from '@/utils/request'
// 替换单查询
export function searchSubstitutedCard() {
export function searchSubstitutedCard(data1, data2, data3, data4) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_替换件_替换单查询'
name: '库存管理_替换件_替换单查询',
param: '替换单编号_check=' + data1 + '&替换单编号=' + data2 + '&替换件名称_check=' + data3 + '&替换件名称=' + data4
}
})
}

12
src/api/ManufacturingCenter/GroupMatching.js
View File

@@ -56,3 +56,15 @@ export function searchPurchaseTable(check, entryNameValue, check1, machine, chec
}
})
}
export function searchTable1(check, entryNameValue, check1, machine, check2, groupNum, check3, year, check4, month, check5, time, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_车间采购出库_零件查询',
param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&年_check=' + check3 + '=int&年=' + year + '=string&月_check=' + check4 + '=int&月=' + month + '=int&入库时间_check=' + check5 + '=int&入库时间=' + time + '=string',
pagination: pageCurrent + '&' + pageSize
}
})
}

2
src/api/ManufacturingCenter/InitialProduction.js
View File

@@ -12,7 +12,7 @@ export function getEntryNameValue() {
}
})
}
// 项目名称
// 机床名称
export function getToolNum(num) {
return request({
url: '',

17
src/api/ManufacturingCenter/PartAssignment.js
View File

@@ -118,19 +118,30 @@ export function searchDetailed(num) {
method: 'post',
data: {
type: '1',
name: '车间管理_基本件采购_请购单明细_查询数据',
name: '车间管理_基本件采购_请购单明细_查询数据_外购件',
param: '请购单流水号=' + num
}
})
}
export function purchaseRequisition(RequisitionList, projectName, projectFloatValue, MachineToolNumber, machineFloatValue, groupName, groupFloatValue, BasicPartsNumber, MaterialName, NumberOfParts, PartType, time, MaterialNum) {
export function searchDetailed1(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间管理_基本件采购_请购单明细_查询数据_基本件',
param: '请购单流水号=' + num
}
})
}
export function purchaseRequisition(RequisitionList, projectName, projectFloatValue, MachineToolNumber, machineFloatValue, groupName, groupFloatValue, BasicPartsNumber, MaterialName, PartToolNumber, Material, NumberOfParts, PartType, time, MaterialNum) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间管理_基本件采购_请购单明细_请购',
param: '请购单流水号=' + RequisitionList + '&项目名称=' + projectName + '&项目流水号=' + projectFloatValue + '&机床图号=' + MachineToolNumber + '&机床流水号=' + machineFloatValue + '&组号=' + groupName + '&组件流水号=' + groupFloatValue + '&基本件流水号=' + BasicPartsNumber + '&物料名称=' + MaterialName + '&零件数量=' + NumberOfParts + '&零件类型=' + PartType + '&物料计划到货时间=' + time + '&物料流水号=' + MaterialNum
param: '请购单流水号=' + RequisitionList + '&项目名称=' + projectName + '&项目流水号=' + projectFloatValue + '&机床图号=' + MachineToolNumber + '&机床流水号=' + machineFloatValue + '&组号=' + groupName + '&组件流水号=' + groupFloatValue + '&基本件流水号=' + BasicPartsNumber + '&物料名称=' + MaterialName + '&零件图号=' + PartToolNumber + '&材料=' + Material + '&零件数量=' + NumberOfParts + '&零件类型=' + PartType + '&物料计划到货时间=' + time + '&物料流水号=' + MaterialNum
}
})
}

62
src/api/ManufacturingCenter/ProcessAdjustQuery.js Normal file
View File

@@ -0,0 +1,62 @@
import request from '@/utils/request'
// 初始化工艺员
export function initCraftmen() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=17'
}
})
}
// 根据工艺员查零件
export function searchPart(person) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_在制零件工艺调整_被调整零件查询',
param: '工艺人员编号=' + person
}
})
}
// 根据零件查工艺 旧
export function searchProcessOld(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_在制零件工艺调整_查询工艺',
param: '工艺计划流水号=' + num
}
})
}
// 根据零件查工艺 新
export function searchProcessNew(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工序_查询工序信息',
param: '工艺计划流水号=' + num
}
})
}
// 查询各工艺员调整工艺情况
export function searchChart() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_在制零件工艺调整_被调整零件数量查询'
}
})
}

147
src/api/ManufacturingCenter/ProcessingStatusEdit.js Normal file
View File

@@ -0,0 +1,147 @@
import request from '@/utils/request'
export function getNames() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改'
}
})
}
export function getMachines(gongyi) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床',
param: '项目流水号=' + gongyi + '=int'
}
})
}
export function getGroups(stepNumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组',
param: '机床流水号=' + stepNumber + '=int'
}
})
}
export function getTable(stepNumber, a, b, c, d, e, f, g, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_加工进度修改专用',
param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=0',
Pagination: pageCurrent + '&' + pageSize
}
})
}
export function getTable2(stepNumber, a, b, c, d, e, g) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_加工进度修改',
param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=1=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=0'
}
})
}
export function handlechange(Number, code) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工序_修改数据_修改实际完成时间',
param: '工序流水号=' + Number + '&实际完成时间=' + code
}
})
}
export function handlechange2(Number, code) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工序_修改数据_工作者',
param: '工序流水号=' + Number + '&工作者考勤编号=' + code
}
})
}
export function handlechange3(Number, code) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工序_修改数据_工作者_MESWORK',
param: '工序流水号=' + Number + '&工作者考勤编号=' + code
}
})
}
export function dialogtablevisible() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '人事档案管理_部门关系_查询节点',
param: '子节点=0'
}
})
}
// 初始化人员信息 弹出框
export function getTree() {
return request({
url: '',
method: 'post',
data: {
type: 1,
name: '人事档案管理_部门关系_查询节点',
param: '子节点=0=int'
}
})
}
export function fn(data, pid) {
const result = []
let temp
for (let i = 0; i < data.length; i++) {
if (data[i].父节点 === pid) {
const obj = { label: data[i].节点名称, id: data[i].子节点 }
temp = fn(data, data[i].子节点)
if (temp.length > 0) {
obj.children = temp
}
result.push(obj)
}
}
return result
}
export function getTable8(code) {
return request({
url: '',
method: 'post',
data: {
type: 1,
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=' + code + '=int'
}
})
}

2
src/api/ManufacturingCenter/ProductionCapacityBalance.js
View File

@@ -235,7 +235,7 @@ export function updateDate(num1, num2, date) {
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_新排产算法_制定计划_调整计划_增加数据New',
name: '车间生产管理工艺_新排产算法_制定计划_调整计划_增加数据New1',
param: '工序流水号=' + num1 + '&调整人编号=' + num2 + '&调整计划完成日期=' + date
}
})

5
src/api/ManufacturingCenter/TypicalProcessMaintenance.js
View File

@@ -23,14 +23,15 @@ export function getPartsName(num) {
})
}
export function getTableData(partsCategoriesCheck, partsCategories, partsNameCheck, partsName) {
export function getTableData(pageCurrent, pageSize, partsCategoriesCheck, partsCategories, partsNameCheck, partsName) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基础表_典型工艺名称_查询数据_综合查询',
param: `典型工艺名称分类流水号_check=${partsCategoriesCheck}&典型工艺名称分类流水号=${partsCategories}&典型工艺流水号_check=${partsNameCheck}&典型工艺流水号=${partsName}&典型工艺流水号1_check=0`
param: `典型工艺名称分类流水号_check=${partsCategoriesCheck}&典型工艺名称分类流水号=${partsCategories}&典型工艺流水号_check=${partsNameCheck}&典型工艺流水号=${partsName}&典型工艺流水号1_check=0`,
Pagination: pageCurrent + '&' + pageSize
}
})
}

2
src/api/ManufacturingCenter/WorkshopEquipmentManagement.js
View File

@@ -6,7 +6,7 @@ export function getData(check, equipmentName, pageCurrent, pageSize) {
method: 'post',
data: {
type: '1',
name: '设备管理_设备加工能力_查询数据_设备维护',
name: '设备管理_设备加工能力_查询数据_设备维护NEW',
param: '设备名称_check=' + check + '=int&设备名称=' + equipmentName,
pagination: pageCurrent + '&' + pageSize
}

38
src/api/Outsourcing/InterBudgetaryBudgets.js
View File

@@ -1,27 +1,47 @@
import request from '@/utils/request'
// 查询（未编制）
export function searchPartNum1(num1, start, end, pageCurrent, pageSize) {
export function machine() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工艺计划_查询序间外协零件_价格预算',
param: '定额人员编号=0&零件图号=' + num1 + '&开始时间=' + start + '&结束时间=' + end + '&预算状态=0',
Pagination: pageCurrent + '&' + pageSize
name: '车间生产管理工艺_序间外协_项目查询'
}
})
}
// 查询零件号（已编制）
export function searchPartNum2(num, start, end, pageCurrent, pageSize) {
export function getToolNum(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工艺计划_查询序间外协零件_价格预算',
param: '定额人员编号=0&零件图号=' + num + '&开始时间=' + start + '&结束时间=' + end + '&预算状态=1',
name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床',
param: '项目流水号=' + num
}
})
}
// 组号
export function getNum(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组',
param: '机床流水号=' + num
}
})
}
// 查询（未编制）
export function searchPartNum1(num1, num2, num3, num4, num5, num6, num7, num8, num9, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工艺计划_查询序间外协零件_价格预算_new',
param: '项目流水号_check=' + num1 + '&项目流水号=' + num2 + '&机床流水号_check=' + num3 + '&机床流水号=' + num4 + '&组件流水号_check=' + num5 + '&组件流水号=' + num6 + '&零件图号_check=' + num7 + '&零件图号=' + num8 + '&预算状态=' + num9,
Pagination: pageCurrent + '&' + pageSize
}
})

206
src/api/Outsourcing/OutsourcingTaskQuery.js Normal file
View File

@@ -0,0 +1,206 @@
import request from '@/utils/request'
// 单据状态： 1 未成交 2 成交 3 作废
export function shouhuo(num) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理_外协加工任务单_修改数据_作废',
param: '外协加工任务单流水号=' + num + '&单据状态=3'
}
})
}
// 初始化获取已生成的外协加工任务单初始化获取已生成的外协加工任务单
export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理_外协加工任务单_查询数据_查询页',
param: '外协加工任务单_check=0&外协加工任务单流水号=null&表单号_check=' + checked + '&表单号=' + contractNumber + '&外协厂家_check=' + checked1 + '&外协厂家=' + manufacturers + '&任务下达日期_时间段=' + checked2 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&单据状态_check=0&单据状态=1&外协员编号_check=0&外协员编号=' + num,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 初始化获取外协厂家数据
export function getData1() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基础表_外协厂家_查询数据'
}
})
}
// 初始化获取已预算价格，未选入到外协加工任务单的零件
export function getTable1(check, partNumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工艺计划_查询数据_外协_新',
param: '零件图号_check=' + check + '=int&零件图号=' + partNumber + '=string'
}
})
}
// 获取零件工序信息（零件号表中）
export function getprocedure(processPlan, single) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_工艺名称简称_新',
param: '工艺计划流水号=' + processPlan + '=int&单件是否外协=' + single + '=int'
}
})
}
// 外协厂家查询
export function searchManufactor(name) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基础表_外协厂家_查询数据_ 根据条件',
param: '序号_check=0=bit&序号=' + ' ' + '=string&外协厂家名称_check=1=bit&外协厂家名称=' + name + '=string&外协厂家简称_check=0=bit&外协厂家简称=' + ' ' + '=string&地址_check=0=bit&地址=' + ' ' + '=string&联系人_check=0=bit&联系人=' + ' ' + '=string&电话_check=0=bit&电话=' + ' ' + '=string&传真_check=0=bit&传真=' + ' ' + '=string&备注_check=0=bit&备注=' + ' ' + '=string&类别_check=0=bit&类别=' + ' ' + '=string&关注_check=0=bit&关注=' + ' ' + '=string&设备情况_check=0=bit&设备情况=' + ' ' + '=string'
}
})
}
// 确定价格
export function spareParts(processNum, single) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_全部_新',
param: '工艺计划流水号=' + processNum + '=int&工序数量=21=int&单件是否外协=' + single + '=int'
}
})
}
// 暂未启用
export function spareParts1(processNum, single) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_全部_新',
param: '工艺计划流水号=' + processNum + '=int&工序数量=31=int&单件是否外协=' + single + '=int'
}
})
}
// 新建外协加工任务单
export function addTable(contractNumber, personNum, manufacturers, time, freight) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理_外协加工任务单_增加数据',
param: '表单号=' + contractNumber + '=string&外协计划员编号=' + personNum + '&外协厂家=' + manufacturers + '=int&任务下达日期=' + time + '=string&运费=' + freight + '=int'
}
})
}
// 外协加工任务单修改
export function editData(Number, manufacturers, freight, documentStatus, sign, Explain) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理_外协加工任务单_修改数据',
param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=' + freight + '=int&单据状态=' + documentStatus + '=int&入库标志=' + sign + '=int&扣款说明=' + Explain
}
})
}
// 成交
export function editData1(Number, manufacturers, freight, documentStatus, sign, Explain) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理_外协加工任务单_修改数据',
param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=' + freight + '=int&单据状态=' + documentStatus + '=int&入库标志=' + sign + '=int&扣款说明=' + Explain + '&扣款_质量=0&扣款_计划=0&扣款_其他=0'
}
})
}
// 删除外协加工任务单
export function deleteData(Number) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理_外协加工任务单_删除数据',
param: '外协加工任务单流水号=' + Number + '=int'
}
})
}
// 移除零件
export function deleteData1(Number) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理_外协加工任务单_修改数据_作废',
param: '外协加工任务单明细流水号=' + Number + '&单据状态=4'
}
})
}
// 选入零件
export function insertParts(processNum, Number) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理_外协加工任务单明细_增加数据',
param: '外协加工任务单流水号=' + Number + '=int&工艺计划流水号=' + processNum + '=int'
}
})
}
// 查询任务单明细
export function getParts(Number) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理_外协加工任务单明细_查询数据',
param: '外协加工任务单流水号=' + Number + '=int'
}
})
}
// 数据库生产表单号
export function getNumber(time) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理_外协加工任务单_查询数据_单据编号',
param: '任务下达日期=' + time + '=string&表单号=1=string=output'
}
})
}
// 计算价格
export function getPrice(Number, money, money1, money2, money3) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理_外协加工任务单明细_修改数据',
param: '外协加工任务单明细流水号=' + Number + '=int&加工价格_预算=' + money + '&加工价格_成交=' + money1 + '&材料价格_价格=' + money2 + '&其他价格=' + money3 + '&入库标志=1=int&交检数量=0=int&合格数量=0=int&回用数量=0=int&废品数量=0=int'
}
})
}

37
src/api/Outsourcing/PreorderAssociation.js
View File

@@ -1,14 +1,47 @@
import request from '@/utils/request'
export function machine() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_序间外协_项目查询'
}
})
}
export function getToolNum(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床',
param: '项目流水号=' + num
}
})
}
// 组号
export function getNum(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组',
param: '机床流水号=' + num
}
})
}
// 查询表1
export function searchTable(check, num1, pageCurrent, pageSize) {
export function searchTable(num1, num2, num3, num4, num5, num6, check, num7, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新',
param: '项目流水号_check=0&项目流水号=0&机床流水号_check=0&机床流水号=0&组件流水号_check=0&组件流水号=0&零件图号_check=' + check + '&零件图号=' + num1 + '&考核状态_check=0&考核状态=0&单件是否外协_check=1&单件是否外协=1&时间=0&机加工开始时间=0&机加工结束时间=0&零件类型=0',
param: '项目流水号_check=' + num1 + '&项目流水号=' + num2 + '&机床流水号_check=' + num3 + '&机床流水号=' + num4 + '&组件流水号_check=' + num5 + '&组件流水号=' + num6 + '&零件图号_check=' + check + '&零件图号=' + num7 + '&考核状态_check=0&考核状态=0&单件是否外协_check=1&单件是否外协=1&时间=0&机加工开始时间=0&机加工结束时间=0&零件类型=0',
Pagination: pageCurrent + '&' + pageSize
}
})

197
src/api/PurchasingCenter/MaterialManagement.js Normal file
View File

@@ -0,0 +1,197 @@
import request from '@/utils/request'
export function initDepartmentName() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_物料主文件_基本_物料部门_查询数据'
}
})
}
export function initMaterialCategory(check, DepartmentValue) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_物料类别编号_查询数据_根据物料部门编号',
param: '物料部门流水号_check=' + check + '=int&物料部门流水号=' + DepartmentValue
}
})
}
export function initMaterialVariety(MaterialCategoryValue) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_物料品种编号_查询数据',
param: '物料类别流水号=' + MaterialCategoryValue
}
})
}
export function initMeasurementUnit() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_计量单位主文件_查询数据'
}
})
}
export function initMaterialSource() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_物料来源_查询数据'
}
})
}
export function searchmaterial(check1, MaterialName, check2, FullNameOfMaterial, check3, MaterialSpecification, check4, MaterialModel, pageCurrent, pageSize, check5, MaterialCategoryValue, check6, MaterialVarietyValue, check7, MeasurementUnitValue, check8, MaterialSourceValue, check9, supplierValue) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_物料主文件_基本_查询数据_分页',
param: '物料流水号_check=0&物料代码_check=0&物料名称_check=' + check1 + '=int&物料名称=' + MaterialName + '&物料全名_check=' + check2 + '=int&物料全名=' + FullNameOfMaterial + '&物料规格_check=' + check3 + '=int&物料规格=' + MaterialSpecification + '&物料型号_check=' + check4 + '=int&物料型号=' + MaterialModel + '&物料类别流水号_check=' + check5 + '=int&物料类别流水号=' + MaterialCategoryValue + '&物料品种流水号_check=' + check6 + '=int&物料品种流水号=' + MaterialVarietyValue + '&供货商流水号_check=' + check9 + '&供货商流水号=' + supplierValue + '&计量单位流水号_check=' + check7 + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号_check=' + check8 + '&物料来源流水号=' + MaterialSourceValue + '&PageCurrent=' + pageCurrent + '=int&PageSize=' + pageSize + '=int&PageCount=1=int=output&ItemCount=1=int=output'
}
})
}
export function getSupplier(check, num, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_供货商_查询数据_根据条件',
param: '供货商_check=' + check + '=int&供货商=' + num,
Pagination: pageCurrent + '&' + pageSize
}
})
}
export function addData(MaterialVariety, MaterialName, FullNameOfMaterial, MaterialSpecification, MaterialModel, MeasurementUnitValue, MaterialSourceValue, supplierValue1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_物料主文件_基本_增加数据',
param: '物料品种流水号=' + MaterialVariety + '&物料名称=' + MaterialName + '&物料全名=' + FullNameOfMaterial + '&物料规格=' + MaterialSpecification + '&物料型号=' + MaterialModel + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号=' + MaterialSourceValue + '&供货商流水号=' + supplierValue1
}
})
}
export function editData(MaterialValue, MaterialVariety, MaterialName, FullNameOfMaterial, MaterialSpecification, MaterialModel, MeasurementUnitValue, MaterialSourceValue, supplierValue1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_物料主文件_基本_修改数据',
param: '物料流水号=' + MaterialValue + '&物料品种流水号=' + MaterialVariety + '&物料名称=' + MaterialName + '&物料全名=' + FullNameOfMaterial + '&物料规格=' + MaterialSpecification + '&物料型号=' + MaterialModel + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号=' + MaterialSourceValue + '&供货商流水号=' + supplierValue1
}
})
}
export function deleteData(num) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_物料主文件_基本_删除数据',
param: '物料流水号=' + num
}
})
}
export function searchCategory() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_物料类别编号_查询数据_根据物料部门编号'
}
})
}
export function searchVarieties(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_物料品种编号_查询数据',
param: '物料类别流水号=' + num
}
})
}
export function editCategory(MaterialCategoryNum, MaterialCategory2, CategoryNumber) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_物料类别编号_修改数据',
param: '物料类别流水号=' + MaterialCategoryNum + '&物料类别=' + MaterialCategory2 + '&类别编号=' + CategoryNumber
}
})
}
export function addCategory(MaterialCategory2, CategoryNumber) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_物料类别编号_增加数据',
param: '物料类别=' + MaterialCategory2 + '&类别编号=' + CategoryNumber
}
})
}
export function deleteCategory(MaterialCategoryNum) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_物料类别编号_删除数据',
param: '物料类别流水号=' + MaterialCategoryNum
}
})
}
export function editVariety(MaterialVarietyNum, MaterialCategoryNum, MaterialVariety2, VarietyNumber, Specifications1, Specifications2) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_物料品种编号_修改数据',
param: '物料品种流水号=' + MaterialVarietyNum + '&物料类别流水号=' + MaterialCategoryNum + '&物料品种=' + MaterialVariety2 + '&品种编号=' + VarietyNumber + '&规格1=' + Specifications1 + '&规格2=' + Specifications2
}
})
}
export function addVariety(MaterialCategoryNum, MaterialVariety2, VarietyNumber, Specifications1, Specifications2) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_物料品种编号_增加数据',
param: '物料类别流水号=' + MaterialCategoryNum + '&物料品种=' + MaterialVariety2 + '&品种编号=' + VarietyNumber + '&规格1=' + Specifications1 + '&规格2=' + Specifications2
}
})
}
export function deleteVariety(MaterialVarietyNum) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_物料品种编号_删除数据',
param: '物料品种流水号=' + MaterialVarietyNum
}
})
}

11
src/api/PurchasingCenter/PurchaseTaskAllocate.js
View File

@@ -47,4 +47,15 @@ export function allocateTask(group, person) {
param: `标准件和外购件流水号组=${group}&人员编号=${person}`
}
})
}// 执行退回
export function executeReturn(...params) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '采购部采购_退回物料',
param: `标准件和外购件流水号组=${params[0]}&组件零件流水号组=${params[1]}`
}
})
}

16
src/api/PurchasingCenter/ReceiptConnectionSheet.js
View File

@@ -49,8 +49,8 @@ export function deleteInvoice(num1) {
}
})
}
// 传送人接收人初始化 采购科改16
export function initPerson() {
// 传送人初始化 采购科改16
export function initSender() {
return request({
url: '',
method: 'post',
@@ -61,6 +61,18 @@ export function initPerson() {
}
})
}
// 接收人初始化 财务部7
export function initReceiver() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=7'
}
})
}
// 初始化合同号
export function initContract() {
return request({

5
src/api/PurchasingCenter/ReceiveCheck.js
View File

@@ -12,15 +12,14 @@ export function initProject() {
})
}
// 初始化项目金额统计表
export function searchReceiveCheck(pageCurrent, pageSize, check, num) {
export function searchReceiveCheck(check, num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '采购管理_领用核算_查询数据',
param: `项目流水号_check=${check}&项目流水号=${num}`,
Pagination: pageCurrent + '&' + pageSize
param: `项目流水号_check=${check}&项目流水号=${num}`
}
})
}

0
src/api/PurchasingCenter/qrcodeGeneration.js
View File

12
src/api/TechnologyCenter/CreatePackingList.js
View File

@@ -148,7 +148,7 @@ export function deleteFileData(num) {
data: {
type: '2',
name: 'PDM_装箱单_随机技术文件_删除数据',
param: `序号=${num}`
param: `文件编号=${num}`
}
})
}
@@ -160,7 +160,7 @@ export function editFileData(name, number, remark, num) {
data: {
type: '2',
name: 'PDM_装箱单_随机技术文件_修改数据',
param: `名称=${name}&数量=${number}&备注=${remark}&序号=${num}`
param: `名称=${name}&数量=${number}&备注=${remark}&文件编号=${num}`
}
})
}
@@ -196,24 +196,24 @@ export function deleteSpareData(num) {
data: {
type: '2',
name: 'PDM_装箱单_备件_删除数据',
param: `序号=${num}`
param: `备件编号=${num}`
}
})
}
export function editSpareData(name, specification, number, unit, remark, num) {
export function editSpareData(name, specification, unit, number, remark, num) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'PDM_装箱单_备件_修改数据',
param: `名称=${name}&规格=${specification}&数量=${number}&单位=${unit}&备注=${remark}&序号=${num}`
param: `名称=${name}&规格=${specification}&数量=${number}&单位=${unit}&备注=${remark}&备件编号=${num}`
}
})
}
export function addSpareData(name, specification, number, unit, remark, num) {
export function addSpareData(name, specification, unit, number, remark, num) {
return request({
url: '',
method: 'post',

14
src/api/WorkshopProcurement/ArrivalStateSearch.js
View File

@@ -31,7 +31,19 @@ export function searchArrivalNum(num) {
method: 'post',
data: {
type: '1',
name: '车间管理_合同物料到货情况_查询数据',
name: '车间管理_合同物料到货情况_查询数据_外购件',
param: `采购合同流水号=${num}`
}
})
}
// 查询到货情况
export function searchArrivalNum1(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间管理_合同物料到货情况_查询数据_基本件',
param: `采购合同流水号=${num}`
}
})

26
src/api/WorkshopProcurement/CreatingProcurementContracts.js
View File

@@ -44,6 +44,28 @@ export function searchData(num) {
}
})
}
export function searchData1(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间管理_基本件采购_请购单明细_查询数据_外购件',
param: '请购单流水号=' + num
}
})
}
export function searchData2(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间管理_基本件采购_请购单明细_查询数据_基本件',
param: '请购单流水号=' + num
}
})
}
// 初始化付款时间节点
export function initPayTimeNode() {
return request({
@@ -116,14 +138,14 @@ export function searchSheetContract(num1) {
})
}
// 生成采购合同
export function doneContract(num1, RequisitionNumber, name1, time1, time2, method, num2, text, freight, num3, partsNum, priceGroup, dayGroup, payGroup, planGroup, taxGroup, currency, num4, id) {
export function doneContract(num1, RequisitionNumber, name1, time1, time2, method, num2, text, freight, num3, partsNum, priceGroup, payGroup, planGroup, taxGroup, currency, num4, id) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间管理_基本件采购_请购单和请购单明细_增加数据',
param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&付款方式=${method}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&运费=${freight}&物料流水号组=${num3}&请购单明细流水号组=${num4}&数量组=${partsNum}&单价组=${priceGroup}&发货天数组=${dayGroup}&付款比例组=${payGroup}&计划付款时间组=${planGroup}&税率组=${taxGroup}&币种流水号组=${currency}`
param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&付款方式=${method}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&运费=${freight}&物料流水号组=${num3}&请购单明细流水号组=${num4}&数量组=${partsNum}&单价组=${priceGroup}&付款比例组=${payGroup}&计划付款时间组=${planGroup}&税率组=${taxGroup}&币种流水号组=${currency}`
}
})
}

2
src/api/WorkshopProcurement/DepartmentBuyerRequestFund.js
View File

@@ -8,7 +8,7 @@ export function searchTable1(pageCurrent, pageSize, check1, start, end, check2,
data: {
type: '1',
name: '车间采购管理_请款表_查询数据',
param: '时间段_check=' + check1 + '&开始时间=' + start + '&结束时间=' + end + '&合同号_check=' + check2 + '&采购合同编号=' + num1 + '&采购员_check=' + check3 + '&采购员姓名=' + name1 + '&供应商_check=' + check4 + '&供应商名称=' + name2,
param: '时间段_check=' + check1 + '&开始时间=' + start + '&结束时间=' + end + '&合同号_check=' + check2 + '&采购合同编号=' + num1 + '&采购员_check=' + check3 + '&采购员流水号=' + name1 + '&供应商_check=' + check4 + '&供应商名称=' + name2,
Pagination: pageCurrent + '&' + pageSize
}
})

16
src/api/WorkshopProcurement/ProcurementContractApproval.js
View File

@@ -7,7 +7,7 @@ export function initContract() {
method: 'post',
data: {
type: '1',
name: '采购管理_采购合同_查询_cjn'
name: '车间采购管理_采购合同_查询_cjn'
}
})
}
@@ -43,7 +43,19 @@ export function searchTable2(num) {
method: 'post',
data: {
type: '1',
name: '车间采购管理_采购合同明细_查询数据',
name: '车间采购管理_采购合同_查询数据_外购件',
param: '采购合同流水号=' + num
}
})
}
// 采购合同明细查询
export function searchTable3(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间采购管理_采购合同_查询数据_基本件',
param: '采购合同流水号=' + num
}
})

16
src/api/WorkshopProcurement/ProcurementContractEnquiry.js
View File

@@ -7,7 +7,7 @@ export function initContract() {
method: 'post',
data: {
type: '1',
name: '采购管理_采购合同_查询_cjn'
name: '车间采购管理_采购合同_查询_cjn'
}
})
}
@@ -43,7 +43,19 @@ export function searchTable2(num) {
method: 'post',
data: {
type: '1',
name: '车间采购管理_采购合同明细_查询数据',
name: '车间采购管理_采购合同_查询数据_外购件',
param: '采购合同流水号=' + num
}
})
}
// 采购合同明细查询
export function searchTable3(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间采购管理_采购合同_查询数据_基本件',
param: '采购合同流水号=' + num
}
})

14
src/api/WorkshopProcurement/ProjectTotalSearch.js
View File

@@ -30,7 +30,19 @@ export function searchProjectTotal1(num) {
method: 'post',
data: {
type: '1',
name: '车间采购管理_项目总价_明细_查询数据',
name: '车间采购管理_项目总价_明细_查询数据_外购件',
param: `项目流水号=${num}`
}
})
}
// 初始化项目金额统计表
export function searchProjectTotal2(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间采购管理_项目总价_明细_查询数据_基本件',
param: `项目流水号=${num}`
}
})

40
src/api/WorkshopProcurement/PurchaseContractChange.js
View File

@@ -11,6 +11,17 @@ export function initContract() {
}
})
}
// 初始化合同号
export function initContract1() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间采购管理_采购合同变更_合同初始化'
}
})
}
// 初始化采购员(考核部门编号：采购部：2)
export function initBuyer() {
return request({
@@ -43,7 +54,19 @@ export function searchTable2(num) {
method: 'post',
data: {
type: '1',
name: '车间采购管理_采购合同明细_查询数据',
name: '车间采购管理_采购合同_查询数据_外购件',
param: '采购合同流水号=' + num
}
})
}
// 采购合同明细查询
export function searchTable5(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间采购管理_采购合同_查询数据_基本件',
param: '采购合同流水号=' + num
}
})
@@ -56,7 +79,7 @@ export function searchTable3(pageCurrent, pageSize, check1, start, end, check2,
data: {
type: '1',
name: '车间采购管理_采购合同变更_查询数据_根据条件_cjn',
param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier,
param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同变更流水号_check=' + check2 + '&采购合同变更流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier,
Pagination: pageCurrent + '&' + pageSize
}
})
@@ -68,7 +91,18 @@ export function searchTable4(num) {
method: 'post',
data: {
type: '1',
name: '车间采购管理_采购合同明细变更_查询数据',
name: '车间采购管理_采购合同明细变更_查询数据_外购件',
param: '采购合同变更流水号=' + num
}
})
}
export function searchTable6(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间采购管理_采购合同明细变更_查询数据_基本件',
param: '采购合同变更流水号=' + num
}
})

1
src/icons/svg/EquipmentCapabilitySetting.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1532937900139" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1990" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M737 942a207 207 0 1 1 207-207 207.234 207.234 0 0 1-207 207z m0-342a135 135 0 1 0 135 135 135.152 135.152 0 0 0-135-135z m-36 60h72v54h40v72H701V660zM508 906H174a96.11 96.11 0 0 1-96-96V174a96.108 96.108 0 0 1 96-96h540a96.11 96.11 0 0 1 96 96v304h-72V174a24.028 24.028 0 0 0-24-24H174a24.028 24.028 0 0 0-24 24v636a24.028 24.028 0 0 0 24 24h334v72zM292.74 464L188 356.624l51.4-50.094 50.814 52.09 98.042-110.632L442 295.566zM666 414H460v-72h206v72zM292.74 716L188 608.624l51.4-50.094 50.814 52.09 98.042-110.632L442 547.566z" p-id="1991" fill="#ffffff"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 954 B

1
src/icons/svg/InterBudgetaryBudgets.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543302086129" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1091" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M770.714831 959.25644 244.333286 959.25644c-43.549865 0-78.993099-35.438117-78.993099-78.926584L165.340187 143.321196c0-43.48949 35.443233-78.949097 78.993099-78.949097l526.381545 0c43.552935 0 78.995145 35.46063 78.995145 78.949097l0 737.00866C849.709977 923.819346 814.267766 959.25644 770.714831 959.25644L770.714831 959.25644zM244.333286 117.021204c-14.517645 0-26.315342 11.834536-26.315342 26.301016l0 737.00866c0 14.557554 11.797697 26.301016 26.315342 26.301016l526.381545 0c14.517645 0 26.318412-11.744485 26.318412-26.301016L797.033243 143.321196c0-14.465456-11.800767-26.301016-26.318412-26.301016L244.333286 117.02018 244.333286 117.021204zM725.708801 407.740448 289.339316 407.740448c-26.121937 0-47.385217-22.332634-47.385217-49.718355L241.954099 225.870284c0-27.477818 21.263279-49.718355 47.385217-49.718355l436.369485 0c26.121937 0 47.388287 22.240537 47.388287 49.718355l0 132.151809C773.096065 385.407814 751.830739 407.740448 725.708801 407.740448L725.708801 407.740448zM294.582737 355.092367l425.883667 0L720.466404 228.777497 294.582737 228.777497 294.582737 355.092367 294.582737 355.092367zM400.957463 607.282087c0 11.535731-9.467629 20.971637-21.072945 20.971637l-90.545202 0c-11.605316 0-21.069875-9.435906-21.069875-20.971637l0-90.600461c0-11.650341 9.464559-21.063735 21.069875-21.063735l90.545202 0c11.604292 0 21.072945 9.413394 21.072945 21.063735L400.957463 607.282087 400.957463 607.282087zM577.001945 607.282087c0 11.535731-9.41851 20.971637-21.023826 20.971637l-90.548272 0c-11.651364 0-21.069875-9.435906-21.069875-20.971637l0-90.600461c0-11.650341 9.41851-21.063735 21.069875-21.063735l90.548272 0c11.605316 0 21.023826 9.413394 21.023826 21.063735L577.001945 607.282087 577.001945 607.282087zM746.783793 607.282087c0 11.535731-9.41851 20.971637-21.076014 20.971637l-90.543156 0c-11.605316 0-21.069875-9.435906-21.069875-20.971637l0-90.600461c0-11.650341 9.464559-21.063735 21.069875-21.063735l90.543156 0c11.657504 0 21.076014 9.413394 21.076014 21.063735L746.783793 607.282087 746.783793 607.282087zM400.957463 806.710139c0 11.651364-9.467629 21.086248-21.072945 21.086248l-90.545202 0c-11.605316 0-21.069875-9.435906-21.069875-21.086248l0-90.485851c0-11.651364 9.464559-21.063735 21.069875-21.063735l90.545202 0c11.604292 0 21.072945 9.41237 21.072945 21.063735L400.957463 806.710139 400.957463 806.710139zM577.001945 806.710139c0 11.651364-9.41851 21.086248-21.023826 21.086248l-90.548272 0c-11.651364 0-21.069875-9.435906-21.069875-21.086248l0-90.485851c0-11.651364 9.41851-21.063735 21.069875-21.063735l90.548272 0c11.605316 0 21.023826 9.41237 21.023826 21.063735L577.001945 806.710139 577.001945 806.710139zM746.783793 806.710139c0 11.651364-9.41851 21.086248-21.076014 21.086248l-90.543156 0c-11.605316 0-21.069875-9.435906-21.069875-21.086248l0-90.485851c0-11.651364 9.464559-21.063735 21.069875-21.063735l90.543156 0c11.657504 0 21.076014 9.41237 21.076014 21.063735L746.783793 806.710139 746.783793 806.710139zM746.783793 806.710139" p-id="1092"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

1
src/icons/svg/MaintenanceEquipmentPerson.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1532937378997" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2118" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M128 384h128v512H128zM320 128h128v768H320zM512 544h128v352H512zM896 576a96 96 0 0 0-64-90.53V576h-64v-90.53a96 96 0 0 0 0 181.06v216.31A13.16 13.16 0 0 0 781.16 896h37.68A13.16 13.16 0 0 0 832 882.84V666.53A96 96 0 0 0 896 576z" p-id="2119" fill="#ffffff"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 655 B

1
src/icons/svg/MaterialMaintenance.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1532937719569" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4070" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M596.48 332.288l-368.64-2.048c-14.336 0-25.6-11.776-25.6-25.6 0-14.336 11.776-25.6 25.6-25.6l368.64 2.048c14.336 0 25.6 11.776 25.6 25.6 0 14.336-11.776 25.6-25.6 25.6zM601.6 521.728l-368.64-2.048c-14.336 0-25.6-11.776-25.6-25.6 0-14.336 11.776-25.6 25.6-25.6l368.64 2.048c14.336 0 25.6 11.776 25.6 25.6 0 14.336-11.776 25.6-25.6 25.6zM471.04 711.168l-235.52-2.048c-14.336 0-25.6-11.776-25.6-25.6s11.776-25.6 25.6-25.6l235.52 2.048c14.336 0 25.6 11.776 25.6 25.6 0 14.336-11.776 25.6-25.6 25.6zM788.992 939.52c-78.848 0-143.36-64.512-143.36-143.36s64.512-143.36 143.36-143.36 143.36 64.512 143.36 143.36-64.512 143.36-143.36 143.36z m0-235.52c-50.688 0-92.16 41.472-92.16 92.16s41.472 92.16 92.16 92.16 92.16-41.472 92.16-92.16-41.472-92.16-92.16-92.16z" p-id="4071"></path><path d="M785.92 683.52c-14.336 0-25.6-11.264-25.6-25.6v-40.96c0-14.336 11.264-25.6 25.6-25.6s25.6 11.264 25.6 25.6v40.96c0 14.336-11.264 25.6-25.6 25.6zM691.712 726.016c-6.656 0-13.312-2.56-18.432-7.68l-29.696-30.72c-9.728-10.24-9.728-26.624 0.512-36.352 10.24-9.728 26.624-9.728 36.352 0.512l29.696 30.72c9.728 10.24 9.728 26.624-0.512 36.352-5.12 4.608-11.264 7.168-17.92 7.168zM652.8 821.76h-40.96c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h40.96c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6zM663.552 948.736c-6.656 0-13.312-2.56-17.92-7.68-10.24-10.24-10.24-26.112 0-36.352l30.208-30.208c10.24-10.24 26.112-10.24 36.352 0s10.24 26.112 0 36.352l-30.208 30.208c-5.12 5.12-11.776 7.68-18.432 7.68zM791.04 1000.96c-14.336 0-25.6-11.264-25.6-25.6v-46.08c0-14.336 11.264-25.6 25.6-25.6s25.6 11.264 25.6 25.6v46.08c0 14.336-11.264 25.6-25.6 25.6zM916.48 947.712c-6.656 0-13.312-2.56-17.92-7.68l-30.208-30.208c-10.24-10.24-10.24-26.112 0-36.352s26.112-10.24 36.352 0l30.208 30.208c10.24 10.24 10.24 26.112 0 36.352-5.12 5.12-11.776 7.68-18.432 7.68zM970.24 821.76h-46.08c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h46.08c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6zM884.736 724.992c-6.656 0-13.312-2.56-17.92-7.68-10.24-10.24-10.24-26.112 0-36.352l30.208-30.208c10.24-10.24 26.112-10.24 36.352 0s10.24 26.112 0 36.352l-30.208 30.208c-5.12 5.12-11.776 7.68-18.432 7.68zM317.44 1005.056H38.4c-14.336 0-25.6-11.264-25.6-25.6V35.84c0-14.336 11.264-25.6 25.6-25.6h733.696c14.336 0 25.6 11.264 25.6 25.6v276.992c0 14.336-11.264 25.6-25.6 25.6s-25.6-11.264-25.6-25.6V61.44H64v892.416H317.44c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6z" p-id="4072"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

1
src/icons/svg/MaterialManagement.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1539331081532" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2108" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M357.856 506.24L230.72 434.4a22.4 22.4 0 0 0-29.664 6.976 19.744 19.744 0 0 0 7.392 27.936l127.136 71.872a22.4 22.4 0 0 0 29.664-6.976 19.776 19.776 0 0 0-7.392-27.968z" p-id="2109"></path><path d="M906.048 407.52c-11.968 0-21.632 9.12-21.632 20.384v251.584l-363.552 193.408V516.544c0-1.568-0.608-2.944-0.928-4.416l371.328-198.272a19.808 19.808 0 0 0-0.96-35.904L508.928 98.272a22.944 22.944 0 0 0-19.328 0L108.224 277.952a19.296 19.296 0 0 0-10.464 23.424 18.336 18.336 0 0 0-1.44 6.752v383.296c0 7.168 3.968 13.76 10.432 17.44l381.376 216.352 0.16 0.064c0.256 0.128 0.576 0.128 0.8 0.288a22.976 22.976 0 0 0 8.608 2.304c0.992 0.064 1.952-0.096 2.944-0.16a22.08 22.08 0 0 0 7.456-1.76c0.608-0.256 1.184-0.128 1.792-0.448l406.816-216.384a20.16 20.16 0 0 0 11.008-17.728v-263.488c-0.032-11.232-9.728-20.384-21.664-20.384zM477.664 871.712L139.488 679.872v-348.8l339.104 181.056c-0.352 1.472-0.928 2.848-0.928 4.416v355.168zM834.656 297.28l-335.392 179.072L163.904 297.28l335.328-158.016L834.656 297.28z" p-id="2110"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

1
src/icons/svg/OutFactoryMaintenance.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543302210318" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2855" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M851.2 953.6c-12.8 0-19.2-6.4-19.2-19.2V556.8c0-64-44.8-108.8-96-108.8h-448C236.8 448 192 492.8 192 556.8v377.6c0 12.8-6.4 19.2-19.2 19.2s-19.2-6.4-19.2-19.2V556.8c0-83.2 57.6-147.2 134.4-147.2h448c70.4 0 134.4 64 134.4 147.2v377.6c0 12.8-12.8 19.2-19.2 19.2z" fill="" p-id="2856"></path><path d="M947.2 960H76.8c-6.4 0-12.8-6.4-12.8-19.2s6.4-19.2 19.2-19.2h864c12.8 0 19.2 6.4 19.2 19.2s-12.8 19.2-19.2 19.2z" fill="" p-id="2857"></path><path d="M556.8 960h-256c-25.6 0-44.8-19.2-44.8-44.8v-236.8c0-25.6 19.2-44.8 44.8-44.8h249.6c25.6 0 44.8 19.2 44.8 44.8v236.8c6.4 25.6-19.2 44.8-38.4 44.8z m-256-288c-6.4 0-6.4 0-6.4 6.4v236.8c0 6.4 0 6.4 6.4 6.4h249.6c6.4 0 6.4 0 6.4-6.4v-236.8c0-6.4 0-6.4-6.4-6.4H300.8zM627.2 448H512c-25.6 0-44.8-19.2-44.8-44.8v-64c0-25.6 19.2-44.8 44.8-44.8h115.2c25.6 0 44.8 19.2 44.8 44.8v64c0 25.6-19.2 44.8-44.8 44.8zM512 332.8c-6.4 0-6.4 0-6.4 6.4v64c0 6.4 0 6.4 6.4 6.4h115.2c6.4 0 6.4 0 6.4-6.4v-64c0-6.4 0-6.4-6.4-6.4H512zM851.2 550.4c-12.8 0-19.2-6.4-19.2-19.2V102.4l-70.4-6.4-6.4 326.4c0 12.8-6.4 19.2-19.2 19.2s-19.2-6.4-19.2-19.2v-320c0-25.6 19.2-44.8 44.8-44.8H832c25.6 0 44.8 19.2 44.8 44.8v428.8c-6.4 6.4-19.2 19.2-25.6 19.2z" fill="" p-id="2858"></path><path d="M428.8 953.6c-12.8 0-19.2-6.4-19.2-19.2v-281.6c0-12.8 6.4-19.2 19.2-19.2s19.2 6.4 19.2 19.2v281.6c0 12.8-12.8 19.2-19.2 19.2zM582.4 556.8H275.2c-12.8 0-19.2-6.4-19.2-19.2s6.4-19.2 19.2-19.2H576c12.8 0 19.2 6.4 19.2 19.2s-6.4 19.2-12.8 19.2z" fill="" p-id="2859"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

1
src/icons/svg/OutsourcingDataMaintenance.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543302266001" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3839" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M227.556 113.778h113.777v56.889H227.556z m0 341.333h113.777V512H227.556z m0 341.333h113.777v56.89H227.556z" fill="#73777A" p-id="3840"></path><path d="M853.333 56.889v170.667H170.667V56.889h682.666M910.223 0H113.777v284.444h796.444V0z m-56.89 398.222V568.89H170.667V398.222h682.666m56.89-56.889H113.777v284.445h796.444V341.333z m-56.89 398.223v170.666H170.667V739.556h682.666m56.89-56.89H113.777v284.445h796.444V682.667z" fill="#73777A" p-id="3841"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 848 B

1
src/icons/svg/OutsourcingInspectionEntry.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543302366055" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5388" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M747.52 1020.16H131.84c-39.68 0-70.4-32-70.4-70.4V74.24C61.44 34.56 93.44 3.84 131.84 3.84h753.92c39.68 0 70.4 32 70.4 70.4v718.08c0 12.8-10.24 23.04-23.04 23.04s-23.04-10.24-23.04-23.04V74.24c0-14.08-11.52-25.6-25.6-25.6H131.84c-14.08 0-25.6 11.52-25.6 25.6v874.24c0 14.08 11.52 25.6 25.6 25.6h615.68c12.8 0 23.04 10.24 23.04 23.04s-11.52 23.04-23.04 23.04z" fill="" p-id="5389"></path><path d="M687.36 236.8H256c-12.8 0-23.04-10.24-23.04-23.04S244.48 192 256 192h431.36c12.8 0 23.04 10.24 23.04 23.04s-10.24 21.76-23.04 21.76zM682.24 396.8H250.88c-12.8 0-23.04-10.24-23.04-23.04s10.24-23.04 23.04-23.04h431.36c12.8 0 23.04 10.24 23.04 23.04s-10.24 23.04-23.04 23.04zM526.08 556.8H248.32c-12.8 0-23.04-10.24-23.04-21.76s10.24-23.04 23.04-23.04h277.76c12.8 0 21.76 10.24 21.76 23.04s-8.96 21.76-21.76 21.76zM701.44 642.56c53.76 0 97.28 43.52 97.28 97.28s-43.52 97.28-97.28 97.28-97.28-43.52-97.28-97.28 44.8-97.28 97.28-97.28m0-44.8c-78.08 0-142.08 64-142.08 142.08s64 142.08 142.08 142.08 142.08-64 142.08-142.08S780.8 597.76 701.44 597.76z" fill="" p-id="5390"></path><path d="M908.8 986.88c-6.4 0-11.52-2.56-16.64-6.4l-124.16-128c-8.96-8.96-8.96-23.04 0-32s23.04-8.96 32 0l124.16 128c8.96 8.96 8.96 23.04 0 32-3.84 3.84-10.24 6.4-15.36 6.4z" fill="" p-id="5391"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

1
src/icons/svg/OutsourcingPaymentPlanManagement.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543302138984" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1877" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M762.503311 141.113925c-14.285355-9.653871-33.714869-5.90243-43.363623 8.393157-9.658987 14.295588-5.907547 33.709753 8.388041 43.367717 106.359376 71.861678 169.863712 191.280488 169.863712 319.443449 0 212.412784-172.811858 385.220548-385.220548 385.220548S126.956484 724.732056 126.956484 512.318248c0-128.168078 63.49922-247.586888 169.858596-319.443449 14.295588-9.658987 18.057261-29.073152 8.398274-43.363623-9.648754-14.295588-29.073152-18.052145-43.363623-8.398274C138.267087 224.602408 64.488757 363.373984 64.488757 512.318248c0 246.854201 200.827935 447.687252 447.682136 447.687252S959.859167 759.173472 959.859167 512.318248C959.859167 363.373984 886.075721 224.607524 762.503311 141.113925z" p-id="1878"></path><path d="M400.698055 64.636113c-17.248849 0-31.233352 13.984503-31.233352 31.233352l0 30.470989c0 17.248849 13.985526 31.233352 31.233352 31.233352 17.248849 0 31.233352-13.985526 31.233352-31.233352L431.931407 95.869465C431.931407 78.621639 417.946904 64.636113 400.698055 64.636113z" p-id="1879"></path><path d="M623.649869 64.636113c-17.248849 0-31.233352 13.984503-31.233352 31.233352l0 30.470989c0 17.248849 13.985526 31.233352 31.233352 31.233352 17.248849 0 31.233352-13.985526 31.233352-31.233352L654.883221 95.869465C654.883221 78.621639 640.897695 64.636113 623.649869 64.636113z" p-id="1880"></path><path d="M425.695379 227.656977c11.209296 18.047028 41.974997 48.588625 86.157265 48.588625 43.958164 0 75.100442-30.3134 86.573751-48.223305 9.302877-14.528901 5.068436-33.846876-9.455349-43.149752-14.544251-9.29776-33.846876-5.063319-43.149752 9.455349-0.121773 0.198521-13.379729 19.449981-33.968649 19.449981-20.008706 0-32.443923-18.127869-33.276894-19.373233-9.165754-14.427594-28.285207-18.799158-42.829458-9.760295C421.089477 193.749726 416.59 213.006302 425.695379 227.656977z" p-id="1881"></path><path d="M356.00311 591.05859c-17.248849 0-31.233352 13.984503-31.233352 31.233352s13.984503 31.233352 31.233352 31.233352L480.93754 653.525294l0 98.250698c0 17.248849 13.984503 31.238468 31.233352 31.238468 17.248849 0 31.233352-13.989619 31.233352-31.238468l0-98.250698 124.93443 0c17.248849 0 31.238468-13.984503 31.238468-31.233352s-13.989619-31.233352-31.238468-31.233352L543.405267 591.05859l0-83.289961 124.93443 0c17.248849 0 31.238468-13.985526 31.238468-31.233352 0-17.248849-13.989619-31.233352-31.238468-31.233352l-80.761372 0 68.041676-68.038606c12.20088-12.20088 12.20088-31.976272 0.005117-44.171012-12.195763-12.20088-31.976272-12.195763-44.171012-0.005117l-99.280144 99.276051-99.280144-99.276051c-12.190647-12.190647-31.971156-12.195763-44.171012 0.005117-12.195763 12.195763-12.195763 31.971156 0.005117 44.171012l68.041676 68.038606-80.766488 0c-17.248849 0-31.233352 13.984503-31.233352 31.233352 0 17.248849 13.984503 31.233352 31.233352 31.233352L480.93754 507.768629l0 83.289961L356.00311 591.05859z" p-id="1882"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

1
src/icons/svg/OutsourcingTaskExecution.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543302173366" class="icon" style="" viewBox="0 0 1044 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2695" xmlns:xlink="http://www.w3.org/1999/xlink" width="203.90625" height="200"><defs><style type="text/css"></style></defs><path d="M840.454 62.442h-638.605c-76.445 0-139.409 63.68-139.409 141.007v614.048c0 77.326 62.963 141.007 139.408 141.007h638.605c76.454 0 139.408-63.68 139.408-141.007v-614.048c0-77.326-58.454-141.007-139.408-141.007zM912.409 822.050c0 40.931-31.473 72.772-71.954 72.772h-638.605c-40.473 0-71.954-31.84-71.954-72.772v-618.603c0-40.931 31.481-72.772 71.954-72.772h638.605c40.481 0 71.954 31.84 71.954 72.772v618.603zM399.73 285.32l-98.936 100.065-44.973-45.477c-13.5-13.647-35.981-13.647-44.973 0-13.5 13.638-13.5 36.386 0 45.477l71.954 72.781c4.5 4.546 13.492 9.092 26.981 9.092 13.5 0 13.5-4.546 26.981-9.092l121.426-122.813c13.5-13.647 13.5-36.386 0-45.487-26.981-13.638-44.973-13.638-58.463-4.546zM813.473 339.908h-310.308c-22.481 0-31.481 13.638-31.481 31.84 0 22.739 13.5 31.84 31.481 31.84h310.316c22.481 0 31.473-13.647 31.473-31.84 0-18.202-13.5-31.84-31.481-31.84zM318.775 544.584c-58.463 0-103.436 45.487-103.436 104.62 0 59.125 44.973 104.611 103.436 104.611 58.473 0 103.436-45.487 103.436-104.611 0-63.68-49.463-104.62-103.436-104.62zM318.775 681.043c-22.481 0-35.973-13.647-35.973-36.386 0-22.747 13.492-36.395 35.973-36.395 22.492 0 35.981 13.647 35.981 36.395 0 22.739-17.992 36.386-35.981 36.386zM813.473 612.808h-310.308c-22.481 0-31.481 13.647-31.481 31.849 0 18.184 13.5 31.84 31.481 31.84h310.316c22.481 0 31.473-13.647 31.473-31.84 0-18.202-13.5-31.84-31.481-31.84z" p-id="2696"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

1
src/icons/svg/OutsourcingTaskQuery.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543559071353" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1472" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M408.2 723h50v50h-50v-50z m80 50h50v-50h-50v50z m264.9-230.1l-35.4 35.4L862.5 723H578.2v50h284.3L717.7 917.7l35.4 35.4L958.2 748 753.1 542.9zM321.9 291.6C321.9 181 411.5 91.4 522 91.4S722.1 181 722.1 291.5 632.5 491.7 522 491.7s-200.1-89.6-200.1-200.1z m50 0c0 40.1 15.6 77.8 44 106.2s66.1 44 106.2 44c40.1 0 77.8-15.6 106.2-44 28.4-28.4 44-66.1 44-106.2 0-40.1-15.6-77.8-44-106.2-28.4-28.4-66.1-44-106.2-44-40.1 0-77.8 15.6-106.2 44-28.4 28.4-44 66.1-44 106.2zM512 604.8c-52.5 0-103.4-9.2-151.3-27.3 4-1.9 8-3.8 12-5.6 44.1-19.6 91-29.5 139.3-29.5 42.1 0 83.1 7.5 122.1 22.4l39.5-37.7C624 504.7 569.4 492.3 512 492.3c-226.4 0-410 192.5-410 430 0 3.4 0 6.9 0.1 10.3h50c-0.1-3.4-0.1-6.8-0.1-10.3 0-51.6 9.6-101.6 28.6-148.7 18.3-45.3 44.4-86 77.7-120.9 15.4-16.2 32-30.7 49.6-43.5 60.9 29.1 130.4 45.5 204.1 45.5 9.7 0 19.2-0.3 28.7-0.8l61.3-58.5c-29.2 6.2-59.3 9.4-90 9.4z" fill="" p-id="1473"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

1
src/icons/svg/PreorderAssociation.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543302025609" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="625" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M607.3 640.2H127.9v-439c0-5 4-9 9-9h748c5 0 9 4 9 9v277.7c0 17.7 14.3 32 32 32s32-14.3 32-32V201.2c0-40.3-32.7-73-73-73h-748c-40.2 0-73 32.7-73 73v557.5c0 40.2 32.7 73 73 73h470.4c17.7 0 32-14.3 32-32v-0.1c0-17.7-14.3-32-32-32H136.9c-5 0-9-4-9-9v-54.4h479.4c17.7 0 32-14.3 32-32s-14.4-32-32-32z" p-id="626"></path><path d="M959 608.5c0-17.8-14.6-32.4-32.4-32.4H735.5c-8.3-0.1-16.6 3-22.9 9.3-6.3 6.3-9.4 14.6-9.3 22.9v191.1c0 17.8 14.6 32.4 32.4 32.4 17.8 0 32.4-14.6 32.4-32.4V686.1l136.1 136.1c12.4 12.4 32.8 12.4 45.3 0s12.4-32.8 0-45.3l-136.1-136h113.2c17.8 0 32.4-14.6 32.4-32.4z" p-id="627"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 995 B

1
src/icons/svg/ProcessingStatusEdit.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543312395670" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1739" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M237.477297 786.433252h487.224794v-61.285629H237.477297v61.285629zM724.702091 573.429266H237.477297v60.301674h487.224794V573.429266z" p-id="1740"></path><path d="M846.702242 938.800126H146.261877V115.955362h491.157175l60.922667-60.943309H85.33577v944.755464h822.263336V252.709684l-60.895144 66.769632V938.800126h-0.00172z" p-id="1741"></path><path d="M481.329662 481.699506l111.469076-0.092891 201.09847-200.475757-108.642784-112.778149-203.833591 203.217758-0.091171 110.129039zM907.599106 167.773001L799.049212 55.012053l-63.963983 63.212255 109.088317 113.104988 63.42556-63.556295z" p-id="1742"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 998 B

7
src/icons/svg/SystemRrolemaintenance.svg Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Svg Vector Icons : http://www.sfont.cn -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
<metadata> Svg Vector Icons : http://www.sfont.cn </metadata>
<g><path d="M667.5,650c4.7,3.4,10.4,5.5,16.7,5.5c15.7,0,28.4-12.7,28.4-28.4c0-9.9-5-18.5-12.7-23.6l0,0c-33.9-23-71.2-41.3-111-54c91.6-47.6,154.3-143.3,154.3-253.7C743.2,138,615.3,10,457.4,10c-157.9,0-285.8,128-285.8,285.8c0,110.4,62.6,206.1,154.2,253.7c-174,55.5-300.2,217.9-301.3,410c0,0.2,0.1,2.5,0.1,2.5c1,14.8,13.2,26.6,28.2,26.6c15.1,0,27.5-11.8,28.5-26.6c0-207.6,168.3-376,376-376c77.8,0,150.1,23.6,210,64.1L667.5,650z M228.7,295.8c0-126.3,102.4-228.7,228.7-228.7c126.3,0,228.7,102.4,228.7,228.7c0,126.3-102.4,228.7-228.7,228.7C331.1,524.5,228.7,422.1,228.7,295.8z"/><path d="M947.9,786.1H827.4V666.6c0-15.2-12.3-27.6-27.6-27.6s-27.6,12.3-27.6,27.6v119.5H652c-15.2,0-27.6,12.3-27.6,27.6c0,15.2,12.3,27.6,27.6,27.6h120.3v121.2c0,15.2,12.3,27.6,27.6,27.6s27.6-12.3,27.6-27.6V841.2h120.5c15.2,0,27.6-12.3,27.6-27.6C975.4,798.4,963.1,786.1,947.9,786.1z"/></g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

1
src/icons/svg/UnqualifiedTreatment.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543302320460" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4601" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 1024A512 512 0 1 1 512 0a512 512 0 0 1 0 1024zM512 170.666667a56.888889 56.888889 0 0 0-56.888889 56.888889v341.333333a56.888889 56.888889 0 0 0 113.777778 0V227.555556a56.888889 56.888889 0 0 0-56.888889-56.888889z m0 625.777777a56.888889 56.888889 0 1 0 0-113.777777 56.888889 56.888889 0 0 0 0 113.777777z" p-id="4602"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 726 B

7
src/icons/svg/WorkshopPersonnelRoleMana.svg Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Svg Vector Icons : http://www.sfont.cn -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
<metadata> Svg Vector Icons : http://www.sfont.cn </metadata>
<g><g transform="translate(0.000000,511.000000) scale(0.100000,-0.100000)"><path d="M4391.9,4998.3c-285.2-50.9-482.8-136.5-790.4-342.2c-413.5-275-778.2-686.5-935-1055.2c-120.2-283.1-154.8-456.3-152.8-792.4c0-285.2,20.4-427.8,81.5-590.8c10.2-22.4-2-30.6-50.9-30.6c-40.7,0-85.6-20.4-128.3-59.1c-63.1-57-67.2-67.2-73.3-222c-10.2-203.7,32.6-419.6,138.5-721.1c85.6-246.5,185.4-411.5,266.9-448.2c44.8-20.4,57-46.9,85.6-191.5C2974.1-133.2,3324.5-638.4,3831.7-889c497.1-244.5,994.1-273,1476.9-79.4c529.6,211.8,892.2,666.1,1069.5,1346.5l65.2,250.6l63.2-6.1c85.5-8.2,152.8,50.9,238.3,213.9c132.4,256.7,238.4,660,238.4,914.7c0,160.9-28.5,248.5-101.9,299.4l-40.7,28.5l44.8,252.6c36.7,205.7,44.8,330,46.9,670.2c0,374.8-4.1,433.9-46.9,576.5c-103.9,360.6-287.2,586.7-537.8,666.1c-52.9,16.3-97.8,53-146.7,120.2c-136.5,185.4-325.9,334.1-598.9,470.6c-264.8,132.4-415.6,165-788.4,173.2C4634.4,5012.5,4444.9,5008.4,4391.9,4998.3z"/><path d="M3043.4-901.2c-425.8-291.3-1189.7-643.7-1735.6-802.6c-156.9-44.8-332-105.9-393.2-136.5C607-1989,378.8-2388.3,330-2865l-12.2-132.4l158.9-152.8C1265-3903.9,2340.6-4458,3438.6-4678c509.3-101.9,621.3-112,1263-112c517.4,2,641.7,8.2,886.1,46.8c488.9,77.4,1004.3,218,1432.1,393.2c105.9,42.8,197.6,81.5,201.7,87.6c6.1,4.1-53,71.3-130.4,148.7c-226.1,222-364.6,448.2-464.5,759.8c-73.3,226.1-93.7,637.6-44.8,880c75.4,356.5,248.5,676.3,507.2,935c79.4,79.4,138.5,144.6,136.5,146.7c-4.1,2.1-134.5,67.2-287.2,144.6c-154.8,77.4-372.8,199.6-486.9,270.9c-114.1,71.3-209.8,126.3-209.8,124.2c-2-4-158.9-497-346.3-1095.9c-488.9-1552.3-582.6-1839.5-598.9-1823.2c-8.2,6.1-93.7,238.3-189.5,513.4L4929.7-2757l89.6,138.5c207.8,319.8,299.4,598.9,252.6,770c-55,207.8-270.9,328-588.7,328c-605,0-757.8-387.1-393.2-990c53-89.6,110-179.3,124.3-203.7c26.5-38.7,10.2-97.8-150.7-556.1c-97.8-281.1-187.4-511.3-195.6-511.3c-10.2,0-18.3,4.1-18.3,10.2c0,16.3-914.7,2909-922.8,2915.1C3122.8-852.3,3086.2-872.7,3043.4-901.2z"/><path d="M8022-1530.7c-741.5-201.7-1169.3-992.1-926.9-1711.2c146.7-438,450.2-727.2,906.5-867.8c191.5-59.1,493-63.2,692.6-10.2c220,59.1,440,187.4,600.9,348.3c163,165,254.6,309.6,332,523.5c46.9,130.4,53,179.3,55,413.5c0,224.1-8.1,287.3-46.8,407.4c-132.4,401.3-433.9,711-835.2,861.7c-114.1,42.8-179.3,53-401.3,57.1C8209.5-1502.1,8103.5-1508.2,8022-1530.7z M8492.6-1905.5l59.1-59.1v-338.1v-338.2h334.1c323.9,0,338.1-2,393.2-48.9c44.8-38.7,57-65.2,57-134.5s-12.2-95.8-57-134.4c-55-46.9-69.3-48.9-393.2-48.9h-334.1v-338.2v-338.2l-59.1-59.1c-97.8-95.7-236.3-77.4-297.4,42.8c-22.4,44.8-30.5,132.4-30.5,376.9v315.8h-336.1c-332.1,0-338.1,0-387.1,50.9c-38.7,36.7-50.9,71.3-50.9,132.4s12.2,95.7,50.9,132.4c48.9,50.9,55,50.9,387.1,50.9h336.1v315.7c0,403.3,30.5,476.7,199.6,478.7C8413.2-1846.4,8449.8-1862.7,8492.6-1905.5z"/></g></g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

7
src/icons/svg/WorkshopProcessMaintenance.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

10
src/utils/curd.js
View File

@@ -79,9 +79,6 @@ export default {
})
}
}
if (this[carrier].length !== 0) {
this[carrier] = response.data[0][select[0]]
}
})
} else {
requestData(param).then(response => { // 这个方法没什么难度，不注释了
@@ -139,7 +136,7 @@ export default {
// 3）接受值，数组，一般是['table','total','loading']顺序不能变
Vue.prototype.getTable = function(requestData, param, e) {
requestData(...param).then(response => {
const data = response.data.rows ? response.data.rows : response.data
const data = response.data.rows
this[e[0]] = []
this[e[1]] = 0
if (data && data.length > 0) {
@@ -159,9 +156,7 @@ export default {
// console.log('暂无数据')
}
}).then(() => {
if (this[e[2]]) {
this[e[2]] = false
}
this[e[2]] = false
})
}
// 添加表格数据
@@ -172,6 +167,7 @@ export default {
// 4) 回调函数，必须
Vue.prototype.addTable = function(requestData, param, form, callback) {
if (type(callback) === 'function' && type(requestData) === 'function' && type(form) === 'string') {
console.log(this.$refs[form])
this.$refs[form].validate((valid) => {
if (valid) {
requestData(...param).then(response => {

16
src/utils/request.js
View File

@@ -3,15 +3,29 @@ import axios from 'axios'
// import store from '../store'
// import { getToken } from '@/utils/auth'
export const wsuri = `ws://192.168.1.128:61101//WebMoudule//websocket`
export const wsuri = `ws://192.168.1.149:61101//WebMoudule//websocket`
export const name = `OP8888`
// 创建axios实例
export const upload = `http://localhost:8411/submit/uploadFile.ashx`
export const download = `http://localhost:8411/submit/downloadFile.ashx`
const service = axios.create({
<<<<<<< HEAD
baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
=======
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
>>>>>>> 7cdb10d153358b72f95165dd7f3a12ad7675f14d
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
baseURL: `http://192.168.0.105:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.137.85:8411/submit/MESCommonBase.ashx`, // 李鑫
// baseURL: `http://192.168.1.112:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})

206
src/vendor/Export2Excelcjn.js vendored Normal file
View File

@@ -0,0 +1,206 @@
/* eslint-disable */
require('script-loader!file-saver');
import XLSX from 'xlsx'
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({
header,
data,
filename,
autoWidth = true,
bookType= 'xlsx'
} = {}) {
/* original data */
filename = filename || 'excel-list'
data = [...data]
data.unshift(header);
var ws_name = filename || 'excel-list';
var wb = new Workbook(),
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;
}
/* 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}`);
}

2
src/views/Assembly/AssemblyInformationInput/index.vue
View File

@@ -137,7 +137,7 @@
</el-table-column>
</el-table>
<el-button style="margin-left: 120px;margin-top: 20px" @click="dialogFormVisible = false">取消</el-button>
<el-button type="primary" style="margin-top: 20px" @click="getName">确认</el-button>
<el-button :disabled="staffNum===''" type="primary" style="margin-top: 20px" @click="getName">确认</el-button>
</div>
</el-dialog>
</div>

8
src/views/Assembly/AssemblyPlan/index.vue
View File

@@ -62,7 +62,7 @@
</el-table-column>
<el-table-column align="center" label="计划完成日期">
<template slot-scope="scope">
{{ scope.row.项目计划完成时间 }}
{{ scope.row.发货节点 }}
</template>
</el-table-column>
<el-table-column align="center" label="客户名称">
@@ -144,9 +144,9 @@ export default {
this.machineNumberValue ? this.check1 = 1 : this.check1 = 0
searchTable(this.check, this.projectValue, this.check1, this.machineNumberValue, this.check2, this.startEndDate[0], this.startEndDate[1], this.pageCurrent, this.pageSize).then(response => {
for (let i = 0; i < response.data.rows.length; i++) {
console.log(response.data.rows[i].项目计划完成时间)
if (response.data.rows[i].项目计划完成时间 !== '') {
response.data.rows[i].项目计划完成时间 = (response.data.rows[i].项目计划完成时间).split(' ')[0]
console.log(response.data.rows[i].发货节点)
if (response.data.rows[i].发货节点 !== '') {
response.data.rows[i].发货节点 = (response.data.rows[i].发货节点).split(' ')[0]
}
}
this.tableData = response.data.rows

4
src/views/Assembly/AssemblyProcessPlanning/index.vue
View File

@@ -206,7 +206,7 @@
<el-row>
<el-col :span="9">
<el-form-item label="典型工艺机床分类">
<el-select v-model="machineTypeValue" placeholder="机床分类" size="small" style="width:150px">
<el-select v-model="machineTypeValue" placeholder="机床分类" size="small" style="width:150px" @change="SearchMachine">
<el-option
v-for="item in machineType"
:key="item.value"
@@ -783,6 +783,8 @@ export default {
this.dataAll = []
} else { this.$message.error('保存失败') }
})
} else {
this.$message.warning('请勾选是否核准')
}
},
upOne(row) {

6
src/views/Assembly/PrintingAssemblyProcessCard/index.vue
View File

@@ -99,9 +99,9 @@
<td colspan="6">{{ list.工艺内容及装配具体要求 }}</td>
<td align="center">{{ list.质检 }}</td>
<td>{{ list.工时 }}</td>
<td>{{ list.装配员 }}</td>
<td>{{ list.检验员 }}</td>
<td width="100px">{{ list.备注 }}</td>
<td/>
<td/>
<td width="100px"/>
</tr>
</tbody>
</table>

305
src/views/BasicData/EquipmentCapabilitySetting/index.vue Normal file
View File

@@ -0,0 +1,305 @@
<template>
<div class="app-container">
<el-card>
<span>设备名称：</span>
<el-input v-model="equipmentName" clearable size="small" style="width:200px;margin:10px;"/>
<el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=10;searchTable()">查询</el-button>
<el-button type="primary" class="el-icon-circle-plus-outline" size="small" @click="handleAdd('form');param = 0">新增</el-button>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" height="580" style="width: 100%;" border highlight-current-row>
<el-table-column
label=" "
align="center"
type="index"
width="50"/>
<el-table-column label="设备名称" align="center" width="280px">
<template slot-scope="scope">
{{ scope.row.设备名称 }}
</template>
</el-table-column>
<el-table-column label="设备编号" align="center" width="110px">
<template slot-scope="scope">
{{ scope.row.设备编号 }}
</template>
</el-table-column>
<el-table-column label="设备型号" align="center" width="280px">
<template slot-scope="scope">
{{ scope.row.设备型号 }}
</template>
</el-table-column>
<el-table-column label="设备性能指标" align="center" width="120px">
<template slot-scope="scope">
{{ scope.row.设备性能指标 }}
</template>
</el-table-column>
<el-table-column label="设备加工能力" align="center" width="140px">
<template slot-scope="scope">
{{ scope.row.设备加工能力工时 }}
</template>
</el-table-column>
<el-table-column label="设备工时系数" align="center" width="120px">
<template slot-scope="scope">
{{ scope.row.设备工时系数 }}
</template>
</el-table-column>
<el-table-column label="设备加工工艺" align="center" width="230px">
<template slot-scope="scope">
{{ scope.row.工艺属性 }}
</template>
</el-table-column>
<el-table-column label="班次类型" align="center" width="110px">
<template slot-scope="scope">
{{ scope.row.班次类型 }}
</template>
</el-table-column>
<el-table-column label="整改工时系数" align="center">
<template slot-scope="scope">
{{ scope.row.整改工时比例 }}
</template>
</el-table-column>
<el-table-column label="预留工时系数" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.设备预留工时系数 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="200px" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
class="el-icon-edit"
@click="handleEdit(scope.row);param = 1">编辑</el-button>
<el-button
size="mini"
type="danger"
class="el-icon-delete"
@click="handleDelete(scope.$index, scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
v-if="!loading"
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-dialog :title="title" :visible.sync="dialogFormVisible" center width="800px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm" style="margin: auto">
<el-row>
<el-col :span="12">
<el-form-item label="设备名称" prop="设备名称">
<el-input v-model="form.设备名称" placeholder="设备名称" clearable size="small" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备型号" prop="设备型号">
<el-input v-model="form.设备型号" placeholder="设备型号" clearable size="small" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="性能指标" prop="设备性能指标">
<el-input v-model="form.设备性能指标" placeholder="性能指标" clearable size="small" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="加工能力" prop="设备加工能力工时">
<el-input v-model="form.设备加工能力工时" placeholder="加工能力" clearable size="small" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="整改工时系数" prop="整改工时比例">
<el-input v-model="form.整改工时比例" placeholder="设备整改工时系数" clearable size="small" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备编号" prop="设备编号">
<el-input v-model="form.设备编号" placeholder="设备编号" clearable size="small" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="工艺" prop="工艺属性代码">
<el-select v-model="form.工艺属性代码" filterable size="small" style="width:230px;">
<el-option
v-for="item in Technology"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="班次类型" prop="班次类型">
<el-select v-model="form.班次类型" filterable size="small" style="width:230px;">
<el-option
v-for="item in ClassType"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="工时系数" prop="设备工时系数">
<el-input v-model="form.设备工时系数" placeholder="工时系数" clearable size="small" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="预留工时系数" prop="设备预留工时系数">
<el-input v-model="form.设备预留工时系数" placeholder="设备预留工时系数" clearable size="small" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff()">取消</el-button>
<el-button v-show="title==='增加'" type="primary" @click="submitAdd()">确定</el-button>
<el-button v-show="title==='编辑'" type="primary" @click="submitEdit()">确定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { getTechnology, searchtable, edittype, handlechange, handledelete } from '@/api/BasicData/EquipmentCapabilitySetting'
export default {
data() {
return {
equipmentNum: '',
num1: '',
equipmentName: '',
loading: false,
tableData: [], // 表格数据
pageSize: 10,
pageCurrent: 1,
total: 0,
dialogFormVisible: false,
title: '',
Technology: [],
ClassType: [{
value: 0,
label: 0
}, {
value: 1,
label: 1
}, {
value: 2,
label: 2
}, {
value: 3,
label: 3
}, {
value: 4,
label: 4
}],
form: {
设备名称: '', // 设备名称
设备型号: '', // 设备型号
设备性能指标: '', // 性能指标
设备加工能力工时: '', // 加工能力
整改工时比例: '', // 设备整改工时指数
设备编号: '', // 设备编号
工艺属性代码: '', // 工艺
班次类型: '', // 班次类型
设备工时系数: '', // 工时系数
设备预留工时系数: '' // 设备预留工时系数
},
rules: {
设备名称: [{ required: true, message: '请输入设备名称', trigger: 'blur' }],
设备型号: [{ required: true, message: '请输入设备型号', trigger: 'blur' }],
设备性能指标: [{ required: true, message: '请输入性能指标', trigger: 'blur' }],
设备加工能力工时: [{ required: true, message: '请输入加工能力', trigger: 'blur' }],
整改工时比例: [{ required: true, message: '请输入设备整改工时指数', trigger: 'blur' }],
设备编号: [{ required: true, message: '请输入设备编号', trigger: 'blur' }],
工艺属性代码: [{ required: true, message: '请选择工艺', trigger: 'change' }],
班次类型: [{ required: true, message: '请选择班次类型', trigger: 'change' }],
设备工时系数: [{ required: true, message: '请输入工时系数', trigger: 'blur' }],
设备预留工时系数: [{ required: true, message: '请输入设备预留工时系数', trigger: 'blur' }]
}
}
},
created() {
this.searchTable()
this.fetchData()
},
methods: {
// 初始化获取工艺
fetchData() {
this.getSelect(getTechnology, ['工艺名称', '工艺编号'], 'Technology')
},
// 查询
searchTable() {
this.loading = true
this.equipmentName ? this.num1 = 1 : this.num1 = 0
this.getTable(searchtable, [this.pageCurrent, this.pageSize, this.num1, this.equipmentName], ['tableData', 'total', 'loading'])
},
// 点击增加
handleAdd() {
this.dialogFormVisible = true
this.title = '增加'
this.addForm('form')
},
// 增加确定
submitAdd() {
this.addTable(edittype, [this.form.设备名称, this.form.设备型号, this.form.设备性能指标, this.form.设备工时系数, this.form.工艺属性代码, this.form.班次类型, this.form.设备加工能力工时, this.form.整改工时比例, this.form.设备编号, this.form.设备预留工时系数], 'form', function() { this.searchTable(); this.dialogFormVisible = false })
},
// 编辑打开
handleEdit(row) {
this.dialogFormVisible = true
this.title = '编辑'
this.equipmentNum = row.设备流水号
this.editForm(row, 'form')
},
// 编辑确定
submitEdit() {
this.editTable(handlechange, [this.equipmentNum, this.form.设备名称, this.form.设备型号, this.form.设备性能指标, this.form.设备工时系数, this.form.工艺属性代码, this.form.班次类型, this.form.设备加工能力工时, this.form.整改工时比例, this.form.设备编号, this.form.设备预留工时系数], 'form', function() { this.searchTable(); this.dialogFormVisible = false })
},
// 重置表单
callOff() {
this.dialogFormVisible = false
},
// 删除
handleDelete(index, row) {
this.deleteRow(handledelete, row.设备流水号, function() { this.searchTable() })
},
// 分页
handleSizeChange(val) {
this.pageCurrent = 1
this.pageSize = val
this.searchTable()
},
handleCurrentChange(val) {
this.pageCurrent = val
this.searchTable()
}
}
}
</script>
<style scoped>
.el-card{
margin-bottom: 15px;
}
.el-input{
width: 200px!important;
}
</style>

251
src/views/BasicData/MaintenanceEquipmentPerson/index.vue Normal file
View File

@@ -0,0 +1,251 @@
<template>
<div class="app-container">
<el-card>
<span>设备名称:</span>
<el-select v-model="equipmentNameValue" placeholder="设备名称" style="width:200px" size="small" clearable filterable>
<el-option
v-for="item in equipmentName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>操作者:</span>
<el-input v-model="operator" placeholder="操作者" size="small" clearable style="width:200px" @dblclick.native="getOperator();param = 0"/>
<el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="getTableData">查询</el-button>
<el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" @click="handleAdd">增加</el-button>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" highlight-current-row border style="height: 500px">
<el-table-column label="设备名称" align="center" >
<template slot-scope="scope">
{{ scope.row.设备名称 }}
</template>
</el-table-column>
<el-table-column label="班次" align="center" >
<template slot-scope="scope">
{{ scope.row.班次 }}
</template>
</el-table-column>
<el-table-column label="操作者" align="center" >
<template slot-scope="scope">
{{ scope.row.操作者 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" >
<template slot-scope="scope">
<el-button type="primary" size="mini" icon="el-icon-edit" style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
<el-button type="danger" size="mini" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible" title="选择人员" center style="min-height: 300px">
<span>部门名称:</span>
<el-select v-model="departmentValue" placeholder="部门名称" size="small" clearable style="width:180px" @change="getTablePeople">
<el-option
v-for="item in department"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-table
:data="tablePeople"
style="width:100%;max-height: 300px;margin-top: 20px"
height="300"
highlight-current-row
@row-click="currentPeople">
<el-table-column align="center" label="考勤编号">
<template slot-scope="scope">
{{ scope.row.考勤编号 }}
</template>
</el-table-column>
<el-table-column align="center" label="姓名">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column align="center" label="性别">
<template slot-scope="scope">
{{ scope.row.性别 }}
</template>
</el-table-column>
<el-table-column align="center" label="工作岗位">
<template slot-scope="scope">
{{ scope.row.岗位名称 }}
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogFormVisible = false">确定</el-button>
</div>
</el-dialog>
<el-dialog :title="title" :visible.sync="dialogFormVisible_form" center style="min-height: 300px" width="400px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="设备名称" prop="设备名称">
<el-select v-model="form.设备流水号" placeholder="设备名称" style="width:200px" size="small" clearable filterable>
<el-option
v-for="item in equipmentName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="班次" prop="班次" >
<el-select v-model="form.班次" placeholder="班次" style="width:200px" size="small" clearable filterable>
<el-option
v-for="item in staff"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="操作者" prop="操作者" >
<el-input v-model="form.操作者" placeholder="操作者" size="small" style="width:200px" clearable @dblclick.native="getOperator();param = 1"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel">取消</el-button>
<el-button v-show="title === '增加'" type="primary" @click="submitAdd()">确定</el-button>
<el-button v-show="title === '编辑'" type="primary" @click="submitEdit()">确定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { getEquipment, getDepartment, getTablePeople, getTableData, deleteTable, getStaff, addTable, editTable } from '@/api/BasicData/MaintenanceEquipmentPerson'
import { SectionToChinese } from '@/utils/tool'
export default {
data() {
return {
equipmentNameValue: '',
equipmentNameCheck: null,
equipmentName: [],
operator: '',
operatorNum: '',
operatorCheck: null,
dialogFormVisible: false,
tablePeople: [],
departmentValue: '',
department: [],
tableData: [],
pageCurrent: 1,
pageSize: 10,
total: 0,
loading: false,
title: '',
dialogFormVisible_form: false,
param: null,
form: {
设备名称: '',
设备流水号: null,
班次: '',
班次代码: '',
操作者: '',
操作者编号: null
},
rules: {
设备名称: [{ required: true, message: '请选择设备名称', trigger: 'blur' }],
操作者: [{ required: true, message: '请选择操作者', change: 'blur' }]
},
staff: [],
No: null
}
},
created() {
this.fetchData()
this.getTableData()
},
methods: {
fetchData() {
this.getSelect(getEquipment, ['设备名称', '设备流水号'], 'equipmentName', [0, this.equipmentNameValue]) // 获取设备名称
getStaff().then(res => { // 获取班次
res.data.map(row => {
this.staff.push({
label: `${SectionToChinese(row.班次代码)}班`,
value: row.班次代码
})
})
})
},
getOperator() {
this.dialogFormVisible = true
this.getSelect(getDepartment, ['部门', '考核部门编号'], 'department')
},
getTablePeople() {
this.getData(getTablePeople, 'tablePeople', this.departmentValue)
},
currentPeople(row) {
if (this.param === 0) {
this.operator = row.姓名
this.operatorNum = row.人员编号
} else if (this.param === 1) {
this.form.操作者 = row.姓名
this.form.操作者编号 = row.人员编号
} else {
console.log(`err`)
}
},
getTableData() {
console.log(typeof (this.equipmentName))
this.equipmentNameValue ? this.equipmentNameCheck = 1 : this.equipmentNameCheck = 0
this.operator ? this.operatorCheck = 1 : this.operatorCheck = 0
this.loading = true
this.getTable(getTableData, [this.equipmentNameCheck, this.equipmentNameValue, this.operatorCheck, this.operatorNum, this.pageCurrent, this.pageSize], ['tableData', 'total', 'loading'])
},
handleAdd() {
this.addForm('form', [this.dialogFormVisible_form = true, this.title = '增加'])
},
handleEdit(row) {
this.No = row.设备人员关系流水号
this.editForm(row, 'form', [this.dialogFormVisible_form = true, this.title = '编辑'])
},
submitAdd() {
for (let i = 0; i < this.equipmentName.length; i++) {
if (this.form.设备流水号 === this.equipmentName[i].value) {
this.form.设备名称 = this.equipmentName[i].label
break
}
}
this.addTable(addTable, [this.form.设备流水号, this.form.设备名称, this.form.班次, this.form.操作者, this.form.操作者编号], 'form', function() { this.getTableData(); this.dialogFormVisible_form = false })
},
submitEdit() {
this.editTable(editTable, [this.form.设备名称, this.form.设备流水号, this.form.班次代码, this.form.操作者, this.form.操作者编号, this.No], 'form', function() { this.getTableData(); this.dialogFormVisible_form = false })
},
cancel() {
this.dialogFormVisible_form = false
},
handleDelete(row) {
this.deleteRow(deleteTable, row.设备人员关系流水号, function() { this.getTableData() })
},
handleSizeChange(val) {
this.pageSize = val
this.pageCurrent = 1
this.getTableData()
},
handleCurrentChange(val) {
this.pageCurrent = val
this.getTableData()
}
}
}
</script>
<style scoped>
span{
margin: 20px;
}
</style>

199
src/views/BasicData/MaterialMaintenance/index.vue Normal file
View File

@@ -0,0 +1,199 @@
<template>
<div class="app-container">
<el-card>
<span>材料名称:</span>
<el-input v-model="Material" placeholder="请输材料名称" size="small" style="width:200px" clearable/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="pageCurrent = 1;pageSize = 10;featchMaterial()">查询</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="add()">增加</el-button>
</el-card>
<el-card>
<el-table
v-loading="listLoading"
:data="tableData"
style="width: 100%"
height="580"
highlight-current-row
border>
<el-table-column align="center" label="材料名称">
<template slot-scope="scope">
{{ scope.row.材料 }}
</template>
</el-table-column>
<el-table-column align="center" label="变更日期">
<template slot-scope="scope">
{{ scope.row.操作日期 }}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
icon="el-icon-edit"
@click="Edit(scope.row)">编辑</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click="delMaterial(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible" title="新增材料" center style="min-height: 200px" width="400px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px">
<el-form-item label="材料名称" prop="MaterialName" style="display: inline-block">
<el-input v-model="form.MaterialName" clearable size="small" style="width:200px"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="callOff()">取消</el-button>
<el-button type="primary" size="small" @click="addMaterial('form')">确定</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible2" title="编辑材料" center style="min-height: 200px" width="400px">
<el-form ref="form2" :model="form2" :rules="rules" label-position="left" label-width="110px">
<el-form-item label="材料名称" prop="MaterialName2" style="display: inline-block">
<el-input v-model="form2.MaterialName2" size="small" clearable style="width:200px"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="callOff()">取消</el-button>
<el-button type="primary" size="small" @click="editMaterial('form2')">确定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { featchMaterial, addMaterial, delMaterial, editMaterial } from '@/api/BasicData/Materialmaintenance'
export default {
data() {
return {
ID: '',
dialogFormVisible: false,
dialogFormVisible2: false,
tableData: [],
Material: '', // 材质名称
listLoading: false,
pageCurrent: 1,
pageSize: 10,
total: null,
form: {
MaterialName: ''
},
form2: {
MaterialName2: ''
},
rules: {
MaterialName: [{ required: true, message: '请输入材料名称', trigger: 'blur' }],
MaterialName2: [{ required: true, message: '请输入材料名称', trigger: 'blur' }]
}
}
},
created() {
this.featchMaterial()
},
methods: {
handleSizeChange(val) {
this.pageSize = val
this.pageCurrent = 1
this.featchMaterial()
},
handleCurrentChange(val) {
this.pageCurrent = val
this.featchMaterial()
},
featchMaterial() {
featchMaterial(this.Material, this.pageCurrent, this.pageSize).then(response => {
this.tableData = response.data.rows
this.total = response.data.total
})
},
callOff() {
this.dialogFormVisible = false
this.dialogFormVisible2 = false
},
add() {
if (this.$refs['form'] !== undefined) {
this.$refs['form'].resetFields()
}
this.form.MaterialName = ''
this.dialogFormVisible = true
},
addMaterial(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
addMaterial(this.form.MaterialName).then(response => {
if (response.data[0].result === '1') {
this.$message.success('添加成功')
this.dialogFormVisible = false
this.form = {}
this.featchMaterial()
} else {
this.$message.error('添加失败')
this.form = {}
}
})
}
})
},
delMaterial(row) {
this.$confirm('此操作将永久删除该行， 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
delMaterial(row.材料流水号).then(response => {
if (response.data[0].result === '1') {
this.form.MaterialName = ''
this.featchMaterial()
this.$message.success('删除成功')
} else {
this.$message.error('删除失败')
}
})
})
},
Edit(row) {
if (this.$refs['form2'] !== undefined) {
this.$refs['form2'].resetFields()
}
this.dialogFormVisible2 = true
this.form2.MaterialName2 = row.材料
this.ID = row.材料流水号
},
editMaterial(form2) {
this.$refs[form2].validate((valid) => {
if (valid) {
this.dialogFormVisible2 = false
editMaterial(this.ID, this.form2.MaterialName2).then(response => {
if (response.data[0].result === '1') {
this.featchMaterial()
this.$message.success('编辑成功')
this.form = {}
} else {
this.$message.error('编辑失败')
this.form = {}
}
})
}
})
}
}
}
</script>
<style scoped>
</style>

24
src/views/BasicData/PersonnelManagement/index.vue
View File

@@ -537,13 +537,8 @@ export default {
}
},
addPeople() {
this.people_title = '新增人员'
this.people_DFV = true
this.addForm('people_form')
},
submitAddPeople() {
this.people_DFV = false
if (this.id) {
<<<<<<< HEAD
addPeople(this.id, this.people_form.Sex, this.people_form.Education, this.people_form.Address, this.people_form.Nation, this.people_form.Post, this.people_form.AccountNumber, this.people_form.Password, this.people_form.Name, this.people_form.IDcard, this.people_form.TimeOfEntry, this.people_form.Birthday, this.people_form.ContactInformation).then(response => {
if (response.data[0].result === '1') {
this.i = 1
@@ -553,10 +548,27 @@ export default {
this.$message.error('添加失败')
}
})
=======
this.people_title = '新增人员'
this.people_DFV = true
this.addForm('people_form')
>>>>>>> 7cdb10d153358b72f95165dd7f3a12ad7675f14d
} else {
this.$message.warning(`请选择部门名称`)
}
},
submitAddPeople() {
this.people_DFV = false
addPeople(this.id, this.people_form.Sex, this.people_form.Education, this.people_form.Address, this.people_form.Nation, this.people_form.Post, this.people_form.AccountNumber, this.people_form.Password, this.people_form.Name, this.people_form.IDcard, this.people_form.TimeOfEntry, this.people_form.Birthday, this.people_form.ContactInformation).then(response => {
if (response.data[0].result === '1') {
this.i = 1
this.handleNodeClick()
this.$message.success('添加成功')
} else {
this.$message.error('添加失败')
}
})
},
handleEditPeople(row) {
this.people_title = '编辑人员'
this.people_DFV = true

218
src/views/BasicData/SystemRrolemaintenance/index.vue Normal file
View File

@@ -0,0 +1,218 @@
<template>
<div class="app-container">
<el-card>
<span>角色功能:</span>
<el-input v-model="RoleFunctioning" size="small" clearable style="width:200px"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="pageCurrent=1;pageSize = 10;searchData()">查询</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">增加</el-button>
</el-card>
<el-card style="margin-top: 15px">
<el-table
v-loading="loading"
:data="tableData"
highlight-current-row
border>
<el-table-column align="center" label="角色编号" width="100">
<template slot-scope="scope">
{{ scope.row.角色编号 }}
</template>
</el-table-column>
<el-table-column align="center" label="角色功能">
<template slot-scope="scope">
{{ scope.row.角色功能 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作日期">
<template slot-scope="scope">
{{ scope.row.操作日期 }}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
icon="el-icon-edit"
@click="handleEdit(scope.row)">编辑</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible1" title="新增角色" center style="min-height: 200px" width="400px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px">
<el-form-item label="角色名称" prop="角色功能" style="display: inline-block">
<el-input
v-model="form.角色功能"
clearable
size="small"
placeholder="角色功能"
style="width: 200px;"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogFormVisible1 = false">取消</el-button>
<el-button type="primary" size="small" @click="submitAdd1('form')">确定</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible2" title="编辑角色" center style="min-height: 200px" width="400px">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px">
<el-form-item label="角色名称" prop="角色功能" style="display: inline-block">
<el-input
v-model="form2.角色功能"
clearable
size="small"
placeholder="角色功能"
style="width: 200px;"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogFormVisible2 = false">取消</el-button>
<el-button type="primary" size="small" @click="submitAdd2('form2')">确定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { InitRolefunction, deleteData, searchTable, addData, addData2 } from '@/api/BasicData/SystemRrolemaintenance'
export default {
data() {
return {
RoleFunctioning: '',
pageCurrent: 1,
pageSize: 10,
total: null,
loading: false,
tableData: [],
dialogFormVisible1: false,
dialogFormVisible2: false,
name: '',
num: '', // 角色编号
form: {
角色功能: ''
},
form2: {
角色功能: ''
},
rules: {
角色功能: [{ required: true, message: '请输入角色名称', trigger: 'blur' }]
},
rules2: {
角色功能: [{ required: true, message: '请输入角色名称', trigger: 'blur' }]
}
}
},
created() {
this.fetchData()
},
methods: {
fetchData() {
InitRolefunction(this.pageCurrent, this.pageSize).then(response => { // 初始化
this.tableData = response.data.rows
this.total = response.data.total
})
},
searchData() {
this.loading = true
searchTable(this.RoleFunctioning, this.pageCurrent, this.pageSize).then(response => {
this.tableData = response.data.rows
this.total = response.data.total
this.loading = false
console.log(response.data)
})
},
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()
}
this.dialogFormVisible2 = true
this.form2.角色功能 = row.角色功能
this.num = row.角色编号
},
submitAdd2(formName) { // 编辑角色功能
this.$refs[formName].validate((valid) => {
if (valid) {
addData2(this.form2.角色功能, this.num).then(response => {
if (response.data[0].result === '1') {
this.$message.success('编辑成功')
this.fetchData()
this.dialogFormVisible2 = false
} else { this.$message.error('编辑失败') }
})
}
})
},
submitAdd1(formName) { // 增加角色功能
this.$refs[formName].validate((valid) => {
if (valid) {
addData(this.form.角色功能).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.form.角色功能 = ''
this.fetchData()
this.dialogFormVisible1 = false
} else { this.$message.error('增加失败') }
})
}
})
},
handleAdd() {
if (this.$refs['form'] !== undefined) {
this.$refs['form'].resetFields()
}
this.dialogFormVisible1 = true
},
handleDelete(row) { // 删除
this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteData(row.角色编号).then(response => {
if (response.data[0].result === '1') {
this.$message.success('删除成功')
} else {
this.$message.error('删除失败')
}
this.fetchData()
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
}
}
}
</script>
<style scoped>
</style>

399
src/views/BasicData/WorkshopPersonnelRoleMana/index.vue Normal file
View File

@@ -0,0 +1,399 @@
<template>
<div class="app-container">
<table style="width: 100%">
<el-card>
<span>员工姓名:</span>
<el-input v-model="staffName" placeholder="员工姓名" size="small" clearable style="width:200px"/>
<span style="margin-left: 15px">角色名称:</span>
<el-select v-model="roleName" placeholder="角色名称" clearable size="small" style="width:200px">
<el-option
v-for="item in roleNames"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="pageCurrent1=1;searchData()">查询</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="handelAdd">增加</el-button>
</el-card>
<el-card>
<el-table :data="tableData" highlight-current-row>
<el-table-column label="员工姓名">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column disabled label="所属部门" >
<template slot-scope="scope">
{{ scope.row.部门名称 }}
</template>
</el-table-column>
<el-table-column label="岗位名称">
<template slot-scope="scope">
{{ scope.row.岗位名称 }}
</template>
</el-table-column>
<el-table-column label="角色名称">
<template slot-scope="scope">
{{ scope.row.角色功能 }}
</template>
</el-table-column>
<el-table-column label="考勤编号">
<template slot-scope="scope">
{{ scope.row.考勤编号 }}
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
icon="el-icon-edit"
@click="submitEdit(scope.$index, scope.row)">修改</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent1"
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="10"
:total="total1"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
</div>
</el-card>
</table>
<el-dialog :visible.sync="dialogFormVisible" title="人员信息" center width="750px">
<div style="height: 500px">
<div style="float: left;margin-top: 10px;margin-left: 20px;overflow-y: scroll;height: 400px">
<el-tree
:data="data2"
node-key="id"
style="width: 150px;float: left"
height="400"
accordion
@node-click="handleNodeClick"
/>
</div>
<el-table :data="List1" highlight-current-row height="400" style="width: 400px;float: left;margin-left: 30px" @row-click="handleCurrentChange">
<el-table-column label="考勤编号" align="center" >
<template slot-scope="scope">
{{ scope.row.考勤编号 }}
</template>
</el-table-column>
<el-table-column label="姓名" align="center" >
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="性别" align="center">
<template slot-scope="scope">
{{ scope.row.性别 }}
</template>
</el-table-column>
<el-table-column label="工作岗位" align="center">
<template slot-scope="scope">
{{ scope.row.岗位名称 }}
</template>
</el-table-column>
</el-table>
</div>
<el-button style="margin-left: 260px" @click="dialogFormVisible = false">取消</el-button>
<el-button type="primary" style="margin-top: 20px" @click="getName">确认</el-button>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible1" title="增加" center style="min-height: 270px" width="800px">
<el-form ref="form1" :model="form1" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
<el-form-item label="员工姓名" prop="staffName">
<el-input v-model="form1.staffName" placeholder="请双击选择" size="small" clearable style="width:200px" @dblclick.native="dialogTableVisible()"/>
</el-form-item>
<el-form-item label="角色名称" prop="roleName">
<el-select v-model="form1.roleName" placeholder="角色名称" size="small" clearable style="width:200px">
<el-option
v-for="item in roleNames"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="考勤编号" >
<el-input
v-model="cjscgy"
disabled
size="small"
style="width:200px"/>
</el-form-item>
<el-form-item label="所属部门" >
<el-input v-model="ssks" size="small" style="width:200px"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOFF">取 消</el-button>
<el-button type="primary" @click="submitAdd1()">确 定</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible2" title="编辑" center style="min-height: 270px" width="800px">
<el-form ref="form2" :model="form2" :rules="rules1" label-position="left" label-width="110px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
<el-form-item label="员工姓名" >
<el-input v-model="form2.staffName" disabled size="small" clearable style="width:200px"/>
</el-form-item>
<el-form-item label="角色名称" prop="roleName">
<el-select v-model="form2.roleName" placeholder="角色名称" clearable size="small" style="width:200px">
<el-option
v-for="item in roleNames"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="考勤编号" >
<el-input
v-model="cjscgy"
disabled
size="small"
style="width:200px"/>
</el-form-item>
<el-form-item disabled="true" label="所属部门" >
<el-input v-model="ssks" disabled size="small" style="width:200px"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOFF">取消</el-button>
<el-button type="primary" @click="submitAdd2()">确定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { dialogtablevisible, deleteData, getTree, fn, getTable8, initOrderType, addData1, addData2, searchTable } from '@/api/BasicData/WorkshopPersonnelRoleMana'
export default {
data() {
return {
number: '',
form1: {
staffName: '',
roleName: ''
},
form2: {
staffName: '',
roleName: ''
},
rules: {
staffName: [{ required: true, message: '请选择员工姓名', trigger: 'change' }],
roleName: [{ required: true, message: '请选择员工角色', trigger: 'change' }]
},
rules1: {
roleName: [{ required: true, message: '请选择员工角色', trigger: 'change' }]
},
staffName: '',
cjscgy: '',
List1: [],
ssks: '',
data2: [],
dialogFormVisible1: false,
dialogFormVisible2: false,
tableData: [],
check1: '',
check2: '',
name: '', // 中间变量
check3: '',
check4: '',
staffNum: '',
personnelNumber: '',
personnelStream: '',
pageCurrent1: 1,
pageSize1: 10,
total1: null,
roleName: null,
roleNames: [],
rybh: '',
jsbh: '',
dialogFormVisible: false
}
},
created() {
this.fetchData()
},
methods: {
handelAdd(row) {
this.dialogFormVisible1 = true
this.ssks = ''
this.cjscgy = ''
if (this.$refs['form1'] !== undefined) {
this.$refs['form1'].resetFields()
}
},
submitEdit(index, row) {
if (this.$refs['form2'] !== undefined) {
this.$refs['form2'].resetFields()
}
this.dialogFormVisible2 = true
this.personnelStream = row.人员角色流水号
this.form2.staffName = row.姓名
this.ssks = row.部门名称
this.personnelNumber = row.人员编号
this.form2.roleName = parseInt(row.角色编号)
this.cjscgy = row.考勤编号
},
callOFF() {
this.dialogFormVisible1 = false
this.dialogFormVisible2 = false
this.ssks = ''
this.cjscgy = ''
},
searchData() {
if (this.staffName !== '' && this.staffName !== null) {
this.check1 = 1
} else {
this.check1 = 0
}
if (this.roleName !== '' && this.roleName !== null) {
this.check2 = 1
} else {
this.check2 = 0
}
searchTable(this.check1, this.staffName, this.check2, this.roleName, this.pageCurrent1, this.pageSize1).then(response => {
this.tableData = response.data.rows
this.total1 = response.data.total
})
},
fetchData() {
getTree().then(response => { // 获取人员信息树
const data = response.data
this.data2 = fn(data, 0)
})
initOrderType().then(response => { // 角色名称
for (let i = 0; i < response.data.length; i++) {
this.roleNames.push({
label: response.data[i].角色功能,
value: response.data[i].角色编号
})
}
})
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) {
addData1(this.personnelNumber, this.form1.roleName).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.ssks = ''
this.form1.staffName = ''
this.form1.roleName = ''
this.searchData()
this.dialogFormVisible1 = false
} else { this.$message.error('增加失败') }
})
} else {
console.log('error submit!!')
return false
}
})
},
submitAdd2() {
this.$refs['form2'].validate((valid) => {
if (valid) {
addData2(this.personnelStream, this.personnelNumber, this.form2.roleName).then(response => {
if (response.data[0].result === '1') {
this.$message.success('修改成功')
this.ssks = ''
this.searchData()
this.dialogFormVisible2 = false
} else { this.$message.error('修改失败') }
})
} else {
console.log('error submit!!')
return false
}
})
},
handleCurrentChange3(val) {
this.searchgroup()
},
handleNodeClick(data) { // 树节点点击
this.ssks = data.label
getTable8(data.id).then(response => {
this.List1 = response.data
})
},
handleDelete(row) { // 删除
this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteData(row.人员角色流水号).then(response => {
if (response.data[0].result === '1') {
this.$message.success('删除成功')
} else { this.$message.error('删除失败') }
this.searchData()
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
},
dialogTableVisible() {
this.dialogFormVisible = true
dialogtablevisible().then(response => {
})
},
handleCurrentChange(row) { // 获取当前行人员信息
this.ssks = row.节点名称
this.number = row.考勤编号
this.name = row.姓名
this.personnelNumber = row.人员编号
},
getName() { // 提交人员
this.cjscgy = this.number
this.dialogFormVisible = false
this.form1.staffName = this.name
this.form2.staffName = this.name
}
}
}
</script>
<style scoped>
.el-card{
margin-bottom:15px;
margin-left: 15px;
margin-right: 15px;
}
</style>

567
src/views/BasicData/WorkshopProcessMaintenance/index.vue Normal file
View File

@@ -0,0 +1,567 @@
<template>
<div class="app-container">
<el-row>
<el-col :span="6">
<el-card>
<span>工艺分类：</span>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="addProcessClassification()">新增</el-button>
<el-button size="small" type="warning" icon="el-icon-edit" @click="editProcessClassification()">编辑</el-button>
<el-button size="small" type="danger" icon="el-icon-delete" @click="delProcessClassification()">删除</el-button>
</el-card>
</el-col>
<el-col :span="18">
<el-card>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="addProcess">新增工艺名称</el-button>
</el-card>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-card>
<el-table
v-loading="loading1"
ref="multipleTable"
:data="tableData1"
stripe
tooltip-effect="dark"
style="width: 100%"
height="700">
<el-table-column align="center" label=" " width="50px">
<template slot-scope="scope">
<el-radio :label="scope.row.工艺分类流水号" v-model="radio" @change.native="getCurrentRow(scope.row.工艺分类流水号, scope.row.工艺分类名称)">
{{ a }}
</el-radio>
</template>
</el-table-column>
<el-table-column align="left" label="工艺分类">
<template slot-scope="scope">
{{ scope.row.工艺分类名称 }}
</template>
</el-table-column>
</el-table>
</el-card>
</el-col>
<el-col :span="18">
<el-card >
<el-table
:data="tableData2"
:row-key="getRowKeys"
:expand-row-keys="expands"
height="700"
width="100%"
@expand-change="searchTechnologicalRequirementsOfProcessNum">
<el-table-column type="expand">
<template slot-scope="scope">
<el-table :data="tableData3" border>
<el-table-column label="工艺要求">
<template slot-scope="scope">
{{ scope.row.工艺要求 }}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="200px">
<template slot-scope="scope">
<el-button
size="mini"
type="warning"
icon="el-icon-edit"
@click="editTechnologicalRequirements(scope.row)">编辑</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click="delTechnologicalRequirements(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column label="工艺名称">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column>
<template slot-scope="scope">
<el-button
size="mini"
type="warning"
icon="el-icon-edit"
@click="editProcess(scope.row)">编辑工艺</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click="delProcess(scope.row)">删除工艺</el-button>
<el-button
size="mini"
type="primary"
icon="el-icon-circle-plus-outline"
@click="addTechnologicalRequirements(scope.row)">新增要求</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
</el-col>
</el-row>
<el-dialog :visible.sync="dialogFormVisible1" title="增加工艺分类" center style="min-height: 300px" width="400px">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" >
<el-form-item label="工艺分类" prop="ProcessClassification">
<el-input v-model="form1.ProcessClassification" size="small" clearable style="width:200px"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="calloff">取 消</el-button>
<el-button type="primary" @click="submit1('form1')">确 定</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible2" title="编辑工艺分类" center style="min-height: 300px" width="400px">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" >
<el-form-item label="工艺分类" prop="ProcessClassification">
<el-input v-model="form1.ProcessClassification" size="small" clearable style="width:200px"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="calloff">取 消</el-button>
<el-button type="primary" @click="submit1('form1')">确 定</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible3" title="增加工艺" center style="min-height: 300px" width="400px">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" >
<el-form-item label="工艺名称" prop="Process">
<el-input v-model="form2.Process" size="small" clearable style="width:200px"/>
</el-form-item>
<el-form-item label="工艺名称简称" prop="ProcessShort">
<el-input v-model="form2.ProcessShort" size="small" clearable style="width:200px"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="calloff">取 消</el-button>
<el-button type="primary" @click="submit1('form2')">确 定</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible4" title="编辑工艺" center style="min-height: 300px" width="400px">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" >
<el-form-item label="工艺名称" prop="Process">
<el-input v-model="form2.Process" size="small" clearable style="width:200px"/>
</el-form-item>
<el-form-item label="工艺名称简称" prop="ProcessShort">
<el-input v-model="form2.ProcessShort" size="small" clearable style="width:200px"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="calloff">取 消</el-button>
<el-button type="primary" @click="submit1('form2')">确 定</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible5" title="新增工艺要求" center style="min-height: 300px" width="400px">
<el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" >
<el-form-item label="工艺要求" prop="Process">
<el-input v-model="form3.TechnologicalRequirements" size="small" clearable style="width:200px"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="calloff">取 消</el-button>
<el-button type="primary" @click="submit1('form3')">确 定</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible6" title="编辑工艺要求" center style="min-height: 300px" width="400px">
<el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" >
<el-form-item label="工艺要求" prop="TechnologicalRequirements">
<el-input v-model="form3.TechnologicalRequirements" size="small" clearable style="width:200px"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="calloff">取 消</el-button>
<el-button type="primary" @click="submit1('form3')">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { searchProcessClassification, searchProcessNameOfProcessClassification, searchTechnologicalRequirementsOfProcessNum, searchProcessClassificationOfProcessClassificationNum, addProcessClassification, editProcessClassification, delProcessClassification, addProcess, delProcess, editProcess, addTechnologicalRequirements, editTechnologicalRequirements, delTechnologicalRequirements } from '@/api/BasicData/WorkshopProcessMaintenance'
export default {
data() {
return {
// 工艺分类所需变量
a: '',
expands: [],
tableData1: [],
ProcessNum: '',
loading1: false,
loading2: false,
loading3: false,
ProcessClassificationNum: '',
radio: null,
dialogFormVisible1: false,
dialogFormVisible2: false,
dialogFormVisible3: false,
dialogFormVisible4: false,
dialogFormVisible5: false,
dialogFormVisible6: false,
temp: null,
ProcessClassificationNumS: '',
form1: {
ProcessClassification: ''
},
form2: {
Process: '',
ProcessShort: ''
},
form3: {
TechnologicalRequirements: ''
},
rules1: {
ProcessClassification: [{ required: true, message: '请输入工艺分类名称', trigger: 'blur' }]
},
rules2: {
Process: [{ required: true, message: '请输入工艺名称' }],
ProcessShort: [{ required: true, message: '请输入工艺名称简称' }]
},
rules3: {
TechnologicalRequirements: [{ required: true, message: '请输入工艺要求', trigger: 'blur' }]
},
tableData2: [],
tableData3: [],
Num: [],
maxNum: '',
max: [],
code: ''
}
},
created() {
this.searchProcessClassification()
},
methods: {
searchProcessClassification() {
this.loading1 = true
searchProcessClassification(this.ProcessClassification).then(response => {
this.loading1 = false
this.tableData1 = response.data
this.total1 = response.data
return this.tableData1
}).then(data => {
this.Num = data
for (let i = 0; i < this.Num.length; i++) {
this.max.push(this.Num[i].工艺分类流水号)
}
return this.max
}).then(data => {
const a = data
this.maxNum = a[0]
for (let j = 0; j < a.length; j++) {
if (this.maxNum < a[j]) {
this.maxNum = a[j]
}
}
return this.maxNum
}).then(data => {
const b = data
this.radio = b
return this.radio
}).then(data => {
const c = data
this.loading2 = true
searchProcessNameOfProcessClassification(c).then(response => {
this.loading2 = false
this.tableData2 = response.data
})
})
},
addProcessClassification() {
if (this.$refs['form1'] !== undefined) {
this.$refs['form1'].resetFields()
}
this.form1 = {}
this.dialogFormVisible1 = true
this.temp = 1
},
editProcessClassification() {
if (this.radio !== '') {
this.temp = 2
this.dialogFormVisible2 = true
searchProcessClassificationOfProcessClassificationNum(this.radio).then(response => {
this.form1.ProcessClassification = response.data[0].工艺分类名称
})
} else {
this.$message.warning('请选择工艺分类')
}
},
submitProcessClassification() {
editProcessClassification(this.radio, this.form1.ProcessClassification).then(response => {
if (response.data[0].result === '1') {
this.$message.success('信息更新成功')
this.dialogFormVisible2 = false
this.searchProcessClassification()
} else {
this.$message.error('信息更新失败')
}
})
},
submitaddProcessClassification() {
addProcessClassification(this.form1.ProcessClassification).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.searchProcessClassification()
this.dialogFormVisible1 = false
} else { this.$message.error('增加失败') }
})
},
submit1(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.temp === 1) {
this.submitaddProcessClassification()
this.form1 = {
ProcessClassification: ''
}
this.temp = null
} else if (this.temp === 2) {
this.submitProcessClassification()
this.form1 = {
ProcessClassification: ''
}
this.temp = null
} else if (this.temp === 3) {
this.submitaddProcess()
this.form2 = {
Process: '',
ProcessShort: ''
}
this.temp = null
} else if (this.temp === 4) {
this.submiteditProcess()
this.form2 = {
Process: '',
ProcessShort: ''
}
this.temp = null
} else if (this.temp === 5) {
this.submitTechnologicalRequirements()
this.form3 = {
TechnologicalRequirements: ''
}
this.temp = null
} else if (this.temp === 6) {
this.submiteditTechnologicalRequirements()
this.form3 = {
TechnologicalRequirements: ''
}
this.temp = null
}
}
})
},
delProcessClassification() {
if (this.radio !== '') {
this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
delProcessClassification(this.radio).then(response => {
if (response.data[0].result === '1') {
this.searchProcessClassification()
this.$message.success('删除成功')
} else {
this.$message.error('删除失败')
}
})
})
} else {
this.$message.warning('请选择工艺分类')
}
},
calloff() {
this.dialogFormVisible1 = false
this.dialogFormVisible2 = false
this.dialogFormVisible3 = false
this.dialogFormVisible4 = false
this.dialogFormVisible5 = false
this.dialogFormVisible6 = false
this.form1 = {
ProcessClassification: ''
}
this.form2 = {
Process: '',
ProcessShort: ''
}
this.form3 = {
TechnologicalRequirements: ''
}
},
getCurrentRow(row) {
searchProcessClassificationOfProcessClassificationNum(this.radio).then(response => {
this.form1.ProcessClassification = response.data[0].工艺分类名称
})
this.loading2 = true
searchProcessNameOfProcessClassification(row).then(response => {
this.loading2 = false
this.tableData2 = response.data
})
},
searchTechnologicalRequirementsOfProcessNum(row, expandedRows) {
// this.expands = []
// this.expands.push(row.工艺编号)
if (expandedRows.length > 1) {
expandedRows.shift()
}
this.loading3 = true
searchTechnologicalRequirementsOfProcessNum(row.工艺编号).then(response => {
this.loading3 = false
this.tableData3 = response.data
})
},
addProcess() {
if (this.$refs['form2'] !== undefined) {
this.$refs['form2'].resetFields()
}
if (this.radio !== '') {
this.form2.Process = ''
this.form2.ProcessShort = ''
this.dialogFormVisible3 = true
this.temp = 3
} else {
this.$message.warning('请选择一个工艺分类')
}
},
submitaddProcess() {
addProcess(this.radio, this.form2.Process, this.form2.ProcessShort).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.loading2 = true
searchProcessNameOfProcessClassification(this.radio).then(response => {
this.loading2 = false
this.tableData2 = response.data
})
this.dialogFormVisible3 = false
} else { this.$message.error('增加失败') }
})
},
editProcess(row) {
this.dialogFormVisible4 = true
this.temp = 4
this.form2.Process = row.工艺名称
this.form2.ProcessShort = row.工艺名称简称
this.ProcessNum = row.工艺编号
},
submiteditProcess() {
editProcess(this.ProcessNum, this.form2.Process, this.form2.ProcessShort).then(response => {
if (response.data[0].result === '1') {
this.$message.success('信息更新成功')
this.dialogFormVisible4 = true
searchProcessNameOfProcessClassification(this.radio).then(response => {
this.loading2 = false
this.tableData2 = response.data
})
this.dialogFormVisible4 = false
} else {
this.$message.error('信息更新失败')
}
})
},
getRowKeys(row) {
return row.工艺编号
},
delProcess(row) {
this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
delProcess(row.工艺编号).then(response => {
if (response.data[0].result === '1') {
this.loading2 = true
searchProcessNameOfProcessClassification(this.radio).then(response => {
this.loading2 = false
this.tableData2 = response.data
})
this.$message.success('删除成功')
} else {
this.$message.error('删除失败')
}
})
})
},
addTechnologicalRequirements(row) {
if (this.$refs['form3'] !== undefined) {
this.$refs['form3'].resetFields()
}
this.ProcessNum = row.工艺编号
this.form3.TechnologicalRequirements = ''
this.dialogFormVisible5 = true
this.temp = 5
},
submitTechnologicalRequirements() {
addTechnologicalRequirements(this.ProcessNum, this.form3.TechnologicalRequirements).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.loading3 = true
searchTechnologicalRequirementsOfProcessNum(this.ProcessNum).then(response => {
this.loading3 = false
this.tableData3 = response.data
})
this.dialogFormVisible5 = false
} else { this.$message.error('增加失败') }
})
},
editTechnologicalRequirements(row) {
this.temp = 6
this.dialogFormVisible6 = true
this.form3.TechnologicalRequirements = row.工艺要求
this.code = row.工艺要求流水号
this.ProcessNum = row.工艺编号
},
submiteditTechnologicalRequirements() {
editTechnologicalRequirements(this.code, this.form3.TechnologicalRequirements).then(response => {
if (response.data[0].result === '1') {
this.$message.success('信息更新成功')
this.loading3 = true
searchTechnologicalRequirementsOfProcessNum(this.ProcessNum).then(response => {
this.loading3 = false
this.tableData3 = response.data
})
this.dialogFormVisible6 = false
} else {
this.$message.error('信息更新失败')
}
})
},
delTechnologicalRequirements(row) {
this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
delTechnologicalRequirements(row.工艺要求流水号).then(response => {
if (response.data[0].result === '1') {
this.loading3 = true
searchTechnologicalRequirementsOfProcessNum(row.工艺编号).then(response => {
this.loading3 = false
this.tableData3 = response.data
})
this.$message.success('删除成功')
} else {
this.$message.error('删除失败')
}
})
})
}
}
}
</script>
<style scoped>
.el-card {
margin-top: 15px;
margin-left: 15px;
}
</style>

32
src/views/Inventory/DirectPart/index.vue
View File

@@ -268,9 +268,8 @@ export default {
this.PeopleNumber = this.id
},
searchMachine() { // 查询机床
if (this.ProjectValue === '') {
this.ProjectValue_check = 0
}
this.Machine = []
this.ProjectValue ? this.ProjectValue_check = 1 : this.ProjectValue_check = 0
searchmachine(this.ProjectValue_check, this.ProjectValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machine.push({
@@ -281,6 +280,7 @@ export default {
})
},
searchGroupList() { // 查询组号
this.GroupNum = []
searchTeam(this.MachineValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.GroupNum.push({
@@ -291,16 +291,19 @@ export default {
})
},
searchPeopleData() { // 查询人员
this.People = []
searchPeople().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.People.push({
label: response.data[i].姓名,
value: response.data[i].考勤编号
value: parseInt(response.data[i].考勤编号)
})
}
console.log(this.People)
})
},
searchContractData() { // 查询合同
this.Contract = []
searchContract().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Contract.push({
@@ -312,18 +315,10 @@ export default {
},
searchPartinfo() {
this.tableDataPurchase = []
if (this.ProjectValue === '') {
this.ProjectValue_check = 0
}
if (this.MachineValue === '') {
this.MachineValue_check = 0
}
if (this.GroupNumValue === '') {
this.GroupNumValue_check = 0
}
if (this.ContractValue === '') {
this.ContractValue_check = 0
}
this.ProjectValue ? this.ProjectValue_check = 1 : this.ProjectValue_check = 0
this.MachineValue ? this.MachineValue_check = 1 : this.MachineValue_check = 0
this.GroupNumValue ? this.GroupNumValue_check = 1 : this.GroupNumValue_check = 0
this.ContractValue ? this.ContractValue_check = 1 : this.ContractValue_check = 0
this.listLoading = true
searchDirectPart(this.PageCurrent, this.PageSize, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue, this.ContractValue_check, this.ContractValue).then(response => {
this.tableDataPurchase = response.data.rows
@@ -349,8 +344,7 @@ export default {
// 打开直达件表单
addDirect(row) {
this.PeopleValue = ''
this.form = []
console.log(row)
this.form = {}
this.dialogFormVisible = true
this.materialNum = row.物料流水号
this.purchaseContractNumber = row.采购合同明细流水号
@@ -367,7 +361,7 @@ export default {
this.dialogFormVisible1 = true
this.directPartNumber = row.直达件流水号
this.form.DirectNumber = row.到货数量
this.PeopleValue = row.领用人员流水号
this.PeopleValue = parseInt(row.领用人员流水号)
this.form.DirectNote = row.备注
},
// 修改直达件

2
src/views/Inventory/ExchangeApproval/index.vue
View File

@@ -129,7 +129,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
approvalExchangepart(row.交换单流水号, row.交换件物料流水号, row.交换件组件零件流水号, row.交换件采购合同明细流水号, row.货位流水号, row.交换数量).then(response => {
approvalExchangepart(row.交换单流水号, row.交换件物料流水号, row.被交换件物料流水号, row.交换件组件零件流水号, row.被交换件组件零件流水号, row.交换件采购合同明细流水号, row.货位流水号, row.被交换货位流水号, row.交换数量).then(response => {
if (response.data[0].result === '1') {
this.$message.success('执行成功')
this.searchTable1()

247
src/views/Inventory/ExchangePart/index.vue
View File

@@ -71,22 +71,22 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">交换</el-button>
<el-button size="small" type="primary" icon="el-icon-sort-down" style="margin: 0 0 0 0px" @click="selected(scope.row)">被交换</el-button>
<el-button :disabled="scope.row.是否禁用" size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">交换</el-button>
<el-button :disabled="scope.row.是否禁用" size="small" type="primary" icon="el-icon-sort-down" style="margin: 0 0 0 0px" @click="selected(scope.row)">被交换</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="PageCurrent"
:page-sizes="[10, 20, 30, 40]"
:page-size="10"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="PageCurrent"
:page-sizes="[10, 20, 30, 40]"
:page-size="10"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
<el-card>
<el-row>
<el-col :span="11">
@@ -109,12 +109,12 @@
</el-table-column>
<el-table-column label="机床名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组件名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.组件名称 }}
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="物料名称" align="center" min-width="80">
@@ -127,7 +127,7 @@
</el-col>
<el-col :span="2">
<div style="margin: 10px 15px">
<el-button size="small" type="primary" icon="el-icon-edit" @click="total = 0;pageSize = 10;pageList = 1;exchange()" >交换</el-button>
<el-button size="small" type="primary" icon="el-icon-edit" @click="total = 0;pageSize = 10;pageList = 1;exchange('form')" >交换</el-button>
</div>
</el-col>
<el-col :span="11">
@@ -149,12 +149,12 @@
</el-table-column>
<el-table-column label="机床名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组件名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.组件名称 }}
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="物料名称" align="center" min-width="80">
@@ -166,25 +166,7 @@
</div>
</el-col>
</el-row>
<!--新增交换件对话框-->
<el-dialog :title="title" :visible.sync="dialogFormVisible" center width="380px">
<el-form ref="form" :model="form" :rules="rules" label-position="left">
<el-form-item label="交换单编号" prop="ContractNumberValue" label-width="100px" size="small">
<el-input v-model="form.ExchangeNumber" size="small" placeholder="请输入零件交换单编号" style="width: 200px"/>
</el-form-item>
<el-form-item label="交换数量" prop="TotalContractAmount" label-width="100px">
<el-input v-model="form.ExchangeNumberx" size="small" placeholder="请输入交换数量" style="width: 200px"/>
</el-form-item>
<el-form-item label="备注" prop="TotalContractAmount" label-width="100px">
<el-input v-model="form.ExchangeNote" size="small" placeholder="请输入备注" style="width: 200px"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>
<el-button v-show="title==='交换'" type="primary" @click="addListDetailinfor('form')">确 定</el-button>
<el-button v-show="title==='编辑'" type="primary" @click="submitEdit('form')">确定</el-button>
</div>
</el-dialog>
<!--交换件表格-->
</el-card>
<el-card>
<el-table
@@ -240,38 +222,67 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="180">
<template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="handleEdit(scope.row)">编辑</el-button>
<el-button size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 0 0px" @click="dropListinfor(scope.row)">删除</el-button>
<el-button :disabled="scope.row.是否禁用" size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="handleEdit(scope.row)">编辑</el-button>
<el-button :disabled="scope.row.是否禁用" size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 0 0px" @click="dropListinfor(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="PageCurrent1"
:page-sizes="[10, 20, 30, 40]"
:page-size="10"
:total="total1"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
</div>
</el-card>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="PageCurrent1"
:page-sizes="[10, 20, 30, 40]"
:page-size="10"
:total="total1"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
</div>
<el-dialog :title="title" :visible.sync="dialogFormVisible" center width="380px">
<el-form ref="form" :model="form" :rules="rules" label-position="left">
<el-form-item label="交换单编号" prop="ExchangeNumber" label-width="100px" size="small">
<el-input v-model="form.ExchangeNumber" size="small" placeholder="请输入零件交换单编号" style="width: 200px"/>
</el-form-item>
<el-form-item label="交换数量" prop="ExchangeNumberx" label-width="100px">
<el-input v-model="form.ExchangeNumberx" size="small" placeholder="请输入交换数量" style="width: 200px"/>
</el-form-item>
<el-form-item label="领料单" prop="ExchangeNumberx" label-width="100px">
<el-select v-model="PickingListNumber" filterable clearable size="small" placeholder="领料单号" style="width: 200px;margin-right:10px" @change="searchGroupList()">
<el-option
v-for="item in PickingList"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="ExchangeNote" label-width="100px">
<el-input v-model="form.ExchangeNote" size="small" placeholder="请输入备注" style="width: 200px"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>
<el-button v-show="title==='交换'" type="primary" @click="addListDetailinfor('form')">确 定</el-button>
<el-button v-show="title==='编辑'" type="primary" @click="submitEdit(scope.$index, scope.row, 'form')">确定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { initProject, searchmachine, searchTeam, searchPurchasePart, addExchangepart, searchExchangePart, dropExchangeList, editExchangeList } from '@/api/Inventory/ExchangePart'
import { initProject, searchmachine, searchTeam, searchPurchasePart, addExchangepart, searchExchangePart, dropExchangeList, editExchangeList, searchList1 } from '@/api/Inventory/ExchangePart'
import { mapGetters } from 'vuex'
export default {
data() {
return {
ProjectValue: ' ',
count1: 0,
count2: 0, // 清表单验证计数器
ProjectValue: '',
Project: [],
ProjectValue_check: 1,
MachineValue: ' ',
ProjectValue_check: 0,
MachineValue: '',
Machine: [],
MachineValue_check: 1,
GroupNumValue: ' ',
GroupNumValue: '',
GroupNumValue_check: 1,
GroupNum: [],
tableDataBasic: [],
@@ -302,7 +313,7 @@ export default {
rules: { // 表单验证规则
ExchangeNumber: [{ required: true, message: '请输入交换件编号', trigger: 'blur' }],
ExchangeNumberx: [{ required: true, message: '请输入交换件数量', trigger: 'blur' }],
ExchangeNote: [{ required: true, message: '请输入交换件备注', trigger: 'change' }]
ExchangeNote: [{ required: true, message: '请输入交换件备注', trigger: 'blur' }]
},
PageCurrent: 1,
PageSize: 10,
@@ -314,7 +325,9 @@ export default {
listLoading1: '',
exchangeListNumber: '',
eTeamPartNumber: '',
title: ''
title: '',
PickingListNumber: '',
PickingList: []
}
},
computed: {
@@ -326,6 +339,7 @@ export default {
this.fetchData()
this.getpeopleid()
this.getExchangeTable()
this.searchPickingList()
},
methods: {
fetchData() {
@@ -334,27 +348,44 @@ export default {
// 获取人员编号
getpeopleid() {
this.picikingPeople = this.id
console.log(this.picikingPeople)
},
searchMachine() { // 查询机床
if (this.ProjectValue === '') {
searchMachine() {
this.MachineValue = ''
this.Machine = []
this.GroupNumValue = ''
this.GroupNum = []
if (this.ProjectValue !== '') {
this.ProjectValue_check = 1
searchmachine(this.ProjectValue_check, this.ProjectValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machine.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号
})
}
})
} else {
this.ProjectValue_check = 0
}
searchmachine(this.ProjectValue_check, this.ProjectValue).then(response => {
},
searchGroupList() {
this.GroupNumValue = ''
this.GroupNum = []
searchTeam(this.MachineValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machine.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号
this.GroupNum.push({
label: response.data[i].组号,
value: response.data[i].组件流水号
})
}
})
},
searchGroupList() { // 查询组号
searchTeam(this.MachineValue).then(response => {
searchPickingList() {
searchList1().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.GroupNum.push({
label: response.data[i].组件名称,
value: response.data[i].组件流水号
this.PickingList.push({
label: response.data[i].领料单编号,
value: response.data[i].领料单流水号
})
}
})
@@ -362,20 +393,24 @@ export default {
searchPartinfo() {
this.tableDataPurchase = []
this.tableDataBasic = []
if (this.ProjectValue === ' ') {
if (this.ProjectValue === '') {
this.ProjectValue_check = 0
}
if (this.MachineValue === ' ') {
if (this.MachineValue === '') {
this.MachineValue_check = 0
}
if (this.GroupNumValue === ' ') {
if (this.GroupNumValue === '') {
this.GroupNumValue_check = 0
}
this.listLoading = true
searchPurchasePart(this.PageCurrent, this.PageSize, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
this.tableDataPurchase = response.data.rows
console.log(this.tableDataPurchase)
this.total = response.data.total
const data = response.data.rows
console.log(data)
for (let i = 0; i < data.length; i++) {
data[i].是否交换 === '1' || data[i].是否交换 === '2' ? data[i].是否禁用 = true : data[i].是否禁用 = false
}
this.tableDataPurchase = data
})
this.listLoading = false
},
@@ -392,44 +427,77 @@ export default {
getExchangeTable() {
this.listLoading1 = true
searchExchangePart(this.PageCurrent1, this.PageSize1).then(response => {
this.tableDataExchange = response.data.rows
const data = response.data.rows
console.log(data)
for (let i = 0; i < data.length; i++) {
data[i].审批通过 === '1' || data[i].审批通过 === '2' ? data[i].是否禁用 = true : data[i].是否禁用 = false
}
this.tableDataExchange = data
this.total1 = response.data.total
this.listLoading1 = false
})
},
handleSizeChange1(val) {
this.PageCurrent1 = 1
this.PageSize1 = val
this.getExchangeTable()
},
handleCurrentChange1(val) {
this.PageCurrent1 = val
this.getExchangeTable()
},
// 选择领料单
chooseListinfor(row) {
this.pickingListNumberx = row.领料单流水号
console.log(this.pickingListNumberx)
this.searchListDetailt()
},
// 增加交换件
addListDetailinfor() {
addExchangepart(this.form.ExchangeNumber, this.tableData1[0].组件零件流水号, this.tableData1[0].物料流水号, this.tableData1[0].采购合同明细流水号, this.tableData2[0].组件零件流水号, this.tableData1[0].物料名称, this.tableData2[0].物料名称, this.tableData2[0].货位流水号, this.form.ExchangeNumberx, this.picikingPeople, this.form.ExchangeNote).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
} else { this.$message.error('增加失败') }
addListDetailinfor(form) {
this.$refs[form].validate((valid) => {
if (valid) {
addExchangepart(this.form.ExchangeNumber, this.tableData1[0].组件零件流水号, this.tableData1[0].物料流水号, this.tableData1[1].物料流水号, this.tableData1[0].采购合同明细流水号, this.tableData2[0].组件零件流水号, this.tableData1[0].物料名称, this.tableData2[0].物料名称, this.tableData1[0].货位流水号, this.tableData2[0].货位流水号, this.form.ExchangeNumberx, this.picikingPeople, this.form.ExchangeNote, this.PickingListNumber).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
} else { this.$message.error('增加失败') }
}).then(() => {
this.dialogFormVisible = false
this.PageCurrent1 = 1
this.getExchangeTable()
this.searchPartinfo()
})
}
})
this.dialogFormVisible = false
this.getExchangeTable()
},
// 打开交换表单
exchange() {
this.title = '交换'
this.dialogFormVisible = true
exchange(form) {
if (this.tableData1.length === 0) {
this.$message.error('请选择交换件')
} else if (this.tableData2.length === 0) {
this.$message.error('请选择交换件')
} else {
this.count1 = this.count1 + 1
if (this.count1 !== 1) {
this.$refs[form].resetFields()
}
this.title = '交换'
this.form.ExchangeNumber = ''
this.form.ExchangeNumberx = ''
this.form.ExchangeNote = ''
this.dialogFormVisible = true
}
},
// 重置表单
callOff() {
callOff(formName) {
this.form.ExchangeNumber = ''
this.form.ExchangeNumberx = ''
this.form.ExchangeNote = ''
this.dialogFormVisible = false
this.$refs[formName].resetFields()
},
// 选中零件交换
selecting(row) {
const arr = new Array(row)
this.tableData1 = arr
console.log(this.tableData1)
},
// 选中被零件交换
selected(row) {
@@ -445,11 +513,12 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
dropExchangeList(this.exchangeListNumber, this.eTeamPartNumber).then(response => {
dropExchangeList(this.exchangeListNumber).then(response => {
if (response.data[0].result === '1') {
this.$message.success('删除成功')
this.getExchangeTable().then(response => {
})
this.dialogFormVisible = false
this.PageCurrent1 = 1
this.getExchangeTable()
} else {
this.$message.error('删除失败')
}

35
src/views/Inventory/genneralPart/index.vue → src/views/Inventory/GenneralPart/index.vue
View File

@@ -76,6 +76,7 @@
<template slot-scope="scope">
<el-button type="primary" size="mini" class="el-icon-success" @click="Innumber">入库</el-button>
<el-button
:disabled="scope.row.是否禁用"
size="mini"
type="danger"
class="el-icon-delete"
@@ -178,6 +179,8 @@ export default {
if (response.data.length === 0) {
this.listLoading = false
this.$message.warning('无此零件')
} else if (response.data[0].剩余数量 === 0) {
this.$message.warning('该零件已入库完毕')
} else {
for (let i = 0; i < this.tableData.length; i++) {
if (response.data[0].工艺计划流水号 === this.tableData[i].工艺计划流水号) {
@@ -212,18 +215,26 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
for (let i = 0; i < this.tableData.length; i++) {
if (this.tableData[i].innumber > this.tableData[i].plannumber) {
this.tableData[i].innumber = this.tableData[i].plannumber
if (this.locateNumber === '') {
this.$message.error('请选择货位')
} else {
for (let i = 0; i < this.tableData.length; i++) {
if (this.tableData[i].innumber === '0') {
this.$message.error('请输入正确数量')
} else {
if (this.tableData[i].innumber > this.tableData[i].plannumber) {
this.tableData[i].innumber = this.tableData[i].plannumber
}
insertOne(this.tableData[i].工艺计划流水号, this.tableData[i].innumber, this.PeopleNumber, this.tableData[i].capture, this.inventoryNumber, this.locateNumber, this.tableData[i].note).then(response => {
this.$message({
type: 'success',
message: '零件入库成功!'
})
}).then(() => {
this.Empty()
})
}
}
insertOne(this.tableData[i].工艺计划流水号, this.tableData[i].innumber, this.PeopleNumber, this.tableData[i].capture, this.inventoryNumber, this.locateNumber, this.tableData[i].note).then(response => {
this.$message({
type: 'success',
message: '零件入库成功!'
})
}).then(() => {
this.Empty()
})
}
}).catch(() => {
this.$message({
@@ -245,7 +256,7 @@ export default {
this.locateName = []
this.locateNumber = ''
if (this.inventoryNumber) {
this.getSelect(getlocate, ['货位名称'], 'locateName', this.inventoryNumber)
this.getSelect(getlocate, ['货位名称', '货位流水号'], 'locateName', this.inventoryNumber)
}
}
}

37
src/views/Inventory/Inboundscanning/index.vue
View File

@@ -76,6 +76,7 @@
<template slot-scope="scope">
<el-button type="primary" size="mini" class="el-icon-success" @click="Innumber">入库</el-button>
<el-button
:disabled="scope.row.是否禁用"
size="mini"
type="danger"
class="el-icon-delete"
@@ -160,7 +161,9 @@ export default {
},
websocketonmessage(msg) { // 数据接收
this.partNumber = msg.data.split('|')[3]
this.getscantable()
this.partNumber = this.partNumber.slice(1)
console.log()
this.getscantable(this.partNumber, 3333)
},
websocketclose() { // 关闭
console.log('WebSocket关闭')
@@ -178,6 +181,8 @@ export default {
if (response.data.length === 0) {
this.listLoading = false
this.$message.warning('无此零件')
} else if (response.data[0].剩余数量 === 0) {
this.$message.warning('该零件已入库完毕')
} else {
for (let i = 0; i < this.tableData.length; i++) {
if (response.data[0].工艺计划流水号 === this.tableData[i].工艺计划流水号) {
@@ -212,18 +217,26 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
for (let i = 0; i < this.tableData.length; i++) {
if (this.tableData[i].innumber > this.tableData[i].plannumber) {
this.tableData[i].innumber = this.tableData[i].plannumber
if (this.locateNumber === '') {
this.$message.error('请选择货位')
} else {
for (let i = 0; i < this.tableData.length; i++) {
if (this.tableData[i].innumber === '0') {
this.$message.error('请输入正确数量')
} else {
if (this.tableData[i].innumber > this.tableData[i].plannumber) {
this.tableData[i].innumber = this.tableData[i].plannumber
}
insertOne(this.tableData[i].工艺计划流水号, this.tableData[i].innumber, this.PeopleNumber, this.tableData[i].capture, this.inventoryNumber, this.locateNumber, this.tableData[i].note).then(response => {
this.$message({
type: 'success',
message: '零件入库成功!'
})
}).then(() => {
this.Empty()
})
}
}
insertOne(this.tableData[i].工艺计划流水号, this.tableData[i].innumber, this.PeopleNumber, this.tableData[i].capture, this.inventoryNumber, this.locateNumber, this.tableData[i].note).then(response => {
this.$message({
type: 'success',
message: '零件入库成功!'
})
}).then(() => {
this.Empty()
})
}
}).catch(() => {
this.$message({

748
src/views/Inventory/InventoryCheck/index.vue
View File

File diff suppressed because it is too large Load Diff

132
src/views/Inventory/InventoryManagement/index.vue
View File

@@ -40,22 +40,13 @@
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column prop="budget" label="领用人" width="100" align="center">
<template slot-scope="scope">
{{ scope.row.领用人 }}
</template>
</el-table-column>
<el-table-column label="操作" min-width="100" align="center" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
icon="el-icon-edit"
type="primary"
@click="handleEdit(scope.row)">修改</el-button>
</template>
</el-table-column>
<el-table-column label="操作" min-width="100" align="center" fixed="right">
<template slot-scope="scope">
@click="handleEdit(scope.$index, scope.row, 'form')">修改</el-button>
<el-button
size="mini"
type="danger"
@@ -100,7 +91,12 @@
{{ scope.row.仓库名称 }}
</template>
</el-table-column>
<el-table-column label="操作" min-width="100" align="center" fixed="right">
<el-table-column align="center" label="二维码" width="150">
<template slot-scope="scope">
<canvas :id="canvas[scope.$index]" class="code"/>
</template>
</el-table-column>
<el-table-column label="操作" width="200px" align="center">
<template slot-scope="scope">
<el-button
size="mini"
@@ -117,14 +113,15 @@
</el-table>
</el-card>
<!--仓库表单-->
<el-dialog :visible.sync="dialogFormVisible" title="增加仓库" center style="min-height: 300px" width="400px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
<el-dialog :visible.sync="dialogFormVisible" title="增加仓库" center width="450px">
<el-form ref="form" :model="form" :rules="rules" label-position="center" label-width="110px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
<el-form-item label="仓库编号" prop="WarehouseNumber">
<el-input
v-model="form.WarehouseNumber"
size="small"
clearable
style="width:200px"/>
</el-form-item>
</el-col>
@@ -135,6 +132,7 @@
<el-input
v-model="form.WarehouseName"
size="small"
clearable
style="width:200px"/>
</el-form-item>
</el-col>
@@ -145,6 +143,7 @@
<el-input
v-model="form.WarehouseDescription"
size="small"
clearable
style="width:200px"/>
</el-form-item>
</el-col>
@@ -154,6 +153,7 @@
<el-form-item label="地址" prop="Address">
<el-input
v-model="form.Address"
clearable
size="small"
style="width:200px"/>
</el-form-item>
@@ -161,10 +161,10 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="领用者" prop="TotalContractAmount" label-width="100px">
<el-select v-model="PeopleValue" filterable clearable size="small" placeholder="领用者" style="width: 200px;margin-right:10px" @change="searchGroupList()">
<el-form-item label="联系人" prop="ContactpeopleValue">
<el-select v-model="form.ContactpeopleValue" clearable filterable size="small" placeholder="领用者" style="width: 200px;margin-right:10px">
<el-option
v-for="item in People"
v-for="item in Contactpeople"
:key="item.value"
:label="item.label"
:value="item.value"/>
@@ -177,6 +177,7 @@
<el-form-item label="备注" prop="Note">
<el-input
v-model="form.Note"
clearable
size="small"
style="width:200px"/>
</el-form-item>
@@ -213,11 +214,14 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="永久" prop="永久">
<el-input
v-model="form2.永久"
size="small"
style="width:200px"/>
<el-form-item label="是否永久" prop="永久">
<el-select v-model="form2.永久" clearable filterable placeholder="请选择" style="width: 200px;margin-right:10px">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
@@ -241,9 +245,12 @@
</template>
<script>
import { initWarehouse, addWarehouse, alterWarehouse, deleteWarehouse, searchLocate, addLocate, alterLocate, deleteLocate, searchPeople } from '@/api/Inventory/InventoryManagement'
import QRCode from 'qrcode'
export default {
data() {
return {
Contactpeople: [], // 联系人
count2: 0, // 清表单验证计数器
tableData: [],
tableData2: [],
wareHouse: '',
@@ -254,10 +261,12 @@ export default {
WarehouseName: '', // 仓库名称
WarehouseDescription: '', // 仓库描述
Address: '', // 地址
ContactpeopleValue: '',
Note: '' // 备注
},
rules: { // 表单验证规则
WarehouseNumber: [{ required: true, message: '请输入仓库编号', trigger: 'change' }],
WarehouseNumber: [{ required: true, message: '请输入仓库编号', trigger: 'blur' }],
ContactpeopleValue: [{ required: true, message: '请选择联系人', trigger: 'change' }],
WarehouseName: [{ required: true, message: '请输入仓库名称', trigger: 'blur' }],
WarehouseDescription: [{ required: true, message: '请输入仓库描述', trigger: 'blur' }],
Address: [{ required: true, message: '请输入地址', trigger: 'blur' }],
@@ -280,7 +289,15 @@ export default {
LocateNumber: '',
listLoading: '',
PeopleValue: '',
People: []
People: [],
canvas: [],
options: [{
value: '1',
label: '是'
}, {
value: '0',
label: '否'
}]
}
},
created() {
@@ -294,7 +311,6 @@ export default {
this.listLoading = true
initWarehouse().then(response => {
this.listLoading = false
console.log(response)
for (let i = 0; i < response.data.length; i++) {
this.tableData.push({
仓库流水号: response.data[i].仓库流水号,
@@ -302,8 +318,9 @@ export default {
仓库名称: response.data[i].仓库名称,
仓库描述: response.data[i].仓库描述,
地址: response.data[i].地址,
联系人: response.data[i].联系人,
备注: response.data[i].备注
联系人: response.data[i].姓名,
备注: response.data[i].备注,
人员编号: response.data[i].人员编号
})
}
})
@@ -313,11 +330,12 @@ export default {
this.getLocate()
},
searchPeopleData() { // 查询人员
this.Contactpeople = []
searchPeople().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.People.push({
this.Contactpeople.push({
label: response.data[i].姓名,
value: response.data[i].考勤编号
value: response.data[i].人员编号
})
}
})
@@ -325,7 +343,9 @@ export default {
getLocate() {
this.tableData2 = []
searchLocate(this.wareHouse).then(response => {
for (let i = 0; i < response.data.length; i++) {
const data = response.data
for (let i = 0; i < data.length; i++) {
this.canvas.push(response.data[i].货位流水号.toString())
this.tableData2.push({
货位流水号: response.data[i].货位流水号,
货位名称: response.data[i].货位名称,
@@ -335,10 +355,20 @@ export default {
仓库名称: response.data[i].仓库名称
})
}
return data
}).then(res => {
for (let i = 0; i < res.length; i++) {
QRCode.toCanvas(document.getElementById(this.canvas[i]), res[i].货位流水号.toString(), function(error) {
if (error) console.error(error)
console.log('success!')
})
}
this.tableData2 = res
})
},
// 点击增加仓库
ADD() {
this.form = []
if (this.$refs['form'] !== undefined) {
this.$refs['form'].resetFields()
}
@@ -355,19 +385,20 @@ export default {
this.form.WarehouseName = ''
this.form.WarehouseDescription = ''
this.form.Address = ''
this.form.Contactpeople = ''
this.form.ContactpeopleValue = ''
this.form.Note = ''
this.temp = null
this.temp = ''
} else if (this.temp === 2) {
this.chaEdit()
this.temp = null
this.temp = ''
}
}
})
},
// 执行增加仓库
addTableData() {
addWarehouse(this.form.WarehouseNumber, this.form.WarehouseName, this.form.WarehouseDescription, this.form.Address, this.PeopleValue, this.form.Note).then(response => {
addWarehouse(this.form.WarehouseNumber, this.form.WarehouseName, this.form.WarehouseDescription, this.form.Address, this.form.ContactpeopleValue, this.form.Note).then(response => {
console.log(this.form.WarehouseNumber, this.form.WarehouseName, this.form.WarehouseDescription, this.form.Address, this.form.ContactpeopleValue, this.form.Note)
this.dialogFormVisible = false
if (response.data[0].result === '1') {
this.$message.success('添加成功')
@@ -375,7 +406,7 @@ export default {
this.form.WarehouseName = ''
this.form.WarehouseDescription = ''
this.form.Address = ''
this.form.Contactpeople = ''
this.form.ContactpeopleValue = ''
this.form.Note = ''
} else {
this.$message.error('添加失败')
@@ -384,29 +415,23 @@ export default {
})
},
// 编辑
handleEdit(row) {
handleEdit(index, row, formName) {
this.temp = 2
this.dialogFormVisible = true
this.form.WarehouseNumber = row.仓库编号
this.form.WarehouseName = row.仓库名称
this.form.WarehouseDescription = row.仓库描述
this.form.Address = row.地址
this.form.Contactpeople = row.联系人
this.form.ContactpeopleValue = row.人员编号
this.form.Note = row.备注
this.HouseNumber = row.仓库流水号
},
// 执行修改
chaEdit() {
alterWarehouse(this.HouseNumber, this.form.WarehouseNumber, this.form.WarehouseName, this.form.WarehouseDescription, this.form.Address, this.form.Contactpeople, this.form.Note).then(response => {
this.dialogFormVisible = false
alterWarehouse(this.HouseNumber, this.form.WarehouseNumber, this.form.WarehouseName, this.form.WarehouseDescription, this.form.Address, this.form.ContactpeopleValue, this.form.Note).then(response => {
if (response.data[0].result === '1') {
this.$message.success('信息更新成功')
this.form.WarehouseNumber = ''
this.form.WarehouseName = ''
this.form.WarehouseDescription = ''
this.form.Address = ''
this.form.Contactpeople = ''
this.form.Note = ''
this.dialogFormVisible = false
this.getTable()
} else {
this.$message.error('信息更新失败')
@@ -425,14 +450,13 @@ export default {
this.getTable()
this.$message.success('删除成功')
} else {
this.$message.error('删除失败')
this.$message.error('数据占用')
}
})
})
},
// 重置表单
callOff(formName) {
console.log(1515)
this.form = {}
this.form2.ContractNumberValue = ''
this.form2.EntryName = ''
@@ -443,6 +467,7 @@ export default {
},
// 点击增加货位
ADDLocate() {
this.form2 = []
if (this.$refs['form2'] !== undefined) {
this.$refs['form2'].resetFields()
}
@@ -498,6 +523,7 @@ export default {
},
// 执行修改货位
LocateEdit() {
console.log(this.LocateNumber, this.form2.货位名称, this.form2.工作中心, this.form2.仓库流水号, this.form2.永久, this.form2.不可用量)
alterLocate(this.LocateNumber, this.form2.货位名称, this.form2.工作中心, this.form2.仓库流水号, this.form2.永久, this.form2.不可用量).then(response => {
this.dialogFormVisible2 = false
if (response.data[0].result === '1') {
@@ -530,6 +556,15 @@ export default {
})
})
},
useqrcode() {
// 生成的二维码内容，可以添加变量
this.QueryDetail = this.num
var canvas = document.getElementById('canvas')
QRCode.toCanvas(canvas, this.QueryDetail, function(error) {
if (error) console.error(error)
console.log('success!')
})
},
// 重置表单
callLocateOff(formName) {
this.form2 = {}
@@ -546,5 +581,8 @@ export default {
</script>
<style scoped>
.code{
width:120px!important;
height: auto!important;
}
</style>

43
src/views/Inventory/OfflinePartOut/index.vue
View File

@@ -93,7 +93,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="addDirectPartm()">确 定</el-button>
<el-button type="primary" @click="addDirectPartm()">确定</el-button>
</div>
</el-dialog>
<el-card>
@@ -102,7 +102,7 @@
:data="tableDataOut"
border
style="width: 100%;"
height="200">
height="350">
<el-table-column
label="序号"
align="center"
@@ -177,7 +177,8 @@ export default {
PeopleNumber: '',
tableDataOut: [],
listLoading: '',
listLoading1: ''
listLoading1: '',
partnumber: ''
}
},
computed: {
@@ -200,7 +201,6 @@ export default {
this.PeopleNumber = this.id
},
searchMachine() { // 查询机床
console.log(1351)
if (this.ProjectValue === '') {
this.ProjectValue_check = 0
}
@@ -251,6 +251,8 @@ export default {
this.contractNumber = row.离线合同明细流水号
this.locateNumber = row.货位流水号
this.materialNumber = row.物料流水号
this.partnumber = row.货位存量
console.log(this.partnumber)
this.searchoutRecord()
},
// 重置表单
@@ -272,21 +274,24 @@ export default {
},
// 离线外购件出库
addDirectPartm() {
console.log(this.contractNumber, this.PeopleValue, this.form.DirectNumber, this.locateNumber, this.form.DirectNote, this.form.ProjectValue, this.MachineValue, this.GroupNumValue, this.materialNumber, this.PeopleNumber)
outlinePartOut(this.contractNumber, this.PeopleValue, this.form.DirectNumber, this.locateNumber, this.form.DirectNote, this.form.ProjectValue, this.MachineValue, this.GroupNumValue, this.materialNumber, this.PeopleNumber).then(response => {
if (response.data[0].result === '1') {
this.$notify({
title: '成功',
message: '信息添加成功',
type: 'success'
})
this.dialogFormVisible = false
this.searchDirect()
} else {
this.$message.error('信息添加失败')
}
})
this.dialogFormVisible = false
if (this.partnumber < this.form.DirectNumber) {
this.$message.error('请正确输入数量')
} else {
outlinePartOut(this.contractNumber, this.PeopleValue, this.form.DirectNumber, this.locateNumber, this.form.DirectNote, this.form.ProjectValue, this.MachineValue, this.GroupNumValue, this.materialNumber, this.PeopleNumber).then(response => {
if (response.data[0].result === '1') {
this.$notify({
title: '成功',
message: '信息添加成功',
type: 'success'
})
this.dialogFormVisible = false
this.searchDirect()
} else {
this.$message.error('信息添加失败')
}
})
this.dialogFormVisible = false
}
}
}
}

29
src/views/Inventory/PartOut/index.vue
View File

@@ -9,7 +9,7 @@
:data="tableData1"
border
style="width: 100%;"
height="200">
height="300">
<el-table-column
label="序号"
align="center"
@@ -41,7 +41,7 @@
:data="tableDataPicking"
border
style="width: 100%;"
height="200">
height="400">
<el-table-column
label="序号"
align="center"
@@ -84,7 +84,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="80">
<template slot-scope="scope">
<el-button size="small" type="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="partOut(scope.row)">出库</el-button>
<el-button :disabled="scope.row.是否出库" size="small" type="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="partOut(scope.row)">出库</el-button>
</template>
</el-table-column>
</el-table>
@@ -93,7 +93,7 @@
</template>
<script>
import { searchList, searchListDetail, PurchasePart, BasicPart, WorkShopPart } from '@/api/Inventory/PartOut'
import { searchList, searchListDetail, PurchasePart, BasicPart, WorkShopPart, ListDetailOut } from '@/api/Inventory/PartOut'
import { mapGetters } from 'vuex'
export default {
data() {
@@ -113,6 +113,7 @@ export default {
tableDataPicking: [], // 领料单明细表格
listNumber: '',
pickingListNumber: null, // 领料单编号
pickingListNumber_check: 1,
pickingListNumberx: '', // 领料单流水号
picikingPeople: '', // 领料人流水号
partProjectNumber: '', // 项目流水号
@@ -144,8 +145,14 @@ export default {
},
// 查询领料单
searchListinfor() {
if (this.pickingListNumber === null) {
this.pickingListNumber_check = 0
}
this.listLoading = true
searchList(this.pickingListNumber).then(response => {
searchList(this.pickingListNumber_check, this.pickingListNumber).then(response => {
for (let i = 0; i < response.data.length; i++) {
response.data[i].领料时间 = response.data[i].领料时间.substring(0, response.data[i].领料时间.length - 8)
}
this.tableData1 = response.data
this.listLoading = false
})
@@ -154,7 +161,11 @@ export default {
searchListDetailt() {
this.listLoading1 = true
searchListDetail(this.pickingListNumberx).then(response => {
this.tableDataPicking = response.data
const data = response.data
for (let i = 0; i < data.length; i++) {
data[i].是否出库 === '1' ? data[i].是否禁用 = true : data[i].是否禁用 = false
}
this.tableDataPicking = data
this.listLoading1 = false
})
},
@@ -171,19 +182,25 @@ export default {
if (row.车间外购 === 1) {
WorkShopPart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
if (response.data[0].result === '1') {
ListDetailOut(row.领料单明细流水号)
this.$message.success('出库成功')
this.searchListDetailt()
} else { this.$message.error('出库失败') }
})
} else if (row.零件类型 === 1 || row.零件类型 === 2) {
PurchasePart(row.组件零件流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
if (response.data[0].result === '1') {
ListDetailOut(row.领料单明细流水号)
this.$message.success('出库成功')
this.searchListDetailt()
} else { this.$message.error('出库失败') }
})
} else {
BasicPart(row.工艺计划流水号, row.出库数量, row.收件信息ID, row.备注).then(response => {
if (response.data[0].result === '1') {
this.$message.success('出库成功')
ListDetailOut(row.领料单明细流水号)
this.searchListDetailt()
} else { this.$message.error('增加失败') }
})
}

150
src/views/Inventory/PickingList/index.vue
View File

@@ -168,11 +168,21 @@
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="库存数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.可出库数量 }}
</template>
</el-table-column>
<el-table-column label="待出库数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.待出库数量 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" min-width="80">
<template slot-scope="scope" align="center">
{{ scope.row.零件图号 }}
@@ -240,11 +250,21 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.数量 }}
</template>
</el-table-column>
<el-table-column label="零件数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.货位存量 }}
</template>
</el-table-column>
<el-table-column label="待出库数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.待出库数量 }}
</template>
</el-table-column>
<el-table-column label="零件类型" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.类型名称 }}
@@ -307,11 +327,21 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.数量 }}
</template>
</el-table-column>
<el-table-column label="零件数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.货位存量 }}
</template>
</el-table-column>
<el-table-column label="待出库数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.待出库数量 }}
</template>
</el-table-column>
<el-table-column label="零件类型" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.类型名称 }}
@@ -434,14 +464,14 @@ import { mapGetters } from 'vuex'
export default {
data() {
return {
ProjectValue: ' ',
ProjectValue: '',
Project: [],
ProjectValue_check: 1,
MachineValue: ' ',
MachineValue: null,
Machine: [],
MachineValue_check: 1,
GroupNumValue: ' ',
GroupNumValue_check: 1,
MachineValue_check: 0,
GroupNumValue: null,
GroupNumValue_check: 0,
GroupNum: [],
tableDataBasic: [],
tableDataPurchase: [],
@@ -525,7 +555,10 @@ export default {
listLoadingx: '',
purchaseDetailNum: '',
dialogFormVisibleWork: false,
time: []
time: [],
materialLocate: '',
enableOut: '',
pickingListNumber_check: 1
}
},
computed: {
@@ -547,8 +580,14 @@ export default {
console.log(this.picikingPeople)
},
searchMachine() { // 查询机床
if (this.ProjectValue === ' ') {
this.MachineValue = ''
this.Machine = []
this.GroupNumValue = ''
this.GroupNum = []
if (this.ProjectValue === '') {
this.ProjectValue_check = 0
} else {
this.ProjectValue_check = 1
}
searchmachine(this.ProjectValue_check, this.ProjectValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
@@ -560,6 +599,8 @@ export default {
})
},
searchGroupList() { // 查询组号
this.GroupNumValue = ''
this.GroupNum = []
searchTeam(this.MachineValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.GroupNum.push({
@@ -572,14 +613,14 @@ export default {
searchPartinfo() {
this.tableDataPurchase = []
this.tableDataBasic = []
if (this.ProjectValue === ' ') {
this.ProjectValue_check = 0
if (this.ProjectValue !== null && this.ProjectValue !== '') {
this.ProjectValue_check = 1
}
if (this.MachineValue === ' ') {
this.MachineValue_check = 0
if (this.MachineValue !== null && this.MachineValue !== '') {
this.MachineValue_check = 1
}
if (this.GroupNumValue === ' ') {
this.GroupNumValue_check = 0
if (this.GroupNumValue !== null && this.GroupNumValue !== '') {
this.GroupNumValue_check = 1
}
this.listLoading = true
this.listLoading1 = true
@@ -604,23 +645,23 @@ export default {
})
},
handleSizeChange(val) {
this.PageCurrent = 1
this.PageSize = val
this.searchPartinfo()
},
handleCurrentChange(val) {
this.PageCurrent = val
this.searchPartinfo()
},
handleSizeChange1(val) {
this.PageCurrent1 = 1
this.PageSize1 = val
this.searchPartinfo()
},
handleCurrentChange1(val) {
handleCurrentChange(val) {
this.PageCurrent1 = val
this.searchPartinfo()
},
handleSizeChange1(val) {
this.PageCurrent = 1
this.PageSize = val
this.searchPartinfo()
},
handleCurrentChange1(val) {
this.PageCurrent = val
this.searchPartinfo()
},
handleSizeChangex(val) {
this.PageCurrentx = 1
this.PageSizex = val
@@ -632,8 +673,11 @@ export default {
},
// 查询领料单
searchListinfor() {
if (this.pickingListNumber === null) {
this.pickingListNumber_check = 0
}
this.listLoading2 = true
searchList(this.PageCurrent2, this.PageSize2, this.pickingListNumber).then(response => {
searchList(this.PageCurrent2, this.PageSize2, this.pickingListNumber_check, this.pickingListNumber).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].领料时间.length - 8)
}
@@ -685,7 +729,7 @@ export default {
this.$message.success('删除成功')
this.searchListinfor()
} else {
this.$message.error('删除失败')
this.$message.error('数据占用')
}
})
}).catch(() => {
@@ -708,7 +752,7 @@ export default {
this.$message.success('删除成功')
this.searchListDetailt()
} else {
this.$message.error('删除失败')
this.$message.error('数据占用')
}
})
}).catch(() => {
@@ -742,26 +786,30 @@ export default {
this.materialName = row.零件名称
this.materialType = row.零件类型名称
this.materialNumber = row.零件图号
this.enableOut = row.可出库数量
this.purchaseDetailNum = row.采购合同明细流水号
},
addBasicListDetail(formName) {
if (this.pickingListNumberx === '') {
this.$message.error('请选择领料单')
} if (this.form.OutNumber === '') {
this.$message.error('请输入领用数量')
} else if (this.form.OutNumber === '' || this.form.OutNumber > this.enableOut) {
this.$message.error('请正确输入领用数量')
} else {
this.$refs[formName].validate((valid) => {
if (valid) {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialNumber, this.materialType, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 0, this.materialLocate).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.searchPartinfo()
} else {
this.$message.error('增加失败')
}
})
this.dialogFormVisible1 = false
this.searchListinfor()
}
})
}
this.$refs[formName].validate((valid) => {
if (valid) {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.locatenumber, 0).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
} else {
this.$message.error('增加失败')
}
})
this.dialogFormVisible1 = false
this.searchListinfor()
}
})
},
// 增加外购件领料单明细
addListDetailinfor(row) {
@@ -782,18 +830,22 @@ export default {
this.materialType = row.物料规格
this.dialogFormVisible = true
this.purchaseDetailNum = row.采购合同明细流水号
this.materialLocate = row.物料与货位对照流水号
this.enableOut = row.货位存量 - row.待出库数量
},
execaddListDetail(formName) {
if (this.pickingListNumberx === '') {
this.$message.error('请选择领料单')
} else if (this.OutNumber === '') {
this.$message.error('请输入领用数量')
} else if (this.form2.OutNumber === '' || this.form2.OutNumber > this.enableOut) {
console.log(this.enableOut)
this.$message.error('请正确输入领用数量')
} else {
this.$refs[formName].validate((valid) => {
if (valid) {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form2.OutNumber, this.partType, this.form2.outNote, this.craftplannumber, this.receive, this.teamPart, this.locatenumber, 0).then(response => {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form2.OutNumber, this.partType, this.form2.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 0, this.materialLocate).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.searchPartinfo()
} else {
this.$message.error('增加失败')
}
@@ -821,18 +873,22 @@ export default {
this.materialType = row.物料规格
this.dialogFormVisibleWork = true
this.purchaseDetailNum = row.采购合同明细流水号
this.materialLocate = row.物料与货位对照流水号
this.enableOut = row.货位存量
console.log(this.enableOut)
},
addWorkshopListDetail(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.pickingListNumberx === '') {
this.$message.error('请选择领料单')
} else if (this.OutNumber === '') {
this.$message.error('请输入领用数量')
} else if (this.form3.OutNumber === '' || this.form3.OutNumber > this.enableOut) {
this.$message.error('请正确输入领用数量')
} else {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form3.OutNumber, this.partType, this.form3.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 1).then(response => {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form3.OutNumber, this.partType, this.form3.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 1, this.materialLocate).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.searchPartinfo()
} else {
this.$message.error('增加失败')
}

14
src/views/Inventory/SubPartCome/index.vue
View File

@@ -3,8 +3,8 @@
<el-card>
<span style="margin: 5px">替换单编号</span>
<el-input v-model="substituteNumber" clearable size="small" style="width:200px" />
<span style="margin: 5px">零件图号</span>
<el-input v-model="partNumber" clearable size="small" style="width:200px" />
<span style="margin: 5px">替换件名称</span>
<el-input v-model="subPartName" clearable size="small" style="width:200px" />
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="getSubstitutedCard()">查询</el-button>
</el-card>
<el-card>
@@ -65,8 +65,10 @@ export default {
data() {
return {
tableDataExchange: [],
substituteNumber: '',
partNumber: '',
check1: 0,
check2: 0,
substituteNumber: '', // 替换单编号
subPartName: '', // 替换件名称
listLoading: '',
subList: '',
locateNumber: '',
@@ -77,7 +79,9 @@ export default {
// 替换单查询
getSubstitutedCard() {
this.listloading = true
searchSubstitutedCard().then(response => {
this.substituteNumber ? this.check1 = 1 : this.check1 = 0
this.subPartName ? this.check2 = 1 : this.check2 = 0
searchSubstitutedCard(this.check1, this.substituteNumber, this.check2, this.subPartName).then(response => {
this.tableDataExchange = response.data
this.listloading = false
})

30
src/views/Inventory/SubstitutePart/index.vue
View File

@@ -99,12 +99,12 @@
</el-table-column>
<el-table-column label="机床名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组件名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.组件名称 }}
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="物料名称" align="center" min-width="80">
@@ -349,18 +349,24 @@ export default {
this.picikingPeople = this.id
console.log(this.picikingPeople)
},
searchMachine() { // 查询机床
if (this.ProjectValue === '') {
searchMachine() {
this.MachineValue = ''
this.Machine = []
this.GroupNumValue = ''
this.GroupNum = []
if (this.ProjectValue !== '') {
this.ProjectValue_check = 1
searchmachine(this.ProjectValue_check, this.ProjectValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machine.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号
})
}
})
} else {
this.ProjectValue_check = 0
}
searchmachine(this.ProjectValue_check, this.ProjectValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machine.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号
})
}
})
},
searchGroupList() { // 查询组号
searchTeam(this.MachineValue).then(response => {

385
src/views/ManufacturingCenter/GroupMatching/index.vue
View File

@@ -158,13 +158,83 @@
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="PageCurrent1"
:current-page="pageCurrent4"
:page-sizes="[10, 20, 30, 40]"
:page-size="10"
:total="total1"
:page-size="pageSize4"
:total="total4"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
@size-change="handleSizeChange4"
@current-change="handleCurrentChange4"/>
</div>
</el-card>
<el-card>
<el-table
v-loading="listLoading2"
:data="tableData1"
border
style="width: 100%;"
height="300">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column label="物料名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="物料规格" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="物料型号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床图号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.货位存量 }}
</template>
</el-table-column>
<el-table-column label="零件类型" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.类型名称 }}
</template>
</el-table-column>
<el-table-column label="入库时间" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.入库时间 }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent5"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize5"
:total="total5"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange5"
@current-change="handleCurrentChange5"/>
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible2" title="选择机床" center style="min-height: 300px">
@@ -273,7 +343,7 @@
</template>
<script>
import { initProject, searchTable, searchmachine, searchgroup, searchPurchaseTable } from '@/api/ManufacturingCenter/GroupMatching'
import { initProject, searchTable, searchmachine, searchgroup, searchPurchaseTable, searchTable1 } from '@/api/ManufacturingCenter/GroupMatching'
export default {
data() {
return {
@@ -293,13 +363,22 @@ export default {
pageSize1: 10,
pageCurrent2: 1,
pageSize2: 10,
pageCurrent4: 1,
pageSize4: 10,
pageCurrent5: 1,
pageSize5: 10,
tableData7: [],
tableData6: [],
tableData: [],
tableData1: [],
state: null,
total: null,
total1: null,
total2: null,
listLoading1: false,
listLoading2: false,
total: 0,
total1: 0,
total2: 0,
total4: 0,
total5: 0,
title: '',
dialogFormVisible2: false,
dialogFormVisible3: false,
@@ -359,6 +438,8 @@ export default {
methods: {
searchData() {
this.loading = true
this.listLoading1 = true
this.listLoading2 = true
if (this.entryNameValue !== null && this.entryNameValue !== '') {
if (this.entryNameValue !== null && this.entryNameValue !== '') {
this.check = 1
@@ -406,8 +487,14 @@ export default {
searchPurchaseTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
console.log(response)
this.tableDataPurchase = response.data.rows
this.listLoading = false
this.total1 = response.data.total
this.listLoading1 = false
this.total4 = parseInt(response.data.total)
})
searchTable1(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
console.log(response)
this.tableData1 = response.data.rows
this.listLoading2 = false
this.total5 = parseInt(response.data.total)
})
} else {
this.loading = false
@@ -481,11 +568,105 @@ export default {
handleSizeChange(val) {
this.pageCurrent = 1
this.pageSize = val
this.searchData()
if (this.entryNameValue !== null && this.entryNameValue !== '') {
if (this.entryNameValue !== null && this.entryNameValue !== '') {
this.check = 1
} else {
this.check = 0
}
if (this.machineToolNumber !== '') {
this.check1 = 1
} else {
this.check1 = 0
}
if (this.groupNumber !== '') {
this.check2 = 1
} else {
this.check2 = 0
}
if (this.year !== null && this.year !== '') {
this.check3 = 1
} else {
this.check3 = 0
}
if (this.month !== null && this.month !== '') {
this.check4 = 1
} else {
this.check4 = 0
}
if (this.time !== '' && this.time !== null) {
this.check5 = 1
} else {
this.check5 = 0
}
searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].入库时间 !== null) {
response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
}
if (response.data.rows[i].计划完成时间 !== null) {
response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
}
}
this.tableData = response.data.rows
this.total = parseInt(response.data.total)
this.loading = false
})
} else {
this.loading = false
this.$message.warning('请先选择项目')
}
},
handleCurrentChange(val) {
this.pageCurrent = val
this.searchData()
if (this.entryNameValue !== null && this.entryNameValue !== '') {
if (this.entryNameValue !== null && this.entryNameValue !== '') {
this.check = 1
} else {
this.check = 0
}
if (this.machineToolNumber !== '') {
this.check1 = 1
} else {
this.check1 = 0
}
if (this.groupNumber !== '') {
this.check2 = 1
} else {
this.check2 = 0
}
if (this.year !== null && this.year !== '') {
this.check3 = 1
} else {
this.check3 = 0
}
if (this.month !== null && this.month !== '') {
this.check4 = 1
} else {
this.check4 = 0
}
if (this.time !== '' && this.time !== null) {
this.check5 = 1
} else {
this.check5 = 0
}
searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].入库时间 !== null) {
response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
}
if (response.data.rows[i].计划完成时间 !== null) {
response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
}
}
this.tableData = response.data.rows
this.total = parseInt(response.data.total)
this.loading = false
})
} else {
this.loading = false
this.$message.warning('请先选择项目')
}
},
handleSizeChange1(val) {
this.pageCurrent1 = 1
@@ -504,6 +685,184 @@ export default {
handleCurrentChange3(val) {
this.pageCurrent2 = val
this.searchGroupList()
},
handleSizeChange4(val) {
this.pageCurrent4 = 1
this.pageSize4 = val
if (this.entryNameValue !== null && this.entryNameValue !== '') {
if (this.entryNameValue !== null && this.entryNameValue !== '') {
this.check = 1
} else {
this.check = 0
}
if (this.machineToolNumber !== '') {
this.check1 = 1
} else {
this.check1 = 0
}
if (this.groupNumber !== '') {
this.check2 = 1
} else {
this.check2 = 0
}
if (this.year !== null && this.year !== '') {
this.check3 = 1
} else {
this.check3 = 0
}
if (this.month !== null && this.month !== '') {
this.check4 = 1
} else {
this.check4 = 0
}
if (this.time !== '' && this.time !== null) {
this.check5 = 1
} else {
this.check5 = 0
}
searchPurchaseTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent4, this.pageSize4).then(response => {
console.log(response)
this.tableDataPurchase = response.data.rows
this.listLoading1 = false
this.total4 = parseInt(response.data.total)
})
} else {
this.loading = false
this.$message.warning('请先选择项目')
}
},
handleCurrentChange4(val) {
this.pageCurrent4 = val
if (this.entryNameValue !== null && this.entryNameValue !== '') {
if (this.entryNameValue !== null && this.entryNameValue !== '') {
this.check = 1
} else {
this.check = 0
}
if (this.machineToolNumber !== '') {
this.check1 = 1
} else {
this.check1 = 0
}
if (this.groupNumber !== '') {
this.check2 = 1
} else {
this.check2 = 0
}
if (this.year !== null && this.year !== '') {
this.check3 = 1
} else {
this.check3 = 0
}
if (this.month !== null && this.month !== '') {
this.check4 = 1
} else {
this.check4 = 0
}
if (this.time !== '' && this.time !== null) {
this.check5 = 1
} else {
this.check5 = 0
}
searchPurchaseTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent4, this.pageSize4).then(response => {
console.log(response)
this.tableDataPurchase = response.data.rows
this.listLoading1 = false
this.total4 = parseInt(response.data.total)
})
} else {
this.loading = false
this.$message.warning('请先选择项目')
}
},
handleSizeChange5(val) {
this.pageCurrent5 = 1
this.pageSize5 = val
if (this.entryNameValue !== null && this.entryNameValue !== '') {
if (this.entryNameValue !== null && this.entryNameValue !== '') {
this.check = 1
} else {
this.check = 0
}
if (this.machineToolNumber !== '') {
this.check1 = 1
} else {
this.check1 = 0
}
if (this.groupNumber !== '') {
this.check2 = 1
} else {
this.check2 = 0
}
if (this.year !== null && this.year !== '') {
this.check3 = 1
} else {
this.check3 = 0
}
if (this.month !== null && this.month !== '') {
this.check4 = 1
} else {
this.check4 = 0
}
if (this.time !== '' && this.time !== null) {
this.check5 = 1
} else {
this.check5 = 0
}
searchTable1(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent5, this.pageSize5).then(response => {
console.log(response)
this.tableData1 = response.data.rows
this.listLoading2 = false
this.total5 = parseInt(response.data.total)
})
} else {
this.loading = false
this.$message.warning('请先选择项目')
}
},
handleCurrentChange5(val) {
this.pageCurrent5 = val
if (this.entryNameValue !== null && this.entryNameValue !== '') {
if (this.entryNameValue !== null && this.entryNameValue !== '') {
this.check = 1
} else {
this.check = 0
}
if (this.machineToolNumber !== '') {
this.check1 = 1
} else {
this.check1 = 0
}
if (this.groupNumber !== '') {
this.check2 = 1
} else {
this.check2 = 0
}
if (this.year !== null && this.year !== '') {
this.check3 = 1
} else {
this.check3 = 0
}
if (this.month !== null && this.month !== '') {
this.check4 = 1
} else {
this.check4 = 0
}
if (this.time !== '' && this.time !== null) {
this.check5 = 1
} else {
this.check5 = 0
}
searchTable1(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent5, this.pageSize5).then(response => {
console.log(response)
this.tableData1 = response.data.rows
this.listLoading2 = false
this.total5 = parseInt(response.data.total)
})
} else {
this.loading = false
this.$message.warning('请先选择项目')
}
}
}
}

76
src/views/ManufacturingCenter/InitialProduction/index.vue
View File

@@ -143,40 +143,40 @@
{{ scope.row.零件类型名称 }}
</template>
</el-table-column>
<el-table-column label="是否外协" align="center" width="90">
<template slot-scope="scope">
<el-checkbox v-model="tableData[scope.$index].checked_waixie" @change="gaibianwaixie(scope.$index, scope.row)"/>
外协
</template>
</el-table-column>
<el-table-column label="是否带料" align="center" width="90">
<template slot-scope="scope">
<el-checkbox :disabled="!tableData[scope.$index].checked_waixie" v-model="tableData[scope.$index].checked_dailiao"/>
带料
</template>
</el-table-column>
<el-table-column label="是否着急" align="center" width="90">
<template slot-scope="scope">
<el-checkbox v-model="tableData[scope.$index].checked_zhaoji"/>
着急
</template>
</el-table-column>
<!--<el-table-column label="是否外协" align="center" width="90">-->
<!--<template slot-scope="scope">-->
<!--<el-checkbox v-model="tableData[scope.$index].checked_waixie" @change="gaibianwaixie(scope.$index, scope.row)"/>-->
<!--外协-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="是否带料" align="center" width="90">-->
<!--<template slot-scope="scope">-->
<!--<el-checkbox :disabled="!tableData[scope.$index].checked_waixie" v-model="tableData[scope.$index].checked_dailiao"/>-->
<!--带料-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="是否着急" align="center" width="90">-->
<!--<template slot-scope="scope">-->
<!--<el-checkbox v-model="tableData[scope.$index].checked_zhaoji"/>-->
<!--着急-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column prop="name" label="打回原因" width="170" align="center">-->
<!--<template slot-scope="scope">-->
<!--<el-input v-model="tableData[scope.$index].name" type="textarea" :rows="1" style="width:150px" placeholder="原因">-->
<!--</el-input>-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="操作" width="300px" fixed="right" align="center">
<el-table-column label="操作" width="200px" fixed="right" align="center">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
@click="handleEdit(scope.$index, scope.row, 'form')">分批投产</el-button>
<el-button
size="mini"
type="primary"
@click="handleDele(scope.$index, scope.row, 'form1')">打回档案</el-button>
<!--<el-button-->
<!--size="mini"-->
<!--type="primary"-->
<!--@click="handleDele(scope.$index, scope.row, 'form1')">打回</el-button>-->
</template>
</el-table-column>
</el-table>
@@ -190,16 +190,10 @@
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
<el-checkbox v-model="checked_baitu" style="margin-top:0px">是否白图</el-checkbox>
<el-checkbox v-model="checked_gaonandu">是否高难度</el-checkbox>
<!--<el-checkbox v-model="checked_baitu" style="margin-top:0px">是否白图</el-checkbox>-->
<!--<el-checkbox v-model="checked_gaonandu">是否高难度</el-checkbox>-->
<el-button type="primary" size="small" style="float:right;margin-top:10px" @click="production">投产</el-button>
</div>
<!--<el-row>-->
<!--<el-checkbox v-model="checked_baitu" style="margin-top:20px">是否白图</el-checkbox>-->
<!--<el-checkbox v-model="checked_gaonandu">是否高难度</el-checkbox>-->
<!--<el-button type="primary" size="small" @click="production" style="float:right;margin-top:10px">投产</el-button>-->
<!--</el-row>-->
</div>
</el-card>
@@ -236,14 +230,14 @@
label="批次数量">
<template slot-scope="scope">{{ scope.row.批次数量 }}</template>
</el-table-column>
<el-table-column
label="是否外协">
<template slot-scope="scope">{{ scope.row.是否外协 }}</template>
</el-table-column>
<el-table-column
label="是否带料">
<template slot-scope="scope">{{ scope.row.是否带料 }}</template>
</el-table-column>
<!--<el-table-column-->
<!--label="是否外协">-->
<!--<template slot-scope="scope">{{ scope.row.是否外协 }}</template>-->
<!--</el-table-column>-->
<!--<el-table-column-->
<!--label="是否带料">-->
<!--<template slot-scope="scope">{{ scope.row.是否带料 }}</template>-->
<!--</el-table-column>-->
<el-table-column
label="机加工开始时间">
<template slot-scope="scope">{{ scope.row.机加工开始时间 }}</template>
@@ -289,7 +283,7 @@
</div>
</el-dialog>
<el-dialog :title="title" :visible.sync="dialogFormVisible1" center width="24%">
<el-dialog :title="title" :visible.sync="dialogFormVisible1" center width="450px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="零件图号" prop="PDnumber">
<el-input v-model="form.PDnumber" size="small" readonly style="width:250px" />
@@ -415,7 +409,7 @@ export default {
toolNumValue: '',
toolNum: [], // 机床号
NumValue: '',
Num: [], // 机床后什么号
Num: [], // 分组
liushuihao: '',
gongyijihua: '',
radio: 0, // 第一组

127
src/views/ManufacturingCenter/PartAssignment/index.vue
View File

@@ -74,19 +74,19 @@
<el-tab-pane label="基本件">
<el-table :data="tableData1" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
<el-table-column align="center" width="50" type="selection"/>
<el-table-column label="物料名称" align="center">
<el-table-column label="零件名称" align="center">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="物料规格" align="center">
<el-table-column label="零件图号" align="center">
<template slot-scope="scope">
{{ scope.row.物料规格 }}
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="物料型号" align="center">
<el-table-column label="材料" align="center">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
{{ scope.row.材料 }}
</template>
</el-table-column>
<el-table-column label="零件数量" align="center">
@@ -186,8 +186,8 @@
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
<el-button type="success" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="purchaseRequisition()">车间请购</el-button>
<el-button type="primary" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="PurchasingDepartment()">采购部门采购</el-button>
<el-button type="warning" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="Production()">车间生产</el-button>
<el-button v-show="PartType!=='基本件'" type="primary" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="PurchasingDepartment()">采购部门采购</el-button>
<el-button v-show="PartType==='基本件'" type="warning" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="Production()">车间生产</el-button>
</el-card>
<el-card>
<el-row>
@@ -228,6 +228,60 @@
</el-table-column>
</el-table>
</el-card>
<el-card>
<el-table :data="tableData6" border size="mini" style="width: 100%" height="300px">
<el-table-column label="零件名称" align="center">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="材料" align="center">
<template slot-scope="scope">
{{ scope.row.材料 }}
</template>
</el-table-column>
<el-table-column label="零件数量" align="center">
<template slot-scope="scope">
{{ scope.row.零件数量 }}
</template>
</el-table-column>
<el-table-column label="零件类型" align="center">
<template slot-scope="scope">
{{ scope.row.零件类型 }}
</template>
</el-table-column>
<el-table-column label="物料计划到货时间" align="center">
<template slot-scope="scope">
{{ scope.row.物料计划到货时间 }}
</template>
</el-table-column>
<el-table-column label="项目名称" align="center">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床编号" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="250px" fixed="right">
<template slot-scope="scope">
<el-button type="danger" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)">移出</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
<el-card>
<el-table :data="tableData5" border size="mini" style="width: 100%" height="300px">
<el-table-column label="物料名称" align="center">
@@ -282,7 +336,6 @@
</el-table-column>
</el-table>
</el-card>
<el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="400px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="请购单编号" prop="请购单编号">
@@ -323,12 +376,11 @@
<el-button v-show="title==='编辑'" type="primary" @click="submitEdit('form')">确定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { initProject, searchmachine, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed, purchaseRequisition, purchaseRequisition1, MoveOut, MoveOut1, PurchasingDepartment, Production } from '@/api/ManufacturingCenter/PartAssignment'
import { initProject, searchmachine, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed, searchDetailed1, purchaseRequisition, purchaseRequisition1, MoveOut, MoveOut1, PurchasingDepartment, Production } from '@/api/ManufacturingCenter/PartAssignment'
import { mapGetters } from 'vuex'
export default {
inject: ['reload'],
@@ -352,6 +404,7 @@ export default {
tableData3: [],
tableData4: [],
tableData5: [],
tableData6: [],
loading: false,
title: '',
dialogFormVisible: false,
@@ -370,6 +423,7 @@ export default {
StandardPartsAndOutsourcing: [],
MaterialNum: [],
MaterialName: [],
PartToolNumber: [],
MaterialSpecification: [],
MaterialModel: [],
NumberOfParts: [],
@@ -582,24 +636,41 @@ export default {
searchDetailed(row) {
this.RequisitionList = row.请购单流水号
searchDetailed(row.请购单流水号).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].物料计划到货时间 !== '') {
response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
}
}
this.tableData5 = response.data
})
searchDetailed1(row.请购单流水号).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].物料计划到货时间 !== '') {
response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
}
}
this.tableData6 = response.data
})
},
handleSelectionChange(val) {
console.log(val)
if (this.PartType === '基本件') {
this.MaterialNum = []
this.BasicPartsNumber = []
this.MaterialName = []
this.MaterialSpecification = []
this.MaterialModel = []
this.PartToolNumber = []
this.Material = []
this.NumberOfParts = []
for (let i = 0; i < val.length; i++) {
this.MaterialNum[i] = val[i].物料流水号
this.BasicPartsNumber[i] = val[i].基本件流水号
this.MaterialName[i] = val[i].零件名称
this.PartToolNumber[i] = val[i].零件图号
this.Material[i] = val[i].材料
this.NumberOfParts[i] = val[i].零件数量
}
} else if (this.PartType === '外购件') {
this.MaterialNum = []
this.StandardPartsAndOutsourcing = []
this.MaterialName = []
this.MaterialSpecification = []
@@ -614,7 +685,12 @@ export default {
this.NumberOfParts[i] = val[i].零件数量
}
} else if (this.PartType === '标准件') {
this.MaterialNum = []
this.StandardPartsAndOutsourcing = []
this.MaterialName = []
this.MaterialSpecification = []
this.MaterialModel = []
this.NumberOfParts = []
for (let i = 0; i < val.length; i++) {
this.StandardPartsAndOutsourcing[i] = val[i].标准件和外购件流水号
this.MaterialNum[i] = val[i].物料流水号
@@ -631,7 +707,7 @@ export default {
this.result = 0
if (this.PartType === '基本件') {
for (let i = 0; i < this.BasicPartsNumber.length; i++) {
purchaseRequisition(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.BasicPartsNumber[i], this.MaterialName[i], this.NumberOfParts[i], 3, this.time, this.MaterialNum[i]).then(response => {
purchaseRequisition(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.BasicPartsNumber[i], this.MaterialName[i], this.PartToolNumber[i], this.Material[i], this.NumberOfParts[i], 3, this.time, this.MaterialNum[i]).then(response => {
this.result += parseInt(response.data[0].result)
console.log(this.result)
if (this.result === this.BasicPartsNumber.length) {
@@ -640,8 +716,13 @@ export default {
searchPart(this.groupFloatValue).then(response => {
this.tableData1 = response.data
})
searchDetailed(this.RequisitionList).then(response => {
this.tableData5 = response.data
searchDetailed1(this.RequisitionList).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].物料计划到货时间 !== '') {
response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
}
}
this.tableData6 = response.data
})
}
})
@@ -656,6 +737,11 @@ export default {
this.tableData2 = response.data
})
searchDetailed(this.RequisitionList).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].物料计划到货时间 !== '') {
response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
}
}
this.tableData5 = response.data
})
}
@@ -671,6 +757,11 @@ export default {
this.tableData3 = response.data
})
searchDetailed(this.RequisitionList).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].物料计划到货时间 !== '') {
response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
}
}
this.tableData5 = response.data
})
}
@@ -685,10 +776,12 @@ export default {
}
},
PurchasingDepartment() {
this.result = 0
if (this.time !== '') {
for (let i = 0; i < this.StandardPartsAndOutsourcing.length; i++) {
PurchasingDepartment(this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.time, this.MaterialNum[i], this.NumberOfParts[i], this.projectFloatValue, this.machineFloatValue).then(response => {
if (response.data[0].result === '1') {
this.result += parseInt(response.data[0].result)
if (this.result === this.StandardPartsAndOutsourcing.length) {
this.$message.success('请购成功')
if (this.PartType === '外购件') {
searchPart1(this.groupFloatValue, 2).then(response => {
@@ -699,7 +792,7 @@ export default {
this.tableData3 = response.data
})
}
} else { this.$message.error('请购失败') }
}
})
}
} else {

5
src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
View File

@@ -29,7 +29,7 @@
</el-table-column>
<el-table-column label="零件投产数量" align="center">
<template slot-scope="scope">
{{ scope.row.投产总数量 }}
{{ scope.row.批次数量 }}
</template>
</el-table-column>
</el-table>
@@ -588,7 +588,7 @@ export default {
total: 0,
tableData: [],
loading: false,
PrNum: '027W191482-0001',
PrNum: '',
tableData2: [],
tableData3: [],
机床号: '',
@@ -617,6 +617,7 @@ export default {
searchData() {
this.loading = true
search(this.pageCurrent, this.pageSize, this.PrNum).then(response => {
console.log(response.data)
this.tableData = response.data.rows
this.total = response.data.total
this.loading = false

280
src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue Normal file
View File

@@ -0,0 +1,280 @@
<template>
<div class="app-container">
<el-card>
<span>工艺员:</span>
<el-select v-model="craftmenValue" placeholder="工艺员" size="small" style="width:100px" @change="searchParts()">
<el-option
v-for="item in craftmen"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>零件图号:</span>
<el-select v-model="partNumValue" filterable placeholder="零件图号" style="margin-right: 10px" size="small" clearable @clear="returnDate = ''">
<el-option
v-for="item in partNum"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchData()">查询</el-button>
<span>打回时间:</span>
<el-date-picker v-model="returnDate" :clearable="false" type="datetime" placeholder="打回时间" size="small" readonly/>
</el-card>
<el-row>
<el-col :span="12">
<el-card>
<div style="display: inline-block;margin-bottom: 20px">改前零件工艺</div>
<el-table id="div1" ref="div1" :data="tableData1" :row-class-name="tableRowClassName1" size="mini" border style="height:350px;overflow-y: auto;" @mouseenter.native="changeScrollBefore">
<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="120px">
<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 header-align="center" label="工艺要求">
<template slot-scope="scope">
{{ scope.row.工艺要求 }}
</template>
</el-table-column>
</el-table>
</el-card>
</el-col>
<el-col :span="12">
<el-card style="margin-left:15px">
<div style="display: inline-block;margin-bottom: 20px">改后零件工艺</div>
<el-table id="div2" ref="div2" :data="tableData2" :row-class-name="tableRowClassName2" size="mini" border style="height:350px;overflow-y: scroll;" @mouseenter.native="changeScrollAfter">
<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="120px">
<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 header-align="center" label="工艺要求">
<template slot-scope="scope">
{{ scope.row.工艺要求 }}
</template>
</el-table-column>
</el-table>
</el-card>
</el-col>
</el-row>
<el-card>
<div id="myChart" :style="{width: '100%', height: '400px', margin: 'auto'}"/>
</el-card>
</div>
</template>
<script>
import echarts from 'echarts'
import { initCraftmen, searchPart, searchProcessOld, searchProcessNew, searchChart } from '@/api/ManufacturingCenter/ProcessAdjustQuery'
export default {
data() {
return {
returnDate: '',
craftmenValue: '',
craftmen: [],
partNumValue: '', // 工艺计划流水号
partNum: [],
partStatus: '',
tableData1: [],
tableData2: [],
dataX: [],
partsNum: []
}
},
created() {
this.fetchData()
this.searchChart()
},
methods: {
changeScrollBefore() {
const div1 = document.getElementById('div1')
const div2 = document.getElementById('div2')
div2.removeAttribute('onscroll')
div1.setAttribute('onscroll', 'document.getElementById(\'div2\').scrollTop = scrollTop')
},
changeScrollAfter() {
const div1 = document.getElementById('div1')
const div2 = document.getElementById('div2')
div1.removeAttribute('onscroll')
div2.setAttribute('onscroll', 'document.getElementById(\'div1\').scrollTop = scrollTop')
},
searchChart() {
searchChart().then(response => {
console.log(response, 11)
for (let i = 0; i < response.data.length; i++) {
this.dataX.push(response.data[i].姓名)
this.partsNum.push(response.data[i].零件数量)
}
this.drawLine()
})
},
drawLine() {
const myChart = echarts.init(document.getElementById('myChart'))
myChart.clear()
myChart.setOption({
title: {
text: '在制零件工艺调整统计',
left: 'center'
},
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'shadow'
}
},
xAxis: {
type: 'category',
name: '工艺员',
data: this.dataX,
axisLabel: {
interval: 0,
rotate: 0,
margin: 10
}
},
yAxis: {
type: 'value',
name: '工艺被调整零件数',
min: 0,
minInterval: 1
},
series: [
{
name: '工艺调整零件数',
type: 'bar',
data: this.partsNum,
markLine: {
data: [
{ type: 'average', name: '平均值' }
]
}
}
]
})
},
fetchData() {
this.craftmen = []
initCraftmen().then(response => { // 初始化工艺员
for (let i = 0; i < response.data.length; i++) {
this.craftmen.push({
label: response.data[i].姓名,
value: response.data[i].人员编号
})
}
})
},
searchParts() {
this.tableData1 = []
this.tableData2 = []
this.partNum = []
this.partNumValue = ''
this.returnDate = ''
searchPart(this.craftmenValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.partNum.push({
label: response.data[i].零件图号_零件工艺计划,
value: response.data[i].工艺计划流水号
})
}
})
},
searchData() {
this.tableData1 = []
this.tableData2 = []
if (this.partNumValue !== '' && this.partNumValue !== null) {
searchProcessOld(this.partNumValue).then(response => {
this.tableData1 = response.data
this.returnDate = response.data[0].操作时间
})
searchProcessNew(this.partNumValue).then(response => {
this.tableData2 = response.data
})
} else {
this.$message.error('请先选择零件')
}
},
tableRowClassName2({ row }) {
for (let i = 0; i < this.tableData1.length; i++) {
row.工艺编号 === null ? row.工艺编号 = 0 : row.工艺编号
if (this.tableData1[i].工序流水号 === row.工序流水号 && this.tableData1[i].工艺编号 !== null) {
if (this.tableData1[i].工艺编号 !== row.工艺编号 || this.tableData1[i].工艺要求 !== row.工艺要求 || this.tableData1[i].工艺难度等级 !== row.工艺难度等级) {
return 'change'
} else {
if (this.tableData1[i].工序顺序 !== row.工序顺序 && (row.工艺要求 || row.工艺难度等级)) {
return 'change'
} else {
return ''
}
}
}
}
},
tableRowClassName1({ row }) {
for (let i = 0; i < this.tableData2.length; i++) {
row.工艺编号 === null ? row.工艺编号 = 0 : row.工艺编号
if (this.tableData2[i].工序流水号 === row.工序流水号 && this.tableData2[i].工艺编号 !== null) {
if (this.tableData2[i].工艺编号 !== row.工艺编号 || this.tableData2[i].工艺要求 !== row.工艺要求 || this.tableData2[i].工艺难度等级 !== row.工艺难度等级) {
return 'change'
} else {
if (this.tableData1[i].工序顺序 !== row.工序顺序 && (row.工艺要求 || row.工艺难度等级)) {
return 'change'
} else {
return ''
}
}
}
}
}
}
}
</script>
<style>
.el-table .change {
background: oldlace;
}
</style>
<style scoped>
.el-card{
margin-bottom: 15px;
}
.el-date-editor{
width:200px
}
.el-select{
width:200px
}
.el-input{
width:200px
}
span{
margin: 10px 0 10px 10px;
}
.searchForm .el-form-item{
margin-bottom: 5px;
}
</style>

45
src/views/ManufacturingCenter/ProcessPlanning/index.vue
View File

@@ -10,8 +10,8 @@
partNumValue = '';typeValue = '';partName = '';
material = '';materialName = '';spec = '';batchNum = '';
searchParts()">
<el-radio :label="1">未编制</el-radio>
<el-radio :label="2">已编制</el-radio>
<el-radio v-model="radio" :label="1">未编制</el-radio>
<el-radio v-model="radio" :label="2">已编制</el-radio>
</el-radio-group>
<span>工艺员:</span>
<el-select
@@ -205,7 +205,7 @@
@current-change="handleCurrentChange"/>
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogMaterial=false">提交</el-button>
<el-button type="primary" size="small" @click="selectMaterial2()">提交</el-button>
</div>
</el-dialog>
@@ -616,7 +616,9 @@ export default {
result: 0,
oldNum: '',
newNum: '',
tableRecord: []
tableRecord: [],
materialName2: '',
material2: ''
}
},
created() {
@@ -635,15 +637,6 @@ export default {
this.spec = ''
this.batchNum = ''
},
// tableRowClassName({ row }) {
// for (let i = 0; i < this.tableRecord.length; i++) {
// if (this.tableRecord[i].工序流水号 === row.工序流水号 && this.radio === 2 && this.tableRecord[i].工艺编号 !== null) { // && this.tableRecord[i].工艺难度等级 !== null && this.tableRecord[i].工艺要求 !== null
// if (this.tableRecord[i].工艺编号 !== row.工艺编号 || this.tableRecord[i].工艺要求 !== row.工艺要求 || this.tableRecord[i].工艺难度等级 !== row.工艺难度等级 || this.tableRecord[i].工序顺序 !== row.工序顺序) {
// return 'change'
// }
// }
// }
// },
returnEdit() { // 在制零件工艺修改
if (this.partNumValue === '' || this.partNumValue === null) {
this.$message.error('请选择零件')
@@ -688,10 +681,17 @@ export default {
}
},
selectMaterial(row) { // 选择材质
this.materialName2 = ''
this.material2 = ''
this.materialName2 = row.材料
this.material2 = row.材料流水号
},
selectMaterial2() {
this.materialName = ''
this.material = ''
this.materialName = row.材料
this.material = row.材料流水号
this.materialName = this.materialName2
this.material = this.material2
this.dialogMaterial = false
},
fetchData() {
this.materialClass = []
@@ -923,10 +923,8 @@ export default {
this.tableData[i].工艺难度等级 = this.tableData2[i].工艺难度等级
this.tableData[i].工艺要求 = this.tableData2[i].工艺要求
selectRequest(this.tableData[i].工序流水号, this.tableData[i].工艺计划流水号, this.tableData2[i].工艺编号, this.tableData2[i].工艺序号, this.tableData2[i].工艺要求).then(response => {
console.log('该工艺保存成功', 501)
})
hardEdit(this.tableData[i].工序流水号, this.tableData2[i].工艺难度等级).then(response => {
console.log(response.data, '难度等级修改成功', 502)
})
this.dialogFormVisible = false
}
@@ -970,7 +968,6 @@ export default {
this.$message.error('请在主界面选择一个零件作为被拷贝对象')
} else {
gongyiCopy(this.num, this.partNumValue).then(() => { // 工艺计划流水号_完成工艺, 工艺计划流水号_被拷工艺
console.log('已拷贝到主表', 503)
this.searchDetail()
})
}
@@ -985,18 +982,15 @@ export default {
}
}
gongyiYQ(this.num).then(response => {
console.log(response.data, 119)
this.tableData4 = response.data
})
},
hardEdit(row) { // 修改难度等级
hardEdit(row.工序流水号, row.工艺难度等级).then(response => {
console.log(response.data, '难度等级修改成功', 504)
})
},
requestEdit(row) { // 修改工艺要求
requestEdit(row.工序流水号, row.工艺要求).then(response => {
console.log(response.data, '工艺要求修改成功', 505)
})
},
tableSearch(index) { // 主界面工艺名称分类、工艺名称及工艺要求后续查询
@@ -1027,7 +1021,10 @@ export default {
}
},
cChange() { // 工艺名称分类改变
this.processNameValue = ''
this.processName = []
this.processRequestValue = ''
this.processRequest = []
for (let i = 0; i < this.processNameClass.length; i++) {
if (this.processNameClassValue === this.processNameClass[i].value) {
processNameSelect(this.processSelect[i].value).then(response => { // 查询工艺名称
@@ -1042,6 +1039,7 @@ export default {
}
},
nChange() { // 工艺名称改变
this.processRequestValue = ''
this.processRequest = []
for (let i = 0; i < this.processName.length; i++) {
if (this.processNameValue === this.processName[i].value) {
@@ -1063,7 +1061,6 @@ export default {
this.tableData[this.index].工艺要求 = this.str
this.dialogFormVisible2 = false
selectRequest(this.tableData[this.index].工序流水号, this.tableData[this.index].工艺计划流水号, this.tableData[this.index].工艺编号, this.tableData[this.index].工序顺序, this.tableData[this.index].工艺要求).then(response => {
console.log('该工艺保存成功', 506)
})
},
calTol() { // 计算公差
@@ -1114,7 +1111,6 @@ export default {
this.$message.error('请先选择一个零件')
} else {
insertOne(this.partNumValue, row.工序流水号).then(response => {
console.log(response.data, '插入成功', 507)
this.searchDetail()
})
}
@@ -1145,7 +1141,6 @@ export default {
this.$message.error('请先选择一个零件')
} else {
upOne(this.partNumValue, row.工序流水号).then(response => {
console.log(response.data, '上移成功', 508)
this.searchDetail()
})
}
@@ -1155,7 +1150,6 @@ export default {
this.$message.error('请先选择一个零件')
} else {
downOne(this.partNumValue, row.工序流水号).then(response => {
console.log(response.data, '下移成功', 509)
this.searchDetail()
})
}
@@ -1198,7 +1192,6 @@ export default {
}).then(() => {
for (let i = 0; i < 30; i++) {
hardEdit(this.tableData[i].工序流水号, '').then(response => {
console.log(response.data, '清空难度等级', 510)
})
}
deleteTable(this.newNum).then(response => {

3
src/views/ManufacturingCenter/ProcessingStatus/index.vue
View File

@@ -40,11 +40,11 @@
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 200px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=10;total = 0">查询</el-button>
<span>进度颜色：</span>
<!--<span style="background-color: white">全部</span>-->
<span style="background-color: red">拖期</span>
<span style="background-color: yellow">即将拖期</span>
<span style="background-color: lawngreen">如期</span>
<span style="background-color: deepskyblue">工序外协</span>
<span style="background-color: grey">报废</span>
</el-row>
</el-card>
@@ -396,7 +396,6 @@ export default {
this.Groups = []
if (this.project !== '') {
getMachines(this.project).then(response => {
console.log(response.data)
for (let i = 0; i < response.data.length; i++) {
this.Machines.push({
label: response.data[i].机床图号,

733
src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue Normal file
View File

@@ -0,0 +1,733 @@
<template>
<div class="app-container">
<el-card>
<el-row>
<span>项目名称:</span>
<el-select v-model="project" size="small" filterable clearable placeholder="项目名称" @change="getMachine">
<el-option
v-for="item in projects"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床号:</span>
<el-select v-model="Machine" size="small" clearable placeholder="机床号" @change="getGroup">
<el-option
v-for="item in Machines"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>组号:</span>
<el-select v-model="Group" size="small" clearable placeholder="组号">
<el-option
v-for="item in Groups"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>零件号:</span>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 200px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;pageSize=10;total = 0;getTableData();">查询</el-button>
</el-row>
</el-card>
<el-card>
<el-table
v-loading="listLoading1"
:data="tableData1"
class="table"
border
height="650">
<el-table-column
label="序号"
align="center"
width="50"
type="index"/>
<el-table-column
align="center"
label="零件图号"
width="200px">
<template slot-scope="scope">{{ 零件图号[scope.$index] }}</template>
</el-table-column>
<el-table-column
align="center"
label="零件名称"
width="120px">
<template slot-scope="scope"> {{ 零件名称[scope.$index] }}</template>
</el-table-column>
<el-table-column
align="center"
prop="address"
label="数量">
<template slot-scope="scope">{{ 投产数量[scope.$index] }}</template>
</el-table-column>
<el-table-column label="零件加工计划进度(工艺名称,计划完成时间,实际完成时间,员工名称)" >
<el-table-column label="[1]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][0]" @click="handleChange1(scope.$index, scope.row, 'form', 0)">
<h4>{{ process[scope.$index][0] }}</h4><h4>{{ planDate[scope.$index][0] }} </h4><h4> {{ realDate[scope.$index][0] }}</h4><h4> {{ worker[scope.$index][0] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[2]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][1]" @click="handleChange1(scope.$index, scope.row, 'form', 1)">
<h4>{{ process[scope.$index][1] }}</h4><h4>{{ planDate[scope.$index][1] }} </h4><h4> {{ realDate[scope.$index][1] }}</h4><h4> {{ worker[scope.$index][1] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[3]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][2]" @click="handleChange1(scope.$index, scope.row, 'form', 2)">
<h4>{{ process[scope.$index][2] }}</h4><h4>{{ planDate[scope.$index][2] }} </h4><h4> {{ realDate[scope.$index][2] }}</h4><h4> {{ worker[scope.$index][2] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[4]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][3]" @click="handleChange1(scope.$index, scope.row, 'form', 3)">
<h4>{{ process[scope.$index][3] }}</h4><h4>{{ planDate[scope.$index][3] }} </h4><h4> {{ realDate[scope.$index][3] }}</h4><h4> {{ worker[scope.$index][3] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[5]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][4]" @click="handleChange1(scope.$index, scope.row, 'form', 4)">
<h4>{{ process[scope.$index][4] }}</h4><h4>{{ planDate[scope.$index][4] }} </h4><h4> {{ realDate[scope.$index][4] }}</h4><h4> {{ worker[scope.$index][4] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[6]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][5]" @click="handleChange1(scope.$index, scope.row, 'form', 5)">
<h4>{{ process[scope.$index][5] }}</h4><h4>{{ planDate[scope.$index][5] }} </h4><h4> {{ realDate[scope.$index][5] }}</h4><h4> {{ worker[scope.$index][5] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[7]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][6]" @click="handleChange1(scope.$index, scope.row, 'form', 6)">
<h4>{{ process[scope.$index][6] }}</h4><h4>{{ planDate[scope.$index][6] }} </h4><h4> {{ realDate[scope.$index][6] }}</h4><h4> {{ worker[scope.$index][6] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[8]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][7]" @click="handleChange1(scope.$index, scope.row, 'form', 7)">
<h4>{{ process[scope.$index][7] }}</h4><h4>{{ planDate[scope.$index][7] }} </h4><h4> {{ realDate[scope.$index][7] }}</h4><h4> {{ worker[scope.$index][7] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[9]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][8]" @click="handleChange1(scope.$index, scope.row, 'form', 8)">
<h4>{{ process[scope.$index][8] }}</h4><h4>{{ planDate[scope.$index][8] }} </h4><h4> {{ realDate[scope.$index][8] }}</h4><h4> {{ worker[scope.$index][8] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[10]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][9]" @click="handleChange1(scope.$index, scope.row, 'form', 9)">
<h4>{{ process[scope.$index][9] }}</h4><h4>{{ planDate[scope.$index][9] }} </h4><h4> {{ realDate[scope.$index][9] }}</h4><h4> {{ worker[scope.$index][9] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[11]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][10]" @click="handleChange1(scope.$index, scope.row, 'form', 10)">
<h4>{{ process[scope.$index][10] }}</h4><h4>{{ planDate[scope.$index][10] }} </h4><h4> {{ realDate[scope.$index][10] }}</h4><h4> {{ worker[scope.$index][10] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[12]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][11]" @click="handleChange1(scope.$index, scope.row, 'form', 11)">
<h4>{{ process[scope.$index][11] }}</h4><h4>{{ planDate[scope.$index][11] }} </h4><h4> {{ realDate[scope.$index][11] }}</h4><h4> {{ worker[scope.$index][11] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[13]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][12]" @click="handleChange1(scope.$index, scope.row, 'form', 12)">
<h4>{{ process[scope.$index][12] }}</h4><h4>{{ planDate[scope.$index][12] }} </h4><h4> {{ realDate[scope.$index][12] }}</h4><h4> {{ worker[scope.$index][12] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[14]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][13]" @click="handleChange1(scope.$index, scope.row, 'form', 13)">
<h4>{{ process[scope.$index][13] }}</h4><h4>{{ planDate[scope.$index][13] }} </h4><h4> {{ realDate[scope.$index][13] }}</h4><h4> {{ worker[scope.$index][13] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[15]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][14]" @click="handleChange1(scope.$index, scope.row, 'form', 14)">
<h4>{{ process[scope.$index][14] }}</h4><h4>{{ planDate[scope.$index][14] }} </h4><h4> {{ realDate[scope.$index][14] }}</h4><h4> {{ worker[scope.$index][14] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[16]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][15]" @click="handleChange1(scope.$index, scope.row, 'form', 15)">
<h4>{{ process[scope.$index][15] }}</h4><h4>{{ planDate[scope.$index][15] }} </h4><h4> {{ realDate[scope.$index][15] }}</h4><h4> {{ worker[scope.$index][15] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[17]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][16]" @click="handleChange1(scope.$index, scope.row, 'form', 16)">
<h4>{{ process[scope.$index][16] }}</h4><h4>{{ planDate[scope.$index][16] }} </h4><h4> {{ realDate[scope.$index][16] }}</h4><h4> {{ worker[scope.$index][16] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[18]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][17]" @click="handleChange1(scope.$index, scope.row, 'form', 17)">
<h4>{{ process[scope.$index][17] }}</h4><h4>{{ planDate[scope.$index][17] }} </h4><h4> {{ realDate[scope.$index][17] }}</h4><h4> {{ worker[scope.$index][17] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[19]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][18]" @click="handleChange1(scope.$index, scope.row, 'form', 18)">
<h4>{{ process[scope.$index][18] }}</h4><h4>{{ planDate[scope.$index][18] }} </h4><h4> {{ realDate[scope.$index][18] }}</h4><h4> {{ worker[scope.$index][18] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[20]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][19]" @click="handleChange1(scope.$index, scope.row, 'form', 19)">
<h4>{{ process[scope.$index][19] }}</h4><h4>{{ planDate[scope.$index][19] }} </h4><h4> {{ realDate[scope.$index][19] }}</h4><h4> {{ worker[scope.$index][19] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[21]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][20]" @click="handleChange1(scope.$index, scope.row, 'form', 20)">
<h4>{{ process[scope.$index][20] }}</h4><h4>{{ planDate[scope.$index][20] }} </h4><h4> {{ realDate[scope.$index][20] }}</h4><h4> {{ worker[scope.$index][20] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[22]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][21]" @click="handleChange1(scope.$index, scope.row, 'form', 21)">
<h4>{{ process[scope.$index][21] }}</h4><h4>{{ planDate[scope.$index][21] }} </h4><h4> {{ realDate[scope.$index][21] }}</h4><h4> {{ worker[scope.$index][21] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[23]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][22]" @click="handleChange1(scope.$index, scope.row, 'form', 22)">
<h4>{{ process[scope.$index][22] }}</h4><h4>{{ planDate[scope.$index][22] }} </h4><h4> {{ realDate[scope.$index][22] }}</h4><h4> {{ worker[scope.$index][22] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[24]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][23]" @click="handleChange1(scope.$index, scope.row, 'form', 23)">
<h4>{{ process[scope.$index][23] }}</h4><h4>{{ planDate[scope.$index][23] }} </h4><h4> {{ realDate[scope.$index][23] }}</h4><h4> {{ worker[scope.$index][23] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[25]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][24]" @click="handleChange1(scope.$index, scope.row, 'form', 24)">
<h4>{{ process[scope.$index][24] }}</h4><h4>{{ planDate[scope.$index][24] }} </h4><h4> {{ realDate[scope.$index][24] }}</h4><h4> {{ worker[scope.$index][24] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[26]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][25]" @click="handleChange1(scope.$index, scope.row, 'form', 25)">
<h4>{{ process[scope.$index][25] }}</h4><h4>{{ planDate[scope.$index][25] }} </h4><h4> {{ realDate[scope.$index][25] }}</h4><h4> {{ worker[scope.$index][25] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[27]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][26]" @click="handleChange1(scope.$index, scope.row, 'form', 26)">
<h4>{{ process[scope.$index][26] }}</h4><h4>{{ planDate[scope.$index][26] }} </h4><h4> {{ realDate[scope.$index][26] }}</h4><h4> {{ worker[scope.$index][26] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[28]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][27]" @click="handleChange1(scope.$index, scope.row, 'form', 27)">
<h4>{{ process[scope.$index][27] }}</h4><h4>{{ planDate[scope.$index][27] }} </h4><h4> {{ realDate[scope.$index][27] }}</h4><h4> {{ worker[scope.$index][27] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[29]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][28]" @click="handleChange1(scope.$index, scope.row, 'form', 28)">
<h4>{{ process[scope.$index][28] }}</h4><h4>{{ planDate[scope.$index][28] }} </h4><h4> {{ realDate[scope.$index][28] }}</h4><h4> {{ worker[scope.$index][28] }}</h4>
</div>
</template>
</el-table-column>
<el-table-column label="[30]" align="center" width="120px">
<template slot-scope="scope">
<div :class="colorCode[scope.$index][29]" @click="handleChange1(scope.$index, scope.row, 'form', 29)">
<h4>{{ process[scope.$index][29] }}</h4><h4>{{ planDate[scope.$index][29] }} </h4><h4> {{ realDate[scope.$index][29] }}</h4><h4> {{ worker[scope.$index][29] }}</h4>
</div>
</template>
</el-table-column>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="400px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px" class="demo-ruleForm">
<el-row width="200px">
<el-form-item label="操作员" prop="人员" >
<el-input v-model="form.人员" placeholder="操作员" readonly size="small" style="width: 80%" @focus="dialogTableVisible" />
</el-form-item>
<el-form-item label="考勤编号" prop="考勤编号" >
<el-input v-model="form.考勤编号" placeholder="考勤编号" disabled size="small" style="width: 80%" />
</el-form-item>
<el-form-item label="完成日期" prop="完成时间">
<el-date-picker
v-model="form.完成时间"
style="width: 80%"
size="small"
type="date"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期"/>
</el-form-item>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="submit('form')" >确定</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible1" title="人员信息" center width="750px">
<div style="height: 500px">
<div style="float: left;margin-top: 10px;margin-left: 20px;overflow-y: scroll;height: 400px">
<el-tree
:data="data2"
node-key="id"
style="width: 150px;float: left"
height="400"
accordion
@node-click="handleNodeClick"
/>
</div>
<el-table :data="List1" highlight-current-row height="400" style="width: 400px;float: left;margin-left: 30px" @row-click="handleCurrentChange2">
<el-table-column label="考勤编号" align="center" >
<template slot-scope="scope">
{{ scope.row.考勤编号 }}
</template>
</el-table-column>
<el-table-column label="姓名" align="center" >
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="性别" align="center">
<template slot-scope="scope">
{{ scope.row.性别 }}
</template>
</el-table-column>
<el-table-column label="工作岗位" align="center">
<template slot-scope="scope">
{{ scope.row.岗位名称 }}
</template>
</el-table-column>
</el-table>
</div>
<el-button style="margin-left: 260px" @click="dialogFormVisible1 = false">取消</el-button>
<el-button type="primary" style="margin-top: 20px" @click="getName">确认</el-button>
</el-dialog>
</div>
</template>
<script>
import { handlechange3, getTable8, getTree, fn, dialogtablevisible, getNames, getMachines, getGroups, getTable, getTable2, handlechange, handlechange2 } from '@/api/ManufacturingCenter/ProcessingStatusEdit'
export default {
data() {
return {
midd: 0,
ssks: '',
cjscgy: '',
List1: [],
data2: [],
dialogFormVisible1: false,
Name: '',
person: '',
title: '',
Num: '',
form: {
人员: '',
考勤编号: '',
完成时间: ''
},
rules: {
人员: [{ required: true, message: '请选择操作员', trigger: 'change' }],
考勤编号: [{ required: true, message: '考勤编号', trigger: 'change' }],
完成时间: [{ required: true, message: '请选择实际完成时间', trigger: 'change' }]
},
Number1: '',
dialogFormVisible: false,
count1: 0,
liushuihao: '',
radioList: '0',
length: 0,
listLoading1: false,
tableData1: [],
project: '',
projects: [],
Machine: '',
Machines: [],
Group: '',
Groups: [],
Speed: '',
Speeds: [{
value: 5,
label: '全部'
}, {
value: 1,
label: '拖期'
}, {
value: 2,
label: '即将拖期'
}, {
value: 3,
label: '如期'
}, {
value: 4,
label: '工序外协'
}],
number: '',
checkbox_project: false,
checkbox_Machine: false,
checkbox_Group: false,
checkbox_number: false,
零件图号: [],
零件名称: [],
投产数量: [],
result: [],
kaoqinbianhao: [[]],
gongxuliushuihao: [[]],
process: [[]],
planDate: [[]],
worker: [[]],
colorCode: [[]],
realDate: [[]],
total: 0, // 总条数
pageSize: 10,
pageCurrent: 1
}
},
created() {
this.fetchData()
this.fetchData3()
},
methods: {
handleCurrentChange2(row) { // 获取当前行人员信息
this.ssks = row.节点名称
this.Number1 = row.考勤编号
this.Name = row.姓名
},
getName() { // 提交人员
this.dialogFormVisible1 = false
this.form.人员 = this.Name
this.form.考勤编号 = this.Number1
},
handleNodeClick(data) { // 树节点点击
this.ssks = data.label
getTable8(data.id).then(response => {
this.List1 = response.data
})
},
fetchData3() {
getTree().then(response => { // 获取人员信息树
const data = response.data
this.data2 = fn(data, 0)
})
},
dialogTableVisible() {
this.dialogFormVisible1 = true
dialogtablevisible()
},
// 查询供应商名称
fetchData() {
this.projects = []
getNames().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.projects.push({
label: response.data[i].项目名称,
value: response.data[i].项目流水号
})
}
})
},
getMachine() {
this.Machine = ''
this.Machines = []
this.Group = ''
this.Groups = []
if (this.project !== '') {
getMachines(this.project).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machines.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号
})
}
})
}
},
getGroup() {
this.Group = ''
this.Groups = []
getGroups(this.Machine).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Groups.push({
label: response.data[i].组号,
value: response.data[i].组件流水号
})
}
})
},
// 按条件查询
// CASE WHEN datediff(day , 计划日期 , 完成日期) <= 2 THEN 'lightgreen'
// WHEN datediff(day , 计划日期 , 完成日期) > 2 THEN 'red'
// WHEN datediff(day , 计划日期 , isnull(完成日期 , getdate())) > 1 THEN 'yellow' END
getTableData() {
this.listLoading1 = true
if (this.project === '') {
this.checkbox_project = false
} else {
this.checkbox_project = true
}
if (this.Machine === '') {
this.checkbox_Machine = false
} else {
this.checkbox_Machine = true
}
if (this.Group === '') {
this.checkbox_Group = false
} else {
this.checkbox_Group = true
}
if (this.number === '') {
this.checkbox_number = false
} else {
this.checkbox_number = true
}
this.tableData1 = []
this.零件图号 = []
this.零件名称 = []
this.投产数量 = []
this.result = []
this.kaoqinbianhao = [[]]
this.gongxuliushuihao = [[]]
this.process = [[]]
this.planDate = [[]]
this.worker = [[]]
this.colorCode = [[]]
this.realDate = [[]]
this.length = 0
getTable(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.pageCurrent, this.pageSize).then(response => {
if (response.data.rows.length === 0) {
this.listLoading1 = false
} else {
this.length = parseInt(response.data.total)
for (let i = 0; i < response.data.rows.length; i++) { // 声明二维数组
this.零件图号.push(response.data.rows[i].零件图号)
this.零件名称.push(response.data.rows[i].零件名称)
this.投产数量.push(response.data.rows[i].投产数量)
this.kaoqinbianhao[i] = []
this.gongxuliushuihao[i] = []
this.process[i] = []
this.planDate[i] = []
this.worker[i] = []
this.colorCode[i] = []
this.realDate[i] = []
this.result.push(response.data.rows[i])
}
if (this.零件图号.length !== 0) {
for (let i = 0; i < this.零件图号.length; i++) {
getTable2(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.零件图号[i]).then(response => {
this.liushuihao = response.data[0].工艺计划流水号
for (let k = 0; k < response.data.length; k++) {
if (response.data[k].工艺计划流水号 === this.liushuihao) {
this.kaoqinbianhao[i][k] = response.data[k].工作者考勤编号
this.gongxuliushuihao[i][k] = response.data[k].工序流水号
this.process[i][k] = response.data[k].工艺名称简称
this.planDate[i][k] = response.data[k].计划日期_短
this.worker[i][k] = response.data[k].员工姓名
this.realDate[i][k] = response.data[k].完成日期_短
if (response.data[k].工序状态 === 5) { // 灰色:停产，不允许修改，重新投产
this.colorCode[i][k] = 'grey'
} else {
this.colorCode[i][k] = response.data[k].进度颜色
}
if (response.data[k].工序间是否外协 === 2) {
this.colorCode[i][k] = 'lightblue'
}
}
}
}).then(() => {
this.tableData1.push(this.result[i])
this.listLoading1 = false
this.total = this.length
})
}
} else {
this.tableData1 = []
this.listLoading1 = false
this.total = 0
}
}
})
},
// 编辑打开
handleChange1(index, row, formName, a) {
if (this.process[index][a] !== '' && this.process[index][a] !== null && this.process[index][a] !== undefined && this.colorCode[index][a] !== 'grey') {
this.count1 = this.count1 + 1
if (this.count1 !== 1) {
this.$refs[formName].resetFields()
}
this.midd = 0
this.form.完成时间 = ''
this.form.人员 = ''
this.form.考勤编号 = ''
if (this.worker[index][a] !== '请选择') {
this.midd = 1
this.form.人员 = this.worker[index][a]
}
if (this.kaoqinbianhao[index][a] !== 0) {
this.form.考勤编号 = this.kaoqinbianhao[index][a]
}
this.title = this.process[index][a]
this.Num = this.gongxuliushuihao[index][a]
this.dialogFormVisible = true
}
},
// 编辑确定
handleChange() {
if (this.midd === 0) {
handlechange2(this.Num, this.form.考勤编号).then(response => {
if (response.data[0].result === '1') {
handlechange(this.Num, this.form.完成时间).then(response => {
if (response.data[0].result === '1') {
this.$message.success('信息编辑成功')
} else {
this.$message.error('信息编辑失败')
}
})
} else {
this.$message.error('信息编辑失败')
}
})
this.getTableData()
} else {
handlechange3(this.Num, this.form.考勤编号).then(response => {
if (response.data[0].result === '1') {
handlechange(this.Num, this.form.完成时间).then(response => {
if (response.data[0].result === '1') {
this.$message.success('信息编辑成功')
this.getTableData()
} else {
this.$message.error('信息编辑失败')
}
})
} else {
this.$message.error('信息编辑失败')
}
})
}
this.dialogFormVisible = false
},
// 提交添加或者修改
submit(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.handleChange()
} else {
return false
}
})
},
// 重置表单
callOff(formName) {
this.dialogFormVisible = false
this.$refs[formName].resetFields()
},
handleSizeChange(val) {
this.pageSize = val
this.getTableData()
},
handleCurrentChange(val) {
this.pageCurrent = val
this.getTableData()
}
}
}
</script>
<style>
.white{
background-color: ghostwhite;
border: 1px solid #1f2d3d;
}
.grey{
background-color: grey;
border: 1px solid #1f2d3d;
}
.red{
background-color: orangered;
border: 1px solid #1f2d3d;
}
.lightblue{
background-color: deepskyblue;
border: 1px solid #1f2d3d;
}
.yellow{
background-color: yellow;
border: 1px solid #1f2d3d;
}
.blank{
background-color: transparent;
border: 0px solid white;
}
.lightgreen{
background-color: lightgreen;
border: 1px solid #1f2d3d;
}
</style>
<style scoped>
.el-form-item{
margin-bottom: 22px;
}
.el-card{
margin-bottom: 15px;
}
span{
margin: 10px 0 10px 10px;
}
.table h4{
border: 1px solid transparent;
margin: 0;
font-weight: normal;
width: 100px;
height: 24px;
}
</style>

80
src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
View File

@@ -73,12 +73,12 @@
type="selection"
align="center"
width="35"/>
<el-table-column label="零件图号" align="center" width="200">
<el-table-column label="零件图号" align="center" width="300">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" width="130">
<el-table-column label="零件名称" align="center" width="200">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -103,42 +103,42 @@
{{ scope.row.工序数量 }}
</template>
</el-table-column>
<el-table-column label="是否超负荷" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.是否超负荷 }}
</template>
</el-table-column>
<el-table-column label="外协" width="100" align="center">
<template slot-scope="scope">
<el-checkbox v-model="scope.row.是否预计外协" @change="table1Out(scope.row)">外协</el-checkbox>
</template>
</el-table-column>
<el-table-column label="加工件合格" align="center" width="230">
<template slot-scope="scope">
<el-date-picker
v-model="tableData[scope.$index].加工件合格时间"
size="mini"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择加工件合格时间"
@change="timeChange(scope.row)"/>
</template>
</el-table-column>
<el-table-column label="板焊结束" width="150" align="center">
<template slot-scope="scope">
{{ scope.row.板焊 }}
</template>
</el-table-column>
<el-table-column label="操作" width="200px" align="center" fixed="right">
<template slot-scope="scope" align="center">
<el-button
size="mini"
type="primary"
class="el-icon-edit"
@click="PlateWelding(scope.$index, scope.row, 'form1')">板焊</el-button>
<!--<el-button size="mini" type="primary" @click="inBatches">分批</el-button>-->
</template>
</el-table-column>
<!--<el-table-column label="是否超负荷" align="center" width="100">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.是否超负荷 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="外协" width="100" align="center">-->
<!--<template slot-scope="scope">-->
<!--<el-checkbox v-model="scope.row.是否预计外协" @change="table1Out(scope.row)">外协</el-checkbox>-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="加工件合格" align="center" width="230">-->
<!--<template slot-scope="scope">-->
<!--<el-date-picker-->
<!--v-model="tableData[scope.$index].加工件合格时间"-->
<!--size="mini"-->
<!--type="date"-->
<!--value-format="yyyy-MM-dd"-->
<!--placeholder="选择加工件合格时间"-->
<!--@change="timeChange(scope.row)"/>-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="板焊结束" width="150" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.板焊 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="操作" width="200px" align="center" fixed="right">-->
<!--<template slot-scope="scope" align="center">-->
<!--<el-button-->
<!--size="mini"-->
<!--type="primary"-->
<!--class="el-icon-edit"-->
<!--@click="PlateWelding(scope.$index, scope.row, 'form1')">板焊</el-button>-->
<!--&lt;!&ndash;<el-button size="mini" type="primary" @click="inBatches">分批</el-button>&ndash;&gt;-->
<!--</template>-->
<!--</el-table-column>-->
</el-table>
<div v-if="是否扫描 === false" class="block" style="margin-top: 10px;">
<el-pagination
@@ -173,7 +173,7 @@
v-loading="listLoading1"
:data="tableData1"
class="table"
border
borde
style="max-height: 500px"
height="500">
<el-table-column label="零件图号" align="center" width="240">
@@ -1206,6 +1206,7 @@ export default {
if (this.零件图号.length !== 0) {
for (let i = 0; i < this.零件图号.length; i++) {
selection2(this.工艺计划流水号[i]).then(response => {
console.log(response.data, 2)
for (let k = 0; k < response.data.length; k++) {
this.process[i][k] = response.data[k].工艺名称简称
this.planDate[i][k] = response.data[k].计划日期_短
@@ -1472,7 +1473,6 @@ export default {
}).then(() => {
plan(this.tableData1[i].工艺计划流水号).then(response => {
if (this.tableData1[i].平衡次数 !== 0 || this.tableData1[i].是否焊接 !== 1) {
console.log(this.tableData1[i].平衡次数, 111)
this.result1 += parseInt(response.data[0].result)
if (this.result1 === this.length) {
this.$message.success('零件计划制定成功')

1
src/views/ManufacturingCenter/QuotaFormulation/index.vue
View File

@@ -308,6 +308,7 @@ export default {
this.result += parseInt(response.data[0].result)
if (this.result === this.tableData.length) {
this.$message.success('保存成功')
this.typeChange()
} else if (response.data[0].result === '0') {
this.$message.error('第' + (i + 1) + '行保存失败')
}

55
src/views/ManufacturingCenter/StatusQuery/index.vue
View File

@@ -122,10 +122,10 @@
</div>
</el-card>
<el-dialog :title="title" :visible.sync="dialogFormVisible4" center style="min-height: 300px" width="800px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="零件状态" prop="零件状态" style="margin-left: 200px">
<el-select v-model="form.零件状态" placeholder="零件状态" size="small" clearable>
<el-dialog :title="title" :visible.sync="dialogFormVisible4" center style="min-height: 300px" width="400px">
<el-form label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="零件状态">
<el-select v-model="partStateValue1" placeholder="零件状态" size="small">
<el-option
v-for="item in partState"
:key="item.value"
@@ -135,8 +135,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel('form')">取消</el-button>
<el-button type="primary" @click="submitEdit('form')">确定</el-button>
<el-button @click="cancel()">取消</el-button>
<el-button type="primary" @click="submitEdit()">确定</el-button>
</div>
</el-dialog>
@@ -267,6 +267,7 @@ export default {
groupNum: null, // 组件流水号
partNumber: '', // 零件号
partStateValue: null, // 零件状态
partStateValue1: null,
partState: [], // 零件状态数组
partTypeValue: null, // 零件类型
num: null,
@@ -300,15 +301,7 @@ export default {
}, {
value: 2,
label: '外协生产'
}],
form: {
零件状态: null
},
rules: {
零件状态: [
{ required: true, message: '请选择零件状态', trigger: 'change' }
]
}
}]
}
},
created() {
@@ -442,34 +435,24 @@ export default {
this.dialogFormVisible3 = false
},
handleEdit(row) {
if (this.$refs['form'] !== undefined) {
this.$refs['form'].resetFields()
}
this.form = {}
console.log(row)
this.title = '编辑'
this.partStateValue1 = parseInt(row.考核状态) + 2
this.dialogFormVisible4 = true
this.num = row.工艺计划流水号
},
submitEdit(formName) { // 提交编辑
this.$refs[formName].validate((valid) => {
if (valid) {
editData(this.num, this.form.零件状态).then(response => {
if (response.data[0].result === '1') {
this.$message.success('编辑成功')
this.dialogFormVisible4 = false
this.pageCurrent = 1
this.searchData()
} else { this.$message.error('编辑失败') }
})
} else {
return false
}
submitEdit() { // 提交编辑
editData(this.num, this.partStateValue1).then(response => {
if (response.data[0].result === '1') {
this.$message.success('编辑成功')
this.dialogFormVisible4 = false
this.pageCurrent = 1
this.searchData()
} else { this.$message.error('编辑失败') }
})
},
cancel(formName) { // 取消
this.form = {}
cancel() { // 取消
this.dialogFormVisible4 = false
this.$refs[formName].resetFields()
},
handleSizeChange(val) {
this.pageSize = val

102
src/views/ManufacturingCenter/TypicalProcessMaintenance/index.vue
View File

@@ -2,38 +2,36 @@
<template>
<div class="app-container">
<el-card>
<div style="margin-top: -10px;">
<el-row>
<span>零件分类:</span>
<el-select v-model="partsCategoriesValue" size="small" filterable clearable placeholder="零件分类" @change="getPartsName">
<el-option
v-for="item in partsCategories"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>零件名称:</span>
<el-select v-model="partsNameValue" size="small" filterable clearable placeholder="零件名称" @change="getTableData" >
<el-option
v-for="item in partsName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>典型工艺号:</span>
<el-input v-model="typicalNumValue" auto-complete="off" style="width: 200px" size="small" />
<el-button size="small" type="primary" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="getTableData">查询</el-button>
<el-button size="small" type="info" icon="el-icon-circle-plus-outline" style="margin: 10px 0 0 10px" @click="addTableData">增加</el-button>
<el-button size="small" type="success" icon="el-icon-cjn-09" style="margin: 10px 0 0 10px" @click="editConfirm">保存</el-button>
</el-row>
</div>
<span>零件分类:</span>
<el-select v-model="partsCategoriesValue" size="small" filterable clearable placeholder="零件分类" @change="getPartsName">
<el-option
v-for="item in partsCategories"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>零件名称:</span>
<el-select v-model="partsNameValue" size="small" filterable clearable placeholder="零件名称" @change="getTableData" >
<el-option
v-for="item in partsName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>典型工艺号:</span>
<el-input v-model="typicalNumValue" auto-complete="off" style="width: 100px" size="small" readonly/>
<el-button size="small" type="success" icon="el-icon-search" style="margin-left: 10px" @click="total=0;pageCurrent=1;pageSize=20;getTableData()">查询</el-button>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addTableData">增加</el-button>
<el-button size="small" type="warning" icon="el-icon-menu" style="margin-left: 10px" @click="editConfirm">保存</el-button>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" border style="width: 100%;max-height: 550px;" size="mini" height="550px">
<el-table-column prop="num" label="序号" width="50" align="center" type="index"/>
<el-table-column prop="num" label="序号" width="50" align="center" type="index">
<template slot-scope="scope">
{{ scope.row.工艺序号 }}
</template>
</el-table-column>
<el-table-column prop="name" label="工艺名称" width="230" align="center">
<template slot-scope="scope">
<el-input
@@ -66,12 +64,12 @@
</el-table-column>
<el-table-column prop="name" label="单件" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.单件定额工时" style="width:50px" placeholder="单件定额工时"/>
<el-input v-model="scope.row.单件定额工时" size="mini" style="width:90px" placeholder="单件定额"/>
</template>
</el-table-column>
<el-table-column prop="name" label="准结" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.准结定额工时" style="width:50px" placeholder="准结定额工时"/>
<el-input v-model="scope.row.准结定额工时" size="mini" style="width:90px" placeholder="准结定额"/>
</template>
</el-table-column>
<el-table-column label="操作" width="300" align="center" fixed="right">
@@ -101,6 +99,16 @@
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[20, 30, 40, 50]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible" title="工艺名称、工艺要求选择" center width="400px">
@@ -145,6 +153,9 @@ import { getPartsCategories, getPartsName, getTableData, upMove, downMove, deleR
export default {
data() {
return {
pageCurrent: 1,
pageSize: 20,
total: 0,
partsCategories: [],
partsCategoriesCheck: null,
partsCategoriesValue: '',
@@ -181,7 +192,7 @@ export default {
getPartsName(this.partsCategoriesValue).then(res => {
const data = res.data
data.length > 0 ? this.partsNameValue = data[0].典型工艺流水号 : this.partsNameValue = ''
this.typicalNumValue = data[0].典型工艺号
this.typicalNumValue = data.length > 0 ? data[0].典型工艺号 : ''
data.map(item => {
this.partsName.push({
label: item.典型工艺名称,
@@ -193,11 +204,25 @@ export default {
getTableData() {
this.partsCategoriesValue ? this.partsCategoriesCheck = 1 : this.partsCategoriesCheck = 0
this.partsNameValue ? this.partsNameCheck = 1 : this.partsNameCheck = 0
this.loading = true
getTableData(this.partsCategoriesCheck, this.partsCategoriesValue, this.partsNameCheck, this.partsNameValue).then(res => {
this.loading = false
this.tableData = res.data
})
if (this.partsCategoriesCheck === 0 && this.partsNameCheck === 0) {
this.$message.error('请选择查询条件')
} else {
this.loading = true
getTableData(this.pageCurrent, this.pageSize, this.partsCategoriesCheck, this.partsCategoriesValue, this.partsNameCheck, this.partsNameValue).then(res => {
this.loading = false
this.tableData = res.data.rows
this.total = res.data.total
})
}
},
handleSizeChange(val) {
this.pageCurrent = 1
this.pageSize = val
this.getTableData()
},
handleCurrentChange(val) {
this.pageCurrent = val
this.getTableData()
},
upMove(row) {
upMove(row.典型工艺流水号, row.典型工艺工序流水号).then(res => {
@@ -234,7 +259,7 @@ export default {
if (res.data[0].result === '1') {
index++
} else {
this.$message.error('零件保存失败')
this.$message.error('零件工艺保存失败')
}
if (index === this.tableData.length) {
this.$message.success('保存修改成功')
@@ -302,4 +327,7 @@ export default {
span{
margin: 20px;
}
.el-card{
margin-bottom: 15px;
}
</style>

8
src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
View File

@@ -8,7 +8,7 @@
</el-card>
<el-card>
<el-table :data="List" highlight-current-row border>
<el-table :data="List" border size="small">
<el-table-column label="设备名称" align="center" >
<template slot-scope="scope">
{{ scope.row.设备名称 }}
@@ -159,6 +159,7 @@
</div>
</el-dialog>
</div>
</template>
<script>
@@ -210,9 +211,11 @@ export default {
},
created() {
this.initialization()
this.fetchData()
},
methods: {
fetchData() {
this.List = []
if (this.equipmentName !== '') {
this.check = 1
} else {
@@ -318,6 +321,9 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
if (this.List && this.List.length === 1 && this.pageCurrent > 1) {
this.pageCurrent--
}
deleteTable(row.设备流水号).then(response => {
if (response.data[0].result === '1') {
this.$message.success('删除成功')

12
src/views/MarketingCenter/CRM/index.vue
View File

@@ -400,6 +400,9 @@ export default {
this.loading3 = true
selectMarketingManager(this.AdressID).then(response => {
this.loading3 = false
for (let i = 0; i < response.data.length; i++) {
response.data[i].出生日期 = (response.data[i].出生日期).split(' ')[0]
}
this.tableData3 = response.data
})
},
@@ -438,6 +441,9 @@ export default {
this.loading3 = false
selectMarketingManager(data).then(response => {
this.loading3 = false
for (let i = 0; i < response.data.length; i++) {
response.data[i].出生日期 = (response.data[i].出生日期).split(' ')[0]
}
this.tableData3 = response.data
})
})
@@ -467,6 +473,9 @@ export default {
function a() {
selectMarketingManager(this.AdressID).then(response => {
this.loading3 = false
for (let i = 0; i < response.data.length; i++) {
response.data[i].出生日期 = (response.data[i].出生日期).split(' ')[0]
}
this.tableData3 = response.data
})
}
@@ -490,6 +499,9 @@ export default {
this.loading3 = true
selectMarketingManager(this.AdressID).then(response => {
this.loading3 = false
for (let i = 0; i < response.data.length; i++) {
response.data[i].出生日期 = (response.data[i].出生日期).split(' ')[0]
}
this.tableData3 = response.data
})
}

182
src/views/Outsourcing/InterBudgetaryBudgets/index.vue
View File

@@ -7,28 +7,33 @@
<el-radio :label="1">未编制</el-radio>
<el-radio :label="2">已编制</el-radio>
</el-radio-group>
<span>项目名称:</span>
<el-select v-model="entryNameValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="项目名称" @change="typeChange()">
<el-option
v-for="item in entryName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床名称:</span>
<el-select v-model="toolNumValue" clearable filterable size="small" placeholder="机床号" style="margin-bottom:10px" @change="typeChange1()">
<el-option
v-for="item in toolNum"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>分组:</span>
<el-select v-model="NumValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="机床组号">
<el-option
v-for="item in Num"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>零件图号:</span>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px"/>
<span>开始时间:</span>
<el-date-picker
v-model="date01"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
type="date"
size="small"
placeholder="选择开始日期"/>
<span>结束时间:</span>
<el-date-picker
v-model="date02"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
type="date"
size="small"
placeholder="选择结束日期"/>
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize2=10; pageCurrent2=1;searchPartNum()">查询</el-button>
</el-row>
@@ -71,30 +76,30 @@
{{ scope.row.原材料规格 }}
</template>
</el-table-column>
<el-table-column label="面积" width="110" align="center">
<template slot-scope="scope">
{{ scope.row.面积 }}
</template>
</el-table-column>
<el-table-column label="重量" width="110" align="center">
<template slot-scope="scope">
{{ scope.row.重量 }}
</template>
</el-table-column>
<el-table-column label="材料费" width="110" align="center">
<template slot-scope="scope">
{{ scope.row.材料费 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="150px" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
class="el-icon-edit"
@click="edit(scope.$index, scope.row, 'form')">编辑</el-button>
</template>
</el-table-column>
<!--<el-table-column label="面积" width="110" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.面积 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="重量" width="110" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.重量 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="材料费" width="110" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.材料费 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="操作" align="center" width="150px" fixed="right">-->
<!--<template slot-scope="scope">-->
<!--<el-button-->
<!--size="mini"-->
<!--type="primary"-->
<!--class="el-icon-edit"-->
<!--@click="edit(scope.$index, scope.row, 'form')">编辑</el-button>-->
<!--</template>-->
<!--</el-table-column>-->
</el-table>
<div class="block">
<el-pagination
@@ -134,7 +139,7 @@
</el-table-column>
<el-table-column label="外协预算价格" width="110" align="center">
<template slot-scope="scope">
<el-input v-model="tableData[scope.$index].外协预算价格_系数" size="mini" />
<el-input v-model="tableData[scope.$index].外协预算价格_计算" size="mini" />
</template>
</el-table-column>
</el-table>
@@ -165,10 +170,16 @@
</template>
<script>
import { searchPartNum1, searchPartNum2, searchTable, saveWeightArea, saveMaterialPrice, saveRowPrice } from '@/api/Outsourcing/InterBudgetaryBudgets'
import { machine, getToolNum, getNum, searchPartNum1, searchTable, saveWeightArea, saveMaterialPrice, saveRowPrice } from '@/api/Outsourcing/InterBudgetaryBudgets'
export default {
data() {
return {
entryNameValue: '',
entryName: [], // 项目名称
toolNumValue: '',
toolNum: [], // 机床号
NumValue: '',
Num: [], // 分组
lingjianhao: '',
dialogFormVisible: false,
form: {
@@ -183,8 +194,6 @@ export default {
result2: [],
radio: 1,
partName: '', // 零件名称
date01: '', // 开始时间
date02: '', // 结束时间
loading0: false,
tableData: [],
loading2: false,
@@ -194,33 +203,92 @@ export default {
pageCurrent2: 1 // 后台获取页
}
},
created() {
this.fetchData()
},
methods: {
radioChange() {
this.tableData2 = []
this.entryNameValue = ''
this.toolNumValue = ''
this.NumValue = ''
},
fetchData() {
this.entryNameValue = ''
this.entryName = []
machine().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.entryName.push({
label: response.data[i].项目名称,
value: response.data[i].项目流水号
})
}
})
},
typeChange() {
this.toolNumValue = ''
this.toolNum = []
this.NumValue = ''
this.Num = []
getToolNum(this.entryNameValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.toolNum.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号
})
}
})
},
typeChange1() {
this.NumValue = ''
this.Num = []
getNum(this.toolNumValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Num.push({
label: response.data[i].组号,
value: response.data[i].组件流水号
})
}
})
},
// 查零件号
searchPartNum() {
if (this.partName === null) {
this.partName = ''
}
if (this.date01 === '') {
this.date01 = null
if (this.entryNameValue !== null && this.entryNameValue !== '') {
this.check_entryNameValue = 1
} else {
this.check_entryNameValue = 0
}
if (this.date02 === '') {
this.date02 = null
if (this.toolNumValue !== null && this.toolNumValue !== '') {
this.check_toolNumValue = 1
} else {
this.check_toolNumValue = 0
}
if (this.NumValue !== null && this.NumValue !== '') {
this.check_NumValue = 1
} else {
this.check_NumValue = 0
}
if (this.partName !== null && this.partName !== '') {
this.check_partName = 1
} else {
this.check_partName = 0
}
this.loading2 = true
this.tableData2 = []
this.tableData = []
if (this.radio === 1) {
searchPartNum1(this.partName, this.date01, this.date02, this.pageCurrent2, this.pageSize2).then(response => {
searchPartNum1(this.check_entryNameValue, this.entryNameValue, this.check_toolNumValue, this.toolNumValue, this.check_NumValue, this.NumValue, this.check_partName, this.partName, 0, this.pageCurrent2, this.pageSize2).then(response => {
console.log(response.data)
this.tableData2 = response.data.rows
this.total2 = response.data.total
}).then(() => {
this.loading2 = false
})
} else {
searchPartNum2(this.partName, this.date01, this.date02, this.pageCurrent2, this.pageSize2).then(response => {
searchPartNum1(this.check_entryNameValue, this.entryNameValue, this.check_toolNumValue, this.toolNumValue, this.check_NumValue, this.NumValue, this.check_partName, this.partName, 1, this.pageCurrent2, this.pageSize2).then(response => {
this.tableData2 = response.data.rows
this.total2 = response.data.total
}).then(() => {
@@ -238,7 +306,7 @@ export default {
return
} else if (index === 5) {
for (let i = 0; i < data.length; i++) {
sums[5] += parseFloat(data[i].外协预算价格_系数)
sums[5] += parseFloat(data[i].外协预算价格_计算)
}
sums[5] = parseInt(sums[5] * 100) / 100
}
@@ -250,8 +318,8 @@ export default {
this.tableData = []
searchTable(row.工艺计划流水号, 1).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].外协预算价格_系数 !== 0) {
response.data[i].外协预算价格_系数 = response.data[i].外协预算价格_系数.toFixed(2)
if (response.data[i].外协预算价格_计算 !== 0) {
response.data[i].外协预算价格_计算 = response.data[i].外协预算价格_计算.toFixed(2)
}
}
this.cailiaofei = row.材料费
@@ -305,7 +373,7 @@ export default {
this.$message.error('请选择零件')
} else {
for (let i = 0; i < this.tableData.length; i++) {
saveRowPrice(this.tableData[i].工序流水号, parseFloat(this.tableData[i].外协预算价格_系数), this.tableData[i].工艺计划流水号, this.cailiaofei).then(response => {
saveRowPrice(this.tableData[i].工序流水号, parseFloat(this.tableData[i].外协预算价格_计算), this.tableData[i].工艺计划流水号, this.cailiaofei).then(response => {
})
}
this.$message.success('保存成功')

36
src/views/Outsourcing/OutFactoryMaintenance/index.vue
View File

@@ -52,26 +52,11 @@
{{ scope.row.设备情况 }}
</template>
</el-table-column>
<!--<el-table-column label="类别" align="center" width="110px">-->
<!--<template slot-scope="scope">-->
<!--{{scope.row.类别}}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="关注" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{scope.row.关注}}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="备注" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<!--<el-table-column label="序号" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{scope.row.序号}}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="操作" align="center" width="200px" fixed="right">
<template slot-scope="scope">
<el-button
@@ -138,18 +123,6 @@
</el-form-item>
</el-col>
</el-row>
<!--<el-row>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="类别" prop="category">-->
<!--<el-input v-model="form.category" placeholder="类别" clearable size="small"></el-input>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="关注" prop="attention">-->
<!--<el-input v-model="form.attention" placeholder="关注" clearable size="small" ></el-input>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
<el-row>
<el-col :span="12">
<el-form-item label="设备情况" prop="EquipmentCondition">
@@ -162,15 +135,6 @@
</el-form-item>
</el-col>
</el-row>
<!--<el-row>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="厂家序号" prop="ManufacturerNumber">-->
<!--<el-input v-model="form.ManufacturerNumber" placeholder="厂家序号" clearable size="small"></el-input>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12">-->
<!--</el-col>-->
<!--</el-row>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>

37
src/views/Outsourcing/OutsourcingDataMaintenance/index.vue
View File

@@ -22,6 +22,7 @@
:data="tableData3"
border
stripe
size="small"
tooltip-effect="dark"
style="width: 100%;"
height="650">
@@ -43,30 +44,31 @@
<template slot-scope="scope">{{ scope.row.工艺名称简称 }}</template>
</el-table-column>
<el-table-column label="计算方式" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.外协价格计算标准流水号)===1" type="success" size="small">工时</el-tag>
<el-tag v-if="parseInt(scope.row.外协价格计算标准流水号)===2" type="success" size="small">重量</el-tag>
<el-tag v-if="parseInt(scope.row.外协价格计算标准流水号)===3" type="success" size="small">面积</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="工时价格(元/分)">
<template slot-scope="scope">
<div :class="colorCode1[scope.$index]">
<h4>{{ scope.row.外协价格1 }}</h4>
</div>
{{ scope.row.外协价格1 }}
</template>
</el-table-column>
<el-table-column align="center" label="重量价格(元/kg)">
<template slot-scope="scope">
<div :class="colorCode2[scope.$index]">
<h4>{{ scope.row.重量价格1 }}</h4>
</div>
{{ scope.row.重量价格1 }}
</template>
</el-table-column>
<el-table-column align="center" label="面积价格(元/m2)">
<template slot-scope="scope">
<div :class="colorCode3[scope.$index]">
<h4>{{ scope.row.面积价格1 }}</h4>
</div>
{{ scope.row.面积价格1 }}
</template>
</el-table-column>
<el-table-column label="操作" width="130px" align="center">
<template slot-scope="scope">
<el-button
@@ -227,21 +229,6 @@ export default {
getTable(this.Code_Check, this.Code, this.Code_Check1, this.processClassificationValue, this.pageList, this.pageSize).then(response => {
this.total = parseInt(response.data.total)
if (response.data.rows.length !== 0) {
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].外协价格计算标准流水号 === '1') {
this.colorCode1.push('mianji')
this.colorCode2.push('')
this.colorCode3.push('')
} else if (response.data.rows[i].外协价格计算标准流水号 === '2') {
this.colorCode1.push('')
this.colorCode2.push('mianji')
this.colorCode3.push('')
} else {
this.colorCode1.push('')
this.colorCode2.push('')
this.colorCode3.push('mianji')
}
}
this.tableData3 = response.data.rows
}
})

Some files were not shown because too many files have changed in this diff Show More