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-05-13 16:00:35 +08:00
parent dfd3fb5d7f fe0ba3d7bd
commit 549eb788b4
28 changed files with 544 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -61,14 +61,14 @@ export function searchPeople(data1) {
})
}
// 离线件出库
export function outlinePartOut(data2, data3, data4, data5, data6, data7, data8, data9, data10) {
export function outlinePartOut(data2, data3, data4, data5, data6, data7, data8, data9, data10, data11) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_离线采购件_零件出库',
param: '领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 + '&项目流水号=' + data6 + '&机床流水号=' + data7 + '&组件流水号=' + data8 + '&物料流水号=' + data9 + '&出库人员流水号=' + data10
param: '领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 + '&项目流水号=' + data6 + '&机床流水号=' + data7 + '&组件流水号=' + data8 + '&物料流水号=' + data9 + '&出库人员流水号=' + data10 + '&离线合同明细流水号=' + data11
}
})
}

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

@@ -0,0 +1,25 @@
import request from '@/utils/request'
// 电子看板_线体上下线数量统计_查询
export function ANDON_countselect() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'ANDON_大屏幕显示',
param: 'WorkShopType=A'
}
})
}
export function ANDON_opselect(opname) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'ANDON_办公室监控_消息通知',
param: 'WorkShopType=A' + '&工位号=' + opname + '=string'
}
})
}

43
src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js
View File

@@ -1,14 +1,49 @@
import request from '@/utils/request'
// 查询
export function search(pageCurrent, pageSize, num) {
// 初始化机床项目
export function initMachineProject() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_按零件图号查',
param: '零件图号=' + num,
name: 'PDM_项目名称_查询数据'
}
})
}
// 组件查询
export function searchgroup(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_组件名称_查询数据',
param: '机床流水号=' + num
}
})
}
// 工艺定额人员查询
export function initPerson() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=20'
}
})
}
// 查询
export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3, check4, val4) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_按机床分组图号人员查',
param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}`,
Pagination: pageCurrent + '&' + pageSize
}
})

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

@@ -353,7 +353,7 @@ export function saveApprove(num0, num1, request0, spec, num2, outhelp, num3, num
method: 'post',
data: {
type: '2',
name: ' ',
name: '车间生产管理工艺_零件工序_增加数据_同时修改工艺计划',
param: '工艺计划流水号=' + num0 + '&工艺编号=' + num1 + '&工艺要求=' + request0 + '&原材料规格=' + spec + '&工序顺序=' + num2 + '&工序间是否外协=' + outhelp + '&工序流水号=' + num3 + '&材料流水号=' + num4 + '&重量=' + weight + '&面积=' + area + '&工艺人员编号=' + num5 + '&工艺难度等级=' + level
}
})

1
src/icons/svg/AntonMonitoring.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="1557551342926" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2259" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 972.20608a460.22656 460.22656 0 1 1 460.8-460.22144 460.50816 460.50816 0 0 1-460.8 460.22144z m0-869.248a409.6 409.6 0 1 0 409.56416 409.6 409.6 409.6 0 0 0-409.56416-409.6z m317.47584 413.51168v-0.08192c0 0.3072-0.0512 0.58368-0.0512 0.85504-0.03072 0.1536-0.03072 0.30208-0.0512 0.42496 0 0.2048-0.05632 0.43008-0.0768 0.62976l-0.08192 0.73216v0.08192a27.45856 27.45856 0 0 1-6.69696 14.336c-6.72768 8.66304-14.06464 16.7936-21.4272 24.7808a558.592 558.592 0 0 1-135.74144 109.4656 347.96032 347.96032 0 0 1-101.71392 39.10144 277.43232 277.43232 0 0 1-116.88448-1.7664c-67.15904-15.52896-128-54.16448-181.17632-100.32128a510.62784 510.62784 0 0 1-69.39136-71.2448 28.55424 28.55424 0 0 1 0-36.72064c6.69696-8.66304 14.05952-16.8192 21.42208-24.7808a557.94688 557.94688 0 0 1 135.73632-109.41952 347.70432 347.70432 0 0 1 101.7088-39.1168 277.55008 277.55008 0 0 1 116.85376 1.7408c67.16416 15.5392 128 54.1952 181.17632 100.352a508.54912 508.54912 0 0 1 69.39648 71.2448 26.97216 26.97216 0 0 1 6.70208 14.336 0.09216 0.09216 0 0 0 0 0.0768l0.08192 0.73216 0.11264 0.65024v0.43008a7.89504 7.89504 0 0 1 0.05632 0.84992c0 0.45568 0.0512 0.88576 0.0512 1.31072l-0.00512 1.32608zM509.44 381.99808c-66.2784 0-120.00768 57.18528-120.00768 127.77472s53.76 127.75424 120.00768 127.75424 120.0384-57.1904 120.0384-127.75424S575.74912 381.99808 509.44 381.99808z m0 191.616c-33.12128 0-60.0064-28.61056-60.0064-63.86688s26.86976-63.86176 60.0064-63.86176 60.0064 28.60032 60.00128 63.88736-26.83904 63.86688-60.00128 63.86688z" p-id="2260" fill="#ffffff"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

1
src/icons/svg/OutPartSelect.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="1557551270940" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1394" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M767.142469 703.290721 447.538361 703.290721l0 191.763488 511.369643 0L958.908004 64.079434 447.538361 64.079434l0 191.763488 319.604108 0L767.142469 703.290721zM831.065338 767.212566 831.065338 191.922101 511.458159 191.922101l0-63.920822 383.528 0L894.986159 831.132364 511.458159 831.132364l0-63.920822L831.065338 767.211543z" p-id="1395" fill="#ffffff"></path><path d="M447.538361 447.606411 447.538361 319.763744 511.458159 319.763744 511.458159 383.685589 575.380004 383.685589 575.380004 447.606411 639.301849 447.606411 639.301849 511.527233 575.380004 511.527233 575.380004 575.448054 511.458159 575.448054 511.458159 639.369899 447.538361 639.369899 447.538361 511.527233 64.011384 511.527233 64.011384 447.606411Z" p-id="1396" fill="#ffffff"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

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

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000"><path d="M500 10C229.4 10 10 229.4 10 500s219.4 490 490 490 490-219.4 490-490S770.6 10 500 10zM393.9 313.3L555.7 220c12.7-7.3 29.2-2.9 36.5 9.7 7.3 12.7 2.9 29-9.8 36.5l-161.8 93.5c-12.7 7.3-29 2.9-36.3-9.8-7.4-13-3.1-29.3 9.6-36.6zm295.3 137.6l-161.8 93.3-93.3-161.8 161.8-93.3 93.3 161.8zM157.1 650.3c-11-19.2-4.5-43.7 14.7-54.7l295.6-155.2 26.7 46.3L211.8 665c-19.1 11-43.7 4.5-54.7-14.7zM785 783.7H438l-1.3-25.5 26.2-1.2s1.6-11.9 1.6-26.7c0-14.8 12-26.7 26.7-26.7h240.2c14.8 0 26.7 11.9 26.7 26.7V757l27.5-.6-.6 27.3zm-55.7-263.3l-161.9 93.3c-12.7 7.3-29.2 2.9-36.5-9.8-7.3-12.7-2.9-29.2 9.7-36.5l161.8-93.3c12.7-7.3 29.2-2.9 36.5 9.8 7.6 12.7 3.2 29-9.6 36.5z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 737 B

1
src/icons/svg/machine.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="1557552071193" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2463" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M938.666667 810.666667V85.333333H106.666667v448h21.333333v64h64v85.333334h42.666667v-85.333334h64v-64h21.333333V298.666667h362.666667v512h-106.666667v-85.333334h-170.666667v85.333334h-106.666666v-85.333334H128v85.333334H42.666667v128h938.666666v-128zM256 554.666667H170.666667v-21.333334h85.333333z m21.333333-298.666667v234.666667H149.333333V128h746.666667v682.666667h-170.666667V256z m170.666667 512h85.333333v42.666667h-85.333333zM170.666667 768h85.333333v42.666667H170.666667z m768 128H85.333333v-42.666667h853.333334z" p-id="2464" fill="#1296db"></path><path d="M661.333333 192m-42.666666 0a42.666667 42.666667 0 1 0 85.333333 0 42.666667 42.666667 0 1 0-85.333333 0Z" p-id="2465" fill="#1296db"></path><path d="M277.333333 170.666667h298.666667v42.666666H277.333333zM789.333333 597.333333h42.666667v170.666667h-42.666667zM789.333333 469.333333h42.666667v85.333334h-42.666667zM789.333333 341.333333h42.666667v85.333334h-42.666667z" p-id="2466" fill="#1296db"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

1
src/icons/svg/machiningHoursStatistics.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="1557551198088" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="569" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 964.608c-61.089792 0-120.367104-11.969536-176.183296-35.57888-53.900288-22.797312-102.300672-55.428096-143.858688-96.987136-41.55904-41.558016-74.189824-89.959424-96.987136-143.858688C71.361536 632.367104 59.392 573.089792 59.392 512s11.969536-120.367104 35.57888-176.183296c22.797312-53.900288 55.428096-102.300672 96.987136-143.858688 41.558016-41.55904 89.959424-74.189824 143.858688-96.987136C391.632896 71.361536 450.910208 59.392 512 59.392s120.367104 11.969536 176.183296 35.57888c53.900288 22.797312 102.300672 55.428096 143.858688 96.987136 41.55904 41.558016 74.189824 89.959424 96.987136 143.858688C952.638464 391.632896 964.608 450.910208 964.608 512c0 88.037376-25.302016 173.389824-73.16992 246.832128-7.719936 11.845632-23.5776 15.187968-35.426304 7.469056-11.843584-7.719936-15.187968-23.580672-7.468032-35.426304C890.978304 665.769984 913.408 590.084096 913.408 512c0-54.201344-10.609664-106.76736-31.53408-156.237824-20.215808-47.797248-49.163264-90.727424-86.03648-127.599616s-79.803392-65.819648-127.599616-86.03648C618.76736 121.201664 566.201344 110.592 512 110.592s-106.76736 10.609664-156.237824 31.53408c-47.797248 20.215808-90.727424 49.163264-127.599616 86.03648s-65.819648 79.803392-86.03648 127.599616C121.201664 405.23264 110.592 457.798656 110.592 512s10.609664 106.76736 31.53408 156.237824c20.215808 47.797248 49.163264 90.727424 86.03648 127.599616s79.803392 65.819648 127.599616 86.03648C405.23264 902.798336 457.798656 913.408 512 913.408c80.4864 0 158.12096-23.724032 224.514048-68.605952 11.711488-7.917568 27.626496-4.842496 35.545088 6.87104 7.918592 11.712512 4.842496 27.626496-6.87104 35.546112C690.296832 937.846784 602.745856 964.608 512 964.608z" p-id="570" fill="#ffffff"></path><path d="M674.051072 392.5504l-221.702144-128c-7.919616-4.574208-17.680384-4.574208-25.6 0-7.92064 4.573184-12.8 13.024256-12.8 22.1696l0 435.2-10.24 0c-14.139392 0-25.6 11.460608-25.6 25.6s11.460608 25.6 25.6 25.6l122.88 0c14.139392 0 25.6-11.460608 25.6-25.6s-11.460608-25.6-25.6-25.6l-61.44 0L465.148928 557.500416 674.051072 436.8896c7.92064-4.573184 12.8-13.024256 12.8-22.1696S681.971712 397.12256 674.051072 392.5504zM465.148928 498.378752 465.148928 331.061248 610.051072 414.72 465.148928 498.378752z" p-id="571" fill="#ffffff"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

1
src/utils/request.js
View File

@@ -5,6 +5,7 @@ import axios from 'axios'
export const wsuri = `ws://192.168.1.232:61101//WebMoudule//websocket`
export const name = `OP8888`
export const name1 = `OP1000`
// 创建axios实例
export const readFile = `http://192.168.1.231:8411/webpage/file/` // invoice

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

