Merge branch 'projects/mesxc-test' into projects/mesxc-zhp

src/views/cost/energyCost/index.vue

@@ -92,7 +92,7 @@ export default {
 					param: 'searchTime',
 				},
 				{
-					type: this.$auth.hasPermi('cost:energyCost:query')
+					type: this.$auth.hasPermi('extend:cost-energy-search:query')
 						? 'button'
 						: '',
 					btnName: '查询',
@@ -100,7 +100,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('cost:energyCost:export')
+					type: this.$auth.hasPermi('extend:cost-energy-search:export')
 						? 'button'
 						: '',
 					btnName: '导出',

src/views/cost/energyCostHis/index.vue

@@ -116,7 +116,7 @@ export default {
 					defaultSelect: [],
 				},
 				{
-					type: this.$auth.hasPermi('cost:energyCostHis:query')
+					type: this.$auth.hasPermi('extend:cost-enery-auto-report:query')
 						? 'button'
 						: '',
 					btnName: '查询',
@@ -124,7 +124,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('cost:energyCostHis:export')
+					type: this.$auth.hasPermi('extend:cost-enery-auto-report:export')
 						? 'button'
 						: '',
 					btnName: '导出',

src/views/cost/rawMaterialConfig/index.vue

@@ -101,13 +101,13 @@ export default {
 			},
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi(`cost:rawMaterialConfig:update`)
+				this.$auth.hasPermi(`extend:cost-material-set:update`)
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
 					: undefined,
-				this.$auth.hasPermi(`cost:rawMaterialConfig:delete`)
+				this.$auth.hasPermi(`extend:cost-material-set:delete`)
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -124,7 +124,7 @@ export default {
 					filterable: true,
 				},
 				{
-					type: this.$auth.hasPermi('cost:rawMaterialConfig:query')
+					type: this.$auth.hasPermi('extend:cost-material-set:query')
 						? 'button'
 						: '',
 					btnName: '查询',
@@ -133,13 +133,13 @@ export default {
 				},
 				{
 					type:
-						this.$auth.hasPermi('cost:rawMaterialConfig:create') &&
-						this.$auth.hasPermi('cost:rawMaterialConfig:query')
+						this.$auth.hasPermi('extend:cost-material-set:create') &&
+						this.$auth.hasPermi('extend:cost-material-set:query')
 							? 'separate'
 							: '',
 				},
 				{
-					type: this.$auth.hasPermi('cost:rawMaterialConfig:create')
+					type: this.$auth.hasPermi('extend:cost-material-set:create')
 						? 'button'
 						: '',
 					btnName: '新增',

src/views/cost/rawMaterialCost/index.vue

@@ -97,7 +97,7 @@ export default {
 					param: 'searchTime',
 				},
 				{
-					type: this.$auth.hasPermi('cost:rawMaterialCost:query')
+					type: this.$auth.hasPermi('extend:cost-material-search:query')
 						? 'button'
 						: '',
 					btnName: '查询',
@@ -105,7 +105,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('cost:rawMaterialCost:export')
+					type: this.$auth.hasPermi('extend:cost-material-search:export')
 						? 'button'
 						: '',
 					btnName: '导出',

src/views/cost/rawMaterialCostHis/index.vue

@@ -115,7 +115,7 @@ export default {
 					defaultSelect: [],
 				},
 				{
-					type: this.$auth.hasPermi('cost:rawMaterialCostHis:query')
+					type: this.$auth.hasPermi('extend:cost-material-auto-report:query')
 						? 'button'
 						: '',
 					btnName: '查询',
@@ -123,7 +123,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('cost:rawMaterialCostHis:export')
+					type: this.$auth.hasPermi('extend:cost-material-auto-report:export')
 						? 'button'
 						: '',
 					btnName: '导出',