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:
liushuai
2019-10-30 12:56:49 +08:00
parent f7a889e3d6 5dc659c34f
commit e8fa4894ef
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/views/ManufacturingCenter/ActualWorkQuery/index.vue
View File

@@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-card>
<el-card style="width: 1100px;">
<el-row>
<span class="demonstration">日期:</span>
<el-date-picker
@@ -13,13 +13,13 @@
placeholder="选择日期"
@change="pageCurrent=1;total=0;searchTable()"/>
<span>操作者:</span>
<el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:200px; margin-top: 10px;margin-bottom: 10px"/>
<el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:100px; margin-top: 10px;margin-bottom: 10px"/>
<el-button :disabled="loading" type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;total=0;searchTable();">查询</el-button>
</el-row>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" stripe height="700" size="mini" style="width: 1050px;" border>
<el-card style="width: 1100px;">
<el-table v-loading="loading" :data="tableData" stripe height="700" size="mini" style="width: 1100px;" border>
<el-table-column label="序号" type="index" align="center" width="55"/>
<el-table-column label="操作者" prop="姓名" align="center" width="80px">
<template slot-scope="scope">
@@ -46,14 +46,14 @@
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column label="实际工时" align="center" width="70px">
<el-table-column label="实际工时" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.实际加工时间段 || '—' }}
</template>
</el-table-column>
<el-table-column label="计划工时" prop="理论加工时间段" align="center" width="90px">
<el-table-column label="计划工时" prop="理论加工时间段" align="center" width="100px">
<template slot-scope="scope">
{{ isShow ? scope.row.理论加工时间段 : '-' }}
{{ scope.row.理论加工时间段 }}
</template>
</el-table-column>
<el-table-column label="实际开始时间" align="center" width="160px">
@@ -91,7 +91,6 @@ export default {
name: 'ActualTimeSupplement',
data() {
return {
isShow: false,
startTime: getNowShotTime(),
workerName: '',
loading: false,

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

@@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-card>
<el-card style="width: 585px;">
<el-date-picker
v-model="startTime"
value-format="yyyy-MM-dd"
@@ -16,13 +16,13 @@
style="width: 170px;margin:0px 10px"
type="date"
placeholder="选择结束日期"/>
<el-button type="success" class="el-icon-search" size="small" style="margin:0px 10px" @click="searchTable();">查询</el-button>
<el-button type="success" class="el-icon-search" size="small" @click="searchTable();">查询</el-button>
<el-tooltip :open-delay="1000" content="导出人员工时统计表" placement="right">
<el-button type="primary" size="small" icon="el-icon-download" style="margin:0px 10px" @click="exportTable()">导出</el-button>
<el-button type="primary" size="small" icon="el-icon-download" @click="exportTable()">导出</el-button>
</el-tooltip>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" size="mini" stripe style="width: 700px" border element-loading-text="拼命加载中">
<el-card style="width: 585px">
<el-table v-loading="loading" :data="tableData" size="mini" stripe style="width: 585px" border element-loading-text="拼命加载中">
<el-table-column label="操作者" align="center" width="110px">
<template slot-scope="scope">
{{ scope.row.姓名 }}