add:1.主表增加产线信息;trackNo 跟踪号;
2.sn条码校验,非空的不能重复
3.增加分页,增加状态:1.忽略过账 :状态跟回传异常异样忽略(功能暂时不确定)
4.物料名称,bom数量有可能为0;为0的也跟回传异常异样忽略;
This commit is contained in:
@@ -73,6 +73,8 @@
|
||||
<el-table-column prop="orgno" label="机构编号" min-width="120" />
|
||||
<el-table-column prop="biztype" label="业务类型" min-width="100" />
|
||||
<el-table-column prop="invscheme" label="库存方案" min-width="100" />
|
||||
<el-table-column prop="trackNo" label="跟踪号" min-width="100" />
|
||||
<el-table-column prop="workArea" label="产线" min-width="100" />
|
||||
<el-table-column prop="transtype" label="交易类型" min-width="100" />
|
||||
<el-table-column prop="biztime" label="业务时间" min-width="160" />
|
||||
<el-table-column prop="createTime" label="创建时间" min-width="160" />
|
||||
@@ -121,7 +123,7 @@
|
||||
<el-descriptions-item label="回传备注" :span="2">{{ currentRow.remark }}</el-descriptions-item>
|
||||
<el-descriptions-item label="报工参数" :span="2">{{ currentRow.reportParam }}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
<el-table :data="currentRow.details || []" size="mini" style="width: 100%; margin-top: 12px;">
|
||||
<el-table :data="pagedDetails" size="mini" style="width: 100%; margin-top: 12px;">
|
||||
<el-table-column prop="seq" label="行序号" width="80" />
|
||||
<el-table-column label="回传状态" min-width="140">
|
||||
<template slot-scope="scope">
|
||||
@@ -154,6 +156,14 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-pagination
|
||||
style="margin-top: 8px; text-align: right;"
|
||||
:current-page.sync="detailPage.page"
|
||||
:page-size.sync="detailPage.size"
|
||||
:page-sizes="[10, 20, 50, 100]"
|
||||
:total="(currentRow.details || []).length"
|
||||
layout="total, prev, pager, next, sizes"
|
||||
/>
|
||||
<div slot="footer" class="dialog-footer"><el-button type="primary" @click="viewShow = false">关闭</el-button></div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
@@ -212,6 +222,7 @@ export default {
|
||||
viewShow: false,
|
||||
uploadFlag: true,
|
||||
currentRow: {},
|
||||
detailPage: { page: 1, size: 10 },
|
||||
permission: {
|
||||
add: ['purchasemst:add'],
|
||||
edit: ['purchasemst:edit'],
|
||||
@@ -221,7 +232,8 @@ export default {
|
||||
{ value: '0', label: '待回传' },
|
||||
{ value: '1', label: '回传成功' },
|
||||
{ value: '2', label: '回传失败' },
|
||||
{ value: '3', label: '回传异常' }
|
||||
{ value: '3', label: '回传异常' },
|
||||
{ value: '4', label: '忽略过账' },
|
||||
],
|
||||
rules: {
|
||||
orgno: [{ required: true, message: '请输入机构编号', trigger: 'blur' }],
|
||||
@@ -230,6 +242,22 @@ export default {
|
||||
}
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
pagedDetails() {
|
||||
const list = this.currentRow.details || []
|
||||
const start = (this.detailPage.page - 1) * this.detailPage.size
|
||||
return list.slice(start, start + this.detailPage.size)
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
'detailPage.size'() {
|
||||
const total = (this.currentRow.details || []).length
|
||||
const maxPage = Math.max(1, Math.ceil(total / this.detailPage.size))
|
||||
if (this.detailPage.page > maxPage) {
|
||||
this.detailPage.page = maxPage
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
[CRUD.HOOK.beforeRefresh]() {
|
||||
if (this.query.dateRange) {
|
||||
@@ -332,6 +360,7 @@ export default {
|
||||
toView(row) {
|
||||
get(row.id).then(res => {
|
||||
this.currentRow = res.data
|
||||
this.detailPage.page = 1
|
||||
this.viewShow = true
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user