Commit 3fa4a948 authored by 李驰骋's avatar 李驰骋

弹出表格显示调整

parent 97a0ed43
...@@ -214,8 +214,6 @@ ...@@ -214,8 +214,6 @@
<uni-th width="65px" align="center">状态</uni-th> <uni-th width="65px" align="center">状态</uni-th>
<uni-th width="110px" align="center">产品物料编码</uni-th> <uni-th width="110px" align="center">产品物料编码</uni-th>
<uni-th width="110px" align="center">产品物料名称</uni-th> <uni-th width="110px" align="center">产品物料名称</uni-th>
<uni-th width="150px" align="center">规格型号</uni-th>
<uni-th width="60px" align="center">单位</uni-th>
<uni-th width="80px" align="center">领料数量</uni-th> <uni-th width="80px" align="center">领料数量</uni-th>
<uni-th width="110px" align="center">批次号</uni-th> <uni-th width="110px" align="center">批次号</uni-th>
</uni-tr> </uni-tr>
...@@ -228,9 +226,7 @@ ...@@ -228,9 +226,7 @@
</uni-td> </uni-td>
<uni-td align="center">{{ line.attr3 == 1 ? '校验':'未校验' }}</uni-td> <uni-td align="center">{{ line.attr3 == 1 ? '校验':'未校验' }}</uni-td>
<uni-td align="center">{{ line.itemCode }}</uni-td> <uni-td align="center">{{ line.itemCode }}</uni-td>
<uni-td align="center">{{ line.itemName }}</uni-td> <uni-td align="center">{{ line.itemName }}({{line.specification}})/{{line.unitOfMeasure}}</uni-td>
<uni-td align="center">{{ line.specification}}</uni-td>
<uni-td>{{ line.unitOfMeasure }}</uni-td>
<uni-td align="center">{{ line.quantityIssued }}</uni-td> <uni-td align="center">{{ line.quantityIssued }}</uni-td>
<uni-td align="center">{{ line.batchCode }}</uni-td> <uni-td align="center">{{ line.batchCode }}</uni-td>
</uni-tr> </uni-tr>
...@@ -249,8 +245,6 @@ ...@@ -249,8 +245,6 @@
<uni-th width="100px" align="center">操作</uni-th> <uni-th width="100px" align="center">操作</uni-th>
<uni-th width="110px" align="center">产品物料编码</uni-th> <uni-th width="110px" align="center">产品物料编码</uni-th>
<uni-th width="110px" align="center">产品物料名称</uni-th> <uni-th width="110px" align="center">产品物料名称</uni-th>
<uni-th width="150px" align="center">规格型号</uni-th>
<uni-th width="60px" align="center">单位</uni-th>
<uni-th width="110px" align="center">批次号</uni-th> <uni-th width="110px" align="center">批次号</uni-th>
<uni-th width="100px" align="center">备注</uni-th> <uni-th width="100px" align="center">备注</uni-th>
</uni-tr> </uni-tr>
...@@ -262,9 +256,7 @@ ...@@ -262,9 +256,7 @@
</view> </view>
</uni-td> </uni-td>
<uni-td align="center">{{ line.itemCode }}</uni-td> <uni-td align="center">{{ line.itemCode }}</uni-td>
<uni-td align="center">{{ line.itemName }}</uni-td> <uni-td align="center">{{ line.itemName }}({{line.specification}})/{{line.unitOfMeasure}}</uni-td>
<uni-td align="center">{{ line.specification}}</uni-td>
<uni-td>{{ line.unitOfMeasure }}</uni-td>
<uni-td align="center">{{ line.batchNo }}</uni-td> <uni-td align="center">{{ line.batchNo }}</uni-td>
<uni-td align="center">{{ line.remark }}</uni-td> <uni-td align="center">{{ line.remark }}</uni-td>
</uni-tr> </uni-tr>
...@@ -283,8 +275,6 @@ ...@@ -283,8 +275,6 @@
<uni-th width="100px" align="center">操作</uni-th> <uni-th width="100px" align="center">操作</uni-th>
<uni-th width="110px" align="center">产品物料编码</uni-th> <uni-th width="110px" align="center">产品物料编码</uni-th>
<uni-th width="110px" align="center">产品物料名称</uni-th> <uni-th width="110px" align="center">产品物料名称</uni-th>
<uni-th width="150px" align="center">规格型号</uni-th>
<uni-th width="60px" align="center">单位</uni-th>
<uni-th width="80px" align="center">领取数量</uni-th> <uni-th width="80px" align="center">领取数量</uni-th>
</uni-tr> </uni-tr>
<uni-tr v-for="(line,index) in materialRequestList" :key="index"> <uni-tr v-for="(line,index) in materialRequestList" :key="index">
...@@ -295,9 +285,7 @@ ...@@ -295,9 +285,7 @@
</view> </view>
</uni-td> </uni-td>
<uni-td align="center">{{ line.itemCode }}</uni-td> <uni-td align="center">{{ line.itemCode }}</uni-td>
<uni-td align="center">{{ line.itemName }}</uni-td> <uni-td align="center">{{ line.itemName }}({{line.specification}})/{{line.unitOfMeasure}}</uni-td>
<uni-td align="center">{{ line.specification}}</uni-td>
<uni-td>{{ line.unitOfMeasure }}</uni-td>
<uni-td align="center">{{line.applyNum}}</uni-td> <uni-td align="center">{{line.applyNum}}</uni-td>
</uni-tr> </uni-tr>
</uni-table> </uni-table>
...@@ -338,8 +326,6 @@ ...@@ -338,8 +326,6 @@
<uni-th width="100px" align="center">操作</uni-th> <uni-th width="100px" align="center">操作</uni-th>
<uni-th width="110px" align="center">产品物料编码</uni-th> <uni-th width="110px" align="center">产品物料编码</uni-th>
<uni-th width="110px" align="center">产品物料名称</uni-th> <uni-th width="110px" align="center">产品物料名称</uni-th>
<uni-th width="150px" align="center">规格型号</uni-th>
<uni-th width="60px" align="center">单位</uni-th>
<uni-th width="80px" align="center">领料数量</uni-th> <uni-th width="80px" align="center">领料数量</uni-th>
<uni-th width="80px" align="center">退料数量</uni-th> <uni-th width="80px" align="center">退料数量</uni-th>
<uni-th width="110px" align="center">批次号</uni-th> <uni-th width="110px" align="center">批次号</uni-th>
...@@ -352,9 +338,7 @@ ...@@ -352,9 +338,7 @@
</view> </view>
</uni-td> </uni-td>
<uni-td align="center">{{ line.itemCode }}</uni-td> <uni-td align="center">{{ line.itemCode }}</uni-td>
<uni-td align="center">{{ line.itemName }}</uni-td> <uni-td align="center">{{ line.itemName }}({{line.specification}})/{{line.unitOfMeasure}}</uni-td>
<uni-td align="center">{{ line.specification}}</uni-td>
<uni-td>{{ line.unitOfMeasure }}</uni-td>
<uni-td align="center">{{ line.quantityIssued }}</uni-td> <uni-td align="center">{{ line.quantityIssued }}</uni-td>
<uni-td align="center">{{ line.applyNum }}</uni-td> <uni-td align="center">{{ line.applyNum }}</uni-td>
<uni-td align="center">{{ line.batchCode }}</uni-td> <uni-td align="center">{{ line.batchCode }}</uni-td>
...@@ -1210,7 +1194,8 @@ export default { ...@@ -1210,7 +1194,8 @@ export default {
rst.push({ rst.push({
"itemId":s.itemId, "itemId":s.itemId,
"taskId":taskInfo.taskId, "taskId":taskInfo.taskId,
"applyNum":s.applyNum "applyNum":s.applyNum,
"applyType":1
}); });
} }
}); });
...@@ -1251,7 +1236,9 @@ export default { ...@@ -1251,7 +1236,9 @@ export default {
"taskId":taskInfo.taskId, "taskId":taskInfo.taskId,
"backNum":s.applyNum, "backNum":s.applyNum,
"issueLineId":s.lineId, "issueLineId":s.lineId,
"workOrderId":s.workorderId "workOrderId":s.workorderId,
"batchNo":s.batchCode,
"packNo":s.packNo
}); });
} }
}); });
......
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