l

src/view/performance/jjgzzhys.vue

@@ -146,20 +146,17 @@ const jjgzzhysclick = async () => {
   };
   console.log(formattedData);
   const staffSalaryCount_add = await staffSalaryCount(formattedData);//调用接口
-<<<<<<< HEAD
   console.log(staffSalaryCount_add);
   // if (staffSalaryCount_add.code === 0) {
   //   ElMessage({type: 'success',message: msg})
   // }else{
   //   ElMessage({type: 'error',message: '更新失败'})
   // }
-=======
   if (staffSalaryCount_add.code === 0) {
     ElMessage({type: 'success',message: msg})
   }else{
     ElMessage({type: 'error',message: '更新成功'})
   }
->>>>>>> de9ed826175bbf174cd077b307a9089dbda4147c
 };
 </script>
 <style scoped>