From 2f486945f009d236ba42a2cd0d29021885ea6f22 Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Tue, 28 Apr 2026 13:29:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE-=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=AE=9A=E9=A2=9D=E8=A1=A8-=E9=87=91=E6=8A=BC?=
 =?UTF-8?q?=E5=AE=9A=E9=A2=9D-=E6=96=B0=E5=A2=9E=E6=8E=92=E5=BA=8F/?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=20=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE-?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=AE=9A=E9=A2=9D=E8=A1=A8-=E9=93=B6?=
 =?UTF-8?q?=E6=9D=BF=E5=AE=9A=E9=A2=9D-=E6=96=B0=E5=A2=9E=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F/=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../materialQuota/components/KAu.vue          | 139 +++++++++---------
 .../materialQuota/components/silverAnode.vue  |  54 +++++--
 2 files changed, 117 insertions(+), 76 deletions(-)

diff --git a/src/views/basicData/materialQuota/components/KAu.vue b/src/views/basicData/materialQuota/components/KAu.vue
index 6775149f..c4ff8a9d 100644
--- a/src/views/basicData/materialQuota/components/KAu.vue
+++ b/src/views/basicData/materialQuota/components/KAu.vue
@@ -1,32 +1,17 @@
 <template>
   <div>
-    <avue-crud
-      :option="option"
-      :table-loading="loading"
-      :data="data"
-      v-model="form"
-      v-model:page="page"
-      ref="crud"
-      @row-del="rowDel"
-      :before-open="beforeOpen"
-      @row-save="rowSave"
-      @row-update="rowUpdate"
-      @search-change="searchChange"
-      @search-reset="searchReset"
-      @selection-change="selectionChange"
-      @current-change="currentChange"
-      @size-change="sizeChange"
-      @refresh-change="refreshChange"
-      @on-load="onLoad"
-    >
+    <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
+      @row-del="rowDel" :before-open="beforeOpen" @row-save="rowSave" @row-update="rowUpdate"
+      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
+      @sort-change="sortChange" :permission="permissionList">
       <template #menu-left>
         <!-- <el-button type="primary" icon="el-icon-plus" @click="addEdit">新增 </el-button> -->
-        <el-button type="danger"  @click="handleDelete"
-          >删除
+        <el-button type="danger" v-if="permission.materialQuota1_del" @click="handleDelete">删除
         </el-button>
       </template>
       <template #menu-right>
-        <el-button type="primary"  @click="handleImport">导入 </el-button>
+        <el-button type="primary" v-if="permission.materialQuota1_import" @click="handleImport">导入 </el-button>
       </template>
       <template #menu="scope">
         <!-- <el-button type="text" @click="editFn(scope.row)">编辑 </el-button> -->
@@ -48,25 +33,24 @@
     </avue-crud>
     <!-- 导入 -->
     <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
-      templateUrl="/blade-desk/BA/MaterialQuota/downloadExcelTemplate"
-      templateName="金钾定额模板.xls"
-      importUrl="/blade-desk/BA/MaterialQuota/importExcel"
-     @closeDialog="closeDialog"></basic-import>
+      templateUrl="/blade-desk/BA/MaterialQuota/downloadExcelTemplate" templateName="金钾定额模板.xls"
+      importUrl="/blade-desk/BA/MaterialQuota/importExcel" @closeDialog="closeDialog"></basic-import>
   </div>
 </template>
 <script>
 import basicImport from '@/components/basic-import/main.vue'
