Commit 881919ab authored by 张海景's avatar 张海景

update:修改生产工单和刀模板上下机传参

parent 92176c5f
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<!-- 是否包装工序isPackage为1是 --> <!-- 是否包装工序isPackage为1是 -->
<scroll-view style="max-height: 600px" scroll-y="true" class="scroll-Y"> <scroll-view style="max-height: 600px" scroll-y="true" class="scroll-Y">
<view class="feedback-card" v-for="(feedback, i) in feedbackForms" :key="i+'taskWorkunitId'"> <view class="feedback-card" v-for="(feedback, i) in feedbackForms" :key="i+feedback.id">
<view v-if="feedback.isPackage === '1'" > <view v-if="feedback.isPackage === '1'" >
<u-form label-width="80px" :model="feedback" :rules="rules" labelAlign="right"> <u-form label-width="80px" :model="feedback" :rules="rules" labelAlign="right">
<u-row> <u-row>
...@@ -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="getWorkorderDirectiveList(feedback, i,true)"></u-number-box> <u-number-box :min="0" v-model="feedback.packNum" @blur="handleChangePackNum(feedback, i)"></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="getWorkorderDirectiveList(feedback, i,true)"></u-number-box> <u-number-box :min="0" v-model="feedback.encasementNum" @blur="handleChangePackNum(feedback, i)"></u-number-box>
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="6"> <u-col span="6">
...@@ -856,6 +856,7 @@ import UButton from '../../../uview-ui/components/u-button/u-button.vue'; ...@@ -856,6 +856,7 @@ 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'],
...@@ -873,6 +874,7 @@ export default { ...@@ -873,6 +874,7 @@ export default {
}, },
data() { data() {
return { return {
getWorkorderDirectiveLoading: false,
tableOrderColumn: [ tableOrderColumn: [
{ {
name: 'quantity', name: 'quantity',
...@@ -954,7 +956,6 @@ export default { ...@@ -954,7 +956,6 @@ export default {
slot: 'peration' slot: 'peration'
} }
], ],
userVisible: false, userVisible: false,
useData: {}, useData: {},
ProogingSpecificationSheetForm: {}, ProogingSpecificationSheetForm: {},
...@@ -1371,6 +1372,12 @@ export default { ...@@ -1371,6 +1372,12 @@ export default {
uni.$off('taskStatusChanged'); uni.$off('taskStatusChanged');
}, },
methods: { methods: {
handleChangePackNum(feedback, i) {
if (this.getWorkorderDirectiveLoading) {
return
}
debounce(this.getWorkorderDirectiveList(feedback, i,true), 30000)
},
handleSubmitConfirmlKnifeTemp() { handleSubmitConfirmlKnifeTemp() {
this.knifeTempVisible = true this.knifeTempVisible = true
this.$refs.appScan.closed() this.$refs.appScan.closed()
...@@ -1391,8 +1398,8 @@ export default { ...@@ -1391,8 +1398,8 @@ export default {
this.getPemissionScan() this.getPemissionScan()
}, },
handleUpdateKnifeTemp(code) { handleUpdateKnifeTemp(code) {
console.log(this.knifeTempType, code, 'code---handleUpdateKnifeTemp') console.log({ type: this.knifeTempType, sn: code, task_workunt_id: this.tableSelectData[0].taskWorkunitId }, code, 'code---handleUpdateKnifeTemp')
this.$u.api.dModel.tmToolMachinesScancode({ type: this.knifeTempType, sn: code }).then((res) => { this.$u.api.dModel.tmToolMachinesScancode({ type: this.knifeTempType, sn: code, task_workunt_id: this.tableSelectData[0].taskWorkunitId }).then((res) => {
console.log(res, 'res333') console.log(res, 'res333')
if (res.code === 200) { if (res.code === 200) {
this.$u.toast(this.knifeTempType === '1'? '上机成功': '下机成功') this.$u.toast(this.knifeTempType === '1'? '上机成功': '下机成功')
...@@ -2061,6 +2068,7 @@ export default { ...@@ -2061,6 +2068,7 @@ export default {
}, },
// 获取指令列表 // 获取指令列表
getWorkorderDirectiveList(rows, index, flag) { getWorkorderDirectiveList(rows, index, flag) {
this.getWorkorderDirectiveLoading = true
let row = this.feedbackForms[index]; let row = this.feedbackForms[index];
this.$u.api this.$u.api
.workOrderSoDirectiveApi({ .workOrderSoDirectiveApi({
...@@ -2073,6 +2081,7 @@ export default { ...@@ -2073,6 +2081,7 @@ export default {
}) })
.then((res) => { .then((res) => {
console.log(res, '88999res'); console.log(res, '88999res');
this.getWorkorderDirectiveLoading = false
if (res.code === 200) { if (res.code === 200) {
this.copyFeedBackForms = JSON.parse(JSON.stringify(this.feedbackForms)) this.copyFeedBackForms = JSON.parse(JSON.stringify(this.feedbackForms))
console.log(this.copyFeedBackForms,'this.copyFeedBackForms88999') console.log(this.copyFeedBackForms,'this.copyFeedBackForms88999')
...@@ -2126,10 +2135,10 @@ export default { ...@@ -2126,10 +2135,10 @@ export default {
if (flag) { if (flag) {
console.log(this.copyFeedBackForms,'this.copyFeedBackForms') console.log(this.copyFeedBackForms,'this.copyFeedBackForms')
// this.$set(this.feedbackForms, index, this.copyFeedBackForms[index]) // this.$set(this.feedbackForms, index, this.copyFeedBackForms[index])
this.$set(rows, 'packNum', this.copyFeedBackForms[index].packNum) this.$set(this.feedbackForms[index], 'packNum', this.copyFeedBackForms[index].packNum)
this.$set(rows, 'encasementNum', this.copyFeedBackForms[index].encasementNum) this.$set(this.feedbackForms[index], 'encasementNum', this.copyFeedBackForms[index].encasementNum)
this.$set(rows, 'mergePack', this.copyFeedBackForms[index].mergePack) this.$set(this.feedbackForms[index], 'mergePack', this.copyFeedBackForms[index].mergePack)
console.log(rows, '889row') console.log(this.feedbackForms[index], '889row')
} }
console.log(88999) console.log(88999)
} }
......
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