权限：移除业务物理删除入口

shierfeng-fastapi-frontend/src/api/business/inbound.js

@@ -52,14 +52,6 @@ export function updateInbound(data) {
   })
 }
 
-// 删除首次入库草稿
-export function delInbound(inboundIds) {
-  return request({
-    url: '/business/inbound/' + inboundIds,
-    method: 'delete'
-  })
-}
-
 // 确认首次入库单
 export function confirmInbound(inboundId, data) {
   return request({

shierfeng-fastapi-frontend/src/api/business/shipment.js

@@ -60,14 +60,6 @@ export function updateShipment(data) {
   })
 }
 
-// 删除整托发货草稿
-export function delShipment(shipmentIds) {
-  return request({
-    url: '/business/shipment/' + shipmentIds,
-    method: 'delete'
-  })
-}
-
 // 确认整托发货单
 export function confirmShipment(shipmentId, data) {
   return request({

shierfeng-fastapi-frontend/src/api/master/customer.js

@@ -34,11 +34,3 @@ export function updateCustomer(data) {
     data: data
   })
 }
-
-// 删除客户
-export function delCustomer(customerIds) {
-  return request({
-    url: '/master/customer/' + customerIds,
-    method: 'delete'
-  })
-}

shierfeng-fastapi-frontend/src/api/master/line.js

@@ -34,11 +34,3 @@ export function updateLine(data) {
     data: data
   })
 }
-
-// 删除生产线
-export function delLine(lineIds) {
-  return request({
-    url: '/master/line/' + lineIds,
-    method: 'delete'
-  })
-}

shierfeng-fastapi-frontend/src/api/master/pallet.js

@@ -43,11 +43,3 @@ export function updatePallet(data) {
     data: data
   })
 }
-
-// 删除托盘
-export function delPallet(palletIds) {
-  return request({
-    url: '/master/pallet/' + palletIds,
-    method: 'delete'
-  })
-}

shierfeng-fastapi-frontend/src/api/master/site.js

@@ -35,14 +35,6 @@ export function updateSite(data) {
   })
 }
 
-// 删除客户现场
-export function delSite(siteIds) {
-  return request({
-    url: '/master/site/' + siteIds,
-    method: 'delete'
-  })
-}
-
 // 查询客户现场可分配用户
 export function getSiteUsers(siteId) {
   return request({

shierfeng-fastapi-frontend/src/api/master/strain.js

@@ -34,11 +34,3 @@ export function updateStrain(data) {
     data: data
   })
 }
-
-// 删除菌种
-export function delStrain(strainIds) {
-  return request({
-    url: '/master/strain/' + strainIds,
-    method: 'delete'
-  })
-}

shierfeng-fastapi-frontend/src/api/master/warehouse.js

@@ -35,14 +35,6 @@ export function updateWarehouse(data) {
   })
 }
 
