Merge remote-tracking branch 'origin/dev' into dev

spring

5 天以前 4538de1fa692cf5454ae7b1b061a8c298be96821

 src/views/personnelManagement/contractManagement/components/formDia.vue

@@ -26,7 +26,7 @@
import {ref} from "vue";
import {staffOnJobInfo} from "@/api/personnelManagement/employeeRecord.js";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['confirm'])
const emit = defineEmits(['close'])

const dialogFormVisible = ref(false);
const operationType = ref('')