diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index 8586f00..9b5049d 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -616,932 +616,1066 @@
 
 <script>
 import {
-	listReportWork, getReportWork, delReportWork, addReportWork, getWorkcenterList, getWarehouseList,
-	updateReportWork, reportSap, getBatchList, reportSapCancel,
-	getAllLevelReportList, deleteBomRowNow,
-	getReportSAPList, submitReportPS, submitReportPSSAP, getCKList,
-	getPutInOrderList
+  listReportWork,
+  getReportWork,
+  delReportWork,
+  addReportWork,
+  getWorkcenterList,
+  getWarehouseList,
+  updateReportWork,
+  reportSap,
+  getBatchList,
+  reportSapCancel,
+  getAllLevelReportList,
+  deleteBomRowNow,
+  getReportSAPList,
+  submitReportPS,
+  submitReportPSSAP,
+  getCKList,
+  getPutInOrderList,
 } from "@/api/mes/reportWork";
-import { getConsumeList, submitConsumePS, submitReportInfo, getBomList, getAllLevelConsumeList } from "@/api/mes/reportWorkConsume";
+import {
+  getConsumeList,
+  submitConsumePS,
+  submitReportInfo,
+  getBomList,
+  getAllLevelConsumeList,
+} from "@/api/mes/reportWorkConsume";
 import ReportWorkConsume from "./reportWorkConsume.vue";
 import ItemSelectUser from "./selectUser.vue";
 import ItemSelectWorkOrder from "./selectWorkOrder.vue";
 import ItemSelectMaterial from "./selectMaterial.vue";
 import ItemSelectEquip from "./selectEquip.vue";
