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-31 08:11:24 +08:00
parent d3ce0baf0b
commit ca02868500
15 changed files with 563 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,7 +127,7 @@
<div id="son21" :class="[isActive ? color[5] : 'weikaishi']" class="module" style="position: relative;left: -1225px;top:235px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">采购计划完成率：{{ `${data2[0].车间采购}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[5] : 'weikaishi']" type="text" @click.stop="searchDiv17">车间采购<br>{{ `${data2[0].车间采购}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[5] : 'weikaishi']" type="text" @click.stop="searchDiv17">制造部采购<br>{{ `${data2[0].车间采购}%` }}</el-button>
</el-tooltip>
</div>
<div id="son22" :class="[isActive ? color[4] : 'weikaishi']" class="module" style="position: relative;left: -465px;top:278px; width: 80px;height: 48px;">
@@ -911,7 +911,7 @@
</el-col>
<el-col :span="8">
<div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
<h3>车间采购</h3>
<h3>制造部采购</h3>
<el-table
id="div3"
ref="div3"
@@ -943,7 +943,7 @@
{{ scope.row.总零件数量 ? scope.row.总零件数量 : '0' }}
</template>
</el-table-column>
<el-table-column align="center" label="车间采购到货" width="60px">
<el-table-column align="center" label="采购到货" width="60px">
<template slot-scope="scope">
{{ scope.row.到货数量 ? scope.row.到货数量 : 0 }}
</template>
@@ -1511,10 +1511,10 @@
</el-row>
</el-card>
</div>
<!--车间采购-->
<!--制造部采购-->
<div v-show="showDiv17">
<el-card class="showDiv">
<h3 style="align-content: center">{{ Machine }} : 车间采购</h3>
<h3 style="align-content: center">{{ Machine }} : 制造部采购</h3>
<el-row style="margin-top: 10px">
<el-col :span="12">
<div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">

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

@@ -67,22 +67,22 @@
</el-table-column>
<el-table-column label="签订日期" align="center" width="120px">
<template slot-scope="scope">
{{ scope.row.合同签订日期 }}
{{ scope.row.合同签订日期 !== '1900-01-01' ? scope.row.合同签订日期 : '-' }}
</template>
</el-table-column>
<el-table-column label="交货期" align="center" width="120px">
<template slot-scope="scope">
{{ scope.row.发货节点 }}
{{ scope.row.发货节点 !== '1900-01-01' ? scope.row.发货节点 : '-' }}
</template>
</el-table-column>
<el-table-column label="设备预验节点" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.设备预验收节点 }}
{{ scope.row.设备预验收节点 !== '1900-01-01' ? scope.row.设备预验收节点 : '-' }}
</template>
</el-table-column>
<el-table-column label="安装调试节点" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.安装调试节点 }}
{{ scope.row.安装调试节点 !== '1900-01-01' ? scope.row.安装调试节点 : '-' }}
</template>
</el-table-column>
<el-table-column label="设计者" align="center" width="90px">
@@ -101,7 +101,7 @@
<el-date-picker v-model="scope.row.审图计划开始时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
{{ scope.row.审图计划开始时间 }}
{{ scope.row.审图计划开始时间 !== '1900-01-01' ? scope.row.审图计划开始时间 : '-' }}
</template>
</template>
</el-table-column>
@@ -111,7 +111,7 @@
<el-date-picker v-model="scope.row.审图计划完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
{{ scope.row.审图计划完成时间 }}
{{ scope.row.审图计划完成时间 !== '1900-01-01' ? scope.row.审图计划完成时间 : '-' }}
</template>
</template>
</el-table-column>
@@ -121,7 +121,7 @@
<el-date-picker v-model="scope.row.审图实际完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
{{ scope.row.审图实际完成时间 }}
{{ scope.row.审图实际完成时间 !== '1900-01-01' ? scope.row.审图实际完成时间 : '-' }}
</template>
</template>
</el-table-column>
@@ -131,13 +131,13 @@
<el-date-picker v-model="scope.row.机床设计完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
<el-button class="bold-font" type="text" @click="code = 1;openDialog(scope.row)">{{ scope.row.机床设计完成时间 }}</el-button>
<el-button class="bold-font" type="text" @click="code = 1;openDialog(scope.row)">{{ scope.row.机床设计完成时间 !== '1900-01-01 00:00:00' ? scope.row.机床设计完成时间 : '-' }}</el-button>
</template>
</template>
</el-table-column>
<el-table-column label="发图（实际）" align="center" width="150px">
<template slot-scope="scope">
<div class="bold-font">{{ scope.row.机床设计实际完成时间 }}</div>
<div class="bold-font">{{ scope.row.机床设计实际完成时间 !== '1900-01-01' ? scope.row.机床设计实际完成时间 : '-' }}</div>
</template>
</el-table-column>
<el-table-column label="采购（计划）" align="center" width="150px">
@@ -146,13 +146,13 @@
<el-date-picker v-model="scope.row.采购完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
<el-button class="bold-font" type="text" @click="code = 2;openDialog(scope.row)">{{ scope.row.采购完成时间 }}</el-button>
<el-button class="bold-font" type="text" @click="code = 2;openDialog(scope.row)">{{ scope.row.采购完成时间 !== '1900-01-01' ? scope.row.采购完成时间 : '-' }}</el-button>
</template>
</template>
</el-table-column>
<el-table-column label="采购（实际）" align="center" width="150px">
<template slot-scope="scope">
<div class="bold-font">{{ scope.row.采购实际完成时间 }}</div>
<div class="bold-font">{{ scope.row.采购实际完成时间 !== '1900-01-01' ? scope.row.采购实际完成时间 : '-' }}</div>
</template>
</el-table-column>
<el-table-column label="备料（计划）" align="center" width="150px">
@@ -161,13 +161,13 @@
<el-date-picker v-model="scope.row.备料完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
<el-button class="bold-font" type="text" @click="code = 3;openDialog(scope.row)">{{ scope.row.备料完成时间 }}</el-button>
<el-button class="bold-font" type="text" @click="code = 3;openDialog(scope.row)">{{ scope.row.备料完成时间 !== '1900-01-01' ? scope.row.备料完成时间 : '-' }}</el-button>
</template>
</template>
</el-table-column>
<el-table-column label="备料（实际）" align="center" width="150px">
<template slot-scope="scope">
<div class="bold-font">{{ scope.row.备料实际完成时间 }}</div>
<div class="bold-font">{{ scope.row.备料实际完成时间 !== '1900-01-01' ? scope.row.备料实际完成时间 : '-' }}</div>
</template>
</el-table-column>
<el-table-column label="制造（计划）" align="center" width="150px">
@@ -176,13 +176,13 @@
<el-date-picker v-model="scope.row.机床生产完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
<el-button class="bold-font" type="text" @click="code = 4;openDialog(scope.row)">{{ scope.row.机床生产完成时间 }}</el-button>
<el-button class="bold-font" type="text" @click="code = 4;openDialog(scope.row)">{{ scope.row.机床生产完成时间 !== '1900-01-01' ? scope.row.机床生产完成时间 : '-' }}</el-button>
</template>
</template>
</el-table-column>
<el-table-column label="制造（实际）" align="center" width="150px">
<template slot-scope="scope">
<div class="bold-font">{{ scope.row.机床生产实际完成时间 }}</div>
<div class="bold-font">{{ scope.row.机床生产实际完成时间 !== '1900-01-01' ? scope.row.机床生产实际完成时间 : '-' }}</div>
</template>
</el-table-column>
<el-table-column label="装配（计划）" align="center" width="150px">
@@ -191,13 +191,13 @@
<el-date-picker v-model="scope.row.机床装配完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
<el-button class="bold-font" type="text" @click="code = 5;openDialog(scope.row)">{{ scope.row.机床装配完成时间 }}</el-button>
<el-button class="bold-font" type="text" @click="code = 5;openDialog(scope.row)">{{ scope.row.机床装配完成时间 !== '1900-01-01' ? scope.row.机床装配完成时间 : '-' }}</el-button>
</template>
</template>
</el-table-column>
<el-table-column label="装配（实际）" align="center" width="150px">
<template slot-scope="scope">
<div class="bold-font">{{ scope.row.机床装配实际完成时间 }}</div>
<div class="bold-font">{{ scope.row.机床装配实际完成时间 !== '1900-01-01' ? scope.row.机床装配实际完成时间 : '-' }}</div>
</template>
</el-table-column>
<!--<el-table-column label="顺序" align="center" width="100px">-->