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-11-05 09:27:31 +08:00
parent d2b879835c
commit b1f4fd3368
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/ManufacturingCenter/InitialProduction/index.vue
View File

@@ -165,13 +165,13 @@
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange"/> @current-change="handleCurrentChange"/>
<el-tooltip :open-delay="1200" effect="dark" content="打回到零件分配" placement="top"> <el-tooltip :open-delay="1200" effect="dark" content="打回到零件分配" placement="top">
<el-button :loading="listLoading3" type="primary" size="small" style="float:right;margin-left: 10px" @click="back">打回</el-button> <el-button :loading="listLoading3" type="danger" size="small" style="float:right;margin-left: 10px" @click="back">打回</el-button>
</el-tooltip> </el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="选中零件进行投产" placement="top"> <el-tooltip :open-delay="1200" effect="dark" content="选中零件进行投产" placement="top">
<el-button :loading="listLoading3" type="primary" size="small" style="float:right;" @click="production">投产</el-button> <el-button :loading="listLoading3" type="primary" size="small" style="float:right;" @click="production">投产</el-button>
</el-tooltip> </el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="选中零件进行备料投产" placement="top"> <el-tooltip :open-delay="1200" effect="dark" content="选中零件进行备料投产" placement="top">
<el-button :loading="listLoading3" type="primary" size="small" style="float:right;" @click="production10">备料投产</el-button> <el-button :loading="listLoading3" type="success" size="small" style="float:right;" @click="production10">备料投产</el-button>
</el-tooltip> </el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="将不同组号中相同图号的零件合并" placement="top"> <el-tooltip :open-delay="1200" effect="dark" content="将不同组号中相同图号的零件合并" placement="top">
<el-checkbox v-model="checked_hebing" style="float:right;margin-top:10px;margin-right:10px">合并生产</el-checkbox> <el-checkbox v-model="checked_hebing" style="float:right;margin-top:10px;margin-right:10px">合并生产</el-checkbox>

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

@@ -136,7 +136,7 @@
<el-pagination <el-pagination
v-show="false" v-show="false"
:current-page="currentPage" :current-page="currentPage"
:page-sizes="[10, 20, 30, 1000000]" :page-sizes="[10, 20, 30, 100]"
:page-size="pageSize" :page-size="pageSize"
:total="total" :total="total"
style="float:left" style="float:left"
@@ -151,7 +151,7 @@
<div v-if="是否扫描 === true" class="block" style="margin-top: 10px;"> <div v-if="是否扫描 === true" class="block" style="margin-top: 10px;">
<el-pagination <el-pagination
:current-page="currentPage5" :current-page="currentPage5"
:page-sizes="[10, 20, 30, 1000000]" :page-sizes="[10, 20, 30, 100]"
:page-size="pageSize5" :page-size="pageSize5"
:total="total5" :total="total5"
style="float:left" style="float:left"
@@ -706,15 +706,15 @@ export default {
tableData2: [], // 导出临时表 tableData2: [], // 导出临时表
length: 0, // 记TABLEDATA1的长度 length: 0, // 记TABLEDATA1的长度
total: 0, // 总条数 total: 0, // 总条数
pageSize: 1000000, // 每页显示条数 pageSize: 100, // 每页显示条数
pageList: 1, // 后台获取页 pageList: 1, // 后台获取页
currentPage: 1, // 显示当前页 currentPage: 1, // 显示当前页
total1: 0, // 总条数 total1: 0, // 总条数
pageSize1: 1000000, // 每页显示条数 pageSize1: 10, // 每页显示条数
pageList1: 1, // 后台获取页 pageList1: 1, // 后台获取页
currentPage1: 1, // 显示当前页 currentPage1: 1, // 显示当前页
total5: 0, // 总条数 total5: 0, // 总条数
pageSize5: 1000000, // 每页显示条数 pageSize5: 100, // 每页显示条数
pageList5: 1, // 后台获取页 pageList5: 1, // 后台获取页
currentPage5: 1 // 显示当前页 currentPage5: 1 // 显示当前页
} }