Skip to content

M
mes-pad
Commit 6e44a8a4 authored by chenzj's avatar chenzj
Browse files
Options

Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev

parents 81e41e31 06d0aa52
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 13 deletions
pages/mes/prodReport/index.vue
View file @ 6e44a8a4
...@@ -237,13 +237,13 @@ ...@@ -237,13 +237,13 @@
<!-- {{ scope.row }} --> <!-- {{ scope.row }} -->
<u-button v-if="scope.row.feedbackQuantity && Number(scope.row.feedbackQuantity) > 0" <u-button v-if="scope.row.feedbackQuantity && Number(scope.row.feedbackQuantity) > 0"
@tap="rePackageInfoPrint(feedback, scope.row, i)" type="success" @tap="rePackageInfoPrint(feedback, scope.row, i)" class="successBtn"
style="margin-left: 20rpx" size="mini"> style="margin-left: 20rpx">
补打印 补打印
</u-button> </u-button>
<u-button v-else-if="Number(scope.row.packageNum) > Number(scope.row.feedbackQuantity)" <u-button v-else-if="Number(scope.row.packageNum) > Number(scope.row.feedbackQuantity)"
@tap="handleSubmitPackageFeedback(feedback, scope.row, i)" type="success" @tap="handleSubmitPackageFeedback(feedback, scope.row, i)" class="successBtn"
style="margin-left: 20rpx" size="mini"> style="margin-left: 20rpx">
打印/报工 打印/报工
</u-button> </u-button>
<!-- <u-input v-model="scope.row.reportQuantity" type="number"></u-input> --> <!-- <u-input v-model="scope.row.reportQuantity" type="number"></u-input> -->
...@@ -265,12 +265,12 @@ ...@@ -265,12 +265,12 @@
<template slot="peration" slot-scope="scope"> <template slot="peration" slot-scope="scope">
<!-- {{ scope.row }} --> <!-- {{ scope.row }} -->
<u-button v-if="scope.row.feedbackQuantity && Number(scope.row.feedbackQuantity) > 0" <u-button v-if="scope.row.feedbackQuantity && Number(scope.row.feedbackQuantity) > 0"
@tap="rePackageInfoPrint(feedback, scope.row, i)" type="success" @tap="rePackageInfoPrint(feedback, scope.row, i)"
style="margin-left: 20rpx" size="mini"> style="margin-left: 20rpx" class="successBtn">
补打印 补打印
</u-button> </u-button>
<u-button v-else @tap="handleSubmitPackageFeedback(feedback, scope.row, i)" type="success" <u-button v-else @tap="handleSubmitPackageFeedback(feedback, scope.row, i)"
style="margin-left: 20rpx" size="mini">打印/报工</u-button> style="margin-left: 20rpx" class="successBtn">打印/报工</u-button>
<!-- <u-input v-model="scope.row.reportQuantity" type="number"></u-input> --> <!-- <u-input v-model="scope.row.reportQuantity" type="number"></u-input> -->
</template> </template>
</zb-table> </zb-table>
...@@ -290,12 +290,12 @@ ...@@ -290,12 +290,12 @@
<template slot="peration" slot-scope="scope"> <template slot="peration" slot-scope="scope">
<!-- {{ scope.row }} --> <!-- {{ scope.row }} -->
<u-button v-if="scope.row.feedbackQuantity && Number(scope.row.feedbackQuantity) > 0" <u-button v-if="scope.row.feedbackQuantity && Number(scope.row.feedbackQuantity) > 0"
@tap="rePackageInfoPrint(feedback, scope.row, i)" type="success" @tap="rePackageInfoPrint(feedback, scope.row, i)"
style="margin-left: 20rpx" size="mini"> style="margin-left: 20rpx" class="successBtn">
补打印 补打印
</u-button> </u-button>
<u-button v-else @tap="handleSubmitPackageFeedback(feedback, scope.row, i)" type="success" <u-button v-else @tap="handleSubmitPackageFeedback(feedback, scope.row, i)"
style="margin-left: 20rpx" size="mini">打印/报工</u-button> style="margin-left: 20rpx" class="successBtn">打印/报工</u-button>
</template> </template>
</zb-table> </zb-table>
</view> </view>
...@@ -1422,6 +1422,16 @@ export default { ...@@ -1422,6 +1422,16 @@ export default {
label: '生产订单数量', label: '生产订单数量',
width: 140 width: 140
}, },
{
name: 'startSerial',
label: '开始序列码',
width: 140
},
{
name: 'endSerial',
label: '结束序列码',
width: 140
},
{ {
name: 'productSpc', name: 'productSpc',
label: '规格', label: '规格',
...@@ -3201,7 +3211,23 @@ export default { ...@@ -3201,7 +3211,23 @@ export default {
color: black; color: black;
} }
} }
.successBtn {
display: inline-flex;
width: auto;
font-size: 22rpx;
padding-top: 1px;
height: 50rpx;
line-height: 50rpx;
padding: 0 20rpx;
color: #ffffff;
border-color: #19be6b;
background-color: #19be6b;
&:hover {
border-color: #19be6b !important;
background-color: #19be6b !important;
color: #ffffff !important;
}
}
</style> </style>
<style lang="scss"> <style lang="scss">
.mynotable { .mynotable {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment