diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue
index 32b2e41c..946fafdc 100644
--- a/src/views/bigScreen/index_enm.vue
+++ b/src/views/bigScreen/index_enm.vue
@@ -259,7 +259,7 @@
 						<div class="elecItem_wrap">
 							<span>水泥包装工序电耗</span>
 							<p class="elec_number">
-								{{(Number(hotData.bz_elec_consume_unit) + Number(dicData.b_snbz_elec)).toFixed(2) }}
+								{{(Number(hotData.dz_elec_consume_unit)).toFixed(2) }}
 								<span class="elec_unit">kW·h/t</span>
 							</p>
 						</div>
@@ -452,6 +452,7 @@ export default {
 				sn_cen_consume_unit: 0, //水泥综合能耗
 				sn_elec_consume_unit: 0,//水泥分布电耗
 				bz_elec_consume_unit: 0,//水泥包装分布电耗
+				dz_elec_consume_unit: 0,//袋装水泥分布电耗
 			},
 			dicData:{
 				b_sl_elec:0,
@@ -1179,9 +1180,6 @@ export default {
 						that.hotData.celec_consume_unit =Number(ress[0].celec_consume_unit).toFixed(2);
 						that.hotData.coal_consume_unit =Number(ress[0].coal_consume_unit).toFixed(2);
 						that.hotData.cen_consume_unit = Number(ress[0].cen_consume_unit).toFixed(2);
-						console.log(that.hotData.celec_consume_unit);
-						console.log(that.hotData.coal_consume_unit);
-						console.log(that.hotData.cen_consume_unit);
 					});
 				});
 			this.$API.mtm.mgroup.list
@@ -1197,8 +1195,6 @@ export default {
 				this.$API.enm.enstat.req(params).then((ress) => {
 					that.hotData.sn_elec_consume_unit =Number(ress[0].elec_consume_unit).toFixed(2);
 					that.hotData.sn_cen_consume_unit = Number(ress[0].cen_consume_unit).toFixed(2);
-					console.log(that.hotData.sn_elec_consume_unit);
-					console.log(that.hotData.sn_cen_consume_unit);
 				});
 			});
 			this.$API.mtm.mgroup.list
@@ -1211,9 +1207,23 @@ export default {
 				params.month_s = that.currentMonth;
 				params.type = "month_s";
 				params.mgroup = that.yurefadianId;
-				this.$API.enm.enstat.req(params).then((ress) => {
-					that.hotData.bz_elec_consume_unit =Number(ress[0].elec_consume_unit).toFixed(2);
-					console.log(that.hotData.bz_elec_consume_unit);
+				this.$API.enm.mpointstat.list.req(params).then((res) => {
+					if (res.length > 0){
+						let dz_sum = 0;
+						let dz_elec = 0;
+						res.forEach((item) =>{
+							if (item.mpoint_nickname == "袋装水泥总和"){
+								dz_sum = item.val || 0;
+							}else if( item.mpoint_nickname == "水泥包装用电合计"){
+								dz_elec = Number(item.val) || 0;
+							}
+						if (dz_sum > 0){
+							that.hotData.dz_elec_consume_unit = Number(dz_elec/dz_sum).toFixed(2);
+						}else{
+							that.hotData.dz_elec_consume_unit = 0;
+						}
+						})
+					}
 				});
 			});
 		},
diff --git a/src/views/em/equipment.vue b/src/views/em/equipment.vue
index c56c1084..a38bc5d2 100644
--- a/src/views/em/equipment.vue
+++ b/src/views/em/equipment.vue
@@ -4,29 +4,11 @@
       <div class="left-panel">
         <el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'equipment.create'">新增</el-button>
         <el-button type="primary" @click="echeckrecord" v-auth="'echeckrecord.create'">批量巡检</el-button>
-        <!-- <el-select v-model="query.belong_dept" placeholder="所在车间" clearable style="margin-left: 2px;"
-        @change="handleQuery">
-          <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
-        </el-select> -->
       </div>
       <div class="right-panel">
         <el-cascader v-model="query.belong_dept" :options="group" :props="groupsProps" clearable placeholder="所在车间"
           :show-all-levels="false" @change="handleQuery">
         </el-cascader>
-        <!-- <el-select v-model="query.state" placeholder="设备状态" clearable>
-          <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"
-          @change="handleQuery"></el-option>
-        </el-select> -->
-        <!-- <el-select
-            v-model="query.is_deleted"
-            placeholder="筛选"
-            @change="handleQuery"
-            clearable
-            style="margin-left: 2px"
-          >
-            <el-option label="在用" :value="false"></el-option>
-            <el-option label="已删" :value="true"></el-option>
-        </el-select> -->
         <el-input v-model="query.search" placeholder="设备名称/编号" clearable style="width:200px"></el-input>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
       </div>
@@ -92,9 +74,6 @@
         <el-table-column label="所在工段" show-overflow-tooltip>
           <template #default="scope">{{ scope.row.mgroup_name }}</template>
         </el-table-column>
