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

更新

Browse Source
This commit is contained in:
liushuai
2019-10-29 16:36:34 +08:00
parent ad31970800 e35b2215d3
commit 4f5db3ff46
116 changed files with 5956 additions and 1870 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/api/Assembly/AssemblyQualityInspection.js
View File

@@ -35,7 +35,7 @@ export function searchgroup(num) {
})
}
// 质检管理_质量情况_查询数据
export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, pageCurrent, pageSize) {
export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4) {
return request({
url: '',
method: 'post',
@@ -43,8 +43,7 @@ export function selecttable(check1, value1, check2, value2, check3, value3, chec
type: '1',
name: '质检管理_装配质检_质检情况_查询数据',
param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&检测项_check=' + check3 + '&检测项流水号=' + value3 +
'&质检情况_check=' + check4 + '&质检情况=' + value4,
Pagination: pageCurrent + '&' + pageSize
'&质检情况_check=' + check4 + '&质检情况=' + value4
}
})
}

10
src/api/Assembly/QualityInspectionInformationInquiry.js
View File

@@ -95,25 +95,23 @@ export function searchTableDetail(...params) {
}
})
}
export function searchData(pageSize, pageCurrent) {
export function searchData() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_加工顺序调整_查询正在加工零件工序_NEW',
Pagination: pageCurrent + '&' + pageSize
name: '车间生产管理工艺_加工顺序调整_查询正在加工零件工序_NEW'
}
})
}
export function searchData1(pageSize, pageCurrent) {
export function searchData1() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'MES_机加工MES_记录零件待加工显示_NEW',
Pagination: pageCurrent + '&' + pageSize
name: 'MES_机加工MES_记录零件待加工显示_NEW'
}
})
}

36
src/api/BasicData/PartsNumberMaintenance.js
View File

@@ -34,27 +34,25 @@ export function groupSelect(machineValue) {
}
})
}
export function searchTable5(pageCurrent, pageSize, projectCheck, project, machineCheck, machine, groupCheck, group) {
export function searchTable5(projectCheck, project, machineCheck, machine, groupCheck, group) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_零件明细表_外购件和标准件_临时表数据查询',
param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}`,
Pagination: pageCurrent + '&' + pageSize
param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}`
}
})
}
export function searchTable6(pageCurrent, pageSize, projectCheck, project, machineCheck, machine, groupCheck, group) {
export function searchTable6(projectCheck, project, machineCheck, machine, groupCheck, group) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_零件明细表_基本件_临时表数据查询',
param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}`,
Pagination: pageCurrent + '&' + pageSize
param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}`
}
})
}
@@ -70,27 +68,25 @@ export function searchTable7(pageCurrent, pageSize, projectCheck, project, machi
}
})
}
export function basicPartsData(project_check, project, machine_check, machine, group_check, group, pageSize, pageCurrent) {
export function basicPartsData(project_check, project, machine_check, machine, group_check, group) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_零件明细表_基本件_查询数据_综合gj',
param: `项目流水号_check=${project_check}&项目流水号=${project}&机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}`,
Pagination: pageCurrent + '&' + pageSize
param: `项目流水号_check=${project_check}&项目流水号=${project}&机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}`
}
})
}
export function purchasePartsData(num, pageCurrent, pageSize) {
export function purchasePartsData(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_零件明细表_标准件和外购件_查询数据',
param: `组件流水号=${num}`,
pagination: pageCurrent + '&' + pageSize
param: `组件流水号=${num}`
}
})
}
@@ -204,15 +200,14 @@ export function editBasicParts(num, num1) {
}
})
}
export function getTable(num, pageList, pageSize) {
export function getTable(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工艺计划_已投产_按组查',
param: '组件流水号=' + num + '=int',
Pagination: pageList + '&' + pageSize
param: '组件流水号=' + num + '=int'
}
})
}
@@ -227,15 +222,14 @@ export function editProductNum(num, num1) {
}
})
}
export function getTable1(num, a, b, c, d, e, f, g, pageList, pageSize) {
export function getTable1(num, a, b, c, d, e, f, g) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_新排产算法_能力平衡_查询数据_要平衡的零件',
param: '项目流水号_check=' + num + '=string&项目流水号=' + a + '=int&机床流水号_check=' + b + '=string&机床流水号=' + c + '=int&组件流水号_check=' + d + '=string&组件流水号=' + e + '=int&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=1=int&考核状态=5=int',
Pagination: pageList + '&' + pageSize
param: '项目流水号_check=' + num + '=string&项目流水号=' + a + '=int&机床流水号_check=' + b + '=string&机床流水号=' + c + '=int&组件流水号_check=' + d + '=string&组件流水号=' + e + '=int&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=1=int&考核状态=5=int'
}
})
}
@@ -258,8 +252,7 @@ export function searchTable1(...params) {
data: {
type: '1',
name: '采购管理_采购部采购_查询物料_数量维护',
param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&机床流水号_check=${params[4]}&机床流水号=${params[5]}&组件流水号_check=${params[6]}&组件流水号=${params[7]}&物料状态=1`,
Pagination: params[0] + '&' + params[1]
param: `项目流水号_check=${params[0]}&项目流水号=${params[1]}&机床流水号_check=${params[2]}&机床流水号=${params[3]}&组件流水号_check=${params[4]}&组件流水号=${params[5]}&物料状态=1`
}
})
}
@@ -271,8 +264,7 @@ export function searchTable2(...params) {
data: {
type: '1',
name: '采购管理_采购部采购_查询物料_基本件_数量维护',
param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&机床流水号_check=${params[4]}&机床流水号=${params[5]}&组件流水号_check=${params[6]}&组件流水号=${params[7]}&物料状态=1`,
Pagination: params[0] + '&' + params[1]
param: `项目流水号_check=${params[0]}&项目流水号=${params[1]}&机床流水号_check=${params[2]}&机床流水号=${params[3]}&组件流水号_check=${params[4]}&组件流水号=${params[5]}&物料状态=1`
}
})
}

5
src/api/BasicData/SystemRrolemaintenance.js
View File

@@ -1,13 +1,12 @@
import request from '@/utils/request'
export function InitRolefunction(pageCurrent, pageSize) {
export function InitRolefunction() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '菜单系统模块_项目角色_查询数据_MESWORK',
Pagination: pageCurrent + '&' + pageSize
name: '菜单系统模块_项目角色_查询数据_MESWORK'
}
})
}

5
src/api/BasicData/WorkshopPersonnelRoleMana.js
View File

@@ -136,15 +136,14 @@ export function initOrderType() {
}
})
}
export function searchTable(check1, staffName, check2, systemAdministrator, pageCurrent, pageSize) {
export function searchTable(check1, staffName, check2, systemAdministrator) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '菜单系统模块_项目角色员工综合_查询数据',
param: '姓名_check=' + check1 + '=int&姓名=' + staffName + '=string&角色编号_check=' + check2 + ' =int&角色编号=' + systemAdministrator + '=int',
Pagination: pageCurrent + '&' + pageSize
param: '姓名_check=' + check1 + '=int&姓名=' + staffName + '=string&角色编号_check=' + check2 + ' =int&角色编号=' + systemAdministrator + '=int'
}
})
}

14
src/api/ManufacturingCenter/ActualWorkQuery.js Normal file
View File

@@ -0,0 +1,14 @@
import request from '@/utils/request'
// 查询加工工时统计表
export function searchTable(num1, num2, num3, num4, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_工时统计_当日过程工时查询',
param: `加工开始时间_check=${num1}&加工开始时间=${num2}&工作者姓名_check=${num3}&工作者姓名=${num4}`,
Pagination: pageCurrent + '&' + pageSize
}
})
}

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

@@ -1,14 +1,13 @@
import request from '@/utils/request'
export function getData(num, num1, pageCurrent, pageSize) {
export function getData(num, num1) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理_设备运行情况_查询数据',
param: '工位号=' + num + '&日期=' + num1,
pagination: pageCurrent + '&' + pageSize
param: '工位号=' + num + '&日期=' + num1
}
})
}

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

@@ -98,8 +98,8 @@ export function searchTable01(...params) {
data: {
type: '1',
name: '采购管理_采购部采购_查询物料_分配后_加供应商',
param: `项目流水号_check=${params[0]}&项目流水号=${params[1]}&机床流水号_check=${params[2]}&机床流水号=${params[3]}&组件流水号_check=${params[4]}&组件流水号=${params[5]}`,
Pagination: params[6] + '&' + params[7]
param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}`,
Pagination: params[4] + '&' + params[5]
}
})
}

25
src/api/ManufacturingCenter/ManHourStatistics.js Normal file
View File

@@ -0,0 +1,25 @@
import request from '@/utils/request'
// 查询人员总工工时
export function searchtable(num1, num2, num3, num4, num5) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_工时统计_查询数据2',
param: '操作者_check=' + num1 + '&姓名=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5
}
})
}
export function searchTable2(pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '3',
name: 'SELECT 零件图号,零件名称,工序顺序,工艺名称,单件定额工时,准结定额工时 FROM 车间生产管理工艺_零件工序_视图 where 工艺编号 is not null and 工艺计划流水号 = 1235',
pagination: pageCurrent + '&' + pageSize
}
})
}

539
src/api/ManufacturingCenter/ProcessPlanningNew.js Normal file
View File

@@ -0,0 +1,539 @@
import request from '@/utils/request'
// 查询零件未编制（包含借用件）
export function getPartnames3(num1, num2) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工艺计划_编制工艺_按人员机床组号或图号查',
param: '工艺人员编号=' + num1 + '&机床组号或图号=' + num2
}
})
}
// 查询零件已编制（包含借用件）
export function getPartnames4(num1, num2) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工艺计划_查询已完成工艺制定零件_按人员机床组号或图号查',
param: '工艺人员编号=' + num1 + '&机床组号或图号=' + num2
}
})
}
// 典艺查询<高精原有数据>
export function searchProcess11(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_原零件工艺查询_MESWORK',
param: '零件图号=' + num
}
})
}
// 典艺查询<高精原有数据>
export function numChange(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_原零件工艺明细查询_MESWORK',
param: '典艺流水号=' + num
}
})
}
// 保存主表工艺
export function selectRequest(num0, num1, num2, num3, request0) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工序_修改数据_根据工序流水号和工艺计划流水号',
param: '工序流水号=' + num0 + '&工艺计划流水号=' + num1 + '&工艺编号=' + num2 + '&工艺顺序=' + num3 + '&工艺要求=' + request0
}
})
}
// 初始化 工艺员A
export function initCraftmen() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=20'
}
})
}
// 查询 未编制 零件号
export function getPartnames1(num1, num2) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工艺计划_编制工艺_按人员查',
param: '工艺人员编号=' + num1 + '&零件图号=' + num2
}
})
}
// 初始化 已编制 零件号
export function getPartnames2(num1, num2) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工艺计划_查询已完成工艺制定零件',
param: '工艺人员编号=' + num1 + '&零件图号=' + num2
}
})
}
// 零件详细信息
export function detailInfo(serialNum) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工艺计划_查已投产零件信息',
param: '工艺计划流水号=' + serialNum + '=int'
}
})
}
// 初始化材质
export function getMaterial(pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_材质表_查询数据',
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 根据材质名称查材质
export function searchMaterial(pageCurrent, pageSize, name) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_材质表_查询数据_根据材料名称',
param: '材料名称=' + name,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 典型工艺选择零件分类A
export function typicalProcess() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基础表_典型工艺名称_分类_查询数据'
}
})
}
// 典型工艺选择零件名称、工艺号、备注
export function FcK(serialNum) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基础表_典型工艺名称_查询数据_查典型工艺名称',
param: '典型工艺名称分类流水号=' + serialNum + '=int'
}
})
}
// 典型工艺查询
export function searchProcess(check1, a, check2, b, check3, c) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基础表_典型工艺名称_查询数据_综合查询',
param: '典型工艺名称分类流水号_check=' + check1 + '=bit&典型工艺名称分类流水号=' + a + '=int&典型工艺流水号_check=' + check2 + '=bit&典型工艺流水号=' + b + '=int&典型工艺流水号1_check=' + check3 + '=bit&典型工艺流水号1=' + c + '=int'
}
})
}
// 初始化工艺名称
export function processNameClick() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基础表_工艺分类名称_查询数据_零件工艺制定专用'
}
})
}
// 工艺名称查询
export function processNameSelect(val) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基础表_工艺名称_查询数据',
param: '工艺分类流水号_check=1=bit&工艺分类流水号=' + val + '=int'
}
})
}
// 工艺要求查询
export function processRequestSelect(val) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理_基础表_工艺要求_查询数据',
param: '工艺编号=' + val + '=int'
}
})
}
// 初始化公差A
export function initTolerance() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基础表_公差对照表_查询数据'
}
})
}
// 公差查询
export function searchTolerance(val1, val2) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基础表_公差对照表_公差_查询数据',
param: '输入数值=' + val1 + '&参数=' + val2
}
})
}
// 工艺定额人员查询
export function initPerson() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=9'
}
})
}
// 完艺工艺查询
export function searchWYgongyi(check1, tuhao, check2, bianhao, check3, start, end, check4, name) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工艺计划_查询数据_根据零件图号查询已投产的工艺计划流水号',
param: '零件图号_check=' + check1 + '&零件图号=' + tuhao + '&工艺员编号_check=' + check2 + '&工艺员编号=' + bianhao + '&工艺时间_check=' + check3 + '&工艺开始时间=' + start + '=datetime&工艺结束时间=' + end + '=datetime&零件名称_check=' + check4 + '&零件名称=' + name
}
})
}
// 完艺工艺要求查询
export function gongyiYQ(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工艺计划_查询数据',
param: '工艺计划流水号=' + num
}
})
}
// 完艺工艺拷贝
export function gongyiCopy(num1, num2) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工序_工艺拷贝_工艺计划流水号',
param: '工艺计划流水号_完成工艺=' + num1 + '=int&工艺计划流水号_被拷工艺=' + num2 + '=int'
}
})
}
// 主界面选择零件号查主表
export function mainTable(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工序_查询工序信息',
param: '工艺计划流水号=' + num + '=int'
}
})
}
// 主界面主表难度等级修改
export function hardEdit(num, hard) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工序_修改数据_工艺难度等级',
param: '工序流水号=' + num + '=int&工艺难度等级=' + hard
}
})
}
// 主界面主表工艺要求修改
export function requestEdit(num, request0) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工序_修改数据_工艺要求_根据工序流水号',
param: '工序流水号=' + num + '=int&工艺要求=' + request0
}
})
}
// 主界面主表插入功能
export function insertOne(num0, num1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工序_修改数据_工艺计划流水号和工序流水号',
param: '工艺计划流水号=' + num0 + '=int&工序流水号=' + num1 + '=int'
}
})
}
// 主界面主表删除功能
export function deleteOne(num0, num1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工序_删除数据_工序流水号',
param: '工艺计划流水号=' + num0 + '=int&工序流水号=' + num1 + '=int'
}
})
}
// 主界面主表上移功能
export function upOne(num0, num1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工序_修改数据_上移工序',
param: '工艺计划流水号=' + num0 + '=int&工序流水号=' + num1 + '=int'
}
})
}
// 主界面主表下移功能
export function downOne(num0, num1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工序_修改数据_下移工序',
param: '工艺计划流水号=' + num0 + '=int&工序流水号=' + num1 + '=int'
}
})
}
// 保存变更材质
export function saveMaterial(num0, num1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工艺计划_修改零件材料',
param: '工艺计划流水号=' + num0 + '&材料流水号=' + num1
}
})
}
// 核准保存
export function saveApprove(num0, num1, request0, spec, num2, outhelp, num3, num4, weight, area, num5, level) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工序_增加数据_同时修改工艺计划',
param: '工艺计划流水号=' + num0 + '&工艺编号=' + num1 + '&工艺要求=' + request0 + '&原材料规格=' + spec + '&工序顺序=' + num2 + '&工序间是否外协=' + outhelp + '&工序流水号=' + num3 + '&材料流水号=' + num4 + '&重量=' + weight + '&面积=' + area + '&工艺人员编号=' + num5 + '&工艺难度等级=' + level
}
})
}
// 粘贴
export function pasteTable(oldNum, newNum) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工艺计划_拷贝零件工艺',
param: '工艺计划流水号旧=' + oldNum + '&工艺计划流水号新=' + newNum
}
})
}
// 删除
export function deleteTable(num) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工序_删除零件工艺',
param: '工艺计划流水号=' + num
}
})
}
// 在制零件工艺修改
export function returnEdit(num) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_在制零件工艺调整_修改工艺',
param: '工艺计划流水号=' + num
}
})
}
// 查询工艺记录
export function searchRecord(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_在制零件工艺调整_查询工艺',
param: '工艺计划流水号=' + num
}
})
}
// 重量拷贝
export function WeightCopy(num, num2) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工序_重量拷贝_工艺计划流水号',
param: '工艺计划流水号=' + num + '&重量信息=' + num2
}
})
}
// 保存变更材质
export function saveWeight(num0, num1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工艺计划_修改零件重量',
param: '工艺计划流水号=' + num0 + '&重量=' + num1
}
})
}
// 单件工时改变
export function singleChange(val1, val2) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工序_单件准结定额_修改数据',
param: '工序流水号=' + val1 + '&单件定额工时=' + val2
}
})
}
// 准结工时改变
export function readyChange(val1, val2) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工序_单件准结定额_修改数据',
param: '工序流水号=' + val1 + '&准结定额工时=' + val2
}
})
}
// 未编制定额保存
export function TableAddLi1(a, b) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_定额任务分配_保存数据',
param: '工艺计划流水号=' + a + '=string&人员编号=' + b + '=string'
}
})
}
// 已编制定额保存
export function TableAddLi(a, b, c, num0, num1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工序_增加数据_修改数据',
param: '单件定额工时=' + a + '=string&准结定额工时=' + b + '=string&零件图号=' + c + '=string&工序流水号=' + num0 + '=int&工艺计划流水号=' + num1 + '=int'
}
})
}
// 修改备注
export function modifyRemark(...params) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工艺计划_工艺修改记录_增加数据',
param: `修改人员编号=${params[0]}&修改备注=${params[1]}&工艺计划流水号=${params[2]}`
}
})
}
export function editGongyi(num, num1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工序_修改数据_2027zdyNew',
param: `工艺计划流水号=${num}&工艺编号=${num1}`
}
})
}
export function dropGongyi(num, num1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工序_删除数据_2027zdyNew',
param: `工艺计划流水号=${num}&工序流水号=${num1}`
}
})
}

51
src/api/ManufacturingCenter/ProcessingStatusNew.js Normal file
View File

@@ -0,0 +1,51 @@
import request from '@/utils/request'
// 机床名称
export function getMachines() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int'
}
})
}
// 获取组号
export function getGroups(stepNumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组',
param: '机床流水号=' + stepNumber + '=int'
}
})
}
export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_横向赋值新建存储过程_新',
param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 获取组号
export function gettabledata1(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_加工进度查询_查询_New',
param: '工艺计划流水号=' + num + '=int'
}
})
}

28
src/api/ManufacturingCenter/ScheduleCompletionDetails.js Normal file
View File

@@ -0,0 +1,28 @@
import request from '@/utils/request'
// 查询人员总工工时
export function searchtable(num2, num3, num4, num5, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_工时统计_查询数据2_新',
param: '操作者_check=0&姓名=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 查询人员具体工序
export function searchtable2(num1, num2, num3, num4, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_工时统计按人员查询_查询数据2_新',
param: '工作者编号=' + num1 + '&时间_check=' + num2 + '&开始时间=' + num3 + '&结束时间=' + num4,
Pagination: pageCurrent + '&' + pageSize
}
})
}

86
src/api/ManufacturingCenter/ShopScheduling.js Normal file
View File

@@ -0,0 +1,86 @@
import request from '@/utils/request'
// 初始化工艺
export function getPerson() {
return request({
url: '',
method: 'post',
data: {
type: '3',
name: 'SELECT 姓名,人员编号 FROM 人事档案管理_人员名单 inner join dbo.人事档案管理_基础表_部门 on 人事档案管理_人员名单.考核部门编号=人事档案管理_基础表_部门.考核部门编号 where 人事档案管理_人员名单.考核部门编号=12 and 人员编号 <> 82 order by 姓名 '
}
})
}
export function getParts(pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_车间排产_零件查询',
Pagination: pageCurrent + '&' + pageSize
}
})
}
export function getGongxu(num) {
return request({
url: '',
method: 'post',
data: {
type: '3',
name: `select 姓名,排产时间,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态 from dbo.车间生产管理工艺_插件排产查询_视图 where 工艺编号 is not null and 工艺编号<>0 and 考核状态 = 6 and 工艺计划流水号=${num} order by 工序顺序`
}
})
}
export function searchTableData2(num) {
return request({
url: '',
method: 'post',
data: {
type: '3',
name: `select 工艺计划流水号,姓名,零件图号,零件名称,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态 from dbo.车间生产管理工艺_插件排产查询_视图 where 排产人员=${num} and 工序状态<>4 order by 工序顺序`
}
})
}
export function XuanRu(num, num2) {
return request({
url: '',
method: 'post',
data: {
type: '4',
name: `update 车间生产管理工艺_零件工序 set 排产人员=${num},排产时间= GETDATE() where 工序流水号=${num2}`
}
})
}
export function XuanChu(num) {
return request({
url: '',
method: 'post',
data: {
type: '4',
name: `update 车间生产管理工艺_零件工序 set 排产人员= null,排产时间= null where 工序流水号=${num}`
}
})
}
export function panDuan(num) {
return request({
url: '',
method: 'post',
data: {
type: '3',
name: ` select 状态,工艺计划流水号 from
(
select 工艺计划流水号,零件名称,投产数量,机床图号,组号,(零件图号+' '+规格) as 图号及规格
,计划开始时间,计划结束时间,排产人员,排产时间,
(case when SUM(CASE WHEN 排产人员 IS NULL THEN 1 ELSE 0 END) = 0 then 2 else
case when COUNT(*) > SUM(CASE WHEN 排产人员 IS NULL THEN 1 ELSE 0 END) then 1 else 0 end end) as 状态
from dbo.车间生产管理工艺_插件排产查询_视图
where 工艺编号 is not null and 工艺编号<>0 and 工艺计划流水号 is not null and 考核状态 =6
group by 工艺计划流水号,零件名称,投产数量,机床图号,组号,零件图号,规格,计划开始时间,计划结束时间,排产人员,排产时间
) as a
where 工艺计划流水号=${num}
order by 图号及规格
`
}
})
}

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

@@ -44,15 +44,14 @@ export function searchgroup(num, pageCurrent, pageSize) {
}
})
}
export function searchTable(check, entryNameValue, check1, machine, check2, groupNum, check3, partNumber, check4, partStateValue, check5, partTypeValue, pageSize, pageCurrent) {
export function searchTable(check, entryNameValue, check1, machine, check2, groupNum, check3, partNumber, check4, partStateValue, check5, partTypeValue) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新_MESWORK',
param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int',
pagination: pageCurrent + '&' + pageSize
param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int'
}
})
}

10
src/api/ManufacturingCenter/machiningHoursStatistics.js
View File

@@ -62,15 +62,14 @@ export function initProject() {
})
}
// 车间生产管理工艺_工时统计_机床查询_查询数据
export function searchtable4(num1, num2, pageCurrent, pageSize) {
export function searchtable4(num1, num2) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_工时统计_机床查询_查询数据',
param: '机床流水号_check=' + num1 + '&机床流水号=' + num2,
Pagination: pageCurrent + '&' + pageSize
param: '机床流水号_check=' + num1 + '&机床流水号=' + num2
}
})
}
@@ -87,15 +86,14 @@ export function searchtable44(num1, num2) {
})
}
// 车间生产管理工艺_工时统计_组号查询_查询数据
export function searchtable5(num1, pageCurrent, pageSize) {
export function searchtable5(num1) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_工时统计_组号查询_查询数据',
param: '机床流水号=' + num1,
Pagination: pageCurrent + '&' + pageSize
param: '机床流水号=' + num1
}
})
}

3
src/api/Outsourcing/OutsourcingQCSearch.js
View File

@@ -8,8 +8,7 @@ export function searchTable1(...params) {
data: {
type: '1',
name: '车间生产管理_外协到货单_查询数据',
param: `外协到货单号_check=${params[2]}&外协到货单号=${params[3]}&外协厂家_check=${params[4]}&外协厂家=${params[5]}`,
Pagination: params[0] + '&' + params[1]
param: `外协到货单号_check=${params[0]}&外协到货单号=${params[1]}&外协厂家_check=${params[2]}&外协厂家=${params[3]}`
}
})
}

37
src/api/PurchasingCenter/CreateInquirySheet.js
View File

@@ -353,7 +353,7 @@ export function searchMerge(num) {
}
})
}
export function getPerson(num) {
export function getPerson() {
return request({
url: '',
method: 'post',
@@ -387,3 +387,38 @@ export function tiaozheng2(num1, num2) {
}
})
}
// 查询时间@change修改
export function timeChange1(num1, num2) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '采购管理_创建询价单_外购件时间修改',
param: '外购件开始时间=' + num1 + '&外购件结束时间=' + num2
}
})
}
// 查询时间@change修改
export function timeChange2(num1, num2) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '采购管理_创建询价单_基本件时间修改',
param: '基本件开始时间=' + num1 + '&基本件结束时间=' + num2
}
})
}
// 查询时间初始化查询
export function timeSearch() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '采购管理_创建询价单_时间查询'
}
})
}

19
src/api/WorkshopProcurement/CreatingPurchasingMaterials.js
View File

@@ -26,14 +26,14 @@ export function addMateriel2(num1, num2) {
})
}
// 保存重量和备注
export function saveWeight(num1, num2, num3, num4) {
export function saveWeight(num1, num2, num3, num4, num5, num6, num7) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '备料管理_采购计划明细_保存重量和备注',
param: `采购计划明细流水号=${num1}&成品尺寸=${num2}&备注=${num3}&单价=${num4}`
name: '备料管理_采购计划明细_保存重量和备注_9745',
param: `采购计划流水号=${num1}&成品尺寸=${num2}&备注=${num3}&单位=${num4}&零件图号=${num5}&材料=${num6}&零件名称=${num7}`
}
})
}
@@ -52,27 +52,26 @@ export function initPartDrawing(check1, name) {
})
}
// 查询外购备料
export function searchPurchasedMaterials(pageCurrent, pageSize, check1, name) {
export function searchPurchasedMaterials(check1, name) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '备料管理_外购备料_查询数据',
param: `零件图号_check=${check1}&零件图号=${name}`,
Pagination: pageCurrent + '&' + pageSize
param: `零件图号_check=${check1}&零件图号=${name}`
}
})
}
// 查询采购单
export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name) {
export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name, check3, name2) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '备料管理_采购计划_查询数据',
param: `采购单号_check=${check1}&采购单号=${num}&供应商名称_check=${check2}&供应商名称=${name}`,
param: `采购单号_check=${check1}&采购单号=${num}&供应商名称_check=${check2}&供应商名称=${name}&供应商流水号_check=${check3}&供应商流水号=${name2}`,
Pagination: pageCurrent + '&' + pageSize
}
})
@@ -161,14 +160,14 @@ export function saveMateriel1(num1) {
})
}
// 删除采购计划明细
export function deleteMateriel(num, num1) {
export function deleteMateriel(num, num1, num2, num3) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '备料管理_外购备料_移出数据',
param: `采购计划明细流水号=${num}&工艺计划流水号=${num1}`
param: `采购计划流水号=${num}&零件图号=${num1}&材料=${num2}&零件名称=${num3}`
}
})
}

4
src/api/WorkshopProcurement/NewArrivalList.js
View File

@@ -37,14 +37,14 @@ export function searchMateriel(num, num1) {
})
}
// 查询到货单
export function searchArriveOrder(num, num1, num2, num3, num5, num6, num7, pageCurrent, pageSize) {
export function searchArriveOrder(num, num1, num8, num9, num2, num3, num5, num6, num7, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '备料管理_到货单查询_新',
param: `供应商名称_check=${num}&供应商名称=${num1}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}&是否关联_check=${num6}&是否关联=${num7}`,
param: `供应商名称_check=${num}&供应商名称=${num1}&供应商名称_check=${num8}&供应商名称=${num9}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}&是否关联_check=${num6}&是否关联=${num7}`,
Pagination: pageCurrent + '&' + pageSize
}
})

1
src/icons/svg/ActualWorkQuery.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/ManHourStatistics.svg Normal file
View File

@@ -0,0 +1 @@
<svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"><defs><style/></defs><path d="M900.608 936.96H131.584c-14.336 0-25.6-11.264-25.6-25.6V294.4c0-14.336 11.264-25.6 25.6-25.6h769.024c14.336 0 25.6 11.264 25.6 25.6v616.96c0 14.336-11.264 25.6-25.6 25.6zm-743.424-51.2h717.824V320H157.184v565.76z"/><path d="M984.576 316.416H48.64c-14.336 0-25.6-11.264-25.6-25.6V92.16c0-14.336 11.264-25.6 25.6-25.6h935.936c14.336 0 25.6 11.264 25.6 25.6v198.656c0 14.336-11.264 25.6-25.6 25.6zm-910.336-51.2h884.736V117.76H74.24v147.456zM723.456 486.4H309.76c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h413.696c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6zM516.608 839.168c-83.968 0-152.064-68.096-152.064-152.064S432.64 535.04 516.608 535.04s152.064 68.096 152.064 152.064-68.096 152.064-152.064 152.064zm0-252.928c-55.808 0-100.864 45.056-100.864 100.864S460.8 787.968 516.608 787.968c55.808 0 100.864-45.056 100.864-100.864S572.416 586.24 516.608 586.24z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1018 B

1
src/icons/svg/ProcessPlanningNew.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="1545972017991" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1585" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M905.216 401.408 905.216 401.408c-26.624-28.672-65.536-45.056-104.448-45.056-4.096 0-8.192 0-10.24 0L790.528 180.224c0-18.432-16.384-34.816-34.816-34.816L108.544 145.408c-18.432 0-34.816 16.384-34.816 34.816l0 647.168c0 18.432 16.384 34.816 34.816 34.816l647.168 0c18.432 0 34.816-16.384 34.816-34.816l0-176.128c4.096 0 6.144 0 10.24 0 40.96 0 77.824-16.384 104.448-43.008 26.624-26.624 43.008-63.488 43.008-104.448C948.224 462.848 931.84 428.032 905.216 401.408zM448.512 188.416l286.72 0 0 182.272c-14.336 8.192-26.624 16.384-38.912 28.672-20.48 20.48-34.816 45.056-40.96 75.776L448.512 475.136 448.512 188.416zM415.744 794.624l-286.72 0 0-286.72 286.72 0L415.744 794.624zM415.744 475.136l-286.72 0 0-286.72 286.72 0L415.744 475.136zM735.232 794.624l-286.72 0 0-286.72 204.8 0c2.048 38.912 18.432 73.728 43.008 100.352 10.24 10.24 24.576 20.48 38.912 26.624L735.232 794.624zM800.768 608.256c-57.344 0-104.448-47.104-104.448-104.448 0-57.344 47.104-104.448 104.448-104.448s104.448 47.104 104.448 104.448C905.216 561.152 858.112 608.256 800.768 608.256z" p-id="1586"></path><path d="M849.92 460.8 849.92 460.8c4.096-4.096 12.288-4.096 18.432 0 4.096 4.096 4.096 12.288 0 18.432l-79.872 79.872c-4.096 6.144-12.288 6.144-18.432 0l0 0-36.864-36.864c-4.096-4.096-4.096-12.288 0-18.432 6.144-4.096 12.288-4.096 18.432 0L778.24 532.48 849.92 460.8 849.92 460.8z" p-id="1587"></path><path d="M301.056 593.92 301.056 593.92c6.144-6.144 16.384-6.144 22.528 0 6.144 6.144 6.144 16.384 0 22.528L286.72 655.36l38.912 38.912c6.144 6.144 6.144 16.384 0 22.528-6.144 6.144-16.384 6.144-22.528 0l-38.912-38.912-38.912 38.912c-6.144 6.144-16.384 6.144-22.528 0-6.144-6.144-6.144-16.384 0-22.528l38.912-38.912-38.912-38.912c-6.144-6.144-6.144-16.384 0-22.528 6.144-6.144 16.384-6.144 22.528 0l38.912 38.912L301.056 593.92 301.056 593.92z" p-id="1588"></path><path d="M245.76 253.952 245.76 253.952c0-8.192 8.192-16.384 16.384-16.384 8.192 0 16.384 8.192 16.384 16.384l0 55.296 55.296 0c8.192 0 16.384 6.144 16.384 16.384 0 8.192-8.192 16.384-16.384 16.384l-55.296 0 0 55.296c0 10.24-8.192 16.384-16.384 16.384-10.24 0-16.384-8.192-16.384-16.384l0-55.296L190.464 342.016c-10.24 0-16.384-8.192-16.384-16.384 0-10.24 8.192-16.384 16.384-16.384L245.76 309.248 245.76 253.952 245.76 253.952z" p-id="1589"></path><path d="M665.6 671.744 665.6 671.744c8.192 0 16.384 8.192 16.384 16.384 0 8.192-8.192 16.384-16.384 16.384-120.832 0-22.528 0-143.36 0-8.192 0-16.384-8.192-16.384-16.384 0-8.192 6.144-16.384 16.384-16.384C641.024 671.744 544.768 671.744 665.6 671.744L665.6 671.744z" p-id="1590"></path><path d="M665.6 606.208 665.6 606.208c8.192 0 16.384 8.192 16.384 16.384 0 8.192-8.192 16.384-16.384 16.384-120.832 0-22.528 0-143.36 0-8.192 0-16.384-8.192-16.384-16.384 0-10.24 6.144-16.384 16.384-16.384C641.024 606.208 544.768 606.208 665.6 606.208L665.6 606.208z" p-id="1591"></path><path d="M665.6 309.248 665.6 309.248c8.192 0 16.384 6.144 16.384 16.384 0 8.192-8.192 16.384-16.384 16.384-120.832 0-22.528 0-143.36 0-8.192 0-16.384-8.192-16.384-16.384 0-10.24 6.144-16.384 16.384-16.384C641.024 309.248 544.768 309.248 665.6 309.248L665.6 309.248z" p-id="1592"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

7
src/icons/svg/ProcessingStatusNew.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="M990,466.4l-11.9-11.9l-33.3,33.3L512.2,55.2l33.3-33.3L533.6,10l-33.3,33.3l-31.5-31.5l-11.9,11.9l31.5,31.5L55.2,488.4l-31.5-31.5l-11.9,11.9l31.5,31.5L10,533.6l11.9,11.9l33.3-33.3l432.6,432.6l-33.3,33.3l11.9,11.9l33.3-33.3l32.1,32.1l11.9-11.9l-32.1-32.1l433.2-433.2l32.1,32.1l11.9-11.9l-32.1-32.1L990,466.4z M499.7,932.9L67.1,500.3L500.3,67.1l432.6,432.6L499.7,932.9z"/><path d="M616.7,526.7c-9.1,0-18.8,3-28.4,7.9L466.6,412.8c4.9-9.6,7.8-19.2,7.8-28c0-48.4-46-95.3-94.4-95.3c-0.3,0-0.6,0-0.9,0c-0.2,0-5.7,5.6-8.7,8.6c39,39.1,35.8,32.7,35.8,56.7c0,19.4-31.1,50.1-50.1,50.1c-4.2,0-7.4,0.1-10.1,0.1c-13.2,0-13.4-2.8-46.5-35.9c-3.1,3.1-8.6,8.5-8.6,8.7c0.6,48.7,46.6,95.3,95.3,95.3c8.8,0,18.3-2.8,27.6-7.5l122.2,122.2c-4.6,9.3-7.4,18.6-7.4,27.2c0,48.4,46,95.3,94.4,95.3c0.3,0,0.6,0,0.9,0c0.2,0,5.7-5.6,8.7-8.6c-39-39-35.8-32.7-35.8-56.6c0-19.4,31.1-50.1,50.1-50.1c4.2,0,7.4-0.1,10.1-0.1c13.2,0,13.4,2.8,46.6,35.9c3.1-3.1,8.6-8.5,8.6-8.7C711.4,573.3,665.4,526.7,616.7,526.7"/><path d="M489,67.1h22v865.8h-22V67.1L489,67.1z"/></g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

1
src/icons/svg/ShopScheduling.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="1545978842550" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1498" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 1024C229.248 1024 0 794.752 0 512 0 229.205333 229.248 0 512 0s512 229.205333 512 512c0 282.752-229.248 512-512 512z m0-938.666667C276.352 85.333333 85.333333 276.352 85.333333 512s191.018667 426.666667 426.666667 426.666667 426.666667-191.018667 426.666667-426.666667S747.648 85.333333 512 85.333333z m213.333333 640h-298.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333333h42.666666a42.666667 42.666667 0 0 1 85.333334 0h298.666666a42.666667 42.666667 0 0 1 0 85.333333z m0-170.666666h-42.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333334h298.666666a42.666667 42.666667 0 0 1 85.333334 0h42.666666a42.666667 42.666667 0 0 1 0 85.333334z m0-170.666667h-298.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333333h42.666666a42.666667 42.666667 0 0 1 85.333334 0h298.666666a42.666667 42.666667 0 0 1 0 85.333333z" p-id="1499"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

11
src/styles/element-ui.scss
View File

@@ -48,11 +48,12 @@
.hover-row td{
background: RGB(236 245 255)!important;
}
.el-table td, .is-leaf{
background-color: rgb(255, 255, 255);
color: black;
font-weight:400
}
//表格行颜色9745
//.el-table td, .is-leaf{
// background-color: rgb(255, 255, 255);
// color: black;
// font-weight:400
//}
.el-table--striped .el-table__body tr.el-table__row--striped td{
background-color: #d8dde6;/*修改斑马线表格背景*/
}

17
src/styles/index.scss
View File

@@ -109,7 +109,7 @@ el-form-item__content{
//background-color: #2e296a!important;
}
.el-card__body{
padding: 10px !important;
padding: 0 10px 0 10px !important;
margin: 0px !important;
}
.app-container{
@@ -275,3 +275,18 @@ h3 {
color: white;
}
}
.el-tabs--border-card>.el-tabs__content {
padding: 15px 15px 0px 15px!important;
}
//.el-table__header-wrapper {
// height: 25px!important;
//}
/* 设置表主体的高度 */
.el-table__body td,.el-table__body th{
padding:1px!important;
height: 25px!important;
}
/* 设置表头的高度 */
.el-table__header td,.el-table__header th{
padding:0px!important;
}

1
src/utils/request.js
View File

@@ -18,7 +18,6 @@ export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx`
export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx`
export const url = `http://192.168.0.109:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel
// 技术中心程序发布时要更改下面所有的IP到0段
export const ServerIP = `http://192.168.1.231:8411/webpage/file/`
export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231

