center-lims-before-ruoyi.git

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

gaoluyang

2025-03-10 2f5d64825dbc81f9732893ee9f3de1a38725ae25

分支
用户	gaoluyang <2820782392@qq.com>
	星期一, 三月 10, 2025 17:12 +0800
提交者	gaoluyang <2820782392@qq.com>
	星期一, 三月 10, 2025 17:12 +0800
提交	2f5d64825dbc81f9732893ee9f3de1a38725ae25
目录	fae930c963d6919594b9b97e4cbf2fb08ffa1c0a 目录 \| zip \| gz
上一版本	d3793edc9e3479f162c0cab6930d17c919ecacae 查看 \| 对比 14d29f928b24d203e76f1dcefc1a51182657cd45 查看 \| 对比

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

已添加37个文件

已修改8个文件

	src/api/cnas/personnel/personalOverview.js	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/api/cnas/personnel/personnelInfo.js	819 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/assets/images/renyuan-title.svg	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/Editor/index.vue	36 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/FileUpload/index.vue	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/ImageUpload/index.vue	48 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/Table/value-table.vue	45 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/materialOrder/filesLookVisible.vue	54 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personalOverview/index.vue	242 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/Communicate/Add.vue	116 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/Communicate/index.vue	213 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/JobResponsibilities/index.vue	364 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/Mandate/Add.vue	198 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/Mandate/index.vue	228 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/PersonnelCapacity/index.vue	567 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/PersonnelInformation/index.vue	947 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/PersonnelList/index.vue	319 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/PersonnelTraining/AddInDetail.vue	319 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/PersonnelTraining/Edit.vue	580 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/PersonnelTraining/index.vue	1012 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/Plan/Add.vue	172 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/Plan/UploadExcel.vue	44 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/Plan/index.vue	484 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/Records/Add.vue	234 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/Records/control/Step/ConditionForm.vue	145 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/Records/control/Step/Inform.vue	103 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/Records/control/Step/MeasureForm.vue	110 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/Records/control/Step/RectifyForm.vue	101 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/Records/control/index.vue	312 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/Records/dispose/Step/Fact.vue	108 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/Records/dispose/Step/Measure.vue	121 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/Records/dispose/Step/Reason.vue	122 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/Records/dispose/Step/Result.vue	111 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/Records/dispose/index.vue	239 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/Records/index.vue	406 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/Records/supervise/ApproveForm.vue	84 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/Records/supervise/SuperviseForm.vue	201 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/TrainingRecord/index.vue	285 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/rewardPunishmentRecord/index.vue	316 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/components/trackRecord/index.vue	298 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/Department/index.vue	156 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/personnel/personnelInfo/index.vue	297 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/CNAS/systemManagement/measuresDealRisks/components/hazardIdentificationRiskAssessment.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/structural/capabilityAndLaboratory/capability/index.vue	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/structural/capabilityAndLaboratory/laboratory/index.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史