-// 删除仓库
-export function delWarehouse(warehouseIds) {
-  return request({
-    url: '/master/warehouse/' + warehouseIds,
-    method: 'delete'
-  })
-}
-
 // 查询仓库可分配用户
 export function getWarehouseUsers(warehouseId) {
   return request({

shierfeng-fastapi-frontend/src/views/business/filling/index.vue

@@ -32,7 +32,7 @@
     </el-row>
 
     <el-alert v-if="loadError" :title="loadError" type="error" :closable="false" show-icon class="mb8" />
-    <div v-if="userStore.admin === true && !testBatchStore.isTestMode" class="mb8"><el-button type="warning" plain icon="FolderAdd" :disabled="!selectedIds.length || operationPending" @click="openAdoptionDialog">纳入测试批次</el-button></div>
+    <div v-if="userStore.admin === true && !testBatchStore.isTestMode" class="mb8"><el-button type="warning" plain icon="FolderAdd" :disabled="!selectedIds.length || operationPending" @click="openAdoptionDialog" v-hasPermi="['system:testbatch:adopt']">纳入测试批次</el-button></div>
     <el-table v-loading="loading" empty-text="暂无数据" :data="fillingList" class="data-table" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" />
       <el-table-column label="装填单号" prop="fillingNo" min-width="170" :show-overflow-tooltip="true" />

shierfeng-fastapi-frontend/src/views/business/inbound/index.vue

@@ -41,7 +41,7 @@
     </el-row>
 
     <el-alert v-if="loadError" :title="loadError" type="error" :closable="false" show-icon class="mb8" />
-    <div v-if="userStore.admin === true && !testBatchStore.isTestMode" class="mb8"><el-button type="warning" plain icon="FolderAdd" :disabled="!selectedIds.length || operationPending" @click="openAdoptionDialog">纳入测试批次</el-button></div>
+    <div v-if="userStore.admin === true && !testBatchStore.isTestMode" class="mb8"><el-button type="warning" plain icon="FolderAdd" :disabled="!selectedIds.length || operationPending" @click="openAdoptionDialog" v-hasPermi="['system:testbatch:adopt']">纳入测试批次</el-button></div>
     <el-table v-loading="loading" empty-text="暂无数据" :data="inboundList" class="data-table" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" />
       <el-table-column label="入库单号" prop="inboundNo" min-width="170" :show-overflow-tooltip="true" />
@@ -72,15 +72,6 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['business:inbound:edit']"
           >编辑</el-button>
-          <el-button
-            v-if="scope.row.status === 'DRAFT'"
-            link
-            type="danger"
-            icon="Delete"
-            :disabled="operationPending"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['business:inbound:remove']"
-          >删除</el-button>
           <el-button
             v-if="scope.row.status === 'DRAFT'"
             link
@@ -208,7 +199,6 @@ import useTestBatchStore from '@/store/modules/testBatch'
 import {
   addInbound,
   confirmInbound,
-  delInbound,
   getInbound,
   getInboundWarehouseOptions,
   listInbound,
@@ -229,7 +219,6 @@ const optionLoading = ref(false)
 const detailLoading = ref(false)
 const scanLoading = ref(false)
 const submitLoading = ref(false)
-const deleteLoading = ref(false)
 const confirmLoading = ref(false)
 const loadError = ref('')
 const optionError = ref('')
@@ -242,7 +231,7 @@ const editDetailReady = ref(false)
 const isEdit = computed(() => Boolean(form.value.inboundId))
 const canAddInbound = computed(() => proxy.$auth.hasPermiAnd(['business:inbound:query', 'business:inbound:add']))
 const canEditInbound = computed(() => proxy.$auth.hasPermiAnd(['business:inbound:query', 'business:inbound:edit']))
-const operationPending = computed(() => submitLoading.value || deleteLoading.value || confirmLoading.value)
+const operationPending = computed(() => submitLoading.value || confirmLoading.value)
 let listGeneration = 0
 let optionGeneration = 0
 let detailGeneration = 0
@@ -545,27 +534,6 @@ function saveInboundUpdate() {
   submitInboundForm(true)
 }
 
-function handleDelete(row) {
-  if (row.status !== 'DRAFT') {
-    proxy.$modal.msgWarning('只有草稿入库单可以删除')
-    return
-  }
-  if (operationPending.value) return
-  deleteLoading.value = true
-  proxy.$modal.confirm(`是否确认删除入库单“${row.inboundNo || `#${row.inboundId}`}”？`).then(() => {
-    return delInbound(String(row.inboundId))
-  }).then((response) => {
-    proxy.$modal.msgSuccess(response.msg || '删除成功')
-    getList()
-  }).catch((error) => {
-    if (error !== 'cancel' && error !== 'close') {
-      loadError.value = '入库单删除失败，请稍后重试'
-    }
-  }).finally(() => {
-    deleteLoading.value = false
-  })
-}
-
 function clearConfirmIdempotency() {
   confirmIdempotency.inboundId = undefined
   confirmIdempotency.key = ''

shierfeng-fastapi-frontend/src/views/business/return/index.vue

@@ -173,7 +173,7 @@
     </el-form>
 
     <el-alert v-if="loadError" :title="loadError" type="error" :closable="false" show-icon class="mb8" />
-    <div v-if="userStore.admin === true && !testBatchStore.isTestMode" class="mb8"><el-button type="warning" plain icon="FolderAdd" :disabled="!selectedIds.length || operationPending" @click="openAdoptionDialog">纳入测试批次</el-button></div>
+    <div v-if="userStore.admin === true && !testBatchStore.isTestMode" class="mb8"><el-button type="warning" plain icon="FolderAdd" :disabled="!selectedIds.length || operationPending" @click="openAdoptionDialog" v-hasPermi="['system:testbatch:adopt']">纳入测试批次</el-button></div>
     <el-table v-loading="loading" empty-text="暂无数据" :data="returnList" class="data-table" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" />
       <el-table-column label="退回单号" prop="returnNo" min-width="170" :show-overflow-tooltip="true" />

shierfeng-fastapi-frontend/src/views/business/shipment/index.vue

@@ -38,7 +38,7 @@
     </el-row>
 
     <el-alert v-if="loadError" :title="loadError" type="error" :closable="false" show-icon class="mb8" />
-    <div v-if="userStore.admin === true && !testBatchStore.isTestMode" class="mb8"><el-button type="warning" plain icon="FolderAdd" :disabled="!selectedIds.length || operationPending" @click="openAdoptionDialog">纳入测试批次</el-button></div>
+    <div v-if="userStore.admin === true && !testBatchStore.isTestMode" class="mb8"><el-button type="warning" plain icon="FolderAdd" :disabled="!selectedIds.length || operationPending" @click="openAdoptionDialog" v-hasPermi="['system:testbatch:adopt']">纳入测试批次</el-button></div>
     <el-table v-loading="loading" empty-text="暂无数据" :data="shipmentList" class="data-table" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" />
       <el-table-column label="发货单号" prop="shipmentNo" min-width="170" :show-overflow-tooltip="true" />
@@ -69,15 +69,6 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['business:shipment:edit']"
           >编辑</el-button>
-          <el-button
-            v-if="scope.row.status === 'DRAFT'"
-            link
-            type="danger"
-            icon="Delete"
-            :disabled="operationPending"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['business:shipment:remove']"
-          >删除</el-button>
           <el-button
             v-if="scope.row.status === 'DRAFT'"
             link
@@ -219,7 +210,6 @@ import useTestBatchStore from '@/store/modules/testBatch'
 import {
   addShipment,
   confirmShipment,
-  delShipment,
   getShipment,
   getShipmentSiteOptions,
   getShipmentWarehouseOptions,
@@ -242,7 +232,6 @@ const optionLoading = ref(false)
 const detailLoading = ref(false)
 const scanLoading = ref(false)
 const submitLoading = ref(false)
-const deleteLoading = ref(false)
 const confirmLoading = ref(false)
 const loadError = ref('')
 const optionError = ref('')
@@ -255,7 +244,7 @@ const editDetailReady = ref(false)
 const isEdit = computed(() => Boolean(form.value.shipmentId))
 const canAddShipment = computed(() => proxy.$auth.hasPermiAnd(['business:shipment:query', 'business:shipment:add']))
 const canEditShipment = computed(() => proxy.$auth.hasPermiAnd(['business:shipment:query', 'business:shipment:edit']))
-const operationPending = computed(() => submitLoading.value || deleteLoading.value || confirmLoading.value)
+const operationPending = computed(() => submitLoading.value || confirmLoading.value)
 let listGeneration = 0
 let optionGeneration = 0
 let detailGeneration = 0
@@ -577,25 +566,6 @@ function saveShipmentUpdate() {
   submitShipmentForm(true)
 }
 
-function handleDelete(row) {
-  if (row.status !== 'DRAFT') {
-    proxy.$modal.msgWarning('只有草稿发货单可以删除')
-    return
-  }
-  if (operationPending.value) return
-  deleteLoading.value = true
-  proxy.$modal.confirm(`是否确认删除发货单“${row.shipmentNo || `#${row.shipmentId}`}”？`).then(() => {
-    return delShipment(String(row.shipmentId))
-  }).then((response) => {
-    proxy.$modal.msgSuccess(response.msg || '删除成功')
-    getList()
-  }).catch((error) => {
-    if (error !== 'cancel' && error !== 'close') loadError.value = '发货单删除失败，请稍后重试'
-  }).finally(() => {
-    deleteLoading.value = false
-  })
-}
-
 function clearConfirmIdempotency() {
   confirmIdempotency.shipmentId = undefined
   confirmIdempotency.key = ''

shierfeng-fastapi-frontend/src/views/business/usage/index.vue

@@ -112,7 +112,7 @@
     </el-form>
 
     <el-alert v-if="loadError" :title="loadError" type="error" :closable="false" show-icon class="mb8" />
-    <div v-if="userStore.admin === true && !testBatchStore.isTestMode" class="mb8"><el-button type="warning" plain icon="FolderAdd" :disabled="!selectedIds.length || operationPending" @click="openAdoptionDialog">纳入测试批次</el-button></div>
+    <div v-if="userStore.admin === true && !testBatchStore.isTestMode" class="mb8"><el-button type="warning" plain icon="FolderAdd" :disabled="!selectedIds.length || operationPending" @click="openAdoptionDialog" v-hasPermi="['system:testbatch:adopt']">纳入测试批次</el-button></div>
     <el-table v-loading="loading" empty-text="暂无数据" :data="usageList" class="data-table" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" />
       <el-table-column label="使用记录号" prop="usageNo" min-width="170" :show-overflow-tooltip="true" />

shierfeng-fastapi-frontend/src/views/master/customer/index.vue

@@ -27,10 +27,9 @@
           @click="handleUpdate()" v-hasPermi="['master:customer:edit']"
         >修改</el-button>
       </el-col>
-      <el-col :span="1.5"><el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['master:customer:remove']">删除</el-button></el-col>
     </el-row>
     <el-row v-if="userStore.admin === true && !testBatchStore.isTestMode" :gutter="10" class="mb8 master-toolbar">
-      <el-col :span="1.5"><el-button type="warning" plain icon="FolderAdd" :disabled="!selectedIds.length" @click="openAdoptionDialog">纳入测试批次</el-button></el-col>
+      <el-col :span="1.5"><el-button type="warning" plain icon="FolderAdd" :disabled="!selectedIds.length" @click="openAdoptionDialog" v-hasPermi="['system:testbatch:adopt']">纳入测试批次</el-button></el-col>
     </el-row>
 
     <el-alert v-if="loadError" :title="loadError" type="error" :closable="false" show-icon class="mb8" />
@@ -51,10 +50,6 @@
             v-if="proxy.$auth.hasPermiAnd(['master:customer:query', 'master:customer:edit'])"
             link type="primary" icon="Edit" :disabled="detailLoading" @click="handleUpdate(scope.row)" v-hasPermi="['master:customer:edit']"
           >修改</el-button>
-          <el-button
-            v-if="scope.row.canRemove === true"
-            link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['master:customer:remove']"
-          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -117,7 +112,7 @@
 </style>
 
 <script setup name="Customer">
-import { addCustomer, delCustomer, getCustomer, listCustomer, updateCustomer } from "@/api/master/customer";
+import { addCustomer, getCustomer, listCustomer, updateCustomer } from "@/api/master/customer";
 import TestBatchAdoptionDialog from '@/components/TestBatchAdoptionDialog'
 import useUserStore from '@/store/modules/user'
 import useTestBatchStore from '@/store/modules/testBatch'
@@ -130,7 +125,6 @@ const adoptionDialogRef = ref()
 const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 const customerList = ref([]);
 const selectedIds = ref([]);
-const removableIds = ref([]);
 const loading = ref(false);
 const detailLoading = ref(false);
 const submitLoading = ref(false);
@@ -138,7 +132,6 @@ const loadError = ref("");
 const formError = ref("");
 const open = ref(false);
 const single = ref(true);
-const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
 let listGeneration = 0;
@@ -223,11 +216,7 @@ function handleQuery() { queryParams.value.pageNum = 1; getList(); }
 function resetQuery() { proxy.resetForm("queryRef"); handleQuery(); }
 function handleSelectionChange(selection) {
   selectedIds.value = selection.map((item) => item.customerId);
-  removableIds.value = selection
-    .filter((item) => item.canRemove === true)
-    .map((item) => item.customerId);
   single.value = selectedIds.value.length !== 1;
-  multiple.value = removableIds.value.length === 0;
 }
 
 function openAdoptionDialog() { adoptionDialogRef.value?.open() }
@@ -309,15 +298,5 @@ function submitUpdate() {
     }).finally(() => { submitLoading.value = false; });
   });
 }
-function handleDelete(row) {
-  const targetIds = row?.customerId ? (row.canRemove === true ? [row.customerId] : []) : removableIds.value;
-  if (!targetIds.length) { proxy.$modal.msgWarning("请选择允许删除的客户"); return; }
-  proxy.$modal.confirm(`是否确认删除客户编号为“${targetIds.join(",")}”的数据项？`).then(() =>
-    delCustomer(targetIds.join(","))
-  ).then(() => { proxy.$modal.msgSuccess("删除成功"); getList(); }).catch((error) => {
-    if (error !== "cancel" && error !== "close") loadError.value = "客户删除失败，请稍后重试";
-  });
-}
-
 getList();
 </script>

shierfeng-fastapi-frontend/src/views/master/line/index.vue

@@ -30,10 +30,9 @@
           @click="handleUpdate()" v-hasPermi="['master:line:edit']"
         >修改</el-button>
       </el-col>
-      <el-col :span="1.5"><el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['master:line:remove']">删除</el-button></el-col>
     </el-row>
     <el-row v-if="userStore.admin === true && !testBatchStore.isTestMode" :gutter="10" class="mb8 master-toolbar">
-      <el-col :span="1.5"><el-button type="warning" plain icon="FolderAdd" :disabled="!selectedIds.length" @click="openAdoptionDialog">纳入测试批次</el-button></el-col>
+      <el-col :span="1.5"><el-button type="warning" plain icon="FolderAdd" :disabled="!selectedIds.length" @click="openAdoptionDialog" v-hasPermi="['system:testbatch:adopt']">纳入测试批次</el-button></el-col>
     </el-row>
 
     <el-alert v-if="loadError" :title="loadError" type="error" :closable="false" show-icon class="mb8" />
@@ -55,10 +54,6 @@
             v-if="proxy.$auth.hasPermiAnd(['master:line:query', 'master:line:edit'])"
             link type="primary" icon="Edit" :disabled="detailLoading" @click="handleUpdate(scope.row)" v-hasPermi="['master:line:edit']"
           >修改</el-button>
-          <el-button
-            v-if="scope.row.canRemove === true"
-            link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['master:line:remove']"
-          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -119,7 +114,7 @@
 </style>
 
 <script setup name="Line">
-import { addLine, delLine, getLine, listLine, updateLine } from "@/api/master/line";
+import { addLine, getLine, listLine, updateLine } from "@/api/master/line";
 import TestBatchAdoptionDialog from '@/components/TestBatchAdoptionDialog'
 import useUserStore from '@/store/modules/user'
 import useTestBatchStore from '@/store/modules/testBatch'
@@ -132,7 +127,6 @@ const adoptionDialogRef = ref()
 const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 const lineList = ref([]);
 const selectedIds = ref([]);
-const removableIds = ref([]);
 const loading = ref(false);
 const detailLoading = ref(false);
 const submitLoading = ref(false);
@@ -140,7 +134,6 @@ const loadError = ref("");
 const formError = ref("");
 const open = ref(false);
 const single = ref(true);
-const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
 let listGeneration = 0;
@@ -232,11 +225,7 @@ function handleQuery() { queryParams.value.pageNum = 1; getList(); }
 function resetQuery() { proxy.resetForm("queryRef"); handleQuery(); }
 function handleSelectionChange(selection) {
   selectedIds.value = selection.map((item) => item.lineId);
-  removableIds.value = selection
-    .filter((item) => item.canRemove === true)
-    .map((item) => item.lineId);
   single.value = selectedIds.value.length !== 1;
-  multiple.value = removableIds.value.length === 0;
 }
 
 function openAdoptionDialog() { adoptionDialogRef.value?.open() }
@@ -319,15 +308,5 @@ function submitUpdate() {
     }).finally(() => { submitLoading.value = false; });
   });
 }