-        <!-- <el-table-column label="保管人">
-          <template #default="scope">{{ scope.row.keeper_name }}</template>
-        </el-table-column> -->
         <el-table-column label="安装位置" show-overflow-tooltip>
           <template #default="scope">{{ scope.row.place }}</template>
         </el-table-column>
@@ -102,13 +81,10 @@
           <template #default="scope">{{ scope.row.description }}</template>
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="left" width="180">
-          <template #default="scope">
-            <el-button link type="primary" @click="table_record(scope.row)" v-auth="'einspect.create'">
-              巡检
-            </el-button>
-            <el-button link type="warning" @click="table_edit(scope.row)" v-auth="'equipment.update'">
-              编辑
-            </el-button>
+         <template #default="scope">
+            <el-button link type="success" @click="table_print(scope.row)">打印</el-button>
+            <el-button link type="primary" @click="table_record(scope.row)" v-auth="'einspect.create'">巡检</el-button>
+            <el-button link type="warning" @click="table_edit(scope.row)" v-auth="'equipment.update'">编辑</el-button>
             <el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row)" v-auth="'equipment.delete'">
               <template #reference>
                 <el-button link type="danger">删除</el-button>
@@ -187,21 +163,6 @@
               <ehsUserSelect :multiple="false" @submit="getReceptionist" />
             </span>
           </el-form-item>
-          <!-- <el-form-item label="巡检人" prop="inspect_user">
-                <el-select
-                  v-model="form.inspect_user"
-                  placeholder="巡检人"
-                  clearable
-                  style="width:100%"
-                >
-                  <el-option
-                  v-for="item in userList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
         </el-col>
         <el-col :md="12" :sm="24">
           <el-form-item label="巡检结果" prop="result">
@@ -269,12 +230,6 @@ export default {
         emitPath: false,
         checkStrictly: true,
       },
-      // stateOptions: [
-      //   { label: '完好', value: 10 },
-      //   { label: '限用', value: 20 },
-      //   { label: '在修', value: 30 },
-      //   { label: '禁用', value: 40 },
-      // ],
       results_: {
         'pass': '正常',
         'fail': '异常',
@@ -291,7 +246,8 @@ export default {
       item: {},
       visible: false,
       visibleRecord: false,
-      excelName: ''
+      excelName: '',
+      printer_name:localStorage.getItem("printer_name"),
     };
   },
   mounted() {
@@ -401,7 +357,22 @@ export default {
           return err;
         });
     },
-
+table_print(row){
+      let that = this;
+      let params = {},data={};
+      data.name = row.name;
+      data.number = row.number;
+      params.data = data;
+      params.label_template_name = '设备打印模板';
+      that.$API.cm.labeltemplate.commands.req(params).then((res) => {
+        let obj = {};
+        obj.printer_commands = res.commands;
+        obj.printer_name = that.printer_name;
+        that.$API.wpm.prints.req(obj).then((response) => {
+          that.$message.success("打印成功");
+        });
+      });
+    },
     //本地更新数据
     handleSaveSuccess(data, mode) {
       this.$refs.table.refresh();
diff --git a/src/views/enm_pack/report.vue b/src/views/enm_pack/report.vue
index 71b0f220..1455292d 100644
--- a/src/views/enm_pack/report.vue
+++ b/src/views/enm_pack/report.vue
@@ -633,7 +633,7 @@ export default {
 							}else if (item.mpoint_nickname == "出厂熟料"){
 								that.tableDatas[11][5] = item.val;
 							}else if (item.mpoint_nickname == "水泥包装用电合计") {
-								that.tableDatas[12][5] = item.elec_consume_unit;
+								that.tableDatas[12][5] = (item.val/that.tableDatas[9][5]).toFixed(2)
 								that.tableDatas[13][5] = item.val;
 							} 
 						}
@@ -676,7 +676,7 @@ export default {
 							}else if (item.mpoint_nickname == "出厂熟料"){
 								that.tableDatas[11][4] = item.val;
 							}else if (item.mpoint_nickname == "水泥包装用电合计") {
-								that.tableDatas[12][4] = item.elec_consume_unit;
+								that.tableDatas[12][4] = (item.val/that.tableDatas[9][4]).toFixed(2)
 								that.tableDatas[13][4] = item.val;
 							} 
 						}
@@ -720,7 +720,7 @@ export default {
 							}else if (item.mpoint_nickname == "出厂熟料"){
 								that.tableDatas[11][2] = item.val;
 							}else if (item.mpoint_nickname == "水泥包装用电合计") {
-								that.tableDatas[12][2] = item.elec_consume_unit;
+								that.tableDatas[12][2] = (item.val/that.tableDatas[9][2]).toFixed(2)
 								that.tableDatas[13][2] = item.val;
 							} 
 						}
