diff --git a/src/views/qualityManagement/tankSolutionSystem/workTankManagement.vue b/src/views/qualityManagement/tankSolutionSystem/workTankManagement.vue
index 121b8efa..0ef8f5c6 100644
--- a/src/views/qualityManagement/tankSolutionSystem/workTankManagement.vue
+++ b/src/views/qualityManagement/tankSolutionSystem/workTankManagement.vue
@@ -18,15 +18,21 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
+      @sort-change="sortChange"
+      :permission="permissionList"
     >
       <template #menu-left>
-        <el-button type="danger" @click="handleDelete">删 除 </el-button>
+        <el-button type="danger" v-if="permission.workTankManagement_del" @click="handleDelete">
+          删 除
+        </el-button>
       </template>
       <template #menu-right>
-        <el-button type="primary"  @click="handleImport">导入 </el-button>
+        <el-button type="primary" v-if="permission.workTankManagement_import" @click="handleImport">
+          导入
+        </el-button>
       </template>
-      <template #status-desc="{type}">
-        <p v-if="type == 'edit'" style="color:red">注：作业槽停用将停止下发槽液任务</p>
+      <template #status-desc="{ type }">
+        <p v-if="type == 'edit'" style="color: red">注：作业槽停用将停止下发槽液任务</p>
       </template>
       <template #status="{ row }">
         <div style="display: flex; align-items: center; justify-content: center">
@@ -58,8 +64,14 @@
 </template>
 
 <script>
-import {getList,addWorkTank,updateWorkTank,deleteWorkTank} from "@/api/basicData/workTankManagement"
+import {
+  getList,
+  addWorkTank,
+  updateWorkTank,
+  deleteWorkTank,
+} from '@/api/basicData/workTankManagement';
 import basicImport from '@/components/basic-import/main.vue';