-function handleDelete(row) {
-  const targetIds = row?.lineId ? (row.canRemove === true ? [row.lineId] : []) : removableIds.value;
-  if (!targetIds.length) { proxy.$modal.msgWarning("请选择允许删除的生产线"); return; }
-  proxy.$modal.confirm(`是否确认删除产线编号为“${targetIds.join(",")}”的数据项？`).then(() =>
-    delLine(targetIds.join(","))
-  ).then(() => { proxy.$modal.msgSuccess("删除成功"); getList(); }).catch((error) => {
-    if (error !== "cancel" && error !== "close") loadError.value = "生产线删除失败，请稍后重试";
-  });
-}
-
 getList();
 </script>

shierfeng-fastapi-frontend/src/views/master/pallet/index.vue

@@ -24,10 +24,9 @@
           @click="handleUpdate()" v-hasPermi="['master:pallet:edit']"
         >修改</el-button>
       </el-col>
-      <el-col :span="1.5"><el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['master:pallet:remove']">删除</el-button></el-col>
     </el-row>
     <el-row v-if="userStore.admin === true && !testBatchStore.isTestMode" :gutter="10" class="mb8 master-toolbar">
-      <el-col :span="1.5"><el-button type="warning" plain icon="FolderAdd" :disabled="!selectedIds.length" @click="openAdoptionDialog">纳入测试批次</el-button></el-col>
+      <el-col :span="1.5"><el-button type="warning" plain icon="FolderAdd" :disabled="!selectedIds.length" @click="openAdoptionDialog" v-hasPermi="['system:testbatch:adopt']">纳入测试批次</el-button></el-col>
     </el-row>
 
     <el-alert v-if="loadError" :title="loadError" type="error" :closable="false" show-icon class="mb8" />
