Commit 7b2a0773 authored by 张海景's avatar 张海景

update:提交修报工问题

parent 5255a0e0
...@@ -190,12 +190,12 @@ ...@@ -190,12 +190,12 @@
<u-row> <u-row>
<u-col span="3"> <u-col span="3">
<u-form-item label="包装数量:" prop="packNum"> <u-form-item label="包装数量:" prop="packNum">
<u-number-box :min="0" v-model="feedback.packNum" @blur="handleChangePackNum(feedback, i)"></u-number-box> <u-number-box :min="0" v-model="feedback.packNum"></u-number-box>
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="3"> <u-col span="3">
<u-form-item label="装箱数量:" prop="encasementNum"> <u-form-item label="装箱数量:" prop="encasementNum">
<u-number-box :min="0" v-model="feedback.encasementNum" @blur="handleChangePackNum(feedback, i)"></u-number-box> <u-number-box :min="0" v-model="feedback.encasementNum"></u-number-box>
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="6"> <u-col span="6">
...@@ -212,16 +212,20 @@ ...@@ -212,16 +212,20 @@
<u-button @tap="getPrintTemplate(feedback)" type="success" style="margin-left: 20rpx" size="mini">选择打印模板</u-button> <u-button @tap="getPrintTemplate(feedback)" type="success" style="margin-left: 20rpx" size="mini">选择打印模板</u-button>
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="6"> <u-col span="4">
<u-form-item label-width="120px" label="是否合并包装:" prop="mergePack"> <u-form-item label-width="120px" label="是否合并包装:" prop="mergePack">
<view class="uni-list-item__extra"> <view class="uni-list-item__extra">
<u-radio-group v-model="feedback.mergePack" @change="getWorkorderDirectiveList(feedback, i, true)"> <!-- @change="handleChangePackNum(feedback, i)" -->
<u-radio-group v-model="feedback.mergePack" >
<u-radio :name="1"></u-radio> <u-radio :name="1"></u-radio>
<u-radio :name="0"></u-radio> <u-radio :name="0"></u-radio>
</u-radio-group> </u-radio-group>
</view> </view>
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="2">
<u-button @tap="handleChangePackNum(feedback, i)" type="success" size="mini">计算包装标签</u-button>
</u-col>
</u-row> </u-row>
</u-form> </u-form>
<view> <view>
...@@ -241,7 +245,7 @@ ...@@ -241,7 +245,7 @@
<!-- {{ scope.row }} --> <!-- {{ scope.row }} -->
<u-button <u-button
v-if="Number(scope.row.packageNum) > Number(scope.row.feedbackQuantity)" v-if="Number(scope.row.packageNum) > Number(scope.row.feedbackQuantity)"
@tap="handleSubmitPackageFeedback(feedback, scope.row)" @tap="handleSubmitPackageFeedback(feedback, scope.row, i)"
type="success" type="success"
style="margin-left: 20rpx" style="margin-left: 20rpx"
size="mini" size="mini"
...@@ -265,7 +269,7 @@ ...@@ -265,7 +269,7 @@
</template> </template>
<template slot="peration" slot-scope="scope"> <template slot="peration" slot-scope="scope">
<!-- {{ scope.row }} --> <!-- {{ scope.row }} -->
<u-button @tap="handleSubmitPackageFeedback(feedback, scope.row)" type="success" style="margin-left: 20rpx" size="mini">打印/报工</u-button> <u-button @tap="handleSubmitPackageFeedback(feedback, scope.row, i)" type="success" style="margin-left: 20rpx" size="mini">打印/报工</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>
...@@ -283,7 +287,7 @@ ...@@ -283,7 +287,7 @@
</template> </template>
<template slot="peration" slot-scope="scope"> <template slot="peration" slot-scope="scope">
<!-- {{ scope.row }} --> <!-- {{ scope.row }} -->
<u-button @tap="handleSubmitPackageFeedback(feedback, scope.row)" type="success" style="margin-left: 20rpx" size="mini">打印/报工</u-button> <u-button @tap="handleSubmitPackageFeedback(feedback, scope.row, i)" type="success" style="margin-left: 20rpx" size="mini">打印/报工</u-button>
</template> </template>
</zb-table> </zb-table>
</view> </view>
...@@ -859,7 +863,6 @@ import UButton from '../../../uview-ui/components/u-button/u-button.vue'; ...@@ -859,7 +863,6 @@ import UButton from '../../../uview-ui/components/u-button/u-button.vue';
import cameraAuthMixin from '@/components/AppScan/appScanMixins.js'; import cameraAuthMixin from '@/components/AppScan/appScanMixins.js';
import { handleError } from 'vue'; import { handleError } from 'vue';
import AppScan from '../../../components/AppScan/AppScan.vue'; import AppScan from '../../../components/AppScan/AppScan.vue';
import { debounce } from '@/utils/ruoyi';
export default { export default {
name: 'ProdReport', name: 'ProdReport',
dicts: ['pro_pack_type', 'sap_yes_no'], dicts: ['pro_pack_type', 'sap_yes_no'],
...@@ -1376,10 +1379,10 @@ export default { ...@@ -1376,10 +1379,10 @@ export default {
}, },
methods: { methods: {
handleChangePackNum(feedback, i) { handleChangePackNum(feedback, i) {
if (this.getWorkorderDirectiveLoading) { // if (this.getWorkorderDirectiveLoading) {
return; // return;
} // }
debounce(this.getWorkorderDirectiveList(feedback, i, true), 30000); this.getWorkorderDirectiveList(feedback, i, true)
}, },
handleSubmitConfirmlKnifeTemp() { handleSubmitConfirmlKnifeTemp() {
this.knifeTempVisible = true; this.knifeTempVisible = true;
...@@ -2149,11 +2152,12 @@ export default { ...@@ -2149,11 +2152,12 @@ export default {
} }
}); });
}, },
handleSubmitPackageFeedback(item, row) { handleSubmitPackageFeedback(item, row, i) {
if (item.printTemplate && !this.vuex_printConnect) { if (item.printTemplate && !this.vuex_printConnect) {
this.$u.toast('打印机连接失败'); this.$u.toast('打印机连接失败');
return; return;
} }
item.feedbackTime = this.parseTime(new Date())
this.$u.api this.$u.api
.feedBackPackage({ .feedBackPackage({
taskWorkunitId: item.taskWorkunitId, taskWorkunitId: item.taskWorkunitId,
...@@ -2191,6 +2195,7 @@ export default { ...@@ -2191,6 +2195,7 @@ export default {
} }
if (!res.msg) { if (!res.msg) {
this.$u.toast('上报成功'); this.$u.toast('上报成功');
this.getWorkorderDirectiveList(item, i)
} else { } else {
this.$u.toast(res.msg); this.$u.toast(res.msg);
} }
......
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