Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev

pages/mes/prodReport/index.vue

@@ -730,6 +730,7 @@
               <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="100px" align="center">版号</uni-th>
               <uni-th width="110px" align="center">批次号</uni-th>
               <uni-th width="60" align="center">合格</uni-th>
             </uni-tr>
@@ -745,6 +746,7 @@
               <uni-td align="center">{{ line.quantityIssued }}</uni-td>
               <uni-td align="center">{{ line.applyNum }}</uni-td>
               <uni-td align="center">{{ line.totalBackNum }}</uni-td>
+			  <uni-td align="center">{{ line.packNo }}</uni-td>
               <uni-td align="center">{{ line.batchCode }}</uni-td>
               <uni-td align="center">{{ line.isQualified == 1 ? '是' : '' }}{{ line.isQualified == 0 ? '否' : ''
                 }}</uni-td>
@@ -2741,7 +2743,8 @@ export default {
         if (this.materialReturnFormData.workorderCode) {
           data.workorderCode = this.materialReturnFormData.workorderCode;
         } else {
-          data.workorderCode = this.curTaskInfo.workorderOption.flatMap((it) => it.value).join(',');
+          // data.workorderCode = this.curTaskInfo.workorderOption.flatMap((it) => it.value).join(',');
+		  data.workorderCode = null;
         }
         return data;
       });