@@ -52,10 +51,6 @@
             v-if="proxy.$auth.hasPermiAnd(['master:pallet:query', 'master:pallet:edit'])"
             link type="primary" icon="Edit" :disabled="detailLoading" @click="handleUpdate(scope.row)" v-hasPermi="['master:pallet:edit']"
           >修改</el-button>
-          <el-button
-            v-if="scope.row.canRemove === true"
-            link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['master:pallet:remove']"
-          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -119,7 +114,7 @@
 </style>
 
 <script setup name="Pallet">
-import { addPallet, delPallet, getPallet, getPalletQrcode, listPallet, updatePallet } from "@/api/master/pallet";
+import { addPallet, getPallet, getPalletQrcode, listPallet, updatePallet } from "@/api/master/pallet";
 import TestBatchAdoptionDialog from '@/components/TestBatchAdoptionDialog'
 import useUserStore from '@/store/modules/user'
 import useTestBatchStore from '@/store/modules/testBatch'
@@ -132,7 +127,6 @@ const adoptionDialogRef = ref()
 const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 const palletList = ref([]);
 const selectedIds = ref([]);
-const removableIds = ref([]);
 const loading = ref(false);
 const detailLoading = ref(false);
 const submitLoading = ref(false);
@@ -140,7 +134,6 @@ const loadError = ref("");
 const formError = ref("");
 const open = ref(false);
 const single = ref(true);