+import { mapGetters } from 'vuex';
 export default {
   components: {
     basicImport,
@@ -108,11 +120,11 @@ export default {
         showOverflowTooltip: true,
         align: 'center',
         searchLabelPosition: 'left',
-        searchLabelWidth:'auto',
+        searchLabelWidth: 'auto',
         searchGutter: 24,
         searchSpan: 6,
         menuAlign: 'center',
-        menuWidth:120,
+        menuWidth: 120,
         gridBtn: false,
         searchMenuPosition: 'right',
         column: [
@@ -120,7 +132,7 @@ export default {
             label: '作业中心',
             prop: 'workstationId',
             type: 'select',
-            sortable: true,
+            sortable: 'custom',
             filter: true,
             span: 24,
             search: true,
@@ -132,19 +144,19 @@ export default {
                 trigger: 'blur',
               },
             ],
-            dicUrl:"/api/blade-desk/BA/WorkCenter/listForSelect",
-            props:{
-              label:"wcName",
-              value:"id"
-            }
+            dicUrl: '/api/blade-desk/BA/WorkCenter/listForSelect',
+            props: {
+              label: 'wcName',
+              value: 'id',
+            },
           },
           {
             label: '槽号',
             prop: 'workTankCode',
             search: true,
-            sortable: true,
+            sortable: 'custom',
             filter: true,
-            searchOrder:1,
+            searchOrder: 1,
             // addDisplay: false,
             // editDisplay: false,
             // viewDisplay: false,
@@ -161,7 +173,7 @@ export default {
             label: '作业槽描述',
             prop: 'name',
             search: false,
-            sortable: true,
+            sortable: 'custom',
             filter: true,
             span: 24,
             rules: [
@@ -177,7 +189,7 @@ export default {
             prop: 'status',
             type: 'switch',
             search: true,
-            sortable: true,
+            sortable: 'custom',
             filter: true,
             span: 24,
             value: 1,
@@ -185,12 +197,13 @@ export default {
               { label: '暂停使用', value: 0 },
               { label: '使用', value: 1 },
             ],
+            width: 110,
           },
           {
             label: '操作人',
             prop: 'opUserRealName',
             search: false,
-            sortable: true,
+            sortable: 'custom',
             filter: true,
             editDisplay: false,
             addDisplay: false,
@@ -202,12 +215,13 @@ export default {
                 trigger: 'blur',
               },
             ],
+            width: 100,
           },
           {
             label: '更新时间',
             prop: 'updateTime',
             search: false,
-            sortable: true,
+            sortable: 'custom',
             editDisplay: false,
             filter: true,
             addDisplay: false,
@@ -219,6 +233,7 @@ export default {
                 trigger: 'blur',
               },
             ],
+            width: 180,
           },
         ],
       },
@@ -250,31 +265,40 @@ export default {
       selectionList: [],
     };
   },
-  mounted() {},
+  computed: {
+    ...mapGetters(['permission']),
+    permissionList() {
+      return {
+        addBtn: this.validData(this.permission.workTankManagement_add, false),
+        editBtn: this.validData(this.permission.workTankManagement_edit, false),
+        delBtn: this.validData(this.permission.workTankManagement_del, false),
+      };
+    },
+  },
   methods: {
     beforeOpen(done, type) {
-      if(type === 'edit') {
+      if (type === 'edit') {
         // 将 workstationId 转换为字符串以匹配下拉框的 value 类型
-        if(this.form.workstationId) {
-          this.form.workstationId = this.form.workstationId + ''
+        if (this.form.workstationId) {
+          this.form.workstationId = this.form.workstationId + '';
         }
       }
-      done()
+      done();
     },
-   // 点击导入按钮
+    // 点击导入按钮
     handleImport() {
-      this.isShowImport = true
+      this.isShowImport = true;
     },
-    closeDialog(val){
-      this.isShowImport = false
-      if(val){
-        this.onLoad()
+    closeDialog(val) {
+      this.isShowImport = false;
+      if (val) {
+        this.onLoad();
       }
     },
-    handleDelete(){
-      if(this.selectionList.length == 0){
-        this.$message.error('请至少选择一条数据')
-        return
+    handleDelete() {
+      if (this.selectionList.length == 0) {
+        this.$message.error('请至少选择一条数据');
+        return;
       }
       this.$confirm('确定将选择数据删除?', {
         confirmButtonText: '确定',
@@ -282,15 +306,14 @@ export default {
         type: 'warning',
       }).then(() => {
         deleteWorkTank({
-          ids:this.selectionList.map(item => item.id).join(',')
-        }).then(res =>{
-          if(res.data.code == 200){
-            this.$message.success('删除成功')
-            this.onLoad()
+          ids: this.selectionList.map(item => item.id).join(','),
+        }).then(res => {
+          if (res.data.code == 200) {
+            this.$message.success('删除成功');
+            this.onLoad();
           }
-        })
+        });
       });
-      
     },
     // 多选
     selectionChange(list) {
@@ -305,32 +328,35 @@ export default {
       // if(row.workstationId) {
       //   row.workstationId = parseInt(row.workstationId)
       // }
-      updateWorkTank(row).then(res =>{
-        if(res.data.code == 200){
-          this.$message.success('修改成功')
-          this.onLoad()
-          done()
-        }
-      }).catch(err =>{
-        loading()
-      })
+      updateWorkTank(row)
+        .then(res => {
+          if (res.data.code == 200) {
+            this.$message.success('修改成功');
+            this.onLoad();
+            done();
+          }
+        })
+        .catch(err => {
+          loading();
+        });
     },
     rowSave(row, done, loading) {
-      console.log('row-------------------',row)
-      row.status = row.status == "" ? 0 : row.status
+      row.status = row.status == '' ? 0 : row.status;
       // 将 workstationId 转为数字类型
       // if(row.workstationId) {
       //   row.workstationId = parseInt(row.workstationId)
       // }
-      addWorkTank(row).then(res =>{
-        if(res.data.code == 200){
-          this.$message.success('新增成功')
-          this.onLoad()
-          done()
-        }
-      }).catch(err =>{
-        loading(false)
-      })
+      addWorkTank(row)
+        .then(res => {
+          if (res.data.code == 200) {
+            this.$message.success('新增成功');
+            this.onLoad();
+            done();
+          }
+        })
+        .catch(err => {
+          loading(false);
+        });
     },
     searchReset() {
       this.query = {};
@@ -349,14 +375,14 @@ export default {
         type: 'warning',
       }).then(() => {
         deleteWorkTank({
-          ids:row.id
-        }).then(res =>{
-          if(res.data.code == 200){
-            this.$message.success('删除成功')
-            this.onLoad()
-            done()
+          ids: row.id,
+        }).then(res => {
+          if (res.data.code == 200) {
+            this.$message.success('删除成功');
+            this.onLoad();
+            done();
           }
-        })
+        });
       });
     },
     currentChange(currentPage) {
@@ -367,18 +393,29 @@ export default {
     },
     refreshChange() {
       this.onLoad(this.page, this.query);
+    },
+        // 排序
+    sortChange({ prop, order }) {
+      this.query.descs = undefined;
+      this.query.ascs = undefined;
+      let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs';
+      this.query[orderByFieldKey] = !prop
+        ? undefined
+        : prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
+      // // 重新加载数据
+      this.onLoad(this.page, this.query);
     },
     onLoad() {
       this.loading = true;
       getList({
-        current:this.page.currentPage,
-        size:this.page.pageSize,
-        ...this.query
-      }).then(res =>{
-        this.data = res.data.data.records
-        this.page.total = res.data.data.total
-        this.loading = false
-      })
+        current: this.page.currentPage,
+        size: this.page.pageSize,
+        ...this.query,
+      }).then(res => {
+        this.data = res.data.data.records;
+        this.page.total = res.data.data.total;
+        this.loading = false;
+      });
     },
   },
 };