diff --git a/src/api/quality/income.js b/src/api/quality/income.js
index c859d3d5..416fdcd7 100644
--- a/src/api/quality/income.js
+++ b/src/api/quality/income.js
@@ -119,10 +119,11 @@ export function commitActualValue(recordId, actualValues) {
 } 
 
 //审核结果提交
-export function commitCheckResult(recordId,typeCode) {
+export function commitCheckResult(recordId,typeCode,checkType) {
 	const data = {
 		recordId,
-		typeCode
+		typeCode,
+		checkType
 	}
 	return request({
 		url: '/quality/qcIncome/commitCheckResult',
diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue
index b5a91eca..3a0a4379 100644
--- a/src/views/quality/qcIncome/checkProjectType.vue
+++ b/src/views/quality/qcIncome/checkProjectType.vue
@@ -172,7 +172,7 @@ export default {
 
     //提交整体检测结果
     submitBomForm() {
-      commitCheckResult(this.queryParams.belongTo,this.typeCode).then(response => {
+      commitCheckResult(this.queryParams.belongTo,this.typeCode,this.checkType).then(response => {
           this.$modal.msgSuccess("检测完成");
           this.$emit('saveCheck');
           this.showFlag = false;
diff --git a/src/views/quality/qcIncome/index.vue b/src/views/quality/qcIncome/index.vue
index 3cfe9c61..8933fc61 100644
--- a/src/views/quality/qcIncome/index.vue
+++ b/src/views/quality/qcIncome/index.vue
@@ -569,7 +569,6 @@ export default {
 						});
 					} else {
 						addIncome(this.form).then(response => {
-							this.$modal.msgSuccess("新增成功");
 							this.open = false;
 							this.getList();
 						});
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index b4c92d0f..a9f85215 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -599,7 +599,6 @@ export default {
 						});
 					} else {
 						addQcProduce(this.form).then(response => {
-							this.$modal.msgSuccess("新增成功");
 							this.open = false;
 							this.getList();
 						});
diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue
index ea5389fe..7a7153eb 100644
--- a/src/views/quality/qcWarehousing/index.vue
+++ b/src/views/quality/qcWarehousing/index.vue
@@ -592,7 +592,6 @@ export default {
 						});
 					} else {
 						addWarehousing(this.form).then(response => {
-							this.$modal.msgSuccess("新增成功");
 							this.open = false;
 							this.getList();
 						});
diff --git a/src/views/quality/unqualified/index.vue b/src/views/quality/unqualified/index.vue
index 77f1e65e..3e8b6696 100644
--- a/src/views/quality/unqualified/index.vue
+++ b/src/views/quality/unqualified/index.vue
@@ -1,14 +1,22 @@
 <template>
 	<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="taskId">
+			<el-form-item label="任务编码" prop="checkNo">
 				<el-input
-					v-model="queryParams.taskId"
+					v-model="queryParams.checkNo"
 					placeholder="请输入所属任务编码"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
+			<el-form-item label="订单编码" prop="orderNo">
+				<el-input
+					v-model="queryParams.orderNo"
+					placeholder="请输入订单编码"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
 			<el-form-item label="物料号" prop="materialCode">
 				<el-input
 					v-model="queryParams.materialCode"
@@ -99,16 +107,27 @@
 		<el-table v-loading="loading" :data="unqualifiedList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="id" align="center" prop="id" v-if="false"/>
-			<el-table-column label="所属任务编码" align="center" prop="taskId" />
-			<el-table-column label="0未处理" align="center" prop="status" />
-			<el-table-column label="下一节点编码" align="center" prop="nextNodeCode" />
-			<el-table-column label="下一节点名称" align="center" prop="nextNodeName" />
-			<el-table-column label="不合格描述" align="center" prop="remark" />
-			<el-table-column label="预留字段1" align="center" prop="attr1" />
-			<el-table-column label="预留字段2" align="center" prop="attr2" />
-			<el-table-column label="预留字段3" align="center" prop="attr3" />
-			<el-table-column label="预留字段4" align="center" prop="attr4" />
-			<el-table-column label="工厂编码" align="center" prop="factoryCode" />
+			<el-table-column label="检查任务编码" align="center" prop="checkNo" width="150"/>
+			<el-table-column label="订单编码" align="center" prop="orderNo" width="150"/>
+			<el-table-column label="批次号" align="center" prop="incomeBatchNo" width="100"/>
+			<el-table-column label="质检项目" align="center" prop="checkName" width="80"/>
+			<el-table-column label="物料编码" align="center" prop="materialCode" width="150"/>
+            <el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
+            <el-table-column label="订单数量" align="center" prop="quality" />
+			<el-table-column label="单位" align="center" prop="unit" />
+            <el-table-column label="异常时间" align="center" prop="checkTime" width="120"/>
+			<el-table-column label="状态" align="center" prop="status" >
+                <template slot-scope="scope">
+					<dict-tag
+						:options="dict.type.do_result"
+						:value="scope.row.status"
+					/>
+				</template>
+			</el-table-column>
+			<el-table-column label="下一节点编码" align="center" prop="nextNodeCode" width="120"/>
+			<el-table-column label="下一节点名称" align="center" prop="nextNodeName" width="120"/>
+			<el-table-column label="提报时间" align="center" prop="createTime" width="120"/>
+			<el-table-column label="不合格描述" align="center" prop="remark" width="120"/>
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot-scope="scope">
 					<el-button
@@ -131,38 +150,121 @@
 		/>
 
 		<!-- 添加或修改不合格处理对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
-				<el-form-item label="归属任务编码" prop="taskId">
-					<el-input v-model="form.taskId" placeholder="请输入归属任务编码" />
-				</el-form-item>
-				<el-form-item label="下一节点编码" prop="nextNodeCode">
-					<el-input v-model="form.nextNodeCode" placeholder="请输入下一节点编码" />
-				</el-form-item>
-				<el-form-item label="下一节点名称" prop="nextNodeName">
-					<el-input v-model="form.nextNodeName" placeholder="请输入下一节点名称" />
-				</el-form-item>
-				<el-form-item label="不合格描述" prop="remark">
-					<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-				</el-form-item>
-				<el-form-item label="预留字段1" prop="attr1">
-					<el-input v-model="form.attr1" placeholder="请输入预留字段1" />
-				</el-form-item>
-				<el-form-item label="预留字段2" prop="attr2">
-					<el-input v-model="form.attr2" placeholder="请输入预留字段2" />
-				</el-form-item>
-				<el-form-item label="预留字段3" prop="attr3">
-					<el-input v-model="form.attr3" placeholder="请输入预留字段3" />
-				</el-form-item>
-				<el-form-item label="预留字段4" prop="attr4">
-					<el-input v-model="form.attr4" placeholder="请输入预留字段4" />
-				</el-form-item>
-				<el-form-item label="工厂编码" prop="factoryCode">
-					<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
-				</el-form-item>
-				<el-form-item label="删除标识1删除0正常" prop="delFlag">
-					<el-input v-model="form.delFlag" placeholder="请输入删除标识1删除0正常" />
-				</el-form-item>
+		<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="100px">
+				<el-row>
+				   <el-col :span="8">
+						<el-form-item label="检验任务编号" prop="checkNo">
+							<el-input v-model="form.checkNo" placeholder="请输入检验任务编号" disabled/>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">	
+						<el-form-item label="来料批次号" prop="incomeBatchNo">
+							<el-input v-model="form.incomeBatchNo" placeholder="请输入来料批次号" />
+						</el-form-item>
+					</el-col>
+                    <el-col :span="8">
+						<el-form-item label="订单号" prop="orderNo">
+							<el-input v-model="form.orderNo" placeholder="请输入订单号" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row>
+			        <el-col :span="12">
+				   		<el-form-item label="物料名称" prop="materialName">
+							<el-input v-model="form.materialName" placeholder="请选择物料名称">
+							<el-button slot="append" @click="handleSelectMaterial" icon="el-icon-search"></el-button>
+							</el-input>
+						</el-form-item>
+					</el-col>
+
+					<el-col :span="12">
+						<el-form-item label="物料号" prop="materialCode">
+							<el-input v-model="form.materialCode" placeholder="请输入物料号" disabled/>
+						</el-form-item>
+					</el-col>
+				</el-row>	
+				<el-row>
+					<el-col :span="8">
+						<el-form-item label="检验类型" prop="checkType" >
+							<el-select v-model="form.checkType" placeholder="请选择检验类型" style="width: 100%;">
+								<el-option
+									v-for="dict in checkTypes"
+									:key="dict.id"
+									:label="dict.checkName"
+									:value="dict.id"
+								></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">	
+						<el-form-item label="收货数量" prop="quality">
+							<el-input type="number" v-model="form.quality" placeholder="请输入收货数量" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="单位" prop="unit" >
+							<el-select v-model="form.unit" placeholder="请选择单位" style="width: 100%;">
+								<el-option
+									v-for="dict in dict.type.unit"
+									:key="dict.value"
+									:label="dict.label"
+									:value="dict.value"
+								></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col :span="8">
+						<el-form-item label="供应商名称" prop="supplierName">
+							<el-input v-model="form.supplierName" placeholder="请选择供应商名称">
+							<el-button slot="append" @click="handleSelectSupplier" icon="el-icon-search"></el-button>
+							</el-input>
+						</el-form-item>
+					</el-col>
+				   <el-col :span="8">	
+						<el-form-item label="供应商编码" prop="supplierCode">
+							<el-input v-model="form.supplierCode" placeholder="请输入供应商编码" disabled/>
+						</el-form-item>
+					</el-col>	
+					<el-col :span="8">
+						<el-form-item label="来料时间" prop="incomeTime">
+							<el-date-picker clearable
+								v-model="form.incomeTime"
+								type="datetime"
+								value-format="yyyy-MM-dd HH:mm:ss"
+								placeholder="请选择来料时间">
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+				</el-row>	
+				<el-row>
+					<el-col :span="8">
+						<el-form-item label="检测人姓名" prop="checkManName">
+							<el-input v-model="form.checkManName" placeholder="请选择检测人姓名">
+							<el-button slot="append" @click="handleSelectUser" icon="el-icon-search"></el-button>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="检测人工号" prop="checkManCode" >
+							<el-input v-model="form.checkManCode" placeholder="请输入检测人工号" disabled/>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">	
+						<el-form-item label="检测地点" prop="checkLoc">
+							<el-input v-model="form.checkLoc" placeholder="请输入检测地点" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col :span="24">
+						<el-form-item label="不合格描述" prop="checkLoc">
+							<el-input type="textarea" autosize placeholder="请输入内容" v-model="form.remark"></el-input>
+						</el-form-item>
+					</el-col>
+				</el-row>		
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -203,7 +305,7 @@ export default {
 				checkTimeArray: [],
 				pageNum: 1,
 				pageSize: 10,
-				taskId: null,
+				checkNo: null,
 				status: null,
 				nextNodeCode: null,
 				nextNodeName: null,
@@ -223,8 +325,15 @@ export default {
 	created() {
 		this.getDate();
 		this.getList();
+		this.getCheckTypes();
 	},
 	methods: {
+		/****/
+		getCheckTypes() {
+           	getCheckTypes('material').then(response => {
+				this.checkTypes = response;
+			});
+		},
         /**获取默认查询时间段**/
 		getDate() {
 			let start = this.Fungetdate (0)
@@ -264,7 +373,7 @@ export default {
 		reset() {
 			this.form = {
 				id: null,
-				taskId: null,
+				checkNo: null,
 				status: null,
 				nextNodeCode: null,
 				nextNodeName: null,
@@ -311,7 +420,7 @@ export default {
 			getUnqualified(id).then(response => {
 				this.form = response.data;
 				this.open = true;
-				this.title = "修改不合格处理";
+				this.title = "不合格处理流程";
 			});
 		},
 		/** 提交按钮 */
diff --git a/src/views/technology/proroute/routeprodproduct.vue b/src/views/technology/proroute/routeprodproduct.vue
index b4dd8a3a..ed8886a9 100644
--- a/src/views/technology/proroute/routeprodproduct.vue
+++ b/src/views/technology/proroute/routeprodproduct.vue
@@ -162,7 +162,7 @@ export default {
       //--------------------->
       leftList: [],
       rightList: [],
-      titles: ["未factoryCode", "已关联产品"],
+      titles: ["未关联产品", "已关联产品"],
       // 左侧分页数据
       Ltotal: "",
       LPageNum: "1",