-const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
 const printingIds = ref([]);
@@ -232,11 +225,7 @@ function handleQuery() { queryParams.value.pageNum = 1; getList(); }
 function resetQuery() { proxy.resetForm("queryRef"); handleQuery(); }
 function handleSelectionChange(selection) {
   selectedIds.value = selection.map((item) => item.palletId);
-  removableIds.value = selection
-    .filter((item) => item.canRemove === true)
-    .map((item) => item.palletId);
   single.value = selectedIds.value.length !== 1;
-  multiple.value = removableIds.value.length === 0;
 }
 
 function openAdoptionDialog() { adoptionDialogRef.value?.open() }
@@ -315,16 +304,6 @@ function submitUpdate() {
     }).finally(() => { submitLoading.value = false; });
   });
 }
-function handleDelete(row) {
-  const targetIds = row?.palletId ? (row.canRemove === true ? [row.palletId] : []) : removableIds.value;
-  if (!targetIds.length) { proxy.$modal.msgWarning("请选择允许删除的托盘"); return; }
-  proxy.$modal.confirm(`是否确认删除托盘编号为“${targetIds.join(",")}”的数据项？`).then(() =>
-    delPallet(targetIds.join(","))
-  ).then(() => { proxy.$modal.msgSuccess("删除成功"); getList(); }).catch((error) => {
-    if (error !== "cancel" && error !== "close") loadError.value = "托盘删除失败，请稍后重试";
-  });
-}
-
 function isPrinting(palletId) {
   return printingIds.value.includes(palletId);
 }