11
src/utils/tool.js
View File

@@ -41,7 +41,7 @@ function zeroFill(i) {
return i
}
}
// 获取当前时间
// 获取当前时间(yyyy-mm-dd hh:mm:ss)
export function getNowTime() {
const date = new Date()
const month = zeroFill(date.getMonth() + 1)
@@ -52,7 +52,14 @@ export function getNowTime() {
const time = date.getFullYear() + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second
return time
}
// 获取当前时间(yyyy-mm-dd)
export function getNowShotTime() {
const date = new Date()
const month = zeroFill(date.getMonth() + 1)
const day = zeroFill(date.getDate())
const time = date.getFullYear() + '-' + month + '-' + day
return time
}
// 判断类型
export function type(target) {
const ret = typeof (target)

77
src/views/Assembly/AssemblyQualityInspection/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<el-card>
<el-row>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin-left: 10px" clearable @change="machineChange()">
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin:0px 10px" clearable @change="machineChange()">
<el-option
v-for="item in machineNumber"
:key="item.value"
@@ -12,21 +12,21 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable>
<el-select v-model="groupNumberValue" filterable placeholder="组号" style="margin:0px 10px" size="small" clearable>
<el-option
v-for="item in groupNumber"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select v-model="TestValue" filterable placeholder="组号" size="small" clearable>
<el-select v-model="TestValue" filterable placeholder="组号" style="margin:0px 10px" size="small" clearable>
<el-option
v-for="item in Test"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" size="small" clearable>
<el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" style="margin:0px 10px" size="small" clearable>
<el-option
v-for="item in qualityInspection"
:key="item.value"
@@ -40,35 +40,35 @@
</el-row>
</el-card>
<el-card>
<el-table :data="tableData1" border size="mini" highlight-current-row stripe style="width: 100%" height="600px">
<el-table-column align="center" sortable prop="是否合格" label="检验情况" width="80px">
<el-table :data="tableData1" border size="mini" highlight-current-row stripe style="width: 100%" height="830px">
<el-table-column align="center" prop="是否合格" label="检验情况" width="80px">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否合格)===0||scope.row.是否合格===''" type="primary" size="small" @click="approvalPass(scope.row)">未检验</el-tag>
<el-tag v-if="parseInt(scope.row.是否合格)===1" type="success" size="small">合格</el-tag>
<el-tag v-if="parseInt(scope.row.是否合格)===2" type="error" size="small">不合格</el-tag>
</template>
</el-table-column>
<el-table-column label="机床图号" sortable prop="机床图号" align="center" width="120px">
<el-table-column label="机床图号" prop="机床图号" align="center" width="120px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="机床名称" sortable prop="机床名称" align="center" width="260px">
<el-table-column label="机床名称" prop="机床名称" align="center" width="260px">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column label="组号" sortable prop="组号" align="center" width="100px">
<el-table-column label="组号" prop="组号" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="部件名称" sortable prop="组件名称" align="center" width="100px">
<el-table-column label="部件名称" prop="组件名称" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.组件名称 }}
</template>
</el-table-column>
<el-table-column label="检测项" sortable prop="检测项" align="center" width="100px">
<el-table-column label="检测项" prop="检测项" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.检测项 }}
</template>
@@ -84,16 +84,16 @@
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40, 100]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
<!-- <div class="block">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent"-->
<!-- :page-sizes="[10, 20, 30, 40, 100]"-->
<!-- :page-size="pageSize"-->
<!-- :total="total"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange"-->
<!-- @current-change="handleCurrentChange"/>-->
<!-- </div>-->
</el-card>
</div>
</template>
@@ -119,10 +119,10 @@ export default {
label: '不合格'
}
],
tableData1: [],
total: 0, // 总条数
pageSize: 10, // 每页显示条数
pageCurrent: 1 // 后台获取页
tableData1: []
// total: 0, // 总条数
// pageSize: 10, // 每页显示条数
// pageCurrent: 1 // 后台获取页
}
},
created() {
@@ -198,23 +198,20 @@ export default {
if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
if (this.TestValue !== '' && this.TestValue !== null) { this.check3 = 1 } else { this.check3 = 0 }
if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check4 = 1 } else { this.check4 = 0 }
selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.TestValue, this.check4, this.qualityInspectionValue, this.pageCurrent, this.pageSize).then(response => {
console.log(response.data.rows, 111)
this.tableData1 = response.data.rows
this.total = response.data.total
console.log(this.tableData1)
selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.TestValue, this.check4, this.qualityInspectionValue).then(response => {
this.tableData1 = response.data
})
},
// 分页
handleSizeChange(val) {
this.pageCurrent = 1
this.pageSize = val
this.selecttable()
},
handleCurrentChange(val) {
this.pageCurrent = val
this.selecttable()
}
// 分页
// handleSizeChange(val) {
// this.pageCurrent = 1
// this.pageSize = val
// this.selecttable()
// },
// handleCurrentChange(val) {
// this.pageCurrent = val
// this.selecttable()
// }
}
}

140
src/views/Assembly/QualityInspectionInformationInquiry/index.vue
View File