@@ -9,7 +9,7 @@
</el-card>
<el-card>
<el-table v-loading="listLoading" :data="tableData" border size="mini" style="width: 100%" height="650px">
<el-table v-loading="listLoading" :data="tableDataNum" border size="mini" style="width: 100%" height="650px">
<el-table-column
label="序号"
align="center"
@@ -32,12 +32,12 @@
</el-table-column>
<el-table-column label="计划数量" align="center" min-width="100">
<template slot-scope="scope" align="center">
{{ tableData[scope.$index].plannumber }}
{{ tableDataNum[scope.$index].plannumber }}
</template>
</el-table-column>
<el-table-column label="入库数量" align="center" min-width="100">
<template slot-scope="scope">
<el-input v-model="tableData[scope.$index].innumber" clearable size="mini"/>
<el-input v-model="tableDataNum[scope.$index].innumber" clearable size="mini"/>
</template>
</el-table-column>
<el-table-column label="仓库" align="center" min-width="100">
@@ -92,7 +92,7 @@ export default {
ace: 0,
a: '',
tableData: [],
partNumber: '',
partNumber: [],
listLoading: false,
craftplannumber: '',
radio2: 3,
@@ -101,7 +101,8 @@ export default {
inventoryNumber: '',
locateName: [], // 货位名称下拉框
locateNumber: '',
Partpaint: ''
Partpaint: '',
tableDataNum: []
}
},
computed: {
@@ -118,6 +119,7 @@ export default {
methods: {
// 移除
handleDelete(index, row) {
this.tableDataNum.splice(index, 1)
this.tableData.splice(index, 1)
},
// 获取人员编号
@@ -153,10 +155,12 @@ export default {
},
// 根据图号查流水号并查表1
getCraftNumber() {
this.partNumber = ''
this.partNumber = []
CraftNumber(this.Partpaint).then(response => {
if (response.data.length > 0 && response.data[0].工艺计划流水号) {
this.partNumber = response.data[0].工艺计划流水号
for (let i = 0; i < response.data.length; i++) {
this.partNumber.push(
response.data[i].工艺计划流水号
)
}
}).then(() => {
this.getscantable()
@@ -166,50 +170,78 @@ export default {
getPaint() {
searchPartNumber(this.partNumber).then(response => {
this.Partpaint = response.data[0].零件图号
return this.Partpaint
}).then(() => {
this.getCraftNumber()
})
this.getscantable()
// this.getscantable()
},
// 根据流水号查询
getscantable() {
if (this.partNumber === '' || this.partNumber === null) {
this.$message.error('请输入正确零件号')
// this.tableData = []
if (this.partNumber.length === 0) {
this.$notify({
title: '警告',
message: '请输入正确的零件图号',
type: 'warning'
})
} else {
this.listLoading = true
searchTable(this.partNumber).then(response => {
console.log(response.data)
if (response.data.length === 0) {
this.listLoading = false
this.$message.warning('该零件未加工完成')
} else if (response.data[0].考核状态 === 8) {
this.listLoading = false
this.$message.warning('该零件已入库')
} else if (response.data[0].考核状态 === 9) {
this.listLoading = false
this.$message.warning('该零件已出库')
} else if (response.data[0].考核状态 === 7) {
for (let i = 0; i < this.tableData.length; i++) {
if (response.data[0].工艺计划流水号 === this.tableData[i].工艺计划流水号) {
this.ace = this.ace + 1
}
}
if (this.ace === 0) {
this.tableData.push({
plannumber: response.data[0].剩余数量,
innumber: response.data[0].入库数量,
capture: '',
note: '',
工艺计划流水号: response.data[0].工艺计划流水号,
项目名称: response.data[0].项目名称,
机床图号: response.data[0].机床图号,
零件图号: response.data[0].零件图号
this.$notify({
title: '警告',
message: '该零件未加工完成',
type: 'warning'
})
} else {
this.$message.error('此件已在列表中')
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].考核状态 === 8) {
this.listLoading = false
this.$notify({
title: '警告',
message: 'P' + response.data[i].工艺计划流水号 + '已入库',
type: 'warning'
})
} else if (response.data[i].考核状态 === 9) {
this.listLoading = false
this.$notify({
title: '警告',
message: 'P' + response.data[i].工艺计划流水号 + '已出库',
type: 'warning'
})
} else if (response.data[i].考核状态 === 7) {
this.listLoading = false
this.tableData.push({
plannumber: response.data[i].剩余数量,
innumber: response.data[i].入库数量,
capture: '',
note: '',
工艺计划流水号: response.data[i].工艺计划流水号,
项目名称: response.data[i].项目名称,
机床图号: response.data[i].机床图号,
零件图号: response.data[i].零件图号
})
const hash = {} // 一个新数组，data为你需要去重的数组，newData用于接收去重后的数组, curVal.去重条件
this.tableDataNum = this.tableData.reduce((preVal, curVal) => {
hash[curVal.工艺计划流水号] ? '' : hash[curVal.工艺计划流水号] = true && preVal.push({
工艺计划流水号: curVal.工艺计划流水号,
项目名称: curVal.项目名称,
机床图号: curVal.机床图号,
零件图号: curVal.零件图号,
plannumber: curVal.plannumber,
innumber: curVal.innumber,
capture: '',
note: ''
})
return preVal
}, [])
}
}
}
}).then(() => {
this.listLoading = false
this.ace = 0
})
}
},
@@ -223,14 +255,14 @@ export default {
if (this.locateNumber === '') {
this.$message.error('请选择货位')
} else {
for (let i = 0; i < this.tableData.length; i++) {
if (Number(this.tableData[i].innumber) === 0) {
for (let i = 0; i < this.tableDataNum.length; i++) {
if (Number(this.tableDataNum[i].innumber) === 0) {
this.$message.error('请输入正确数量')
} else {
if (this.tableData[i].innumber > this.tableData[i].plannumber) {
this.tableData[i].innumber = this.tableData[i].plannumber
if (this.tableDataNum[i].innumber > this.tableDataNum[i].plannumber) {
this.tableDataNum[i].innumber = this.tableDataNum[i].plannumber
}
insertOne(this.tableData[i].工艺计划流水号, this.tableData[i].innumber, this.PeopleNumber, this.tableData[i].capture, this.inventoryNumber, this.locateNumber, this.tableData[i].note).then(response => {
insertOne(this.tableDataNum[i].工艺计划流水号, this.tableDataNum[i].innumber, this.PeopleNumber, this.tableDataNum[i].capture, this.inventoryNumber, this.locateNumber, this.tableDataNum[i].note).then(response => {
if (response.data[0].result === '1') {
this.$message({
type: 'success',
@@ -257,6 +289,7 @@ export default {
// 清空
Empty() {
this.tableData = []
this.tableDataNum = []
this.Partpaint = ''
},
// 仓库查询

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

@@ -226,7 +226,8 @@ export default {
total2: 0,
materialName: '', // 物料名称
materialSpec: '', // 物料规格
materialModel: '' // 物料型号
materialModel: '', // 物料型号
离线合同明细流水号: ''
}
},
computed: {
@@ -270,7 +271,7 @@ export default {
for (let i = 0; i < response.data.length; i++) {
this.GroupNum.push({
label: response.data[i].组号,
value: response.data[i].组件流水号
value: Number(response.data[i].组件流水号)
})
}
})
@@ -333,13 +334,13 @@ export default {
if (this.$refs['form'] !== undefined) {
this.$refs['form'].resetFields()
}
this.form = {}
this.form.MachineValue = ''
this.form.GroupNumValue = ''
this.dialogFormVisible = true
this.locateNumber = row.货位流水号
this.materialNumber = row.物料流水号
this.partnumber = row.货位存量
this.离线合同明细流水号 = row.离线合同明细流水号
},
// 重置表单
callOff() {
@@ -360,13 +361,12 @@ export default {
},
// 离线外购件出库
addDirectPartm() {
console.log(this.partnumber, this.form.DirectNumber)
if (Number(this.partnumber) < Number(this.form.DirectNumber)) {
this.$message.error('请正确输入数量')
} else {
this.$refs['form'].validate((valid) => {
if (valid) {
outlinePartOut(this.form.PeopleValue, this.form.DirectNumber, this.locateNumber, this.form.DirectNote, this.form.ProjectValue, this.form.MachineValue, this.form.GroupNumValue, this.materialNumber, this.PeopleNumber).then(response => {
outlinePartOut(this.form.PeopleValue, this.form.DirectNumber, this.locateNumber, this.form.DirectNote, this.form.ProjectValue, this.form.MachineValue, this.form.GroupNumValue, this.materialNumber, this.PeopleNumber, this.离线合同明细流水号).then(response => {
if (response.data[0].result === '1') {
this.$message.success('零件出库成功')
this.dialogFormVisible = false

153
src/views/ManufacturingCenter/AntonMonitoring/index.vue Normal file
View File

@@ -0,0 +1,153 @@
<template>
<div>
<el-card>
<el-badge :value="value" class="item" style="margin-bottom: 10px; float: right">
<el-button size="small" @click="openWindow">Andon信息</el-button>
</el-badge>
<el-table
:data="tableData"
style="width: 100%;"
size="mini"
height="800"
highlight-current-row
border>
<el-table-column align="center" label="工位号">
<template slot-scope="scope">
<el-button type="text">{{ scope.row.工位号 }}</el-button>
</template>
</el-table-column>
<el-table-column align="center" label="登陆人">
<template slot-scope="scope">
<el-tag v-if="scope.row.姓名===''||scope.row.姓名===null" slot="reference" size="small" style="width: 80px" type="warning">未登录</el-tag>
<el-tag v-else slot="reference" type="success" size="small" style="width: 80px"> {{ scope.row.姓名 }} </el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="呼叫类型">
<template slot-scope="scope">
<div v-if="scope.row.呼叫备注===''|| scope.row.呼叫备注===null"><div style="width: 12px;height: 12px;border-radius: 50%;background-color: rgb(103, 194, 58);display: inline-block;margin:0px 5px 0 0"/>正常工作</div>
<div v-else ><div style="width: 12px;height: 12px;border-radius: 50%;background-color: red;display: inline-block;margin:0px 5px 0 0"/>{{ scope.row.呼叫备注 }}</div>
</template>
</el-table-column>
</el-table>
</el-card>
<el-dialog
:visible.sync="dialogVisible"
width="60%">
<el-table
:data="tableDataMassage"
style="width: 100%;"
size="mini"
height="500"
highlight-current-row
border>
<el-table-column align="center" label="工位号">
<template slot-scope="scope">
<el-button type="text">{{ scope.row.工位号 }}</el-button>
</template>
</el-table-column>
<el-table-column align="center" label="登陆人">
<template slot-scope="scope">
<el-tag v-if="scope.row.姓名===''||scope.row.姓名===null" slot="reference" size="small" style="width: 80px" type="warning">未登录</el-tag>
<el-tag v-else slot="reference" type="success" size="small" style="width: 80px"> {{ scope.row.姓名 }} </el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="呼叫类型">
<template slot-scope="scope">
<div v-if="scope.row.呼叫备注===''|| scope.row.呼叫备注===null"><div style="width: 12px;height: 12px;border-radius: 50%;background-color: rgb(103, 194, 58);display: inline-block;margin:0px 5px 0 0"/>正常工作</div>
<div v-else ><div style="width: 12px;height: 12px;border-radius: 50%;background-color: red;display: inline-block;margin:0px 5px 0 0"/>{{ scope.row.呼叫备注 }}</div>
</template>
</el-table-column>
</el-table>
</el-dialog>
</div>
</template>
<script>
import { ANDON_countselect } from '@/api/ManufacturingCenter/AntonMonitoring'
import { wsuri, name1 } from '@/utils/request'
export default {
data() {
return {
tableData: [],
timer_ANDON: '',
andonMsg: '',
Name: '',
massage: [],
dialogVisible: false,
tableDataMassage: [],
value: 0
}
},
mounted() {
this.ANDON_countselect()
this.timer_ANDON = setInterval(this.search(), 60 * 1000 * 5) // ANDON看板 5 分钟一刷新
},
created() {
this.initWebpack()
},
methods: {
ANDON_countselect() {
ANDON_countselect().then(response => {
this.tableData = response.data
})
},
// 初始化websocket
initWebpack() {
this.websock = new WebSocket(wsuri)// 这里面的this都指向vue
this.websock.onopen = this.websocketopen
this.websock.onmessage = this.websocketonmessage
this.websock.onclose = this.websocketclose
this.websock.onerror = this.websocketerror
},
// 打开
websocketopen() {
console.log('WebSocket连接成功')
this.websock.send('{<' + name1 + '>}')
},
// 数据接收
websocketonmessage(msg) {
console.log(msg)
this.andonMsg = msg.data.split('|')[3]
this.Name = msg.data.split('|')[2]
if (this.andonMsg === '1') {
this.search()
}
},
// 关闭
websocketclose() {
console.log('WebSocket关闭')
},
// 失败
websocketerror() {
console.log('WebSocket连接失败')
},
search() {
this.tableDataMassage = []
ANDON_countselect().then(response => {
this.tableData = response.data
return response.data
}).then(data => {
for (let i = 0; i < data.length; i++) {
if (data[i].呼叫备注 !== null) {
this.tableDataMassage.push(data[i])
}
}
this.value = this.tableDataMassage.length
})
},
openWindow() {
this.dialogVisible = true
}
}
}
</script>
<style scoped>
.el-card{
margin-left: 2px;
margin-top: 2px;
margin-bottom: 2px;
margin-right: 2px;
}
</style>

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

@@ -1,19 +1,55 @@
<template>
<div class="app-container">
<el-card>
<div slot="header">
<el-row>
<el-col style="width: 280px">
<span>机床号：</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange">
<el-option
v-for="item in machineNumber"
: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.name }}</div>
</el-option>
</el-select>
</el-col>
<el-col style="width: 270px">
<span>组号：</span>
<el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable>
<el-option
v-for="item in groupNumber"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-col>
<el-col style="width: 280px">
<span>零件号：</span>
<el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 200px"/>
</el-col>
<el-col style="width: 290px">
<span>工艺员：</span>
<el-select v-model="personValue" placeholder="工艺员" size="small" clearable>
<el-option
v-for="item in person"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-col>
<el-col style="width: 290px">
<el-button type="success" size="small" style="margin-left: 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=10;total=0;searchData()">查询</el-button>
<el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-download" @click="downLoaddek('dek')">导出工艺定额卡</el-button>
<el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-download" @click="downLoadlxd('lxd')">导出加工路线单</el-button>
</el-card>
<el-card>
</el-col>
</el-row>
</div>
<el-table
v-loading="loading"
:data="tableData"
style="max-height: 300px"
height="300px"
style="max-height: 550px"
height="550"
border
highlight-current-row
@row-click="click">
@@ -44,545 +80,88 @@
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-card>
<table id="dek" style="width: 975px;" border="2px" cellspacing="0px" align="center">
<thead>
<tr height="25px">
<td colspan="4" rowspan="2" style="text-align:center;font-size: 30px;font-weight: bold">GAOJING</td>
<td rowspan="4" style="font-size: 30px;font-weight: bold;width: 210px">工艺、定额卡</td>
<td>零件图号</td>
<td colspan="3">{{ 零件图号 }}</td>
<el-card v-if="tableData2.length">
<table class="tg">
<tr>
<td class="tg-x61c" colspan="4" rowspan="2">江苏高精</td>
<td class="tg-c3ow" colspan="2" rowspan="2">零件条码</td>
<td class="tg-c3ow" colspan="3">零件图号</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件图号 : '' }}</td>
<td class="tg-c3ow">数量</td>
</tr>
<tr>
<td>零件名称</td>
<td>{{ 零件名称 }}</td>
<td>数量</td>
<td>{{ 投产数量 }}</td>
<td class="tg-c3ow" colspan="3">零件名称</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件名称 : '' }}</td>
<td class="tg-c3ow" rowspan="3">{{ tableData2[0] ? tableData2[0].投产数量 : '' }}</td>
</tr>
<tr>
<td colspan="4" style="text-align:center;">江苏高精机电装备有限公司</td>
<td colspan="2">材料</td>
<td colspan="2">原材料规格</td>
<td class="tg-c3ow" colspan="2">项目名称</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].项目名称 : '' }}</td>
<td class="tg-c3ow" colspan="2" rowspan="2">{{ tableData2[0] ? 'P' + tableData2[0].工艺计划流水号 : '' }}</td>
<td class="tg-c3ow" colspan="3">机床</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机床图号 : '' }}</td>
</tr>
<tr>
<td>机床号</td>
<td>{{ 机床号 }}</td>
<td>组号</td>
<td>{{ 组号 }}</td>
<td colspan="2">{{ 材料 }}</td>
<td colspan="2">{{ 原材料规格 }}</td>
<td class="tg-c3ow">材质</td>
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].材料 : '' }}</td>
<td class="tg-c3ow">规格</td>
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].原材料规格 : '' }}</td>
<td class="tg-c3ow" colspan="3">组号</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].组号 : '' }}</td>
</tr>
<tr>
<td rowspan="2" style="text-align:center;">序次</td>
<td rowspan="2" colspan="2" style="text-align:center;">工艺名称</td>
<td rowspan="2" colspan="4" style="text-align:center;width: 550px">工艺要求</td>
<td colspan="2" style="text-align:center;">定额工时</td>
<td class="tg-c3ow">序次</td>
<td class="tg-c3ow">工艺名称</td>
<td class="tg-c3ow" colspan="3">工艺要求</td>
<td class="tg-c3ow">难度系数</td>
<td class="tg-c3ow">工作者</td>
<td class="tg-c3ow">单件</td>
<td class="tg-c3ow">准结</td>
<td class="tg-c3ow">检查结果</td>
<td class="tg-c3ow">计划完成日期</td>
<td class="tg-c3ow">工序条码</td>
</tr>
<tr v-for="(value,key) in tableData2" :id="key" :key="key">
<td class="tg-c3ow">{{ key + 1 }}</td>
<td class="tg-c3ow">{{ value.工艺名称 }}</td>
<td class="tg-c3ow" colspan="3">{{ value.工艺要求 }}</td>
<td class="tg-c3ow">{{ value.工艺难度等级 }}</td>
<td class="tg-c3ow"/>
<td class="tg-c3ow">{{ value.单件定额工时 }}</td>
<td class="tg-c3ow">{{ value.准结定额工时 }}</td>
<td class="tg-c3ow"/>
<td class="tg-c3ow">{{ value.计划日期 }}</td>
<td class="tg-c3ow">{{ value.工序流水号 }}</td>
</tr>
<tr>
<td style="text-align:center;">单件</td>
<td style="text-align:center;">准结</td>
<td class="tg-c3ow">工艺员</td>
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].工艺员 : '' }}</td>
<td class="tg-c3ow">定额员</td>
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].定额员 : '' }}</td>
<td class="tg-c3ow">工艺完成</td>
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].工艺实际完成时间.split(' ')[0] : '' }}</td>
<td class="tg-c3ow">加工开始</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工开始时间 : '' }}</td>
<td class="tg-c3ow">加工结束</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工结束时间 : '' }}</td>
</tr>
</thead>
<tbody>
<tr id="1">
<td>1</td>
<td colspan="2"/>
<td colspan="4" style="text-align:left;"/>
<td/>
<td/>
</tr>
<tr id="2">
<td>2</td>
<td colspan="2"/>
<td colspan="4" style="text-align:left;"/>
<td/>
<td/>
</tr>
<tr id="3">
<td>3</td>
<td colspan="2"/>
<td colspan="4" style="text-align:left;"/>
<td/>
<td/>
</tr>
<tr id="4">
<td>4</td>
<td colspan="2"/>
<td colspan="4" style="text-align:left;"/>
<td/>
<td/>
</tr>
<tr id="5">
<td>5</td>
<td colspan="2"/>
<td colspan="4" style="text-align:left;"/>
<td/>
<td/>
</tr>
<tr id="6">
<td>6</td>
<td colspan="2"/>
<td colspan="4" style="text-align:left;"/>
<td/>
<td/>
</tr>
<tr id="7">
<td>7</td>
<td colspan="2"/>
<td colspan="4" style="text-align:left;"/>
<td/>
<td/>
</tr>
<tr id="8">
<td>8</td>
<td colspan="2"/>
<td colspan="4" style="text-align:left;"/>
<td/>
<td/>
</tr>
<tr id="9">
<td>9</td>
<td colspan="2"/>
<td colspan="4" style="text-align:left;"/>
<td/>
<td/>
</tr>
<tr id="10">
<td>10</td>
<td colspan="2"/>
<td colspan="4" style="text-align:left;"/>
<td/>
<td/>
</tr>
<tr id="11">
<td>11</td>
<td colspan="2"/>
<td colspan="4" style="text-align:left;"/>
<td/>
<td/>
</tr>
<tr id="12">
<td>12</td>
<td colspan="2"/>
<td colspan="4" style="text-align:left;"/>
<td/>
<td/>
</tr>
<tr id="13">
<td>13</td>
<td colspan="2"/>
<td colspan="4" style="text-align:left;"/>
<td/>
<td/>
</tr>
<tr id="14">
<td>14</td>
<td colspan="2"/>
<td colspan="4" style="text-align:left;"/>
<td/>
<td/>
</tr>
<tr id="15">
<td>15</td>
<td colspan="2"/>
<td colspan="4" style="text-align:left;"/>
<td/>
<td/>
</tr>
<tr id="16">
<td>16</td>
<td colspan="2"/>
<td colspan="4" style="text-align:left;"/>
<td/>
<td/>
</tr>
<tr id="17">
<td>17</td>
<td colspan="2"/>
<td colspan="4" style="text-align:left;"/>
<td/>
<td/>
</tr>
<tr id="18">
<td>18</td>
<td colspan="2"/>
<td colspan="4" style="text-align:left;"/>
<td/>
<td/>
</tr>
<tr id="19">
<td>19</td>
<td colspan="2"/>
<td colspan="4" style="text-align:left;"/>
<td/>
<td/>
</tr>
<tr id="20">
<td>20</td>
<td colspan="2"/>
<td colspan="4" style="text-align:left;"/>
<td/>
<td/>
</tr>
</tbody>
<tfoot>
<tr>
<td>工艺员:</td>
<td colspan="2">{{ 工艺员 }}</td>
<td>定额员:</td>
<td>{{ 定额员 }}</td>
<td>日期:</td>
<td colspan="3">{{ 日期 }}</td>
</tr>
</tfoot>
</table>
</el-card>
<el-card>
<table id="lxd" style="width: 800px;" border="2px" cellspacing="0px" align="center">
<thead>
<tr height="60px">
<td colspan="6" style="text-align:center;width: 33%">江苏高精机电<br>装备有限公司</td>
<td colspan="6" style="font-size: 30px;font-weight: bold;text-align:center;width: 34%">零件加工路线单</td>
<td colspan="6" style="text-align:center;width: 33%">毛 坯 别 <br> 铸 锻 铆 锯 材</td>
</tr>
<tr>
<td colspan="2" style="text-align:center">材料</td>
<td colspan="4" style="text-align:center">{{ 材料 }}</td>
<td colspan="3" style="text-align:center;width: 17%">材料规格</td>
<td colspan="9" style="text-align:center">{{ 原材料规格 }}</td>
</tr>
<tr>
<td colspan="4" style="text-align:center">机床号</td>
<td colspan="4" style="text-align:center">组号</td>
<td colspan="6" style="text-align:center">零件图号</td>
<td colspan="3" style="text-align:center">零件名称</td>
<td style="text-align:center">数量</td>
</tr>
<tr height="80px">
<td colspan="4" style="text-align:center">{{ 机床号 }}</td>
<td colspan="4" style="text-align:center">{{ 组号 }}</td>
<td colspan="6" style="text-align:center">{{ 零件图号 }}</td>
<td colspan="3" style="text-align:center">{{ 零件名称 }}</td>
<td style="text-align:center">{{ 投产数量 }}</td>
</tr>
<tr>
<td colspan="4" style="text-align:center">工序</td>
<td colspan="2" style="text-align:center">工时定额</td>
<td colspan="3" rowspan="3" style="text-align:center">工作者<br>(设备)</td>
<td colspan="4" style="text-align:center">检查结果</td>
<td colspan="2" rowspan="3" style="text-align:center">检章</td>
<td colspan="2" rowspan="3" style="text-align:center">计划完成日期</td>
<td rowspan="3" style="text-align:center">月/日</td>
</tr>
<tr>
<td rowspan="2" style="text-align:center">次序</td>
<td colspan="3" rowspan="2" style="text-align:center;width: 15%">名称</td>
<td rowspan="2" style="text-align:center">单件</td>
<td rowspan="2" style="text-align:center">准结</td>
<td rowspan="2" style="text-align:center">合格</td>
<td rowspan="2" style="text-align:center">回用</td>
<td colspan="2" style="text-align:center">废品</td>
</tr>
<tr>
<td style="text-align:center;width: 5%">工</td>
<td style="text-align:center;width: 5%">料</td>
</tr>
</thead>
<tbody>
<tr id="21">
<td style="text-align:center">1</td>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td style="text-align:center"/>
</tr>
<tr id="22">
<td style="text-align:center">2</td>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td style="text-align:center"/>
</tr>
<tr id="23">
<td style="text-align:center">3</td>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td style="text-align:center"/>
</tr>
<tr id="24">
<td style="text-align:center">4</td>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td style="text-align:center"/>
</tr>
<tr id="25">
<td style="text-align:center">5</td>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td style="text-align:center"/>
</tr>
<tr id="26">
<td style="text-align:center">6</td>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td style="text-align:center"/>
</tr>
<tr id="27">
<td style="text-align:center">7</td>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td style="text-align:center"/>
</tr>
<tr id="28">
<td style="text-align:center">8</td>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td style="text-align:center"/>
</tr>
<tr id="29">
<td style="text-align:center">9</td>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td style="text-align:center"/>
</tr>
<tr id="30">
<td style="text-align:center">10</td>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td style="text-align:center"/>
</tr>
<tr id="31">
<td style="text-align:center">11</td>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td style="text-align:center"/>
</tr>
<tr id="32">
<td style="text-align:center">12</td>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td style="text-align:center"/>
</tr>
<tr id="33">
<td style="text-align:center">13</td>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td style="text-align:center"/>
</tr>
<tr id="34">
<td style="text-align:center">14</td>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td style="text-align:center"/>
</tr>
<tr id="35">
<td style="text-align:center">15</td>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td style="text-align:center"/>
</tr>
<tr id="36">
<td style="text-align:center">16</td>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td style="text-align:center"/>
</tr>
<tr id="37">
<td style="text-align:center">17</td>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td style="text-align:center"/>
</tr>
<tr id="38">
<td style="text-align:center">18</td>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td style="text-align:center"/>
</tr>
<tr id="39">
<td style="text-align:center">19</td>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td style="text-align:center"/>
</tr>
<tr id="40">
<td style="text-align:center">20</td>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="3" style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td colspan="2" style="text-align:center"/>
<td style="text-align:center"/>
</tr>
</tbody>
</table>
</el-card>
</div>
</template>
<script>
import { search, searchtable1, searchtable2 } from '@/api/ManufacturingCenter/PartWorkCraftSelect_rdlc'
import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
import { initMachineProject, searchgroup, initPerson, search, searchtable1 } from '@/api/ManufacturingCenter/PartWorkCraftSelect_rdlc'
export default {
data() {
return {
cell: [],
machineNumberValue: '',
machineNumber: [],
groupNumberValue: '',
groupNumber: [],
personValue: '',
person: [],
pageCurrent: 1,
pageSize: 10,
total: 0,
@@ -609,16 +188,46 @@ export default {
},
methods: {
fetchData() {
for (let i = 0; i < 9; i++) {
for (let j = 1; j < 28; j++) {
this.cell.push(String.fromCharCode(65 + i) + j)
initMachineProject().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.machineNumber.push({
label: response.data[i].机床图号,
name: response.data[i].项目名称,
value: response.data[i].机床流水号
})
}
})
initPerson().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.person.push({
label: response.data[i].姓名,
value: response.data[i].人员编号
})
}
})
},
machineChange() {
this.groupNumberValue = ''
this.groupNumber = []
searchgroup(this.machineNumberValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.groupNumber.push({
label: response.data[i].组号,
value: response.data[i].组件流水号
})
}
})
},
searchData() {
this.loading = true
search(this.pageCurrent, this.pageSize, this.PrNum).then(response => {
let check1, check2, check3, check4
this.machineNumberValue ? check1 = 1 : check1 = 0
this.groupNumberValue ? check2 = 1 : check2 = 0
this.PrNum ? check3 = 1 : check3 = 0
this.personValue ? check4 = 1 : check4 = 0
search(this.pageCurrent, this.pageSize, check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.PrNum, check4, this.personValue).then(response => {
this.tableData = response.data.rows
console.log(response)
this.total = response.data.total
this.loading = false
})
@@ -626,46 +235,6 @@ export default {
click(row) {
searchtable1(row.工艺计划流水号).then(response => {
this.tableData2 = response.data
this.tableData2[0].工艺实际完成时间 = response.data[0].工艺实际完成时间.substr(0, 10) // 只处理了要显示的时间格式
this.机床号 = response.data[0].机床图号
this.组号 = response.data[0].组号
this.零件图号 = response.data[0].零件图号
this.零件名称 = response.data[0].零件名称
this.投产数量 = response.data[0].投产数量
this.材料 = response.data[0].材料
this.原材料规格 = response.data[0].原材料规格
this.工艺员 = response.data[0].工艺员
this.定额员 = response.data[0].定额员
this.日期 = response.data[0].工艺实际完成时间.substr(0, 10)
}).then(() => {
for (let j = 0; j < 20; j++) {
document.getElementById(String(j + 1)).children[1].innerHTML = ''
document.getElementById(String(j + 1)).children[2].innerHTML = ''
document.getElementById(String(j + 1)).children[3].innerHTML = ''
document.getElementById(String(j + 1)).children[4].innerHTML = ''
}
for (let j = 0; j < this.tableData2.length; j++) {
document.getElementById(String(j + 1)).children[1].innerHTML = this.tableData2[j].工艺名称
document.getElementById(String(j + 1)).children[2].innerHTML = this.tableData2[j].工艺要求
document.getElementById(String(j + 1)).children[3].innerHTML = this.tableData2[j].单件定额工时
document.getElementById(String(j + 1)).children[4].innerHTML = this.tableData2[j].准结定额工时
}
})
searchtable2(row.工艺计划流水号).then(response => {
this.tableData3 = response.data
}).then(() => {
for (let j = 0; j < 20; j++) {
document.getElementById(String(j + 21)).children[1].innerHTML = ''
document.getElementById(String(j + 21)).children[2].innerHTML = ''
document.getElementById(String(j + 21)).children[3].innerHTML = ''
document.getElementById(String(j + 21)).children[10].innerHTML = ''
}
for (let j = 0; j < this.tableData3.length; j++) {
document.getElementById(String(j + 21)).children[1].innerHTML = this.tableData3[j].工艺名称
document.getElementById(String(j + 21)).children[2].innerHTML = this.tableData3[j].单件定额工时
document.getElementById(String(j + 21)).children[3].innerHTML = this.tableData3[j].准结定额工时
document.getElementById(String(j + 21)).children[10].innerHTML = this.tableData3[j].计划日期.substr(5, 5)
}
})
},
handleSizeChange(val) {
@@ -676,27 +245,6 @@ export default {
handleCurrentChange(val) {
this.pageCurrent = val
this.searchData()
},
handleDownload() {
if (this.tableData2.length === 0) {
this.$message.error('请选择一个零件')
} else {
require.ensure([], () => {
const { export_json_to_excel } = require('@/vendor/Export2Excel1')
const list = this.tableData2
export_json_to_excel(list, '工艺定额卡', this.cell)
})
}
},
downLoaddek(tableid) { // 下载工艺定额卡
getExplorer()
method5(tableid)
Cleanup()
},
downLoadlxd(tableid) { // 下载零件加工路线单
getExplorer()
method5(tableid)
Cleanup()
}
}
}
@@ -707,6 +255,11 @@ export default {
height: 30px;
text-align:center;
}
.tg {border-collapse:collapse;border-spacing:0;margin: 0 auto}
.tg td{font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;}
.tg th{font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;}
.tg .tg-c3ow{border-color:inherit;text-align:center;vertical-align:top}
.tg .tg-x61c{font-weight:bold;font-size:28px;border-color:inherit;text-align:center;vertical-align:top}
</style>
<style scoped>
span{
@@ -715,8 +268,7 @@ export default {
.el-card{
margin-bottom: 15px;
}
.el-table {
max-height: 250px;
overflow: auto;
.el-col{
margin-bottom: 10px;
}
</style>

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

@@ -15,7 +15,7 @@
:value="item.value"/>
</el-select>
<span>零件号:</span>
<el-select v-model="partNumValue" filterable clearable placeholder="零件号" size="small" @clear="clearDetail" @change="searchParts();searchDetail()">
<el-select v-model="partNumValue" filterable clearable placeholder="零件号" size="small" @clear="clearDetail" @change="searchDetail()">
<el-option
v-for="item in partNum"
:key="item.value"
@@ -175,6 +175,7 @@
<el-table
v-loading="loading0"
:data="tableData"
class="processTable"
border
style="width: 100%;max-height: 550px;"
size="mini"
@@ -185,7 +186,6 @@
<el-input
v-model="scope.row.工艺名称"
:disabled="disabled"
size="mini"
readonly
style="width:200px"
@dblclick.native="tableSearch(scope.$index)"/>
@@ -196,7 +196,6 @@
<el-select
v-model="scope.row.工艺难度等级"
:disabled="disabled"
size="mini"
@change="hardEdit(scope.row)">
<el-option v-for="item in hard" :key="item.value" :label="item.label" :value="item.value">
<span style="color: #8492a6; font-size: 13px">{{ item.value }}</span>
@@ -210,7 +209,6 @@
v-model="scope.row.工艺要求"
:rows="1"
:disabled="disabled"
size="mini"
type="textarea"
@dblclick.native="tableSearch(scope.$index)"
@change="requestEdit(scope.row)"/>
@@ -221,25 +219,21 @@
<div>
<el-button
:disabled="disabled"
size="mini"
icon="el-icon-arrow-up"
type="primary"
@click="upOne(scope.row)"/>
<el-button
:disabled="disabled"
size="mini"
icon="el-icon-arrow-down"
type="primary"
@click="downOne(scope.row)"/>
<el-button
:disabled="disabled"
size="mini"
icon="el-icon-circle-plus-outline"
type="primary"
@click="insertOne(scope.row)"/>
<el-button
:disabled="disabled"
size="mini"
icon="el-icon-delete"
type="danger"
@click="deleteOne(scope.row)"/>
@@ -1451,3 +1445,15 @@ export default {
background: oldlace;
}
</style>
<style lang="scss">
.processTable{
.el-input__inner{
font-weight: bold;
font-size: 20px;
}
.el-textarea__inner{
font-weight: bold;
font-size: 20px;
}
}
</style>

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

@@ -411,10 +411,8 @@ export default {
})
},
typeChange() {
if (this.projectValue === '' || this.projectValue === null) {
this.toolNumValue = ''
this.toolNum = []
} else {
getToolNum(1, this.projectValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.toolNum.push({
@@ -423,10 +421,8 @@ export default {
})
}
})
}
},
groupChange(row, index) {
console.log(row.组件流水号)
if (row.组件流水号 !== '') {
searchgroupName(row.组件流水号).then(response => {
console.log(response.data)

30
src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
View File

@@ -81,12 +81,12 @@
</el-table-column>
<el-table-column label="开始时间" align="center" min-width="130px">
<template slot-scope="scope">
<span :class="colorJudge(scope.row.合同签订日期)">{{ scope.row.合同签订日期 }}</span>
<span :class="colorJudge(scope.row.合同签订日期)">{{ scope.row.合同签订日期 === '1900-01-01 00:00:00' ? '' : scope.row.合同签订日期 }}</span>
</template>
</el-table-column>
<el-table-column label="结束时间" align="center" min-width="130px">
<template slot-scope="scope">
<span :class="colorJudge(scope.row.发货节点)">{{ scope.row.发货节点 }}</span>
<span :class="colorJudge(scope.row.发货节点)">{{ scope.row.发货节点 === '1900-01-01 00:00:00' ? '' : scope.row.发货节点 }}</span>
</template>
</el-table-column>
<el-table-column label="设备预验节点" align="center" width="150px">
@@ -101,67 +101,67 @@
</el-table-column>
<el-table-column label="审图（计划开始）" align="center" min-width="170px">
<template slot-scope="scope">
{{ scope.row.审图计划开始时间 }}
{{ scope.row.审图计划开始时间 === '1900-01-01 00:00:00' ? '' : scope.row.审图计划开始时间 }}
</template>
</el-table-column>
<el-table-column label="审图（计划完成）" align="center" min-width="170px">
<template slot-scope="scope">
<span :class="colorJudge(scope.row.审图计划完成时间, scope.row.审图实际完成时间)">{{ scope.row.审图计划完成时间 }}</span>
<span :class="colorJudge(scope.row.审图计划完成时间, scope.row.审图实际完成时间)">{{ scope.row.审图计划完成时间 === '1900-01-01 00:00:00' ? '' : scope.row.审图计划完成时间 }}</span>
</template>
</el-table-column>
<el-table-column label="审图（实际完成）" align="center" min-width="170px">
<template slot-scope="scope">
<span :class="colorActual(scope.row.审图计划完成时间, scope.row.审图实际完成时间)">{{ scope.row.审图实际完成时间 }}</span>
<span :class="colorActual(scope.row.审图计划完成时间, scope.row.审图实际完成时间)">{{ scope.row.审图实际完成时间 === '1900-01-01 00:00:00' ? '' : scope.row.审图实际完成时间 }}</span>
</template>
</el-table-column>
<el-table-column label="发图" align="center" min-width="140px">
<template slot-scope="scope">
<span :class="colorJudge(scope.row.机床设计完成时间, scope.row.机床设计实际完成时间)">{{ scope.row.机床设计完成时间 }}</span>
<span :class="colorJudge(scope.row.机床设计完成时间, scope.row.机床设计实际完成时间)">{{ scope.row.机床设计完成时间 === '1900-01-01 00:00:00' ? '' : (scope.row.机床设计完成时间 ? scope.row.机床设计完成时间.split(' ')[0] : '') }}</span>
</template>
</el-table-column>
<el-table-column label="发图（实际）" align="center" width="140px">
<template slot-scope="scope">
<span :class="colorActual(scope.row.机床设计完成时间, scope.row.机床设计实际完成时间)">{{ scope.row.机床设计实际完成时间 }}</span>
<span :class="colorActual(scope.row.机床设计完成时间, scope.row.机床设计实际完成时间)">{{ scope.row.机床设计实际完成时间 === '1900-01-01 00:00:00' ? '' : scope.row.机床设计实际完成时间 }}</span>
</template>
</el-table-column>
<el-table-column label="采购" align="center" min-width="140px">
<template slot-scope="scope">
<span :class="colorJudge(scope.row.采购完成时间, scope.row.采购实际完成时间)">{{ scope.row.采购完成时间 }}</span>
<span :class="colorJudge(scope.row.采购完成时间, scope.row.采购实际完成时间)">{{ scope.row.采购完成时间 === '1900-01-01 00:00:00' ? '' : (scope.row.采购完成时间 ? scope.row.采购完成时间.split(' ')[0] : '') }}</span>
</template>
</el-table-column>
<el-table-column label="采购（实际）" align="center" width="140px">
<template slot-scope="scope">
<span :class="colorActual(scope.row.采购完成时间, scope.row.采购实际完成时间)">{{ scope.row.采购实际完成时间 }}</span>
<span :class="colorActual(scope.row.采购完成时间, scope.row.采购实际完成时间)">{{ scope.row.采购实际完成时间 === '1900-01-01 00:00:00' ? '' : scope.row.采购实际完成时间 }}</span>
</template>
</el-table-column>
<el-table-column label="备料" align="center" min-width="140px">
<template slot-scope="scope">
<span :class="colorJudge(scope.row.备料完成时间, scope.row.备料实际完成时间)">{{ scope.row.备料完成时间 }}</span>
<span :class="colorJudge(scope.row.备料完成时间, scope.row.备料实际完成时间)">{{ scope.row.备料完成时间 === '1900-01-01 00:00:00' ? '' : (scope.row.备料完成时间 ? scope.row.备料完成时间.split(' ')[0] : '') }}</span>
</template>
</el-table-column>
<el-table-column label="备料（实际）" align="center" width="140px">
<template slot-scope="scope">
<span :class="colorActual(scope.row.备料完成时间, scope.row.备料实际完成时间)">{{ scope.row.备料实际完成时间 }}</span>
<span :class="colorActual(scope.row.备料完成时间, scope.row.备料实际完成时间)">{{ scope.row.备料实际完成时间 === '1900-01-01 00:00:00' ? '' : scope.row.备料实际完成时间 }}</span>
</template>
</el-table-column>
<el-table-column label="制造" align="center" min-width="140px">
<template slot-scope="scope">
<span :class="colorJudge(scope.row.机床生产完成时间, scope.row.机床生产实际完成时间)">{{ scope.row.机床生产完成时间 }}</span>
<span :class="colorJudge(scope.row.机床生产完成时间, scope.row.机床生产实际完成时间)">{{ scope.row.机床生产完成时间 === '1900-01-01 00:00:00' ? '' : (scope.row.机床生产完成时间 ? scope.row.机床生产完成时间.split(' ')[0] : '') }}</span>
</template>
</el-table-column>
<el-table-column label="制造（实际）" align="center" width="140px">
<template slot-scope="scope">
<span :class=" colorActual(scope.row.机床生产完成时间, scope.row.机床生产实际完成时间)">{{ scope.row.机床生产实际完成时间 }}</span>
<span :class=" colorActual(scope.row.机床生产完成时间, scope.row.机床生产实际完成时间)">{{ scope.row.机床生产实际完成时间 === '1900-01-01 00:00:00' ? '' : scope.row.机床生产实际完成时间 }}</span>
</template>
</el-table-column>
<el-table-column label="装配" align="center" min-width="140px">
<template slot-scope="scope">
<span :class="colorJudge(scope.row.机床装配完成时间, scope.row.机床装配实际完成时间)">{{ scope.row.机床装配完成时间 }}</span>
<span :class="colorJudge(scope.row.机床装配完成时间, scope.row.机床装配实际完成时间)">{{ scope.row.机床装配完成时间 === '1900-01-01 00:00:00' ? '' : (scope.row.机床装配完成时间 ? scope.row.机床装配完成时间.split(' ')[0] : '') }}</span>
</template>
</el-table-column>
<el-table-column label="装配（实际）" align="center" width="140px">
<template slot-scope="scope">
<span :class="colorActual(scope.row.机床装配完成时间, scope.row.机床装配实际完成时间)">{{ scope.row.机床装配实际完成时间 }}</span>
<span :class="colorActual(scope.row.机床装配完成时间, scope.row.机床装配实际完成时间)">{{ scope.row.机床装配实际完成时间 === '1900-01-01 00:00:00' ? '' : scope.row.机床装配实际完成时间 }}</span>
</template>
</el-table-column>
</el-table>

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

@@ -212,8 +212,8 @@ export default {
this.partName = ''
this.batchNum = ''
this.material = ''
this.personValue = ''
this.tableData = [] // 清主表
this.personChange()
} else { // 未编制
this.shuliang = ''
this.isShow = false
@@ -224,7 +224,6 @@ export default {
this.partName = ''
this.batchNum = ''
this.material = ''
this.personValue = ''
this.tableData = [] // 清主表
getPartnames1().then(response => {
for (let i = 0; i < response.data.length; i++) {

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

@@ -187,19 +187,19 @@
{{ scope.row.付款方式 }}
</template>
</el-table-column>
<el-table-column align="center" label="合同总金额（元）" width="150">
<el-table-column align="center" label="合同总金额（万元）" width="150">
<template slot-scope="scope">
{{ scope.row.合同总金额 }}
{{ scope.row.合同总金额.toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="已到账金额（元）" width="150">
<el-table-column align="center" label="已到账金额（万元）" width="150">
<template slot-scope="scope">
{{ scope.row.已支付 }}
{{ scope.row.已支付.toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="未到账金额（元）" width="150">
<el-table-column align="center" label="未到账金额（万元）" width="150">
<template slot-scope="scope">
<el-tag size="small" style="width: 100px" type="warning">{{ scope.row.未支付金额 }}</el-tag>
<el-tag size="small" style="width: 100px" type="warning">{{ scope.row.未支付金额.toFixed(2) }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="付款进度" width="150">

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

@@ -104,6 +104,11 @@
</template>
</template>
</el-table-column>
<el-table-column align="center" label="客户名称" width="260">
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" width="200">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
@@ -144,11 +149,6 @@
{{ scope.row.营销经理 }}
</template>
</el-table-column>
<el-table-column align="center" label="客户名称" width="260">
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="联系人" width="80">
<template slot-scope="scope">
{{ scope.row.联系人 }}

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

@@ -484,10 +484,10 @@ export default {
sums[index] = this.taxRate * 100 + '% (税率)'
return
} else if (index === 9) {
sums[index] = (parseInt(sums[7]) * 100 * this.taxRate) / 100 + ' 元(税额)'
sums[index] = (parseInt(sums[7]) * 100 * this.taxRate) / 100 + ' 万元(税额)'
return
} else if (index === 10) {
sums[index] = parseFloat(sums[7]) - parseFloat(sums[9]) + ' 元(未税)'
sums[index] = parseFloat(sums[7]) - parseFloat(sums[9]) + ' 万元(未税)'
return
}
})

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

@@ -574,11 +574,6 @@
{{ scope.row.企业性质 }}
</template>
</el-table-column>
<el-table-column align="center" label="创立日期" min-width="100">
<template slot-scope="scope">
{{ scope.row.创立日期 }}
</template>
</el-table-column>
<el-table-column align="center" label="注册资本" min-width="100">
<template slot-scope="scope">
{{ scope.row.注册资本 }}

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

@@ -484,11 +484,6 @@
{{ scope.row.企业性质 }}
</template>
</el-table-column>
<el-table-column align="center" label="创立日期" min-width="100">
<template slot-scope="scope">
{{ scope.row.创立日期 }}
</template>
</el-table-column>
<el-table-column align="center" label="注册资本" min-width="100">
<template slot-scope="scope">
{{ scope.row.注册资本 }}

13
src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
View File

@@ -17,7 +17,10 @@
v-for="item in machine"
:key="item.value"
:label="item.label"
:value="item.value"/>
:value="item.value">
<b style="float: left">{{ item.label }}</b>
<b style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</b>
</el-option>
</el-select>
<el-button
type="success"
@@ -208,7 +211,10 @@
v-for="item in machine"
:key="item.value"
:label="item.label"
:value="item.value"/>
:value="item.value">
<b style="float: left">{{ item.label }}</b>
<b style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</b>
</el-option>
</el-select>
<el-button
type="success"
@@ -473,7 +479,8 @@ export default {
for (let i = 0; i < response.data.length; i++) {
this.machine.push({
value: response.data[i].机床流水号,
label: response.data[i].机床图号
label: response.data[i].机床图号,
name: response.data[i].机床名称
})
}
})

2
src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
View File

@@ -683,7 +683,7 @@ export default {
<style>
.el-table .warning-row {
background: oldlace;
background: red;
}
</style>

4
src/views/TechnologyCenter/ImportParts/specificationData.vue
View File

@@ -640,7 +640,11 @@ export default {
<style>
.el-table .warning-row {
<<<<<<< HEAD
background: yellowgreen;
=======
background: red;
>>>>>>> fe0ba3d7bde1d5cfc6a4a87843e945deaff60a8d
}
.rgb196{
background: palevioletred;

9
src/views/TechnologyCenter/QueryParts/index.vue
View File

@@ -116,10 +116,10 @@
<el-table-column label="操作" fixed="right" align="center" width="100">
<template slot-scope="scope">
<el-button
:disabled="Number(id)!==0"
size="mini"
type="danger"
icon="el-icon-delete"
disabled
@click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
@@ -202,10 +202,10 @@
<el-table-column label="操作" fixed="right" align="center" width="200">
<template slot-scope="scope">
<el-button
:disabled="Number(id)!==0"
size="mini"
type="danger"
icon="el-icon-delete"
disabled
@click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
@@ -226,6 +226,7 @@
<script>
import { projectSelect, machineSelect, groupSelect, basicPartsData, deleteBasicParts, purchasePartsData, deletePurchaseData } from '@/api/TechnologyCenter/QueryParts'
import { mapGetters } from 'vuex'
export default {
name: 'Index',
data() {
@@ -249,6 +250,10 @@ export default {
}
},
computed: {
...mapGetters([
'name',
'id' // 人员编号
]),
groupName() {
for (let i = 0; i < this.group.length; i++) {
if (this.group[i].value === this.groupValue) {