shierfeng-fastapi-frontend/src/views/master/site/index.vue

@@ -30,11 +30,10 @@
           @click="handleUpdate()" v-hasPermi="['master:site:edit']"
         >修改</el-button>
       </el-col>
-      <el-col :span="1.5"><el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['master:site:remove']">删除</el-button></el-col>
       <el-col :span="1.5"><el-button type="warning" plain icon="User" :disabled="single" @click="handleAssign()" v-hasPermi="['master:site:assign']">分配用户</el-button></el-col>
     </el-row>
     <el-row v-if="userStore.admin === true && !testBatchStore.isTestMode" :gutter="10" class="mb8 master-toolbar">
-      <el-col :span="1.5"><el-button type="warning" plain icon="FolderAdd" :disabled="!selectedIds.length" @click="openAdoptionDialog">纳入测试批次</el-button></el-col>
+      <el-col :span="1.5"><el-button type="warning" plain icon="FolderAdd" :disabled="!selectedIds.length" @click="openAdoptionDialog" v-hasPermi="['system:testbatch:adopt']">纳入测试批次</el-button></el-col>
     </el-row>
 
     <el-alert v-if="loadError" :title="loadError" type="error" :closable="false" show-icon class="mb8" />
@@ -58,10 +57,6 @@
             v-if="proxy.$auth.hasPermiAnd(['master:site:query', 'master:site:edit'])"
             link type="primary" icon="Edit" :disabled="detailLoading" @click="handleUpdate(scope.row)" v-hasPermi="['master:site:edit']"
           >修改</el-button>
-          <el-button
-            v-if="scope.row.canRemove === true"
-            link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['master:site:remove']"
-          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -128,7 +123,7 @@
 
 <script setup name="Site">
 import BusinessUserAssignDialog from "@/components/BusinessUserAssignDialog";
-import { addSite, delSite, getSite, listSite, updateSite } from "@/api/master/site";
+import { addSite, getSite, listSite, updateSite } from "@/api/master/site";
 import TestBatchAdoptionDialog from '@/components/TestBatchAdoptionDialog'
 import useUserStore from '@/store/modules/user'
 import useTestBatchStore from '@/store/modules/testBatch'
@@ -141,7 +136,6 @@ const adoptionDialogRef = ref()
 const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 const siteList = ref([]);
 const selectedIds = ref([]);
-const removableIds = ref([]);
 const selectedRows = ref([]);
 const assignDialogRef = ref();
 const loading = ref(false);
