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

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
liushuai
2020-02-05 12:14:36 +08:00
parent a1b1feb81e da82d12e74
commit 18c5cf8f80
17 changed files with 492 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/views/ManufacturingCenter/CreatePreparationBill/index.vue
View File

@@ -19,13 +19,26 @@
<el-button type="primary" size="small" icon="el-icon-printer" style="margin-left:10px" @click="exportTable('BL')">打印自家备料单</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="导出备料分配单" placement="top">
<el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
<el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 140px" @click="exportExcel">导出</el-button>
</el-tooltip>
</el-row>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" height="760" style="width: 1126px; margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange">
<el-table
v-loading="loading"
:data="tableData"
height="760"
style="width: 1126px; margin: 3px 0"
size="mini"
border
stripe
sortable
highlight-current-row
element-loading-text="拼命加载中"
@sort-change="sortChange"
@selection-change="handleSelectionChange">
<!--<el-table v-loading="loading" :data="tableData" height="760" style="width: 1126px; margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange">-->
<el-table-column
type="selection"
width="50"
@@ -37,12 +50,13 @@
<el-tag v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='0'" type="warning" size="mini">未分配</el-tag>
</template>
</el-table-column>
<el-table-column label="零件名称" prop="零件名称" align="center" width="250" show-overflow-tooltip>
<el-table-column label="零件名称" prop="零件名称" align="center" width="250" sortable="custom" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" prop="零件图号" align="center" width="180" show-overflow-tooltip>
<el-table-column label="零件图号" prop="零件图号" align="center" width="180" sortable="custom" show-overflow-tooltip>
<!--<el-table-column label="零件图号" prop="零件图号" align="center" width="180" show-overflow-tooltip>-->
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
@@ -133,13 +147,30 @@ export default {
tableData: [], // 表格数据
total: null, // 总条数
pageSize: 30, // 每页显示条数
pageCurrent: 1 // 后台获取页
pageCurrent: 1, // 后台获取页
ordername: '',
order: ''
}
},
created() {
this.searchTable()
},
methods: {
sortChange(column, prop, order) {
console.log(column + '-' + column.prop + '-' + column.order, 11111)
if (column.prop === '零件名称') {
this.ordername = 1
} else if (column.prop === '零件图号') { this.ordername = 2 } else {
this.ordername = ''
}
console.log(this.ordername, 9990999)
if (column.order === 'ascending') {
this.order = 1
} else if (column.order === 'descending') { this.order = 2 } else {
this.order = ''
}
this.searchTable()
},
exportTable() {
if (this.tableData2.length === 0) {
this.$message.warning('暂无数据')
@@ -164,8 +195,7 @@ export default {
} else {
this.partNamecheck = false
}
searchtable(this.partNamecheck, this.partName, !this.all, 0, this.pageCurrent, this.pageSize).then(response => {
console.log(response)
searchtable(this.partNamecheck, this.partName, !this.all, 0, this.pageCurrent, this.pageSize, this.ordername, this.order).then(response => {
if (response.data.total === 0) {
this.loading = false
} else {

2
src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
View File

@@ -69,7 +69,7 @@
</el-table-column>
<el-table-column align="center" label="加工日期" width="100px">
<template slot-scope="scope">
{{ scope.row.操作时间 }}
{{ scope.row.操作时间.substr(0,10) }}
</template>
</el-table-column>
<el-table-column align="center" label="计划准结工时" width="100px">

83
src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
View File

@@ -3,14 +3,27 @@
<el-card>
<span>设备名称:</span>
<el-input v-model="equipmentName" placeholder="设备名称" size="small" clearable style="width:200px;margin-left: 10px"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:30px" @click="pageCurrent = 1;fetchData()">查询</el-button>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:30px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="pageCurrent = 1;fetchData()">查询</el-button>
<el-tooltip effect="dark" content="添加新设备" placement="top">
<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button>
<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="handleAdd()">新增</el-button>
</el-tooltip>
<span style="margin-left: 40px">有效时间：</span>
<el-date-picker
v-model="time"
type="date"
size="small"
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
<el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">
<el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="setUp">设定</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">
<el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="generate">生成设备加工能力</el-button>
</el-tooltip>
</el-card>
<el-card>
<el-table :data="List" border size="small" stripe highlight-current-row height="500px">
<el-table :data="List" border size="small" stripe highlight-current-row height="700px">
<el-table-column label="设备名称" prop="设备名称" align="center" >
<template slot-scope="scope">
{{ scope.row.设备名称 }}
@@ -68,32 +81,32 @@
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-card>
<span>有效时间：</span>
<el-date-picker
v-model="time"
type="date"
size="small"
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
<el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">
<el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">
<el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px" @click="generate">生成设备加工能力</el-button>
</el-tooltip>
<!-- <div class="block" style="margin-top: 10px;">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize"-->
<!-- :total="total"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange"-->
<!-- @current-change="handleCurrentChange"/>-->
<!-- </div>-->
</el-card>
<!-- <el-card>-->
<!-- <span>有效时间：</span>-->
<!-- <el-date-picker-->
<!-- v-model="time"-->
<!-- type="date"-->
<!-- size="small"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择日期"/>-->
<!-- <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">-->
<!-- <el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>-->
<!-- </el-tooltip>-->
<!-- <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">-->
<!-- <el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px" @click="generate">生成设备加工能力</el-button>-->
<!-- </el-tooltip>-->
<!-- </el-card>-->
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm">
@@ -240,8 +253,8 @@ export default {
this.check = 0
}
getData(this.check, this.equipmentName, this.pageCurrent, this.pageSize).then(response => {
this.List = response.data.rows
this.total = response.data.total
this.List = response.data
// this.total = response.data.total
})
},
initialization() {
@@ -399,4 +412,14 @@ export default {
.el-card{
margin-bottom: 1px;
}
/*.el-button--success {*/
/* background: #ecf5ff;*/
/* border-color: #2d72d5;*/
/* color: #2d72d5;*/
/*}*/
/*.el-button--primary {*/
/* background: #fdf6ec;*/
/* border-color: #ff9759;*/
/* color: #ff9759;*/
/*}*/
</style>