diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue
index b52639d..04be22c 100644
--- a/src/views/device/repairOrder/index.vue
+++ b/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"
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index b77d662..b82f268 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -437,8 +437,8 @@
 				</el-tab-pane>
 			</el-tabs>
 			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="cancel" v-if="optType == 'view'">返回</el-button>
-				<el-button type="primary" :disabled="loading" @click="submitReport" v-else>确 定</el-button>
+<!--				<el-button type="primary" @click="cancel" v-hasPermi="['mes:reportWork:report']" v-if="optType == 'view'">返回</el-button>-->
+				<el-button type="primary" :disabled="loading" @click="submitReport"  v-hasPermi="['mes:reportWork:submit']">确 定</el-button>
 				<el-button @click="cancel">取 消</el-button>
 			</div>
 		</el-dialog>
@@ -1000,14 +1000,14 @@ export default {
     },
     // 取消按钮
     cancel() {
-      window.location.reload();
+     // window.location.reload();
       this.open = false;
       this.openReport = false;
       this.openReportSAP = false;
       this.openConsume = false;
       this.loading = false;
       this.reset();
-      this.getList();
+     // this.getList();
     },
     getSummaries(param) {
       const { columns, data } = param;
diff --git a/src/views/quality/qcTableIncome/index.vue b/src/views/quality/qcTableIncome/index.vue
index a06637b..bd621cb 100644
--- a/src/views/quality/qcTableIncome/index.vue
+++ b/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>
@@ -81,7 +90,7 @@
 				</el-tab-pane>
 			</el-tabs>
 
-		
+
 			<!--供应商选择弹窗-->
 			<ItemSelectSupplier
 				ref="itemSelectSupplier"
@@ -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: '',
@@ -148,7 +159,7 @@ export default {
 		this.getIncomeChartList()
 	},
 	created() {
-		
+
 	},
 	methods: {
 		handleClick(){
@@ -191,7 +202,7 @@ export default {
 					}
 				},
 				series: [
-					{   
+					{
 						name:'成品包装不良率%',
 						data: ydata,
 						type: 'bar',
@@ -218,7 +229,7 @@ export default {
 				]
 				};
 
-				optionGys && myChartGys.setOption(optionGys);	
+				optionGys && myChartGys.setOption(optionGys);
 		},
         /**获取默认查询时间段**/
 		getDate() {
@@ -437,4 +448,4 @@ export default {
 
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/quality/sjAnalysisReport/index.vue b/src/views/quality/sjAnalysisReport/index.vue
index 27cf76c..03b026e 100644
--- a/src/views/quality/sjAnalysisReport/index.vue
+++ b/src/views/quality/sjAnalysisReport/index.vue
@@ -22,7 +22,7 @@
 				</el-select>
 			</el-form-item>
 			<el-form-item v-show="queryParams.ymdms=='yyyy'" label="检验时间">
-				<el-date-picker				
+				<el-date-picker
 				v-model="queryParams.incomeTimeStr"
 				style="width: 230px"
 				type="year"
@@ -38,8 +38,8 @@
 				<el-date-picker v-model="queryParams.incomeTimeStr" size="small" style="width: 230px" type="date" value-format="yyyy-MM-dd" placeholder="选择检验时间"
 				/>
 			</el-form-item>
-			
-			
+
+
 			<el-form-item>
 				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
 				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -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>
@@ -139,7 +139,7 @@ export default {
 				checkType:'checkTypeSC',
 				ymdms: 'dd',
 				incomeTimeStr: moment().format('YYYY-MM-DD'),
-				
+
 			},
 			// 表单参数
 			form: {},
@@ -173,7 +173,7 @@ export default {
 				// },
 			],
 			tableThead:[
-				
+
 			],
 			tableTbody:[],
 			tableBlfx:[],
@@ -188,8 +188,8 @@ export default {
 			this.getTbody()
 			this.getBlfx()
 		// })
-		
-	
+
+
 
 	},
 	created() {
@@ -205,7 +205,7 @@ export default {
 			let res=await getTableHzTitleTh({checkType:'checkTypeSC'})
 			console.log('resTh',res)
 			this.tableThead=res.columns1
-			
+
 		},
 		async getTbody(){
 			this.loading=true
@@ -221,7 +221,7 @@ export default {
 			res.map((item,index)=>{
 				xData.push(item.timeCol),
 				yData.push(item.noOkRate)
-				
+
 			})
 			console.log('tableTbody',this.tableTbody)
 			this.loading=false
@@ -294,7 +294,7 @@ export default {
 						rotate: _this.queryParams.ymdms=='dd'?0:50,
 						fontSize:11
 					},
-					
+
 					data: xData
 				},
 				yAxis: {
@@ -309,7 +309,7 @@ export default {
 					}
 				},
 				series: [
-					{   
+					{
 						name:'成品包装不良率%',
 						data: yData,
 						type: 'line',
@@ -337,7 +337,7 @@ export default {
 				]
 				};
 
-				optionj && myChartj.setOption(optionj);	
+				optionj && myChartj.setOption(optionj);
 		},
 		getEchartsTj(xdata,ydata){
 			var chartDomj = document.getElementById('echartTsj');
@@ -358,7 +358,7 @@ export default {
 						show:false,
 						inside:true,
 					},
-					
+
 					data: xdata
 				},
 				yAxis: {
@@ -368,7 +368,7 @@ export default {
 					},
 				},
 				series: [
-					{   
+					{
 						name:'成品包装不良率%',
 						data: ydata,
 						type: 'bar',
@@ -395,7 +395,7 @@ export default {
 				]
 				};
 
-				option2j && myChart2j.setOption(option2j);	
+				option2j && myChart2j.setOption(option2j);
 		},
 		getechartsThj(peiData){
 			console.log('peiData',peiData)
@@ -443,7 +443,7 @@ export default {
 					}
 				]
 			}
-			option3j && myChart3j.setOption(option3j);	
+			option3j && myChart3j.setOption(option3j);
 		},
 		// 表单重置
 		reset() {
@@ -478,7 +478,7 @@ export default {
 			this.getThead()
 			this.getTbody()
 			this.getBlfx()
-			
+
 		},
 		/** 重置按钮操作 */
 		resetQuery() {
@@ -528,7 +528,7 @@ export default {
 			padding: 5px 0px;
 			font-weight: 600;
 		}
-	}	
+	}
 	.top-right-table{
 		display: flex;
 		justify-content: space-between;
@@ -552,7 +552,7 @@ export default {
 				font-weight: 600;
 			}
 		}
-		
+
 	}
 }
 .bottom-echart{
@@ -619,4 +619,4 @@ export default {
 
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/wms/supplier/index.vue b/src/views/wms/supplier/index.vue
index 475b553..7c1903f 100644
--- a/src/views/wms/supplier/index.vue
+++ b/src/views/wms/supplier/index.vue
@@ -24,62 +24,64 @@
           @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-input
-					v-model="queryParams.accountNumber"
-					placeholder="请输入账号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="证照编码" prop="licenceNumber">
-				<el-input
-					v-model="queryParams.licenceNumber"
-					placeholder="请输入证照编码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="省" prop="province">
-				<el-input
-					v-model="queryParams.province"
-					placeholder="请输入省"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="市" prop="city">
-				<el-input
-					v-model="queryParams.city"
-					placeholder="请输入市"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="区" prop="area">
-				<el-input
-					v-model="queryParams.area"
-					placeholder="请输入区"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="邮编" prop="postcode">
-				<el-input
-					v-model="queryParams.postcode"
-					placeholder="请输入邮编"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item> -->
+      <!-- <el-form-item label="账号" prop="accountNumber">
+        <el-input
+          v-model="queryParams.accountNumber"
+          placeholder="请输入账号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="证照编码" prop="licenceNumber">
+        <el-input
+          v-model="queryParams.licenceNumber"
+          placeholder="请输入证照编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="省" prop="province">
+        <el-input
+          v-model="queryParams.province"
+          placeholder="请输入省"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="市" prop="city">
+        <el-input
+          v-model="queryParams.city"
+          placeholder="请输入市"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="区" prop="area">
+        <el-input
+          v-model="queryParams.area"
+          placeholder="请输入区"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="邮编" prop="postcode">
+        <el-input
+          v-model="queryParams.postcode"
+          placeholder="请输入邮编"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
       <el-form-item label="联系人电话" prop="contactPhone">
         <el-input
           v-model="queryParams.contactPhone"
@@ -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,12 +457,20 @@
 				</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-input v-model="form.remark" placeholder="请输入备注" />
-				</el-form-item> -->
+        <!--<el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item> -->
         <!-- </el-col>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -476,6 +492,7 @@ import {
 
 export default {
   name: "Supplier",
+  dicts: ["order_type_ll"],
   data() {
     return {
       // 遮罩层