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-22 11:36:01 +08:00
parent b5ab4726f8
commit a14d365c2c
3 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,11 +85,6 @@
{{ scope.row.安装调试节点 }}
</template>
</el-table-column>
<el-table-column label="客户名称" align="center" width="280px">
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<el-table-column label="设计者" align="center" width="90px">
<template slot-scope="scope">
<template v-if="scope.row.edit">

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

@@ -74,19 +74,14 @@
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column label="客户名称" align="center" min-width="240px" fixed="left">
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<el-table-column label="开始时间" align="center" min-width="130px">
<template slot-scope="scope">
<span :class="colorJudge(scope.row.合同签订日期)">{{ scope.row.合同签订日期 === '1900-01-01 00:00:00' ? '' : scope.row.合同签订日期 }}</span>
<span :class="colorJudge(scope.row.合同签订日期)">{{ scope.row.合同签订日期 === '1900-01-01' ? '' : 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.发货节点 === '1900-01-01 00:00:00' ? '' : scope.row.发货节点 }}</span>
<span :class="colorJudge(scope.row.发货节点)">{{ scope.row.发货节点 === '1900-01-01' ? '' : scope.row.发货节点 }}</span>
</template>
</el-table-column>
<el-table-column label="设备预验节点" align="center" width="150px">
@@ -101,17 +96,17 @@
</el-table-column>
<el-table-column label="审图（计划开始）" align="center" min-width="170px">
<template slot-scope="scope">
{{ scope.row.审图计划开始时间 === '1900-01-01 00:00:00' ? '' : scope.row.审图计划开始时间 }}
{{ scope.row.审图计划开始时间 === '1900-01-01' ? '' : 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.审图计划完成时间 === '1900-01-01 00:00:00' ? '' : scope.row.审图计划完成时间 }}</span>
<span :class="colorJudge(scope.row.审图计划完成时间, scope.row.审图实际完成时间)">{{ scope.row.审图计划完成时间 === '1900-01-01' ? '' : 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.审图实际完成时间 === '1900-01-01 00:00:00' ? '' : scope.row.审图实际完成时间 }}</span>
<span :class="colorActual(scope.row.审图计划完成时间, scope.row.审图实际完成时间)">{{ scope.row.审图实际完成时间 === '1900-01-01' ? '' : scope.row.审图实际完成时间 }}</span>
</template>
</el-table-column>
<el-table-column label="发图" align="center" min-width="140px">
@@ -121,7 +116,7 @@
</el-table-column>
<el-table-column label="发图（实际）" align="center" width="140px">
<template slot-scope="scope">
<span :class="colorActual(scope.row.机床设计完成时间, scope.row.机床设计实际完成时间)">{{ scope.row.机床设计实际完成时间 === '1900-01-01 00:00:00' ? '' : scope.row.机床设计实际完成时间 }}</span>
<span :class="colorActual(scope.row.机床设计完成时间, scope.row.机床设计实际完成时间)">{{ scope.row.机床设计实际完成时间 === '1900-01-01' ? '' : scope.row.机床设计实际完成时间 }}</span>
</template>
</el-table-column>
<el-table-column label="采购" align="center" min-width="140px">
@@ -131,7 +126,7 @@
</el-table-column>
<el-table-column label="采购（实际）" align="center" width="140px">
<template slot-scope="scope">
<span :class="colorActual(scope.row.采购完成时间, scope.row.采购实际完成时间)">{{ scope.row.采购实际完成时间 === '1900-01-01 00:00:00' ? '' : scope.row.采购实际完成时间 }}</span>
<span :class="colorActual(scope.row.采购完成时间, scope.row.采购实际完成时间)">{{ scope.row.采购实际完成时间 === '1900-01-01' ? '' : scope.row.采购实际完成时间 }}</span>
</template>
</el-table-column>
<el-table-column label="备料" align="center" min-width="140px">
@@ -141,7 +136,7 @@
</el-table-column>
<el-table-column label="备料（实际）" align="center" width="140px">
<template slot-scope="scope">
<span :class="colorActual(scope.row.备料完成时间, scope.row.备料实际完成时间)">{{ scope.row.备料实际完成时间 === '1900-01-01 00:00:00' ? '' : scope.row.备料实际完成时间 }}</span>
<span :class="colorActual(scope.row.备料完成时间, scope.row.备料实际完成时间)">{{ scope.row.备料实际完成时间 === '1900-01-01' ? '' : scope.row.备料实际完成时间 }}</span>
</template>
</el-table-column>
<el-table-column label="制造" align="center" min-width="140px">
@@ -151,7 +146,7 @@
</el-table-column>
<el-table-column label="制造（实际）" align="center" width="140px">
<template slot-scope="scope">
<span :class=" colorActual(scope.row.机床生产完成时间, scope.row.机床生产实际完成时间)">{{ scope.row.机床生产实际完成时间 === '1900-01-01 00:00:00' ? '' : scope.row.机床生产实际完成时间 }}</span>
<span :class=" colorActual(scope.row.机床生产完成时间, scope.row.机床生产实际完成时间)">{{ scope.row.机床生产实际完成时间 === '1900-01-01' ? '' : scope.row.机床生产实际完成时间 }}</span>
</template>
</el-table-column>
<el-table-column label="装配" align="center" min-width="140px">
@@ -161,7 +156,7 @@
</el-table-column>
<el-table-column label="装配（实际）" align="center" width="140px">
<template slot-scope="scope">
<span :class="colorActual(scope.row.机床装配完成时间, scope.row.机床装配实际完成时间)">{{ scope.row.机床装配实际完成时间 === '1900-01-01 00:00:00' ? '' : scope.row.机床装配实际完成时间 }}</span>
<span :class="colorActual(scope.row.机床装配完成时间, scope.row.机床装配实际完成时间)">{{ scope.row.机床装配实际完成时间 === '1900-01-01' ? '' : scope.row.机床装配实际完成时间 }}</span>
</template>
</el-table-column>
</el-table>
@@ -316,6 +311,11 @@
{{ scope.row.任务开始时间 }}
</template>
</el-table-column>
<el-table-column label="实际开始时间" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.实际开始时间 }}
</template>
</el-table-column>
<el-table-column label="计划完成时间" align="center" min-width="100px">
<template slot-scope="scope">
<span :class="colorJudge(scope.row.计划完成时间, scope.row.实际完成时间)">{{ scope.row.计划完成时间 }}</span>
@@ -356,6 +356,11 @@
{{ scope.row.任务开始时间 }}
</template>
</el-table-column>
<el-table-column label="实际开始时间" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.下阶段开始时间 }}
</template>
</el-table-column>
<el-table-column label="计划完成时间" align="center" min-width="100px">
<template slot-scope="scope">
<span :class="colorJudge(scope.row.计划完成时间, scope.row.实际完成时间)">{{ scope.row.计划完成时间 }}</span>
@@ -615,6 +620,9 @@ export default {
// } else if ((this.arrival3[i] - this.now) > (86400000 * this.warningValue)) {
// this.judge3[i] = 3 // 进度正常
// }
if (response.data[i].实际开始时间 !== '' && response.data[i].实际开始时间 !== null) {
response.data[i].实际开始时间 = response.data[i].实际开始时间.split(' ')[0]
}
if (response.data[i].任务开始时间 !== '' && response.data[i].任务开始时间 !== null) {
response.data[i].任务开始时间 = response.data[i].任务开始时间.split(' ')[0]
}
@@ -630,6 +638,7 @@ export default {
this.tableData4 = response.data
})
searchtable2(this.machineValue, 5).then(response => {
console.log(response.data)
for (let i = 0; i < response.data.length; i++) {
// this.arrival4.push(new Date(response.data[i].计划完成时间))
// if ((this.arrival4[i] - this.now) > 0 && (this.arrival4[i] - this.now) < (86400000 * this.warningValue)) {
@@ -639,6 +648,9 @@ export default {
// } else if ((this.arrival3[i] - this.now) > (86400000 * this.warningValue)) {
// this.judge4[i] = 3 // 进度正常
// }
if (response.data[i].下阶段开始时间 !== '' && response.data[i].下阶段开始时间 !== null) {
response.data[i].下阶段开始时间 = response.data[i].下阶段开始时间.split(' ')[0]
}
if (response.data[i].任务开始时间 !== '' && response.data[i].任务开始时间 !== null) {
response.data[i].任务开始时间 = response.data[i].任务开始时间.split(' ')[0]
}

2
src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
View File

@@ -89,7 +89,7 @@
</el-card>
<el-card>
<div style="width:1000px;margin-left: 300px">
<div style="width:60%;margin-left: 18%">
<el-card>
<table id="1" cellspacing="0px" align="center" border width="100%" style="">
<tr style="height: 40px">