Merge branch 'projects/mesxc-test' into projects/mesxc-zjl
This commit is contained in:
		@@ -92,7 +92,9 @@ export default {
 | 
			
		||||
					param: 'searchTime',
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: 'button',
 | 
			
		||||
					type: this.$auth.hasPermi('cost:energyCost:query')
 | 
			
		||||
						? 'button'
 | 
			
		||||
						: '',
 | 
			
		||||
					btnName: '查询',
 | 
			
		||||
					name: 'search',
 | 
			
		||||
					color: 'primary',
 | 
			
		||||
 
 | 
			
		||||
@@ -116,7 +116,9 @@ export default {
 | 
			
		||||
					defaultSelect: [],
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: 'button',
 | 
			
		||||
					type: this.$auth.hasPermi('cost:energyCostHis:query')
 | 
			
		||||
						? 'button'
 | 
			
		||||
						: '',
 | 
			
		||||
					btnName: '查询',
 | 
			
		||||
					name: 'search',
 | 
			
		||||
					color: 'primary',
 | 
			
		||||
 
 | 
			
		||||
@@ -124,7 +124,9 @@ export default {
 | 
			
		||||
					filterable: true,
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: 'button',
 | 
			
		||||
					type: this.$auth.hasPermi('cost:rawMaterialConfig:query')
 | 
			
		||||
						? 'button'
 | 
			
		||||
						: '',
 | 
			
		||||
					btnName: '查询',
 | 
			
		||||
					name: 'search',
 | 
			
		||||
					color: 'primary',
 | 
			
		||||
 
 | 
			
		||||
@@ -97,7 +97,9 @@ export default {
 | 
			
		||||
					param: 'searchTime',
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: 'button',
 | 
			
		||||
					type: this.$auth.hasPermi('cost:rawMaterialCost:query')
 | 
			
		||||
						? 'button'
 | 
			
		||||
						: '',
 | 
			
		||||
					btnName: '查询',
 | 
			
		||||
					name: 'search',
 | 
			
		||||
					color: 'primary',
 | 
			
		||||
 
 | 
			
		||||
@@ -115,7 +115,9 @@ export default {
 | 
			
		||||
					defaultSelect: [],
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: 'button',
 | 
			
		||||
					type: this.$auth.hasPermi('cost:rawMaterialCostHis:query')
 | 
			
		||||
						? 'button'
 | 
			
		||||
						: '',
 | 
			
		||||
					btnName: '查询',
 | 
			
		||||
					name: 'search',
 | 
			
		||||
					color: 'primary',
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user