Commit e4096d8c authored by 张海景's avatar 张海景

update:修改生产工单

parent 0f255876
...@@ -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"> <view class="feedback-card" v-for="(feedback, i) in feedbackForms" :key="i+'taskWorkunitId'">
<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>
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
</u-col> </u-col>
<u-col span="4"> <u-col span="4">
<u-form-item label="不良品数量:" prop="quantityUnqualify"> <u-form-item label="不良品数量:" prop="quantityUnqualify">
<u-number-box :min="0" @change="quantityChanged" v-model="feedback.quantityUnqualify"></u-number-box> <u-number-box :min="0" v-model="feedback.quantityUnqualify"></u-number-box>
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="4"> <u-col span="4">
...@@ -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"></u-number-box> <u-number-box :min="0" v-model="feedback.packNum" @blur="getWorkorderDirectiveList(feedback, i,true)"></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"></u-number-box> <u-number-box :min="0" v-model="feedback.encasementNum" @blur="getWorkorderDirectiveList(feedback, i,true)"></u-number-box>
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="6"> <u-col span="6">
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
<u-col span="6"> <u-col span="6">
<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"> <u-radio-group v-model="feedback.mergePack" @change="getWorkorderDirectiveList(feedback, i,true)">
<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>
...@@ -1325,7 +1325,8 @@ export default { ...@@ -1325,7 +1325,8 @@ export default {
], ],
tableDataDetail: [], tableDataDetail: [],
showRowDeatilFlag: false, showRowDeatilFlag: false,
loading: false loading: false,
copyFeedBackForms: []
}; };
}, },
mounted() { mounted() {
...@@ -1675,6 +1676,8 @@ export default { ...@@ -1675,6 +1676,8 @@ export default {
return; return;
} else { } else {
if (row.isPackage === '1') { if (row.isPackage === '1') {
row.packNum = items.usagePackNum
row.encasementNum = items.usageEncasementNum
this.getWorkorderDirectiveList(id, index); this.getWorkorderDirectiveList(id, index);
} }
} }
...@@ -2032,7 +2035,8 @@ export default { ...@@ -2032,7 +2035,8 @@ export default {
tableDirectiveData: [], tableDirectiveData: [],
currentTabPro: 0, currentTabPro: 0,
packNum:0, packNum:0,
encasementNum: 0 encasementNum: 0,
mergePack: 0
}; };
this.getWorkorderWithSizeAndDirective(feedback, index); this.getWorkorderWithSizeAndDirective(feedback, index);
this.feedbackForms.push(feedback); this.feedbackForms.push(feedback);
...@@ -2046,7 +2050,7 @@ export default { ...@@ -2046,7 +2050,7 @@ export default {
this.proVisible = true; this.proVisible = true;
}, },
// 获取指令列表 // 获取指令列表
getWorkorderDirectiveList(id, index) { getWorkorderDirectiveList(rows, index, flag) {
let row = this.feedbackForms[index]; let row = this.feedbackForms[index];
this.$u.api this.$u.api
.workOrderSoDirectiveApi({ .workOrderSoDirectiveApi({
...@@ -2059,6 +2063,8 @@ export default { ...@@ -2059,6 +2063,8 @@ export default {
.then((res) => { .then((res) => {
console.log(res, '88999res'); console.log(res, '88999res');
if (res.code === 200) { if (res.code === 200) {
this.copyFeedBackForms = JSON.parse(JSON.stringify(this.feedbackForms))
console.log(this.copyFeedBackForms,'this.copyFeedBackForms88999')
if(res.data.directiveList) { if(res.data.directiveList) {
row.tableDirectiveData = res.data.directiveList.map(item => { row.tableDirectiveData = res.data.directiveList.map(item => {
return { return {
...@@ -2105,8 +2111,18 @@ export default { ...@@ -2105,8 +2111,18 @@ export default {
} else { } else {
row.tableSizeData = [] row.tableSizeData = []
} }
} else {
if (flag) {
console.log(this.copyFeedBackForms,'this.copyFeedBackForms')
// this.$set(this.feedbackForms, index, this.copyFeedBackForms[index])
this.$set(rows, 'packNum', this.copyFeedBackForms[index].packNum)
this.$set(rows, 'encasementNum', this.copyFeedBackForms[index].encasementNum)
this.$set(rows, 'mergePack', this.copyFeedBackForms[index].mergePack)
console.log(rows, '889row')
}
console.log(88999)
} }
}); })
}, },
handleSubmitPackageFeedback(item, row) { handleSubmitPackageFeedback(item, row) {
if ((item.printTemplate) && !this.vuex_printConnect) { if ((item.printTemplate) && !this.vuex_printConnect) {
...@@ -2132,7 +2148,8 @@ export default { ...@@ -2132,7 +2148,8 @@ export default {
}) })
.then((res) => { .then((res) => {
if (res.code === 200) { if (res.code === 200) {
this.proVisible = false; // this.proVisible = false;
item.quantityUnqualify = 0
if (item.printTemplate) { if (item.printTemplate) {
let params = {}; let params = {};
res.data.forEach((datas) => { res.data.forEach((datas) => {
......
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