diff --git a/src/views/quality/checkType/index.vue b/src/views/quality/checkType/index.vue
index 415a646..eb36a0f 100644
--- a/src/views/quality/checkType/index.vue
+++ b/src/views/quality/checkType/index.vue
@@ -89,12 +89,19 @@
 						@click="handleDelete(scope.row)"
 						v-hasPermi="['quality:checkType:remove']"
 					>删除</el-button>
-          <el-button
+          			<el-button
 						size="mini"
 						type="text"
 						icon="el-icon-connection"
 						@click="handleBind(scope.row)"
-					>分配检检员</el-button>
+					>分配检验员</el-button>
+                    <!--
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-connection"
+						@click="handleFile(scope.row)"
+					>受控文件</el-button>-->
 				</template>
 			</el-table-column>
 		</el-table>
diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index 2ce8a72..91f64cc 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -606,6 +606,11 @@
 								</el-input>
 							</el-form-item>
 						</el-col>
+						<el-col :span="16">
+							<el-form-item label="生产批次" prop="incomeBatchNo">
+								<el-input v-model="form.incomeBatchNo" disabled/>
+							</el-form-item>
+						</el-col>
 					</el-row>
 					<el-row>
 						<el-col :span="24">
diff --git a/src/views/quality/qcTableDL/index.vue b/src/views/quality/qcTableDL/index.vue
index 2b223fd..4486601 100644
--- a/src/views/quality/qcTableDL/index.vue
+++ b/src/views/quality/qcTableDL/index.vue
@@ -37,7 +37,6 @@
       <el-form-item label="检验类型" prop="typeCode">
         <el-select
           v-model="queryParams.typeCode"
-          clearable
           placeholder="请选择检验类型"
           @change="getCheckTypeList"
         >
@@ -52,7 +51,6 @@
       <el-form-item label="检验节点" prop="checkType">
         <el-select
           v-model="queryParams.checkType"
-          clearable
           placeholder="请选择检验节点"
           @change="getProjectListFunc"
         >
diff --git a/src/views/quality/qcTableXJ/index.vue b/src/views/quality/qcTableXJ/index.vue
index b5175bc..4f30660 100644
--- a/src/views/quality/qcTableXJ/index.vue
+++ b/src/views/quality/qcTableXJ/index.vue
@@ -17,6 +17,7 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
+			<!--
 			<el-form-item label="工单生产日期" prop="incomeTime">
 				<el-date-picker clearable
 					v-model="queryParams.incomeTime"
@@ -26,7 +27,19 @@
 					style="width:205px"
 					>
 				</el-date-picker>
+			</el-form-item>-->
+
+			<el-form-item label="任务时间" prop="incomeTimeArray">
+                <el-date-picker
+				v-model="queryParams.incomeTimeArray"
+				format="yyyy-MM-dd HH:mm:ss"
+				type="datetimerange"
+				range-separator="至"
+				start-placeholder="开始日期"
+				end-placeholder="结束日期">
+				</el-date-picker>
 			</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>
@@ -155,6 +168,7 @@ export default {
 				open: false,
 				// 查询参数
 				queryParams: {
+					incomeTimeArray: [],
 					pageNum: 1,
 					pageSize: 10,
 					checkNo: null,
@@ -212,7 +226,9 @@ export default {
        	/**获取默认查询时间段**/
 		getDate() {
 			let start = this.Fungetdate (0)
-			this.queryParams.incomeTime =start
+			let end = this.Fungetdate (1)
+			this.queryParams.incomeTimeArray.push(start,end)
+			//this.queryParams.checkTimeArray.push(start,end)
 		},
 		Fungetdate (num) {
 			var dd = new Date();
@@ -231,9 +247,12 @@ export default {
 			this.loading = true;
 
 
-			if(this.queryParams.incomeTime != null){
-				this.queryParams.incomeTimeStr = moment(this.queryParams.incomeTime).format('YYYY-MM-DD');
-
+			if(this.queryParams.incomeTimeArray != null &&this.queryParams.incomeTimeArray.length>0){
+				this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
+				this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
+			}else{
+				this.queryParams.incomeTimeStart = null;
+				this.queryParams.incomeTimeEnd = null;
 			}
 
 			getXJCheckTableList(this.queryParams).then(response => {
diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue
index d23c529..9bb99f2 100644
--- a/src/views/wms/product/index.vue
+++ b/src/views/wms/product/index.vue
@@ -24,6 +24,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="检验标准" prop="mvgr5">
+        <el-input
+          v-model="queryParams.mvgr5"
+          placeholder="请输入检验标准码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -172,6 +180,12 @@
         prop="reportRate"
         width="150"
       />
+      <el-table-column
+        label="检验标准"
+        align="center"
+        prop="mvgr5"
+        width="150"
+      />
       <!-- 中文描述也就是产品名称 -->
       <!-- <el-table-column label="英文描述" align="center" prop="productDescEn" />
 						<el-table-column label="产品类别" align="center" prop="productGroup">
@@ -508,10 +522,10 @@
         </el-form-item>
 
 
-        <el-form-item label="质量产品类型" prop="other">
+        <el-form-item label="CPK品类" prop="other">
           <el-select
             v-model="form.other"
-            placeholder="请选择质量产品类型"
+            placeholder="请选择质量品类"
             style="width: 320px"
           >
             <el-option