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

Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

Browse Source
This commit is contained in:
zhangdingyu
2019-09-26 08:51:23 +08:00
parent 043af9eca6 961d3c9973
commit a0ddbdb218
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2064,15 +2064,15 @@ export default {
能力平衡: 0, 能力平衡: 0,
外协: 0, 外协: 0,
车间加工: 0, 车间加工: 0,
自制质检: 0, 自制质检: '-',
采购质检: 0, 采购质检: '-',
成组配套: 0, 成组配套: 0,
电气装配: 0, 电气装配: 0,
机械装配: 0, 机械装配: 0,
冷作: 0, 冷作: 0,
油漆: 0, 油漆: 0,
装配质检: 0, 装配质检: '-',
总装调试: 0, 总装调试: '-',
发货: 0 发货: 0
}], }],
isActive: false, isActive: false,
@@ -2383,16 +2383,16 @@ export default {
if (response.data[0].装配质检 === '') { if (response.data[0].装配质检 === '') {
response.data[0].装配质检 = '-' response.data[0].装配质检 = '-'
} }
if (response.data[0].总装调试 === '1900-01-01 00:00:00.000') { if (response.data[0].总装调试 === '1900-01-01 00:00:00') {
response.data[0].总装调试 = '-' response.data[0].总装调试 = '-'
} else { } else {
response.data[0].总装调试 = response.data[0].总装调试.split(' ')[0] response.data[0].总装调试 = response.data[0].总装调试.substring(5, 10)
} }
console.log(response.data[0].机床装配实际完成时间, 123) console.log(response.data[0].机床装配实际完成时间, 123)
if (response.data[0].机床装配实际完成时间 === '1900-01-01 00:00:00') { if (response.data[0].机床装配实际完成时间 === '1900-01-01 00:00:00') {
response.data[0].机床装配实际完成时间 = '-' response.data[0].机床装配实际完成时间 = '-'
} else { } else {
response.data[0].机床装配实际完成时间 = response.data[0].机床装配实际完成时间.split(' ')[0] response.data[0].机床装配实际完成时间 = response.data[0].机床装配实际完成时间.substring(5, 10)
} }
this.data2 = response.data this.data2 = response.data
if (response.data[0].签订合同 === 0) { this.color[0] = 'weikaishi' } else if (response.data[0].签订合同 !== 0 && response.data[0].签订合同 !== 100) { this.color[0] = 'jixingzhong' } else if (response.data[0].签订合同 === 100) { this.color[0] = 'yiwancheng' } if (response.data[0].签订合同 === 0) { this.color[0] = 'weikaishi' } else if (response.data[0].签订合同 !== 0 && response.data[0].签订合同 !== 100) { this.color[0] = 'jixingzhong' } else if (response.data[0].签订合同 === 100) { this.color[0] = 'yiwancheng' }