diff --git a/vue/src/router/modules/fisprint.js b/vue/src/router/modules/fisprint.js
index 4962305..ac79e23 100644
--- a/vue/src/router/modules/fisprint.js
+++ b/vue/src/router/modules/fisprint.js
@@ -21,7 +21,7 @@ const pgfisPrint = {
             component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
             name: 'pg-M100Online',//命名路由
             meta: {
-                title: '日常打印M100信息',
+                title: '日常打印E001信息',
                 //roles: ['SettleAccount.Reports'],
                 icon: '客户零件'
             }
@@ -31,7 +31,7 @@ const pgfisPrint = {
             component: () => import('@/views/pg-fis/basedate/select'),
             name: 'select',//命名路由
             meta: {
-                title: 'M100查询',
+                title: 'E001查询',
                 //roles: ['SettleAccount.Reports'],
                 icon: '结算对比'
             }
diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
index b5d3110..20d230d 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
@@ -283,6 +283,10 @@ export default {
         return [];
       },
     },
+    handleDeleteCallBack:{
+      type: Function,
+      default:null
+    }
   },
   data() {
     const validVersion = (rule, value, callback) => {
@@ -393,7 +397,7 @@ export default {
     });
   },
   created() {
-    this.getList();
+    this.handleFilter()
   },
   watch: {
     customerInfosMB: {
@@ -675,7 +679,6 @@ export default {
     handleDelete() {
       //debugger;
       let params = this.zuofei;
-
       this.$axios
         .posts("/api/newjit/MenBanPackingList/scrap", params)
         .then((response) => {
@@ -690,9 +693,9 @@ export default {
             duration: 2000,
           });
           this.getList();
+          if(this.handleDeleteCallBack)this.handleDeleteCallBack()
         });
       this.dialogTableVisible = false;
-      
     },
 
     //作废操作，支持批量操作-门板
diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
index 506e202..0d8de59 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
@@ -203,7 +203,11 @@
       @open="opens()"
       size="900px"
     >
-      <ScrapMB v-bind:customerInfosMB="customerInfosMB"></ScrapMB>
+      <ScrapMB 
+        v-if="drawerMBDelete" 
+        v-bind:customerInfosMB="customerInfosMB"
+        :handleDeleteCallBack="handleFilter"
+      ></ScrapMB>
     </el-drawer>
     <!--柱护板重打-->
     <el-drawer
@@ -256,6 +260,7 @@
         @sort-change="sortChange"
         @selection-change="handleSelectionChange"
         @row-click="handleRowClick"
+        :row-class-name="tableRowClassName"
       >
         <el-table-column
           label="底盘号"
@@ -704,12 +709,12 @@ export default {
         width: 150,
       });
       tempsTabs.push({
-        label: "M100上线时间",
+        label: "E001上线时间",
         prop: "onlineTime",
         width: 150,
       });
       tempsTabs.push({
-        label: "M100接收时间",
+        label: "E001接收时间",
         prop: "receiveTime",
         width: 180,
       });
@@ -723,16 +728,16 @@ export default {
       //   prop: "version",
       //   width: 150,
       // });
-      tempsTabs.push({
-        label: "R100上线时间",
-        prop: "r100OnlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "R100接收时间",
-        prop: "r100ReceiveTime",
-        width: 180,
-      });
+      // tempsTabs.push({
+      //   label: "R100上线时间",
+      //   prop: "r100OnlineTime",
+      //   width: 150,
+      // });
+      // tempsTabs.push({
+      //   label: "R100接收时间",
+      //   prop: "r100ReceiveTime",
+      //   width: 180,
+      // });
       tempsTabs.push({
         label: "产线",
         prop: "productLine",
@@ -765,6 +770,12 @@ export default {
     ...mapGetters(["userInfo"]), //获取当前用户信息
   },
   methods: {
+    tableRowClassName({row, rowIndex}) {
+      if(row.billStatus == 1){
+        return 'error-row';
+      }
+      return '';
+    },
     // 更改主表格高度
     changeMainTableHeight(){
       this.$nextTick(()=>{
@@ -978,7 +989,6 @@ export default {
     },
     //抽屉
     handleDrawerOpen(param) {
-			debugger
       this.drawer = true;
       var parentId = param.assemblyID; //主键id
       this.customerInfos = [
@@ -1002,7 +1012,6 @@ export default {
     },
     /** 导出功能 assembly-cfg-erp/export */
     handleDownload() {
-			debugger
       this.listLoading = true;
 			
       this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
@@ -1109,7 +1118,7 @@ export default {
     /** 格式化字段 */
     fieldFormatter(row, column) {
       if (column.property === "billStatus") {
-        return { 1: "未解析", 2: "已解析", 3: "已打印", 4: "断号" }[row[column.property]];
+        return { 1: "未匹配", 2: "已解析", 3: "已打印", 4: "断号" }[row[column.property]];
       }
       if (column.property === "zHBBillStatus") {
         return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
@@ -1171,7 +1180,6 @@ export default {
         .then((response) => {
           this.list = response.items;
           this.totalCount = response.totalCount;
-					debugger
           setTimeout(() => {
             //大数据量加载时
             this.listLoading = false;
@@ -1209,7 +1217,6 @@ export default {
     },
     // 向子组件更新值
     valueselectChange(val) {
-			debugger
       this.$forceUpdate();
 			
 
@@ -1892,7 +1899,6 @@ export default {
 	
 	//获取所有产线
     getProductLine() {
-			debugger
       this.listPLQuery.UserId = this.userInfo == null ? null : this.userInfo.userId;
       // console.log(
       //   "this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId" +
@@ -2080,6 +2086,14 @@ export default {
   padding: 10px;
   line-height: 20px;
 }
+
+/deep/ .el-table .error-row {
+  background: #fbd6d6 !important;
+
+  td{
+    background: #fbd6d6 !important;
+  }
+}
 </style>
 
 
diff --git a/vue/src/views/pg-fis/basedate/planControl/index.vue b/vue/src/views/pg-fis/basedate/planControl/index.vue
index e269e42..a9bcf1a 100644
--- a/vue/src/views/pg-fis/basedate/planControl/index.vue
+++ b/vue/src/views/pg-fis/basedate/planControl/index.vue
@@ -35,7 +35,7 @@
 				/>
 			</el-form-item>
 
-			<el-form-item label="涂装下线时间">
+			<el-form-item label="涂装下线时间" prop="paintOfflineTimeBegin">
 				<el-date-picker
 					v-model="listQuery.paintOfflineTimeBegin"
 					size="small"
@@ -43,7 +43,7 @@
 					type="datetime"
 				></el-date-picker>
 			</el-form-item>
-			<el-form-item label="-">
+			<el-form-item label="-" prop="paintOfflineTimeEnd">
 				<el-date-picker
 					v-model="listQuery.paintOfflineTimeEnd"
 					size="small"
@@ -52,7 +52,7 @@
 				></el-date-picker>
 			</el-form-item>
 
-			<el-form-item label="总装上线时间">
+			<el-form-item label="总装上线时间" prop="onlineTimeBegin">
 				<el-date-picker
 					v-model="listQuery.onlineTimeBegin"
 					size="small"
@@ -60,7 +60,7 @@
 					type="datetime"
 				></el-date-picker>
 			</el-form-item>
-			<el-form-item label="-">
+			<el-form-item label="-" prop="onlineTimeEnd">
 				<el-date-picker
 					v-model="listQuery.onlineTimeEnd"
 					size="small"
@@ -69,7 +69,7 @@
 				></el-date-picker>
 			</el-form-item>
 
-			<el-form-item label="序列号">
+			<el-form-item label="序列号" prop="serialNumBegin">
 				<el-input
 					v-model="listQuery.serialNumBegin"
 					clearable
@@ -77,7 +77,7 @@
 					style="width: 120px"
 				/>
 			</el-form-item>
-			<el-form-item label="-">
+			<el-form-item label="-" prop="serialNumEnd">
 				<el-input
 					v-model="listQuery.serialNumEnd"
 					clearable
@@ -86,7 +86,7 @@
 				/>
 			</el-form-item>
 
-			<el-form-item label="流水号">
+			<el-form-item label="流水号" prop="hostSNBegin">
 				<el-input
 					v-model="listQuery.hostSNBegin"
 					clearable
@@ -94,7 +94,7 @@
 					style="width: 120px"
 				/>
 			</el-form-item>
-			<el-form-item label="-">
+			<el-form-item label="-" prop="hostSNEnd">
 				<el-input
 					v-model="listQuery.hostSNEnd"
 					clearable
@@ -103,14 +103,14 @@
 				/>
 			</el-form-item>
 
-			<el-form-item label="主机厂生产线">
+			<el-form-item label="主机厂生产线" prop="productLine">
 				<el-select v-model="listQuery.productLine" clearable>
 					<el-option label="A" value="A"></el-option>
 					<el-option label="B" value="B"></el-option>
 				</el-select>
 			</el-form-item>
 
-			<el-form-item label="创建时间">
+			<el-form-item label="创建时间" prop="createTimeBegin">
 				<el-date-picker
 					v-model="listQuery.createTimeBegin"
 					size="small"
@@ -118,7 +118,7 @@
 					type="datetime"
 				></el-date-picker>
 			</el-form-item>
-			<el-form-item label="-">
+			<el-form-item label="-" prop="createTimeEnd">
 				<el-date-picker
 					v-model="listQuery.createTimeEnd"
 					size="small"
@@ -127,7 +127,7 @@
 				></el-date-picker>
 			</el-form-item>
 
-			<el-form-item label="导入时间">
+			<el-form-item label="导入时间" prop="importTimeBegin">
 				<el-date-picker
 					v-model="listQuery.importTimeBegin"
 					size="small"
@@ -135,7 +135,7 @@
 					type="datetime"
 				></el-date-picker>
 			</el-form-item>
-			<el-form-item label="-">
+			<el-form-item label="-" prop="importTimeEnd">
 				<el-date-picker
 					v-model="listQuery.importTimeEnd"
 					size="small"
diff --git a/vue/src/views/pg-fis/basedate/select/index.vue b/vue/src/views/pg-fis/basedate/select/index.vue
index d60eeb0..2f939fd 100644
--- a/vue/src/views/pg-fis/basedate/select/index.vue
+++ b/vue/src/views/pg-fis/basedate/select/index.vue
@@ -96,7 +96,7 @@
             />
           </el-form-item> -->
           <!-- <el-row> -->
-          <el-form-item label="流水号:">
+          <el-form-item label="流水号:" prop="HostSNBegin" >
           <!-- <el-form-item label="大众顺序号:" prop="hostSN"> -->
             <el-input
               v-model="listQuery.HostSNBegin"
@@ -107,7 +107,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-         <el-form-item label="-">
+         <el-form-item label="-" prop="HostSNEnd">
             <el-input
               v-model="listQuery.HostSNEnd"
               placeholder=""
@@ -271,6 +271,7 @@
         @sort-change="sortChange"
         @selection-change="handleSelectionChange"
         @row-click="handleRowClick"
+        :row-class-name="tableRowClassName"
       >
         <el-table-column
           label="底盘号"
@@ -633,12 +634,12 @@ export default {
         width: 150,
       });
       tempsTabs.push({
-        label: "M100上线时间",
+        label: "E001上线时间",
         prop: "onlineTime",
         width: 150,
       });
       tempsTabs.push({
-        label: "M100接收时间",
+        label: "E001接收时间",
         prop: "receiveTime",
         width: 180,
       });
@@ -657,31 +658,31 @@ export default {
         prop: "productLine",
         width: 120,
       });
-      tempsTabs.push({
-        label: "状态",
-        prop: "billStatus",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "柱护板状态",
-        prop: "printBillNum",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "不可打印",
-        prop: "canNotPrint",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "R100上线时间",
-        prop: "r100OnlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "R100接收时间",
-        prop: "r100ReceiveTime",
-        width: 180,
-      });
+      // tempsTabs.push({
+      //   label: "状态",
+      //   prop: "billStatus",
+      //   width: 120,
+      // });
+      // tempsTabs.push({
+      //   label: "柱护板状态",
+      //   prop: "printBillNum",
+      //   width: 120,
+      // });
+      // tempsTabs.push({
+      //   label: "不可打印",
+      //   prop: "canNotPrint",
+      //   width: 120,
+      // });
+      // tempsTabs.push({
+      //   label: "R100上线时间",
+      //   prop: "r100OnlineTime",
+      //   width: 150,
+      // });
+      // tempsTabs.push({
+      //   label: "R100接收时间",
+      //   prop: "r100ReceiveTime",
+      //   width: 180,
+      // });
       tempsTabs.push({
         label: "备注",
         prop: "description",
@@ -692,6 +693,12 @@ export default {
     ...mapGetters(["userInfo"]), //获取当前用户信息
   },
   methods: {
+    tableRowClassName({row, rowIndex}) {
+      if(row.billStatus == 1){
+        return 'error-row';
+      }
+      return '';
+    },
     // 更改主表格高度
     changeMainTableHeight(){
       this.$nextTick(()=>{
@@ -1693,6 +1700,12 @@ export default {
   margin-left: 5px;
   margin-right: 5px;
 }
+/deep/ .el-table .error-row {
+  background: #fbd6d6 !important;
+  td{
+    background: #fbd6d6 !important;
+  }
+}
 </style>