@@ -765,9 +765,15 @@ export default {
 							}else if (item.mpoint_nickname == "出厂熟料"){
 								that.tableDatas[11][3] = item.val;
 							}else if (item.mpoint_nickname == "水泥包装用电合计") {
-								that.tableDatas[12][3] = item.elec_consume_unit;
-								that.tableDatas[13][3] = item.val;
-							} 
+								const demon = Number(that.tableDatas[9][3]) || 0;
+								const numer = Number(item.val) || 0;
+								if (demon !== 0){
+									that.tableDatas[12][3] = (item.val/that.tableDatas[9][3]).toFixed(2)
+								}else{
+									that.tableDatas[12][3] = 0;
+								}
+								that.tableDatas[13][3] = numer;
+							} 							
 						}
 					)}
 				});
@@ -834,8 +840,14 @@ export default {
 							}else if (item.mpoint_nickname == "出厂熟料"){
 								that.tableDatas[11][5] = item.val;
 							}else if (item.mpoint_nickname == "水泥包装用电合计") {
-								that.tableDatas[12][5] = item.elec_consume_unit;
-								that.tableDatas[13][5] = item.val;
+								const demon = Number(that.tableDatas[9][5]) || 0;
+								const numer = Number(item.val) || 0;
+								if (demon !== 0){
+									that.tableDatas[12][5] = (item.val/that.tableDatas[9][5]).toFixed(2)
+								}else{
+									that.tableDatas[12][5] = 0;
+								}
+								that.tableDatas[13][5] = numer;
 							} 
 						})}
 		})
@@ -878,7 +890,7 @@ export default {
 						}else if (item.mpoint_nickname == "出厂熟料"){
 							that.tableDatas[11][4] = item.val;
 						}else if (item.mpoint_nickname == "水泥包装用电合计") {
-							that.tableDatas[12][4] = item.elec_consume_unit;
+							that.tableDatas[12][4] = (item.val/that.tableDatas[9][4]).toFixed(2)
 							that.tableDatas[13][4] = item.val;
 						} 
 					})
diff --git a/src/views/inm/helpso.vue b/src/views/inm/helpso.vue
index 4f69b8f6..738d4958 100644
--- a/src/views/inm/helpso.vue
+++ b/src/views/inm/helpso.vue
@@ -2,6 +2,12 @@
 	<el-container>
 		<el-header>
 			<div class="left-panel">
+				<el-button
+					type="primary"
+					:disabled = 'dLoading'
+					icon="el-icon-download"
+					@click="exportList"
+				>导出</el-button>
 			</div>
 			<div class="right-panel">
 				<el-input
@@ -120,6 +126,9 @@
 	</el-container>
 </template>
 <script>
+
+import * as XLSX2 from "xlsx";
+import * as XLSX from "xlsx-style";
 import printDialog from "./../template/printmaterial.vue";
 export default {
 	name: "materials",
@@ -135,6 +144,8 @@ export default {
 			query: {},
 			warehouseOptions: [],
 			wmtype:0,
+			ElLoading:null,
+			dLoading:false,
 			print_m:false,
 			materialsVisible:false,
 			apiObjPrint:this.$API.cm.labelmat.fromMb,
@@ -183,6 +194,78 @@ export default {
 			    this.$refs.printmaterial.open();
 			})
 		},
+		exportList(){
+			let that = this;
+        	that.dLoading = true;
+			let chartName = '辅料表';
+			let titleData = ['辅料表'];
+			let tipsData = ['日期','物料编号','物料名称','货位号','规格','品牌型号','单位','安全库存','数量','单价','总金额'];
+			let tableData = [];
+			tableData.push(titleData)
+        	tableData.push(tipsData)
+			that.ElLoading = this.$loading({
+				lock: true,
+				text: '数据请求中，请稍后...',
+				background: 'rgba(0, 0, 0, 0)',
+			})
+			that.$API.inm.warehouse.batch.req({ page: 0, count__gte: 1, material__type__in: "40" }).then((res) => {
+				res.forEach(item => {
+					let data0 = [];
+					let total = Number(item.material_.unit_price)*Number(item.count);
+					data0.push(item.update_time);
+					data0.push(item.material_.number);
+					data0.push(item.material_.name);
+					data0.push(item.material_.bin_number_main);
+					data0.push(item.material_.specification);
+					data0.push(item.material_.model);
+					data0.push(item.material_.unit);
+					data0.push(item.material_.count_safe);
+					data0.push(item.count);
+					data0.push(item.material_.unit_price);
+					data0.push(total);
+					tableData.push(data0);
+			   })
+			    let ws = XLSX2.utils.aoa_to_sheet(tableData);
+              	let wb = XLSX2.utils.book_new();
+				 XLSX2.utils.book_append_sheet(wb, ws, chartName);
+				var wopts = {
+					bookType: 'xlsx', 
+					bookSST: false, 
+					type: 'binary'
+				};
+              var wbout = XLSX.write(wb, wopts);
+              var blob = new Blob([this.s2ab(wbout)], {
+                  type: "application/octet-stream"
+              });
+              this.openDownloadDialog(blob, chartName+`.xlsx`);
+              that.dLoading = false;
+              that.ElLoading.close();
+			}).catch(res=>{
+				that.dLoading = false;
+				that.ElLoading.close();
+			})
+		},
+		s2ab(s) {
+          var buf = new ArrayBuffer(s.length);
+          var view = new Uint8Array(buf);
+          for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
+          return buf;
+      },
+	  openDownloadDialog(url, saveName) {
+          if (typeof url == 'object' && url instanceof Blob) {
+              url = URL.createObjectURL(url); // 创建blob地址
+          }
+          var aLink = document.createElement('a');
+          aLink.href = url;
+          aLink.download = saveName || ''; // HTML5新增的属性，指定保存文件名，可以不要后缀，注意，file:///模式下不会生效
+          var event;
+          if (window.MouseEvent) event = new MouseEvent('click');
+          else {
+              event = document.createEvent('MouseEvents');
+              event.initMouseEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+          }
+          aLink.dispatchEvent(event);
+      },
 	},
 };
 </script>
