质量和生产报表优化、白坯单位bug

src/views/mes/dailyReportNew/index.vue

@@ -85,13 +85,13 @@
 		>
       <el-table-column prop="factoryCode"  label="工厂" width="90"/>
       <el-table-column prop="workshopCode" label="车间编码" width="90"/>
-      <el-table-column prop="workshopName" label="车间名称" width="90"/>
+      <!--<el-table-column prop="workshopName" label="车间名称" width="90"/>-->
       <el-table-column prop="productDate" label="日期" width="100"/>
       <el-table-column prop="sapCode" label="产线编码" width="90"/>
-      <el-table-column prop="sapName" label="产线名称" width="160"/>
+      <!--<el-table-column prop="sapName" label="产线名称" width="160"/>-->
 			<el-table-column prop="equipmentName" label="组别" width="90"/>
 			<el-table-column prop="prodType" label="品类" width="80"/>
-			<el-table-column prop="teamLeaderName" label="组长" width="100"/>
+			<el-table-column prop="teamLeaderName" label="组长" width="100" :formatter="teamLeaderFormate"/>
             <el-table-column prop="workorderCode" label="工单号" width="150"/>
 			<el-table-column prop="productCode"	label="产品编码" width="120" :formatter="productCodeFormate"/>
 			<el-table-column prop="productName" label="产品名称" width="200"/>
@@ -251,6 +251,11 @@ export default {
 				return cellValue.slice(7,18);  //返回值
 			}
 		},
+		teamLeaderFormate(row, column, cellValue){
+			if(cellValue != null){
+				return cellValue.split("-")[0];  //返回值
+			}
+		},
 		/** 搜索按钮操作 */
 		handleQuery() {
 			this.queryParams.pageNum = 1;

src/views/quality/produceReport/index.vue

@@ -656,7 +656,13 @@
 					<el-row>
 						<el-col :span="20">
 							<el-form-item label="综合结论："  label-width="160px">
-								<el-input type="textarea" disabled/>
+								 <el-col :span="6">
+									<span v-if="this.checkResult=='Y'">√合格</span>
+									<span label="N" v-else>×不合格</span>
+								</el-col>
+								<el-col :span="8">
+									备注:判定合格打“√”，不合格打“×”
+								</el-col>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -739,6 +745,7 @@ export default {
 			validateRules: [],
 			checkList: [],
 			standardNo: null,
+			checkResult: 'Y',
 			printData: {
 				printable: 'printForm',
 				ignore: ['no-print'],
@@ -960,6 +967,7 @@ export default {
 					this.form.ignore = ['no-print'];//打印时需要
 					this.firstReportOpen = true;
 					this.title = "首检检验报告";
+					this.checkResult = response.data.checkResult;
 				})
 				this.queryParams.recordId = recordId;
 				this.getCheckedProjectList();

src/views/quality/productReport/index.vue

@@ -544,7 +544,7 @@ export default {
 				this.checkProjectList0  = itemType0s;
 				this.total = response.total;
 				this.loading = false;
-				this.form.standardNo = this.checkProjectList[0].standardNo;
+				//this.form.standardNo = this.checkProjectList[0].standardNo;
 
 				this.rowspan()
 			});

src/views/quality/qcInventory/selectPutInOrder.vue

@@ -9,10 +9,19 @@
 
       <el-col :span="24" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="left">
-          <el-form-item label="单号">
+          <el-form-item label="物料名称">
             <el-input
-              v-model="queryParams.orderNo"
-              placeholder="单号"
+              v-model="queryParams.materialName"
+              placeholder="物料名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="物料编码">
+            <el-input
+              v-model="queryParams.materialCode"
+              placeholder="物料编码"
               clearable
               style="width: 240px"
               @keyup.enter.native="handleQuery"
@@ -27,8 +36,8 @@
           <el-table-column width="50" align="center" type="selection"/>
           <el-table-column label="单号" align="left"  prop="orderNo" width="120"/>
           
-          <el-table-column label="产品编码"  align="left" prop="materialCode" width="180" />
-          <el-table-column label="产品名称"  align="left" prop="materialName" width="180"/>
+          <el-table-column label="物料编码"  align="left" prop="materialCode" width="180" />
+          <el-table-column label="物料名称"  align="left" prop="materialName" width="180"/>
           <el-table-column label="数量"  align="left" prop="quality" width="100" />
           <el-table-column label="仓库编码"  align="left" prop="supplierCode"/>
           <el-table-column label="仓库编名称"  align="left" prop="supplierName" width="120"/>