@@ -151,7 +145,6 @@ const loadError = ref("");
 const formError = ref("");
 const open = ref(false);
 const single = ref(true);
-const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
 let listGeneration = 0;
@@ -244,11 +237,7 @@ function resetQuery() { proxy.resetForm("queryRef"); handleQuery(); }
 function handleSelectionChange(selection) {
   selectedRows.value = selection;
   selectedIds.value = selection.map((item) => item.siteId);
-  removableIds.value = selection
-    .filter((item) => item.canRemove === true)
-    .map((item) => item.siteId);
   single.value = selectedIds.value.length !== 1;
-  multiple.value = removableIds.value.length === 0;
 }
 
 function openAdoptionDialog() { adoptionDialogRef.value?.open() }
@@ -343,15 +332,5 @@ function submitUpdate() {
     }).finally(() => { submitLoading.value = false; });
   });
 }
-function handleDelete(row) {
-  const targetIds = row?.siteId ? (row.canRemove === true ? [row.siteId] : []) : removableIds.value;
-  if (!targetIds.length) { proxy.$modal.msgWarning("请选择允许删除的客户现场"); return; }
-  proxy.$modal.confirm(`是否确认删除现场编号为“${targetIds.join(",")}”的数据项？`).then(() =>
-    delSite(targetIds.join(","))
-  ).then(() => { proxy.$modal.msgSuccess("删除成功"); getList(); }).catch((error) => {
-    if (error !== "cancel" && error !== "close") loadError.value = "客户现场删除失败，请稍后重试";
-  });
-}
-
 getList();
 </script>

shierfeng-fastapi-frontend/src/views/master/strain/index.vue

@@ -34,12 +34,9 @@
           v-hasPermi="['master:strain:edit']"
         >修改</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['master:strain:remove']">删除</el-button>
-      </el-col>
     </el-row>
     <el-row v-if="userStore.admin === true && !testBatchStore.isTestMode" :gutter="10" class="mb8 master-toolbar">
-      <el-col :span="1.5"><el-button type="warning" plain icon="FolderAdd" :disabled="!selectedIds.length" @click="openAdoptionDialog">纳入测试批次</el-button></el-col>
+      <el-col :span="1.5"><el-button type="warning" plain icon="FolderAdd" :disabled="!selectedIds.length" @click="openAdoptionDialog" v-hasPermi="['system:testbatch:adopt']">纳入测试批次</el-button></el-col>
     </el-row>
 
     <el-alert v-if="loadError" :title="loadError" type="error" :closable="false" show-icon class="mb8" />
@@ -68,14 +65,6 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['master:strain:edit']"
           >修改</el-button>
-          <el-button
-            v-if="scope.row.canRemove === true"
-            link
-            type="primary"
-            icon="Delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['master:strain:remove']"
-          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -136,7 +125,7 @@
 </style>
 
 <script setup name="Strain">
-import { addStrain, delStrain, getStrain, listStrain, updateStrain } from "@/api/master/strain";
+import { addStrain, getStrain, listStrain, updateStrain } from "@/api/master/strain";
 import TestBatchAdoptionDialog from '@/components/TestBatchAdoptionDialog'
 import useUserStore from '@/store/modules/user'
 import useTestBatchStore from '@/store/modules/testBatch'
@@ -150,7 +139,6 @@ const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 
 const strainList = ref([]);
 const selectedIds = ref([]);
-const removableIds = ref([]);
 const loading = ref(false);
 const detailLoading = ref(false);
 const submitLoading = ref(false);
@@ -158,7 +146,6 @@ const loadError = ref("");
 const formError = ref("");
 const open = ref(false);
 const single = ref(true);
-const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
 let listGeneration = 0;
@@ -256,11 +243,7 @@ function resetQuery() {
 
 function handleSelectionChange(selection) {
   selectedIds.value = selection.map((item) => item.strainId);
-  removableIds.value = selection
-    .filter((item) => item.canRemove === true)
-    .map((item) => item.strainId);
   single.value = selectedIds.value.length !== 1;
-  multiple.value = removableIds.value.length === 0;
 }
 
 function openAdoptionDialog() { adoptionDialogRef.value?.open() }
@@ -350,21 +333,5 @@ function submitUpdate() {
   });
 }
 
