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

pages/mes/prodReport/index.vue

@@ -393,6 +393,16 @@
                         v-model="feedback.feedbackTime" />
                     </u-form-item>
                   </u-col>
+				  <u-col span="6">
+				    <u-form-item label="打印:" prop="whether">
+					<view class="uni-list-item__extra">
+					  <u-radio-group v-model="feedback.whether">
+					    <u-radio :name="1">是</u-radio>
+					    <u-radio :name="0">否</u-radio>
+					  </u-radio-group>
+					</view>
+				    </u-form-item>
+				  </u-col>
                 </u-row>
 
                 <!-- <u-row> -->
@@ -2503,8 +2513,14 @@ export default {
                     detail: [
                       {
                         barcode: item.printContents,
-                        gp: item.printContents
-                      }
+					    showText: '单号:'+item.printContents,
+                        gp: 1
+                      },
+					  {
+						barcode: item.printContents,
+						showText: '单号:'+item.printContents,
+						gp: 1
+					  }
                     ]
                   }
                 });