|
@@ -1,8 +1,8 @@
|
|
<template>
|
|
<template>
|
|
<section>
|
|
<section>
|
|
<div style=" display: flex;">
|
|
<div style=" display: flex;">
|
|
- <div ref="sidebars" style="width: 200px;display: block;background: #fff;border-right: 1px solid #E6E6E6;">
|
|
|
|
- <div ref="abbisd" style="width: 200px;overflow: hidden;">
|
|
|
|
|
|
+ <div ref="sidebars" style="width: 180px;display: block;background: #fff;border-right: 1px solid #E6E6E6;">
|
|
|
|
+ <div ref="abbisd" style="width: 180px;overflow: hidden;">
|
|
<el-col :span="12">
|
|
<el-col :span="12">
|
|
<el-menu
|
|
<el-menu
|
|
:default-active="defaultActive"
|
|
:default-active="defaultActive"
|
|
@@ -11,7 +11,7 @@
|
|
background-color="#ffffff"
|
|
background-color="#ffffff"
|
|
text-color="#666666"
|
|
text-color="#666666"
|
|
active-text-color="#20A0FF"
|
|
active-text-color="#20A0FF"
|
|
- style="width:200px">
|
|
|
|
|
|
+ style="width:180px">
|
|
<el-submenu index="1">
|
|
<el-submenu index="1">
|
|
<template slot="title">
|
|
<template slot="title">
|
|
<i class="iconfont firerock-iconbaobiao"></i>
|
|
<i class="iconfont firerock-iconbaobiao"></i>
|
|
@@ -28,7 +28,7 @@
|
|
</el-menu>
|
|
</el-menu>
|
|
</el-col>
|
|
</el-col>
|
|
</div>
|
|
</div>
|
|
- <div class="side" @click="side" ref="sid" style="left: 400px">
|
|
|
|
|
|
+ <div class="side" @click="side" ref="sid" style="left: 340px">
|
|
<div class="spans" ref="side" style="left: -19px;"><i ref="sideI" class="el-icon-arrow-left"></i></div>
|
|
<div class="spans" ref="side" style="left: -19px;"><i ref="sideI" class="el-icon-arrow-left"></i></div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -112,13 +112,13 @@
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column align="center" prop="procedureName" label="工序" min-width="250"></el-table-column>
|
|
<el-table-column align="center" prop="procedureName" label="工序" min-width="250"></el-table-column>
|
|
<!-- <el-table-column align="center" prop="userName" label="人员" min-width="150"></el-table-column> -->
|
|
<!-- <el-table-column align="center" prop="userName" label="人员" min-width="150"></el-table-column> -->
|
|
- <el-table-column align="center" prop="planWorkTime" label="计划工时" min-width="250">
|
|
|
|
|
|
+ <el-table-column align="center" prop="planWorkTime" label="计划工时" width="150">
|
|
<template slot-scope="scope" v-if="scope.row.planWorkTime">{{scope.row.planWorkTime}}分钟</template>
|
|
<template slot-scope="scope" v-if="scope.row.planWorkTime">{{scope.row.planWorkTime}}分钟</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column align="center" prop="nowWorkTime" label="当前工时" min-width="250">
|
|
|
|
|
|
+ <el-table-column align="center" prop="nowWorkTime" label="当前工时" width="150">
|
|
<template slot-scope="scope" v-if="scope.row.nowWorkTime">{{scope.row.nowWorkTime}}分钟</template>
|
|
<template slot-scope="scope" v-if="scope.row.nowWorkTime">{{scope.row.nowWorkTime}}分钟</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column align="center" prop="progress" label="进度" min-width="250">
|
|
|
|
|
|
+ <el-table-column align="center" prop="progress" label="进度" width="150">
|
|
<template slot-scope="scope" v-if="scope.row.progress">
|
|
<template slot-scope="scope" v-if="scope.row.progress">
|
|
{{scope.row.progress}}%
|
|
{{scope.row.progress}}%
|
|
</template>
|
|
</template>
|
|
@@ -132,45 +132,45 @@
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column align="center" prop="productName" label="产品名称" min-width="250"></el-table-column>
|
|
<el-table-column align="center" prop="productName" label="产品名称" min-width="250"></el-table-column>
|
|
<el-table-column align="center" prop="foremanName" label="工长" min-width="150"></el-table-column>
|
|
<el-table-column align="center" prop="foremanName" label="工长" min-width="150"></el-table-column>
|
|
- <el-table-column align="center" prop="startDate" label="开工时间" min-width="250"></el-table-column>
|
|
|
|
- <el-table-column align="center" prop="endDate" label="完工时间" min-width="250"></el-table-column>
|
|
|
|
|
|
+ <el-table-column align="center" prop="startDate" label="开工时间" width="150"></el-table-column>
|
|
|
|
+ <el-table-column align="center" prop="endDate" label="完工时间" width="150"></el-table-column>
|
|
<el-table-column align="center" prop="procedureName" label="工序" min-width="250"></el-table-column>
|
|
<el-table-column align="center" prop="procedureName" label="工序" min-width="250"></el-table-column>
|
|
- <el-table-column align="center" prop="creatorName" label="组员" min-width="250"></el-table-column>
|
|
|
|
- <el-table-column align="center" prop="createDate" label="报工时间" min-width="250"></el-table-column>
|
|
|
|
- <el-table-column align="center" prop="checkName" label="质检人" min-width="250">
|
|
|
|
|
|
+ <el-table-column align="center" prop="creatorName" label="组员" width="150"></el-table-column>
|
|
|
|
+ <el-table-column align="center" prop="createDate" label="报工时间" width="150"></el-table-column>
|
|
|
|
+ <el-table-column align="center" prop="checkName" label="质检人" width="150">
|
|
<template slot-scope="scope">{{scope.row.checkName}}</template>
|
|
<template slot-scope="scope">{{scope.row.checkName}}</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
|
|
|
|
<!-- 计划实时进度表 -->
|
|
<!-- 计划实时进度表 -->
|
|
<el-table v-if="ins == 3" key="4" border :data="planRealTimeProgressList" highlight-current-row v-loading="listLoading" :height="+tableHeight - 1" style="width: 100%;">
|
|
<el-table v-if="ins == 3" key="4" border :data="planRealTimeProgressList" highlight-current-row v-loading="listLoading" :height="+tableHeight - 1" style="width: 100%;">
|
|
- <el-table-column align="center" prop="taskName" label="排产工单号" min-width="150">
|
|
|
|
|
|
+ <el-table-column align="center" prop="taskName" label="排产工单号" min-width="250">
|
|
<template slot-scope="scope">{{scope.row.taskName}}</template>
|
|
<template slot-scope="scope">{{scope.row.taskName}}</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column align="center" prop="userName" label="工长" min-width="250"></el-table-column>
|
|
|
|
- <el-table-column align="center" prop="planNum" label="计划件数" min-width="150">
|
|
|
|
|
|
+ <el-table-column align="center" prop="userName" label="工长" width="150"></el-table-column>
|
|
|
|
+ <el-table-column align="center" prop="planNum" label="计划件数" width="100">
|
|
<template slot-scope="scope">{{scope.row.planNum}}</template>
|
|
<template slot-scope="scope">{{scope.row.planNum}}</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column align="center" prop="productName" label="产品名称" min-width="150">
|
|
<el-table-column align="center" prop="productName" label="产品名称" min-width="150">
|
|
<template slot-scope="scope">{{scope.row.productName}}</template>
|
|
<template slot-scope="scope">{{scope.row.productName}}</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column align="center" prop="startDate" label="开始日期" min-width="150">
|
|
|
|
|
|
+ <el-table-column align="center" prop="startDate" label="开始日期" width="150">
|
|
<template slot-scope="scope">{{scope.row.startDate}}</template>
|
|
<template slot-scope="scope">{{scope.row.startDate}}</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column align="center" prop="endDate" label="完工日期" min-width="150">
|
|
|
|
|
|
+ <el-table-column align="center" prop="endDate" label="完工日期" width="150">
|
|
<template slot-scope="scope">{{scope.row.endDate}}</template>
|
|
<template slot-scope="scope">{{scope.row.endDate}}</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column align="center" prop="statinoName" label="工位" min-width="250"></el-table-column>
|
|
|
|
- <el-table-column align="center" label="计划工时" min-width="150">
|
|
|
|
|
|
+ <el-table-column align="center" prop="statinoName" label="工位" width="150"></el-table-column>
|
|
|
|
+ <el-table-column align="center" label="计划工时" min-width="190">
|
|
<template slot-scope="scope" v-if="scope.row.planWorkTime">{{scope.row.planWorkTime}}分钟 {{scope.row.planCost}}元</template>
|
|
<template slot-scope="scope" v-if="scope.row.planWorkTime">{{scope.row.planWorkTime}}分钟 {{scope.row.planCost}}元</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column align="center" label="当前工时" min-width="250">
|
|
|
|
|
|
+ <el-table-column align="center" label="当前工时" min-width="190">
|
|
<template slot-scope="scope" v-if="scope.row.nowWorkTime">{{scope.row.nowWorkTime}}分钟 {{scope.row.nowCost}}元</template>
|
|
<template slot-scope="scope" v-if="scope.row.nowWorkTime">{{scope.row.nowWorkTime}}分钟 {{scope.row.nowCost}}元</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column align="center" label="实际完工日期" min-width="150">
|
|
<el-table-column align="center" label="实际完工日期" min-width="150">
|
|
<template slot-scope="scope" v-if="scope.row.realEndDate">{{scope.row.realEndDate}}</template>
|
|
<template slot-scope="scope" v-if="scope.row.realEndDate">{{scope.row.realEndDate}}</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column align="center" label="进度" min-width="250">
|
|
|
|
|
|
+ <el-table-column align="center" label="进度" min-width="150">
|
|
<template slot-scope="scope" v-if="scope.row.progress">{{scope.row.progress}}</template>
|
|
<template slot-scope="scope" v-if="scope.row.progress">{{scope.row.progress}}</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
@@ -1428,24 +1428,20 @@ export default {
|
|
side() {
|
|
side() {
|
|
if(this.$refs.side.style.left < '1px') {
|
|
if(this.$refs.side.style.left < '1px') {
|
|
this.$refs.sidebars.style.width = '1px'
|
|
this.$refs.sidebars.style.width = '1px'
|
|
- this.$refs.sid.style.left = '201px'
|
|
|
|
|
|
+ this.$refs.sid.style.left = '161px'
|
|
this.$refs.side.style.left = '1px'
|
|
this.$refs.side.style.left = '1px'
|
|
this.$refs.sideI.className = 'el-icon-arrow-right'
|
|
this.$refs.sideI.className = 'el-icon-arrow-right'
|
|
- // this.$refs.staff.style.margin = '5px 0px 0px 5px'
|
|
|
|
- // this.$refs.staff.style.width = '100%'
|
|
|
|
this.$refs.headHe.style.paddingLeft = '10px'
|
|
this.$refs.headHe.style.paddingLeft = '10px'
|
|
- this.$refs.headine.style.width = (this.windowWidth - 200)+'px'
|
|
|
|
- this.$refs.tabless.style.width = (this.windowWidth - 200)+'px'
|
|
|
|
|
|
+ this.$refs.headine.style.width = (this.windowWidth - 180)+'px'
|
|
|
|
+ this.$refs.tabless.style.width = (this.windowWidth - 180)+'px'
|
|
} else {
|
|
} else {
|
|
- this.$refs.sidebars.style.width = '200px'
|
|
|
|
- this.$refs.sid.style.left = '400px'
|
|
|
|
|
|
+ this.$refs.sidebars.style.width = '180px'
|
|
|
|
+ this.$refs.sid.style.left = '340px'
|
|
this.$refs.side.style.left = '-19px'
|
|
this.$refs.side.style.left = '-19px'
|
|
this.$refs.sideI.className = 'el-icon-arrow-left'
|
|
this.$refs.sideI.className = 'el-icon-arrow-left'
|
|
- // this.$refs.staff.style.margin = '5px 0px 0px 10px'
|
|
|
|
- // this.$refs.staff.style.width = '98%'
|
|
|
|
this.$refs.headHe.style.paddingLeft = '10px'
|
|
this.$refs.headHe.style.paddingLeft = '10px'
|
|
- this.$refs.headine.style.width = (this.windowWidth - 400)+'px'
|
|
|
|
- this.$refs.tabless.style.width = (this.windowWidth - 400)+'px'
|
|
|
|
|
|
+ this.$refs.headine.style.width = (this.windowWidth - 340)+'px'
|
|
|
|
+ this.$refs.tabless.style.width = (this.windowWidth - 340)+'px'
|
|
}
|
|
}
|
|
},
|
|
},
|
|
picks() {
|
|
picks() {
|
|
@@ -1669,7 +1665,7 @@ export default {
|
|
/* 侧边栏收索 */
|
|
/* 侧边栏收索 */
|
|
.side {
|
|
.side {
|
|
position: absolute;
|
|
position: absolute;
|
|
- z-index: 2;
|
|
|
|
|
|
+ z-index: 5;
|
|
border-right: 2px solid #DDDDDD;
|
|
border-right: 2px solid #DDDDDD;
|
|
height: 100%;
|
|
height: 100%;
|
|
top: 0;
|
|
top: 0;
|