-function handleDelete(row) {
-  const targetIds = row?.strainId ? (row.canRemove === true ? [row.strainId] : []) : removableIds.value;
-  if (!targetIds.length) {
-    proxy.$modal.msgWarning("请选择允许删除的菌种");
-    return;
-  }
-  proxy.$modal.confirm(`是否确认删除菌种编号为“${targetIds.join(",")}”的数据项？`).then(() =>
-    delStrain(targetIds.join(","))
-  ).then(() => {
-    proxy.$modal.msgSuccess("删除成功");
-    getList();
-  }).catch((error) => {
-    if (error !== "cancel" && error !== "close") loadError.value = "菌种删除失败，请稍后重试";
-  });
-}
-
 getList();
 </script>

shierfeng-fastapi-frontend/src/views/master/warehouse/index.vue

@@ -27,11 +27,10 @@
           @click="handleUpdate()" v-hasPermi="['master:warehouse:edit']"
         >修改</el-button>
       </el-col>
-      <el-col :span="1.5"><el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['master:warehouse:remove']">删除</el-button></el-col>
       <el-col :span="1.5"><el-button type="warning" plain icon="User" :disabled="single" @click="handleAssign()" v-hasPermi="['master:warehouse:assign']">分配用户</el-button></el-col>
     </el-row>
     <el-row v-if="userStore.admin === true && !testBatchStore.isTestMode" :gutter="10" class="mb8 master-toolbar">
-      <el-col :span="1.5"><el-button type="warning" plain icon="FolderAdd" :disabled="!selectedIds.length" @click="openAdoptionDialog">纳入测试批次</el-button></el-col>
+      <el-col :span="1.5"><el-button type="warning" plain icon="FolderAdd" :disabled="!selectedIds.length" @click="openAdoptionDialog" v-hasPermi="['system:testbatch:adopt']">纳入测试批次</el-button></el-col>
     </el-row>
 
     <el-alert v-if="loadError" :title="loadError" type="error" :closable="false" show-icon class="mb8" />
@@ -54,10 +53,6 @@
             v-if="proxy.$auth.hasPermiAnd(['master:warehouse:query', 'master:warehouse:edit'])"
             link type="primary" icon="Edit" :disabled="detailLoading" @click="handleUpdate(scope.row)" v-hasPermi="['master:warehouse:edit']"
           >修改</el-button>
-          <el-button
-            v-if="scope.row.canRemove === true"
-            link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['master:warehouse:remove']"
-          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -121,7 +116,7 @@
 
 <script setup name="Warehouse">
 import BusinessUserAssignDialog from "@/components/BusinessUserAssignDialog";
-import { addWarehouse, delWarehouse, getWarehouse, listWarehouse, updateWarehouse } from "@/api/master/warehouse";
+import { addWarehouse, getWarehouse, listWarehouse, updateWarehouse } from "@/api/master/warehouse";
 import TestBatchAdoptionDialog from '@/components/TestBatchAdoptionDialog'
 import useUserStore from '@/store/modules/user'
 import useTestBatchStore from '@/store/modules/testBatch'
@@ -134,7 +129,6 @@ const adoptionDialogRef = ref()
 const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 const warehouseList = ref([]);
 const selectedIds = ref([]);
-const removableIds = ref([]);
 const selectedRows = ref([]);
 const assignDialogRef = ref();
 const loading = ref(false);
@@ -144,7 +138,6 @@ const loadError = ref("");
 const formError = ref("");
 const open = ref(false);
 const single = ref(true);
-const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
 let listGeneration = 0;
@@ -229,11 +222,7 @@ function resetQuery() { proxy.resetForm("queryRef"); handleQuery(); }
 function handleSelectionChange(selection) {
   selectedRows.value = selection;
   selectedIds.value = selection.map((item) => item.warehouseId);
-  removableIds.value = selection
-    .filter((item) => item.canRemove === true)
-    .map((item) => item.warehouseId);
   single.value = selectedIds.value.length !== 1;
-  multiple.value = removableIds.value.length === 0;
 }
 
 function openAdoptionDialog() { adoptionDialogRef.value?.open() }
@@ -325,15 +314,5 @@ function submitUpdate() {
     }).finally(() => { submitLoading.value = false; });
   });
 }
-function handleDelete(row) {
-  const targetIds = row?.warehouseId ? (row.canRemove === true ? [row.warehouseId] : []) : removableIds.value;
-  if (!targetIds.length) { proxy.$modal.msgWarning("请选择允许删除的仓库"); return; }
-  proxy.$modal.confirm(`是否确认删除仓库编号为“${targetIds.join(",")}”的数据项？`).then(() =>
-    delWarehouse(targetIds.join(","))
-  ).then(() => { proxy.$modal.msgSuccess("删除成功"); getList(); }).catch((error) => {
-    if (error !== "cancel" && error !== "close") loadError.value = "仓库删除失败，请稍后重试";
-  });
-}
-
 getList();
 </script>