-import {getList,addQuota,updateQuota,deleteQuota} from "@/api/basicData/materialQuota"
+import { getList, addQuota, updateQuota, deleteQuota } from "@/api/basicData/materialQuota"
+import { mapGetters } from 'vuex';
 export default {
   components: {
     basicImport,
   },
   data() {
     return {
-      isShowImport:false,
+      isShowImport: false,
       selectionList: [],
-      loading:{},
-      query:{},
+      loading: {},
+      query: {},
       option: {
         height: "auto",
         calcHeight: 32,
@@ -119,11 +103,11 @@ export default {
           {
             label: "镀层厚度",
             prop: "thickness",
-            sortable: true,
+            sortable: 'custom',
             filter: true,
             span: 24,
             search: false,
-            rule:[
+            rule: [
               {
                 required: true,
                 message: "请输入镀层厚度",
@@ -135,7 +119,7 @@ export default {
           //   label: "工艺能力",
           //   prop: "processAbilityId",
           //   type:"select",
-          //   sortable: true,
+          //   sortable: 'custom',
           //   filter: true,
           //   span: 24,
           //   search: false,
@@ -148,7 +132,7 @@ export default {
           {
             label: "滚振镀金类定额",
             prop: "quota",
-            sortable: true,
+            sortable: 'custom',
             filter: true,
             span: 24,
             search: false,
@@ -156,7 +140,7 @@ export default {
           {
             label: "挂镀金类定额",
             prop: "smallBatQuota",
-            sortable: true,
+            sortable: 'custom',
             filter: true,
             span: 24,
             search: false,
@@ -164,7 +148,7 @@ export default {
           {
             label: "微孔镀金类定额",
             prop: "bigBatQuota",
-            sortable: true,
+            sortable: 'custom',
             filter: true,
             span: 24,
             search: false,
@@ -172,7 +156,7 @@ export default {
           {
             label: "局部镀定额",
             prop: "localBatQuota",
-            sortable: true,
+            sortable: 'custom',
             filter: true,
             span: 24,
             search: false,
@@ -189,12 +173,22 @@ export default {
       isWorkOpen: false,
     };
   },
+  computed: {
+    ...mapGetters(['permission']),
+    permissionList() {
+      return {
+        addBtn: this.validData(this.permission.materialQuota1_add, false),
+        editBtn: this.validData(this.permission.materialQuota1_edit, false),
+        delBtn: this.validData(this.permission.materialQuota1_del, false),
+      };
+    },
+  },
   methods: {
     // 点击导入按钮
     handleImport() {
       this.isShowImport = true
     },
-    validateValue(value){
+    validateValue(value) {
       if (value == null) return '';
 
       // 步骤1：移除所有非数字和非小数点的字符
@@ -226,16 +220,16 @@ export default {
       }
       return filterVal;
     },
-    validateRow(value){
+    validateRow(value) {
       this.form.quota = this.validateValue(value)
     },
-    validateSmallBat(value){
+    validateSmallBat(value) {
       this.form.smallBatQuota = this.validateValue(value)
     },
-    validateBigBat(value){
+    validateBigBat(value) {
       this.form.bigBatQuota = this.validateValue(value)
     },
-    validatePart(value){
+    validatePart(value) {
       this.form.localBatQuota = this.validateValue(value)
     },
     addEdit() {
@@ -248,49 +242,49 @@ export default {
       this.isOpen = false;
       this.isWorkOpen = false;
       this.isShowImport = false
-      if(val){
+      if (val) {
         this.onLoad()
       }
     },
-    beforeOpen(done, type){
-      if(type == 'edit'){
+    beforeOpen(done, type) {
+      if (type == 'edit') {
         this.form.processAbilityId = this.form.processAbilityId + ''
         done()
-      }else{
+      } else {
         done()
       }
     },
-    rowSave(row, done, loading){
+    rowSave(row, done, loading) {
       row.quotaType = 1
-      console.log('row-------------------',row)
-      addQuota(row).then(res =>{
-        if(res.data.code == 200){
+      console.log('row-------------------', row)
+      addQuota(row).then(res => {
+        if (res.data.code == 200) {
           this.$message.success('新增成功')
           this.onLoad()
           done()
         }
       })
     },
-    rowUpdate(row, index, done, loading){
+    rowUpdate(row, index, done, loading) {
       row.quotaType = 1
-      updateQuota(row).then(res =>{
-        if(res.data.code == 200){
+      updateQuota(row).then(res => {
+        if (res.data.code == 200) {
           this.$message.success('修改成功')
           this.onLoad()
           done()
         }
       })
     },
-    rowDel(row) { 
+    rowDel(row) {
       this.$confirm('确定删除数据吗?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
         deleteQuota({
-          ids:row.id
-        }).then(res =>{
-          if(res.data.code == 200){
+          ids: row.id
+        }).then(res => {
+          if (res.data.code == 200) {
             this.$message.success('删除成功')
             this.onLoad()
           }
@@ -334,8 +328,8 @@ export default {
     },
     handleDelete() {
       if (this.selectionList.length === 0) {
-          this.$message.error('请选择至少一条数据');
-          return;
+        this.$message.error('请选择至少一条数据');
+        return;
       }
       this.$confirm("确定将选择数据删除?", {
         confirmButtonText: "确定",
@@ -343,30 +337,41 @@ export default {
         type: "warning",
       }).then(() => {
         deleteQuota({
-          ids:this.selectionList.map(item => item.id).join(',')
-        }).then(res =>{
-          if(res.data.code == 200){
+          ids: this.selectionList.map(item => item.id).join(',')
+        }).then(res => {
+          if (res.data.code == 200) {
             this.$message.success('删除成功')
             this.onLoad()
           }
         })
       });
     },
-    refreshChange(){
+    refreshChange() {
       this.onLoad()
     },
     // 多选
     selectionChange(list) {
       this.selectionList = list;
     },
+    // 排序
+    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,
-        quotaType:1,
+        current: this.page.currentPage,
+        size: this.page.pageSize,
+        quotaType: 1,
         ...this.query
-      }).then(res =>{
+      }).then(res => {
         this.data = res.data.data.records
         this.page.total = res.data.data.total
         this.loading = false
diff --git a/src/views/basicData/materialQuota/components/silverAnode.vue b/src/views/basicData/materialQuota/components/silverAnode.vue
index 64c2802a..01df6f3b 100644
--- a/src/views/basicData/materialQuota/components/silverAnode.vue
+++ b/src/views/basicData/materialQuota/components/silverAnode.vue
@@ -18,23 +18,37 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
+      @sort-change="sortChange"
+      :permission="permissionList"
     >
       <template #menu-left>
         <!-- <el-button type="primary" icon="el-icon-plus" @click="addEdit">新增 </el-button> -->
-        <el-button type="danger"  @click="handleDelete">删除 </el-button>
+        <el-button type="danger" v-if="permission.materialQuota2_del" @click="handleDelete"
+          >删除
+        </el-button>
       </template>
       <template #menu-right>
-        <el-button type="primary"  @click="handleImport">导入 </el-button>
+        <el-button type="primary" v-if="permission.materialQuota2_import" @click="handleImport"
+          >导入
+        </el-button>
       </template>
       <template #menu="scope">
         <!-- <el-button type="text" @click="editFn(scope.row)">编辑 </el-button> -->
         <!-- <el-button type="text" @click="handleDelete">删除 </el-button> -->
       </template>
       <template #quota-form="{ type, disabled }">
-        <el-input v-model="form.quota" placeholder="请输入 滚振镀银类定额" @input="validateQuota"></el-input>
+        <el-input
+          v-model="form.quota"
+          placeholder="请输入 滚振镀银类定额"
+          @input="validateQuota"
+        ></el-input>
       </template>
       <template #smallBatQuota-form="{ type, disabled }">
-        <el-input v-model="form.smallBatQuota" placeholder="请输入 滚振镀银类定额" @input="validateSmallBat"></el-input>
+        <el-input
+          v-model="form.smallBatQuota"
+          placeholder="请输入 滚振镀银类定额"
+          @input="validateSmallBat"
+        ></el-input>
       </template>
     </avue-crud>
     <!-- 导入 -->
@@ -52,6 +66,7 @@
 <script>
 import basicImport from '@/components/basic-import/main.vue';
 import { getList, addQuota, updateQuota, deleteQuota } from '@/api/basicData/materialQuota';
+import { mapGetters } from 'vuex';
 export default {
   components: {
     basicImport,
@@ -114,7 +129,7 @@ export default {
           {
             label: '镀层厚度',
             prop: 'thickness',
-            sortable: true,
+            sortable: 'custom',
             filter: true,
             span: 24,
             search: false,
@@ -130,7 +145,7 @@ export default {
           //   label: "工艺能力",
           //   prop: "processAbilityId",
           //   type:"select",
-          //   sortable: true,
+          //   sortable: 'custom',
           //   filter: true,
           //   span: 24,
           //   search: false,
@@ -143,7 +158,7 @@ export default {
           {
             label: '滚振镀银类定额',
             prop: 'quota',
-            sortable: true,
+            sortable: 'custom',
             filter: true,
             span: 24,
             search: false,
@@ -151,7 +166,7 @@ export default {
           {
             label: '挂镀银类定额',
             prop: 'smallBatQuota',
-            sortable: true,
+            sortable: 'custom',
             filter: true,
             span: 24,
             search: false,
@@ -159,7 +174,7 @@ export default {
           // {
           //   label: "大批量定额",
           //   prop: "bigBatQuota",
-          //   sortable: true,
+          //   sortable: 'custom',
           //   filter: true,
           //   span: 24,
           //   search: false,
@@ -176,6 +191,16 @@ export default {
       isWorkOpen: false,
     };
   },
+  computed: {
+    ...mapGetters(['permission']),
+    permissionList() {
+      return {
+        addBtn: this.validData(this.permission.materialQuota2_add, false),
+        editBtn: this.validData(this.permission.materialQuota2_edit, false),
+        delBtn: this.validData(this.permission.materialQuota2_del, false),
+      };
+    },
+  },
   methods: {
     // 点击导入按钮
     handleImport() {
@@ -338,6 +363,17 @@ export default {
           }
         });
       });
+    },
+        // 排序
+    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;