@@ -61,7 +61,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="pageSize=10; pageCurrent= 1;selecttable()">查询</el-button>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="pageSize=20; pageCurrent= 1;selecttable()">查询</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="导出查询数据" placement="top">
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
</el-tooltip>
@@ -254,29 +254,29 @@
</div>
</el-card>
<el-card>
<h4 style="margin-left: 45%;">正在加工零件列表</h4>
<span style="margin-left: 45%;font-size: 20px;">正在加工零件列表</span>
<el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
<el-table-column label="机床图号" sortable prop="机床图号" align="center">
<el-table-column label="机床图号" prop="机床图号" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="机床名称" sortable prop="机床名称" align="center" min-width="200px">
<el-table-column label="机床名称" prop="机床名称" align="center" min-width="200px">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column label="组号" sortable prop="组号" align="center">
<el-table-column label="组号" prop="组号" align="center">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" sortable prop="零件图号" align="center" min-width="110px">
<el-table-column label="零件图号" prop="零件图号" align="center" min-width="110px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" sortable prop="零件名称" align="center">
<el-table-column label="零件名称" prop="零件名称" align="center">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -286,17 +286,17 @@
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="工序名称" sortable prop="工艺名称" align="center">
<el-table-column label="工序名称" prop="工艺名称" align="center">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column label="工位" sortable prop="终端编号" align="center" width="100px">
<el-table-column label="工位" prop="终端编号" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.终端编号 }}
</template>
</el-table-column>
<el-table-column label="操作工" sortable prop="姓名" align="center">
<el-table-column label="操作工" prop="姓名" align="center">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
@@ -312,41 +312,41 @@
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent1"
:page-sizes="[10, 20, 30, 40, 100]"
:page-size="pageSize1"
:total="total1"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
</div>
<!-- <div class="block">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent1"-->
<!-- :page-sizes="[10, 20, 30, 40, 100]"-->
<!-- :page-size="pageSize1"-->
<!-- :total="total1"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange1"-->
<!-- @current-change="handleCurrentChange1"/>-->
<!-- </div>-->
</el-card>
<el-card>
<h4 style="margin-left: 45%;">待加工零件列表</h4>
<span style="margin-left: 45%;font-size: 20px">待加工零件列表</span>
<el-table :data="tableData20" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
<el-table-column label="机床图号" sortable prop="机床图号" align="center" width="110px">
<el-table-column label="机床图号" prop="机床图号" align="center" width="110px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="机床名称" sortable prop="机床名称" align="center" min-width="200px">
<el-table-column label="机床名称" prop="机床名称" align="center" min-width="200px">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column label="组号" sortable prop="组号" align="center" width="70px">
<el-table-column label="组号" prop="组号" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" sortable prop="零件图号" align="center" width="140px">
<el-table-column label="零件图号" prop="零件图号" align="center" width="140px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" sortable prop="零件名称" align="center" min-width="120px">
<el-table-column label="零件名称" prop="零件名称" align="center" min-width="120px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -356,17 +356,17 @@
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="工序名称" sortable prop="工艺名称" align="center">
<el-table-column label="工序名称" prop="工艺名称" align="center">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column label="工位" sortable prop="mes终端编号" align="center" width="80px">
<el-table-column label="工位" prop="mes终端编号" align="center" width="80px">
<template slot-scope="scope">
{{ scope.row.mes终端编号 }}
</template>
</el-table-column>
<el-table-column label="操作工" sortable prop="姓名" align="center">
<el-table-column label="操作工" prop="姓名" align="center">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
@@ -382,16 +382,16 @@
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent2"
:page-sizes="[10, 20, 30, 40, 100]"
:page-size="pageSize2"
:total="total2"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"/>
</div>
<!-- <div class="block">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent2"-->
<!-- :page-sizes="[10, 20, 30, 40, 100]"-->
<!-- :page-size="pageSize2"-->
<!-- :total="total2"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange2"-->
<!-- @current-change="handleCurrentChange2"/>-->
<!-- </div>-->
</el-card>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="工序完成情况" center style="min-height: 300px">
<el-row>
@@ -402,7 +402,7 @@
</el-row>
<el-table
:data="tableData5"
style="width: 100%;max-height: 400px;margin-top: 20px"
style="width: 100%;margin-top: 20px"
size="mini"
height="300"
stripe
@@ -494,14 +494,14 @@ export default {
dialogFormVisible4: false,
loading: false,
total: 0, // 总条数
pageSize: 10, // 每页显示条数
pageCurrent: 1, // 后台获取页
total1: 0, // 总条数
pageSize1: 10, // 每页显示条数
pageCurrent1: 1, // 后台获取页
total2: 0, // 总条数
pageSize2: 10, // 每页显示条数
pageCurrent2: 1 // 后台获取页
pageSize: 20, // 每页显示条数
pageCurrent: 1 // 后台获取页
// total1: 0, // 总条数
// pageSize1: 10, // 每页显示条数
// pageCurrent1: 1, // 后台获取页
// total2: 0, // 总条数
// pageSize2: 10, // 每页显示条数
// pageCurrent2: 1 // 后台获取页
}
},
created() {
@@ -595,15 +595,15 @@ export default {
})
},
fetchData() {
searchData(this.pageSize1, this.pageCurrent1).then(response => {
this.tableData10 = response.data.rows
searchData().then(response => {
this.tableData10 = response.data
this.total1 = response.data.total
})
},
fetchData1() {
searchData1(this.pageSize2, this.pageCurrent2).then(response => {
searchData1().then(response => {
console.log(response)
this.tableData20 = response.data.rows
this.tableData20 = response.data
this.total2 = response.data.total
})
},
@@ -672,25 +672,25 @@ export default {
handleCurrentChange(val) {
this.pageCurrent = val
this.selecttable()
},
handleSizeChange1(val) {
this.pageCurrent1 = 1
this.pageSize1 = val
this.fetchData()
},
handleCurrentChange1(val) {
this.pageCurrent1 = val
this.fetchData()
},
handleSizeChange2(val) {
this.pageCurrent2 = 1
this.pageSize2 = val
this.fetchData1()
},
handleCurrentChange2(val) {
this.pageCurrent2 = val
this.fetchData1()
}
// handleSizeChange1(val) {
// this.pageCurrent1 = 1
// this.pageSize1 = val
// this.fetchData()
// },
// handleCurrentChange1(val) {
// this.pageCurrent1 = val
// this.fetchData()
// },
// handleSizeChange2(val) {
// this.pageCurrent2 = 1
// this.pageSize2 = val
// this.fetchData1()
// },
// handleCurrentChange2(val) {
// this.pageCurrent2 = val
// this.fetchData1()
// }
}
}

10
src/views/Assembly/SparePartsOutStockRecord/index.vue
View File

@@ -46,27 +46,27 @@
</el-card>
<el-card>
<el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 3px" height="550px">
<el-table-column label="项目名称" align="center">
<el-table-column label="项目名称" prop="项目名称" align="center">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床图号" align="center">
<el-table-column label="机床图号" prop="机床图号" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center">
<el-table-column label="零件图号" prop="零件图号" align="center">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center">
<el-table-column label="零件名称" prop="零件名称" align="center">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="出库时间" align="center">
<el-table-column label="出库时间" prop="出库时间" align="center">
<template slot-scope="scope">
{{ scope.row.出库时间 }}
</template>

458
src/views/BasicData/PartsNumberMaintenance/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<el-card>
<span>项目名称</span>
<el-select v-model="projectValue" placeholder="请选择项目名称" filterable size="small">
<el-select v-model="projectValue" placeholder="请选择项目名称" style="margin: 0px 20px 0px 0px" filterable size="small">
<el-option
v-for="item in project"
:key="item.value"
@@ -10,7 +10,7 @@
:value="item.value"/>
</el-select>
<span>机床图号</span>
<el-select v-model="machineValue" placeholder="请选择机床图号" filterable size="small">
<el-select v-model="machineValue" placeholder="请选择机床图号" style="margin: 0px 20px 0px 0px" filterable size="small">
<el-option
v-for="item in machine"
:key="item.value"
@@ -19,7 +19,7 @@
</el-select>
<span>组号</span>
<el-select v-model="groupValue" placeholder="请选择组号" filterable size="small">
<el-select v-model="groupValue" placeholder="请选择组号" style="margin: 0px 20px 0px 0px" filterable size="small">
<el-option
v-for="item in group"
:key="item.value"
@@ -36,7 +36,7 @@
<div>
<span style="font-size: 20px">基本件三表数量</span>
<el-tooltip :open-delay="1000" effect="dark" content="删除基本件三表数量" placement="top">
<el-button style="float: right;margin-bottom: 20px" type="danger" size="small" @click="alldelete()">全部删除</el-button>
<el-button style="float: right;margin-bottom: 3px" type="danger" size="small" @click="alldelete()">全部删除</el-button>
</el-tooltip>
</div>
<el-table
@@ -144,22 +144,22 @@
</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="handleSizeChanges"
@current-change="handleCurrentChanges"/>
</div>
<!-- <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="handleSizeChanges"-->
<!-- @current-change="handleCurrentChanges"/>-->
<!-- </div>-->
</el-card>
<el-card>
<div>
<span style="font-size: 20px">外购件和标准件三表数量</span>
<el-tooltip :open-delay="1000" effect="dark" content="删除外购件和标准件数量" placement="top">
<el-button style="float: right;margin-bottom: 20px" type="danger" size="small" @click="alldeleteWB()">全部删除</el-button>
<el-button style="float: right;margin-bottom: 3px" type="danger" size="small" @click="alldeleteWB()">全部删除</el-button>
</el-tooltip>
</div>
<el-table
@@ -240,16 +240,16 @@
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px">
<el-pagination
:current-page="pageCurrentWB"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSizeWB"
:total="totalWB"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChangeWB"
@current-change="handleCurrentChangeWB"/>
</div>
<!-- <div class="block" style="margin-top: 10px">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrentWB"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSizeWB"-->
<!-- :total="totalWB"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChangeWB"-->
<!-- @current-change="handleCurrentChangeWB"/>-->
<!-- </div>-->
</el-card>
<el-card>
<div>
@@ -303,17 +303,17 @@
</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="pageSize1"
:total="total1"
style="width:50%;display:inline-block;"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
</div>
<!-- <div class="block" style="margin-top: 10px;">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent1"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize1"-->
<!-- :total="total1"-->
<!-- style="width:50%;display:inline-block;"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange1"-->
<!-- @current-change="handleCurrentChange1"/>-->
<!-- </div>-->
</div>
</el-card>
<el-card>
@@ -362,17 +362,17 @@
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent2"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize2"
:total="total2"
style="float:left"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"/>
</div>
<!-- <div class="block" style="margin-top: 10px;">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent2"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize2"-->
<!-- :total="total2"-->
<!-- style="float:left"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange2"-->
<!-- @current-change="handleCurrentChange2"/>-->
<!-- </div>-->
</el-card>
<el-card>
<div style="font-size: 20px">未分配采购零件数量</div>
@@ -433,17 +433,17 @@
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent3"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize3"
:total="total3"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange3"
@current-change="handleCurrentChange3"/>
</div>
<!-- <div class="block">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent3"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize3"-->
<!-- :total="total3"-->
<!-- style="display:inline-block;width:50%"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange3"-->
<!-- @current-change="handleCurrentChange3"/>-->
<!-- </div>-->
</el-tab-pane>
<el-tab-pane label="基本件">
<el-table :data="tableData4" size="mini" style="max-height: 320px" height="320px" border>
@@ -496,17 +496,17 @@
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent4"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize4"
:total="total4"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange4"
@current-change="handleCurrentChange4"/>
</div>
<!-- <div class="block">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent4"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize4"-->
<!-- :total="total4"-->
<!-- style="display:inline-block;width:50%"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange4"-->
<!-- @current-change="handleCurrentChange4"/>-->
<!-- </div>-->
</el-tab-pane>
</el-tabs>
</el-card>
@@ -515,7 +515,7 @@
<span style="font-size: 20px">临时表</span>
<el-button style="float: right" type="danger" size="small" @click="alldelete5()">全部删除</el-button>
</div>
<el-tabs v-model="activeName" style="margin-top: 20px" type="border-card" @tab-click="searchTable5();searchTable6()">
<el-tabs v-model="activeName" style="margin-top: 10px" type="border-card" @tab-click="searchTable5();searchTable6()">
<el-tab-pane label="标准件和外购件" name="1">
<el-table :data="tableData5" size="mini" style="max-height: 320px" height="320px" border>
<el-table-column align="center" label="项目" min-width="100px">
@@ -562,17 +562,17 @@
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent5"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize5"
:total="total5"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange5"
@current-change="handleCurrentChange5"/>
</div>
<!-- <div class="block">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent5"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize5"-->
<!-- :total="total5"-->
<!-- style="display:inline-block;width:50%"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange5"-->
<!-- @current-change="handleCurrentChange5"/>-->
<!-- </div>-->
</el-tab-pane>
<el-tab-pane label="基本件" name="2">
<el-table :data="tableData6" size="mini" style="max-height: 320px" height="320px" border>
@@ -615,17 +615,17 @@
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent6"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize6"
:total="total6"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange6"
@current-change="handleCurrentChange6"/>
</div>
<!-- <div class="block">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent6"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize6"-->
<!-- :total="total6"-->
<!-- style="display:inline-block;width:50%"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange6"-->
<!-- @current-change="handleCurrentChange6"/>-->
<!-- </div>-->
</el-tab-pane>
</el-tabs>
</el-card>
@@ -677,7 +677,7 @@ export default {
dialogFormVisible3: false,
loading: false,
loadingWB: false,
total: 0,
// total: 0,
tableData: [],
tableData1: [],
tableData2: [],
@@ -687,32 +687,32 @@ export default {
tableData6: [],
tableData7: [],
tableDataWB: [],
pageCurrent: 1,
pageSize: 10,
pageCurrent1: 1,
pageSize1: 10,
total1: 0,
pageCurrent2: 1,
pageSize2: 10,
total2: 0,
pageCurrent3: 1,
pageSize3: 10,
total3: 0,
pageCurrent4: 1,
pageSize4: 10,
total4: 0,
pageCurrent5: 1,
pageSize5: 10,
total5: 0,
pageCurrent6: 1,
pageSize6: 10,
total6: 0,
// pageCurrent: 1,
// pageSize: 10,
// pageCurrent1: 1,
// pageSize1: 10,
// total1: 0,
// pageCurrent2: 1,
// pageSize2: 10,
// total2: 0,
// pageCurrent3: 1,
// pageSize3: 10,
// total3: 0,
// pageCurrent4: 1,
// pageSize4: 10,
// total4: 0,
// pageCurrent5: 1,
// pageSize5: 10,
// total5: 0,
// pageCurrent6: 1,
// pageSize6: 10,
// total6: 0,
pageCurrent7: 1,
pageSize7: 10,
total7: 0,
pageCurrentWB: 1,
pageSizeWB: 10,
totalWB: 0
total7: 0
// pageCurrentWB: 1,
// pageSizeWB: 10,
// totalWB: 0
}
},
computed: {
@@ -871,12 +871,12 @@ export default {
const machine_check = this.machineValue ? 1 : 0
const group_check = this.groupValue ? 1 : 0
this.loading = true
basicPartsData(project_check, this.projectValue, machine_check, this.machineValue, group_check, this.groupValue, this.pageSize, this.pageCurrent).then(response => {
basicPartsData(project_check, this.projectValue, machine_check, this.machineValue, group_check, this.groupValue).then(response => {
this.loading = false
const res = response.data
this.total = res.total
// console.log(this.tableData)
this.tableData = res.rows.map(item => {
this.tableData = res.map(item => {
if (item.整改类型 === '1') {
item.整改类型 = '新增'
} else if (item.整改类型 === '2') {
@@ -888,11 +888,11 @@ export default {
})
})
this.loadingWB = true
purchasePartsData(this.groupValue, this.pageCurrentWB, this.pageSizeWB).then(response => {
purchasePartsData(this.groupValue).then(response => {
this.loadingWB = false
const data = response.data
this.totalWB = data.total
this.tableDataWB = data.rows.map(item => {
this.tableDataWB = data.map(item => {
console.log(item)
item.零件类型 = item.零件类型 === '2' ? '外购件' : '标准件'
return item
@@ -901,22 +901,22 @@ export default {
},
getTable() {
this.tableData1 = []
getTable(this.groupValue, this.pageCurrent1, this.pageSize1).then(response => {
getTable(this.groupValue).then(response => {
this.total1 = parseInt(response.data.total)
this.tableData1 = []
for (let i = 0; i < response.data.rows.length; i++) {
for (let i = 0; i < response.data.length; i++) {
this.tableData1.push({
零件图号: response.data.rows[i].零件图号,
零件名称: response.data.rows[i].零件名称,
投产总数量: response.data.rows[i].投产总数量,
最大投产批次: response.data.rows[i].最大投产批次,
已投产数量: response.data.rows[i].已投产数量,
未投产数量: response.data.rows[i].未投产数量,
零件类型名称: response.data.rows[i].零件类型名称,
组件零件基本件流水号: response.data.rows[i].组件零件基本件流水号,
投产类型流水号: response.data.rows[i].投产类型流水号,
数据类型: response.data.rows[i].数据类型,
材料流水号: response.data.rows[i].材料流水号
零件图号: response.data[i].零件图号,
零件名称: response.data[i].零件名称,
投产总数量: response.data[i].投产总数量,
最大投产批次: response.data[i].最大投产批次,
已投产数量: response.data[i].已投产数量,
未投产数量: response.data[i].未投产数量,
零件类型名称: response.data[i].零件类型名称,
组件零件基本件流水号: response.data[i].组件零件基本件流水号,
投产类型流水号: response.data[i].投产类型流水号,
数据类型: response.data[i].数据类型,
材料流水号: response.data[i].材料流水号
})
}
})
@@ -939,21 +939,21 @@ export default {
} else {
this.checked_partNumber = false
}
getTable1(this.checked_entryName, '', this.checked_toolNum, this.machineValue, this.checked_Num, this.groupValue, this.checked_partNumber, this.partNumber, this.pageCurrent2, this.pageSize2).then(response => {
for (let i = 0; i < response.data.rows.length; i++) {
response.data.rows[i].机加工开始时间_长日期 = response.data.rows[i].机加工开始时间_长日期.substring(0, response.data.rows[i].机加工开始时间_长日期.indexOf(' '))
response.data.rows[i].机加工结束时间_长日期 = response.data.rows[i].机加工结束时间_长日期.substring(0, response.data.rows[i].机加工结束时间_长日期.indexOf(' '))
getTable1(this.checked_entryName, '', this.checked_toolNum, this.machineValue, this.checked_Num, this.groupValue, this.checked_partNumber, this.partNumber).then(response => {
for (let i = 0; i < response.data.length; i++) {
response.data[i].机加工开始时间_长日期 = response.data[i].机加工开始时间_长日期.substring(0, response.data[i].机加工开始时间_长日期.indexOf(' '))
response.data[i].机加工结束时间_长日期 = response.data[i].机加工结束时间_长日期.substring(0, response.data[i].机加工结束时间_长日期.indexOf(' '))
}
this.total2 = parseInt(response.data.total)
for (let i = 0; i < response.data.rows.length; i++) {
for (let i = 0; i < response.data.length; i++) {
this.tableData2.push({
零件图号: response.data.rows[i].零件图号,
零件名称: response.data.rows[i].零件名称,
投产数量: response.data.rows[i].投产数量,
机加工开始时间: response.data.rows[i].机加工开始时间_长日期,
机加工结束时间: response.data.rows[i].机加工结束时间_长日期,
工序数量: response.data.rows[i].工序数量,
工艺计划流水号: response.data.rows[i].工艺计划流水号
零件图号: response.data[i].零件图号,
零件名称: response.data[i].零件名称,
投产数量: response.data[i].投产数量,
机加工开始时间: response.data[i].机加工开始时间_长日期,
机加工结束时间: response.data[i].机加工结束时间_长日期,
工序数量: response.data[i].工序数量,
工艺计划流水号: response.data[i].工艺计划流水号
})
}
})
@@ -963,8 +963,8 @@ export default {
this.projectValue ? check2 = 1 : check2 = 0
this.machineValue ? check0 = 1 : check0 = 0
this.groupValue ? check1 = 1 : check1 = 0
searchTable1(this.pageCurrent3, this.pageSize3, check2, this.projectValue, check0, this.machineValue, check1, this.groupValue).then(response => {
this.tableData3 = response.data.rows
searchTable1(check2, this.projectValue, check0, this.machineValue, check1, this.groupValue).then(response => {
this.tableData3 = response.data
this.total3 = response.data.total
})
},
@@ -973,8 +973,8 @@ export default {
this.projectValue ? check2 = 1 : check2 = 0
this.machineValue ? check0 = 1 : check0 = 0
this.groupValue ? check1 = 1 : check1 = 0
searchTable2(this.pageCurrent4, this.pageSize4, check2, this.projectValue, check0, this.machineValue, check1, this.groupValue).then(response => {
this.tableData4 = response.data.rows
searchTable2(check2, this.projectValue, check0, this.machineValue, check1, this.groupValue).then(response => {
this.tableData4 = response.data
this.total4 = response.data.total
})
},
@@ -983,9 +983,9 @@ export default {
this.projectName ? check2 = 1 : check2 = 0
this.machineName ? check0 = 1 : check0 = 0
this.groupName ? check1 = 1 : check1 = 0
searchTable5(this.pageCurrent6, this.pageSize6, check2, this.projectName, check0, this.machineName, check1, this.groupName).then(response => {
searchTable5(check2, this.projectName, check0, this.machineName, check1, this.groupName).then(response => {
console.log(response, 5, this.activeName)
this.tableData5 = response.data.rows
this.tableData5 = response.data
this.total5 = response.data.total
})
},
@@ -995,9 +995,9 @@ export default {
this.machineName ? check0 = 1 : check0 = 0
this.groupName ? check1 = 1 : check1 = 0
// console.log(this.projectName, this.machineName, this.groupName, 44)
searchTable6(this.pageCurrent6, this.pageSize6, check2, this.projectName, check0, this.machineName, check1, this.groupName).then(response => {
searchTable6(check2, this.projectName, check0, this.machineName, check1, this.groupName).then(response => {
console.log(response, 6)
this.tableData6 = response.data.rows
this.tableData6 = response.data
this.total6 = response.data.total
})
},
@@ -1126,78 +1126,78 @@ export default {
})
}
},
handleSizeChanges(val) {
this.pageCurrent = 1
this.pageSize = val
this.getTableData()
},
handleCurrentChanges(val) {
this.pageCurrent = val
this.getTableData()
},
handleSizeChangeWB(val) {
this.pageCurrentWB = 1
this.pageSizeWB = val
this.getTableData()
},
handleCurrentChangeWB(val) {
this.pageCurrentWB = val
this.getTableData()
},
handleSizeChange1(val) {
this.pageCurrent1 = 1
this.pageSize1 = val
this.getTable()
},
handleCurrentChange1(val) {
this.pageCurrent1 = val
this.getTable()
},
handleSizeChange2(val) {
this.pageSize2 = val
this.pageCurrent2 = 1
this.getTable1()
},
handleCurrentChange2(val) {
this.pageCurrent2 = val
this.getTable1()
},
handleSizeChange3(val) {
this.pageSize3 = val
this.pageCurrent3 = 1
this.searchTable1()
},
handleCurrentChange3(val) {
this.pageCurrent3 = val
this.searchTable1()
},
handleSizeChange4(val) {
this.pageSize4 = val
this.pageCurrent4 = 1
this.searchTable2()
},
handleCurrentChange4(val) {
this.pageCurrent4 = val
this.searchTable2()
},
handleSizeChange5(val) {
this.pageSize5 = val
this.pageCurrent5 = 1
this.searchTable5()
},
handleCurrentChange5(val) {
this.pageCurrent5 = val
this.searchTable5()
},
handleSizeChange6(val) {
this.pageSize6 = val
this.pageCurrent6 = 1
this.searchTable6()
},
handleCurrentChange6(val) {
this.pageCurrent6 = val
this.searchTable6()
},
// handleSizeChanges(val) {
// this.pageCurrent = 1
// this.pageSize = val
// this.getTableData()
// },
// handleCurrentChanges(val) {
// this.pageCurrent = val
// this.getTableData()
// },
// handleSizeChangeWB(val) {
// this.pageCurrentWB = 1
// this.pageSizeWB = val
// this.getTableData()
// },
// handleCurrentChangeWB(val) {
// this.pageCurrentWB = val
// this.getTableData()
// },
// handleSizeChange1(val) {
// this.pageCurrent1 = 1
// this.pageSize1 = val
// this.getTable()
// },
// handleCurrentChange1(val) {
// this.pageCurrent1 = val
// this.getTable()
// },
// handleSizeChange2(val) {
// this.pageSize2 = val
// this.pageCurrent2 = 1
// this.getTable1()
// },
// handleCurrentChange2(val) {
// this.pageCurrent2 = val
// this.getTable1()
// },
// handleSizeChange3(val) {
// this.pageSize3 = val
// this.pageCurrent3 = 1
// this.searchTable1()
// },
// handleCurrentChange3(val) {
// this.pageCurrent3 = val
// this.searchTable1()
// },
// handleSizeChange4(val) {
// this.pageSize4 = val
// this.pageCurrent4 = 1
// this.searchTable2()
// },
// handleCurrentChange4(val) {
// this.pageCurrent4 = val
// this.searchTable2()
// },
// handleSizeChange5(val) {
// this.pageSize5 = val
// this.pageCurrent5 = 1
// this.searchTable5()
// },
// handleCurrentChange5(val) {
// this.pageCurrent5 = val
// this.searchTable5()
// },
// handleSizeChange6(val) {
// this.pageSize6 = val
// this.pageCurrent6 = 1
// this.searchTable6()
// },
// handleCurrentChange6(val) {
// this.pageCurrent6 = val
// this.searchTable6()
// },
handleSizeChange7(val) {
this.pageSize7 = val
this.pageCurrent7 = 1
@@ -1212,7 +1212,7 @@ export default {
</script>
<style scoped>
span{
margin: 20px;
}
/*span{*/
/* margin: 20px;*/
/*}*/
</style>

48
src/views/BasicData/ShiftManagement/index.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-card>
<span style="margin-left: 15px">班次类型:</span>
<!-- <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"
@@ -20,7 +20,7 @@
border
stripe
size="mini"
height="550"
height="820"
center
style="width: 100%">
<el-table-column label="开始工作时间" align="center">
@@ -90,16 +90,16 @@
</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="10"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
<!-- <div class="block" style="margin-top: 10px;">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent"-->
<!-- :page-sizes="[10, 20, 30, 40, 50]"-->
<!-- :page-size="10"-->
<!-- :total="total"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange"-->
<!-- @current-change="handleCurrentChange"/>-->
<!-- </div>-->
</el-card>
<el-dialog v-el-drag-dialog :visible.sync ="dialogFormVisible1" title="新增班次人员" center style="min-height: 270px" width="900px">
<el-form ref="form1" :model="form1" :rules="rules" label-position="right" label-width="160px" class="demo-ruleForm">
@@ -327,9 +327,9 @@ export default {
},
dialogFormVisible1: false,
dialogFormVisible2: false,
pageCurrent: 1,
pageSize: 10,
total: 0,
// pageCurrent: 1,
// pageSize: 10,
// total: 0,
rules2: { // 表单验证规则
value: [{ required: true, message: '请选择时间', trigger: 'blur' }],
value2: [{ required: true, message: '请选择时间', trigger: 'blur' }],
@@ -456,16 +456,16 @@ export default {
this.form1 = {}
this.dialogFormVisible2 = false
this.form2 = {}
},
handleSizeChange(val) {
this.pageSize = val
this.pageCurrent = 1
this.searchTable()
},
handleCurrentChange(val) {
this.pageCurrent = val
this.searchTable()
}
// handleSizeChange(val) {
// this.pageSize = val
// this.pageCurrent = 1
// this.searchTable()
// },
// handleCurrentChange(val) {
// this.pageCurrent = val
// this.searchTable()
// }
}
}
</script>

47
src/views/BasicData/SystemRrolemaintenance/index.vue
View File

@@ -1,8 +1,8 @@
<template>
<div class="app-container">
<el-card>
<span>角色功能:</span>
<el-input v-model="RoleFunctioning" size="small" clearable style="width:200px"/>
<!-- <span>角色功能:</span>-->
<el-input v-model="RoleFunctioning" size="small" clearable placeholder="请输入角色功能" 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>
@@ -10,6 +10,7 @@
<el-table
v-loading="loading"
:data="tableData"
height="830"
highlight-current-row
border>
<el-table-column align="center" label="角色编号" width="100">
@@ -44,16 +45,16 @@
</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>
<!-- <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 v-el-drag-dialog :visible.sync="dialogFormVisible1" title="新增角色" center style="min-height: 200px" width="400px">
@@ -126,8 +127,8 @@ export default {
},
methods: {
fetchData() {
InitRolefunction(this.pageCurrent, this.pageSize).then(response => { // 初始化
this.tableData = response.data.rows
InitRolefunction().then(response => { // 初始化
this.tableData = response.data
this.total = response.data.total
})
},
@@ -140,15 +141,15 @@ export default {
console.log(response.data)
})
},
handleSizeChange(val) {
this.pageCurrent = 1
this.pageSize = val
this.fetchData()
},
handleCurrentChange(val) {
this.pageCurrent = val
this.fetchData()
},
// handleSizeChange(val) {
// this.pageCurrent = 1
// this.pageSize = val
// this.fetchData()
// },
// handleCurrentChange(val) {
// this.pageCurrent = val
// this.fetchData()
// },
handleEdit(row) {
if (this.$refs['form2'] !== undefined) {
this.$refs['form2'].resetFields()

60
src/views/BasicData/WorkshopPersonnelRoleMana/index.vue
View File

@@ -3,22 +3,22 @@
<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">
<!-- <span>员工姓名:</span>-->
<el-input v-model="staffName" placeholder="员工姓名" size="small" clearable style="width:200px;margin: 0px 10px"/>
<!-- <span style="margin-left: 15px">角色名称:</span>-->
<el-select v-model="roleName" placeholder="角色名称" clearable size="small" style="width:200px;margin: 0px 10px">
<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="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="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 stripe size="mini" height="550" border style="width: 100%">
<el-table :data="tableData" highlight-current-row stripe size="mini" height="820" border style="width: 100%">
<el-table-column
label="序号"
align="center"
@@ -66,16 +66,16 @@
</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>
<!-- <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>
@@ -232,9 +232,9 @@ export default {
staffNum: '',
personnelNumber: '',
personnelStream: '',
pageCurrent1: 1,
pageSize1: 10,
total1: null,
// pageCurrent1: 1,
// pageSize1: 10,
// total1: null,
roleName: null,
roleNames: [],
rybh: '',
@@ -283,9 +283,9 @@ export default {
} else {
this.check2 = 0
}
searchTable(this.check1, this.staffName, this.check2, this.roleName, this.pageCurrent1, this.pageSize1).then(response => {
searchTable(this.check1, this.staffName, this.check2, this.roleName).then(response => {
console.log(response)
this.tableData = response.data.rows
this.tableData = response.data
this.total1 = response.data.total
})
},
@@ -304,15 +304,15 @@ export default {
})
this.searchData()
},
handleSizeChange1(val) {
this.pageCurrent1 = 1
this.pageSize1 = val
this.searchData()
},
handleCurrentChange1(val) {
this.pageCurrent1 = val
this.searchData()
},
// handleSizeChange1(val) {
// this.pageCurrent1 = 1
// this.pageSize1 = val
// this.searchData()
// },
// handleCurrentChange1(val) {
// this.pageCurrent1 = val
// this.searchData()
// },
submitAdd1() {
this.$refs['form1'].validate((valid) => {
if (valid) {

63
src/views/Inventory/CreatePickingList/index.vue
View File

@@ -262,36 +262,31 @@
<el-button :disabled="Number(审批情况)===1" size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropList()">删除领料单</el-button>
<span style="font-weight: bold">选中领料单：{{ pickingListNumberShow }}</span>
<span style="font-weight: bold">领料人：{{ peopleName }}</span>
<el-button :disabled="Number(审批情况)===1" size="small" plain type="danger" icon="el-icon-delete" style="margin-right: 20px;float: right" @click="dropListDetail(scope.row)">移除领料明细</el-button>
</div>
<div style="width: 30%;float: left">
<el-table :data="pickListTable1" :row-class-name="tableRowClassName" highlight-current-row border size="mini" height="300" @row-click="clickList">
<el-table :data="pickListTable1" :row-class-name="tableRowClassName" class="shenpi" highlight-current-row border size="mini" width="100%" height="300px" @row-click="clickList">
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column prop="领料单编号" label="领料单编号" align="center" width="100px">
<el-table-column prop="领料单编号" label="领料单编号" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.领料单编号 }}
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" width="100px" >
<el-table-column label="创建时间" align="center" min-width="100px" >
<template slot-scope="scope">
{{ scope.row.操作日期.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column label="领料人" prop="领料人" align="center" width="90px">
<el-table-column label="领料人" prop="领料人" align="center" min-width="90px">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="备注" prop="备注" align="center" width="130px">
<el-table-column label="备注" prop="备注" align="center" min-width="130px">
<template slot-scope="scope">
{{ scope.row.领料单备注 }}
</template>
</el-table-column>
<el-table-column label="审批" prop="审批" align="center" width="90">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.是否审批)===1" type="success">已审批</el-tag>
<el-tag v-else type="warning">未审批</el-tag>
</template>
</el-table-column>
</el-table>
<div class="block" style="float:right;margin: 10px 0;">
<el-pagination
@@ -304,35 +299,35 @@
@current-change="handleCurrentChange3"/>
</div>
</div>
<div style="width: 69%;float: left">
<el-table :data="pickListTable2" border style="width: 100%;" size="mini" height="300">
<div style="width: 69.8%;float: left">
<el-table :data="pickListTable2" border style="width: 100%;" size="mini" height="300px">
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="名称" align="center" sortable prop="名称" min-width="100">
<el-table-column label="名称" align="center" prop="名称" min-width="100">
<template slot-scope="scope">
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" align="center" sortable prop="图号或型号" min-width="100">
<el-table-column label="图号或型号" align="center" prop="图号或型号" min-width="110px">
<template slot-scope="scope">
{{ scope.row.图号或型号 || '—' }}
</template>
</el-table-column>
<el-table-column label="规格" align="center" sortable prop="规格" min-width="100">
<el-table-column label="规格" align="center" prop="规格" min-width="120">
<template slot-scope="scope">
{{ scope.row.规格 || '—' }}
</template>
</el-table-column>
<el-table-column label="机床图号" align="center" sortable prop="机床图号" min-width="100">
<el-table-column label="机床图号" align="center" prop="机床图号" min-width="100">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" sortable prop="组号" min-width="70">
<el-table-column label="组号" align="center" prop="组号" min-width="70">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="总数量" align="center" min-width="70">
<el-table-column label="领用数量" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.总数量 }}
</template>
@@ -347,20 +342,20 @@
{{ scope.row.出库数量1 }}
</template>
</el-table-column>
<el-table-column v-if="true" label="备料确认" align="center" sortable prop="是否备料确认" width="100">
<el-table-column v-if="true" label="备料确认" align="center" prop="是否备料确认" min-width="75px">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.是否备料确认)===1" type="success" size="mini">已备料</el-tag>
<el-tag v-else type="warning" size="mini">未备料</el-tag>
</template>
</el-table-column>
<el-table-column v-if="true" label="领料确认" align="center" sortable prop="是否领料确认" width="100">
<el-table-column v-if="true" label="领料确认" align="center" prop="是否领料确认" width="75px">
<template slot-scope="scope">
<el-tag v-if="(Number(scope.row.总数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领料</el-tag>
<el-tag v-else-if="Number(scope.row.总数量) > Number(scope.row.出库数量1) && Number(scope.row.出库数量1) > 0" type="primary" size="mini">未领完</el-tag>
<el-tag v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领料</el-tag>
</template>
</el-table-column>
<el-table-column v-if="true" label="操作" align="center" width="230">
<el-table-column label="操作" align="center" min-width="120px">
<template slot-scope="scope">
<el-popover placement="right" width="500" trigger="click">
<el-table :data="gridData" highlight-current-row size="mini" show-summary>
@@ -383,7 +378,6 @@
</el-table>
<el-button slot="reference" type="primary" size="mini" icon="el-icon-search" plain @click="searchTable02(scope.row)">查看详情</el-button>
</el-popover>
<el-button :disabled="!!scope.row.是否出库 || Number(scope.row.是否领料确认)===1" size="mini" plain type="danger" icon="el-icon-delete" style="margin-left: 10px" @click="dropListDetail(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -556,11 +550,12 @@ export default {
})
},
tableRowClassName({ row }) {
if (row.是否审批 === 1) {
return 'shenpi-row'
} else {
return ''
}
return '.warning-row'
// if (row.是否审批 === 1) {
// return '.warning-row'
// } else {
// return ''
// }
},
selectable(row, index) { // 控制某行是否可选
console.log(row)
@@ -889,9 +884,6 @@ export default {
</script>
<style scoped>
.el-card{
margin-bottom: 15px;
}
.el-select{
width:200px
}
@@ -904,8 +896,11 @@ export default {
.el-tag{
margin: 0
}
.el-table .shenpi-row {
background: #55a532 !important;
</style>
<style lang="scss">
.shenpi{
.el-table .warning-row {
background: #55a532 !important;
}
}
</style>

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

@@ -32,32 +32,32 @@
</el-row>
</div>
<el-table :data="tableData1" stripe highlight-current-row border style="max-height: 500px;" height="500px" size="mini" show-summary>
<el-table-column label="名称" sortable prop="物料名称" align="center" width="150" show-overflow-tooltip>
<el-table-column label="名称" prop="物料名称" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" sortable prop="物料型号" align="center" width="120" show-overflow-tooltip>
<el-table-column label="图号或型号" prop="物料型号" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="规格" sortable prop="物料规格" align="center" width="130" show-overflow-tooltip>
<el-table-column label="规格" prop="物料规格" align="center" width="130" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="物料来源" sortable prop="物料来源" align="center" width="100">
<el-table-column label="物料来源" prop="物料来源" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.物料来源 }}
</template>
</el-table-column>
<el-table-column label="仓库" sortable prop="仓库名称" align="center" min-width="90">
<el-table-column label="仓库" prop="仓库名称" align="center" min-width="90">
<template slot-scope="scope">
{{ scope.row.仓库名称 }}
</template>
</el-table-column>
<el-table-column label="货位" sortable prop="货位名称" align="center" min-width="90">
<el-table-column label="货位" prop="货位名称" align="center" min-width="90">
<template slot-scope="scope">
{{ scope.row.货位名称 }}
</template>

12
src/views/Inventory/MaterialOut/index.vue
View File

@@ -9,7 +9,7 @@
<h4 style="margin-top:0">领料单</h4>
<el-table :data="pickListTable1" stripe highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="clickList">
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="领料单编号" sortable prop="领料单编号" align="center" min-width="200">
<el-table-column label="领料单编号" prop="领料单编号" align="center" min-width="200">
<template slot-scope="scope">
{{ scope.row.领料单编号 }}
</template>
@@ -19,7 +19,7 @@
{{ scope.row.操作日期.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column label="领料人" sortable prop="姓名" align="center" min-width="130">
<el-table-column label="领料人" prop="姓名" align="center" min-width="130">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
@@ -62,22 +62,22 @@
<el-table :data="pickListTable2" highlight-current-row stripe border style="width: 100%;" size="mini" height="400" @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="55"/>
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="名称" sortable prop="名称" align="center" min-width="100">
<el-table-column label="名称" prop="名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" sortable prop="图号或型号" align="center" min-width="100">
<el-table-column label="图号或型号" prop="图号或型号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.图号或型号 || '—' }}
</template>
</el-table-column>
<el-table-column label="规格" sortable prop="规格" align="center" min-width="100">
<el-table-column label="规格" prop="规格" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.规格 || '—' }}
</template>
</el-table-column>
<el-table-column label="机床图号" sortable prop="机床图号" align="center" min-width="100">
<el-table-column label="机床图号" prop="机床图号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>

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

@@ -15,22 +15,22 @@
<el-card>
<el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width: 100%;" height="440" @row-click="searchoutRecord">
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="物料名称" sortable prop="物料名称" align="center" min-width="120">
<el-table-column label="物料名称" prop="物料名称" align="center" min-width="120">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="物料型号" sortable prop="物料型号" align="center" min-width="120">
<el-table-column label="物料型号" prop="物料型号" align="center" min-width="120">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="物料规格" sortable prop="物料规格" align="center" min-width="120">
<el-table-column label="物料规格" prop="物料规格" align="center" min-width="120">
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="仓库名称" sortable prop="仓库名称" align="center" min-width="80">
<el-table-column label="仓库名称" prop="仓库名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.仓库名称 }}
</template>

4
src/views/Inventory/OfflinePartsStorage/index.vue
View File

@@ -26,12 +26,12 @@
{{ scope.row.离线合同编号 }}
</template>
</el-table-column>
<el-table-column label="名称" sortable prop="物料名称" width="150px" align="center" show-overflow-tooltip>
<el-table-column label="名称" prop="物料名称" width="150px" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="规格型号" sortable prop="规格型号" width="180px" align="center" show-overflow-tooltip>
<el-table-column label="规格型号" prop="规格型号" width="180px" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.规格型号 }}
</template>

12
src/views/Inventory/OutPartSelect/index.vue
View File

@@ -40,12 +40,12 @@
align="center"
width="55"
type="index"/>
<el-table-column align="center" label="零件名称" width="150px">
<el-table-column align="center" label="零件名称" prop="零件名称" width="150px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件图号" width="150px">
<el-table-column align="center" label="零件图号" prop="零件图号" width="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
@@ -55,22 +55,22 @@
{{ scope.row.出库数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="机床图号" width="120px">
<el-table-column align="center" label="机床图号" prop="机床图号" width="120px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" width="120px">
<el-table-column align="center" label="组号" prop="组号" width="120px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="领料人">
<el-table-column align="center" label="领料人" prop="出库备注">
<template slot-scope="scope">
{{ scope.row.出库备注 }}
</template>
</el-table-column>
<el-table-column align="center" label="出库时间">
<el-table-column align="center" label="出库时间" prop="出库时间">
<template slot-scope="scope">
{{ scope.row.出库时间 }}
</template>

20
src/views/Inventory/PurchaseInRecord/index.vue
View File

@@ -50,17 +50,17 @@
</div>
<h4 style="margin-top: 0">采购合同入库</h4>
<el-table :data="tableData1" border stripe size="mini" style="width: 100%;" height="400">
<el-table-column label="名称" sortable prop="名称" align="center" width="100" show-overflow-tooltip>
<el-table-column label="名称" prop="名称" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" sortable prop="图号或型号" align="center" width="120" show-overflow-tooltip>
<el-table-column label="图号或型号" prop="图号或型号" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.图号或型号 }}
</template>
</el-table-column>
<el-table-column label="规格" sortable prop="规格" align="center" width="120" show-overflow-tooltip>
<el-table-column label="规格" prop="规格" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.规格 }}
</template>
@@ -70,12 +70,12 @@
{{ scope.row.入库数量 }}
</template>
</el-table-column>
<el-table-column label="入库人" sortable prop="入库人" align="center" width="100" show-overflow-tooltip>
<el-table-column label="入库人" prop="入库人" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.入库人 }}
</template>
</el-table-column>
<el-table-column label="入库时间" sortable prop="入库时间" align="center" min-width="100">
<el-table-column label="入库时间" prop="入库时间" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.入库时间 }}
</template>
@@ -94,17 +94,17 @@
</div>
<h4>离线合同入库</h4>
<el-table :data="tableData2" border stripe size="mini" style="width: 100%;" height="400">
<el-table-column label="名称" sortable prop="名称" align="center" width="120" show-overflow-tooltip>
<el-table-column label="名称" prop="名称" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" sortable prop="图号或型号" align="center" width="120" show-overflow-tooltip>
<el-table-column label="图号或型号" prop="图号或型号" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.图号或型号 }}
</template>
</el-table-column>
<el-table-column label="规格" sortable prop="规格" align="center" width="120" show-overflow-tooltip>
<el-table-column label="规格" prop="规格" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.规格 }}
</template>
@@ -114,12 +114,12 @@
{{ scope.row.入库数量 }}
</template>
</el-table-column>
<el-table-column label="入库人" sortable prop="入库人" align="center" width="100">
<el-table-column label="入库人" prop="入库人" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.入库人 }}
</template>
</el-table-column>
<el-table-column label="入库时间" sortable prop="入库时间" align="center" min-width="100">
<el-table-column label="入库时间" prop="入库时间" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.入库时间 }}
</template>

7
src/views/Inventory/PurchasePartsStorage/index.vue
View File

@@ -30,17 +30,12 @@
<el-card>
<el-table ref="multipleTable" :data="table1" border stripe size="mini" highlight-current-row style="width: 100%;margin-bottom: 5px" @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="50px"/>
<!--<el-table-column label="合同编号" sortable prop="合同编号" width="120px" align="center" show-overflow-tooltip>-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.合同编号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="名称" sortable prop="物料名称" width="150px" align="center" show-overflow-tooltip >
<template slot-scope="scope">
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="规格型号" sortable prop="规格型号" width="180px" align="center" show-overflow-tooltip>
<el-table-column label="规格型号" prop="规格型号" width="180px" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 ? scope.row.物料规格 : '-' + '&nbsp;' + scope.row.物料型号 ? scope.row.零件图号 : '-' }}
</template>

12
src/views/Inventory/StockInquiry/index.vue
View File

@@ -40,12 +40,12 @@
align="center"
width="55"
type="index"/>
<el-table-column align="center" label="零件名称" width="150px">
<el-table-column align="center" label="零件名称" prop="零件名称" width="150px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件图号" width="150px">
<el-table-column align="center" label="零件图号" prop="零件图号" width="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
@@ -55,12 +55,12 @@
{{ scope.row.入库数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="机床图号" width="120px">
<el-table-column align="center" label="机床图号" prop="机床图号" width="120px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" width="120px">
<el-table-column align="center" label="组号" prop="组号" width="120px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
@@ -70,12 +70,12 @@
{{ scope.row.仓库名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="货位名称" width="120px">
<el-table-column align="center" label="货位名称" prop="货位名称" width="120px">
<template slot-scope="scope">
{{ scope.row.货位名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="入库时间">
<el-table-column align="center" label="入库时间" prop="入库时间">
<template slot-scope="scope">
{{ scope.row.入库时间 }}
</template>

14
src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
View File

@@ -59,12 +59,12 @@
style="width: 100%;"
border>
<el-table-column label="序号" type="index" align="center" width="55"/>
<el-table-column label="零件图号" align="center" min-width="150px">
<el-table-column label="零件图号" prop="零件图号" align="center" min-width="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" min-width="120px">
<el-table-column label="零件名称" prop="零件名称" align="center" min-width="120px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -74,12 +74,12 @@
{{ scope.row.完成数量 }}
</template>
</el-table-column>
<el-table-column label="工艺名称" align="center" min-width="70px">
<el-table-column label="工艺名称" prop="工艺名称" align="center" min-width="90px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column label="操作者" align="center" min-width="80px">
<el-table-column label="操作者" prop="姓名" align="center" min-width="80px">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
@@ -115,12 +115,12 @@
<span v-else>{{ scope.row.修补工时 }}</span>
</template>
</el-table-column>
<el-table-column label="修补操作时间" align="center" min-width="160px">
<el-table-column label="修补操作时间" prop="修补操作时间" align="center" min-width="160px">
<template slot-scope="scope">
{{ scope.row.修补操作时间 || '—' }}
</template>
</el-table-column>
<el-table-column label="修补人" align="center" min-width="100px">
<el-table-column label="修补人" prop="修补人" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.修补人 || '—' }}
</template>
@@ -319,7 +319,7 @@ export default {
submitAdd() {
this.$refs['form'].validate((valid) => {
if (valid) {
submitAdd(this.form.technology, this.form.timeNumber, this.form.number, this.id).then(res => {
submitAdd(this.form.technology, this.form.timeNumber, this.form.number, this.id, this.form.opNum).then(res => {
if (res.data[0].result === '1') {
this.dialogFormVisible = false
this.$message.success('操作成功')

174
src/views/ManufacturingCenter/ActualWorkQuery/index.vue Normal file
View File

@@ -0,0 +1,174 @@
<template>
<div class="app-container">
<el-card>
<el-row>
<span class="demonstration">日期:</span>
<el-date-picker
v-model="startTime"
:clearable="false"
value-format="yyyy-MM-dd"
size="small"
style="width: 160px;margin-top: 10px"
type="date"
placeholder="选择日期"
@change="pageCurrent=1;total=0;searchTable()"/>
<span>操作者:</span>
<el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:200px; margin-top: 10px;margin-bottom: 10px"/>
<el-button :disabled="loading" type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;total=0;searchTable();">查询</el-button>
</el-row>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" stripe height="700" size="mini" style="width: 1360px;" border>
<el-table-column label="序号" type="index" align="center" width="55"/>
<el-table-column label="零件图号" prop="零件图号" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" prop="零件名称" align="center" width="120px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="完成数量" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.完成数量 }}
</template>
</el-table-column>
<el-table-column label="工艺名称" prop="工艺名称" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column label="操作者" prop="姓名" align="center" width="80px">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="实际开始时间" align="center" width="160px">
<template slot-scope="scope">
{{ scope.row.加工开始时间1 }}
</template>
</el-table-column>
<el-table-column label="实际完成时间" align="center" width="160px">
<template slot-scope="scope">
{{ scope.row.加工完成时间1 }}
</template>
</el-table-column>
<el-table-column label="实际工时" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.实际加工时间段 || '—' }}
</template>
</el-table-column>
<el-table-column label="修补数量" align="center" width="70px">
<template slot-scope="scope">
<template v-if="scope.row.isEditing">
<el-input v-model="scope.row.数量" class="edit-input" size="mini"/>
</template>
<span v-else>{{ scope.row.数量 }}</span>
</template>
</el-table-column>
<el-table-column label="修补工时" align="center" width="70px">
<template slot-scope="scope">
<template v-if="scope.row.isEditing">
<el-input v-model="scope.row.修补工时" class="edit-input" size="mini"/>
</template>
<span v-else>{{ scope.row.修补工时 }}</span>
</template>
</el-table-column>
<el-table-column label="修补操作时间" prop="修补操作时间" align="center" width="160px">
<template slot-scope="scope">
{{ scope.row.修补操作时间 || '—' }}
</template>
</el-table-column>
<el-table-column label="修补人" prop="修补人" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.修补人 || '—' }}
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[100, 500, 1000]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
</div>
</template>
<script>
import { searchTable } from '@/api/ManufacturingCenter/ActualWorkQuery'
import { mapGetters } from 'vuex'
import { getNowShotTime } from '@/utils/tool'
export default {
name: 'ActualTimeSupplement',
data() {
return {
startTime: getNowShotTime(),
workerName: '',
loading: false,
pageCurrent: 1,
pageSize: 1000,
total: 0,
tableData: []
}
},
computed: {
...mapGetters([
'id' // 人员编号
])
},
mounted() {
this.searchTable()
},
methods: {
// 查询加工工时统计表
searchTable() {
this.loading = true
let check1, check2
this.startTime ? check1 = 1 : check1 = 0
this.workerName ? check2 = 1 : check2 = 0
searchTable(check1, this.startTime, check2, this.workerName, this.pageCurrent, this.pageSize).then(res => {
this.tableData = res.data.rows
this.total = res.data.total
this.tableData.map(v => {
this.$set(v, 'isEditing', false)
v.原修补工时 = v.修补工时
return v
})
this.loading = false
})
},
// 分页
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;
}
span{
margin: 10px 0 10px 10px;
}
.el-card{
margin: 0px;
}
</style>

6
src/views/ManufacturingCenter/CreatePreparationBill/index.vue
View File

@@ -27,18 +27,18 @@
type="selection"
width="55"
align="center"/>
<el-table-column label="打印状态" align="center">
<el-table-column label="打印状态" prop="备料打印" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.备料打印!=='0'" type="success" size="mini">已导出</el-tag>
<el-tag v-else type="warning" size="mini">未导出</el-tag>
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" >
<el-table-column label="零件名称" prop="零件名称" align="center" >
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" >
<el-table-column label="零件图号" prop="零件图号" align="center" >
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>

52
src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue
View File

@@ -1,8 +1,8 @@
<template>
<div class="app-container">
<el-card>
<span>工位号:</span>
<el-select v-model="MachineValue" filterable size="small" style="width:160px;margin-bottom:10px" placeholder="工位号">
<!-- <span>工位号:</span>-->
<el-select v-model="MachineValue" filterable size="small" style="width:160px;margin:0px 10px" placeholder="工位号">
<el-option
v-for="item in Machine"
:key="item.value"
@@ -12,7 +12,7 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<span>日期:</span>
<!-- <span>日期:</span>-->
<el-date-picker
v-model="Time"
value-format="yyyy-MM-dd"
@@ -20,7 +20,7 @@
style="width: 160px"
type="date"
placeholder="选择日期"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="pageSize=10; pageCurrent= 1;searchData()">查询</el-button>
<el-button type="success" size="small" icon="el-icon-search" style="margin:0px 10px" @click="pageSize=10; pageCurrent= 1;searchData()">查询</el-button>
</el-card>
<el-card>
<el-table
@@ -71,16 +71,16 @@
</template>
</el-table-column>
</el-table>
<div class="block">
<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>
<!-- <div class="block">-->
<!-- <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-card style="width: 49.8%; float: left;margin-right: 5px">
<div id="myChart1" style="width: 1000px; height: 570px; margin: auto"/>
@@ -187,9 +187,9 @@ export default {
time22: '',
time33: '',
time44: '',
pageCurrent: 1,
pageSize: 10,
total: 0,
// pageCurrent: 1,
// pageSize: 10,
// total: 0,
table: []
}
},
@@ -214,13 +214,13 @@ export default {
})
},
searchData() {
getData(this.MachineValue, this.Time, this.pageCurrent, this.pageSize).then(response => {
this.tableDataA = response.data.rows
this.total = response.data.total
this.time1 = response.data.rows[0].运行持续时间
this.time2 = response.data.rows[0].等待持续时间
this.time3 = response.data.rows[0].停机持续时间
this.time4 = response.data.rows[0].报警持续时间
getData(this.MachineValue, this.Time).then(response => {
this.tableDataA = response.data
// this.total = response.data.total
this.time1 = response.data[0].运行持续时间
this.time2 = response.data[0].等待持续时间
this.time3 = response.data[0].停机持续时间
this.time4 = response.data[0].报警持续时间
}).then(() => {
this.drawLine1()
})
@@ -445,8 +445,8 @@ export default {
} // 数据的值
},
legend: { // 图例
left: 'left'
// selectedMode: false, // 图例可点击
left: 'left',
selectedMode: false // 图例可点击
},
dataZoom: [{
type: 'inside',

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

@@ -20,7 +20,7 @@
<el-input v-model="machineToolNumber" placeholder="请双击选择" size="small" clearable style="width:200px" @change="empty1" @dblclick.native="SearchMachine"/>
<span>组号:</span>
<el-input v-model="groupNumber" placeholder="请双击选择" size="small" clearable style="width:200px" @dblclick.native="searchGroupList"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-top: 15px;margin-left: 10px" @click="total=0;pageSize=10;pageCurrent=1;searchData();searchTable()">查询</el-button>
<el-button type="success" icon="el-icon-search" size="small" style="margin-top: 15px;margin-left: 10px" @click="total=0;pageSize=1000;pageCurrent=1;searchData();searchTable()">查询</el-button>
</el-card>
<el-card>
<h3 style="text-align: center;">车间生产</h3>
@@ -82,7 +82,7 @@
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
layout="total"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
@@ -140,7 +140,7 @@
:page-size="pageSize00"
:total="total00"
style="margin-top:10px;display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
layout="total"
@size-change="handleSizeChange00"
@current-change="handleCurrentChange00"/>
</div>
@@ -195,7 +195,7 @@
:page-size="pageSize01"
:total="total01"
style="margin-top:10px;display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
layout="total"
@size-change="handleSizeChange01"
@current-change="handleCurrentChange01"/>
</div>
@@ -255,7 +255,7 @@
:page-size="pageSize02"
:total="total02"
style="margin-top:10px;display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
layout="total"
@size-change="handleSizeChange02"
@current-change="handleCurrentChange02"/>
</div>
@@ -312,7 +312,7 @@
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize5"
:total="total5"
layout="total, sizes, prev, pager, next, jumper"
layout="total"
@size-change="handleSizeChange5"
@current-change="handleCurrentChange5"/>
</div>
@@ -495,13 +495,13 @@ export default {
num: null,
PartType: '标准件',
pageCurrent00: 1,
pageSize00: 10,
pageSize00: 1000,
pageCurrent01: 1,
pageSize01: 10,
pageCurrent02: 1,
pageSize02: 10,
pageSize02: 1000,
pageCurrent: 1,
pageSize: 10,
pageSize: 1000,
pageCurrent1: 1,
pageSize1: 10,
pageCurrent2: 1,
@@ -726,12 +726,16 @@ export default {
this.dialogFormVisible3 = false
},
searchTable() {
if (this.PartType === '标准件') {
this.searchTable0()
} else if (this.PartType === '外购件') {
this.searchTable1()
} else if (this.PartType === '基本件') {
this.searchTable2()
if (this.machine === '' || this.machine === null) {
this.$message.warning('请先选择机床组号')
} else {
if (this.PartType === '标准件') {
this.searchTable0()
} else if (this.PartType === '外购件') {
this.searchTable1()
} else if (this.PartType === '基本件') {
this.searchTable2()
}
}
},
searchTable0() { // 查询标准件
@@ -744,11 +748,10 @@ export default {
})
},
searchTable1() { // 查询外购件
let check1, check2, check3
let check1, check2
this.machine ? check1 = 1 : check1 = 0
this.groupNum ? check2 = 1 : check2 = 0
this.entryNameValue ? check3 = 1 : check3 = 0
searchTable01(check3, this.entryNameValue, check1, this.machine, check2, this.groupNum, this.pageCurrent01, this.pageSize01, 2).then(response => {
searchTable01(check1, this.machine, check2, this.groupNum, this.pageCurrent01, this.pageSize01, 2).then(response => {
this.tableData01 = response.data.rows
this.total01 = response.data.total
})

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

@@ -29,7 +29,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total = 0;pageSize = 10;pageList = 1;getTable()">查询</el-button>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total = 0;pageSize = 10000;pageList = 1;getTable()">查询</el-button>
</el-form-item>
</el-form>
</el-col>
@@ -102,17 +102,17 @@
type="selection"
align="center"
width="35"/>
<el-table-column label="零件号" align="center" min-width="220">
<el-table-column label="零件号" prop="零件图号" align="center" min-width="220">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center">
<el-table-column label="零件名称" prop="零件名称" align="center">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="规格" align="center">
<el-table-column label="规格" prop="规格" align="center">
<template slot-scope="scope">
{{ scope.row.规格 }}
</template>
@@ -137,35 +137,11 @@
{{ scope.row.未投产数量 }}
</template>
</el-table-column>
<el-table-column label="零件类型" align="center" width="100">
<el-table-column label="零件类型" prop="零件类型名称" align="center" width="120">
<template slot-scope="scope">
{{ 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 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="200px" fixed="right" align="center">
<template slot-scope="scope">
<el-button
@@ -174,24 +150,20 @@
type="primary"
plain
@click="handleEdit(scope.$index, scope.row, 'form')">分批投产</el-button>
<!--<el-button-->
<!--size="mini"-->
<!--type="primary"-->
<!--@click="handleDele(scope.$index, scope.row, 'form1')">打回</el-button>-->
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
v-show="false"
:current-page="currentPage"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 20, 30, 10000]"
:page-size="pageSize"
:total="total"
style="width:50%;display:inline-block;"
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-tooltip :open-delay="1200" effect="dark" content="打回到零件分配" placement="top">
<el-button :loading="listLoading3" type="primary" size="small" style="float:right;margin-left: 10px" @click="back">打回</el-button>
</el-tooltip>
@@ -219,7 +191,8 @@
<template slot-scope="scope">{{ scope.row.零件图号 }}</template>
</el-table-column>
<el-table-column
label="零件名称">
prop="零件名称"
label="零件名称" >
<template slot-scope="scope">{{ scope.row.零件名称 }}</template>
</el-table-column>
<el-table-column
@@ -267,15 +240,15 @@
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
v-show="false"
:current-page="currentPage3"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 20, 30, 10000]"
:page-size="pageSize3"
:total="total3"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange3"
@current-change="handleCurrentChange3"/>
</div>
</div>
</el-card>
@@ -425,11 +398,11 @@ export default {
gongyijihua: '',
radio: 0, // 第一组
total: 0, // 总条数
pageSize: 10, // 每页显示条数
pageSize: 10000, // 每页显示条数
pageList: 1, // 后台获取页
currentPage: 1, // 显示当前页
total3: 0, // 总条数
pageSize3: 10, // 每页显示条数
pageSize3: 10000, // 每页显示条数
pageList3: 1, // 后台获取页
currentPage3: 1, // 显示当前页
listLoading: false,
@@ -724,7 +697,7 @@ export default {
this.listLoading1 = false
})
this.total = 0
this.pageSize = 10
this.pageSize = 10000
this.pageList = 1
this.getTable()
} else {
@@ -787,7 +760,7 @@ export default {
this.checked_baitu = false
this.checked_gaonandu = false
this.total = 0
this.pageSize = 10
this.pageSize = 10000
this.pageList = 1
this.shijiancuo1 = 0
this.shijiancuo = 0
@@ -999,7 +972,7 @@ export default {
message: '打回档案成功!'
})
this.total = 0
this.pageSize = 10
this.pageSize = 10000
this.pageList = 1
this.getTable()
} else {

10
src/views/ManufacturingCenter/InventoryQuery/index.vue
View File

@@ -13,27 +13,27 @@
</el-row>
</div>
<el-table :data="tableData1" stripe border height="700px" size="mini" show-summary>
<el-table-column label="名称" sortable prop="物料名称" align="center" width="130" show-overflow-tooltip>
<el-table-column label="名称" prop="物料名称" align="center" width="130" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" sortable prop="物料型号" align="center" width="150" show-overflow-tooltip>
<el-table-column label="图号或型号" prop="物料型号" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="规格" sortable prop="物料规格" align="center" width="200" show-overflow-tooltip>
<el-table-column label="规格" prop="物料规格" align="center" width="200" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="物料来源" sortable prop="物料来源" align="center" width="100">
<el-table-column label="物料来源" prop="物料来源" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.物料来源 }}
</template>
</el-table-column>
<el-table-column label="仓库" sortable prop="仓库名称" align="center" min-width="90">
<el-table-column label="仓库" prop="仓库名称" align="center" min-width="90">
<template slot-scope="scope">
{{ scope.row.仓库名称 }}
</template>

224
src/views/ManufacturingCenter/ManHourStatistics/Export2Excel.js Normal file
View File

@@ -0,0 +1,224 @@
/* eslint-disable */
require('script-loader!file-saver');
// import XLSX from 'xlsx'
import XLSX from 'xlsx-style'
function generateArray(table) {
var out = [];
var rows = table.querySelectorAll('tr');
var ranges = [];
for (var R = 0; R < rows.length; ++R) {
var outRow = [];
var row = rows[R];
var columns = row.querySelectorAll('td');
for (var C = 0; C < columns.length; ++C) {
var cell = columns[C];
var colspan = cell.getAttribute('colspan');
var rowspan = cell.getAttribute('rowspan');
var cellValue = cell.innerText;
if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue;
//Skip ranges
ranges.forEach(function (range) {
if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) {
for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null);
}
});
//Handle Row Span
if (rowspan || colspan) {
rowspan = rowspan || 1;
colspan = colspan || 1;
ranges.push({
s: {
r: R,
c: outRow.length
},
e: {
r: R + rowspan - 1,
c: outRow.length + colspan - 1
}
});
};
//Handle Value
outRow.push(cellValue !== "" ? cellValue : null);
//Handle Colspan
if (colspan)
for (var k = 0; k < colspan - 1; ++k) outRow.push(null);
}
out.push(outRow);
}
return [out, ranges];
};
function datenum(v, date1904) {
if (date1904) v += 1462;
var epoch = Date.parse(v);
return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000);
}
function sheet_from_array_of_arrays(data, opts) {
var ws = {};
var range = {
s: {
c: 10000000,
r: 10000000
},
e: {
c: 0,
r: 0
}
};
for (var R = 0; R != data.length; ++R) {
for (var C = 0; C != data[R].length; ++C) {
if (range.s.r > R) range.s.r = R;
if (range.s.c > C) range.s.c = C;
if (range.e.r < R) range.e.r = R;
if (range.e.c < C) range.e.c = C;
var cell = {
v: data[R][C]
};
if (cell.v == null) continue;
var cell_ref = XLSX.utils.encode_cell({
c: C,
r: R
});
if (typeof cell.v === 'number') cell.t = 'n';
else if (typeof cell.v === 'boolean') cell.t = 'b';
else if (cell.v instanceof Date) {
cell.t = 'n';
cell.z = XLSX.SSF._table[14];
cell.v = datenum(cell.v);
} else cell.t = 's';
ws[cell_ref] = cell;
}
}
if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range);
return ws;
}
function Workbook() {
if (!(this instanceof Workbook)) return new Workbook();
this.SheetNames = [];
this.Sheets = {};
}
function s2ab(s) {
var buf = new ArrayBuffer(s.length);
var view = new Uint8Array(buf);
for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
return buf;
}
export function export_table_to_excel(id) {
var theTable = document.getElementById(id);
var oo = generateArray(theTable);
var ranges = oo[1];
/* original data */
var data = oo[0];
var ws_name = "SheetJS";
var wb = new Workbook(),
ws = sheet_from_array_of_arrays(data);
/* add ranges to worksheet */
// ws['!cols'] = ['apple', 'banan'];
ws['!merges'] = ranges;
/* add worksheet to workbook */
wb.SheetNames.push(ws_name);
wb.Sheets[ws_name] = ws;
var wbout = XLSX.write(wb, {
bookType: 'xlsx',
bookSST: false,
type: 'binary'
});
saveAs(new Blob([s2ab(wbout)], {
type: "application/octet-stream"
}), "test.xlsx")
}
export function export_json_to_excel({
headerGroup,
dataGroup,
sheetGroup,
filename,
autoWidth = true,
bookType= 'xlsx'
} = {}) {
var wb = new Workbook()
for (let i = 0; i < dataGroup.length; i++) {
/* original data */
let data = dataGroup[i]
filename = filename || 'excel-list'
data = [...data]
data.unshift(headerGroup[i]);
var ws_name = sheetGroup[i];
var ws = sheet_from_array_of_arrays(data);
if (autoWidth) {
/*设置worksheet每列的最大宽度*/
const colWidth = data.map(row => row.map(val => {
/*先判断是否为null/undefined*/
if (val == null) {
return {
'wch': 10
};
}
/*再判断是否为中文*/
else if (val.toString().charCodeAt(0) > 255) {
return {
'wch': val.toString().length * 2
};
} else {
return {
'wch': val.toString().length
};
}
}))
/*以第一行为初始值*/
let result = colWidth[0];
for (let i = 1; i < colWidth.length; i++) {
for (let j = 0; j < colWidth[i].length; j++) {
if (result[j]['wch'] < colWidth[i][j]['wch']) {
result[j]['wch'] = colWidth[i][j]['wch'];
}
}
}
ws['!cols'] = result;
}
let R = 0;
data.map(item => {
let C = 0;
item.map(itm => {
var cell_ref = XLSX.utils.encode_cell({c:C,r:R});
var cell = {v: itm }
cell.s= {
alignment: {
horizontal: "center"
}
}
ws[cell_ref] = cell;
C++;
})
R++;
})
/* add worksheet to workbook */
wb.SheetNames.push(ws_name);
wb.Sheets[ws_name] = ws;
}
var wbout = XLSX.write(wb, {
bookType: bookType,
bookSST: false,
type: 'binary'
});
saveAs(new Blob([s2ab(wbout)], {
type: "application/octet-stream"
}), `${filename}.${bookType}`);
}

231
src/views/ManufacturingCenter/ManHourStatistics/index.vue Normal file
View File

@@ -0,0 +1,231 @@
<template>
<div class="app-container">
<el-card>
<el-date-picker
v-model="startTime"
value-format="yyyy-MM-dd"
size="small"
style="width: 170px;margin:0px 10px"
type="date"
placeholder="选择开始日期"/>
<span class="demonstration">~</span>
<el-date-picker
v-model="endTime"
value-format="yyyy-MM-dd"
size="small"
style="width: 170px;margin:0px 10px"
type="date"
placeholder="选择结束日期"/>
<el-button type="success" class="el-icon-search" size="small" style="margin:0px 10px" @click="searchTable();">查询</el-button>
<el-tooltip :open-delay="1000" content="导出人员工时统计表" placement="right">
<el-button type="primary" size="small" icon="el-icon-download" style="margin:0px 10px" @click="exportTable()">导出</el-button>
</el-tooltip>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" height="700" size="mini" stripe style="width: 800px" border element-loading-text="拼命加载中">
<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">
<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>
</el-card>
<div v-show="false">
<el-card>
<el-date-picker
v-model="startTime2"
value-format="yyyy-MM-dd"
size="small"
style="width: 170px;margin:0px 10px"
type="date"
placeholder="选择开始日期"/>
<span class="demonstration">~</span>
<el-date-picker
v-model="endTime2"
value-format="yyyy-MM-dd"
size="small"
style="width: 170px;margin:0px 10px"
type="date"
placeholder="选择结束日期"/>
<el-button type="success" class="el-icon-search" size="small" style="margin:0px 10px" @click="searchTable2();">查询</el-button>
</el-card>
<el-card>
<el-table v-loading="loading2" :data="tableData2" height="380" size="mini" stripe style="width: 100%;" border element-loading-text="拼命加载中">
<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">
<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">
<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>
</el-card>
</div>
</div>
</template>
<script>
import { searchtable, searchTable2 } from '@/api/ManufacturingCenter/ManHourStatistics'
export default {
data() {
return {
workerName: '',
startTime: '',
endTime: '',
loading: false,
tableData: [], // 表格数据
startTime2: '',
endTime2: '',
loading2: false,
tableData2: [] // 表格数据
}
},
created() {
this.searchTable()
},
methods: {
// 查询表格数据
searchTable() {
this.loading = true
this.tableData = []
if (this.startTime && this.endTime) {
this.timeCheck = 1
} else {
this.startTime = ''
this.endTime = ''
this.timeCheck = 0
}
if (this.workerName) {
this.workerName_ckeck = 1
} else {
this.workerName_ckeck = 0
}
searchtable(this.workerName_ckeck, this.workerName, this.timeCheck, this.startTime, this.endTime).then(response => {
response.data.map(v => {
this.$set(v, '比例', v.理论加工时间段 === 0 ? 0 : Math.round(v.实际加工时间段 / v.理论加工时间段 * 100) / 100.00)
})
this.tableData = response.data
this.loading = false
})
},
// 导出
exportTable() {
import('./Export2Excel').then(excel => {
const filterVal1 = ['姓名', '理论加工时间段', '实际加工时间段', '比例']
const data1 = this.tableData.map(v => filterVal1.map(j => v[j]))
const dataGroup = []
dataGroup.push(data1)
const headerGroup = [['操作者', '计划工时', '加工工时', '比例']]
const sheetGroup = ['工时统计表']
excel.export_json_to_excel({
headerGroup: headerGroup,
dataGroup: dataGroup,
sheetGroup: sheetGroup,
filename: '工时统计表',
autoWidth: true,
bookType: 'xlsx'
})
})
},
searchTable2() {
this.loading2 = true
this.tableData2 = []
this.total2 = 0
if (this.startTime && this.endTime) {
this.timeCheck = 1
} else {
this.startTime = ''
this.endTime = ''
this.timeCheck = 0
}
if (this.workerName) {
this.workerName_ckeck = 1
} else {
this.workerName_ckeck = 0
}
searchTable2(this.workerName_ckeck, this.workerName, this.timeCheck, this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => {
console.log(response.data)
this.total2 = response.data.length
this.tableData2 = response.data
this.loading2 = false
})
}
}
}
</script>
<style scoped>
</style>

10
src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
View File

@@ -35,12 +35,12 @@
<el-card>
<el-table v-loading="loading" :data="tableData" height="350" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange2">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="零件名称" align="center" width="220px">
<el-table-column label="零件名称" prop="零件名称" align="center" width="220px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" width="280px">
<el-table-column label="零件图号" prop="零件图号" align="center" width="280px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
@@ -78,12 +78,12 @@
<el-card>
<el-table v-loading="loading2" :data="tableData2" height="350" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="零件名称" align="center" width="220px">
<el-table-column label="零件名称" prop="零件名称" align="center" width="220px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" width="240px">
<el-table-column label="零件图号" prop="零件图号" align="center" width="240px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
@@ -175,7 +175,7 @@ export default {
},
created() {
this.getMachine()
this.searchTable()
// this.searchTable()
this.searchTable2()
},
methods: {

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

@@ -2,8 +2,8 @@
<div class="app-container">
<el-card>
<el-row>
<span>机床编号:</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange">
<!-- <span>机床编号:</span>-->
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin:0px 10px" clearable @change="machineChange">
<el-option
v-for="item in machineNumber"
:key="item.value"
@@ -13,8 +13,8 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<span>组号:</span>
<el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable>
<!-- <span>组号:</span>-->
<el-select v-model="groupNumberValue" filterable placeholder="组号" style="margin:0px 10px" size="small" clearable>
<el-option
v-for="item in groupNumber"
:key="item.value"
@@ -32,27 +32,27 @@
</el-card>
<el-card>
<el-table :data="tableData" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="250px" @row-click="searchPart">
<el-table-column label="项目名称" align="center">
<el-table-column label="项目名称" prop="项目名称" align="center">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床编号" align="center">
<el-table-column label="机床编号" prop="机床图号" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="机床名称" align="center">
<el-table-column label="机床名称" prop="机床名称" align="center">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center">
<el-table-column label="组号" prop="组号" align="center">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="组件名称" align="center">
<el-table-column label="组件名称" prop="组件名称" align="center">
<template slot-scope="scope">
{{ scope.row.组件名称 }}
</template>
@@ -196,13 +196,13 @@
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
<el-tooltip :open-delay="1200" effect="dark" content="将零件选择到采购单" placement="top">
<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="success" size="small" icon="el-icon-star-off" style="margin-top: 3px; margin-left: 15px" @click="purchaseRequisition()">制造部采购</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="所选零件分配到采购部" placement="top">
<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="primary" size="small" icon="el-icon-star-off" style="margin-top: 3px; margin-left: 15px" @click="PurchasingDepartment()">采购部门采购</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="所选零件分配为自家生产" placement="top">
<el-button type="warning" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="Production()">车间生产</el-button>
<el-button type="warning" size="small" icon="el-icon-star-off" style="margin-top: 3px; margin-left: 15px" @click="Production()">车间生产</el-button>
</el-tooltip>
</el-card>
<el-card>

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

@@ -53,22 +53,22 @@
type="selection"
align="center"
width="55"/>
<el-table-column label="机床号" align="center">
<el-table-column label="机床号" prop="机床图号" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center">
<el-table-column label="组号" prop="组号" align="center">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center">
<el-table-column label="零件图号" prop="零件图号" align="center">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center">
<el-table-column label="零件名称" prop="零件名称" align="center">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -78,7 +78,7 @@
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="工艺员" align="center">
<el-table-column label="工艺员" prop="工艺员" align="center">
<template slot-scope="scope">
{{ scope.row.工艺员 }}
</template>

1661
src/views/ManufacturingCenter/ProcessPlanningNew/index.vue Normal file
View File

File diff suppressed because it is too large Load Diff

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

@@ -341,7 +341,6 @@
</el-form-item>
</el-form>
</el-dialog>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="工艺选择" center width="800px">
<el-form ref="form" :model="form" label-position="left" label-width="125px" class="demo-ruleForm">
<el-row>
@@ -396,7 +395,6 @@
</el-table>
</el-form>
</el-dialog>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="已完工艺选择" center width="800px">
<el-form ref="form1" :model="form1" label-position="left" label-width="80px" class="demo-ruleForm">
<el-row>
@@ -471,7 +469,6 @@
</el-table>
</el-form>
</el-dialog>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="工艺定额人员" center style="min-height: 300px">
<el-table :data="tableData3" size="mini" style="width: 97%;max-height: 300px" height="300" highlight-current-row border @row-click="selectPerson">
<el-table-column align="center" label="考勤编号" width="150">

4
src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
View File

@@ -40,12 +40,12 @@
stripe
@selection-change="handleSelectionChange">
<el-table-column align="center" type="selection"/>
<el-table-column align="center" label="零件号" min-width="160">
<el-table-column align="center" label="零件号" prop="零件号" min-width="160">
<template slot-scope="scope">
{{ scope.row.零件号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件名称">
<el-table-column align="center" prop="零件名称" label="零件名称">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>

348
src/views/ManufacturingCenter/ProcessingStatusNew/index.vue Normal file
View File

@@ -0,0 +1,348 @@
<template>
<div class="app-container">
<el-card>
<!-- <el-button :disabled="isShow" type="info" size="small" style="margin: 0px 10px;" @click="EditData">补录完成日期</el-button>-->
<el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 180px;" placeholder="机床号" @change="getGroup">
<el-option
v-for="item in Machines"
:key="item.value"
:label="item.label"
:value="item.value">
<div style="float: left">{{ item.label }}</div>
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<el-select v-model="Group" size="small" clearable placeholder="组号" style="margin:0px 10px;width: 120px;" @change="getTableData">
<el-option
v-for="item in Groups"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
</el-card>
<el-row>
<el-col style="width: 630px">
<el-card>
<el-table
:data="tableData1"
:row-class-name="tableRowClassName"
loading="loading"
class="table"
style="max-height: 830px"
highlight-current-row
empty-text=" "
border>
<el-table-column type="index" label="序号" width="50"/>
<el-table-column align="center" label="工艺名" width="90">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="序间质检" width="90">
<template slot-scope="scope">
{{ scope.row.序间质检 }}
</template>
</el-table-column>
<el-table-column align="center" label="不合格数" width="90">
<template slot-scope="scope">
{{ scope.row.不合格数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作者" show-overflow-tooltip width="90">
<template slot-scope="scope">
{{ scope.row.操作者 }}
</template>
</el-table-column>
<el-table-column align="center" label="排产日期" width="95">
<template slot-scope="scope">
{{ scope.row.排产日期 }}
</template>
</el-table-column>
<el-table-column align="center" label="完成日期" width="100">
<template slot-scope="scope">
{{ scope.row.完成日期 }}
</template>
</el-table-column>
</el-table>
</el-card>
</el-col>
<el-col style="width: 930px">
<el-card>
<el-table
:data="tableData"
:row-class-name="tableRowClassName"
loading="loading"
class="table"
highlight-current-row
border
height="800"
@current-change="getCurrentRow">
<el-table-column type="index" label="序号" width="65">
<template slot-scope="scope">
<el-radio :label="scope.row.序号" v-model="radio"/>
</template>
</el-table-column>
<el-table-column align="center" label="零件图号" show-overflow-tooltip width="200">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件名称" show-overflow-tooltip width="140">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="加工数" width="80">
<template slot-scope="scope">
{{ scope.row.加工数 }}
</template>
</el-table-column>
<el-table-column align="center" label="计划数" width="80">
<template slot-scope="scope">
{{ scope.row.投产数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="加工完成" width="110">
<template slot-scope="scope">
{{ scope.row.完成日期 }}
</template>
</el-table-column>
<el-table-column align="center" label="计划完成" width="110">
<template slot-scope="scope">
{{ scope.row.计划结束时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="用户名称" show-overflow-tooltip width="110">
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[100, 200, 300, 400]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
</el-col>
</el-row>
</div>
</template>
<script>
import { getMachines, getGroups, getTable, gettabledata1 } from '@/api/ManufacturingCenter/ProcessingStatusNew'
import Cookie from 'js-cookie'
export default {
data() {
return {
Machine: '', // 机床号
Machines: [],
Group: '', // 组号
Groups: [],
number: '', // 零件图号
tableData: [], // 工序表
loading: '',
checkbox_Machine: '', // 机床
checkbox_Group: '', // 分组
checkbox_number: '',
pageCurrent: 1,
pageSize: 100,
total: 0,
tableData1: [], // 工序表
radio: '',
completeTime: '', // 完成时间
row1: [],
isShow: true,
processSerialNumber: '', // 工序流水号
startTime: '', // 开始时间
endTime: ''
}
},
created() {
this.getMachine()
},
methods: {
getMachine() {
if (Cookie.get('machineValue') !== undefined) {
this.Machine = ''
this.Machines = []
this.Group = ''
this.Groups = []
getMachines().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machines.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号,
value2: response.data[i].项目名称
})
}
if (Cookie.get('group') !== undefined) {
this.Machine = parseInt(Cookie.get('machineValue'))
this.getGroup()
this.getTableData()
this.Group = parseInt(Cookie.get('group'))
// this.getTableData()
Cookie.remove('machineValue')
Cookie.remove('group')
} else {
// this.getTableData()
Cookie.remove('machineValue')
Cookie.remove('group')
}
})
} else {
this.Machine = ''
this.Machines = []
this.Group = ''
this.Groups = []
getMachines().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machines.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号,
value2: response.data[i].项目名称
})
}
})
this.getTableData()
}
}, // 获取组号
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].组件流水号
})
}
this.Group = response.data[0].组件流水号
})
this.getTableData()
}, // 按条件查询
getTableData() {
this.tableData = []
this.Loading = true
if (this.Machine === '') {
this.checkbox_Machine = 0
} else {
this.checkbox_Machine = 1
}
if (this.Group === '') {
this.checkbox_Group = 0
} else {
this.checkbox_Group = 1
}
if (this.number === '') {
this.checkbox_number = 0
} else {
this.checkbox_number = 1
}
getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => {
if (response.data.rows.length !== 0) {
for (let i = 0; i < response.data.rows.length; i++) {
// while (response.data.rows[i].机加工实际完成时间.indexOf('-') >= 0) {
// response.data.rows[i].机加工实际完成时间 = (response.data.rows[i].机加工实际完成时间.replace('-', '/'))
// }
// while (response.data.rows[i].机加工结束时间.indexOf('-') >= 0) {
// response.data.rows[i].机加工结束时间 = (response.data.rows[i].机加工结束时间.replace('-', '/'))
// }
this.tableData.push({
工艺计划流水号: response.data.rows[i].工艺计划流水号,
序号: response.data.rows[i].序号,
零件图号: response.data.rows[i].零件图号,
零件名称: response.data.rows[i].零件名称,
加工数: response.data.rows[i].完成数量, // MES里采集 现在没有
投产数量: response.data.rows[i].批次数量,
// 完成日期: response.data.rows[i].完成日期,
完成日期: response.data.rows[i].机加工实际完成时间 ? response.data.rows[i].机加工实际完成时间.split(' ')[0] : '', // 排产时间
计划结束时间: response.data.rows[i].机加工结束时间 ? response.data.rows[i].机加工结束时间.split(' ')[0] : '',
// 计划结束时间: response.data.rows[i].计划结束时间,
客户名称: response.data.rows[i].客户名称 // 客户名
})
}
}
this.total = response.data.total
this.loading = false
})
}, // 获取工序表
getCurrentRow(row) {
// this.radio = row.序号
this.radio = true
this.tableData1 = []
gettabledata1(row.工艺计划流水号).then(response => {
console.log(response, 909090)
if (response.data.length !== 0) {
for (let i = 0; i < response.data.length; i++) {
// while (response.data[i].计划日期.indexOf('-') >= 0) {
// response.data[i].计划日期 = (response.data[i].计划日期.replace('-', '/'))
// }
// while (response.data[i].工序完成日期.indexOf('-') >= 0) {
// response.data[i].工序完成日期 = (response.data[i].工序完成日期.replace('-', '/'))
// }
this.tableData1.push({
工艺名称: response.data[i].工艺名称,
序间质检: response.data[i].质检结果,
排产日期: response.data[i].排产时间 ? response.data[i].排产时间.split(' ')[0] : '',
// 排产日期: response.data[i].计划日期,
完成日期: response.data[i].工序完成日期 ? response.data[i].工序完成日期.split(' ')[0] : '',
操作者: response.data[i].操作者,
不合格数量: response.data[i].不合格数量,
质检数量: response.data[i].数量
})
}
}
})
}, // 补加完成日期
// EditData() {
// editdata(this.processSerialNumber).then(response => {
// if (response.data.result === '1') {
// this.$message.success('编辑成功')
// } else {
// this.$message.error('编辑失败')
// }
// })
// },
// getRow(row) {
// console.log(this.completeTime)
// this.completeTime = row.完成日期
// this.processSerialNumber = row.工序流水号
// if (this.completeTime === null) {
// this.isShow = false
// } else {
// this.isShow = true
// }
// },
// 完成日期变色
tableRowClassName({ row, rowIndex }) {
row.index = rowIndex
if (row.完成日期 !== '') {
return 'CompleteColor'
}
},
handleSizeChange(val) {
this.pageSize = val
this.getTableData()
},
handleCurrentChange(val) {
this.pageCurrent = val
this.getTableData()
}
}
}
</script>
<style>
.CompleteColor{
background: #9bd7fc !important;
}
</style>

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

@@ -48,7 +48,7 @@
style="top: 1px;"
placeholder="选择开始日期"/>
<el-tooltip :open-delay="1200" effect="dark" content="变更零件加工开始和结束时间" placement="top">
<el-button size="small" type="primary" style="margin: 10px" @click="PartPlan()">零件计划变更</el-button>
<el-button size="small" type="primary" @click="PartPlan()">零件计划变更</el-button>
</el-tooltip>
<el-button v-if="false" size="small" type="primary" icon="el-icon-download" @click="Export()">导出Excel</el-button>
<el-table
@@ -65,12 +65,12 @@
type="selection"
align="center"
width="50"/>
<el-table-column label="零件图号" align="center" width="200">
<el-table-column label="零件图号" prop="零件图号" align="center" width="200">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" width="300">
<el-table-column label="零件名称" prop="零件名称" align="center" width="300">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -134,24 +134,25 @@
</el-table>
<div v-if="是否扫描 === false" class="block" style="margin-top: 10px;">
<el-pagination
v-show="false"
:current-page="currentPage"
:page-sizes="[10, 20, 30, 40]"
:page-size="10"
:page-sizes="[10, 20, 30, 1000000]"
:page-size="pageSize"
:total="total"
style="float:left"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
<el-tooltip :open-delay="1200" effect="dark" content="将选中零件自动排出加工工序" placement="top">
<el-button type="warning" size="small" icon="el-icon-download" style="float:right;margin:5px 50px 10px 10px" @click="Selection">选入</el-button>
<el-button type="warning" size="small" icon="el-icon-download" @click="Selection">选入</el-button>
</el-tooltip>
<el-button type="warning" size="small" icon="el-icon-download" style="float:right;margin:5px 20px 10px 10px" @click="SelectionAll">全部选入</el-button>
<el-button type="warning" size="small" icon="el-icon-download" @click="SelectionAll">全部选入</el-button>
</div>
<div v-if="是否扫描 === true" class="block" style="margin-top: 10px;">
<el-pagination
:current-page="currentPage5"
:page-sizes="[10, 20, 30, 40]"
:page-size="10"
:page-sizes="[10, 20, 30, 1000000]"
:page-size="pageSize5"
:total="total5"
style="float:left"
layout="total, sizes, prev, pager, next, jumper"
@@ -424,7 +425,7 @@
<el-pagination
:current-page="currentPage1"
:page-sizes="[10, 20, 30, 40]"
:page-size="10"
:page-size="pageSize1"
:total="total1"
style="float:left"
layout="total, sizes, prev, pager, next, jumper"
@@ -705,15 +706,15 @@ export default {
tableData2: [], // 导出临时表
length: 0, // 记TABLEDATA1的长度
total: 0, // 总条数
pageSize: 10, // 每页显示条数
pageSize: 1000000, // 每页显示条数
pageList: 1, // 后台获取页
currentPage: 1, // 显示当前页
total1: 0, // 总条数
pageSize1: 10, // 每页显示条数
pageSize1: 1000000, // 每页显示条数
pageList1: 1, // 后台获取页
currentPage1: 1, // 显示当前页
total5: 0, // 总条数
pageSize5: 10, // 每页显示条数
pageSize5: 1000000, // 每页显示条数
pageList5: 1, // 后台获取页
currentPage5: 1 // 显示当前页
}

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

@@ -186,7 +186,8 @@
</div>
</template>
<script>import { SelectMachine } from '@/api/ManufacturingCenter/ParseQuery'
<script>
import { SelectMachine } from '@/api/ManufacturingCenter/ParseQuery'
import request from '@/utils/request'
export default {
data() {

223
src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue Normal file
View File

@@ -0,0 +1,223 @@
<template>
<div class="app-container">
<el-card>
<el-date-picker
v-model="startTime"
value-format="yyyy-MM-dd"
size="small"
style="width: 170px;margin:0px 10px"
type="date"
placeholder="选择开始加工日期"/>
<span class="demonstration">~</span>
<el-date-picker
v-model="endTime"
value-format="yyyy-MM-dd"
size="small"
style="width: 170px;margin:0px 10px"
type="date"
placeholder="选择加工完成日期"/>
<el-button type="success" class="el-icon-search" size="small" style="margin:0px 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
<!-- <el-tooltip :open-delay="1000" content="导出人员工时统计表" placement="right">-->
<!-- <el-button type="primary" size="small" icon="el-icon-download" style="margin:0px 10px" @click="exportUninquirySheet1()">导出</el-button>-->
<!-- </el-tooltip>-->
</el-card>
<el-row>
<el-col style="width: 400px">
<el-card>
<el-table
v-loading="loading"
:data="tableData"
highlight-current-row
size="mini"
stripe
style="width: 100%;"
height="800px"
border
element-loading-text="拼命加载中"
@row-click="searchTable2">
<el-table-column label="操作者" align="center" width="110px" show-overflow-tooltip>
<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-pagination
v-if="!loading"
:current-page="pageCurrent"
:page-size="pageSize"
:total="total"
layout="total"/>
</div>
</el-card>
</el-col>
<el-col style="margin-left: 0px;width: 830px">
<el-card>
<el-table v-loading="loading2" :data="tableData2" size="mini" stripe highlight-current-row style="width: 100%;" height="800px" border element-loading-text="拼命加载中">
<el-table-column label="零件图号" align="center" width="150px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" width="130px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="工艺名称" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column label="完成数量" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.完成数量 }}
</template>
</el-table-column>
<el-table-column label="序间质检" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.质检结果 }}
</template>
</el-table-column>
<el-table-column label="不合格数" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.不合格数量 }}
</template>
</el-table-column>
<el-table-column label="计划工时" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.理论加工时间段 }}
</template>
</el-table-column>
<el-table-column label="加工工时" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.实际加工时间段 }}
</template>
</el-table-column>
<el-table-column label="完成时间" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.加工完成时间 }}
</template>
</el-table-column>
</el-table>
<div>
<el-pagination
v-if="!loading2"
:current-page="pageCurrent2"
:page-size="pageSize2"
:total="total2"
layout="total"
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"/>
</div>
</el-card>
</el-col>
</el-row>
</div>
</template>
<script>
import { searchtable, searchtable2 } from '@/api/ManufacturingCenter/ScheduleCompletionDetails'
import { getNowTime } from '@/utils/tool'
export default {
data() {
return {
startTime: '', // 开始时间
endTime: getNowTime(), // 结束时间
tableData: [], // 操作者工时统计
loading: '',
tableData2: [], // 工序统计表
loading2: '',
pageCurrent: 1,
pageSize: 10000,
total: '',
pageCurrent2: 1,
pageSize2: 10000,
total2: '',
timeCheck: '',
operater: ''
}
},
created() {
this.searchTable()
},
methods: {
// 查询表格数据
searchTable() {
this.loading = true
this.tableData = []
this.tableData2 = []
this.total2 = 0
if (this.startTime !== '' && this.startTime !== null && this.endTime !== null && this.endTime !== null) {
this.timeCheck = 1
} else {
// this.startTime = ''
// this.endTime = ''
this.timeCheck = 0
}
searchtable(this.operater, this.timeCheck, this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => {
if (response.data.total === 0) {
this.loading = false
} else {
this.total = response.data.total
this.tableData = response.data.rows
}
}).then(() => {
this.loading = false
})
}, // 获取工序表
searchTable2(row) {
this.loading2 = true
this.tableData2 = []
this.pageCurrent2 = 1
searchtable2(row.人员编号, this.timeCheck, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => {
if (response.data.rows.length !== 0) {
for (let i = 0; i < response.data.rows.length; i++) {
this.tableData2.push({
零件图号: response.data.rows[i].零件图号,
零件名称: response.data.rows[i].零件名称,
工艺名称: response.data.rows[i].工艺名称,
完成数量: response.data.rows[i].完成数量,
质检结果: response.data.rows[i].质检结果,
不合格数量: response.data.rows[i].不合格数量,
理论加工时间段: response.data.rows[i].理论加工时间段,
实际加工时间段: response.data.rows[i].实际加工时间段,
加工完成时间: response.data.rows[i].加工完成时间 ? response.data.rows[i].加工完成时间.split(' ')[0] : ''
})
}
}
this.loading2 = false
this.total2 = response.data.total
})
},
handleSizeChange2(val) {
this.pageCurrent2 = 1
this.pageSize2 = val
this.searchTable2()
},
handleCurrentChange2(val) {
this.pageCurrent2 = val
this.searchTable2()
}
}
}
</script>
<style scoped>
</style>

306
src/views/ManufacturingCenter/ShopScheduling/index.vue Normal file
View File

@@ -0,0 +1,306 @@
<template>
<div>
<el-row>
<el-col style="width: 650px">
<el-card style="height: 800px">
<el-row style="margin-top: 5px">
<el-select v-model="PersonValue" filterable placeholder="操作者" size="small" style="width: 100px;float: right" @change="searchTableData2">
<el-option
v-for="item in Person"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-row>
<el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName" height="710" highlight-current-row size="mini" style="width: 100%" border @row-click="getGongxu">
<el-table-column
label="序号"
type="index"
align="center"
width="50"/>
<el-table-column label="图号及规格" align="center" width="190px">
<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="70px">
<template slot-scope="scope">
{{ scope.row.投产数量 }}
</template>
</el-table-column>
<el-table-column label="计划开始" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.计划开始时间 }}
</template>
</el-table-column>
<el-table-column label="计划完成" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.计划结束时间 }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[50, 100, 200, 500, 1000]"
:page-size="pageSize"
:total="total"
:pager-count="5"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
</el-col>
<el-col style="width: 650px">
<el-card style="height: 800px">
<el-table :data="tableData2" height="380" highlight-current-row size="mini" style="width: 100%" border stripe @row-dblclick="XuanChu">
<el-table-column label="零件图号" align="center" width="190px">
<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="100px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.投产数量 }}
</template>
</el-table-column>
<el-table-column label="操作者" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
</el-table>
<el-table :data="tableData3" :row-class-name="tableData3ClassName" height="393" size="mini" style="width: 100%" border @row-dblclick="XuanRu">
<el-table-column label="序号" align="center" width="50px">
<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="90px">
<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="120px">
<template slot-scope="scope">
{{ scope.row.完成日期 }}
</template>
</el-table-column>
</el-table>
</el-card>
</el-col>
</el-row>
</div>
</template>
<script>
import { getPerson, getParts, getGongxu, XuanRu, XuanChu, searchTableData2, panDuan } from '@/api/ManufacturingCenter/ShopScheduling'
export default {
data() {
return {
index: 0,
工艺计划流水号: '',
PersonValue: '',
Person: [],
loading1: false,
loading2: false,
loading3: false,
tableData1: [],
tableData2: [],
tableData3: [],
total: 0, // 总条数
pageSize: 500,
pageCurrent: 1
}
},
created() {
this.getPerson()
this.getParts()
},
methods: {
getPerson() {
this.PersonValue = ''
this.Person = []
getPerson().then(response => {
response.data.map(v => {
this.Person.push({
label: v.姓名,
value: v.人员编号
})
})
this.PersonValue = this.Person[0].value
this.searchTableData2()
})
},
getParts() {
this.tableData1 = []
this.loading1 = true
getParts(this.pageCurrent, this.pageSize).then(response => {
response.data.rows.map(v => {
this.tableData1.push({
工艺计划流水号: v.工艺计划流水号,
图号及规格: v.图号及规格,
零件名称: v.零件名称,
投产数量: v.投产数量,
计划开始时间: v.计划开始时间 ? v.计划开始时间.split(' ')[0] : '',
计划结束时间: v.计划结束时间 ? v.计划结束时间.split(' ')[0] : '',
状态: v.状态
})
})
this.total = response.data.total
this.loading1 = false
})
},
getGongxu(row) {
this.loading3 = true
this.tableData3 = []
this.index = row.index
this.工艺计划流水号 = row.工艺计划流水号
getGongxu(row.工艺计划流水号).then(response => {
response.data.map(v => {
this.tableData3.push({
工序流水号: v.工序流水号,
工序状态: v.工序状态,
工序顺序: v.工序顺序,
工艺名称: v.工艺名称,
姓名: parseInt(v.工序间是否外协) === 2 ? '外协' : v.姓名,
排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '',
完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : '',
工序间是否外协: v.工序间是否外协
})
})
this.loading3 = false
})
},
tableData1ClassName({ row, rowIndex }) {
row.index = rowIndex
if (row.状态 === '1') {
return 'CJPClingjianjinxing'
}
},
tableData3ClassName({ row, rowIndex }) {
if (row.工序状态 === 4) {
return 'CJPCgongxuwancheng'
}
if (row.工序间是否外协 === 2) {
return 'CJPCxujianwaixie'
}
},
searchTableData2() {
this.loading2 = true
this.tableData2 = []
searchTableData2(this.PersonValue).then(response => {
this.tableData2 = response.data
this.loading2 = false
})
},
XuanRu(row) {
if (row.工序状态 !== 4 && row.工序间是否外协 !== 2) {
XuanRu(this.PersonValue, row.工序流水号).then(response => {
if (response.data[0].result === '1') {
this.tableData1[this.index].状态 = '1'
this.loading3 = true
this.tableData3 = []
getGongxu(this.工艺计划流水号).then(response => {
response.data.map(v => {
this.tableData3.push({
工序流水号: v.工序流水号,
工序状态: v.工序状态,
工序顺序: v.工序顺序,
工艺名称: v.工艺名称,
姓名: parseInt(v.工序间是否外协) === 2 ? '外协' : v.姓名,
排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '',
完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : '',
工序间是否外协: v.工序间是否外协
})
})
this.loading3 = false
})
this.searchTableData2()
}
})
}
},
XuanChu(row) {
XuanChu(row.工序流水号).then(response => {
if (response.data[0].result === '1') {
panDuan(row.工艺计划流水号).then(res => {
if (res.data[0].状态 === 0) {
this.tableData1.map(v => {
if (parseInt(v.工艺计划流水号) === parseInt(res.data[0].工艺计划流水号)) {
v.状态 = ''
}
})
}
})
this.loading3 = true
this.tableData3 = []
getGongxu(this.工艺计划流水号).then(response => {
response.data.map(v => {
this.tableData3.push({
工序流水号: v.工序流水号,
工序状态: v.工序状态,
工序顺序: v.工序顺序,
工艺名称: v.工艺名称,
姓名: parseInt(v.工序间是否外协) === 2 ? '外协' : v.姓名,
排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '',
完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : '',
工序间是否外协: v.工序间是否外协
})
})
this.loading3 = false
})
this.searchTableData2()
}
})
},
handleSizeChange(val) {
this.tableData3 = []
this.pageSize = val
this.getParts()
},
handleCurrentChange(val) {
this.tableData3 = []
this.pageCurrent = val
this.getParts()
}
}
}
</script>
<style>
.CJPCgongxuwancheng{
background: #d8e5f6 !important;
}
.CJPClingjianjinxing{
background: #9bd7fc !important;
}
.CJPCxujianwaixie{
background: #e6eaee !important;
}
</style>

4
src/views/ManufacturingCenter/SparePartsForScrap/index.vue
View File

@@ -49,14 +49,14 @@
@current-change="fetchTableData2">
<el-table-column
align="center"
prop="province1"
prop="零件图号"
label="零件号"
>
<template slot-scope="scope">{{ scope.row.零件图号 }}</template>
</el-table-column>
<el-table-column
align="center"
prop="province2"
prop="零件名称"
label="零件名称"
>
<template slot-scope="scope">{{ scope.row.零件名称 }}</template>

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

@@ -2,11 +2,11 @@
<div class="app-container">
<el-card>
<el-row>
<span>项目名称:</span>
<!-- <span>项目名称:</span>-->
<el-select
v-model="entryNameValue"
placeholder="项目名称"
style="width:200px;margin-top: 10px"
style="width:200px;margin: 10px 10px 0px 10px"
size="small"
clearable
filterable
@@ -17,20 +17,18 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床图号:</span>
<el-input v-model="machineToolNumber" placeholder="机床号" size="small" readonly clearable style="width:200px" @change="empty1">
<!-- <span>机床图号:</span>-->
<el-input v-model="machineToolNumber" placeholder="机床号" size="small" readonly clearable style="width:200px;margin: 10px 10px 0px 10px" @change="empty1">
<el-button slot="append" icon="el-icon-search" @click="SearchMachine" />
</el-input>
<span>组号:</span>
<el-input v-model="groupNumber" placeholder="组号" size="small" readonly clearable style="width:200px">
<!-- <span>组号:</span>-->
<el-input v-model="groupNumber" placeholder="组号" size="small" readonly clearable style="width:200px;margin: 10px 10px 0px 10px">
<el-button slot="append" icon="el-icon-search" @click="searchGroupList" />
</el-input>
</el-row>
<el-row>
<span>零件图号:</span>
<el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px;margin-top: 10px"/>
<span>零件状态:</span>
<el-select v-model="partStateValue" placeholder="零件状态" size="small" clearable style="width:200px">
<!-- <span>零件图号:</span>-->
<el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px;margin: 10px 10px 0px 10px"/>
<!-- <span>零件状态:</span>-->
<el-select v-model="partStateValue" placeholder="零件状态" size="small" clearable style="width:200px;margin: 10px 10px 0px 10px">
<el-option
v-for="item in partState"
:key="item.value"
@@ -47,13 +45,15 @@
<!--</el-select>-->
<el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
</el-row>
<!-- <el-row>-->
<!-- </el-row>-->
</el-card>
<el-card>
<el-table
v-loading="loading0"
:data="tableData"
style="width: 100%;max-height: 600px"
height="600"
style="width: 100%"
height="820"
stripe
size="mini"
highlight-current-row
@@ -112,16 +112,16 @@
<!--</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>
<!-- <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 :title="title" :visible.sync="dialogFormVisible4" center style="min-height: 300px" width="400px">
<el-form label-position="left" label-width="110px" class="demo-ruleForm">
@@ -272,8 +272,8 @@ export default {
partState: [], // 零件状态数组
partTypeValue: null, // 零件类型
num: null,
pageCurrent: 1,
pageSize: 20,
// pageCurrent: 1,
// pageSize: 20,
pageCurrent1: 1,
pageSize1: 20,
pageCurrent2: 1,
@@ -282,7 +282,7 @@ export default {
tableData6: [],
tableData: [],
state: null,
total: null,
// total: null,
total1: null,
total2: null,
title: '',
@@ -352,16 +352,15 @@ export default {
this.check5 = 0
}
this.loading0 = true
searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.partNumber, this.check4, this.partStateValue, this.check5, this.partTypeValue, this.pageSize, this.pageCurrent).then(response => {
for (let i = 0; i < response.data.rows.length; i++) {
response.data.rows[i].考核状态 = parseInt(response.data.rows[i].考核状态) - 2
if (response.data.rows[i].传递时间 !== undefined || response.data.rows[i].hasOwnProperty('传递时间')) {
response.data.rows[i].传递时间 = response.data.rows[i].传递时间.split(' ', 2)[0]
searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.partNumber, this.check4, this.partStateValue, this.check5, this.partTypeValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
response.data[i].考核状态 = parseInt(response.data[i].考核状态) - 2
if (response.data[i].传递时间 !== undefined || response.data[i].hasOwnProperty('传递时间')) {
response.data[i].传递时间 = response.data[i].传递时间.split(' ', 2)[0]
}
}
this.loading0 = false
this.tableData = response.data.rows
this.total = parseInt(response.data.total)
this.tableData = response.data
})
},
getList() { // 初始化项目名称
@@ -454,14 +453,14 @@ export default {
cancel() { // 取消
this.dialogFormVisible4 = false
},
handleSizeChange(val) {
this.pageSize = val
this.searchData()
},
handleCurrentChange(val) {
this.pageCurrent = val
this.searchData()
},
// handleSizeChange(val) {
// this.pageSize = val
// this.searchData()
// },
// handleCurrentChange(val) {
// this.pageCurrent = val
// this.searchData()
// },
handleSizeChange1(val) {
this.pageSize1 = val
this.SearchMachine()

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

@@ -11,17 +11,17 @@
<el-card>
<el-table :data="List" border size="small" stripe highlight-current-row height="500px">
<el-table-column label="设备名称" align="center" >
<el-table-column label="设备名称" prop="设备名称" align="center" >
<template slot-scope="scope">
{{ scope.row.设备名称 }}
</template>
</el-table-column>
<el-table-column label="设备编号" align="center" >
<el-table-column label="设备编号" prop="设备编号" align="center" >
<template slot-scope="scope">
{{ scope.row.设备编号 }}
</template>
</el-table-column>
<el-table-column label="设备型号" align="center" >
<el-table-column label="设备型号" rop="设备型号" align="center" >
<template slot-scope="scope">
{{ scope.row.设备型号 }}
</template>
@@ -32,7 +32,7 @@
</template>
</el-table-column>
<el-table-column label="设备加工能力" align="center" >
<template slot-scope="scope">
<template slot-scope="scope">p
{{ scope.row.设备加工能力工时 }}
</template>
</el-table-column>

117
src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
View File

@@ -2,27 +2,26 @@
<div class="app-container">
<el-card>
<el-row>
<span style="margin-left: 10px">操作者:</span>
<el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:200px"/>
<span class="demonstration">完成加工时间:</span>
<el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:200px;margin:0px 10px"/>
<!-- <span class="demonstration">完成加工时间:</span>-->
<el-date-picker
v-model="startTime"
value-format="yyyy-MM-dd"
size="small"
style="width: 160px"
style="width: 170px;margin:0px 10px"
type="date"
placeholder="选择日期"/>
placeholder="选择开始加工日期"/>
<span class="demonstration">~</span>
<el-date-picker
v-model="endTime"
value-format="yyyy-MM-dd"
size="small"
style="width: 160px"
style="width: 170px;margin:0px 10px"
type="date"
placeholder="选择日期"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
placeholder="选择加工完成日期"/>
<el-button type="success" class="el-icon-search" size="small" style="margin:0px 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
<el-tooltip :open-delay="1000" content="导出人员工时统计表" placement="right">
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportUninquirySheet1()">导出</el-button>
<el-button type="primary" size="small" icon="el-icon-download" style="margin:0px 10px" @click="exportUninquirySheet1()">导出</el-button>
</el-tooltip>
</el-row>
</el-card>
@@ -61,7 +60,7 @@
:current-page="pageCurrent"
:page-size="pageSize"
:total="total"
layout="total, prev, pager, next"
layout="total"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
@@ -117,8 +116,8 @@
</el-col>
</el-card>
<el-card>
<span style="margin-left: 10px">机床编号:</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin-top: 10px" clearable @change="searchTable4();searchTable6()">
<!-- <span style="margin-left: 10px">机床编号:</span>-->
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin:0px 10px" clearable @change="searchTable4();searchTable6()">
<el-option
v-for="item in machineNumber"
:key="item.value"
@@ -154,16 +153,16 @@
</template>
</el-table-column>
</el-table>
<div style="margin: 10px">
<el-pagination
v-if="!loading3"
:current-page="pageCurrent3"
:page-size="pageSize3"
:total="total3"
layout="total, prev, pager, next"
@size-change="handleSizeChange3"
@current-change="handleCurrentChange3"/>
</div>
<!-- <div style="margin: 10px">-->
<!-- <el-pagination-->
<!-- v-if="!loading3"-->
<!-- :current-page="pageCurrent3"-->
<!-- :page-size="pageSize3"-->
<!-- :total="total3"-->
<!-- layout="total"-->
<!-- @size-change="handleSizeChange3"-->
<!-- @current-change="handleCurrentChange3"/>-->
<!-- </div>-->
</el-col>
<el-col :span="17" style="margin-left: 30px;">
<el-table v-loading="loading4" :data="tableData4" size="mini" height="380" stripe highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
@@ -188,16 +187,16 @@
</template>
</el-table-column>
</el-table>
<div style="margin: 10px">
<el-pagination
v-if="!loading4"
:current-page="pageCurrent4"
:page-size="pageSize4"
:total="total4"
layout="total, prev, pager, next, jumper"
@size-change="handleSizeChange4"
@current-change="handleCurrentChange4"/>
</div>
<!-- <div style="margin: 10px">-->
<!-- <el-pagination-->
<!-- v-if="!loading4"-->
<!-- :current-page="pageCurrent4"-->
<!-- :page-size="pageSize4"-->
<!-- :total="total4"-->
<!-- layout="total"-->
<!-- @size-change="handleSizeChange4"-->
<!-- @current-change="handleCurrentChange4"/>-->
<!-- </div>-->
</el-col>
</el-card>
</div>
@@ -214,7 +213,7 @@ export default {
loading: false,
tableData: [], // 表格数据
total: null, // 总条数
pageSize: 10, // 每页显示条数
pageSize: 1000, // 每页显示条数
pageCurrent: 1, // 后台获取页
gongzuozhebianhao: '',
machinenumber: '',
@@ -224,17 +223,17 @@ export default {
loading2: false,
tableData2: [], // 表格数据
total2: null, // 总条数
pageSize2: 10, // 每页显示条数
pageSize2: 1000, // 每页显示条数
pageCurrent2: 1, // 后台获取页
loading3: false,
tableData3: [], // 表格数据
total3: null, // 总条数
pageSize3: 10, // 每页显示条数
pageSize3: 1000, // 每页显示条数
pageCurrent3: 1, // 后台获取页
loading4: false,
tableData4: [], // 表格数据
total4: null, // 总条数
pageSize4: 10, // 每页显示条数
pageSize4: 1000, // 每页显示条数
pageCurrent4: 1 // 后台获取页
}
},
@@ -414,12 +413,12 @@ export default {
this.tableData4 = []
this.total3 = 0
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check1 = 1 } else { this.check1 = 0 }
searchtable4(this.check1, this.machineNumberValue, this.pageCurrent, this.pageSize).then(response => {
searchtable4(this.check1, this.machineNumberValue).then(response => {
if (response.data.total === 0) {
this.loading3 = false
} else {
this.total3 = response.data.total
this.tableData3 = response.data.rows
this.tableData3 = response.data
}
}).then(() => {
this.loading3 = false
@@ -430,12 +429,12 @@ export default {
this.tableData4 = []
this.pageCurrent4 = 1
this.machineNumberValue = parseInt(row.机床流水号)
searchtable5(this.machineNumberValue, this.pageCurrent4, this.pageSize4).then(response => {
searchtable5(this.machineNumberValue).then(response => {
if (response.data.total === 0) {
this.loading4 = false
} else {
this.total4 = response.data.total
this.tableData4 = response.data.rows
this.tableData4 = response.data
}
}).then(() => {
this.loading4 = false
@@ -473,26 +472,26 @@ export default {
handleCurrentChange2(val) {
this.pageCurrent2 = val
this.searchTable3()
},
// 分页
handleSizeChange3(val) {
this.pageCurrent3 = 1
this.pageSize3 = val
this.searchTable4()
},
handleCurrentChange3(val) {
this.pageCurrent3 = val
this.searchTable4()
},
handleSizeChange4(val) {
this.pageCurrent4 = 1
this.pageSize4 = val
this.searchTable6()
},
handleCurrentChange4(val) {
this.pageCurrent4 = val
this.searchTable6()
}
// 分页
// handleSizeChange3(val) {
// this.pageCurrent3 = 1
// this.pageSize3 = val
// this.searchTable4()
// },
// handleCurrentChange3(val) {
// this.pageCurrent3 = val
// this.searchTable4()
// },
// handleSizeChange4(val) {
// this.pageCurrent4 = 1
// this.pageSize4 = val
// this.searchTable6()
// },
// handleCurrentChange4(val) {
// this.pageCurrent4 = val
// this.searchTable6()
// }
}
}
</script>

53
src/views/MarketingCenter/BidBond/index.vue
View File

@@ -2,40 +2,31 @@
<div class="app-container">
<!--顶栏结构-->
<el-card>
<!--<el-radio v-model="radio" label="1">未收回</el-radio>-->
<!--<el-radio v-model="radio" label="2">已收回</el-radio>-->
<span>招标企业:</span>
<el-input v-model="TenderingEnterprise" clearable size="small" style="width:200px;margin: 3px 0" placeholder="请输入招标企业"/>
<span style="margin-left: 10px">保金类型:</span>
<el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择" size="small" style="width: 200px">
<el-input v-model="TenderingEnterprise" clearable size="small" style="width:150px;margin: 3px 0" placeholder="请输入招标企业"/>
<el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择保金类型" size="small" style="width: 150px">
<el-option
v-for="item in TypeOfGoldDeposit"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span style="margin-left: 10px">投标人:</span>
<el-input v-model="Bidder" clearable size="small" style="width:200px" placeholder="请选择" @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/>
<el-row>
<span>开始日期: </span>
<el-date-picker
v-model="startTime"
style="width: 200px;margin: 3px 0"
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="请选择开始日期"/>
<span style="margin-left: 10px">结束日期: </span>
<el-date-picker
v-model="endTime"
style="width: 200px;"
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="请选择结束日期"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">新增</el-button>
</el-row>
<el-input v-model="Bidder" clearable size="small" style="width:150px" placeholder="请选择投标人" @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/>
<el-date-picker
v-model="startTime"
style="width: 150px;margin: 3px 0"
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="请选择开始日期"/>
<el-date-picker
v-model="endTime"
style="width: 150px;"
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="请选择结束日期"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">新增</el-button>
</el-card>
<!--投标保证金表格-->
@@ -49,7 +40,7 @@
border
stripe
size="mini">
<el-table-column align="center" label="投标结果" width="200">
<el-table-column align="center" label="投标结果" prop="投标结果" width="200">
<template slot-scope="scope">
<el-radio-group v-model="scope.row.投标结果" @change="changeTenderResult(scope.row)">
<el-radio :disabled="scope.row.是否禁用已中标" label="1">已中标</el-radio>
@@ -62,7 +53,7 @@
{{ !scope.row.公布日期 ? '未公布' : scope.row.公布日期.substring(0 , scope.row.公布日期.length - 8) }}
</template>
</el-table-column>
<el-table-column align="center" label="招标企业" width="180">
<el-table-column align="center" label="招标企业" prop="招标企业" width="180">
<template slot-scope="scope">
{{ scope.row.招标企业 }}
</template>
@@ -103,7 +94,7 @@
<el-tag v-else slot="reference" type="danger" size="mini" style="width: 66px">未收回</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="投标人" width="100">
<el-table-column align="center" label="投标人" prop="投标人" width="100">
<template slot-scope="scope">
{{ scope.row.投标人 }}
</template>

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

@@ -107,7 +107,7 @@
<el-card>
<el-button icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px" @click = "addCustomer();flag1 = 1">新增客户</el-button>
<el-table v-loading="loading2" :data="tableData2" highlight-current-row height="640" size="mini" stripe style="width: 100%;margin-top: 2px" border>
<el-table-column label="客户名称" align="center" min-width="180" show-overflow-tooltip>
<el-table-column label="客户名称" prop="客户名称" align="center" min-width="180" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>

25
src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
View File

@@ -2,32 +2,25 @@
<div>
<el-card>
<el-row>
<span>项目名称：</span>
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin-bottom:10px" size="small">
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin-right:5px;width:150px" size="small">
<el-option
v-for="item in entryName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span style="margin-left: 10px">机床型号：</span>
<el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
<span style="margin-left: 10px">营销经理：</span>
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
</el-row>
<el-row>
<span>开始日期：</span>
<el-input v-model="machine" clearable size="small" style="margin-right:5px;width:150px" placeholder="请输入机床型号"/>
<el-input v-model="MarketingManagerValue" clearable size="small" style="margin-right:5px;width:150px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
<el-date-picker
v-model="startTime"
style="width: 200px;"
style="margin-right:5px;width:150px"
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="请选择开始日期"/>
<span style="margin-left: 10px">结束日期：</span>
<el-date-picker
v-model="endTime"
style="width: 200px;"
style="width: 150px;"
value-format="yyyy-MM-dd"
size="small"
type="date"
@@ -66,14 +59,14 @@
</el-table>
</template>
</el-table-column>
<el-table-column align="center" label="合同编号" width="130">
<el-table-column align="center" label="合同编号" prop="合同编号" width="130">
<template slot-scope="scope">
<template>
<el-tag slot="reference" type="mini">{{ scope.row.合同编号 }}</el-tag>
</template>
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" width="150" show-overflow-tooltip>
<el-table-column align="center" label="项目名称" prop="项目名称" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
@@ -108,12 +101,12 @@
{{ scope.row.安装调试节点&&scope.row.安装调试节点!=='1900/1/1' ? scope.row.安装调试节点 : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="销售经理" width="90">
<el-table-column align="center" label="销售经理" prop="营销经理" width="100">
<template slot-scope="scope">
{{ scope.row.营销经理 }}
</template>
</el-table-column>
<el-table-column align="center" label="客户名称" width="230" show-overflow-tooltip>
<el-table-column align="center" label="客户名称" prop="客户名称" width="230" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>

10
src/views/MarketingCenter/ContractCapitalManagement/index.vue
View File

@@ -24,7 +24,7 @@
:expand-row-keys="expands"
:data="tableData1"
style="width: 100%;"
height="500px"
height="600px"
highlight-current-row
border
stripe
@@ -52,12 +52,12 @@
</el-table>
</template>
</el-table-column>
<el-table-column align="center" label="合同编号" width="140">
<el-table-column align="center" label="合同编号" prop="合同编号" width="140">
<template slot-scope="scope">
<el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" width="80" show-overflow-tooltip>
<el-table-column align="center" label="项目名称" prop="项目名称" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
@@ -94,12 +94,12 @@
</div>
</template>
</el-table-column>
<el-table-column align="center" label="营销经理" width="70">
<el-table-column align="center" label="营销经理" prop="姓名" width="100">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column align="center" label="客户名称" width="160" show-overflow-tooltip>
<el-table-column align="center" label="客户名称" prop="客户名称" width="160" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>

27
src/views/MarketingCenter/ContractInformationManagement/index.vue
View File

@@ -2,32 +2,25 @@
<div class="app-container">
<el-card style="background: rgb(233,240,250)">
<div>
<span>项目名称：</span>
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:200px;margin-top: 3px;">
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:150px;margin-top: 3px;">
<el-option
v-for="item in entryName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span style="margin-left: 10px">机床型号：</span>
<el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
<span style="margin-left: 10px">营销经理：</span>
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
</div>
<div style="margin-top: 10px">
<span style="margin-top: 20px">开始日期：</span>
<el-input v-model="machine" clearable size="small" style="width:150px" placeholder="请输入机床型号"/>
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:140px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
<el-date-picker
v-model="startTime"
style="width: 200px;"
style="width: 150px;"
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="请选择开始日期"/>
<span style="margin-left: 10px">结束日期：</span>
<el-date-picker
v-model="endTime"
style="width: 200px;margin-bottom: 3px;"
style="width: 150px;margin-bottom: 3px;"
value-format="yyyy-MM-dd"
size="small"
type="date"
@@ -44,7 +37,7 @@
:expand-row-keys="expands"
highlight-current-row
style="width: 100%;margin: 3px 0px"
height="500"
height="700"
border
stripe
size="mini"
@@ -94,7 +87,7 @@
</el-table>
</template>
</el-table-column>
<el-table-column align="center" label="合同编号" width="130">
<el-table-column align="center" label="合同编号" prop="合同编号" width="130">
<template slot-scope="scope">
<template>
<el-popover
@@ -114,12 +107,12 @@
</template>
</template>
</el-table-column>
<el-table-column align="center" label="客户名称" width="190" show-overflow-tooltip>
<el-table-column align="center" label="客户名称" prop="客户名称" width="190" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" width="140" show-overflow-tooltip>
<el-table-column align="center" label="项目名称" prop="项目名称" width="140" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
@@ -146,7 +139,7 @@
</el-table-column>
<el-table-column align="center" label="发货节点" width="85">
<template slot-scope="scope">
{{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.图纸会签节点 : '-' }}
{{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="安装调试节点" width="100">

6
src/views/MarketingCenter/CreateProject/index.vue
View File

@@ -83,19 +83,19 @@
</el-table>
</template>
</el-table-column>
<el-table-column align="center" label="合同编号" width="150">
<el-table-column align="center" label="合同编号" prop="合同编号" width="150">
<template slot-scope="scope">
<template>
<el-tag slot="reference">{{ scope.row.合同编号 }}</el-tag>
</template>
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" min-width="150">
<el-table-column align="center" label="项目名称" prop="项目名称" min-width="150">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="项目下达日期" width="150">
<el-table-column align="center" label="项目下达日期" prop="合同签订日期" width="150">
<template slot-scope="scope">
{{ scope.row.合同签订日期 }}
</template>

24
src/views/MarketingCenter/InvoiceRecord/index.vue
View File

@@ -3,30 +3,24 @@
<!--查询条件-->
<el-card>
<el-row>
<span>项目名称：</span>
<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-bottom: 10px" size="small" clearable>
<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-right: 5px" size="small" clearable>
<el-option
v-for="item in entryName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span style="margin-left: 10px">营销经理：</span>
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clearPeople()"/>
</el-row>
<el-row>
<span>开始日期：</span>
<el-input v-model="MarketingManagerValue" clearable size="small" style="margin-right: 5px;width: 150px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clearPeople()"/>
<el-date-picker
v-model="startTime"
style="width: 200px;"
style="margin-right: 5px;width: 150px;"
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="请选择开始日期"/>
<span style="margin-left: 10px">结束日期：</span>
<el-date-picker
v-model="endTime"
style="width: 200px;"
style="width: 150px;"
value-format="yyyy-MM-dd"
size="small"
type="date"
@@ -40,18 +34,18 @@
v-loading="listLoading1"
:data="tableData1"
highlight-current-row
style="width: 100%;margin-top: 3px"
height="460"
style="width: 1360px;margin-top: 3px"
height="550"
border
stripe
size="mini"
@row-click="fetchTableData2">
<el-table-column align="center" label="合同编号" width="140">
<el-table-column align="center" label="合同编号" prop="合同编号" width="140">
<template slot-scope="scope">
<el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" width="150" show-overflow-tooltip>
<el-table-column align="center" label="项目名称" prop="项目名称" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
@@ -88,7 +82,7 @@
<el-input :disabled="scope.row.是是否禁用税率编辑" v-model="scope.row.税率" class="tableInput" size="mini" style="width:70px" placeholder="请填写税率" @click.native="unlockEditor(scope.row)" @blur="lockEditor(scope.row)" @change="revisionOfTaxRate(scope.row)"/>
</template>
</el-table-column>
<el-table-column align="center" label="合同信息备注">
<el-table-column align="center" label="合同信息备注" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.合同信息备注 }}
</template>

16
src/views/MarketingCenter/PerformanceBond/index.vue
View File

@@ -32,19 +32,19 @@
<el-table
v-loading="listLoading1"
:data="tableData1"
style="width: 100%;margin-top: 3px;"
height="500"
style="margin-top: 3px;width: 1355px"
height="600"
border
stripe
size="mini"
highlight-current-row
@row-click="fetchTableData2">
<el-table-column align="center" label="合同编号" width="150">
<el-table-column align="center" label="合同编号" prop="合同编号" width="150">
<template slot-scope="scope">
<el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" width="150" show-overflow-tooltip>
<el-table-column align="center" label="项目名称" prop="项目名称" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
@@ -59,12 +59,12 @@
{{ scope.row.合同签订日期 }}
</template>
</el-table-column>
<el-table-column align="center" label="销售经理" width="90">
<el-table-column align="center" label="销售经理" prop="姓名" width="100">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column align="center" label="客户名称" width="200" show-overflow-tooltip>
<el-table-column align="center" label="客户名称" prop="客户名称" width="200" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
@@ -79,12 +79,12 @@
{{ scope.row.电话 }}
</template>
</el-table-column>
<el-table-column align="center" label="合同信息备注">
<el-table-column align="center" label="合同信息备注" width="130" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.合同信息备注 }}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="210px">
<el-table-column label="操作" align="center" width="210px">
<template slot-scope="scope">
<el-button
:disabled="scope.row.是否禁用增加履约保证金"

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

@@ -33,19 +33,19 @@
<el-table
v-loading="listLoadingProject"
:data="projectTableData"
style="width: 100%;margin-top: 3px;"
style="width: 1360px;margin-top: 3px;"
height="650"
border
stripe
size="mini"
highlight-current-row
@row-click="fetchTableData1">
<el-table-column align="center" label="合同编号" width="150">
<el-table-column align="center" label="合同编号" prop="合同编号" width="150">
<template slot-scope="scope">
<el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" width="160" show-overflow-tooltip>
<el-table-column align="center" label="项目名称" prop="项目名称" width="160" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
@@ -60,12 +60,12 @@
{{ scope.row.合同签订日期 }}
</template>
</el-table-column>
<el-table-column align="center" label="销售经理" width="100">
<el-table-column align="center" label="销售经理" prop="姓名" width="100">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column align="center" label="客户名称" width="250" show-overflow-tooltip>
<el-table-column align="center" label="客户名称" prop="客户名称" width="200" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
@@ -80,7 +80,7 @@
{{ scope.row.电话 }}
</template>
</el-table-column>
<el-table-column align="center" label="合同信息备注" >
<el-table-column align="center" label="合同信息备注" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.合同信息备注 }}
</template>

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

@@ -55,22 +55,22 @@
type="index"
align="center"
width="50"/>
<el-table-column label="零件图号" align="center" width="230px">
<el-table-column label="零件图号" prop="零件图号" align="center" width="230px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" width="230px">
<el-table-column label="零件名称" prop="零件名称" align="center" width="230px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="材料" align="center" min-width="150px">
<el-table-column label="材料" prop="材料" align="center" min-width="150px">
<template slot-scope="scope">
{{ scope.row.材料 }}
</template>
</el-table-column>
<el-table-column label="种类" align="center" width="150px">
<el-table-column label="种类" prop="零件类型名称" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.零件类型名称 }}
</template>

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

@@ -33,6 +33,7 @@
<el-table-column
align="center"
label="工艺名称"
prop="工艺名称"
width="200">
<template slot-scope="scope">{{ scope.row.工艺名称 }}</template>
</el-table-column>

16
src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
View File

@@ -62,34 +62,34 @@
align="center"
fixed="left"
width="50"/>
<el-table-column label="付款状态" width="70" align="center" fixed="left">
<el-table-column label="付款状态" prop="实际付款时间" width="100" align="center" fixed="left">
<template slot-scope="scope">
<el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small">已付</el-tag>
<el-tag v-else type="info" size="small">未付</el-tag>
</template>
</el-table-column>
<el-table-column label="到货状态" width="70" align="center" fixed="left">
<el-table-column label="到货状态" prop="单据状态" width="100" align="center" fixed="left">
<template slot-scope="scope">
<el-tag v-if="scope.row.单据状态==='3'" type="success" size="small">已到</el-tag>
<el-tag v-else type="info" size="small">未到</el-tag>
</template>
</el-table-column>
<el-table-column label="表单号" align="center" min-width="200px" fixed="left">
<el-table-column label="表单号" prop="表单号" align="center" min-width="200px" fixed="left">
<template slot-scope="scope">
{{ scope.row.表单号 }}
</template>
</el-table-column>
<el-table-column label="外协厂家名称" align="center" min-width="200px">
<el-table-column label="外协厂家" prop="外协厂家名称" align="center" min-width="200px">
<template slot-scope="scope">
{{ scope.row.外协厂家名称 }}
</template>
</el-table-column>
<el-table-column label="任务下达日期" align="center" min-width="125px">
<el-table-column label="任务下达日期" prop="任务下达日期" align="center" min-width="125px">
<template slot-scope="scope">
{{ scope.row.任务下达日期 }}
</template>
</el-table-column>
<el-table-column label="外协员" align="center" width="80px">
<el-table-column label="外协员" prop="外协员姓名" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.外协员姓名 }}
</template>
@@ -216,12 +216,12 @@
<el-card>
<el-table v-loading="loading2" :data="tableData2" :summary-method="getSummaries" size="mini" stripe height="370" show-summary style="width: 100%;" border element-loading-text="拼命加载中">
<el-table-column label="发票号" align="center" width="230px">
<el-table-column label="发票号" prop="发票号" align="center" width="230px">
<template slot-scope="scope">
{{ scope.row.发票号 }}
</template>
</el-table-column>
<el-table-column label="接收人" align="center" width="180px">
<el-table-column label="接收人" prop="接收人" align="center" width="180px">
<template slot-scope="scope">
{{ scope.row.接收人 }}
</template>

64
src/views/Outsourcing/OutsourcingQCSearch/index.vue
View File

@@ -1,19 +1,19 @@
<template>
<div class="app-container">
<el-card>
<span style="margin-left: 10px">外协到货单号:</span>
<el-input v-model="orderNumber" clearable style="width: 200px" size="small"/>
<span style="margin-left: 10px">外协厂家:</span>
<el-input v-model="outsourcingSupplier" clearable style="width: 200px" size="small"/>
<el-input v-model="orderNumber" clearable style="width: 200px;margin:0px 10px" placeholder="请输入外协到货单" size="small"/>
<!-- <span style="margin-left: 10px">外协厂家:</span>-->
<el-input v-model="outsourcingSupplier" clearable style="width: 200px;margin:0px 10px" placeholder="请输入外协厂家" size="small"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
<el-table v-loading="" :data="tableData1" border stripe style="width: 100%;max-height: 600px;" height="400px" size="mini" @row-click="searchTable2">
<el-table-column label="序号" align="center" width="55" type="index"/>
<el-table-column label="外协到货单号" sortable prop="外协到货单编号" align="center" min-width="100">
<el-table-column label="外协到货单号" prop="外协到货单编号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.外协到货单编号 }}
</template>
</el-table-column>
<el-table-column label="外协厂家" sortable prop="外协厂家名称" align="center" min-width="100">
<el-table-column label="外协厂家" prop="外协厂家名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.外协厂家名称 }}
</template>
@@ -24,18 +24,18 @@
</template>
</el-table-column>
</el-table>
<div class="block" style="margin: 10px 0;">
<el-pagination
:current-page="pageCurrent1"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize1"
:total="total1"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
</div>
<el-table v-loading="" :data="tableData2" :summary-method="getSummaries" show-summary border stripe style="width: 100%;min-height: 400px" height="400px" size="mini">
<!-- <div class="block" style="margin: 10px 0;">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent1"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize1"-->
<!-- :total="total1"-->
<!-- style="display:inline-block;width:50%"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange1"-->
<!-- @current-change="handleCurrentChange1"/>-->
<!-- </div>-->
<el-table v-loading="" :data="tableData2" :summary-method="getSummaries" show-summary border stripe style="width: 100%;min-height: 400px" height="420px" size="mini">
<el-table-column label="序号" align="center" width="50px" type="index"/>
<el-table-column label="零件名称" align="center" min-width="70px">
<template slot-scope="scope">
@@ -171,9 +171,9 @@ export default {
orderNumber: '',
outsourcingSupplier: '',
tableData1: [],
pageCurrent1: 1,
pageSize1: 10,
total1: 0,
// pageCurrent1: 1,
// pageSize1: 10,
// total1: 0,
tableData2: [],
pageCurrent2: 1,
pageSize2: 10,
@@ -248,20 +248,20 @@ export default {
let check1, check2
this.orderNumber ? check1 = 1 : check1 = 0
this.outsourcingSupplier ? check2 = 1 : check2 = 0
searchTable1(this.pageCurrent1, this.pageSize1, check1, this.orderNumber, check2, this.outsourcingSupplier).then(response => {
this.tableData1 = response.data.rows
searchTable1(check1, this.orderNumber, check2, this.outsourcingSupplier).then(response => {
this.tableData1 = response.data
this.total1 = response.data.total
})
},
handleSizeChange1(val) {
this.pageSize1 = val
this.pageCurrent1 = 1
this.searchTable1()
},
handleCurrentChange1(val) {
this.pageCurrent1 = val
this.searchTable1()
},
// handleSizeChange1(val) {
// this.pageSize1 = val
// this.pageCurrent1 = 1
// this.searchTable1()
// },
// handleCurrentChange1(val) {
// this.pageCurrent1 = val
// this.searchTable1()
// },
searchTable2(row) {
searchTable2(row.外协到货单流水号).then(response => {
this.tableData2 = response.data

16
src/views/Outsourcing/OutsourcingTaskExecution/index.vue
View File

@@ -30,28 +30,28 @@
</el-card>
<el-card>
<el-table v-loading="loading2" :data="List" highlight-current-row height="350" size="mini" stripe border @row-click="searchProcess" >
<el-table-column label="单据状态" width="100" align="center">
<el-table-column label="单据状态" prop="单据状态" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.单据状态==='成交'" type="success" size="small">成交</el-tag>
<el-tag v-else type="info" size="small">未成交</el-tag>
</template>
</el-table-column>
<el-table-column label="表单号" align="center" min-width="200px">
<el-table-column label="表单号" prop="表单号" align="center" min-width="200px">
<template slot-scope="scope">
{{ scope.row.表单号 }}
</template>
</el-table-column>
<el-table-column label="外协厂家" align="center" min-width="200px">
<el-table-column label="外协厂家" prop="外协厂家" align="center" min-width="200px">
<template slot-scope="scope">
{{ scope.row.外协厂家 }}
</template>
</el-table-column>
<el-table-column label="任务下达日期" align="center" min-width="100px">
<el-table-column label="任务下达日期" prop="任务下达日期" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.任务下达日期 }}
</template>
</el-table-column>
<el-table-column label="外协计划员" align="center" >
<el-table-column label="外协员" prop="外协计划员" align="center" >
<template slot-scope="scope">
{{ scope.row.外协计划员 }}
</template>
@@ -99,17 +99,17 @@
<el-table-column
type="selection"
width="55"/>
<el-table-column label="项目名称" align="center" >
<el-table-column label="项目名称" prop="项目名称" align="center" >
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" width="120px" >
<el-table-column label="零件图号" prop="零件图号" align="center" width="120px" >
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" min-width="140px" >
<el-table-column label="零件名称" prop="零件名称" align="center" min-width="140px" >
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>

10
src/views/Outsourcing/OutsourcingTaskQuery/index.vue
View File

@@ -20,28 +20,28 @@
<el-card>
<el-table v-loading="loading2" :data="List" highlight-current-row stripe size="mini" height="350" border @row-click="searchProcess" >
<el-table-column label="付款状态" width="100" align="center">
<el-table-column label="付款状态" prop="实际付款时间" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small" style="margin: 0px">已付款</el-tag>
<el-tag v-else type="info" size="small" style="margin: 0px">未付款</el-tag>
</template>
</el-table-column>
<el-table-column label="表单号" align="center" min-width="200px">
<el-table-column label="表单号" prop="表单号" align="center" min-width="200px">
<template slot-scope="scope">
{{ scope.row.表单号 }}
</template>
</el-table-column>
<el-table-column label="外协厂家" align="center" min-width="200px">
<el-table-column label="外协厂家" prop="外协厂家" align="center" min-width="200px">
<template slot-scope="scope">
{{ scope.row.外协厂家 }}
</template>
</el-table-column>
<el-table-column label="任务下达日期" align="center" min-width="100px">
<el-table-column label="任务下达日期" prop="任务下达日期" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.任务下达日期 }}
</template>
</el-table-column>
<el-table-column label="外协计划员" align="center" >
<el-table-column label="外协员" prop="外协计划员" align="center" >
<template slot-scope="scope">
{{ scope.row.外协计划员 }}
</template>

8
src/views/Outsourcing/PreorderAssociation/index.vue
View File

@@ -49,22 +49,22 @@
type="index"
align="center"
width="50"/>
<el-table-column label="零件图号" align="center" width="220px">
<el-table-column label="零件图号" prop="零件图号" align="center" width="220px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" width="220px">
<el-table-column label="零件名称" prop="零件名称" align="center" width="220px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="材料" align="center">
<el-table-column label="材料" prop="材料" align="center">
<template slot-scope="scope">
{{ scope.row.材料 }}
</template>
</el-table-column>
<el-table-column label="种类" align="center" width="220px">
<el-table-column label="种类" prop="零件类型名臣" align="center" width="220px">
<template slot-scope="scope">
{{ scope.row.零件类型名称 }}
</template>

24
src/views/PurchasingCenter/ArrivalEnquiry/index.vue
View File

@@ -2,16 +2,16 @@
<div class="app-container">
<el-card>
<div slot="header">
<span>供应商:</span>
<el-select v-model="gongyingsValue" placeholder="供应商" size="small" filterable clearable @change="fetchData();searchTable1()">
<!-- <span>供应商:</span>-->
<el-select v-model="gongyingsValue" placeholder="供应商" size="small" style="margin: 0px 10px" filterable clearable @change="fetchData();searchTable1()">
<el-option
v-for="item in gongyings"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>合同号:</span>
<el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable @change="searchTable1()">
<!-- <span>合同号:</span>-->
<el-select v-model="contractNumValue" placeholder="合同号" size="small" style="margin: 0px 10px" filterable clearable @change="searchTable1()">
<el-option
v-for="item in contractNum"
:key="item.value"
@@ -26,7 +26,7 @@
size="small"
icon="el-icon-search"
style="margin-left:10px"
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
@click="total1=0;pageCurrent1=1;pageSize1=1000;searchTable1()">查询</el-button>
</div>
<el-table
v-loading=""
@@ -34,8 +34,8 @@
border
stripe
highlight-current-row
style="width: 100%;max-height: 250px;"
height="250px"
style="width: 100%;"
height="400px"
size="mini"
@row-click="searchTable2">
<el-table-column label="采购编码" align="center" min-width="100">
@@ -87,18 +87,18 @@
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<div class="block">
<el-pagination
:current-page="pageCurrent1"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 20, 30, 40, 1000]"
:page-size="pageSize1"
:total="total1"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
layout="total"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
</div>
<el-table v-loading="" :data="tableData2" stripe border style="width: 100%;max-height: 300px;margin-top: 10px" height="300px" size="mini">
<el-table v-loading="" :data="tableData2" stripe border style="width: 100%;" height="380px" size="mini">
<el-table-column label="采购合同编号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.采购合同编号 }}
@@ -150,7 +150,7 @@ export default {
contractNum: [],
supplierName: '',
tableData1: [],
pageSize1: 10,
pageSize1: 1000,
pageCurrent1: 1,
total1: 0,
tableData2: []

10
src/views/PurchasingCenter/ArrivalStateSearch/index.vue
View File

@@ -28,10 +28,10 @@
border
highlight-current-row
style="width: 100%"
height="400px"
height="600px"
size="mini"
@row-click="searchTable2">
<el-table-column label="采购合同编号" sortable prop="采购合同编号" align="center" min-width="100">
<el-table-column label="采购合同编号" prop="采购合同编号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.采购合同编号 }}
</template>
@@ -41,17 +41,17 @@
{{ scope.row.采购合同名称 }}
</template>
</el-table-column>
<el-table-column label="交货日期" sortable prop="交货日期" align="center" min-width="100">
<el-table-column label="交货日期" prop="交货日期" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.交货日期 }}
</template>
</el-table-column>
<el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="150">
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="采购员" sortable prop="姓名" align="center" min-width="70">
<el-table-column label="采购员" prop="姓名" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>

16
src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
View File

@@ -14,22 +14,22 @@
</div>
<h4 style="margin-top: 0">采购件列表</h4>
<el-table :data="tableData1" size="mini" border style="width: 100%;" height="440">
<el-table-column label="名称" sortable prop="物料名称" align="center" min-width="100">
<el-table-column label="名称" prop="物料名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" sortable prop="物料型号" align="center" min-width="100">
<el-table-column label="图号或型号" prop="物料型号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="规格" sortable prop="物料规格" align="center" min-width="150">
<el-table-column label="规格" prop="物料规格" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column props="仓库名称" sortable prop="仓库名称" label="仓库名称" align="center" min-width="80">
<el-table-column props="仓库名称" prop="仓库名称" label="仓库名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.仓库名称 }}
</template>
@@ -83,22 +83,22 @@
</div>
<h4>滞货件列表</h4>
<el-table :data="tableData2" size="mini" border style="width: 100%;" height="440">
<el-table-column label="名称" sortable prop="物料名称" align="center" min-width="100">
<el-table-column label="名称" prop="物料名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" sortable prop="物料型号" align="center" min-width="120" show-overflow-tooltip>
<el-table-column label="图号或型号" prop="物料型号" align="center" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="规格" sortable prop="物料规格" align="center" min-width="120" show-overflow-tooltip>
<el-table-column label="规格" prop="物料规格" align="center" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="仓库名称" sortable prop="仓库名称" align="center" min-width="80">
<el-table-column label="仓库名称" prop="仓库名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.仓库名称 }}
</template>

345
src/views/PurchasingCenter/CreateInquirySheet/index.vue
View File

@@ -38,46 +38,35 @@
<el-col :span="24">
<el-tabs v-model="tabName" type="border-card" @tab-click="tabClick">
<el-tab-pane label="外购件" name="外购件">
<el-row style="margin-bottom: 5px">
<span>项目名称:</span>
<el-select v-model="projectValue" style="width:200px" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
<el-row style="margin-bottom: 10px">
<el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
<el-option
v-for="item in project"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床图号:</span>
<el-select v-model="machineValue" style="width:200px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
<el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable @change="machineChange">
<el-option
v-for="item in machine"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>组号:</span>
<el-select v-model="groupValue" style="width:200px" placeholder="请选择" size="small" clearable filterable>
<el-select v-model="groupValue" placeholder="组号" size="small" clearable filterable>
<el-option
v-for="item in group"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-row>
<el-row style="margin-bottom: 5px">
<span style="margin-right: -10px">物料状态:</span>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin-left: 10px"/>
<span>物料名称:</span>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>
<el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
<span>物料变更:</span>
<el-switch v-model="switchValue" active-color="#13ce66" inactive-color="#ff4949"/>
</el-row>
<el-row style="margin-bottom: 15px">
<span>物料规格:</span>
<el-row style="margin-bottom: 10px">
<el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
<span>物料型号:</span>
<el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
<span style="margin-left: 10px">时间段:</span>
<el-date-picker
v-model="startTime"
size="small"
@@ -88,7 +77,8 @@
range-separator="～"
style="width:250px"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
end-placeholder="结束日期"
@change="timeChange1()"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent11=1;pageSize11=100;total11=0;searchTable11()">查询</el-button>
<el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价物料清单</el-button>
<el-popover v-model="visible" title="调整采购任务" placement="top" width="180">
@@ -105,7 +95,7 @@
<el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>
</el-popover>
</el-row>
<el-row style="margin-bottom: 10px">
<el-rows>
<el-table
v-loading=""
:data="tableData11"
@@ -144,7 +134,7 @@
<!--{{ scope.row.项目名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="机床图号" sortable align="center" min-width="100" prop="机床图号">
<el-table-column label="机床图号" align="center" min-width="100" prop="机床图号">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
@@ -169,17 +159,17 @@
<!--{{ scope.row.物料品种 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="名称" sortable align="center" min-width="100" prop="名称">
<el-table-column label="名称" align="center" min-width="100" prop="名称">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" sortable align="center" min-width="120" prop="物料型号">
<el-table-column label="图号或型号" align="center" min-width="120" prop="物料型号">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="规格" sortable align="center" min-width="150" prop="物料规格">
<el-table-column label="规格" align="center" min-width="150" prop="物料规格">
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
@@ -239,58 +229,48 @@
<!--</template>-->
<!--</el-table-column>-->
</el-table>
</el-row>
<div class="block">
<el-pagination
:current-page="pageCurrent11"
:page-sizes="[10, 50, 100, 150]"
:page-size="pageSize11"
:total="total11"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange11"
@current-change="handleCurrentChange11"/>
</div>
<div class="block">
<el-pagination
:current-page="pageCurrent11"
:page-sizes="[10, 50, 100, 150]"
:page-size="pageSize11"
:total="total11"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange11"
@current-change="handleCurrentChange11"/>
</div>
</el-rows>
</el-tab-pane>
<el-tab-pane label="基本件" name="基本件">
<el-row style="margin-bottom: 5px">
<span>项目名称:</span>
<el-select v-model="projectValue" style="width:200px" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
<el-row style="margin-bottom: 10px">
<el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
<el-option
v-for="item in project"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床图号:</span>
<el-select v-model="machineValue" style="width:200px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
<el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable @change="machineChange">
<el-option
v-for="item in machine"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>组号:</span>
<el-select v-model="groupValue" style="width:200px" placeholder="请选择" size="small" clearable filterable>
<el-select v-model="groupValue" placeholder="组号" size="small" clearable filterable>
<el-option
v-for="item in group"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-row>
<el-row style="margin-bottom: 5px">
<span style="margin-right: -10px">物料状态:</span>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin-left: 10px"/>
<span>零件图号:</span>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>
<el-input v-model="partNum" placeholder="零件图号" size="small" clearable/>
</el-row>
<el-row style="margin-bottom: 10px">
<span>零件名称:</span>
<el-input v-model="partName" placeholder="零件名称" size="small" clearable/>
<span>零件规格:</span>
<el-input v-model="partSpec" placeholder="零件规格" size="small" clearable/>
<span style="margin-left: 10px">时间段:</span>
<el-date-picker
v-model="endTime"
size="small"
@@ -301,7 +281,8 @@
range-separator="～"
style="width:250px"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
end-placeholder="结束日期"
@change="timeChange2()"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent12=1;pageSize12=100;total12=0;searchTable12()">查询</el-button>
<el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价物料清单</el-button>
<el-popover v-model="visible2" title="调整采购任务" placement="top" width="180">
@@ -422,6 +403,185 @@
@current-change="handleCurrentChange12"/>
</div>
</el-tab-pane>
<!--<el-tab-pane v-show="false" label="标准件" name="标准件">-->
<!--<el-row style="margin-bottom: 5px">-->
<!--<span>项目名称:</span>-->
<!--<el-select v-model="projectValue" style="width:200px" placeholder="项目名称" size="small" filterable clearable @change="projectChange">-->
<!--<el-option-->
<!--v-for="item in project"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<!--<span>机床图号:</span>-->
<!--<el-select v-model="machineValue" style="width:200px" placeholder="请选择" size="small" clearable filterable @change="machineChange">-->
<!--<el-option-->
<!--v-for="item in machine"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<!--<span>组号:</span>-->
<!--<el-select v-model="groupValue" style="width:200px" placeholder="请选择" size="small" clearable filterable>-->
<!--<el-option-->
<!--v-for="item in group"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<!--</el-row>-->
<!--<el-row style="margin-bottom: 5px">-->
<!--<span style="margin-right: -10px">物料状态:</span>-->
<!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin-left: 10px"/>-->
<!--<span>零件图号:</span>-->
<!--<el-input v-model="partNum" placeholder="零件图号" size="small" clearable/>-->
<!--</el-row>-->
<!--<el-row style="margin-bottom: 10px">-->
<!--<span>零件名称:</span>-->
<!--<el-input v-model="partName" placeholder="零件名称" size="small" clearable/>-->
<!--<span>零件规格:</span>-->
<!--<el-input v-model="partSpec" placeholder="零件规格" size="small" clearable/>-->
<!--<span style="margin-left: 10px">时间段:</span>-->
<!--<el-date-picker-->
<!--v-model="endTime"-->
<!--size="small"-->
<!--type="daterange"-->
<!--align="center"-->
<!--value-format="yyyy-MM-dd"-->
<!--format="yyyy-MM-dd"-->
<!--range-separator="～"-->
<!--style="width:250px"-->
<!--start-placeholder="开始日期"-->
<!--end-placeholder="结束日期"/>-->
<!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent12=1;pageSize12=100;total12=0;searchTable12()">查询</el-button>-->
<!--<el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价物料清单</el-button>-->
<!--<el-popover v-model="visible2" title="调整采购任务" placement="top" width="180">-->
<!--<div style="text-align: right; margin: 0">-->
<!--<el-select v-model="PersonValue" style="width:150px" placeholder="人员" size="small" filterable clearable>-->
<!--<el-option-->
<!--v-for="item in Person"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<!--<el-button type="primary" size="mini" @click="visible2 = false;tiaozheng2()">确定</el-button>-->
<!--</div>-->
<!--<el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>-->
<!--</el-popover>-->
<!--</el-row>-->
<!--<el-row style="margin-bottom: 10px">-->
<!--<el-table v-loading="" :data="tableData13" size="mini" style="max-height: 600px" height="500px" border stripe @selection-change="handleSelectionChange3">-->
<!--<el-table-column :selectable="selectable" align="center" type="selection"/>-->
<!--<el-table-column align="center" label="采购情况" prop="询价状态编号" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--<el-tag v-if="scope.row.人员编号===''" type="primary" size="small">未分配</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="项目名称" prop="项目名称" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.项目名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.机床图号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="组号" min-width="80px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.组号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" prop="物料类别" label="物料类别" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料类别 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" prop="物料品种" label="物料品种" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料品种 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" prop="物料型号" label="图号或型号" min-width="110px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料型号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" prop="物料名称" label="名称" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" prop="物料规格" label="规格" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料规格 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="数量" min-width="80px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.零件数量 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="备注" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.备注 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" prop="供货商" label="供货商" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.供货商 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="计划到货时间" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料计划到货时间.split(' ')[0] }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="生产分配时间" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.操作日期.split(' ')[0] }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="采购员" min-width="80px" prop="姓名">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.姓名 ? scope.row.姓名 : '—' }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="采购分配时间" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="撤回分配" min-width="100px" fixed="right">-->
<!--<template slot-scope="scope">-->
<!--<el-tooltip :open-delay="1200" effect="dark" content="撤回已分配的采购任务" placement="top">-->
<!--<el-button-->
<!--:disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"-->
<!--type="primary"-->
<!--size="mini"-->
<!--plain-->
<!--icon="el-icon-back"-->
<!--@click="retract(scope.row)">撤回</el-button>-->
<!--</el-tooltip>-->
<!--</template>-->
<!--</el-table-column>-->
<!--</el-table>-->
<!--</el-row>-->
<!--<div class="block">-->
<!--<el-pagination-->
<!--:current-page="pageCurrent13"-->
<!--:page-sizes="[10, 20, 30, 40]"-->
<!--:page-size="pageSize13"-->
<!--:total="total13"-->
<!--style="display:inline-block;width:50%"-->
<!--layout="total, sizes, prev, pager, next, jumper"-->
<!--@size-change="handleSizeChange13"-->
<!--@current-change="handleCurrentChange13"/>-->
<!--</div>-->
<!--</el-tab-pane>-->
</el-tabs>
</el-col>
</el-row>
@@ -907,7 +1067,7 @@
</template>
<script>
import { tiaozheng2, tiaozheng1, getPerson, getBillNum, searchMaterial, searchPart, searchSupplier, searchCreateInquirySheet, searchCreateInquirySheet2, searchSheetDetail, editInquirySheet,
import { timeSearch, timeChange1, timeChange2, tiaozheng2, tiaozheng1, getPerson, getBillNum, searchMaterial, searchPart, searchSupplier, searchCreateInquirySheet, searchCreateInquirySheet2, searchSheetDetail, editInquirySheet,
createInquirySheet, deleteInquirySheet, addInquirySheet1, addInquirySheet2, outInquirySheet, searchAllMaterial, materialChange, saveOrder,
submitUseInventory, initProject, searchMachine, searchGroup, searchBaseInfo, editBaseInfo, getExport1, getExport2, searchMerge } from '@/api/PurchasingCenter/CreateInquirySheet'
import { mapGetters } from 'vuex'
@@ -919,8 +1079,8 @@ export default {
name: '', // 创建询价单
data() {
return {
startTime: '',
endTime: '',
startTime: [],
endTime: [],
标准件和外购件流水号: [],
基本件流水号: [],
visible: false,
@@ -1009,6 +1169,10 @@ export default {
total12: 0,
pageCurrent12: 1,
pageSize12: 100,
tableData13: [], // 外购件列表
total13: 0,
pageCurrent13: 1,
pageSize13: 100,
remarkFilters: [],
supplierFilters: [],
tableData2: [], // 询价单列表
@@ -1108,9 +1272,10 @@ export default {
}
},
created() {
this.timeSearch()
this.getPerson()
this.fetchData()
this.searchTable11() // 查表1
// this.searchTable11() // 查表1
this.searchTable2() // 查表2
this.searchUnInquiryPartNumber()
this.searchUnBuyPartNumber()
@@ -1122,6 +1287,19 @@ export default {
}, 500)
},
methods: {
timeSearch() {
timeSearch().then(response => {
this.startTime = [response.data[0].外购件开始时间, response.data[0].外购件结束时间]
this.endTime = [response.data[0].基本件开始时间, response.data[0].基本件结束时间]
this.searchTable11()
})
},
timeChange1() {
timeChange1(this.startTime[0], this.startTime[1])
},
timeChange2() {
timeChange2(this.endTime[0], this.endTime[1])
},
Jump() {
window.location.hash = '#PurchasingCenter/CreateInquirySheet'
},
@@ -1521,7 +1699,7 @@ export default {
this.projectValue ? check4 = 1 : check4 = 0
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '')
this.startTime ? check7 = 1 : (check7 = 0, this.startTime = [])
searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, 2, check7, this.startTime[0], this.startTime[1]).then(response => {
this.tableData11 = response.data.rows
this.total11 = response.data.total
@@ -1587,6 +1765,41 @@ export default {
this.pageCurrent12 = val
this.searchTable12()
},
searchTable13() { // 查询基本件列表
let check1, check2, check3, check4, check5, check6, check7
this.partNum ? check1 = 1 : check1 = 0
this.partName ? check2 = 1 : check2 = 0
this.partSpec ? check3 = 1 : check3 = 0
this.projectValue ? check4 = 1 : check4 = 0
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
this.endTime ? check7 = 1 : (check7 = 0, this.endTime = '')
searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => {
this.tableData12 = response.data.rows
this.total12 = response.data.total
const remark = []
const supplier = []
this.remarkFilters = []
this.supplierFilters = []
response.data.rows.map(v => {
if (!remark.includes(v.备注)) {
remark.push(v.备注)
supplier.push(v.供货商)
this.remarkFilters.push({ text: v.备注, value: v.备注 })
this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
}
})
})
},
handleSizeChange13(val) { // 基本件列表分页
this.pageSize13 = val
this.pageCurrent13 = 1
this.searchTable13()
},
handleCurrentChange13(val) { // 基本件列表分页
this.pageCurrent13 = val
this.searchTable13()
},
searchTable2() { // 查询询价单列表
this.supplierName ? this.check3 = 1 : this.check3 = 0
this.inquirySheetNum ? this.check4 = 1 : this.check4 = 0
@@ -1856,6 +2069,16 @@ export default {
this.基本件流水号[i] = val[i].基本件流水号
}
},
handleSelectionChange3(val) { // 基本件多选
this.groupPartBasicNum = []
this.allNum = []
this.基本件流水号 = []
for (let i = 0; i < val.length; i++) {
this.groupPartBasicNum[i] = val[i].组件零件基本件流水号
this.allNum[i] = val[i].零件数量
this.基本件流水号[i] = val[i].基本件流水号
}
},
addInquirySheet() { // 追加物料
const numGroup1 = [] // 空数组，放该询价单中已有的组件零件流水号
const numGroup2 = [] // 空数组，放该询价单中已有的组件零件基本件流水号
@@ -2062,10 +2285,16 @@ export default {
margin-bottom: 0px;
}
.el-select{
width:200px
width:150px;
margin-right: 10px;
}
.el-input{
width:200px
width:150px;
margin-right: 10px;
}
.el-cascader{
width:150px;
margin: 0px 10px 0px 0px;
}
span{
margin: 10px 0 10px 10px;

177
src/views/PurchasingCenter/CreatePurchaseContract/index.vue
View File

@@ -1,105 +1,62 @@
<template>
<div class="components-container">
<el-card>
<el-form label-width="90px" label-position="right">
<el-row>
<el-col :span="6">
<el-form-item label="供应商:">
<el-select v-model="supplierValue11" clearable filterable size="small" placeholder="供应商" style="width:100%" @focus="fetchData11()" @change="selectHetong()">
<el-option
v-for="item in supplier11"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="合同编号:">
<el-select v-model="contractNumValue" filterable size="small" placeholder="合同编号" style="width:100%" @change="contractChange">
<el-option
v-for="item in contractNums"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="供应商:">
<!--<el-select v-model="supplierValue" clearable filterable size="small" placeholder="供应商" style="width:100%" @focus="fetchData" @change="supplierChange">-->
<el-select v-model="supplierValue" clearable filterable size="small" placeholder="供应商" style="width:100%" @focus="fetchData" @change="supplierChange9745">
<el-option
v-for="item in supplier"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="合同名称:">
<el-input v-model="contractName" size="small"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="是否含税:">
<el-input v-model="taxRate" size="small"/>
</el-form-item>
</el-col>
<el-col :span="1">
<el-tooltip :content="hasTax" placement="top">
<el-switch
v-model="hasTax"
active-color="#13ce66"
inactive-color="#ff4949"
active-value="含税"
inactive-value="未税"
style="margin: 10px"/>
</el-tooltip>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="交货日期:">
<el-input v-model="deliveryDate" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="开票信息:">
<el-input v-model="invoiceInfo" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="支付日期:">
<el-input v-model="payDate" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="支付方式:">
<el-input v-model="payMethod" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="21">
<el-form-item label="其他说明:">
<el-input v-model="otherInfo" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
</el-form-item>
</el-col>
<el-col :span="1">
<el-button v-if="quickChangePrice" size="mini" style="margin: 10px 0 0 10px" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>
<el-button v-else size="mini" style="margin: 10px 0 0 10px" @click="quickChangePrice=!quickChangePrice">还原</el-button>
</el-col>
</el-row>
</el-form>
<el-row>
<!--<span>供 应 &nbsp;商:</span>-->
<el-select v-model="supplierValue11" clearable filterable size="small" placeholder="供应商" @focus="fetchData11()" @change="selectHetong()">
<el-option
v-for="item in supplier11"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<!--<span>合同编号:</span>-->
<el-select v-model="contractNumValue" filterable size="small" placeholder="合同编号" @change="contractChange">
<el-option
v-for="item in contractNums"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<!--<span>|| 供 应 商:</span>-->
<el-select v-model="supplierValue" clearable filterable size="small" placeholder="供应商" @focus="fetchData" @change="supplierChange9745">
<el-option
v-for="item in supplier"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<!--<span>合同名称:</span>-->
<el-input v-model="contractName" size="small"/>
<!--<span>是否含税:</span>-->
<el-input :disabled="hasTax==='未税'" v-model="taxRate" size="small" style="width: 80px"/>
<el-tooltip :content="hasTax" placement="top">
<el-switch
v-model="hasTax"
active-color="#13ce66"
inactive-color="#ff4949"
active-value="含税"
inactive-value="未税"/>
</el-tooltip>
</el-row>
<el-row style="margin-top: 10px">
<!--<span>交货日期:</span>-->
<el-input v-model="deliveryDate" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
<!--<span>开票信息:</span>-->
<el-input v-model="invoiceInfo" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
<!--<span>支付 日期:</span>-->
<el-input v-model="payDate" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
<!--<span>支付方式:</span>-->
<el-input v-model="payMethod" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
<!--<span>其他说明:</span>-->
<el-input v-model="otherInfo" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
<el-button v-if="quickChangePrice" size="mini" style="margin: 0px 0 0 10px" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>
<el-button v-else size="mini" style="margin: 10px 0 0 10px" @click="quickChangePrice=!quickChangePrice">还原</el-button>
</el-row>
<el-table :data="tableData1" border style="margin: 10px 0;max-height: 480px;" height="480px" size="mini" show-summary tooltip-effect="dark">
<el-table-column label="序号" align="center" width="50" type="index"/>
<el-table-column label="交货期" align="center" width="150">
<el-table-column label="交货期" align="center" width="170">
<template slot-scope="scope">
<el-date-picker
v-if="quickChangePrice"
@@ -107,8 +64,7 @@
size="mini"
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
style="width:100%"/>
value-format="yyyy-MM-dd"/>
<b v-else>{{ scope.row.交货期.split(' ')[0] || '—' }}</b>
</template>
</el-table-column>
@@ -179,18 +135,13 @@
<el-tooltip v-show="false" :open-delay="1000" content="一键删除交货期" placement="right">
<el-button type="danger" icon="el-icon-date" size="small" @click="deleteAllDate()"/>
</el-tooltip>
<span>①选择合同模板：</span>
<el-radio-group v-show="false" v-model="demoRadio" size="small" @change="demoChange">
<el-radio-button label="模板1"/>
<el-radio-button label="模板2" disabled/>
<!--<el-radio-button label="自定义" disabled/>-->
</el-radio-group>
<el-button type="primary" plain size="small" style="margin-left:10px;" @click="editContract()">预览合同</el-button>
<!--<span>②确认合同总额：</span>-->
<!--<el-input v-model="actualTotal" size="small" style="width: 100px"/>-->
<!--<el-button type="primary" size="small" @click="submitTotal()">确认</el-button>-->
<span>②递交审批：</span>
<el-tooltip :open-delay="1000" effect="dark" content="核对信息后生成合同" placement="top">
<span>递交审批：</span>
<el-tooltip :open-delay="1000" effect="dark" content="生成合同并提交审批" placement="top">
<el-button type="success" size="small" @click="generateContract()">递交</el-button>
</el-tooltip>
<hr>
@@ -897,9 +848,21 @@ export default {
margin-top: 20px;
}
span{
margin: 0 0 0 20px;
margin: 0 0 0 5px;
}
.el-form-item{
margin: 0;
}
.el-select{
width:150px;
margin-right: 10px;
}
.el-input{
width:150px;
margin-right: 10px;
}
.el-textarea{
width:150px;
margin-right: 10px;
}
</style>

2
src/views/PurchasingCenter/FundApproval1/index.vue
View File

@@ -245,7 +245,6 @@ export default {
},
searchTable1() {
initApproval(this.pageCurrent1, this.pageSize1, 0).then(response => {
console.log(response.data)
this.tableData1 = response.data.rows
this.total1 = response.data.total
})
@@ -261,7 +260,6 @@ export default {
},
searchTable2() {
initApprovalOffline(this.pageCurrent2, this.pageSize2, 0).then(response => {
console.log(response.data.rows)
this.tableData2 = response.data.rows
this.total2 = response.data.total
})

8
src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
View File

@@ -41,12 +41,12 @@
</el-form>
</template>
</el-table-column>
<el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="200" show-overflow-tooltip>
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="发票号" sortable prop="发票号" align="center" min-width="90">
<el-table-column label="发票号" prop="发票号" align="center" min-width="90">
<template slot-scope="scope">
{{ scope.row.发票号 }}
</template>
@@ -56,12 +56,12 @@
{{ scope.row.发票金额 }}
</template>
</el-table-column>
<el-table-column label="申请人" sortable prop="申请人姓名" align="center" min-width="80">
<el-table-column label="申请人" prop="申请人姓名" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
</template>
</el-table-column>
<el-table-column label="申请时间" sortable prop="申请时间" align="center" min-width="115" show-overflow-tooltip>
<el-table-column label="申请时间" prop="申请时间" align="center" min-width="115" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.申请时间 ? scope.row.申请时间 : '—' }}
</template>

6
src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
View File

@@ -7,7 +7,7 @@
<el-date-picker v-model="date2" size="small" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择结束日期"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
</div>
<h4 style="margin-top: 5px">发票结算申请单</h4>
<h4 style="margin: 0">发票结算申请单</h4>
<el-table id="expandTable" :data="tableData1" border highlight-current-row height="330px" style="width: 100%;height: 330px;overflow:auto" size="mini" @row-click="searchTable2">
<el-table-column type="expand">
<template slot-scope="scope">
@@ -115,9 +115,9 @@
</div>
</el-card>
<el-card>
<h4 style="margin-top: 5px;display: inline-block;width: 150px;">发票结算申请单明细</h4>
<h4 style="margin: 0px;display: inline-block;width: 150px;">发票结算申请单明细</h4>
<span>发票号：</span>
<el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly/>
<el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly style="margin: 5px 0 5px 0"/>
<el-table :data="tableData2" border stripe highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
<el-table-column label="名称" align="center" min-width="100">
<template slot-scope="scope">

208
src/views/PurchasingCenter/MaterialMProcure/index.vue
View File

@@ -2,126 +2,88 @@
<div class="app-container">
<el-card>
<el-row>
<el-col style="width: 280px;margin-top: 3px">
<span>物料类别:</span>
<el-select
v-model="MaterialCategoryValue"
placeholder="请选择"
size="small"
clearable
@change="searchMaterialVariety">
<el-option
v-for="item in MaterialCategory"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-col>
<el-col style="width: 280px;margin-top: 3px">
<span>物料品种:</span>
<el-select
v-model="MaterialVarietyValue"
placeholder="请选择"
size="small"
clearable
@change="searchMaterial">
<el-option
v-for="item in MaterialVariety"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-col>
<el-col style="width: 280px;margin-top: 3px">
<span>物料名称:</span>
<el-input v-model="MaterialName" placeholder="物料名称" size="small" clearable />
</el-col>
<el-col style="width: 280px;margin-top: 3px">
<span>物料全称:</span>
<el-input
v-model="FullNameOfMaterial"
placeholder="物料全称"
size="small"
clearable/>
</el-col>
<el-col style="width: 280px;margin-top: 3px">
<span>物料规格:</span>
<el-input
v-model="MaterialSpecification"
placeholder="物料规格"
size="small"
clearable/>
</el-col>
<el-col style="width: 280px;margin-top: 3px">
<span>物料型号:</span>
<el-input
v-model="MaterialModel"
placeholder="物料型号"
size="small"
clearable/>
</el-col>
<el-col style="width: 280px">
<span>计算单位:</span>
<el-select
v-model="MeasurementUnitValue"
placeholder="请选择"
style="margin-bottom: 3px;margin-top: 10px"
size="small"
clearable>
<el-option
v-for="item in MeasurementUnit"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-col>
<el-col style="width: 280px">
<span>物料来源:</span>
<el-select
v-model="MaterialSourceValue"
placeholder="请选择"
style="margin-bottom: 3px;margin-top: 10px"
size="small"
clearable>
<el-option
v-for="item in MaterialSource"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-col>
<el-col style="width: 280px">
<span style="margin-left: 15px">供货商:</span>
<el-select
v-model="GonghuoshangValue"
placeholder="请选择"
filterable
style="margin-bottom: 3px;margin-top: 10px"
size="small"
clearable>
<el-option
v-for="item in Gonghuoshang"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<!--<el-input-->
<!--v-model="supplier"-->
<!--placeholder="供货商"-->
<!--size="small"-->
<!--style="margin-bottom: 3px;margin-top: 10px"-->
<!--clearable-->
<!--@dblclick.native="param=0;openSupplier()"/>-->
</el-col>
<el-col style="width: 550px">
<el-button
type="success"
icon="el-icon-search"
size="small"
style="margin-left: 10px"
@click="pageCurrent=1;searchMaterial()">查询</el-button>
<el-button type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">新增采购物料申请</el-button>
</el-col>
<el-select
v-model="MaterialCategoryValue"
placeholder="物料类别"
size="small"
clearable
@change="searchMaterialVariety">
<el-option
v-for="item in MaterialCategory"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select
v-model="MaterialVarietyValue"
placeholder="物料品种"
size="small"
clearable
@change="searchMaterial">
<el-option
v-for="item in MaterialVariety"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-input v-model="MaterialName" placeholder="物料名称" size="small" clearable />
<el-input
v-model="FullNameOfMaterial"
placeholder="物料全称"
size="small"
clearable/>
<el-input
v-model="MaterialSpecification"
placeholder="物料规格"
size="small"
clearable/>
<el-input
v-model="MaterialModel"
placeholder="物料型号"
size="small"
clearable/>
<el-select
v-model="MeasurementUnitValue"
placeholder="计算单位"
size="small"
style="width: 80px"
clearable>
<el-option
v-for="item in MeasurementUnit"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select
v-model="MaterialSourceValue"
placeholder="物料来源"
size="small"
clearable>
<el-option
v-for="item in MaterialSource"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select
v-model="GonghuoshangValue"
placeholder="供货商"
filterable
size="small"
clearable>
<el-option
v-for="item in Gonghuoshang"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button
type="success"
icon="el-icon-search"
size="small"
style="margin-left: 10px"
@click="pageCurrent=1;searchMaterial()">查询</el-button>
<el-button type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">新增采购物料申请</el-button>
</el-row>
</el-card>
@@ -720,9 +682,11 @@ export default {
<style scoped>
.el-select{
width:190px
width:150px;
margin-right: 10px;
}
.el-input{
width:190px
width:150px;
margin-right: 10px;
}
</style>

8
src/views/PurchasingCenter/MaterialManagement/index.vue
View File

@@ -147,22 +147,22 @@
highlight-current-row
border
stripe>
<el-table-column align="center" label="物料名称">
<el-table-column align="center" label="物料名称" prop="物料名称">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="物料规格">
<el-table-column align="center" label="物料规格" prop="物料规格">
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column align="center" label="物料型号">
<el-table-column align="center" label="物料型号" prop="物料型号">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column align="center" label="供货商">
<el-table-column align="center" label="供货商" prop="供货商">
<template slot-scope="scope">
{{ scope.row.供货商 }}
</template>

20
src/views/PurchasingCenter/OfflineContract/index.vue
View File

@@ -2007,7 +2007,6 @@ export default {
</script>
<style scoped>
.offlineContract td{
height: 40px;
text-align: center;
@@ -2017,12 +2016,7 @@ export default {
}
.el-date-editor{
width:150px;
}
.el-select{
width:195px
}
.el-input{
width:195px
margin-right: 10px;
}
span{
margin: 10px 0 10px 10px;
@@ -2041,6 +2035,18 @@ export default {
right: 15px;
top: 5px;
}
.el-select{
width:150px;
margin-right: 10px;
}
.el-input{
width:150px;
margin-right: 10px;
}
.el-cascader{
width:150px;
margin-right: 10px;
}
</style>
<style>
.el-table .MistyRose {

80
src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
View File

@@ -33,17 +33,17 @@
</div>
<h3 style="margin-top: 0">请款表</h3>
<el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" stripe>
<el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="250" show-overflow-tooltip>
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="250" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="请款时间" sortable prop="。请款时间" align="center" min-width="150">
<el-table-column label="请款时间" prop="。请款时间" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.请款时间 }}
</template>
</el-table-column>
<el-table-column label="请款人" sortable prop="姓名" align="center" min-width="80">
<el-table-column label="请款人" prop="姓名" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
@@ -53,43 +53,43 @@
{{ scope.row.请款金额 }}
</template>
</el-table-column>
<el-table-column label="请款付款情况" align="center">
<el-table-column label="审核情况内容" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.审核情况流水号)===3" type="primary" size="small">未审核</el-tag>
<el-tag v-if="Number(scope.row.审核情况流水号)===1" type="success" size="small">已通过</el-tag>
<el-tag v-if="Number(scope.row.审核情况流水号)===2" type="danger" size="small">不通过</el-tag>
</template>
</el-table-column>
<el-table-column label="未通过审核原因" width="110" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审核原因 === '通过' ? '—' : scope.row.未通过审核原因 }}
</template>
</el-table-column>
<el-table-column label="审批情况内容" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</el-tag>
</template>
</el-table-column>
<el-table-column label="未通过审批原因" width="110" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
</template>
</el-table-column>
<el-table-column label="付款情况" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已同意</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="small">不同意</el-tag>
</template>
</el-table-column>
<el-table-column label="未付款原因" width="100" align="center">
<template slot-scope="scope">
{{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
</template>
</el-table-column>
<!--<el-table-column label="请款付款情况" align="center">-->
<!--</el-table-column>-->
<el-table-column label="审核情况内容" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.审核情况流水号)===3" type="primary" size="small">未审核</el-tag>
<el-tag v-if="Number(scope.row.审核情况流水号)===1" type="success" size="small">已通过</el-tag>
<el-tag v-if="Number(scope.row.审核情况流水号)===2" type="danger" size="small">不通过</el-tag>
</template>
</el-table-column>
<el-table-column label="未通过审核原因" width="110" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审核原因 === '通过' ? '—' : scope.row.未通过审核原因 }}
</template>
</el-table-column>
<el-table-column label="审批情况内容" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</el-tag>
</template>
</el-table-column>
<el-table-column label="未通过审批原因" width="130" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
</template>
</el-table-column>
<el-table-column label="付款情况" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已同意</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="small">不同意</el-tag>
</template>
</el-table-column>
<el-table-column label="未付款原因" width="130" align="center">
<template slot-scope="scope">
{{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="250">
<template slot-scope="scope">

6
src/views/PurchasingCenter/OfflineContractSearch/index.vue
View File

@@ -21,8 +21,8 @@
:data="tableData1"
size="mini"
border
style="width: 100%;max-height: 350px;"
height="350px"
style="width: 100%"
height="500px"
highlight-current-row
@row-click="searchTable2">
<el-table-column label="供应商" align="center" min-width="220">
@@ -116,7 +116,7 @@ export default {
supplierName: '',
total1: 0,
pageCurrent1: 1,
pageSize1: 10,
pageSize1: 20,
tableData1: [],
loading1: false,
contractDetail: []

16
src/views/PurchasingCenter/PayStateSearch/index.vue
View File

@@ -22,7 +22,7 @@
style="margin-left:10px"
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
</div>
<el-table v-loading="" :data="tableData1" stripe border style="width: 100%;max-height: 500px;" height="500px" size="mini">
<el-table v-loading="" :data="tableData1" stripe border style="width: 100%" height="800px" size="mini">
<el-table-column type="expand" label="详情" align="center">
<template slot-scope="scope">
<el-form label-position="left" inline class="demo-table-expand">
@@ -54,7 +54,7 @@
</el-form>
</template>
</el-table-column>
<el-table-column label="采购合同号" sortable prop="采购合同编号" align="center" min-width="100">
<el-table-column label="采购合同号" prop="采购合同编号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.采购合同编号 }}
</template>
@@ -64,32 +64,32 @@
{{ scope.row.采购合同名称 }}
</template>
</el-table-column>
<el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="150">
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="采购员" sortable prop="姓名" align="center" min-width="60">
<el-table-column label="采购员" prop="姓名" align="center" min-width="60">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="合同总额" sortable prop="合同金额" align="center" min-width="70" fixed="right">
<el-table-column label="合同总额" prop="合同金额" align="center" min-width="70" fixed="right">
<template slot-scope="scope">
{{ scope.row.合同总额 }}
</template>
</el-table-column>
<el-table-column label="欠款金额" sortable prop="已付金额" align="center" min-width="70" fixed="right">
<el-table-column label="欠款金额" prop="已付金额" align="center" min-width="70" fixed="right">
<template slot-scope="scope">
{{ (Number(scope.row.合同总额)-Number(scope.row.已付金额)).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="已付金额" sortable prop="已付金额" align="center" min-width="70" fixed="right">
<el-table-column label="已付金额" prop="已付金额" align="center" min-width="70" fixed="right">
<template slot-scope="scope">
{{ Number(scope.row.已付金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="付款进度" sortable prop="付款进度" align="center" min-width="150" fixed="right">
<el-table-column label="付款进度" prop="付款进度" align="center" min-width="150" fixed="right">
<template slot-scope="scope">
<el-progress
:text-inside="true"

90
src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
View File

@@ -19,7 +19,7 @@
</div>
<h3>付款计划</h3>
<el-table :data="tableData0" size="mini" border style="max-height: 250px;" height="250px" highlight-current-row @row-click="searchContract">
<el-table-column label="计划状态" sortable prop="计划付款日期" width="100" align="center">
<el-table-column label="计划状态" prop="计划付款日期" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="timeToStamp(scope.row.计划付款日期) <= getDate" type="danger" size="small">已拖期</el-tag>
<el-tag v-if="timeToStamp(scope.row.计划付款日期) > getDate" type="success" size="small">未拖期</el-tag>
@@ -40,17 +40,17 @@
{{ scope.row.计划付款备注 }}
</template>
</el-table-column>
<el-table-column label="采购合同编号" sortable prop="采购合同编号" min-width="100" align="center" show-overflow-tooltip>
<el-table-column label="采购合同编号" prop="采购合同编号" min-width="100" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.采购合同编号 }}
</template>
</el-table-column>
<el-table-column label="采购合同名称" sortable prop="采购合同名称" min-width="100" align="center">
<el-table-column label="采购合同名称" prop="采购合同名称" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.采购合同名称 }}
</template>
</el-table-column>
<el-table-column label="供应商" sortable prop="供应商名称" min-width="150" align="center">
<el-table-column label="供应商" prop="供应商名称" min-width="150" align="center">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
@@ -75,7 +75,7 @@
style="margin-left: 10px"
@click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
<div style="margin-top: 10px">
<div>
<span v-show="supplierValue">累计合同总额：</span>
<el-input v-show="supplierValue" v-model="totalSum" size="mini" style="width: 100px;" readonly/>
<span v-show="supplierValue">累计付款：</span>
@@ -86,17 +86,17 @@
</div>
<h3>请款表</h3>
<el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" stripe>
<el-table-column label="供应商" sortable prop="供应商名称" align="center" min-width="250" show-overflow-tooltip>
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="250" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="请款时间" sortable prop="请款时间" align="center" min-width="150">
<el-table-column label="请款时间" prop="请款时间" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.请款时间 }}
</template>
</el-table-column>
<el-table-column label="请款人" sortable prop="姓名" align="center" min-width="80">
<el-table-column label="请款人" prop="姓名" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
@@ -106,43 +106,43 @@
{{ scope.row.请款金额 }}
</template>
</el-table-column>
<el-table-column label="请款付款情况" align="center">
<el-table-column label="审核情况内容" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.审核情况流水号)===3" type="primary" size="small">未审核</el-tag>
<el-tag v-if="Number(scope.row.审核情况流水号)===1" type="success" size="small">已通过</el-tag>
<el-tag v-if="Number(scope.row.审核情况流水号)===2" type="danger" size="small">不通过</el-tag>
</template>
</el-table-column>
<el-table-column label="未通过审核原因" width="110" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审核原因 === '通过' ? '—' : scope.row.未通过审核原因 }}
</template>
</el-table-column>
<el-table-column label="审批情况内容" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</el-tag>
</template>
</el-table-column>
<el-table-column label="未通过审批原因" width="110" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
</template>
</el-table-column>
<el-table-column label="付款情况" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已付款</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="small">不同意</el-tag>
</template>
</el-table-column>
<el-table-column label="未付款原因" width="100" align="center">
<template slot-scope="scope">
{{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
</template>
</el-table-column>
<!--<el-table-column label="请款付款情况" align="center">-->
<!--</el-table-column>-->
<el-table-column label="审核情况内容" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.审核情况流水号)===3" type="primary" size="small">未审核</el-tag>
<el-tag v-if="Number(scope.row.审核情况流水号)===1" type="success" size="small">已通过</el-tag>
<el-tag v-if="Number(scope.row.审核情况流水号)===2" type="danger" size="small">不通过</el-tag>
</template>
</el-table-column>
<el-table-column label="未通过审核原因" width="110" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审核原因 === '通过' ? '—' : scope.row.未通过审核原因 }}
</template>
</el-table-column>
<el-table-column label="审批情况内容" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</el-tag>
</template>
</el-table-column>
<el-table-column label="未通过审批原因" width="130" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
</template>
</el-table-column>
<el-table-column label="付款情况" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已付款</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="small">不同意</el-tag>
</template>
</el-table-column>
<el-table-column label="未付款原因" width="130" align="center">
<template slot-scope="scope">
{{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="250">
<template slot-scope="scope">

4
src/views/PurchasingCenter/PurchaseContractReview/index.vue
View File

@@ -43,8 +43,8 @@
:data="tableData1"
size="mini"
border
style="width: 100%;max-height: 300px;"
height="300px"
style="width: 100%"
height="500px"
highlight-current-row
@row-click="searchTable2">
<el-table-column type="expand" label="详情">

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