Commit 03fff270 authored by 沈翠玲's avatar 沈翠玲

修改bug

parent a0df847b
...@@ -707,7 +707,6 @@ ...@@ -707,7 +707,6 @@
<uni-th width="100px" align="center">操作</uni-th> <uni-th width="100px" align="center">操作</uni-th>
<uni-th width="150px" align="center">产品物料编码</uni-th> <uni-th width="150px" align="center">产品物料编码</uni-th>
<uni-th width="250px" align="center">产品物料名称</uni-th> <uni-th width="250px" align="center">产品物料名称</uni-th>
<uni-th width="150px" align="center">类型</uni-th>
<uni-th width="170px" align="center">补取数量</uni-th> <uni-th width="170px" align="center">补取数量</uni-th>
</uni-tr> </uni-tr>
<scroll-view scroll-y="true" class="scroll-list" :style="{ height: this.screenHeight/2 - 150 + 'px' }"> <scroll-view scroll-y="true" class="scroll-list" :style="{ height: this.screenHeight/2 - 150 + 'px' }">
...@@ -721,7 +720,6 @@ ...@@ -721,7 +720,6 @@
</uni-td> </uni-td>
<uni-td align="center" style="width: 140px">{{ line.itemCode.substring(line.itemCode.length - 8, line.itemCode.length) }}</uni-td> <uni-td align="center" style="width: 140px">{{ line.itemCode.substring(line.itemCode.length - 8, line.itemCode.length) }}</uni-td>
<uni-td align="center" style="width: 160px">{{ line.itemName }}({{ line.specification }})/{{ line.unitOfMeasure }}</uni-td> <uni-td align="center" style="width: 160px">{{ line.itemName }}({{ line.specification }})/{{ line.unitOfMeasure }}</uni-td>
<uni-td align="center" style="width: 140px">{{ line.isBackflush ==='Y'? '倒冲':'直发' }}</uni-td>
<uni-td align="center" style="width: 150px">{{ line.applyNum }}</uni-td> <uni-td align="center" style="width: 150px">{{ line.applyNum }}</uni-td>
</uni-tr> </uni-tr>
</uni-table> </uni-table>
...@@ -729,9 +727,8 @@ ...@@ -729,9 +727,8 @@
</scroll-view> </scroll-view>
<uni-tr> <uni-tr>
<uni-th width="200px" align="center">申请单号</uni-th> <uni-th width="200px" align="center">申请单号</uni-th>
<uni-th width="200px" align="center">产品物料编码</uni-th> <uni-th width="200px" align="center">产品物料名称</uni-th>
<uni-th width="160px" align="center">申请数量</uni-th> <uni-th width="160px" align="center">申请数量</uni-th>
<uni-th width="150px" align="center">类型</uni-th>
<uni-th width="160px" align="center">状态</uni-th> <uni-th width="160px" align="center">状态</uni-th>
</uni-tr> </uni-tr>
<scroll-view scroll-y="true" class="scroll-list" :style="{ height: this.screenHeight/2 - 200 + 'px' }" > <scroll-view scroll-y="true" class="scroll-list" :style="{ height: this.screenHeight/2 - 200 + 'px' }" >
...@@ -740,7 +737,6 @@ ...@@ -740,7 +737,6 @@
<uni-td align="center" style="width: 125px">{{line.applyNo}}</uni-td> <uni-td align="center" style="width: 125px">{{line.applyNo}}</uni-td>
<uni-td align="center" style="width: 150px">{{ line.sapItemCode.substring(line.sapItemCode.length - 8, line.sapItemCode.length) }}</uni-td> <uni-td align="center" style="width: 150px">{{ line.sapItemCode.substring(line.sapItemCode.length - 8, line.sapItemCode.length) }}</uni-td>
<uni-td align="center" style="width: 100px">{{ line.applyNum }}</uni-td> <uni-td align="center" style="width: 100px">{{ line.applyNum }}</uni-td>
<uni-td align="center" style="width: 140px">{{ line.isBackflush ==='Y'? '倒冲':'直发' }}</uni-td>
<uni-td align="center" style="width: 100px">{{ line.attr1 }}</uni-td> <uni-td align="center" style="width: 100px">{{ line.attr1 }}</uni-td>
</uni-tr> </uni-tr>
</uni-table> </uni-table>
...@@ -2060,6 +2056,7 @@ export default { ...@@ -2060,6 +2056,7 @@ export default {
}) })
} }
} }
this.feedbackForms.push(item);
item.workorderOption = res.rows.map((temp) => { item.workorderOption = res.rows.map((temp) => {
if (temp.saleDirectiveList != null) { if (temp.saleDirectiveList != null) {
item.directiveData[temp.workorderId] = temp.saleDirectiveList.map((temp2) => { item.directiveData[temp.workorderId] = temp.saleDirectiveList.map((temp2) => {
...@@ -2083,6 +2080,7 @@ export default { ...@@ -2083,6 +2080,7 @@ export default {
text: temp.workorderCode text: temp.workorderCode
}; };
}); });
if (item.isPackage === '1' && res.rows.length > 0) { if (item.isPackage === '1' && res.rows.length > 0) {
item.workorderId = res.rows[0].workorderId; item.workorderId = res.rows[0].workorderId;
item.packNum = res.rows[0].usagePackNum ? res.rows[0].usagePackNum : 0; item.packNum = res.rows[0].usagePackNum ? res.rows[0].usagePackNum : 0;
...@@ -2090,7 +2088,6 @@ export default { ...@@ -2090,7 +2088,6 @@ export default {
item.encasementNum = res.rows[0].usageEncasementNum ? res.rows[0].usageEncasementNum : 0; item.encasementNum = res.rows[0].usageEncasementNum ? res.rows[0].usageEncasementNum : 0;
this.getWorkorderDirectiveList(res.rows[0].workorderId, index); this.getWorkorderDirectiveList(res.rows[0].workorderId, index);
} }
this.feedbackForms.push(item);
}).catch(() => { }).catch(() => {
this.feedbackForms.push(item); this.feedbackForms.push(item);
}); });
......
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