Merge remote-tracking branch 'origin/main'
This commit is contained in:
		
						commit
						23362cd6e5
					
				| @ -224,11 +224,9 @@ | |||||||
| <script> | <script> | ||||||
| import { listMaterial, getMaterial, delMaterial, addMaterial, updateMaterial } from "@/api/system/material"; | import { listMaterial, getMaterial, delMaterial, addMaterial, updateMaterial } from "@/api/system/material"; | ||||||
| import { listMaterialGroup } from "@/api/system/materialGroup"; | import { listMaterialGroup } from "@/api/system/materialGroup"; | ||||||
| import imgUpload from '@/components/FileUpload/imgFileUpload' |  | ||||||
| export default { | export default { | ||||||
|   name: "Material", |   name: "Material", | ||||||
|   components:{ |   components:{ | ||||||
|     imgUpload |  | ||||||
|   }, |   }, | ||||||
|   data() { |   data() { | ||||||
|     return { |     return { | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user