增加供应商属性，修改不良分析报表。

src/views/device/repairOrder/index.vue

@@ -423,6 +423,12 @@
         prop="repairMeasures"
         width="300"
       />
+      <el-table-column
+        label="报修时间"
+        align="center"
+        prop="createTime"
+        width="180"
+      />
       <el-table-column
         label="维修开始时间"
         align="center"

src/views/quality/qcTableIncome/index.vue

@@ -9,6 +9,16 @@
 				placeholder="选择月">
 				</el-date-picker>
 			</el-form-item>
+      <el-form-item label="类型" prop="userDefined3">
+        <el-select v-model="queryParams.userDefined3" placeholder="请选择供应商类型" clearable style="width: 100%;">
+          <el-option
+            v-for="dict in dict.type.order_type_ll"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
 			<el-form-item label="供应商" prop="supplierCodeArray">
 				<div class="tagbox">
 					<div class="tag" style="" placeholder="请选择供应商">
@@ -49,7 +59,6 @@
 					icon="el-icon-download"
 					size="mini"
 					@click="handleExport"
-					v-hasPermi="['mes:rfidProcess:export']"
 				>导出</el-button>
 			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -97,6 +106,7 @@ import moment from 'moment';
 import * as echarts from "echarts";
 export default {
 	name: "RfidProcess",
+  dicts: ["order_type_ll"],
 	components: {ItemSelectSupplier},
 	data() {
 		return {
@@ -123,6 +133,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				incomeTimeYM:null,
+        userDefined3:null,
 				pageNum: 1,
 				pageSize: 10,
 				supplierName: '',

src/views/quality/sjAnalysisReport/index.vue

@@ -59,8 +59,8 @@
 						<div class="title">首检数据统计</div>
 						<el-table :data="tableTbody" height="440" :loading="loading" ref="tables">
 							<el-table-column label="时间" align="center" prop="timeCol" min-width="100" fixed="left" />
-							<el-table-column label="抽样数" align="center" prop="sampleQuality" min-width="100" fixed/>
-							<el-table-column label="缺陷不良" align="center"  min-width="100">
+							<el-table-column label="首检批次" align="center" prop="sampleQuality" min-width="100" fixed/>
+							<el-table-column label="不合格原因" align="center"  min-width="100">
 								<template v-for="(column, index) in tableThead">
 									<el-table-column align="center"  :prop="'col'+index" :key="index" :label="column"/>
 								</template>
@@ -83,7 +83,7 @@
 							<div class="title">首检</div>
 							<el-table :data="tableBlfx" height="400">
 								<el-table-column label="时间" align="center" prop="dataType" min-width="100" />
-								<el-table-column label="抽样数" align="center" prop="noOkQuality" min-width="100"/>
+								<el-table-column label="首检批次" align="center" prop="noOkQuality" min-width="100"/>
 								<el-table-column label="不良率" align="center" prop="noOkNumRate" min-width="100">
 									<template slot-scope="scope">
 										<span>{{scope.row.noOkNumRate}}%</span>

src/views/wms/supplier/index.vue

@@ -24,15 +24,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="英文描述" prop="enDesc">
-				<el-input
-					v-model="queryParams.enDesc"
-					placeholder="请输入英文描述"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
+      <el-form-item label="供应商类型" prop="userDefined3">
+        <el-select v-model="queryParams.userDefined3" placeholder="请选择供应商类型" clearable style="width: 100%;">
+          <el-option
+            v-for="dict in dict.type.order_type_ll"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
 			</el-form-item>
-			<el-form-item label="账号" prop="accountNumber">
+      <!-- <el-form-item label="账号" prop="accountNumber">
         <el-input
           v-model="queryParams.accountNumber"
           placeholder="请输入账号"
@@ -238,6 +240,12 @@
         prop="zhDesc"
         width="350"
       />
+      <el-table-column label="供应商类型" align="center" prop="supplierType" width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.order_type_ll" :value="scope.row.userDefined3" />
+        </template>
+      </el-table-column>
+
       <!-- <el-table-column label="英文描述" align="center" prop="enDesc" />
 			<el-table-column label="供应商类型" align="center" prop="supplierType" width="100"/>
 			<el-table-column label="账号" align="center" prop="accountNumber" width="100"/>
@@ -449,10 +457,18 @@
 				</el-form-item>
                     </el-col>
                     <el-col :span="12"> -->
-        <!-- <el-form-item label="用户自定义3" prop="userDefined3">
-					<el-input v-model="form.userDefined3" placeholder="请输入用户自定义3" />
+         <el-form-item label="供应商类型" prop="userDefined3">
+           <el-select v-model="form.userDefined3" placeholder="请选择供应商类型" style="width: 100%;">
+             <el-option
+               v-for="dict in dict.type.order_type_ll"
+               :key="dict.value"
+               :label="dict.label"
+               :value="dict.value"
+             ></el-option>
+           </el-select>
+<!--					<el-input v-model="form.userDefined3" placeholder="请输入用户自定义3" />-->
 				</el-form-item>
-				<el-form-item label="备注" prop="remark">
+        <!--<el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item> -->
         <!-- </el-col>-->
@@ -476,6 +492,7 @@ import {
 
 export default {
   name: "Supplier",
+  dicts: ["order_type_ll"],
   data() {
     return {
       // 遮罩层