Merge remote-tracking branch 'origin/master'

src/views/mes/report/proAssistTable/index.vue

@@ -2,7 +2,7 @@
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
 			<el-form-item label="生产日期" prop="productDateStr" width="100px">
-				<el-date-picker 
+				<el-date-picker
 					v-model="queryParams.productDateStr"
 					type="date"
 					value-format="yyyy-MM-dd"
@@ -78,10 +78,12 @@
 				<el-table-column label="用人" align="center" prop="groupleaderQty" />
 				<el-table-column label="工时" align="center" prop="groupLeaderHour" />
 			</el-table-column>
+			<!--
 			<el-table-column label="物料员" align="center">
 				<el-table-column label="用人" align="center" prop="materialQty" />
 				<el-table-column label="工时" align="center" prop="materialHour" />
 			</el-table-column>
+			-->
 			<el-table-column label="药管员" align="center">
 				<el-table-column label="用人" align="center" prop="pillMgrQty" />
 				<el-table-column label="工时" align="center" prop="pillMgrHour" />
@@ -91,7 +93,7 @@
 				<el-table-column label="工时" align="center" prop="pillDisHour" />
 			</el-table-column>
 		</el-table>
-        
+
 		<!--
 		<pagination
 			v-show="total>0"
@@ -165,7 +167,7 @@ export default {
 	},
 	created() {
 		this.getDate();
-		
+
 	},
 	methods: {
 		/**获取默认查询时间段**/

src/views/quality/productReport/index.vue

@@ -170,7 +170,7 @@
 						<el-descriptions-item label="报检日期" class="my-description-item3">{{form.createTime}}</el-descriptions-item>
 
 						<el-descriptions-item label="生产批号" class="my-description-item1">{{form.incomeBatchNo}}</el-descriptions-item>
-						<el-descriptions-item label="检验依据" class="my-description-item2">09JS08S-048B</el-descriptions-item><!--{{form.standardNo}}-->
+						<el-descriptions-item label="检验依据" class="my-description-item2">{{form.standardNo}}</el-descriptions-item>
 						<el-descriptions-item label="检验日期" class="my-description-item3">{{form.checkTime}}</el-descriptions-item>
 					</el-descriptions>
 					<el-row class="border-row">