Skip to content

M
mes-pad
Commit f75fa2ce authored by 沈翠玲's avatar 沈翠玲
Browse files
Options

A类问题

parent ad30d108
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 50 deletions
common/http.api.js
View file @ f75fa2ce
...@@ -103,7 +103,7 @@ const install = (Vue, vm) => { ...@@ -103,7 +103,7 @@ const install = (Vue, vm) => {
), ),
//装箱打印 //装箱打印
blPackagePrintInfo: (params = {}) => blPackagePrintInfo: (params = {}) =>
vm.$u.post( vm.$u.postJson(
config.adminPath + '/pro/packagePrintRecord/blPackagePrintInfo', config.adminPath + '/pro/packagePrintRecord/blPackagePrintInfo',
params params
), ),
......
pages/mes/prodReport/index.vue
View file @ f75fa2ce
...@@ -238,24 +238,24 @@ ...@@ -238,24 +238,24 @@
</template> </template>
<template slot="grossWeight" slot-scope="scope"> <template slot="grossWeight" slot-scope="scope">
<!-- {{ scope.row }} --> <!-- {{ scope.row }} -->
<u-input v-model="scope.row.grossWeight" type="number"></u-input> <u-input v-model="scope.row.grossWeight" type="number" placeholder=""></u-input>
</template> </template>
<template slot="packageStandard" slot-scope="scope"> <template slot="packageStandard" slot-scope="scope">
<!-- {{ scope.row }} --> <!-- {{ scope.row }} -->
<uni-easyinput type="text" suffixIcon="scan" v-model="scope.row.packageStandard" style="width: 100%" <uni-easyinput type="text" suffixIcon="scan" v-model="scope.row.packageStandard" style="width: 100%"
@iconClick="() => iconPackageStandard(scope.row)" placeholder="请输入装箱规格" /> @iconClick="() => iconPackageStandard(scope.row)" placeholder="" />
</template> </template>
<template slot="peration" slot-scope="scope"> <template slot="peration" slot-scope="scope">
<!-- {{ scope.row }} --> <!-- {{ scope.row }} -->
<u-button v-if="scope.row.isEncase" @tap="handleBlPackagePrintInfo(feedback, scope.row, i)" class="successBtn" style="margin-left: 20rpx">打印</u-button> <u-button v-if="scope.row.isEncase" @tap="handleBlPackagePrintInfo(feedback, scope.row, i)" class="successBtn" style="margin-left: 0">打印</u-button>
<u-button v-else-if="scope.row.feedbackQuantity && Number(scope.row.feedbackQuantity) > 0" <u-button v-else-if="scope.row.feedbackQuantity && Number(scope.row.feedbackQuantity) > 0"
@tap="rePackageInfoPrint(feedback, scope.row, i)" class="successBtn" @tap="rePackageInfoPrint(feedback, scope.row, i)" class="successBtn"
style="margin-left: 20rpx"> style="margin-left: 0">
补打印 补打印
</u-button> </u-button>
<u-button v-else-if="Number(scope.row.packageNum) > Number(scope.row.feedbackQuantity) || scope.row.printbtn" <u-button v-else-if="Number(scope.row.packageNum) > Number(scope.row.feedbackQuantity) || scope.row.printbtn"
@tap="handleSubmitPackageFeedback(feedback, scope.row, i)" class="successBtn" @tap="handleSubmitPackageFeedback(feedback, scope.row, i)" class="successBtn"
style="margin-left: 20rpx"> style="margin-left: 0">
打印/报工 打印/报工
</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> -->
...@@ -276,23 +276,23 @@ ...@@ -276,23 +276,23 @@
</template> </template>
<template slot="grossWeight" slot-scope="scope"> <template slot="grossWeight" slot-scope="scope">
<!-- {{ scope.row }} --> <!-- {{ scope.row }} -->
<u-input v-model="scope.row.grossWeight" type="number"></u-input> <u-input v-model="scope.row.grossWeight" type="number" placeholder=""></u-input>
</template> </template>
<template slot="packageStandard" slot-scope="scope"> <template slot="packageStandard" slot-scope="scope">
<!-- {{ scope.row }} --> <!-- {{ scope.row }} -->
<uni-easyinput type="text" suffixIcon="scan" v-model="scope.row.packageStandard" style="width: 100%" <uni-easyinput type="text" suffixIcon="scan" v-model="scope.row.packageStandard" style="width: 100%"
@iconClick="() => iconPackageStandard(scope.row)" placeholder="请输入装箱规格" /> @iconClick="() => iconPackageStandard(scope.row)" placeholder="装箱规格" />
</template> </template>
<template slot="peration" slot-scope="scope"> <template slot="peration" slot-scope="scope">
<!-- {{ scope.row }} --> <!-- {{ scope.row }} -->
<u-button v-if="scope.row.isEncase" @tap="handleBlPackagePrintInfo(feedback, scope.row, i)" class="successBtn" style="margin-left: 20rpx">打印</u-button> <u-button v-if="scope.row.isEncase" @tap="handleBlPackagePrintInfo(feedback, scope.row, i)" class="successBtn" style="margin-left: 0">打印</u-button>
<u-button v-else-if="scope.row.feedbackQuantity && Number(scope.row.feedbackQuantity) > 0" <u-button v-else-if="scope.row.feedbackQuantity && Number(scope.row.feedbackQuantity) > 0"
@tap="rePackageInfoPrint(feedback, scope.row, i)" @tap="rePackageInfoPrint(feedback, scope.row, i)"
style="margin-left: 20rpx" class="successBtn"> style="margin-left: 0" class="successBtn">
补打印 补打印
</u-button> </u-button>
<u-button v-else @tap="handleSubmitPackageFeedback(feedback, scope.row, i)" <u-button v-else @tap="handleSubmitPackageFeedback(feedback, scope.row, i)"
style="margin-left: 20rpx" class="successBtn">打印/报工</u-button> style="margin-left: 0" 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>
...@@ -311,23 +311,23 @@ ...@@ -311,23 +311,23 @@
</template> </template>
<template slot="grossWeight" slot-scope="scope"> <template slot="grossWeight" slot-scope="scope">
<!-- {{ scope.row }} --> <!-- {{ scope.row }} -->
<u-input v-model="scope.row.grossWeight" type="number"></u-input> <u-input v-model="scope.row.grossWeight" type="number" placeholder=""></u-input>
</template> </template>
<template slot="packageStandard" slot-scope="scope"> <template slot="packageStandard" slot-scope="scope">
<!-- {{ scope.row }} --> <!-- {{ scope.row }} -->
<uni-easyinput type="text" suffixIcon="scan" v-model="scope.row.packageStandard" style="width: 100%" <uni-easyinput type="text" suffixIcon="scan" v-model="scope.row.packageStandard" style="width: 100%"
@iconClick="() => iconPackageStandard(scope.row)" placeholder="请输入装箱规格" /> @iconClick="() => iconPackageStandard(scope.row)" placeholder="装箱规格" />
</template> </template>
<template slot="peration" slot-scope="scope"> <template slot="peration" slot-scope="scope">
<!-- {{ scope.row }} --> <!-- {{ scope.row }} -->
<u-button v-if="scope.row.isEncase" @tap="handleBlPackagePrintInfo(feedback, scope.row, i)" class="successBtn" style="margin-left: 20rpx">打印</u-button> <u-button v-if="scope.row.isEncase" @tap="handleBlPackagePrintInfo(feedback, scope.row, i)" class="successBtn" style="margin-left: 0">打印</u-button>
<u-button v-else-if="scope.row.feedbackQuantity && Number(scope.row.feedbackQuantity) > 0" <u-button v-else-if="scope.row.feedbackQuantity && Number(scope.row.feedbackQuantity) > 0"
@tap="rePackageInfoPrint(feedback, scope.row, i)" @tap="rePackageInfoPrint(feedback, scope.row, i)"
style="margin-left: 20rpx" class="successBtn"> style="margin-left: 0" class="successBtn">
补打印 补打印
</u-button> </u-button>
<u-button v-else @tap="handleSubmitPackageFeedback(feedback, scope.row, i)" <u-button v-else @tap="handleSubmitPackageFeedback(feedback, scope.row, i)"
style="margin-left: 20rpx" class="successBtn">打印/报工</u-button> style="margin-left: 0" class="successBtn">打印/报工</u-button>
</template> </template>
</zb-table> </zb-table>
</view> </view>
...@@ -1062,7 +1062,7 @@ export default { ...@@ -1062,7 +1062,7 @@ export default {
{ {
name: 'peration', name: 'peration',
label: '操作', label: '操作',
width: 120, width: 80,
type: 'slot', type: 'slot',
slot: 'peration' slot: 'peration'
} }
...@@ -1076,41 +1076,41 @@ export default { ...@@ -1076,41 +1076,41 @@ export default {
{ {
name: 'quantity', name: 'quantity',
label: '派工数', label: '派工数',
width: 100 width: 70
}, },
{ {
name: 'packageNum', name: 'packageNum',
label: '包装数', label: '包装数',
width: 80 width: 75
}, },
{ {
name: 'lossNum', name: 'lossNum',
label: 'LOSS数', label: 'LOSS数',
width: 100 width: 80
}, },
{ {
name: 'feedbackQuantity', name: 'feedbackQuantity',
label: '已包装数', label: '已包装数',
width: 130 width: 80
}, },
{ {
name: 'reportQuantity', name: 'reportQuantity',
label: '本次报工', label: '本次报工',
width: 100, width: 80,
type: 'slot', type: 'slot',
slot: 'reportQuantity' slot: 'reportQuantity'
}, },
{ {
name: 'netWeight', name: 'netWeight',
label: '净重', label: '净重',
width: 100, width: 70,
type: 'slot', type: 'slot',
slot: 'netWeight' slot: 'netWeight'
}, },
{ {
name: 'grossWeight', name: 'grossWeight',
label: '毛重', label: '毛重',
width: 100, width: 70,
type: 'slot', type: 'slot',
slot: 'grossWeight' slot: 'grossWeight'
}, },
...@@ -1124,7 +1124,7 @@ export default { ...@@ -1124,7 +1124,7 @@ export default {
{ {
name: 'peration', name: 'peration',
label: '操作', label: '操作',
width: 120, width: 80,
type: 'slot', type: 'slot',
slot: 'peration' slot: 'peration'
} }
...@@ -2517,7 +2517,7 @@ export default { ...@@ -2517,7 +2517,7 @@ export default {
{ {
name: 'standardSizeIdx', name: 'standardSizeIdx',
label: '序号', label: '序号',
width: 60 width: 40
}, },
{ {
name: 'standardSize', name: 'standardSize',
...@@ -2547,21 +2547,21 @@ export default { ...@@ -2547,21 +2547,21 @@ export default {
{ {
name: 'reportQuantity', name: 'reportQuantity',
label: '本次报工', label: '本次报工',
width: 100, width: 90,
type: 'slot', type: 'slot',
slot: 'reportQuantity' slot: 'reportQuantity'
}, },
{ {
name: 'netWeight', name: 'netWeight',
label: '净重', label: '净重',
width: 100, width: 80,
type: 'slot', type: 'slot',
slot: 'netWeight' slot: 'netWeight'
}, },
{ {
name: 'grossWeight', name: 'grossWeight',
label: '毛重', label: '毛重',
width: 100, width: 80,
type: 'slot', type: 'slot',
slot: 'grossWeight' slot: 'grossWeight'
}, },
...@@ -2575,7 +2575,7 @@ export default { ...@@ -2575,7 +2575,7 @@ export default {
{ {
name: 'peration', name: 'peration',
label: '操作', label: '操作',
width: 120, width: 80,
type: 'slot', type: 'slot',
slot: 'peration' slot: 'peration'
} }
...@@ -2748,35 +2748,24 @@ export default { ...@@ -2748,35 +2748,24 @@ export default {
this.$u.toast('打印机连接失败'); this.$u.toast('打印机连接失败');
return; return;
} }
if (!row.grossWeight || !row.packageStandard) {
this.$u.toast('请录入毛重、装箱规格');
return;
}
item.feedbackTime = this.parseTime(new Date()) item.feedbackTime = this.parseTime(new Date())
this.$u.api this.$u.api
.blPackagePrintInfo({ .blPackagePrintInfo({
taskWorkunitId: item.taskWorkunitId, taskWorkunitId: item.taskWorkunitId,
checkBy: item.checkBy, qrcode: row.qrcode,
encasementNum: item.encasementNum,
mergePack: item.mergePack,
packNum: item.packNum,
printTemplate: item.printTemplate,
quantityUnqualify: item.quantityUnqualify,
taskId: item.taskId,
userName: item.userName,
feedbackTime: item.feedbackTime,
workorderId: item.workorderId, workorderId: item.workorderId,
'reportData.grossWeight': row.grossWeight, grossWeight: row.grossWeight,
'reportData.packageStandard': row.packageStandard, packageStandard: row.packageStandard,
'reportData.boxWeight': row.boxWeight, boxWeight: row.boxWeight
'reportData.netWeight': row.netWeight,
'reportData.reportQuantity': row.reportQuantity,
'reportData.packageNum': row.packageNum,
'reportData.qrcode': row.qrcode,
'reportData.workorderSoDirectiveId': row.workorderSoDirectiveId,
'reportData.workorderSoSizeItemId': row.workorderSoSizeItemId
}) })
.then((res) => { .then((res) => {
if (res.code === 200) { if (res.code === 200) {
// this.proVisible = false; // this.proVisible = false;
item.quantityUnqualify = 0; this.$u.toast('打印成功');
this.$u.toast('上报成功');
this.getWorkorderDirectiveList(item, i) this.getWorkorderDirectiveList(item, i)
if (item.printTemplate) { if (item.printTemplate) {
let params = {}; let params = {};
......
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