-import moment from 'moment';
-import { getlistCK } from '@/api/wms/outorder'
+import moment from "moment";
+import { getlistCK } from "@/api/wms/outorder";
 export default {
-	name: "ReportWork",
-	dicts: ['report_type', 'report_sap_status'],
-	components: { ReportWorkConsume, ItemSelectUser, ItemSelectWorkOrder, ItemSelectEquip, ItemSelectMaterial },
-	data() {
-		return {
-			optType: undefined,
-			// 遮罩层
-			loading: true,
-			// 选中数组
-			ids: [],
-			selectRow: {},
-			// 非单个禁用
-			single: true,
-			// 非多个禁用
-			multiple: true,
-			// 显示搜索条件
-			showSearch: true,
-			// 总条数
-			total: 0,
-			consumeTotal: 0,
-			// 报工报表表格数据
-			reportWorkList: [],
-			libTabs: [],
-			libConsumeTabs: [],
-			pOrderTableList: [],
-			sOrderTableList: [],
-			pConsumeTableList: [],
-			sConsumeTableList: [],
-			pBomTableList: [],
-			sBomTableList: [],
-			activeName0: 'first',
-			activeName: 'pOrder',
-			activeNameR: 'order1',
-			activeNameC: 'consume1',
-			selectedWarehouse: '0004',
-			warehouseList: [],
-			//  SAPCD:"",
-			reportRows: [],
-			pReportRows: [],
-			sReportRows: [],
-			pConsumeRows: [],
-			sConsumeRows: [],
-			consumeRows: [],
-			options1: [],
-			// 弹出层标题
-			title: "",
-			titleConsume: "",
-			titleReport: "",
-			// 是否显示弹出层
-			open: false,
-			openReport: false,
-			openReportSAP: false,
-			openConsume: false,
-			consumeQueryParams: {
-				consumePageNum: 1,
-				consumePageSize: 10,
-				reportCode: null,
-			},
-			// 查询参数
-			queryParams: {
-				createTimeArray: [],
-				feedbackTimeArray: [],
-				pageNum: 1,
-				pageSize: 10,
-				reportType: null,
-				reportCode: null,
-				workorderCode: null,
-				productCode: null,
-				productName: null,
-				spec: null,
-				unit: null,
-				quantity: null,
-				quantityFeedback: null,
-				quantityQualified: null,
-				quantityUnqualified: null,
-				userName: null,
-				nickName: null,
-				feedbackChannel: null,
-				feedbackTime: null,
-				recordUser: null,
-				status: null,
-				workTime: null,
-				machineCode: null,
-				machineName: null,
-				teamCode: null,
-				shiftId: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
-				attr4: null,
-				workorderCodeSap: null,
-				parentOrder: null,
-				uploadStatus: "0"
-			},
-			// 表单参数
-			form: {
-				endReport: '0',
-				consumesInfos: []
-			},
-			formSAdd: {
-				endReport: '0'
-			},
-
-			uploadStatusList: [
-				{ "dictLabel": "待报工", "dictValue": "0" },
-				{ "dictLabel": "报工成功", "dictValue": "1" },
-				{ "dictLabel": "报工失败", "dictValue": "2" }
-			],
-			teamList: [],
-			batchList: [],
-			printDialogVisible: false,
-			// 打印
-			formRef: 'form',
-			printData: {
-				printable: 'printFrom',
-				ignore: ['no-print'],
-				workCenter: "暂无数据",
-				SAPNo: null,
-				manufacture: null,
-				auditor: null,
-				printDate: null,
-				factory: null,
-				productDate: null,
-				workTable: [],
-			},
-			refreshNewWorkerTable: true,
-			//工单遮罩层
-			workerLoading: false,
-			newWorkerLoading: false,
-			//工单重新渲染表格
-			refreshWorkerTable: true,
-			// 表单校验
-			rules: {
-				workorderCode: [
-					{ required: true, message: "本次报工工单不能为空", trigger: "blur" }
-				],
-				quantityFeedback: [
-					{ required: true, message: "本次报工数量不能为空", trigger: "blur" }
-				],
-				feedbackTime: [
-					{ required: true, message: "本次报工时间不能为空", trigger: "blur" }
-				],
-				machineName: [
-					{ required: true, message: "本次报工线体不能为空", trigger: "blur" }
-				]
-				, nickName: [
-					{ required: true, message: "本次报工人不能为空", trigger: "blur" }
-				], workTime: [
-					{ required: true, message: "工时不能为空", trigger: "blur" }
-				], useMan: [
-					{ required: true, message: "用人人不能为空", trigger: "blur" }
-				],
-				quantityFeedbacks: [
-					{ required: true, message: "本次报工数量不能为空", trigger: "blur" }
-				],
-				workTimes: [
-					{ required: true, message: "工时不能为空", trigger: "blur" }
-				], useMans: [
-					{ required: true, message: "用人人不能为空", trigger: "blur" }
-				], workCenter: [
-					{ required: true, message: "工作中心不能为空", trigger: "blur" }
-				],
-			},
-			consumeList: [],
-			cwarehouseList: [],
-			tableIndex: 'tableIndex',
-			// 选择物料汇总
-			pConsumeRowsall:[],
-		};
-	},
-	created() {
-		this.getDate();
-		this.getWorkcenterList();
-		this.getWarehouseList();
-	},
-	methods: {
-		getWorkcenterList() {
-			getWorkcenterList().then(data => {
-				this.options1 = data;
-			});
-		},
-		//获取报工物料损耗仓库下拉列表
-		getWarehouseList() {
-			getWarehouseList({}).then(data => {
-				this.cwarehouseList = data;
-			});
-		},
-		//产品编码格式化
-		productCodeFormate(row, column, cellValue) {
-			if (cellValue != null) {
-				return cellValue.slice(7, 18);  //返回值
-			}
-		},
-		//订单编码格式化
-		orderCodeFormate(row, column, cellValue) {
-			if (cellValue != null) {
-				return cellValue.slice(3, 18);  //返回值
-			}
-		},
-		/**获取默认查询时间段**/
-		getDate() {
-			let start = this.Fungetdate(0)
-			let end = this.Fungetdate(1)
-			//this.queryParams.createTimeArray.push(start,end)
-			this.queryParams.feedbackTimeArray.push(start, end)
-			this.getList();
-		},
-		Fungetdate(num) {
-			var dd = new Date();
-			dd.setDate(dd.getDate() + num);
-			var y = dd.getFullYear();
-			var m = dd.getMonth() + 1;//获取当前月份的日期
-			var d = dd.getDate();
-			return y + "-" + m + "-" + d;
-
-		},
-		/** 查询报工报表列表 */
-		getList() {
-			/**
+  name: "ReportWork",
+  dicts: ["report_type", "report_sap_status"],
+  components: {
+    ReportWorkConsume,
+    ItemSelectUser,
+    ItemSelectWorkOrder,
+    ItemSelectEquip,
+    ItemSelectMaterial,
+  },
+  data() {
+    return {
+      optType: undefined,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      selectRow: {},
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      consumeTotal: 0,
+      // 报工报表表格数据
+      reportWorkList: [],
+      libTabs: [],
+      libConsumeTabs: [],
+      pOrderTableList: [],
+      sOrderTableList: [],
+      pConsumeTableList: [],
+      sConsumeTableList: [],
+      pBomTableList: [],
+      sBomTableList: [],
+      activeName0: "first",
+      activeName: "pOrder",
+      activeNameR: "order1",
+      activeNameC: "consume1",
+      selectedWarehouse: "0004",
+      warehouseList: [],
+      //  SAPCD:"",
+      reportRows: [],
+      pReportRows: [],
+      sReportRows: [],
+      pConsumeRows: [],
+      sConsumeRows: [],
+      consumeRows: [],
+      options1: [],
+      // 弹出层标题
+      title: "",
+      titleConsume: "",
+      titleReport: "",
+      // 是否显示弹出层
+      open: false,
+      openReport: false,
+      openReportSAP: false,
+      openConsume: false,
+      consumeQueryParams: {
+        consumePageNum: 1,
+        consumePageSize: 10,
+        reportCode: null,
+      },
+      // 查询参数
+      queryParams: {
+        createTimeArray: [],
+        feedbackTimeArray: [],
+        pageNum: 1,
+        pageSize: 10,
+        reportType: null,
+        reportCode: null,
+        workorderCode: null,
+        productCode: null,
+        productName: null,
+        spec: null,
+        unit: null,
+        quantity: null,
+        quantityFeedback: null,
+        quantityQualified: null,
+        quantityUnqualified: null,
+        userName: null,
+        nickName: null,
+        feedbackChannel: null,
+        feedbackTime: null,
+        recordUser: null,
+        status: null,
+        workTime: null,
+        machineCode: null,
+        machineName: null,
+        teamCode: null,
+        shiftId: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        attr4: null,
+        workorderCodeSap: null,
+        parentOrder: null,
+        uploadStatus: "0",
+      },
+      // 表单参数
+      form: {
+        endReport: "0",
+        consumesInfos: [],
+      },
+      formSAdd: {
+        endReport: "0",
+      },
+
+      uploadStatusList: [
+        { dictLabel: "待报工", dictValue: "0" },
+        { dictLabel: "报工成功", dictValue: "1" },
+        { dictLabel: "报工失败", dictValue: "2" },
+      ],
+      teamList: [],
+      batchList: [],
+      printDialogVisible: false,
+      // 打印
+      formRef: "form",
+      printData: {
+        printable: "printFrom",
+        ignore: ["no-print"],
+        workCenter: "暂无数据",
+        SAPNo: null,
+        manufacture: null,
+        auditor: null,
+        printDate: null,
+        factory: null,
+        productDate: null,
+        workTable: [],
+      },
+      refreshNewWorkerTable: true,
+      //工单遮罩层
+      workerLoading: false,
+      newWorkerLoading: false,
+      //工单重新渲染表格
+      refreshWorkerTable: true,
+      // 表单校验
+      rules: {
+        workorderCode: [
+          { required: true, message: "本次报工工单不能为空", trigger: "blur" },
+        ],
+        quantityFeedback: [
+          { required: true, message: "本次报工数量不能为空", trigger: "blur" },
+        ],
+        feedbackTime: [
+          { required: true, message: "本次报工时间不能为空", trigger: "blur" },
+        ],
+        machineName: [
+          { required: true, message: "本次报工线体不能为空", trigger: "blur" },
+        ],
+        nickName: [
+          { required: true, message: "本次报工人不能为空", trigger: "blur" },
+        ],
+        workTime: [
+          { required: true, message: "工时不能为空", trigger: "blur" },
+        ],
+        useMan: [
+          { required: true, message: "用人人不能为空", trigger: "blur" },
+        ],
+        quantityFeedbacks: [
+          { required: true, message: "本次报工数量不能为空", trigger: "blur" },
+        ],
+        workTimes: [
+          { required: true, message: "工时不能为空", trigger: "blur" },
+        ],
+        useMans: [
+          { required: true, message: "用人人不能为空", trigger: "blur" },
+        ],
+        workCenter: [
+          { required: true, message: "工作中心不能为空", trigger: "blur" },
+        ],
+      },
+      consumeList: [],
+      cwarehouseList: [],
+      tableIndex: "tableIndex",
+      // 选择物料汇总
+      pConsumeRowsall: [],
+      // 选择物料汇总
+      mergedArray: [],
+    };
+  },
+  created() {
+    this.getDate();
+    this.getWorkcenterList();
+    this.getWarehouseList();
+  },
+  methods: {
+    getWorkcenterList() {
+      getWorkcenterList().then((data) => {
+        this.options1 = data;
+      });
+    },
+    //获取报工物料损耗仓库下拉列表
+    getWarehouseList() {
+      getWarehouseList({}).then((data) => {
+        this.cwarehouseList = data;
+      });
+    },
+    //产品编码格式化
+    productCodeFormate(row, column, cellValue) {
+      if (cellValue != null) {
+        return cellValue.slice(7, 18); //返回值
+      }
+    },
+    //订单编码格式化
+    orderCodeFormate(row, column, cellValue) {
+      if (cellValue != null) {
+        return cellValue.slice(3, 18); //返回值
+      }
+    },
+    /**获取默认查询时间段**/
+    getDate() {
+      let start = this.Fungetdate(0);
+      let end = this.Fungetdate(1);
+      //this.queryParams.createTimeArray.push(start,end)
+      this.queryParams.feedbackTimeArray.push(start, end);
+      this.getList();
+    },
+    Fungetdate(num) {
+      var dd = new Date();
+      dd.setDate(dd.getDate() + num);
+      var y = dd.getFullYear();
+      var m = dd.getMonth() + 1; //获取当前月份的日期
+      var d = dd.getDate();
+      return y + "-" + m + "-" + d;
+    },
+    /** 查询报工报表列表 */
+    getList() {
+      /**
 			if(this.queryParams.createTimeArray !=null && this.queryParams.createTimeArray.length>0){
 				this.queryParams.createTimeStart = moment(this.queryParams.createTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
 				this.queryParams.createTimeEnd = moment(this.queryParams.createTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
 			}**/
 
-			if (this.queryParams.feedbackTimeArray != null && this.queryParams.feedbackTimeArray.length > 0) {
-				this.queryParams.feedbackTimeStart = moment(this.queryParams.feedbackTimeArray[0]).format('YYYY-MM-DD');
-				this.queryParams.feedbackTimeEnd = moment(this.queryParams.feedbackTimeArray[1]).format('YYYY-MM-DD');
-			}
-			this.loading = true;
-			listReportWork(this.queryParams).then(response => {
-				this.reportWorkList = response.rows;
-				this.total = response.total;
-				this.loading = false;
-			});
-		},
-		// 查询明细按钮操作
-		handleView(row) {
-			this.reset();
-			const id = row.id || this.ids;
-			getReportWork(id).then(response => {
-				this.form = response.data;
-				this.open = true;
-				this.title = "查看报工信息";
-				this.optType = "view";
-			});
-		},
-		// 取消按钮
-		cancel() {
-			this.open = false;
-			this.openReport = false;
-			this.openReportSAP = false;
-			this.openConsume = false;
-			this.reset();
-		},
-		getSummaries(param) {
-			const { columns, data } = param;
-			const sums = [];
-			columns.forEach((column, index) => {
-				if (index === 0) {
-					sums[index] = '合计';
-					return;
-				}
-				const values = data.map(item => Number(item[column.property]));
-				if (!values.every(value => isNaN(value)) && column.label != '用人数') {
-					sums[index] = values.reduce((prev, curr) => {
-						const value = Number(curr);
-						if (!isNaN(value)) {
-							return prev + curr;
-						} else {
-							return prev;
-						}
-					}, 0);
-					sums[index] += '';
-					if (sums[index] > 1000000) {
-						sums[index] = '';
-					}
-				} else {
-					sums[index] = '';//N/A
-				}
-			});
-
-			return sums;
-		},
-		// 表单重置
-		reset() {
-			this.form = {
-				id: null,
-				reportType: 'UNI',
-				reportCode: null,
-				workorderCode: null,
-				productCode: null,
-				productName: null,
-				spec: null,
-				unit: null,
-				quantity: null,
-				quantityFeedback: null,
-				quantityQualified: null,
-				quantityUnqualified: null,
-				userName: null,
-				nickName: null,
-				feedbackChannel: 'PC',
-				feedbackTime: null,
-				recordUser: null,
-				status: null,
-				remark: null,
-				workTime: null,
-				machineCode: null,
-				machineName: null,
-				teamCode: null,
-				shiftId: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
-				attr4: null,
-				createBy: null,
-				createTime: null,
-				updateTime: null,
-				updateBy: null,
-				endReport: '0'
-			};
-			this.resetForm("form");
-			this.libTabs = [];
-			this.libConsumeTabs = [];
-			this.pOrderTableList = [];
-			this.sOrderTableList = [];
-			this.pReportRows = [];
-			this.sReportRows = [];
-			this.reportRows = [];
-			this.pConsumeTableList = [];
-			this.sConsumeTableList = [];
-			this.pBomTableList = [],
-				this.sBomTableList = [],
-				this.pConsumeRows = [];
-			this.sConsumeRows = [];
-			this.consumeRows = [];
-			this.consumeList = [];
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNum = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm("queryForm");
-			this.handleQuery();
-		},
-		// 多选框选中数据
-		handleSelectionChange(selection) {
-			this.ids = selection.map(item => item.id)
-			this.selectRow = selection
-			this.single = selection.length !== 1
-			this.multiple = !selection.length
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = "添加报工记录";
-			this.optType = "add";
-		},
-		handleAddSAP(row) {
-			this.reset();
-			let sr = this.selectRow[0];
-
-			if (sr.uploadStatus == '1') {
-				this.optType = 'view'
-			} else {
-				this.optType = ''
-			}
-
-			this.queryParams.workorderCode = sr.workorderCode;
-			// this.SAPCD=sr.workorderCodeSap;
-			//查询母工单报工记录列表
-			this.queryParams.parentOrder = '0';
-			getReportSAPList(this.queryParams).then(response => {
-				this.pOrderTableList = response;
-				this.openReportSAP = true;
-				this.titleReport = "SAP收货";
-			});
-
-
-			// let factoryCode = localStorage.getItem('USER_POOL_NAME_CURRENT').substring(3)
-			//  let params = { factoryCode: factoryCode }; // 构造一个包含工厂代码的对象
-			// let requestBody = JSON.stringify(params)// 将参数对象转换为JSON字符串
-			// getCKList(requestBody).then(response => {
-			//   this.warehouseList = response;
-			// });
-			let factoryCode = localStorage.getItem('USER_POOL_NAME_CURRENT').substring(3)
-			let params = { factoryCode: factoryCode }; // 构造一个包含工厂代码的对象
-			//let paramsJSON = JSON.stringify(params); // 将对象转换为JSON字符串
-			console.log(factoryCode)
-			getCKList(params).then(response => {
-				this.warehouseList = response.data
-			});
-
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			this.optType = "edit";
-			let sr = this.selectRow[0];
-			if (sr.uploadStatus == '1') {
-				this.$modal.msgError(`上传sap成功,不允许修改`);
-				return
-			}
-
-			const id = row.id || this.ids
-			getReportWork(id).then(response => {
-				this.form = response.data;
-				this.open = true;
-				this.title = "修改报工报表";
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs["form"].validate(valid => {
-				if (valid) {
-					if (this.form.id != null) {
-						updateReportWork(this.form).then(response => {
-							this.$modal.msgSuccess("修改成功");
-							this.open = false;
-							this.getList();
-						});
-					} else {
-						addReportWork(this.form).then(response => {
-							this.$modal.msgSuccess("新增成功");
-							this.open = false;
-							this.getList();
-						});
-					}
-				}
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-
-			let sr = this.selectRow[0];
-			if (sr.uploadStatus == '1') {
-				this.$modal.msgError(`上传sap成功,不允许删除`);
-				return
-			}
-
-			const ids = row.id || this.ids;
-			this.$modal.confirm('是否确认删除报工报表编号为"' + ids + '"的数据项？').then(function () {
-				return delReportWork(ids);
-			}).then(() => {
-				this.getList();
-				this.$modal.msgSuccess("删除成功");
-			}).catch(() => { });
-		},
-		/** 报工按钮操作 */
-		handleReport(row) {
-			this.loading = true;
-			let sr = this.selectRow[0];
-			if (sr.uploadStatus == '1') {
-				this.$modal.msgError(`上报sap已完成,不能重复报工`);
-				return
-			}
-
-			const code = sr.workorderCode;
-			let _this = this;
-			this.$modal.confirm('是否确认工单"' + code + '"的数据项向sap报工？').then(function () {
-				reportSap(code).then(response => {
-					if (response != null && response.code == 200) {
-						_this.$modal.msgSuccess("报工成功");
-					}
-					_this.loading = false;
-					_this.getList();
-				});
-			}).then(() => {
-
-			}).catch(() => {
-
-			});
-		},
-		/**报工撤销sap。报工状态回退**/
-		handleReportCancel() {
-			this.loading = true;
-			let sr = this.selectRow[0];
-			const code = sr.workorderCode;
-			let _this = this;
-			this.$modal.confirm('是否确认工单"' + code + '"的数据项撤销sap报工？').then(function () {
-				reportSapCancel(code).then(response => {
-					if (response != null && response.code == 200) {
-						_this.$modal.msgSuccess("报工撤销成功");
-					}
-					_this.loading = false;
-					_this.getList();
-				});
-			}).then(() => {
-
-			}).catch(() => {
-
-			});
-		},
-		/** 报工详情按钮操作 */
-		handleReportHz(row) {
-
-			this.reset();
-			let sr = row;
-			if (sr.workorderCode == undefined) {
-				sr = this.selectRow[0]
-			}
-
-			if (sr.uploadStatus == '1') {
-				this.optType = 'view'
-			} else {
-				this.optType = ''
-			}
-
-			this.queryParams.workorderCode = sr.workorderCode;
-
-			//查询工单报工记录列表
-			getAllLevelReportList(this.queryParams).then(response => {
-				this.queryParams.workorderCode = '';
-				this.openReport = true;
-				this.titleReport = "工单报工详情";
-				this.libTabs = response;
-			});
-		},
-		handleEdit(index, row) {
-			console.log('row:', index, row);
-		},
-		// 多选框选中数据
-		pReportSelection(selection, row) {
-
-			const allRows = this.pReportRows.concat(selection)
-			this.pReportRows = allRows.reduce((acc, cur) => {
-				const hasDuplicate = acc.some(item => item.batch === cur.batch
-					&& item.workorderCode === cur.workorderCode);
-				if (!hasDuplicate) {
-					acc.push(cur);
-				}
-				return acc;
-			}, []);
-
-			// 当取消勾选时，selectedRows 会移除对应的行数据
-			if (selection.indexOf(row) === -1) {
-				console.log('Row unchecked:', row);
-				console.log('过滤前:', this.pReportRows);
-				var newReportRows = [];
-				this.pReportRows.forEach(item => {
-					if (item.workorderCode != row.workorderCode
-						|| item.batch != row.batch) {
-						newReportRows.push(item)
-					}
-				})
-				this.pReportRows = newReportRows;
-				console.log('过滤后:', this.pReportRows);
-			}
-		},
-		allReportSelection(selection) {
-			const allRows = this.pReportRows.concat(selection)
-			this.pReportRows = allRows.reduce((acc, cur) => {
-				const hasDuplicate = acc.some(item => item.batch === cur.batch
-					&& item.workorderCode === cur.workorderCode);
-				if (!hasDuplicate) {
-					acc.push(cur);
-				}
-				return acc;
-			}, []);
-		},
-
-		submitReport() {
-			this.reportRows = this.pReportRows;
-			if (this.reportRows == 0) {
-				this.$modal.msgError(`请选择数据`);
-				return false;
-			}
-			submitReportPS(this.reportRows).then(response => {
-				this.$modal.msgSuccess("报工信息修改成功");
-				this.openReport = false;
-				this.getList();
-			});
-		},
-		submitReportSAP() {
-			this.reportRows = this.pReportRows.concat(this.sReportRows)
-			console.log(this.reportRows)
-			if (this.reportRows == 0) {
-				this.$modal.msgError(`请选择数据`);
-				return false;
-			}
-			this.reportRows.forEach(row => {
-				this.$set(row, 'whCode', this.selectedWarehouse);
-			});
-			console.log("仓库－－－" + this.selectedWarehouse)
-			const reportRowsJson = JSON.stringify(this.reportRows); // 将this.reportRows转换为JSON字符串
-			this.loading = true;
-			submitReportPSSAP(reportRowsJson).then(response => {
-				this.$modal.msgSuccess("操作成功");
-				this.loading = false;
-				this.openReportSAP = false;
-				this.getList();
-			});
-		},
-		/** 报工损耗按钮操作 */
-		handleConsumeHz(row) {
-			this.reset();
-			let sr = row;
-			if (sr.workorderCode == undefined) {
-				sr = this.selectRow[0]
-			}
-
-			if (sr.uploadStatus == '1') {
-				this.optType = 'view'
-			} else {
-				this.optType = ''
-			}
-
-			this.queryParams.workorderCode = sr.workorderCode;
-			//查询母工单报工记录列表
-			getAllLevelConsumeList(this.queryParams).then(response => {
-				this.libConsumeTabs = response;
-				this.openConsume = true;
-				this.titleConsume = "工单报工物料损耗详情";
-				this.queryParams.workorderCode = '';
-			});
-
-			this.queryParams.workorderCode = sr.workorderCode;
-			//查询母工单BOM记录列表
-			//this.queryParams.parentOrder = '0';
-			//getBomList(this.queryParams).then(response => {
-			//	this.pBomTableList = this.handleTree(response, 'materialCode', 'pMaterialCode')
-			//});
-
-		},
-		// 多选框选中数据(报工物料消耗专用特殊逻辑，不准改zxl)
-		pConsumeSelection(selection, row) {
-			const allRows = this.pConsumeRows.concat(selection)
-			this.pConsumeRows = allRows.reduce((acc, cur) => {
-				const hasDuplicate = acc.some(item => item.materialCode === cur.materialCode
-					&& item.workorderCode === cur.workorderCode);
-				if (!hasDuplicate) {
-					acc.push(cur);
-				}
-				return acc;
-			}, []);
-
-			// 当取消勾选时，selectedRows 会移除对应的行数据
-			if (selection.indexOf(row) === -1) {
-				console.log('Row unchecked:', row);
-				console.log('过滤前:', this.pConsumeRows);
-				var newPConsumeRows = [];
-				this.pConsumeRows.forEach(item => {
-					if (item.workorderCode != row.workorderCode
-						|| item.materialCode != row.materialCode) {
-						newPConsumeRows.push(item)
-					}
-				})
-				this.pConsumeRowsall = newPConsumeRows
-				this.pConsumeRows = newPConsumeRows;
-				console.log('过滤后:', this.pConsumeRows,this.pConsumeRows);
-			}
-		},
-		// 多选框选中all数据(报工物料消耗专用特殊逻辑，不准改zxl)
-		allConsumeSelection(selection, row) {
-			const allRows = this.pConsumeRows.concat(selection)
-			this.pConsumeRows = allRows.reduce((acc, cur) => {
-				const hasDuplicate = acc.some(item => item.materialCode === cur.materialCode
-					&& item.workorderCode === cur.workorderCode);
-				if (!hasDuplicate) {
-					acc.push(cur);
-				}
-				return acc;
-			}, []);
-		},
-		sConsumeSelection(selection) {
-			this.sConsumeRows = selection;
-		},
-		submitConsume() {
-			// this.loading = true;
-			this.consumeRows = this.pConsumeRows;
-			console.log(this.consumeRows)
-			if (this.consumeRows == 0) {
-				this.$modal.msgError(`请选择要修改的物料数据！`);
-				this.loading = false;
-				return false;
-			}
-			
-			// submitConsumePS(this.consumeRows).then(response => {
-			// 	this.$modal.msgSuccess("报工信息修改成功");
-			// 	this.openConsume = false;
-			// 	this.reset();
-			// 	this.getList();
-			// 	this.loading = false;
-			// });
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			this.download('mes/reportWork/export', {
-				...this.queryParams
-			}, `reportWork_${new Date().getTime()}.xlsx`)
-		},
-		/**人员选择弹出框**/
-		handleSelectUser() {
-			this.$refs.itemSelectUser.showFlag = true;
-		},
-		//人员选择确认
-		onSelectUser(obj) {
-			this.form.userName = obj.code;
-			this.form.nickName = obj.name;
-		},
-		/**工单选择弹出框**/
-		handleSelectWorkOrder() {
-			this.$refs.itemSelectWorkOrder.showFlag = true;
-		},
-		//工单选择确认
-		onSelectWorkOrder(obj) {
-			this.form.workorderCode = obj.workorderCode;
-			this.form.productName = obj.productName;
-			this.form.productCode = obj.productCode;
-			this.form.productSpc = obj.productSpc;
-			this.form.quantity = obj.quantitySplit;
-			this.form.unit = obj.unit;
-			this.form.workorderCodes = obj.workorderCodes;
-			this.form.productNames = obj.productNames;
-			this.form.productCodes = obj.productCodes;
-			this.form.quantitys = obj.quantitySplits;
-			this.form.units = obj.units;
-			this.form.shiftId = obj.shiftId;
-			this.form.shiftName = obj.shiftName;
-			getBatchList(obj.workorderCode).then(response => {
-				this.batchList = response;
-			});
-
-			this.$refs.child.getListByOrderCode(this.form.workorderCode);
-		},
-		/**线体选择弹出框**/
-		handleSelectEquip() {
-			this.$refs.itemSelectEquip.showFlag = true;
-		},
-		//线体选择确认
-		onSelectEquip(obj) {
-			this.form.machineCode = obj.equipmentCode;
-			this.form.machineName = obj.equipmentName;
-		},
-		//物料损耗确认
-		onSelectMaterial(objs) {
-			this.form.consumesInfos = objs;
-		},
-		//报工提交
-		submitReportInfo() {
-			submitReportInfo(this.form).then(response => {
-				this.$modal.msgSuccess("提交成功");
-				this.open = false;
-				this.getList();
-			});
-		},
-		// 打印预览-浏览器打印
-		handlePrint(params) {
-			printJS({
-				printable: params.printable, // 'printFrom', // 标签元素id
-				type: params.type || 'html',
-				maxWidth: 1500, // 最大宽度
-				font_size: "",// 设置字体大小
-				header: params.header, // '表单',
-				targetStyles: ['*'],
-				style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
-				ignoreElements: params.ignore || [], // ['no-print']
-				properties: params.properties || null
-			})
-		},
-		// 打印预览-点击打印预览按钮
-		showPrint() {
-			// 清楚缓存
-			this.printData.workCenter = "暂无数据";
-			this.printData.printDate = null;
-			this.printData.workTable = [];
-			this.printData.factory = null;
-			this.printData.productDate = null;
-			// 打开工单信息对话框
-			this.printDialogVisible = true;
-			this.printData.printDate = moment(new Date()).format('YYYY.MM.DD');
-			this.printData.manufacture = this.$store.state.user.name;
-			this.newWorkerLoading = true // 设置加载状态为true，表示正在加载
-			this.refreshNewWorkerTable = false // 先将refreshProTable设置为false，隐藏表格
-			getPutInOrderList(this.selectRow[0].workorderCode).then(response => {
-				this.printData.workTable = response.data;
-				this.printData.factory = response.data[0].factoryCode;
-				this.printData.workCenter = response.data[0].workshopName;
-				this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格
-				this.newWorkerLoading = false // 设置加载状态为false，表示加载完成
-			})
-		},
-		//物料损耗表格--删除
-		deleteBomRow(index, rows) {
-			this.$modal.confirm('是否确认删除？确认后，不需要点击下方确定,立马删除！').then(function () {
-				if (rows[index].recordId != null) {
-					return deleteBomRowNow(rows[index].recordId);
-				}
-
-			}).then(() => {
-				var newPConsumeRows = [];
-				this.pConsumeRows.forEach(item => {
-					if (item.workorderCode != rows[index].workorderCode
-						|| item.materialCode != rows[index].materialCode) {
-						newPConsumeRows.push(item)
-					}
-				})
-				this.pConsumeRows = newPConsumeRows;
-				rows.splice(index, 1);
-				this.$modal.msgSuccess("删除成功");
-			}).catch(() => { });
-
-		},
-		//物料损耗表格--新增
-		addConsumeTableRow(rows, index) {
-			this.consumeList = rows;
-			if (rows.length == 0) {
-				this.$modal.msgError(`上位机尚未填写损耗，不允许提前新增`);
-				return
-			}
-
-			this.$refs.itemSelectNewPrepare.showFlag = true;
-			this.$refs.itemSelectNewPrepare.init(rows[0].workorderCode, this.selectRow[0].workorderCode, index, 'bcp');//半成品
-		},
-		//物料损耗表格--新增确认
-		onSelectNewPrepare(obj, tableIndx) {
-			const _this = this
-			this.pConsumeRowsall = Array.from(new Set([...this.pConsumeRowsall, ...obj].map(JSON.stringify))).map(JSON.parse);
-			console.log(this.pConsumeRowsall,this.pConsumeRows,'111111')
-			debugger
-			let sr = this.selectRow[0]
-			for (let i = 0; i < obj.length; i++) {
-				if (this.pConsumeRows.length != 0) {
-					this.pConsumeRows.forEach(item => {
-						if (item.materialCode == obj[i].component) {
-							this.$modal.msgError("选择物料重复,自动过滤！");
-						} else {
-							const row = {
-								workorderCode: obj[i].workorderCode,
-								materialCode: obj[i].component,
-								materialName: obj[i].componentName,
-								quantity: obj[i].quantity,
-								unit: obj[i].unit,
-								recoil: "X",
-								parentOrder: sr.workorderCode
-							};
-							this.consumeList.push(row);
-							this.$nextTick(() => {
-								let dynamicRef = 'tableIndex' + tableIndx;
-								console.log(this.consumeList, row, this.pConsumeRows,'22222')
-								_this.$refs[dynamicRef][0].toggleRowSelection(row);
-
-							});
-						}
-					})
-				} else {
-					const row = {
-						workorderCode: obj[i].workorderCode,
-						materialCode: obj[i].component,
-						materialName: obj[i].componentName,
-						quantity: obj[i].quantity,
-						unit: obj[i].unit,
-						recoil: "X",
-						parentOrder: sr.workorderCode
-					};
-					this.consumeList.push(row);
-
-					// 默认勾选新添加的这一行
-					this.$nextTick(() => {
-						let dynamicRef = 'tableIndex' + tableIndx;
-						console.log(this.consumeList, row, this.pConsumeRows,'333333')
-						_this.$refs[dynamicRef][0].toggleRowSelection(row);
-
-					});
-
-				}
-			}
-		},
-		//添加备注
-		addRemarksblur(table, remark, index) {
-			table.forEach(item => {
-				item.remark = remark;
-			})
-		}
-	}
+      if (
+        this.queryParams.feedbackTimeArray != null &&
+        this.queryParams.feedbackTimeArray.length > 0
+      ) {
+        this.queryParams.feedbackTimeStart = moment(
+          this.queryParams.feedbackTimeArray[0]
+        ).format("YYYY-MM-DD");
+        this.queryParams.feedbackTimeEnd = moment(
+          this.queryParams.feedbackTimeArray[1]
+        ).format("YYYY-MM-DD");
+      }
+      this.loading = true;
+      listReportWork(this.queryParams).then((response) => {
+        this.reportWorkList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 查询明细按钮操作
+    handleView(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getReportWork(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "查看报工信息";
+        this.optType = "view";
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.openReport = false;
+      this.openReportSAP = false;
+      this.openConsume = false;
+      this.reset();
+    },
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+          return;
+        }
+        const values = data.map((item) => Number(item[column.property]));
+        if (
+          !values.every((value) => isNaN(value)) &&
+          column.label != "用人数"
+        ) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] += "";
+          if (sums[index] > 1000000) {
+            sums[index] = "";
+          }
+        } else {
+          sums[index] = ""; //N/A
+        }
+      });
+
+      return sums;
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        reportType: "UNI",
+        reportCode: null,
+        workorderCode: null,
+        productCode: null,
+        productName: null,
+        spec: null,
+        unit: null,
+        quantity: null,
+        quantityFeedback: null,
+        quantityQualified: null,
+        quantityUnqualified: null,
+        userName: null,
+        nickName: null,
+        feedbackChannel: "PC",
+        feedbackTime: null,
+        recordUser: null,
+        status: null,
+        remark: null,
+        workTime: null,
+        machineCode: null,
+        machineName: null,
+        teamCode: null,
+        shiftId: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        attr4: null,
+        createBy: null,
+        createTime: null,
+        updateTime: null,
+        updateBy: null,
+        endReport: "0",
+      };
+      this.resetForm("form");
+      this.libTabs = [];
+      this.libConsumeTabs = [];
+      this.pOrderTableList = [];
+      this.sOrderTableList = [];
+      this.pReportRows = [];
+      this.sReportRows = [];
+      this.reportRows = [];
+      this.pConsumeTableList = [];
+      this.sConsumeTableList = [];
+      (this.pBomTableList = []),
+        (this.sBomTableList = []),
+        (this.pConsumeRows = []);
+      this.sConsumeRows = [];
+      this.consumeRows = [];
+      this.consumeList = [];
+      this.pConsumeRowsall = [];
+      this.mergedArray = [];
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.selectRow = selection;
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加报工记录";
+      this.optType = "add";
+    },
+    handleAddSAP(row) {
+      this.reset();
+      let sr = this.selectRow[0];
+
+      if (sr.uploadStatus == "1") {
+        this.optType = "view";
+      } else {
+        this.optType = "";
+      }
+
+      this.queryParams.workorderCode = sr.workorderCode;
+      // this.SAPCD=sr.workorderCodeSap;
+      //查询母工单报工记录列表
+      this.queryParams.parentOrder = "0";
+      getReportSAPList(this.queryParams).then((response) => {
+        this.pOrderTableList = response;
+        this.openReportSAP = true;
+        this.titleReport = "SAP收货";
+      });
+
+      // let factoryCode = localStorage.getItem('USER_POOL_NAME_CURRENT').substring(3)
+      //  let params = { factoryCode: factoryCode }; // 构造一个包含工厂代码的对象
+      // let requestBody = JSON.stringify(params)// 将参数对象转换为JSON字符串
+      // getCKList(requestBody).then(response => {
+      //   this.warehouseList = response;
+      // });
+      let factoryCode = localStorage
+        .getItem("USER_POOL_NAME_CURRENT")
+        .substring(3);
+      let params = { factoryCode: factoryCode }; // 构造一个包含工厂代码的对象
+      //let paramsJSON = JSON.stringify(params); // 将对象转换为JSON字符串
+      console.log(factoryCode);
+      getCKList(params).then((response) => {
+        this.warehouseList = response.data;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.optType = "edit";
+      let sr = this.selectRow[0];
+      if (sr.uploadStatus == "1") {
+        this.$modal.msgError(`上传sap成功,不允许修改`);
+        return;
+      }
+
+      const id = row.id || this.ids;
+      getReportWork(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改报工报表";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateReportWork(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addReportWork(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      let sr = this.selectRow[0];
+      if (sr.uploadStatus == "1") {
+        this.$modal.msgError(`上传sap成功,不允许删除`);
+        return;
+      }
+
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除报工报表编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delReportWork(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 报工按钮操作 */
+    handleReport(row) {
+      this.loading = true;
+      let sr = this.selectRow[0];
+      if (sr.uploadStatus == "1") {
+        this.$modal.msgError(`上报sap已完成,不能重复报工`);
+        return;
+      }
+
+      const code = sr.workorderCode;
+      let _this = this;
+      this.$modal
+        .confirm('是否确认工单"' + code + '"的数据项向sap报工？')
+        .then(function () {
+          reportSap(code).then((response) => {
+            if (response != null && response.code == 200) {
+              _this.$modal.msgSuccess("报工成功");
+            }
+            _this.loading = false;
+            _this.getList();
+          });
+        })
+        .then(() => {})
+        .catch(() => {});
+    },
+    /**报工撤销sap。报工状态回退**/
+    handleReportCancel() {
+      this.loading = true;
+      let sr = this.selectRow[0];
+      const code = sr.workorderCode;
+      let _this = this;
+      this.$modal
+        .confirm('是否确认工单"' + code + '"的数据项撤销sap报工？')
+        .then(function () {
+          reportSapCancel(code).then((response) => {
+            if (response != null && response.code == 200) {
+              _this.$modal.msgSuccess("报工撤销成功");
+            }
+            _this.loading = false;
+            _this.getList();
+          });
+        })
+        .then(() => {})
+        .catch(() => {});
+    },
+    /** 报工详情按钮操作 */
+    handleReportHz(row) {
+      this.reset();
+      let sr = row;
+      if (sr.workorderCode == undefined) {
+        sr = this.selectRow[0];
+      }
+
+      if (sr.uploadStatus == "1") {
+        this.optType = "view";
+      } else {
+        this.optType = "";
+      }
+
+      this.queryParams.workorderCode = sr.workorderCode;
+
+      //查询工单报工记录列表
+      getAllLevelReportList(this.queryParams).then((response) => {
+        this.queryParams.workorderCode = "";
+        this.openReport = true;
+        this.titleReport = "工单报工详情";
+        this.libTabs = response;
+      });
+    },
+    handleEdit(index, row) {
+      console.log("row:", index, row);
+    },
+    // 多选框选中数据
+    pReportSelection(selection, row) {
+      const allRows = this.pReportRows.concat(selection);
+      this.pReportRows = allRows.reduce((acc, cur) => {
+        const hasDuplicate = acc.some(
+          (item) =>
+            item.batch === cur.batch && item.workorderCode === cur.workorderCode
+        );
+        if (!hasDuplicate) {
+          acc.push(cur);
+        }
+        return acc;
+      }, []);
+
+      // 当取消勾选时，selectedRows 会移除对应的行数据
+      if (selection.indexOf(row) === -1) {
+        console.log("Row unchecked:", row);
+        console.log("过滤前:", this.pReportRows);
+        var newReportRows = [];
+        this.pReportRows.forEach((item) => {
+          if (
+            item.workorderCode != row.workorderCode ||
+            item.batch != row.batch
+          ) {
+            newReportRows.push(item);
+          }
+        });
+        this.pReportRows = newReportRows;
+        console.log("过滤后:", this.pReportRows);
+      }
+    },
+    allReportSelection(selection) {
+      const allRows = this.pReportRows.concat(selection);
+      this.pReportRows = allRows.reduce((acc, cur) => {
+        const hasDuplicate = acc.some(
+          (item) =>
+            item.batch === cur.batch && item.workorderCode === cur.workorderCode
+        );
+        if (!hasDuplicate) {
+          acc.push(cur);
+        }
+        return acc;
+      }, []);
+    },
+
+    submitReport() {
+      this.reportRows = this.pReportRows;
+      if (this.reportRows == 0) {
+        this.$modal.msgError(`请选择数据`);
+        return false;
+      }
+      submitReportPS(this.reportRows).then((response) => {
+        this.$modal.msgSuccess("报工信息修改成功");
+        this.openReport = false;
+        this.getList();
+      });
+    },
+    submitReportSAP() {
+      this.reportRows = this.pReportRows.concat(this.sReportRows);
+      console.log(this.reportRows);
+      if (this.reportRows == 0) {
+        this.$modal.msgError(`请选择数据`);
+        return false;
+      }
+      this.reportRows.forEach((row) => {
+        this.$set(row, "whCode", this.selectedWarehouse);
+      });
+      console.log("仓库－－－" + this.selectedWarehouse);
+      const reportRowsJson = JSON.stringify(this.reportRows); // 将this.reportRows转换为JSON字符串
+      this.loading = true;
+      submitReportPSSAP(reportRowsJson).then((response) => {
+        this.$modal.msgSuccess("操作成功");
+        this.loading = false;
+        this.openReportSAP = false;
+        this.getList();
+      });
+    },
+    /** 报工损耗按钮操作 */
+    handleConsumeHz(row) {
+      this.reset();
+      let sr = row;
+      if (sr.workorderCode == undefined) {
+        sr = this.selectRow[0];
+      }
+
+      if (sr.uploadStatus == "1") {
+        this.optType = "view";
+      } else {
+        this.optType = "";
+      }
+
+      this.queryParams.workorderCode = sr.workorderCode;
+      //查询母工单报工记录列表
+      getAllLevelConsumeList(this.queryParams).then((response) => {
+        this.libConsumeTabs = response;
+        this.openConsume = true;
+        this.titleConsume = "工单报工物料损耗详情";
+        this.queryParams.workorderCode = "";
+      });
+
+      this.queryParams.workorderCode = sr.workorderCode;
+      //查询母工单BOM记录列表
+      //this.queryParams.parentOrder = '0';
+      //getBomList(this.queryParams).then(response => {
+      //	this.pBomTableList = this.handleTree(response, 'materialCode', 'pMaterialCode')
+      //});
+    },
+    // 多选框选中数据(报工物料消耗专用特殊逻辑，不准改zxl)
+    pConsumeSelection(selection, row) {
+      const allRows = this.pConsumeRows.concat(selection);
+      this.pConsumeRows = allRows.reduce((acc, cur) => {
+        const hasDuplicate = acc.some(
+          (item) =>
+            item.materialCode === cur.materialCode &&
+            item.workorderCode === cur.workorderCode
+        );
+        if (!hasDuplicate) {
+          acc.push(cur);
+        }
+        return acc;
+      }, []);
+
+      // 当取消勾选时，selectedRows 会移除对应的行数据
+      if (selection.indexOf(row) === -1) {
+        console.log("Row unchecked:", row);
+        console.log("过滤前:", this.pConsumeRows);
+        var newPConsumeRows = [];
+        this.pConsumeRows.forEach((item) => {
+          if (
+            item.workorderCode != row.workorderCode ||
+            item.materialCode != row.materialCode
+          ) {
+            newPConsumeRows.push(item);
+          }
+        });
+        this.mergedArray = newPConsumeRows;
+        this.pConsumeRows = newPConsumeRows;
+        console.log("过滤后:", this.pConsumeRows);
+      }
+      console.log(this.pConsumeRows, selection, "wwwwww");
+    },
+    // 多选框选中all数据(报工物料消耗专用特殊逻辑，不准改zxl)
+    allConsumeSelection(selection, row) {
+      console.log(this.pConsumeRows, selection, "eeeeee");
+      const allRows = this.pConsumeRows.concat(selection);
+      this.pConsumeRows = allRows.reduce((acc, cur) => {
+        const hasDuplicate = acc.some(
+          (item) =>
+            item.materialCode === cur.materialCode &&
+            item.workorderCode === cur.workorderCode
+        );
+        if (!hasDuplicate) {
+          acc.push(cur);
+        }
+        return acc;
+      }, []);
+    },
+    sConsumeSelection(selection) {
+      this.sConsumeRows = selection;
+    },
+    submitConsume() {
+      // this.loading = true;
+      this.pConsumeRows = this.pConsumeRows.concat(
+        this.mergedArray.filter(
+          (obj2) =>
+            !this.pConsumeRows.some(
+              (obj1) => obj1.materialCode === obj2.materialCode
+            )
+        )
+      );
+      this.consumeRows = this.pConsumeRows;
+      console.log(this.consumeRows, this.mergedArray);
+      if (this.consumeRows == 0) {
+        this.$modal.msgError(`请选择要修改的物料数据！`);
+        this.loading = false;
+        return false;
+      }
+
+      // submitConsumePS(this.consumeRows).then(response => {
+      // 	this.$modal.msgSuccess("报工信息修改成功");
+      // 	this.openConsume = false;
+      // 	this.reset();
+      // 	this.getList();
+      // 	this.loading = false;
+      // });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "mes/reportWork/export",
+        {
+          ...this.queryParams,
+        },
+        `reportWork_${new Date().getTime()}.xlsx`
+      );
+    },
+    /**人员选择弹出框**/
+    handleSelectUser() {
+      this.$refs.itemSelectUser.showFlag = true;
+    },
+    //人员选择确认
+    onSelectUser(obj) {
+      this.form.userName = obj.code;
+      this.form.nickName = obj.name;
+    },
+    /**工单选择弹出框**/
+    handleSelectWorkOrder() {
+      this.$refs.itemSelectWorkOrder.showFlag = true;
+    },
+    //工单选择确认
+    onSelectWorkOrder(obj) {
+      this.form.workorderCode = obj.workorderCode;
+      this.form.productName = obj.productName;
+      this.form.productCode = obj.productCode;
+      this.form.productSpc = obj.productSpc;
+      this.form.quantity = obj.quantitySplit;
+      this.form.unit = obj.unit;
+      this.form.workorderCodes = obj.workorderCodes;
+      this.form.productNames = obj.productNames;
+      this.form.productCodes = obj.productCodes;
+      this.form.quantitys = obj.quantitySplits;
+      this.form.units = obj.units;
+      this.form.shiftId = obj.shiftId;
+      this.form.shiftName = obj.shiftName;
+      getBatchList(obj.workorderCode).then((response) => {
+        this.batchList = response;
+      });
+
+      this.$refs.child.getListByOrderCode(this.form.workorderCode);
+    },
+    /**线体选择弹出框**/
+    handleSelectEquip() {
+      this.$refs.itemSelectEquip.showFlag = true;
+    },
+    //线体选择确认
+    onSelectEquip(obj) {
+      this.form.machineCode = obj.equipmentCode;
+      this.form.machineName = obj.equipmentName;
+    },
+    //物料损耗确认
+    onSelectMaterial(objs) {
+      this.form.consumesInfos = objs;
+    },
+    //报工提交
+    submitReportInfo() {
+      submitReportInfo(this.form).then((response) => {
+        this.$modal.msgSuccess("提交成功");
+        this.open = false;
+        this.getList();
+      });
+    },
+    // 打印预览-浏览器打印
+    handlePrint(params) {
+      printJS({
+        printable: params.printable, // 'printFrom', // 标签元素id
+        type: params.type || "html",
+        maxWidth: 1500, // 最大宽度
+        font_size: "", // 设置字体大小
+        header: params.header, // '表单',
+        targetStyles: ["*"],
+        style: "@page {margin:0 10mm};", // 可选-打印时去掉眉页眉尾
+        ignoreElements: params.ignore || [], // ['no-print']
+        properties: params.properties || null,
+      });
+    },
+    // 打印预览-点击打印预览按钮
+    showPrint() {
+      // 清楚缓存
+      this.printData.workCenter = "暂无数据";
+      this.printData.printDate = null;
+      this.printData.workTable = [];
+      this.printData.factory = null;
+      this.printData.productDate = null;
+      // 打开工单信息对话框
+      this.printDialogVisible = true;
+      this.printData.printDate = moment(new Date()).format("YYYY.MM.DD");
+      this.printData.manufacture = this.$store.state.user.name;
+      this.newWorkerLoading = true; // 设置加载状态为true，表示正在加载
+      this.refreshNewWorkerTable = false; // 先将refreshProTable设置为false，隐藏表格
+      getPutInOrderList(this.selectRow[0].workorderCode).then((response) => {
+        this.printData.workTable = response.data;
+        this.printData.factory = response.data[0].factoryCode;
+        this.printData.workCenter = response.data[0].workshopName;
+        this.refreshNewWorkerTable = true; // 立即将refreshProTable设置为true，显示表格
+        this.newWorkerLoading = false; // 设置加载状态为false，表示加载完成
+      });
+    },
+    //物料损耗表格--删除
+    deleteBomRow(index, rows) {
+      this.$modal
+        .confirm("是否确认删除？确认后，不需要点击下方确定,立马删除！")
+        .then(function () {
+          if (rows[index].recordId != null) {
+            return deleteBomRowNow(rows[index].recordId);
+          }
+        })
+        .then(() => {
+          var newPConsumeRows = [];
+          this.pConsumeRows.forEach((item) => {
+            if (
+              item.workorderCode != rows[index].workorderCode ||
+              item.materialCode != rows[index].materialCode
+            ) {
+              newPConsumeRows.push(item);
+            }
+          });
+          this.pConsumeRows = newPConsumeRows;
+          rows.splice(index, 1);
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    //物料损耗表格--新增
+    addConsumeTableRow(rows, index) {
+      this.consumeList = rows;
+      if (rows.length == 0) {
+        this.$modal.msgError(`上位机尚未填写损耗，不允许提前新增`);
+        return;
+      }
+
+      this.$refs.itemSelectNewPrepare.showFlag = true;
+      this.$refs.itemSelectNewPrepare.init(
+        rows[0].workorderCode,
+        this.selectRow[0].workorderCode,
+        index,
+        "bcp"
+      ); //半成品
+    },
+    //物料损耗表格--新增确认
+    onSelectNewPrepare(obj, tableIndx) {
+      const _this = this;
+      let sr = this.selectRow[0];
+      this.pConsumeRowsall = Array.from(
+        new Set([...this.pConsumeRowsall, ...obj].map(JSON.stringify))
+      ).map(JSON.parse);
+      let arry2 = [];
+      this.pConsumeRowsall.forEach((item) => {
+        const row = {
+          workorderCode: item.workorderCode,
+          materialCode: item.component,
+          materialName: item.componentName,
+          quantity: item.quantity,
+          unit: item.unit,
+          recoil: "X",
+          parentOrder: sr.workorderCode,
+        };
+        arry2.push(row);
+      });
+      this.mergedArray = this.pConsumeRows.concat(
+        arry2.filter(
+          (obj2) =>
+            !this.pConsumeRows.some(
+              (obj1) => obj1.materialCode === obj2.materialCode
+            )
+        )
+      );
+      console.log(
+        this.pConsumeRowsall,
+        this.pConsumeRows,
+        "111111",
+        this.mergedArray
+      );
+      const materialCodeSet = new Set(
+        this.pConsumeRows.map((item) => item.materialCode)
+      );
+
+      // 遍历obj数组
+      for (let i = 0; i < obj.length; i++) {
+        // 判断obj中的component是否已存在于pConsumeRows中
+        if (!materialCodeSet.has(obj[i].component)) {
+          const row = {
+            workorderCode: obj[i].workorderCode,
+            materialCode: obj[i].component,
+            materialName: obj[i].componentName,
+            quantity: obj[i].quantity,
+            unit: obj[i].unit,
+            recoil: "X",
+            parentOrder: sr.workorderCode,
+          };
+          // 将满足条件的行数据添加到consumeList中
+          this.consumeList.push(row);
+          this.pConsumeRows.push(row);
+          this.$nextTick(() => {
+            let dynamicRef = "tableIndex" + tableIndx;
+            console.log(this.consumeList, row, this.pConsumeRows, "22222");
+            _this.$refs[dynamicRef][0].toggleRowSelection(row);
+          });
+        } else {
+          this.$modal.msgError("选择物料重复,自动过滤！");
+        }
+      }
+      // this.pConsumeRows = this.mergedArray
+      // for (let i = 0; i < obj.length; i++) {
+      // 	if (this.pConsumeRows.length != 0) {
+      // 		this.pConsumeRows.forEach(item => {
+      // 			console.log(item.materialCode == obj[i].component)
+      // 			if (item.materialCode == obj[i].component) {
+      // 				this.$modal.msgError("选择物料重复,自动过滤！");
+      // 			} else {
+      // 				const row = {
+      // 					workorderCode: obj[i].workorderCode,
+      // 					materialCode: obj[i].component,
+      // 					materialName: obj[i].componentName,
+      // 					quantity: obj[i].quantity,
+      // 					unit: obj[i].unit,
+      // 					recoil: "X",
+      // 					parentOrder: sr.workorderCode
+      // 				};
+      // 				this.consumeList.push(row);
+      // 				this.$nextTick(() => {
+      // 					let dynamicRef = 'tableIndex' + tableIndx;
+      // 					console.log(this.consumeList, row, this.pConsumeRows,'22222')
+      // 					_this.$refs[dynamicRef][0].toggleRowSelection(row);
+      // 				});
+      // 			}
+      // 		})
+      // 	} else {
+      // 		const row = {
+      // 			workorderCode: obj[i].workorderCode,
+      // 			materialCode: obj[i].component,
+      // 			materialName: obj[i].componentName,
+      // 			quantity: obj[i].quantity,
+      // 			unit: obj[i].unit,
+      // 			recoil: "X",
+      // 			parentOrder: sr.workorderCode
+      // 		};
+      // 		this.consumeList.push(row);
+
+      // 		// 默认勾选新添加的这一行
+      // 		this.$nextTick(() => {
+      // 			let dynamicRef = 'tableIndex' + tableIndx;
+      // 			console.log(this.consumeList, row, this.pConsumeRows,'333333')
+      // 			_this.$refs[dynamicRef][0].toggleRowSelection(row);
+      // 		});
+
+      // 	}
+      // }
+    },
+    //添加备注
+    addRemarksblur(table, remark, index) {
+      table.forEach((item) => {
+        item.remark = remark;
+      });
+    },
+  },
 };
 </script>
 <style scoped>
 .print-btn {
-	margin-bottom: 15px;
-	margin-left: 10px;
+  margin-bottom: 15px;
+  margin-left: 10px;
 }
 
 .center-text {
-	text-align: center;
+  text-align: center;
 }
 
 .report-logo {
-	margin-top: 15px;
-	margin-left: 15px;
-	height: 38px;
+  margin-top: 15px;
+  margin-left: 15px;
+  height: 38px;
 }
 
 .button-container {
-	text-align: right;
-	margin-top: 10px;
-	margin-right: 10px;
+  text-align: right;
+  margin-top: 10px;
+  margin-right: 10px;
 }
 
 .my-print-table {
-	font-size: 20px;
+  font-size: 20px;
 }
 
 .my-print-nav {
-	font-size: 19px;
+  font-size: 19px;
 }
 
 .my-print-foot {
-	font-size: 19px;
+  font-size: 19px;
 }
 </style>