Merge branch 'dev' into test

src/views/produce/components/jobBooking/components/jobDdBom.vue

@@ -32,7 +32,7 @@
                 <!-- v-if="(clientEnvironmentId == 3 && item.singleReport == 0) ||  taskObj.type == 4 || clientEnvironmentId == 2" -->
                 <div class="item rx-sc">
                     <div class="rx ww40">
-                        <div class="lable lable100 rx-cc">合格品数量111</div>
+                        <div class="lable lable100 rx-cc">合格品数量</div>
                         <div class="content content_num rx-sc">
                             <el-input size="mini" v-model.number="item.workReportInfo.formedNum" placeholder="请输入合格品数量"
                                 @input="blurNum">