product-inventory-management.git

产品进销存-前端

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

lishenao

9 天以前 fde27654b1b21a8d2c149d3d12f86c3c7314c091

分支
用户	lishenao <3065849776@qq.com>
	星期四, 七月 3, 2025 15:00 +0800
提交者	lishenao <3065849776@qq.com>
	星期四, 七月 3, 2025 15:00 +0800
提交	fde27654b1b21a8d2c149d3d12f86c3c7314c091
目录	5cfe6969ef81d0ba063ea1e075734ee5119f3699 目录 \| zip \| gz
上一版本	4ceaadfe421507c9cd0c32094d04ca938d518311 查看 \| 对比 e42b6e5111af314399a17b669789fb2f960e93a3 查看 \| 对比

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

# Conflicts:
#	src/views/inventoryManagement/dispatchLog/index.vue
#	src/views/inventoryManagement/issueManagement/index.vue
#	src/views/inventoryManagement/receiptManagement/index.vue
#	src/views/inventoryManagement/stockManagement/index.vue

已修改26个文件

已添加4个文件

	src/api/qualityManagement/metricMaintenance.js	34 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/basicData/customerFile/index.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/basicData/product/index.vue	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/basicData/supplierManage/index.vue	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/equipmentManagement/ledger/Form.vue	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/equipmentManagement/ledger/Modal.vue	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/equipmentManagement/ledger/index.vue	172 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/equipmentManagement/repair/Form/MaintainForm.vue	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/equipmentManagement/repair/Form/RepairForm.vue	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/equipmentManagement/repair/Modal/RepairModal.vue	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/equipmentManagement/repair/index.vue	147 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/equipmentManagement/upkeep/Form/MaintenanceForm.vue	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/equipmentManagement/upkeep/Form/PlanForm.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/equipmentManagement/upkeep/index.vue	143 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/inventoryManagement/dispatchLog/index.vue	224 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/inventoryManagement/issueManagement/index.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/inventoryManagement/receiptManagement/index.vue	149 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/inventoryManagement/stockManagement/index.vue	19 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/personnelManagement/contractManagement/components/formDia.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/personnelManagement/contractManagement/index.vue	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/personnelManagement/dimission/components/formDia.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/personnelManagement/dimission/index.vue	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/personnelManagement/employeeRecord/components/formDia.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/personnelManagement/employeeRecord/index.vue	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/personnelManagement/onboarding/components/formDia.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/personnelManagement/onboarding/index.vue	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/qualityManagement/metricMaintenance/index.vue	176 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/qualityManagement/rawMaterialInspection/components/filesDia.vue	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/qualityManagement/rawMaterialInspection/components/formDia.vue	107 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/qualityManagement/rawMaterialInspection/index.vue	224 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史