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

样式

Browse Source
This commit is contained in:
zhangdingyu
2019-09-18 12:24:50 +08:00
parent 93eb6ec5c5
commit faab73c1fa
58 changed files with 0 additions and 4278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,12 +32,6 @@
<span>提前</span>
<el-input-number v-model="warningValue" :min="1" controls-position="right" size="small" style="width: 90px"/>
<span>天预警</span>
<<<<<<< HEAD
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable1()">查询</el-button>
</el-row>
</div>
<h1 class="word" style="margin: 0">总计划:</h1>
=======
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable1();searchAll()">查询</el-button>
</el-row>
</div>
@@ -51,7 +45,6 @@
<span>外协工时总数:</span>{{ 外协工时总数 ? 外协工时总数 : '-' }}&nbsp;(分)
<span>采购总额:</span>{{ 零件金额 ? 零件金额 : '-' }}&nbsp;(元)
</div>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table v-loading="loading" :data="tableData10" height="550" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable">
<el-table-column label="项目编号" align="center" width="140px" fixed="left">
<template slot-scope="scope">
@@ -522,18 +515,12 @@
</template>
<script>
<<<<<<< HEAD
import { initProject, initMachine, searchtable, searchtable2, searchtable5 } from '@/api/ManufacturingCenter/ProjectPlanningQuery'
=======
import { searchAll, initProject, initMachine, searchtable, searchtable2, searchtable5 } from '@/api/ManufacturingCenter/ProjectPlanningQuery'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
import Sticky from '@/components/Sticky'
export default {
components: { Sticky },
data() {
return {
<<<<<<< HEAD
=======
合同总数: '',
合同总金额: '',
已支付: '',
@@ -541,7 +528,6 @@ export default {
实际加工时间: '',
外协工时总数: '',
零件金额: '',
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
projectValue: '',
projectValue1: '',
project: [],
@@ -583,9 +569,6 @@ export default {
this.fetchData()
this.searchTable1()
},
<<<<<<< HEAD
methods: {
=======
mounted() {
this.searchAll()
},
@@ -602,7 +585,6 @@ export default {
this.零件金额 = response.data[0].零件金额
})
},
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
colorJudge(time1, time2) {
if (time2 === null) {
if ((new Date(time1) - this.now) > 0 && (new Date(time1) - this.now) < (86400000 * this.warningValue)) {
@@ -654,58 +636,6 @@ export default {
this.loading = false
} else {
for (let i = 0; i < response.data.rows.length; i++) {
<<<<<<< HEAD
if (response.data.rows[i].合同签订日期 !== '' && response.data.rows[i].合同签订日期 !== null) {
response.data.rows[i].合同签订日期 = response.data.rows[i].合同签订日期.split(' ')[0]
}
if (response.data.rows[i].发货节点 !== '' && response.data.rows[i].发货节点 !== null) {
response.data.rows[i].发货节点 = response.data.rows[i].发货节点.split(' ')[0]
}
if (response.data.rows[i].设备预验收节点 !== '' && response.data.rows[i].设备预验收节点 !== null) {
response.data.rows[i].设备预验收节点 = response.data.rows[i].设备预验收节点.split(' ')[0]
}
if (response.data.rows[i].安装调试节点 !== '' && response.data.rows[i].安装调试节点 !== null) {
response.data.rows[i].安装调试节点 = response.data.rows[i].安装调试节点.split(' ')[0]
}
if (response.data.rows[i].机床设计完成时间 !== '' && response.data.rows[i].机床设计完成时间 !== null) {
response.data.rows[i].机床设计完成时间 = response.data.rows[i].机床设计完成时间.split(' ')[0]
}
if (response.data.rows[i].采购完成时间 !== '' && response.data.rows[i].采购完成时间 !== null) {
response.data.rows[i].采购完成时间 = response.data.rows[i].采购完成时间.split(' ')[0]
}
if (response.data.rows[i].备料完成时间 !== '' && response.data.rows[i].备料完成时间 !== null) {
response.data.rows[i].备料完成时间 = response.data.rows[i].备料完成时间.split(' ')[0]
}
if (response.data.rows[i].机床生产完成时间 !== '' && response.data.rows[i].机床生产完成时间 !== null) {
response.data.rows[i].机床生产完成时间 = response.data.rows[i].机床生产完成时间.split(' ')[0]
}
if (response.data.rows[i].机床装配完成时间 !== '' && response.data.rows[i].机床装配完成时间 !== null) {
response.data.rows[i].机床装配完成时间 = response.data.rows[i].机床装配完成时间.split(' ')[0]
}
if (response.data.rows[i].机床设计实际完成时间 !== '' && response.data.rows[i].机床设计实际完成时间 !== null) {
response.data.rows[i].机床设计实际完成时间 = response.data.rows[i].机床设计实际完成时间.split(' ')[0]
}
if (response.data.rows[i].采购实际完成时间 !== '' && response.data.rows[i].采购实际完成时间 !== null) {
response.data.rows[i].采购实际完成时间 = response.data.rows[i].采购实际完成时间.split(' ')[0]
}
if (response.data.rows[i].备料实际完成时间 !== '' && response.data.rows[i].备料实际完成时间 !== null) {
response.data.rows[i].备料实际完成时间 = response.data.rows[i].备料实际完成时间.split(' ')[0]
}
if (response.data.rows[i].机床生产实际完成时间 !== '' && response.data.rows[i].机床生产实际完成时间 !== null) {
response.data.rows[i].机床生产实际完成时间 = response.data.rows[i].机床生产实际完成时间.split(' ')[0]
}
if (response.data.rows[i].机床装配实际完成时间 !== '' && response.data.rows[i].机床装配实际完成时间 !== null) {
response.data.rows[i].机床装配实际完成时间 = response.data.rows[i].机床装配实际完成时间.split(' ')[0]
}
if (response.data.rows[i].审图计划开始时间 !== '' && response.data.rows[i].审图计划开始时间 !== null) {
response.data.rows[i].审图计划开始时间 = response.data.rows[i].审图计划开始时间.split(' ')[0]
}
if (response.data.rows[i].审图计划完成时间 !== '' && response.data.rows[i].审图计划完成时间 !== null) {
response.data.rows[i].审图计划完成时间 = response.data.rows[i].审图计划完成时间.split(' ')[0]
}
if (response.data.rows[i].审图实际完成时间 !== '' && response.data.rows[i].审图实际完成时间 !== null) {
response.data.rows[i].审图实际完成时间 = response.data.rows[i].审图实际完成时间.split(' ')[0]
=======
if (response.data.rows[i].合同签订日期 !== '' && response.data.rows[i].合同签订日期 !== null && response.data.rows[i].合同签订日期 !== '1900/1/1 0:00:00') {
response.data.rows[i].合同签订日期 = response.data.rows[i].合同签订日期.split(' ')[0]
} else {
@@ -790,7 +720,6 @@ export default {
response.data.rows[i].审图实际完成时间 = response.data.rows[i].审图实际完成时间.split(' ')[0]
} else {
response.data.rows[i].审图实际完成时间 = ''
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
}
this.tableData10.push({
项目编号: response.data.rows[i].项目编号,
@@ -851,10 +780,6 @@ export default {
if (response.data[i].发货节点 !== '' && response.data[i].发货节点 !== null) {
response.data[i].发货节点 = response.data[i].发货节点.split(' ')[0]
}
<<<<<<< HEAD
console.log(response.data[i].设备预验收节点, 11111)
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
// if (response.data[i].设备预验收节点 !== '' && response.data[i].设备预验收节点 !== null) {
// response.data[i].设备预验收节点 = response.data[i].设备预验收节点.split(' ')[0]
// }
@@ -902,10 +827,6 @@ export default {
}
}
this.loading = false
<<<<<<< HEAD
console.log(response.data, 222222)
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.tableData = response.data
}).then(() => {
searchtable2(this.machineValue1, 1).then(response => {
@@ -929,10 +850,6 @@ export default {
}
}
this.loading1 = false
<<<<<<< HEAD
console.log(response.data, 2)
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.tableData1 = response.data
})
searchtable2(this.machineValue1, 2).then(response => {
@@ -959,13 +876,7 @@ export default {
}
}
this.loading1 = false
<<<<<<< HEAD
console.log(response.data, 3)
this.tableData2 = response.data
console.log(response.data, 2222)
=======
this.tableData2 = response.data
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
})
searchtable2(this.machineValue1, 3).then(response => {
for (let i = 0; i < response.data.length; i++) {
@@ -991,10 +902,6 @@ export default {
}
}
this.loading1 = false
<<<<<<< HEAD
console.log(response.data, 4)
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.tableData3 = response.data
})
searchtable2(this.machineValue1, 4).then(response => {
@@ -1021,17 +928,9 @@ export default {
}
}
this.loading1 = false
<<<<<<< HEAD
console.log(response.data, 5)
this.tableData4 = response.data
})
searchtable2(this.machineValue1, 5).then(response => {
console.log(response.data)
=======
this.tableData4 = response.data
})
searchtable2(this.machineValue1, 5).then(response => {
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
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)) {
@@ -1055,10 +954,6 @@ export default {
}
}
this.loading1 = false
<<<<<<< HEAD
console.log(response.data, 6)
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.tableData5 = response.data
})
})