Merge remote-tracking branch 'origin/master' into master

src/views/device/sparepartsInOutStorage/index.vue

@@ -240,7 +240,6 @@
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
-      :pageSizes="[50,100,200,500]"
       @pagination="getList"
     />
 

src/views/mes/dailyReportNew/index.vue

@@ -138,6 +138,11 @@
 				label="影响效率原因"
 				width="120" :show-overflow-tooltip="true">
 			</el-table-column>
+      <el-table-column
+        prop="useManRemark"
+        label="用人情况说明"
+        width="120" :show-overflow-tooltip="true">
+      </el-table-column>
 		</el-table>
 		<pagination
 			v-show="total>0"

src/views/quality/qcTableIncome/index.vue

@@ -72,7 +72,7 @@
 						<el-table-column label="合格批次" align="center" prop="okBatchs" width="100"/>
 						<el-table-column label="不合格批次" align="center" prop="noOkBatchs" width="100"/>
 						<el-table-column label="批次不良率" align="center" prop="noOkBatchRate" width="100"/>
-						<el-table-column label="总数量" align="center" prop="nums" width="90"/>
+						<el-table-column label="总数量" align="center" prop="nums" width="90" />
 						<el-table-column label="合格数量" align="center" prop="okNums" width="100"/>
 						<el-table-column label="不合格数量" align="center" prop="noOkNums" width="100"/>
 						<el-table-column label="数量不良率" align="center" prop="noOkNumRate" width="100"/>

src/views/quality/report/cpDefect/index.vue

@@ -85,7 +85,7 @@ export default {
 				productName: null,
 				productSpc: null,
 				productDate: null,
-				checkType: 'checkTypeCPCJ'
+				checkType: 'checkTypeCPPC'
 			},
 			// 表单参数
 			form: {},