diff --git a/src/views/ofm/booking_form.vue b/src/views/ofm/booking_form.vue
index e97bcd3c..73dff9e1 100644
--- a/src/views/ofm/booking_form.vue
+++ b/src/views/ofm/booking_form.vue
@@ -7,13 +7,15 @@
         ref="addForm"
         label-width="100px"
       > 
-        <el-form-item label="标题" prop="title">
-          <el-input v-model="form.title" clearable></el-input>
-        </el-form-item>
         <el-row>
+          <el-col :span="12">
+            <el-form-item label="会议名称" prop="title">
+              <el-input v-model="form.title" clearable placeholder="请输入会议名称"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="会议室" prop="mroom">
-              <el-select v-model="form.mroom" placeholder="请选择" @change="mRoomChange" style="width: 100%;">
+              <el-select v-model="form.mroom" placeholder="请选择会议室" @change="mRoomChange" style="width: 100%;">
                 <el-option 
                   v-for="item in mRoomList"
                   :key="item.id"
@@ -24,8 +26,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="时间" prop="mdate">
-              <el-date-picker v-model="form.mdate" type="date" value-format="YYYY-MM-DD" style="width: 100%;"/>
+            <el-form-item label="参会领导" prop="key_participants">
+              <el-input v-model="form.key_participants" clearable placeholder="请输入参会领导"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="会议人数" prop="participant_count">
+              <el-input-number v-model="form.participant_count" clearable style="width: 100%;" :precision="0" :step="1" min="1"></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="会议时间" prop="mdate">
+              <el-date-picker v-model="form.mdate" type="date" value-format="YYYY-MM-DD" style="width: 100%;" placeholder="请选择会议时间"></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注">
+              <el-input v-model="form.title" clearable placeholder="备注"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -41,7 +58,7 @@
             :workflow_key="'booking'" 
             :title="bookingTitle" 
             :t_id="form.id" 
-            :ticketId="form.ticket"
+            :ticket_="form.ticket_"
             @success="()=>{$emit('success')}" 
             :submit_b_func="submit_b_func" 
             ref="ticketd_b_start"
@@ -50,7 +67,7 @@
 			</el-footer>
     </el-main>
     <el-aside width="20%" v-if="form.ticket">
-			<ticketd :ticket_full_data="form.ticket_" @success="$emit('success')"></ticketd>
+			<ticketd :ticket_="form.ticket_" @success="$emit('success')"></ticketd>
 		</el-aside>
   </el-container>
 </template>
