离线采购冲突

This commit is contained in:
bryan sun
2019-10-23 19:20:27 +08:00
30 changed files with 1105 additions and 1327 deletions

View File

@@ -29,7 +29,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total = 0;pageSize = 10;pageList = 1;getTable()">查询</el-button>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total = 0;pageSize = 10000;pageList = 1;getTable()">查询</el-button>
</el-form-item>
</el-form>
</el-col>
@@ -142,30 +142,6 @@
{{ scope.row.零件类型名称 }}
</template>
</el-table-column>
<!--<el-table-column label="是否外协" align="center" width="90">-->
<!--<template slot-scope="scope">-->
<!--<el-checkbox v-model="tableData[scope.$index].checked_waixie" @change="gaibianwaixie(scope.$index, scope.row)"/>-->
<!--外协-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="是否带料" align="center" width="90">-->
<!--<template slot-scope="scope">-->
<!--<el-checkbox :disabled="!tableData[scope.$index].checked_waixie" v-model="tableData[scope.$index].checked_dailiao"/>-->
<!--带料-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="是否着急" align="center" width="90">-->
<!--<template slot-scope="scope">-->
<!--<el-checkbox v-model="tableData[scope.$index].checked_zhaoji"/>-->
<!--着急-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column prop="name" label="打回原因" width="170" align="center">-->
<!--<template slot-scope="scope">-->
<!--<el-input v-model="tableData[scope.$index].name" type="textarea" :rows="1" style="width:150px" placeholder="原因">-->
<!--</el-input>-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="操作" width="200px" fixed="right" align="center">
<template slot-scope="scope">
<el-button
@@ -174,24 +150,20 @@
type="primary"
plain
@click="handleEdit(scope.$index, scope.row, 'form')">分批投产</el-button>
<!--<el-button-->
<!--size="mini"-->
<!--type="primary"-->
<!--@click="handleDele(scope.$index, scope.row, 'form1')">打回</el-button>-->
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
v-show="false"
:current-page="currentPage"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 20, 30, 10000]"
:page-size="pageSize"
:total="total"
style="width:50%;display:inline-block;"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
<!--<el-checkbox v-model="checked_baitu" style="margin-top:0px">是否白图</el-checkbox>-->
<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-tooltip>
@@ -268,15 +240,15 @@
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
v-show="false"
:current-page="currentPage3"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 20, 30, 10000]"
:page-size="pageSize3"
:total="total3"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange3"
@current-change="handleCurrentChange3"/>
</div>
</div>
</el-card>
@@ -426,11 +398,11 @@ export default {
gongyijihua: '',
radio: 0, // 第一组
total: 0, // 总条数
pageSize: 10, // 每页显示条数
pageSize: 10000, // 每页显示条数
pageList: 1, // 后台获取页
currentPage: 1, // 显示当前页
total3: 0, // 总条数
pageSize3: 10, // 每页显示条数
pageSize3: 10000, // 每页显示条数
pageList3: 1, // 后台获取页
currentPage3: 1, // 显示当前页
listLoading: false,
@@ -725,7 +697,7 @@ export default {
this.listLoading1 = false
})
this.total = 0
this.pageSize = 10
this.pageSize = 10000
this.pageList = 1
this.getTable()
} else {
@@ -788,7 +760,7 @@ export default {
this.checked_baitu = false
this.checked_gaonandu = false
this.total = 0
this.pageSize = 10
this.pageSize = 10000
this.pageList = 1
this.shijiancuo1 = 0
this.shijiancuo = 0
@@ -1000,7 +972,7 @@ export default {
message: '打回档案成功!'
})
this.total = 0
this.pageSize = 10
this.pageSize = 10000
this.pageList = 1
this.getTable()
} else {