diff --git a/src/views/safetyManagement/wasteGasSet/components/dosingRecord.vue b/src/views/safetyManagement/wasteGasSet/components/dosingRecord.vue
index 82b9759c..3c6d319f 100644
--- a/src/views/safetyManagement/wasteGasSet/components/dosingRecord.vue
+++ b/src/views/safetyManagement/wasteGasSet/components/dosingRecord.vue
@@ -16,14 +16,26 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
+ @sort-change="sortChange"
+ :permission="permissionList"
:search.sync="search"
>
- 新增
- 删 除
+
+ 新增
+
+
+ 删 除
+
- 导入
+
+ 导入
+
@@ -59,6 +71,7 @@ import {
update,
getDosingManList,
} from '@/api/safetyManagement/dosingRecord.js';
+import { mapGetters } from 'vuex';
export default {
components: {
basicImport,
@@ -249,6 +262,15 @@ export default {
},
};
},
+ computed: {
+ ...mapGetters(['permission']),
+ permissionList() {
+ return {
+ editBtn: this.validData(this.permission.processingRecord1_edit, false),
+ delBtn: this.validData(this.permission.processingRecord1_del, false),
+ };
+ },
+ },
mounted() {
this.fetchDosingManList();
},
@@ -373,6 +395,20 @@ export default {
this.query = {};
this.onLoad(this.page);
},
+ // 排序
+ sortChange({ prop, order }) {
+ if (!prop) {
+ // 如果取消排序,清空排序参数
+ this.query.orderByField = undefined;
+ this.query.isAsc = undefined;
+ } else {
+ const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
+ this.query.orderByField = orderByField;
+ this.query.isAsc = order === 'ascending' ? true : false;
+ }
+ // 重新加载数据
+ this.onLoad(this.page, this.query);
+ },
// 加载页面数据
onLoad(page, params = {}) {
this.loading = true;
diff --git a/src/views/safetyManagement/wasteGasSet/components/wasteGasRunRec.vue b/src/views/safetyManagement/wasteGasSet/components/wasteGasRunRec.vue
index 4d72b92e..55480d50 100644
--- a/src/views/safetyManagement/wasteGasSet/components/wasteGasRunRec.vue
+++ b/src/views/safetyManagement/wasteGasSet/components/wasteGasRunRec.vue
@@ -16,6 +16,8 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
+ @sort-change="sortChange"
+ :permission="permissionList"
>
@@ -58,6 +60,7 @@