@@ -98,11 +115,15 @@ export default {
       },
       //表单数据
       form: {
+        note: "",
         mroom: "",
         mdate: "",
         title: "",
         slots: [],
-        ticket_: null
+        ticket_: null,
+        belong_dept: "",
+        participant_count: 0,
+        key_participants: "",
       },
       //验证规则
       rules: {
@@ -168,7 +189,10 @@ export default {
     let that = this;
     that.getmRoomList();
     that.getTid();
-    if(that.type=='edit'){
+    if(that.type=='add'){
+      that.form.belong_dept = that.$TOOL.data.get("USER_INFO").dept_id;
+    }
+    if(that.type=='edit'||that.type=='show'){
       that.form = that.bookingIitem;
       that.mroomName = that.bookingIitem.mroom_name;
       that.bookingTitle = that.mroomName+"预定";
diff --git a/src/views/ofm/mroombooking.vue b/src/views/ofm/mroombooking.vue
index 40f0ff52..bfa3df25 100644
--- a/src/views/ofm/mroombooking.vue
+++ b/src/views/ofm/mroombooking.vue
@@ -41,10 +41,17 @@
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="250">
           <template #default="scope">
+             <el-button
+              link
+              size="small"
+              type="primary"
+              @click="handleShow(scope.row)"
+            >查看</el-button>
             <el-button
               link
               size="small"
               type="primary"
+              v-if="scope.row.ticket_.state_.type==1"
               @click="handleEidt(scope.row)"
             >编辑</el-button>
             <el-popconfirm title="确定删除吗？" @confirm="handleDel(scope.row)">
@@ -63,7 +70,7 @@
       :editId="editId"
       :bookingIitem="bookingIitem"
       @success="handleSuccess" 
-      @cancel="handleCancel"
+      @closed="handleCancel"
     ></bookingDialog>
   </el-drawer>
 </template>
@@ -107,6 +114,10 @@ export default {
     handleCancel() {
       this.limitedVisible = false; 
     },
+    handleSuccess(){
+      this.$refs.table.refresh();
+      this.limitedVisible = false;
+    },
     handleEidt(row) {
       let that = this;
       that.type = "edit";
@@ -114,6 +125,13 @@ export default {
       that.bookingIitem = row;
       that.limitedVisible = true;
     },
+    handleShow(row){
+       let that = this;
+      that.type = "show";
+      that.editId = row.id;
+      that.bookingIitem = row;
+      that.limitedVisible = true;
+    },
     async handleDel(row) {
       var id = row.id;
       var res = await this.$API.ofm.mroombooking.delete.req(id);
diff --git a/src/views/statistics/bxerp/maopi.vue b/src/views/statistics/bxerp/maopi.vue
index 2fe8ed56..a3b64935 100644
--- a/src/views/statistics/bxerp/maopi.vue
+++ b/src/views/statistics/bxerp/maopi.vue
@@ -173,8 +173,8 @@ export default {
 	data() {
 		return {
 			params: {
-				ordering:'-data__毛坯检测_小日期',
-				ordering:'data__毛坯检测_批次号',
+				ordering:'data__毛坯检测_批次号,-data__毛坯检测_小日期,number_prefix,number_suffix',
+				annotate_field_list:["number_prefix", "number_suffix"],
 				querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]],
 			},
 			query:{
diff --git a/src/views/statistics/bxerp/maopiTotal.vue b/src/views/statistics/bxerp/maopiTotal.vue
index ac599aaf..000225df 100644
--- a/src/views/statistics/bxerp/maopiTotal.vue
+++ b/src/views/statistics/bxerp/maopiTotal.vue
@@ -48,24 +48,24 @@
 				<el-table-column label="放大率￠2mm" align="center" class-name="colorheader1">
 					<el-table-column label="合格数" class-name="colorheader1">
 						<template #default="scope">
-							<span>{{ scope.row.data['毛坯检测_缺陷_放大率￠2mm不合格']?scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_缺陷_放大率￠2mm不合格']:scope.row.data.毛坯检测_count_use }}</span>
+							<span>{{ scope.row.data['毛坯检测_含缺陷_放大率￠2mm不合格']?scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_含缺陷_放大率￠2mm不合格']:scope.row.data.毛坯检测_count_use }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="合格率" class-name="colorheader1">
 						<template #default="scope">
-							<span>{{  scope.row.data['毛坯检测_缺陷_放大率￠2mm不合格_比例']?100-scope.row.data['毛坯检测_缺陷_放大率￠2mm不合格_比例']:100 }}%</span>
+							<span>{{  scope.row.data['毛坯检测_含缺陷_放大率￠2mm不合格_比例']?100-scope.row.data['毛坯检测_含缺陷_放大率￠2mm不合格_比例']:100 }}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
 				<el-table-column label="放大率￠16mm" align="center" class-name="colorheader2">
 					<el-table-column label="合格数" class-name="colorheader2">
 						<template #default="scope">
-							<span>{{ scope.row.data['毛坯检测_缺陷_放大率￠16mm不合格']?scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_缺陷_放大率￠16mm不合格']:scope.row.data.毛坯检测_count_use }}</span>
+							<span>{{ scope.row.data['毛坯检测_含缺陷_放大率￠16mm不合格']?scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_含缺陷_放大率￠16mm不合格']:scope.row.data.毛坯检测_count_use }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="合格率" class-name="colorheader2">
 						<template #default="scope">
-							<span>{{  scope.row.data['毛坯检测_缺陷_放大率￠16mm不合格_比例']?100-scope.row.data['毛坯检测_缺陷_放大率￠16mm不合格_比例']:100 }}%</span>
+							<span>{{  scope.row.data['毛坯检测_含缺陷_放大率￠16mm不合格_比例']?100-scope.row.data['毛坯检测_含缺陷_放大率￠16mm不合格_比例']:100 }}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
@@ -73,80 +73,80 @@
 					<el-table-column label="合格数" class-name="colorheader3">
 						<!-- 总数-不合格数-可加工数 -->
 						<template #default="scope">
-							<span v-if="scope.row.data['毛坯检测_缺陷_剪切￠18.3mm不合格']">
-								<span v-if="scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工']">{{ scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_缺陷_剪切￠18.3mm不合格']-scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工'] }}</span>
-								<span v-else>{{ scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_缺陷_剪切￠18.3mm不合格']}}</span>
+							<span v-if="scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm不合格']">
+								<span v-if="scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工']">{{ scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm不合格']-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工'] }}</span>
+								<span v-else>{{ scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm不合格']}}</span>
 							</span>
 							<span v-else>
-								<span v-if="scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工']">{{ scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工'] }}</span>
+								<span v-if="scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工']">{{ scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工'] }}</span>
 								<span v-else>{{ scope.row.data.毛坯检测_count_use }}</span>
 							</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="合格率" class-name="colorheader3">
 						<template #default="scope">
-							<span v-if="scope.row.data['毛坯检测_缺陷_剪切￠18.3mm不合格_比例']">
-								<span v-if="scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工_比例']">{{ 100-scope.row.data['毛坯检测_缺陷_剪切￠18.3mm不合格_比例']-scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工_比例'] }}</span>
-								<span v-else>{{ 100-scope.row.data['毛坯检测_缺陷_剪切￠18.3mm不合格_比例'] }}%</span>
+							<span v-if="scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm不合格_比例']">
+								<span v-if="scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例']">{{ 100-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm不合格_比例']-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例'] }}</span>
+								<span v-else>{{ 100-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm不合格_比例'] }}%</span>
 							</span>
 							<span v-else>
-								<span v-if="scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工_比例']">{{ 100-scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工_比例'] }}%</span>
+								<span v-if="scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例']">{{ 100-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例'] }}%</span>
 								<span v-else>100%</span>
 							</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="可加工" class-name="colorheader3">
 						<template #default="scope">
-							<span>{{ scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工']?scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工']:0 }}</span>
+							<span>{{ scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工']?scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工']:0 }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="加工率" class-name="colorheader3">
 						<template #default="scope">
-							<span>{{  scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工_比例']?scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工_比例']:0 }}%</span>
+							<span>{{  scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例']?scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例']:0 }}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
 				<el-table-column label="暗点" align="center" class-name="colorheader4">
 					<el-table-column label="内标数" class-name="colorheader4">
 						<template #default="scope">
-							<span>{{ scope.row.data.毛坯检测_缺陷_暗点不合格?scope.row.data.毛坯检测_count_use-scope.row.data.毛坯检测_缺陷_暗点不合格:scope.row.data.毛坯检测_count_use }}</span>
+							<span>{{ scope.row.data.毛坯检测_含缺陷_暗点不合格?scope.row.data.毛坯检测_count_use-scope.row.data.毛坯检测_含缺陷_暗点不合格:scope.row.data.毛坯检测_count_use }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="合格率" class-name="colorheader4">
 						<template #default="scope">
-							<span>{{  scope.row.data.毛坯检测_缺陷_暗点不合格_比例?100-scope.row.data.毛坯检测_缺陷_暗点不合格_比例:100 }}%</span>
+							<span>{{  scope.row.data.毛坯检测_含缺陷_暗点不合格_比例?100-scope.row.data.毛坯检测_含缺陷_暗点不合格_比例:100 }}%</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="长点数" class-name="colorheader4">
 						<template #default="scope">
-							<span>{{ scope.row.data.毛坯检测_缺陷_暗点不合格?scope.row.data.毛坯检测_缺陷_暗点不合格:0 }}</span>
+							<span>{{ scope.row.data.毛坯检测_含缺陷_暗点不合格?scope.row.data.毛坯检测_含缺陷_暗点不合格:0 }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="比率" class-name="colorheader4">
 						<template #default="scope">
-							<span>{{  scope.row.data.毛坯检测_缺陷_暗点不合格_比例?scope.row.data.毛坯检测_缺陷_暗点不合格_比例:0 }}%</span>
+							<span>{{  scope.row.data.毛坯检测_含缺陷_暗点不合格_比例?scope.row.data.毛坯检测_含缺陷_暗点不合格_比例:0 }}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
 				<el-table-column label="崩炸" align="center" class-name="colorheader5">
 					<el-table-column label="崩" align="center" class-name="colorheader5">
 						<template #default="scope">
-							<span>{{ scope.row.data.毛坯检测_缺陷_崩?scope.row.data.毛坯检测_缺陷_崩:0 }}</span>
+							<span>{{ scope.row.data.毛坯检测_含缺陷_崩?scope.row.data.毛坯检测_含缺陷_崩:0 }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="合格率" align="center" class-name="colorheader5">
 						<template #default="scope">
-							<span>{{  scope.row.data.毛坯检测_缺陷_崩_比例?100-scope.row.data.毛坯检测_缺陷_崩_比例:100 }}%</span>
+							<span>{{  scope.row.data.毛坯检测_含缺陷_崩_比例?100-scope.row.data.毛坯检测_含缺陷_崩_比例:100 }}%</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="炸废" align="center" class-name="colorheader5">
 						<template #default="scope">
-							<span>{{ scope.row.data.毛坯检测_缺陷_炸废?scope.row.data.毛坯检测_缺陷_炸废:0 }}</span>
+							<span>{{ scope.row.data.毛坯检测_含缺陷_炸废?scope.row.data.毛坯检测_含缺陷_炸废:0 }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="合格率" align="center" class-name="colorheader5">
 						<template #default="scope">
-							<span>{{ scope.row.data.毛坯检测_缺陷_炸废_比例?100-scope.row.data.毛坯检测_缺陷_炸废_比例:100 }}%</span>
+							<span>{{ scope.row.data.毛坯检测_含缺陷_炸废_比例?100-scope.row.data.毛坯检测_含缺陷_炸废_比例:100 }}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
@@ -164,16 +164,16 @@
 				</el-table-column>
 				<el-table-column label="长点试加工数" align="center" class-name="colorheader7">
 					<template #default="scope">
-						<span>{{ scope.row.data.毛坯检测_缺陷_暗点不合格?scope.row.data.毛坯检测_缺陷_暗点不合格:0 }}</span>
+						<span>{{ scope.row.data.毛坯检测_含缺陷_暗点不合格?scope.row.data.毛坯检测_含缺陷_暗点不合格:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="外形偏(0.5mm)" align="center" class-name="colorheader1">
 				</el-table-column>
-				<el-table-column label="备注" align="center" class-name="colorheader3">
+				<!-- <el-table-column label="备注" align="center" class-name="colorheader3">
 					<template #default="scope">
-						<span>{{ scope.row.data.毛坯检测_缺陷_备注 }}</span>
+						<span>{{ scope.row.data.毛坯检测_含缺陷_备注 }}</span>
 					</template>
-				</el-table-column>
+				</el-table-column> -->
 			</scTable>
 		</el-main>
 	</el-container>
diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue
index 5eb03395..a9ce1c52 100644
--- a/src/views/wpm_bx/handover_form.vue
+++ b/src/views/wpm_bx/handover_form.vue
@@ -672,6 +672,7 @@ export default {
 					if(that.mtype==30){
 						that.form.recive_mgroup = that.form.send_mgroup;
 					}
+					that.form.mtype=that.mtype;
 					//合批、分批、报废，这三个交接操作直接创建并提交
 					if(that.mtype==20||that.mtype==30||that.type==40){
 						that.$API.wpm.handover.createsubmit.req(that.form).then((res) => {
diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue
index 3d806532..a7e4c610 100644
--- a/src/views/wpm_bx/inmIn.vue
+++ b/src/views/wpm_bx/inmIn.vue
@@ -93,7 +93,7 @@
 					min-width="150"
 				>
 					<template #default="scope">
-						<span v-if="route_code=='kaitaijiexiaopi'" @click="rowClick(scope.row)" style="color:#0052d9;font-weight: 600;cursor: pointer;">{{scope.row.batch}}</span>
+						<span v-if="route_code=='kaitaijie'" @click="rowClick(scope.row)" style="color:#0052d9;font-weight: 600;cursor: pointer;">{{scope.row.batch}}</span>
 						<span v-else>{{scope.row.batch}}</span>
 					</template>
 				</el-table-column>
diff --git a/src/views/wpm_bx/inmOut.vue b/src/views/wpm_bx/inmOut.vue
index c7a7b2cf..341754f2 100644
--- a/src/views/wpm_bx/inmOut.vue
+++ b/src/views/wpm_bx/inmOut.vue
@@ -108,7 +108,7 @@
 					min-width="150"
 				>
 					<template #default="scope">
-						<span v-if="route_code=='kaitaijiexiaopi'" @click="rowClick(scope.row)" style="color:#0052d9;font-weight: 600;cursor: pointer;">{{scope.row.batch}}</span>
+						<span v-if="route_code=='kaitaijie'" @click="rowClick(scope.row)" style="color:#0052d9;font-weight: 600;cursor: pointer;">{{scope.row.batch}}</span>
 						<span v-else>{{scope.row.batch}}</span>
 					</template>
 				</el-table-column>
diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue
index ed50c5eb..101d6d92 100644
--- a/src/views/wpm_bx/mlogbw_check.vue
+++ b/src/views/wpm_bx/mlogbw_check.vue
@@ -41,12 +41,10 @@
 					@selectAllChange="selectAllChange"
 					@add="rowAdd"
 				>
-					<!-- <el-table-column prop="number"  fixed type="selection"></el-table-column> -->
 					<el-table-column prop="number" label="物料编号" fixed min-width="80px">
 						<template #default="scope">
 							<span v-if="mode == 'outs'">{{ scope.row.number }}</span>
 							<span v-if="mode == 'outs'&&scope.row.wpr_number_out!==null&&scope.row.wpr_number_out!==undefined">——{{ scope.row.wpr_number_out }}</span>
-							<!-- <el-input v-if="scope.row.isEdit&&mode == 'outs'" v-model="scope.row.number" placeholder="物料编号"></el-input> -->
 							<el-select
 								v-if="scope.row.isEdit&&mode == 'ins'&&route_code!=='niuzhuan'"
 								v-model="scope.row.wpr"
@@ -72,13 +70,15 @@
 								v-model="scope.row.equip"
 								placeholder="生产设备"
 								clearable
-								filterable
-								style="width: 100%"
+								filterable  
+								remote = "true" 
+								default-first-option = "true"   
+								style="width: 50%"
 							>
 								<el-option
 									v-for="item in optionsEq"
 									:key="item.id"
-									:label="item.name"
+									:label="item.number"
 									:value="item.id"
 								>
 									<span style="float:left">{{item.name}}</span>
@@ -94,13 +94,14 @@
 								v-if="scope.row.isEdit"
 								v-model="scope.row.work_start_time"
 								type="datetime"
-								value-format="YYYY-MM-DD HH:mm:ss"
-								formatter="YYYY-MM-DD"
+								value-format="YYYY-MM-DD HH:mm"
+								formatter="YYYY-MM-DD HH:mm"
 								style="width: 100%;"
 								popper-append-to-body
+								@change = "timeChange(scope.row)"
 							/>
 							<div v-else>
-								<span v-if="scope.row.work_start_time!==null">{{ scope.row.work_start_time.split(' ')[0]}}</span>
+								<span v-if="scope.row.work_start_time!==null">{{ scope.row.work_start_time}}</span>
 							</div>
 						</template>
 					</el-table-column>
@@ -914,7 +915,8 @@ export default {
 					let date = new Date();
 					if(that.mlogbwlist[index].work_start_time==''||that.mlogbwlist[index].work_start_time==null){
 						that.mlogbwlist[index].work_start_time = that.$TOOL.dateFormat(date, 'yyyy-MM-dd hh:mm:ss');
-					}
+						that.timeChange(that.mlogbwlist[index]);
+					}else{}
 				}
 			});
         },
@@ -1177,21 +1179,6 @@ export default {
 			}).catch((err) => {
 				return err;
 			});
-			// let retryCount = 0;
-			// let MAX_RETRIES = 3;
-			// that.$API.em.cd.req({method:that.setForm.cd_req_addr}).then((res) => {
-			// 	that.qct_testitems.forEach(item0 => {
-			// 		if(item0.testitem_cd_expr!=null){
-			// 			that.mlogbwlist[0][item0.testitem_name]= eval(item0.testitem_cd_expr);
-			// 		}
-			// 	})
-			// }).catch((err) => {
-			// 	if (retryCount < MAX_RETRIES) {
-			// 		retryCount++;
-			// 		that.getEqData(); // 递归调用
-			// 	}
-			// 	return err;
-			// });
 		},
 		wprChange(wprNumber){
 			let that = this;
@@ -1210,6 +1197,42 @@ export default {
 				}
 			});
 		},
+		equipRemoteMethod(row){
+			let that = this;
+			console.log('row',row);
+			console.log('scope.row.equip',row.equip);
+		},
+		timeChange(row){
+			let that = this;
+			let index = that.mlogbwlist.indexOf(row);
+			let waveNum = 1;
+			let hours =Number(row.work_start_time.split(" ")[1].split(":")[0]);
+			let minutes =Number(row.work_start_time.split(" ")[1].split(":")[1]) ;
+			console.log('hours',hours);
+			console.log('minutes',minutes);
+			if((hours==0&&minutes>29)||hours==1||(hours==2&&minutes<30)){
+				waveNum = 9;
+			}else if((hours==2&&minutes>29)||hours==3||(hours==4&&minutes<30)){
+				waveNum = 10;
+			}else if(hours==7||hours==8){
+				waveNum = 1;
+			}else if(hours==9||hours==10){
+				waveNum = 2;
+			}else if(hours==11||hours==12){
+				waveNum = 3;
+			}else if((hours==13&&minutes>29)||hours==14||(hours==15&&minutes<30)){
+				waveNum = 4;
+			}else if((hours==15&&minutes>29)||hours==16||(hours==17&&minutes<30)){
+				waveNum = 5;
+			}else if(hours==18||hours==19){
+				waveNum = 6;
+			}else if(hours==20||hours==21){
+				waveNum = 7;
+			}else if(hours==22||hours==23){
+				waveNum = 8;
+			}
+			that.mlogbwlist[index].波数 = waveNum;
+		},
 		saveSetting(){
 			let that = this;
 			that.$refs.dialogForm.validate((valid) => {
diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index a8b7c456..515083f8 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -179,7 +179,9 @@
 							:accept="['.xlsx', '.xls']"
 							@success = "fileUPSuccess"
 							>
-							<el-button type="primary" icon="el-icon-upload"> </el-button>
+								<el-button type="primary" icon="el-icon-upload" v-if="mode!=='show'"> </el-button>
+								<br/>
+							 	<el-link v-if="mode!=='add'&&form.oinfo_json" :href="form.oinfo_json.test_file" type="primary" target="_blank">{{form.oinfo_json.test_file}}</el-link>
 							</sc-upload-file>
 						</el-form-item>
 					</el-col>
@@ -615,6 +617,12 @@ export default {
 			console.log('交接记录查看',data)
 			let that = this;
 			Object.assign(this.form, data);
+			let obj = {};
+			if(data.oinfo_json&&data.oinfo_json.test_file){
+				obj.name=data.oinfo_json.test_file;
+				obj.url=data.oinfo_json.test_file;
+				this.fileList.push(obj);
+			}
 			that.totalCount = 0;
 			that.form.handoverb = data.handoverb;
 			data.handoverb.forEach(item=>{