first commit

src/api/mes/job.js

@@ -990,3 +990,20 @@ export const Apibomlistarr = (params) => {
   })
 }
 
+//获取近期报工历史订单信息数据
+export const order_Patchwork = (params) => {
+  return service({
+    url: '/mes_server/work_order/order_Patchwork',
+    method: 'get',
+    params
+  })
+}
+//补打小票
+export const Patchwork = (params) => {
+  return service({
+    url: '/mes_server/work_order/Patchwork',
+    method: 'get',
+    params
+  })
+}
+

src/view/performance/QualityAssessment/SemiFinishedRework.vue

@@ -421,15 +421,13 @@ const handleNodeClick = async (node) => {
       code: '返工'
     });
     
-    
-
-    if (response.code === 0 && response.data?.data) {
+    if (response.data.data) {
       // 清空并更新表格数据
       tableData.splice(0, tableData.length, ...response.data.data);
     } else {
       tableData.splice(0, tableData.length);
     }
-    if (excelresponse.code === 0 && excelresponse.data?.data) {
+    if (excelresponse.data.data) {
       // 清空并更新Excel表格数据
       exceltableData.splice(0, exceltableData.length, ...excelresponse.data.data);
     } else {

src/view/performance/baozhuangbaogong.vue

@@ -424,7 +424,7 @@ const ddtableData = reactive([])
 // 查询按钮
 const add_onSubmit = async ()=>{
 	if(add_formData['机台号'] === ''){
-		ElMessage({type: 'warning',message: '未获取到机台'})
+		warningres('未获取到机台')
 		return false;
 	}
 	sizeDatas.length = 0;
@@ -432,7 +432,7 @@ const add_onSubmit = async ()=>{
 	if(add_searchInfo.value === '' || add_searchInfo.value === undefined){
 		const WorkListdata = [];
 		add_tableData.splice(0,add_tableData.length,...WorkListdata);
-		ElMessage({type: 'warning',message: '请扫描小票二维码' })
+		warningres('请扫描小票二维码')
 		return false;
 	}
   
@@ -447,12 +447,17 @@ const add_onSubmit = async ()=>{
 	 _order.value = add_searchInfo.value;
 	 //获取下面报工历史记录
 	 const getSpotLists = await getSpotList({order:add_searchInfo.value,code:_code,sys_sbID:add_formData['机台号']});
+	 if(getSpotLists.data.code === 1){
+	 		 warningres(getSpotLists.msg)
+	 }
 	 //获取尺码
 	 sizeDatas.splice(0, getSpotLists.data.headers.length, ...getSpotLists.data.headers); //型号数据
 	 if(getSpotLists.data.result.ci_num === 0 || getSpotLists.data.result.ci_num === '0'){
-		 ElMessage({type: 'error',message: '已上报，无需再次报工' })
+		 errorres('已上报，无需再次报工')
 		 add_searchInfo.value = ''
 	 }
+	 
+		 
 	 console.log(getSpotLists)
 	 if(getSpotLists.data === null){
 		 add_searchInfo.value = ''
@@ -565,16 +570,16 @@ const currentSlValue=ref('')
 //报工
 const add_Dialog = async ()=>{
 	if(add_formData['机台号'] === '测试机台'){
-		ElMessage({ type: 'warning', message: '测试机台禁止报工' });
+		warningres('测试机台禁止报工')
 		return;
 	}
  if(add_formData['上报数量'] === ''){
-    ElMessage({type: 'warning',message: '上报数量为空，请填写上报数量'})
+	 warningres('上报数量为空，请填写上报数量')
 	return;
   }
   
   if(_order.value === ''){
-    ElMessage({type: 'warning',message: '请重新扫描小票二维码'})
+	  warningres('请重新扫描小票二维码')
 	return;
   }else{
 		let params ={}
@@ -608,7 +613,7 @@ const add_Dialog = async ()=>{
 			add_formData['上报数量']=''
 			add_formData['剩余数量']=''
 		 add_searchInfo.value = ''
-			ElMessage({type: 'success', message: '报工成功'});  
+		 successres('报工成功')
 		}
 
   }
@@ -650,7 +655,7 @@ const add_xpSelectionChange = async (selection) => {
   console.log(selection.length)
   selectedRows.value = selection; 
   if (selection.length === 0) {
-	  ElMessage({type: 'warning', message: '请勾选打印的数据' });
+	  warningres('请勾选打印的数据')
 	  return false;
   }else if(selection.length>0){
 	  allPrintData.value = selection.map((row) => {
@@ -681,7 +686,7 @@ const add_xpSelectionChange = async (selection) => {
 const bgSelection = ref(null)
 const baogong_del = () => {
   if(bgSelection.value === null || bgSelection.value === ''){
-		ElMessage({type: 'warning',message: '请选择删除的数据' })
+	  warningres('请选择删除的数据')
   }else{
 	   console.log(bgSelection.value)
   }
@@ -709,7 +714,7 @@ const del_delclick = async () => {
 	console.log(Selection.value)
 	console.log(add_formData['组别'])
 	const res1 = await spotcheckdel({UniqId:Selection.value,sys_id:add_formData['组别']})
-	res1.code === 0 && ElMessage.success('删除成功')
+	res1.code === 0 && successres('删除成功')
 	add_onSubmit()
 }
   
@@ -731,6 +736,40 @@ page.value = 10;//默认显示
 pageSize.value = val;
 _getStaffList();
 };
+
+
+// 成功
+const successres = (arr) => {
+    ElMessage({
+        type: '',
+        dangerouslyUseHTMLString: true,
+        // duration: 0,  // 不自动关闭
+        message: `<strong style="font-size: 60px; color: black; background-color: #80FA80; padding: 30px 280px; width: 482px; line-height: 60px; text-align: center; display: block;">${arr}</strong>`,
+        customClass: 'custom-warning-message'
+    });
+}
+
+// 失败
+const errorres = (arr) => {
+    ElMessage({
+        type: '',
+        dangerouslyUseHTMLString: true,
+        // duration: 0,  // 不自动关闭
+		message: `<strong style="font-size: 60px; color: white; background-color: red; padding: 30px 280px; width: 482px; line-height: 60px; text-align: center; display: block;">${arr}</strong>`,
+        customClass: 'custom-warning-message'
+    });
+}
+
+// 警告
+const warningres = (arr) => {
+    ElMessage({
+        type: '',
+        dangerouslyUseHTMLString: true,
+        // duration: 0,  // 不自动关闭
+		message: `<strong style="font-size: 60px; color: black; background-color: #f5ff2f; padding: 30px 280px; width: 482px; line-height: 60px; text-align: center; display: block;">${arr}</strong>`,
+        customClass: 'custom-warning-message'
+    });
+}
 </script>
 <style scoped>
 .form-container {

src/view/performance/caiqiebaogong.vue

@@ -510,7 +510,7 @@ const add_onSubmit = async ()=>{
 	const WorkListdata = [];
 	// add_tableData.splice(0,add_tableData.length,...WorkListdata);
 	jdhz_tableData.splice(0,jdhz_tableData.length,...WorkListdata);
-	ElMessage({type: 'warning',message: '搜索内容不能为空' })
+	warningres('搜索内容不能为空')
 	return;
   }
   // 如果没有以"DC"开头，自动补充添加DC 
@@ -630,7 +630,7 @@ const _searchInput = async ()=>{
 //子订单详情页
 const cp_gdprintonClick = async () => {
 	if(add_searchInfo.value === '' || add_searchInfo.value === null){
-		ElMessage({ type: 'warning', message: '请扫描子订单（条码）后再查看' });
+		warningres('请扫描子订单（条码）后再查看')
 		return false;
 	}
 	SubOrderPageRef.value.open(add_searchInfo.value,add_formData['工序']) 
@@ -654,25 +654,25 @@ const add_Dialog = async () => {
 
 
 	if(add_formData['机台号'] === '测试机台'){
-		ElMessage({ type: 'warning', message: '测试机台禁止报工' });
+		warningres('测试机台禁止报工')
 		return;
 	}
 	if (!add_formData['机台号']) {
-	    ElMessage({ type: 'warning', message: '未获取到机台' });
+		warningres('未获取到机台')
 	    return false;
 	}
 	if (!_order.value) {
-	    ElMessage({ type: 'warning', message: '请扫描子订单（条码）后，在进行报工' });
+		warningres('请扫描子订单（条码）后，在进行报工')
 	    return;
 	}
 	if (!add_searchInfo.value) {
-	    ElMessage({ type: 'warning', message: '请扫描子订单（条码）后，在进行报工' });
+		warningres('请扫描子订单（条码）后，在进行报工')
 	    return;
 	}
 	// 检查新增实裁数是否都为空
 	const isAllEmpty = Array.from({ length: 10 }, (_, i) => scsformdata[`scs${i + 1}`]).every(value => !value);
 	if (isAllEmpty) {
-	    ElMessage({ type: 'warning', message: '请至少填写一个报工数据' });
+		warningres('请至少填写一个报工数据')
 	    return;
 	}
 	
@@ -726,7 +726,7 @@ const add_Dialog = async () => {
 		}
 	}
 	if (paramsList.length === 0) {
-		ElMessage({type: 'info',message: '请填写实裁数'});
+		warningres('请填写实裁数')
 		return;
 	}
 	let allSuccess = true;
@@ -764,6 +764,7 @@ const add_Dialog = async () => {
 	    const baogong_getInfo = await getInfo(params);
 	   if (baogong_getInfo.code === 0) {
 	           ElMessage({ type: 'success', message: '报工成功' });
+			   successres('报工成功')
 			   //查询更新数据
 			   add_onSubmit()
 			   //光标跳转input
@@ -788,7 +789,7 @@ const add_Dialog = async () => {
 
 const gd_yulan = () => {
   if(add_searchInfo.value === '' || add_searchInfo.value === null){
-    ElMessage({type: 'warning',message: '请选择具体的工单后，再操作此功能'})
+	warningres('请选择具体的工单后，再操作此功能')
     return false;
   }else{
     const order = add_searchInfo.value.split('-')[0]
@@ -817,7 +818,7 @@ const del_delclick = async () => {
     const isAllMatch = selectedJtbhArray.every(jtbh => jtbh === add_formData['机台号']); // 检查所有值是否匹配
 
     if (!isAllMatch) {
-        ElMessage({ type: 'warning', message: '请选择与机台号相同的记录' });
+		warningres('请选择与机台号相同的记录')
         return false;
     }
 
@@ -835,7 +836,7 @@ const del_delclick = async () => {
             console.log(add_formData['组别']);
             const res1 = await spotcheckdel({ UniqId: Selection.value, sys_id: add_formData['组别'] });
             if (res1.code === 0) {
-                ElMessage.success('删除成功');
+				successres('删除成功')
                 Selection.value = '';
                 add_onSubmit();
             }
@@ -869,6 +870,41 @@ const handleSizeChange = (val) => {
   pageSize.value = val;
   _getStaffList();
 };
+
+
+
+// 成功
+const successres = (arr) => {
+    ElMessage({
+        type: '',
+        dangerouslyUseHTMLString: true,
+        // duration: 0,  // 不自动关闭
+        message: `<strong style="font-size: 60px; color: black; background-color: #80FA80; padding: 30px 280px; width: 482px; line-height: 60px; text-align: center; display: block;">${arr}</strong>`,
+        customClass: 'custom-warning-message'
+    });
+}
+
+// 失败
+const errorres = (arr) => {
+    ElMessage({
+        type: '',
+        dangerouslyUseHTMLString: true,
+        // duration: 0,  // 不自动关闭
+		message: `<strong style="font-size: 60px; color: white; background-color: red; padding: 30px 280px; width: 482px; line-height: 60px; text-align: center; display: block;">${arr}</strong>`,
+        customClass: 'custom-warning-message'
+    });
+}
+
+// 警告
+const warningres = (arr) => {
+    ElMessage({
+        type: '',
+        dangerouslyUseHTMLString: true,
+        // duration: 0,  // 不自动关闭
+		message: `<strong style="font-size: 60px; color: black; background-color: #f5ff2f; padding: 30px 280px; width: 482px; line-height: 60px; text-align: center; display: block;">${arr}</strong>`,
+        customClass: 'custom-warning-message'
+    });
+}
 </script>
 
 <style scoped>

src/view/performance/chafengbaogong.vue

@@ -69,8 +69,6 @@
 						  </el-col>
 					  </el-row>
 					  
-					  
-					  
 					  <el-row :gutter="0">
 					    <el-col :span="2.5">
 					      <el-text style="font-size: 24px; margin-left: 37px;">尺 码&nbsp;</el-text>
@@ -84,8 +82,7 @@
 					      :style="{
 					        padding: '0', 
 					        margin:'0px 16px 0px 0px' 
-					      }"
-					    >
+					      }">
 					      <el-input 
 					        v-model="cmformdata[`cm${index + 1}`]" 
 					        :id="`cm${index + 1}`" 
@@ -97,16 +94,13 @@
 							  index < 4 ? '75px' : 
 							  '100px', 
 					          height: '40px'
-					        }"
-					      />
+					        }"/>
 					    </el-col>
 					  
 					    <!-- 总输入框 -->
 					    <el-col :span="1">
 					      <el-input v-model="cmformdata.cmtotal" id="cmtotal" readonly style="width: 65px; height: 40px;" />
 					    </el-col>
-					  
-					   
 					  </el-row>
 					  
 					  <el-row :gutter="0">
@@ -432,7 +426,7 @@ const luckyexcelPageRef = ref()//pdf预览
 //子订单详情页
 const cp_gdprintonClick = async () => {
 	if(add_searchInfo.value === '' || add_searchInfo.value === null){
-		ElMessage({ type: 'warning', message: '请扫描子订单（条码）后再查看' });
+		warningres("请扫描子订单（条码）后再查看")
 		return false;
 	}
 	SubOrderPageRef.value.open(add_searchInfo.value,add_formData['工序']) 
@@ -645,7 +639,11 @@ const showPdf = async (row) => {
 	//查询
 	const add_onSubmit = async () => {
 		if(add_formData['机台号'] === ''){
-			ElMessage({type: 'warning',message: '未获取到机台'})
+			warningres('未获取到机台')
+			return false;
+		}
+		if(add_searchInfo.value === ''){
+			warningres('请先扫描子订单')
 			return false;
 		}
 		sizeDatas.length = 0;
@@ -657,10 +655,7 @@ const showPdf = async (row) => {
 		if (add_searchInfo.value === '' || add_searchInfo.value === undefined) {
 			const WorkListdata = [];
 			add_tableData.splice(0, add_tableData.length, ...WorkListdata);
-			ElMessage({
-				type: 'warning',
-				message: '请扫描小票二维码'
-			})
+			warningres('未查询到报工历史数据')
 		} else {
 			//获取报工历史记录
 			const getSpotLists = await getSpotList({order: add_searchInfo.value,code: _code,sys_sbID: add_formData['机台号']});
@@ -670,10 +665,7 @@ const showPdf = async (row) => {
 			_list.value = getSpotLists.data.list
 			
 			if (!add_searchInfo.value.includes('-') && getSpotLists.data.records.length === 0) {
-				ElMessage({
-					type: 'warning',
-					message: '未查询到报工历史数据'
-				})
+				warningres('未查询到报工历史数据')
 				return false;
 			}
 			
@@ -733,10 +725,6 @@ const showPdf = async (row) => {
 				}
 			}
 			updateTotal()
-			// //历史记录
-			// if (getSpotLists.data.headers) {
-				
-			// }
 		}
 	}
 	
@@ -773,25 +761,23 @@ const add_Dialog = async () => {
     }
     // 禁用按钮
     isClickable = false;
-
     // 设置定时器，2 秒后重新启用按钮
     setTimeout(() => {
         isClickable = true;
     }, 2000);
 
 		if(add_formData['机台号'] === '测试机台'){
-			ElMessage({ type: 'warning', message: '测试机台禁止报工' });
+			warningres("测试机台禁止报工")
 			return;
 		}
 		sizeDatas.length = 0;
 		add_tableData.length = 0;
-		// console.log(_serial.value)
 		if (_serial.value === NaN) {
-			ElMessage({type: 'warning',message: '网络异常.请检查'})
+			warningres("网络异常.请检查")
 			return fasle;
 		}
 		if (add_searchInfo.value === '') {
-			ElMessage({type: 'warning',message: '请扫描子订单编号输入数量后，再进行上报'})
+			warningres("请扫描子订单编号输入数量后，再进行上报")
 			return fasle;
 		}
 		//尺码
@@ -890,10 +876,7 @@ const add_Dialog = async () => {
 
 			search.value = '';
 			// add_searchInfo.value = ''; 
-			ElMessage({
-				type: 'success',
-				message: '报工成功'
-			});
+			successres('报工成功')
 			// 上报成功后 清空所有输入框上报数量
 			  if (slformdata) {
 			    for (let i = 1; i <= 14; i++) {
@@ -1014,18 +997,12 @@ let allParams = [];
 //补打小票按钮
 const add_bdprintxp = () => {
 	if (selectedSizes.value.length === 0) {
-		ElMessage({
-			type: 'warning',
-			message: '请选择补打尺码'
-		});
+		warningres('请选择补打尺码')
 		return false;
 	}
 	console.log(_table_row['组别'])
 	if(_table_row['组别'] != add_formData['组别']){
-		ElMessage({
-			type: 'warning',
-			message: '请到对应小组进行补打小票'
-		});
+		warningres('请到对应小组进行补打小票')
 		return false;
 	}
 
@@ -1081,10 +1058,7 @@ const add_printxp = async () => {
 	let allParams = []; // 用于存储所有要打印的参数对象  
 	let allParamss = ref([]); // 用于存储所有要打印的参数对象
 	if (!slArray.some(item => item !== "" && item !== null && item !== undefined)) {
-		ElMessage({
-			type: 'warning',
-			message: '请填写上报数量后再使用打印功能'
-		});
+		warningres('请填写上报数量后再使用打印功能')
 		return;
 	} else {
 		for (let i = 0; i < slArray.length; i++) {
@@ -1157,7 +1131,7 @@ const del_delclick = async () => {
     const isAllMatch = selectedJtbhArray.every(组别 => 组别 === add_formData['组别']); // 检查所有值是否匹配
 
     if (!isAllMatch) {
-        ElMessage({ type: 'warning', message: '请选择与机台号相同的记录' });
+		warningres('请选择与机台号相同的记录')
         return false;
     }
     try {
@@ -1173,7 +1147,7 @@ const del_delclick = async () => {
             console.log(add_formData['组别']);
             const res1 = await spotcheckdel({ UniqId: Selection.value, sys_id: add_formData['组别'] });
             if (res1.code === 0) {
-                ElMessage.success('删除成功');
+				successres('删除成功')
                 Selection.value = '';
                 add_onSubmit();
             }
@@ -1202,6 +1176,41 @@ const handleSizeChange = (val) => {
 	pageSize.value = val;
 	_getStaffList();
 };
+
+
+
+// 成功
+const successres = (arr) => {
+    ElMessage({
+        type: '',
+        dangerouslyUseHTMLString: true,
+        // duration: 0,  // 不自动关闭
+        message: `<strong style="font-size: 60px; color: black; background-color: #80FA80; padding: 30px 280px; width: 482px; line-height: 60px; text-align: center; display: block;">${arr}</strong>`,
+        customClass: 'custom-warning-message'
+    });
+}
+
+// 失败
+const errorres = (arr) => {
+    ElMessage({
+        type: '',
+        dangerouslyUseHTMLString: true,
+        // duration: 0,  // 不自动关闭
+		message: `<strong style="font-size: 60px; color: white; background-color: red; padding: 30px 280px; width: 482px; line-height: 60px; text-align: center; display: block;">${arr}</strong>`,
+        customClass: 'custom-warning-message'
+    });
+}
+
+// 警告
+const warningres = (arr) => {
+    ElMessage({
+        type: '',
+        dangerouslyUseHTMLString: true,
+        // duration: 0,  // 不自动关闭
+		message: `<strong style="font-size: 60px; color: black; background-color: #f5ff2f; padding: 30px 280px; width: 482px; line-height: 60px; text-align: center; display: block;">${arr}</strong>`,
+        customClass: 'custom-warning-message'
+    });
+}
 </script>
 <style scoped>
 	:deep(.el-table__body .status-plan-usage-low) {

src/view/performance/houdaoshougong.vue

@@ -213,7 +213,7 @@
 		  <!-- </el-main> -->
 		</layout-content>
 	  </layout>
-	
+	  
 	  <!-- PDF预览页面 -->
 	  <SubOrderPage ref="SubOrderPageRef" />
 	  <!-- <PrintPage ref="printPageRef" /> -->
@@ -277,8 +277,9 @@ import $ from 'jquery';
 import LuckyExcel from 'luckyexcel';
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import {hiprint} from "vue-plugin-hiprint";
-import {ref, reactive,nextTick,watch, setBlockTracking } from 'vue'
-import {getSpotList,search,getTab,OrderAttachments,getTabByGdbh,spotcheckdel } from '@/api/mes/job'
+import {ref, reactive,nextTick,watch, setBlockTracking,computed } from 'vue';
+import { Search } from '@element-plus/icons-vue';
+import {getSpotList,search,getTab,OrderAttachments,getTabByGdbh,spotcheckdel,order_Patchwork,Patchwork} from '@/api/mes/job'
 import {getMachineMac} from '@/api/jixiaoguanli/jitairibaobiao'
 import {getMac} from '@/api/jixiaoguanli/baogong'
 import PrintPage from '../yunyin/shengchanguanli/components/print.vue';
@@ -294,10 +295,11 @@ console.log(path)
 const SubOrderPageRef = ref()
 // const printPageRef = ref()
 
+
 //子订单详情页
 const gd_yulan = async () => {
 	if(add_searchInfo.value === '' || add_searchInfo.value === null){
-		ElMessage({ type: 'warning', message: '请扫描子订单（条码）后再查看' });
+		warningres('请扫描子订单（条码）后再查看')
 		return false;
 	}
 	console.log(add_searchInfo.value.split(',')[0])
@@ -344,6 +346,8 @@ const add_formData = reactive({
 	是否订单尾包: '',
 });
 
+
+
 //物理地址获取机台编号
 const getMachineMacdata = async () => {
   console.log(_code,"机台获取物理地址",Machine.value)
@@ -424,7 +428,7 @@ const ddtableData = reactive([])
 // 查询按钮
 const add_onSubmit = async ()=>{
 	if(add_formData['机台号'] === ''){
-		ElMessage({type: 'warning',message: '未获取到机台'})
+		warningres('未获取到机台')
 		return false;
 	}
 	sizeDatas.length = 0;
@@ -432,7 +436,7 @@ const add_onSubmit = async ()=>{
 	if(add_searchInfo.value === '' || add_searchInfo.value === undefined){
 		const WorkListdata = [];
 		add_tableData.splice(0,add_tableData.length,...WorkListdata);
-		ElMessage({type: 'warning',message: '请扫描小票二维码' })
+		warningres('请扫描小票二维码')
 		return false;
 	}
   
@@ -450,7 +454,7 @@ const add_onSubmit = async ()=>{
 	 //获取尺码
 	 sizeDatas.splice(0, getSpotLists.data.headers.length, ...getSpotLists.data.headers); //型号数据
 	 if(getSpotLists.data.result.ci_num === 0 || getSpotLists.data.result.ci_num === '0'){
-		 ElMessage({type: 'error',message: '已上报，无需再次报工' })
+		 errorres('已上报，无需再次报工')
 		 add_searchInfo.value = ''
 	 }
 	 console.log(getSpotLists)
@@ -552,7 +556,7 @@ function baogongslpd() {
   const totalQuantity = parseInt(add_formData['剩余数量'], 10) || 0; 
   
   if (reportedQuantity > totalQuantity) {  
-    ElMessage({ type: 'warning', message: '上报数量不能大于剩余数量' });  
+	warningres('上报数量不能大于剩余数量')
     add_Dialogonclick.value = false;  
   }else if(reportedQuantity === ''){
 	add_Dialogonclick.value = false;  
@@ -580,16 +584,17 @@ const add_Dialog = async () => {
     }, 2000);
 
 	if(add_formData['机台号'] === '测试机台'){
-		ElMessage({ type: 'warning', message: '测试机台禁止报工' });
+		warningres('测试机台禁止报工')
 		return;
 	}
  if(add_formData['上报数量'] === ''){
-    ElMessage({type: 'warning',message: '上报数量为空，请填写上报数量'})
+	warningres('上报数量为空，请填写上报数量')
 	return;
   }
   
   if(_order.value === ''){
     ElMessage({type: 'warning',message: '请重新扫描小票二维码'})	
+	warningres('请重新扫描小票二维码')
 	return;
   }else{
 		let params ={}
@@ -623,7 +628,7 @@ const add_Dialog = async () => {
 			add_formData['上报数量']=''
 			add_formData['剩余数量']=''
 		 add_searchInfo.value = ''
-			ElMessage({type: 'success', message: '报工成功'});  
+			successres('报工成功')
 		}
 
   }
@@ -666,7 +671,7 @@ const add_xpSelectionChange = async (selection) => {
   console.log(selection.length)
   selectedRows.value = selection; 
   if (selection.length === 0) {
-	  ElMessage({type: 'warning', message: '请勾选打印的数据' });
+	  warningres('请勾选打印的数据')
 	  return false;
   }else if(selection.length>0){
 	  allPrintData.value = selection.map((row) => {
@@ -697,7 +702,7 @@ const add_xpSelectionChange = async (selection) => {
 const bgSelection = ref(null)
 const baogong_del = () => {
   if(bgSelection.value === null || bgSelection.value === ''){
-		ElMessage({type: 'warning',message: '请选择删除的数据' })
+		warningres('请选择删除的数据')
   }else{
 	   console.log(bgSelection.value)
   }
@@ -780,6 +785,40 @@ page.value = 10;//默认显示
 pageSize.value = val;
 _getStaffList();
 };
+
+
+// 成功
+const successres = (arr) => {
+    ElMessage({
+        type: '',
+        dangerouslyUseHTMLString: true,
+        // duration: 0,  // 不自动关闭
+        message: `<strong style="font-size: 60px; color: black; background-color: #80FA80; padding: 30px 280px; width: 482px; line-height: 60px; text-align: center; display: block;">${arr}</strong>`,
+        customClass: 'custom-warning-message'
+    });
+}
+
+// 失败
+const errorres = (arr) => {
+    ElMessage({
+        type: '',
+        dangerouslyUseHTMLString: true,
+        // duration: 0,  // 不自动关闭
+		message: `<strong style="font-size: 60px; color: white; background-color: red; padding: 30px 280px; width: 482px; line-height: 60px; text-align: center; display: block;">${arr}</strong>`,
+        customClass: 'custom-warning-message'
+    });
+}
+
+// 警告
+const warningres = (arr) => {
+    ElMessage({
+        type: '',
+        dangerouslyUseHTMLString: true,
+        // duration: 0,  // 不自动关闭
+		message: `<strong style="font-size: 60px; color: black; background-color: #f5ff2f; padding: 30px 280px; width: 482px; line-height: 60px; text-align: center; display: block;">${arr}</strong>`,
+        customClass: 'custom-warning-message'
+    });
+}
 </script>
 <style scoped>
 .form-container {