0318

src/views/business/daywork/index.vue

@@ -20,9 +20,6 @@
             style="width: 200px"
           />
         </el-form-item>
-        <!-- <el-form-item label="批次号：">
-          <el-input placeholder="请输入批次号" v-model.trim="queryDayworkParams.lotCode" @keyup.enter="handleQuery" @keydown.enter.prevent clearable style="width: 120px" />
-        </el-form-item> -->
         <el-form-item label="产品描述：">
           <el-input
             placeholder="请输入产品描述"
@@ -96,12 +93,6 @@
               width="60"
               align="center"
             />
-            <!-- <el-table-column
-              label="炉号"
-              prop="furnaceNumber"
-              width="60"
-              align="center"
-            /> -->
             <el-table-column
               label="下达日期"
               prop="createTime"
@@ -278,22 +269,23 @@ const { proxy } = getCurrentInstance();
 /** 字典 */
 const { daywork_status } = proxy.useDict("daywork_status");
 
-/** daywork 列表 */
+/** 生产批次 */
 const dayworkList = ref([]);
 const dayworkTable = ref(null);
-const deptList = ref([]);
 const currentDaywork = ref({});
 const dayworkLoading = ref(false);
 const total = ref(0);
-/** daywork 批次 */
+/**工段 */
+const deptList = ref([]);
+const loading = ref(false);
+/** 报工信息 */
 const dayworkItemList = ref([]);
 const dayworkItemLoading = ref(false);
-const processList = ref([]);
-const deptProcessList = ref([]);
 const itemTotal = ref(0);
-const flag = ref(false);
 const latestProcessId = ref(null);
-
+const deptProcessList = ref([]);
+/**工序 */
+const processList = ref([]);
 /** 查询对象 */
 const queryDayworkParams = ref({
   productDescription: "",
@@ -310,10 +302,12 @@ const queryItemParams = ref({
 });
 
 /***********************  方法区  ****************************/
-
+/***********************  工段相关事件  ****************************/
 function getList() {
+  loading.value = true;
   getDept().then((response) => {
     deptList.value = response.data;
+    loading.value = false;
     if (deptList.value.length > 0) {
       queryDayworkParams.value.deptId = deptList.value[0].value;
       getDayworks();
@@ -322,6 +316,12 @@ function getList() {
     }
   });
 }
+//切换工段
+function handleDeptChange() {
+  getDayworks();
+}
+/***********************  生产批次相关事件  ****************************/
+
 /** 查询计划明细 */
 function getDayworks() {
   dayworkLoading.value = true;
@@ -343,6 +343,21 @@ function getDayworks() {
     }
   });
 }
+
+/** 生产计划明细 current-change 事件 */
+function handleDayworkCurrentChange(row) {
+  if (row) {
+    currentDaywork.value = row;
+    queryItemParams.value.dayworkId = currentDaywork.value.id;
+    queryItemParams.value.technologicalProcessDetailId = null;
+    queryItemParams.value.technologicalProcessId = row.technologicalProcessId;
+    getDayworkItems();
+  } else {
+    dayworkItemList.value = [];
+  }
+}
+
+/***********************  报工信息相关事件  ****************************/
 //查询报工信息数据
 function handleGetDayworkItems() {
   dayworkLoading.value = true;
@@ -369,11 +384,7 @@ function handleGetDayworkItems() {
     proxy.$refs.dayworkTable.setCurrentRow(dayworkList.value[index]);
   });
 }
-//切换工段
-function handleDeptChange() {
-  getDayworks();
-}
-//修改
+//修改报工信息
 function handleUpdateDayworkItem(row) {
   //同工序下状态是否有工序已完成
   let processFinish = false;
@@ -417,7 +428,7 @@ function handleUpdateDayworkItem(row) {
   row.processFinish = processFinish;
   proxy.$refs.dayworkItemRef.open(row);
 }
-//查看
+//查看报工信息
 function handleCheckDayworkItem(row) {
   row.technologicalProcessId = queryItemParams.value.technologicalProcessId;
   row.deptId = queryDayworkParams.value.deptId;
@@ -444,10 +455,10 @@ function handleProcessChange() {
   getDayworkItems();
 }
 
-/** 查询报工详情列表 */
+/** 报工详情列表 */
 function getDayworkItems() {
   dayworkItemLoading.value = true;
-  //查询该工段在工段资源分配时绑定的工序
+  //查询该工段在工段资源分配时绑定的工序，传一个flag，如果flag有值则后端查询不分页
   listDeptProcess({ deptId: queryDayworkParams.value.deptId, flag: 1 }).then(
     (res) => {
       deptProcessList.value = res.rows;
@@ -494,19 +505,6 @@ function handleQuery() {
   getDayworks();
 }
 
-/** 生产计划明细 current-change 事件 */
-function handleDayworkCurrentChange(row) {
-  if (row) {
-    currentDaywork.value = row;
-    queryItemParams.value.dayworkId = currentDaywork.value.id;
-    queryItemParams.value.technologicalProcessDetailId = null;
-    queryItemParams.value.technologicalProcessId = row.technologicalProcessId;
-    getDayworkItems();
-  } else {
-    dayworkItemList.value = [];
-  }
-}
-
 onMounted(() => {
   getList();
 });

src/views/business/deptEquipment/form.vue

@@ -1,157 +1,202 @@
 <template>
   <!-- 添加或修改项目信息对话框 -->
-  <el-drawer v-model="visible" size="80%" direction="rtl" :close-on-press-escape="false">
+  <el-drawer
+    v-model="visible"
+    size="80%"
+    direction="rtl"
+    :close-on-press-escape="false"
+  >
     <div class="page-container form-container">
       <div class="form-btns-container">
-        <span class="title-label"><el-icon>
+        <span class="title-label"
+          ><el-icon>
             <Document />
-          </el-icon> 资源组详情</span>
-        <el-button type="primary" icon="Check" style="margin-right: 10px;" @click="handleSave">保 存</el-button>
+          </el-icon>
+          资源组详情</span
+        >
+        <el-button
+          type="primary"
+          icon="Check"
+          style="margin-right: 10px"
+          @click="handleSave"
+          >保 存</el-button
+        >
         <el-button icon="Close" @click="handleCancel">取 消</el-button>
       </div>
       <!-- 主表 -->
-      <el-form ref="formRef" class="master-container" :model="form" label-width="120px" :rules="rules" :show-message="true">
+      <el-form
+        ref="formRef"
+        class="master-container"
+        :model="form"
+        label-width="120px"
+        :rules="rules"
+        :show-message="true"
+      >
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="资源组编号:" prop="code">
-              <el-input v-model.trim="form.code" placeholder="请输入资源组编号" :clearable="true" style="width: 280px" />
+              <el-input
+                v-model.trim="form.code"
+                placeholder="请输入资源组编号"
+                :clearable="true"
+                style="width: 280px"
+              />
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input v-model.trim="form.remark" placeholder="请输入备注" style="width: 280px" />
-            </el-form-item>
-          </el-col> -->
         </el-row>
       </el-form>
       <!-- 搜索区域 -->
       <el-form class="list-search-container" :inline="true">
         <el-form-item class="section-title" label="资源组明细" />
         <el-form-item>
-          <el-button type="warning" icon="Plus" @click="handleOpenPerson('person')">添加人员</el-button>
-          <el-button type="success" icon="Plus" @click="handleOpenPerson('equipment')">添加设备</el-button>
-          <el-button type="danger" icon="Delete" :disabled="selections.length == 0" @click="handleDelete">批量删除</el-button>
-
+          <el-button
+            type="warning"
+            icon="Plus"
+            @click="handleOpenPerson('person')"
+            >添加人员</el-button
+          >
+          <el-button
+            type="success"
+            icon="Plus"
+            @click="handleOpenPerson('equipment')"
+            >添加设备</el-button
+          >
+          <el-button
+            type="danger"
+            icon="Delete"
+            :disabled="selections.length == 0"
+            @click="handleDelete"
+            >批量删除</el-button
+          >
         </el-form-item>
       </el-form>
       <!-- 列表区 -->
       <div class="el-table-container">
-        <el-table ref="equipmentTable" v-loading="loading" row-key="id" @selection-change="handleSelectionChange" :data="form.groupDetailList" height="100%">
+        <el-table
+          ref="equipmentTable"
+          v-loading="loading"
+          row-key="id"
+          @selection-change="handleSelectionChange"
+          :data="form.groupDetailList"
+          height="100%"
+        >
           <el-table-column type="selection" width="40" align="center" />
           <el-table-column label="资源编码" prop="commonCode" align="center" />
           <el-table-column label="资源名称" prop="commonName" align="center" />
           <el-table-column label="资源类别" prop="commonType" align="center">
             <template #default="scope">
-              <dict-tag :options="resource_group_detail" :value="scope.row.commonType" />
+              <dict-tag
+                :options="resource_group_detail"
+                :value="scope.row.commonType"
+              />
             </template>
           </el-table-column>
-          <el-table-column fixed="right" label="操作" align="center" width="140px">
+          <el-table-column
+            fixed="right"
+            label="操作"
+            align="center"
+            width="140px"
+          >
             <template #default="scope">
-              <el-button link type="danger" icon="Delete" @click="handleDeleteResource(scope.row)">删除</el-button>
+              <el-button
+                link
+                type="danger"
+                icon="Delete"
+                @click="handleDeleteResource(scope.row)"
+                >删除</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
       </div>
-      <person ref="personRef" :multiple=true :multipleSelected="handleResourcePersonMultipleSelected" />
-      <equipment ref="equipmentRef" :multiple="true" :multipleSelected="handleResourceMultipleSelected" />
+      <person
+        ref="personRef"
+        :multiple="true"
+        :multipleSelected="handleResourcePersonMultipleSelected"
+      />
+      <equipment
+        ref="equipmentRef"
+        :multiple="true"
+        :multipleSelected="handleResourceMultipleSelected"
+      />
     </div>
   </el-drawer>
 </template>
 <script setup>
-import { detailList } from '@/api/business/equipment'
-import { getResourceGroup, addResourceGroup } from '@/api/business/resourceGroup'
-import person from '@/views/dialog/person.vue'
-import equipment from '@/views/dialog/equipment.vue'
-const { proxy } = getCurrentInstance()
-const emit = defineEmits(['handleSaveResourceSuccess'])
-const { resource_group_detail } = proxy.useDict('resource_group_detail')
-const queryParams = ref({
-  pageNum: 1,
-  pageSize: 10
-})
-
-const selections = ref([])
-const loading = ref(false)
-const title = ref('资源组信息')
-const equipmentDetailList = ref([])
-const detailTotal = ref(0)
-const personRef = ref(null)
-const equipmentRef = ref(null)
-const visible = ref(false)
-const props = defineProps({
-  multipleSelected: {
-    type: Function,
-    default: null
-  }
-})
-const { multipleSelected } = toRefs(props)
+import {
+  getResourceGroup,
+  addResourceGroup,
+} from "@/api/business/resourceGroup";
+import person from "@/views/dialog/person.vue";
+import equipment from "@/views/dialog/equipment.vue";
+const { proxy } = getCurrentInstance();
+const emit = defineEmits(["handleSaveResourceSuccess"]);
+const { resource_group_detail } = proxy.useDict("resource_group_detail");
+const selections = ref([]);
+const loading = ref(false);
+const personRef = ref(null);
+const equipmentRef = ref(null);
+const visible = ref(false);
 const data = reactive({
   form: {
     groupDetailList: [],
-    code: '',
-    remark: ''
+    code: "",
+    remark: "",
   },
   rules: {
-    code: [{ required: true, message: '资源组编码不能为空', trigger: 'blur' }]
-  }
-})
-const { form, rules } = toRefs(data)
+    code: [{ required: true, message: "资源组编码不能为空", trigger: "blur" }],
+  },
+});
+const { form, rules } = toRefs(data);
 
 /***********************  方法区  ****************************/
 /** 打开抽屉 */
 const open = (row) => {
-  reset()
-  loading.value = true
-  form.value.deptId = row.deptId
+  reset();
+  loading.value = true;
+  form.value.deptId = row.deptId;
   if (row.id) {
-    form.value = row
-    console.log(form.value.id)
+    form.value = row;
+    console.log(form.value.id);
     getResourceGroup(form.value.id).then((res) => {
       if (res.code == 200) {
-        form.value = res.data
+        form.value = res.data;
       }
-    })
+    });
   }
-  loading.value = false
-
-  visible.value = true
-}
+  loading.value = false;
+  visible.value = true;
+};
 
 /**
  * 列表checkbox列选择 事件
  */
 function handleSelectionChange(selection) {
-  selections.value = selection
-}
-/** 多选事件 */
-function handleMultipleSelected() {
-  if (multipleSelected.value) {
-    multipleSelected.value(selections.value)
-  }
-  close()
+  selections.value = selection;
 }
+/**打开员工/设备弹窗 */
 function handleOpenPerson(type) {
-  if (type === 'person') {
-    var userInfo = {}
-    userInfo.identifying = false
-    userInfo.deptId = form.value.deptId
-    userInfo.userIds = []
+  if (type === "person") {
+    var userInfo = {};
+    userInfo.identifying = false;
+    userInfo.deptId = form.value.deptId;
+    userInfo.userIds = [];
     form.value.groupDetailList.map((item) => {
-      if (item.commonType === 'person') {
-        userInfo.userIds.push(item.commonCode)
+      if (item.commonType === "person") {
+        userInfo.userIds.push(item.commonCode);
       }
-    })
-    proxy.$refs.personRef.open(userInfo)
-  } else if (type === 'equipment') {
-    var equipmentInfo = {}
-    equipmentInfo.deptId = form.value.deptId
-    equipmentInfo.equipmentCodeIds = []
+    });
+    proxy.$refs.personRef.open(userInfo);
+  } else if (type === "equipment") {
+    var equipmentInfo = {};
+    equipmentInfo.deptId = form.value.deptId;
+    equipmentInfo.equipmentCodeIds = [];
     form.value.groupDetailList.map((item) => {
-      if (item.commonType === 'equipmentDetail') {
-        equipmentInfo.equipmentCodeIds.push(item.commonCode)
+      if (item.commonType === "equipmentDetail") {
+        equipmentInfo.equipmentCodeIds.push(item.commonCode);
       }
-    })
-    proxy.$refs.equipmentRef.open(equipmentInfo)
+    });
+    proxy.$refs.equipmentRef.open(equipmentInfo);
   }
 }
 /**
@@ -159,89 +204,90 @@ function handleOpenPerson(type) {
  */
 function handleResourceMultipleSelected(section) {
   for (var i = 0; i < section.length; i++) {
-    var item = {}
-    item.commonId = section[i].id
-    item.commonCode = section[i].equipmentCode
-    item.commonName = section[i].equipmentName
-    item.commonType = 'equipmentDetail'
-    form.value.groupDetailList.push(item)
+    var item = {};
+    item.commonId = section[i].id;
+    item.commonCode = section[i].equipmentCode;
+    item.commonName = section[i].equipmentName;
+    item.commonType = "equipmentDetail";
+    form.value.groupDetailList.push(item);
   }
 }
 
 /**批量删除 */
 function handleDelete() {
-  form.value.groupDetailList = form.value.groupDetailList.filter((item) => !selections.value.some((selectedItem) => selectedItem === item))
+  form.value.groupDetailList = form.value.groupDetailList.filter(
+    (item) => !selections.value.some((selectedItem) => selectedItem === item)
+  );
 }
 /**人员多选带回 */
 function handleResourcePersonMultipleSelected(section) {
-  console.log(section)
+  console.log(section);
   for (var i = 0; i < section.length; i++) {
-    let item = {}
-    item.commonId = section[i].userId
-    item.commonCode = section[i].userName
-    item.commonName = section[i].nickName
-    item.commonType = 'person'
-    form.value.groupDetailList.push(item)
+    let item = {};
+    item.commonId = section[i].userId;
+    item.commonCode = section[i].userName;
+    item.commonName = section[i].nickName;
+    item.commonType = "person";
+    form.value.groupDetailList.push(item);
   }
 }
 /**
  * 对话框关闭 事件
  */
 function close() {
-  reset()
-  visible.value = false
+  reset();
+  visible.value = false;
 }
 /** 表单重置 */
 function reset() {
   form.value = {
     code: null,
     remark: null,
-    groupDetailList: []
-  }
-  proxy.resetForm('formRef')
+    groupDetailList: [],
+  };
+  proxy.resetForm("formRef");
 }
 
 /** 提交按钮 */
 const handleSave = () => {
-  proxy.$refs['formRef'].validate((valid) => {
+  proxy.$refs["formRef"].validate((valid) => {
     if (valid) {
       if (!form.value.groupDetailList) {
-        proxy.$modal.msg('资源组信息不能为空')
-      }
-      else {
-        var personInfo = []
+        proxy.$modal.msg("资源组信息不能为空");
+      } else {
+        var personInfo = [];
         form.value.groupDetailList.map((item) => {
-          if (item.commonType === 'person') {
-            personInfo.push(item.commonCode)
+          if (item.commonType === "person") {
+            personInfo.push(item.commonCode);
           }
-        })
-        if(personInfo.length == 0) {
-          proxy.$modal.msg('至少有一名资源组成员')
-        }
-        else {
+        });
+        if (personInfo.length == 0) {
+          proxy.$modal.msg("至少有一名资源组成员");
+        } else {
           addResourceGroup(form.value).then((res) => {
-        if (res.code == 200) {
-          emit('handleSaveResourceSuccess')
-          close()
-        }
-      })     
+            if (res.code == 200) {
+              emit("handleSaveResourceSuccess");
+              close();
+            }
+          });
         }
       }
     }
-  })
-}
+  });
+};
+/**删除资源组明细 */
 function handleDeleteResource(row) {
-  form.value.groupDetailList.splice(form.value.groupDetailList.indexOf(row), 1)
+  form.value.groupDetailList.splice(form.value.groupDetailList.indexOf(row), 1);
 }
 
 /** 取消按钮 */
 const handleCancel = () => {
-  visible.value = false
-  reset()
-}
+  visible.value = false;
+  reset();
+};
 
 /** 暴露给父组件的方法 */
 defineExpose({
-  open
-})
+  open,
+});
 </script>

src/views/business/deptEquipment/index.vue

@@ -35,7 +35,7 @@
           <el-form class="list-search-container" :inline="true" style="display:flex ;">
             <el-form-item class="section-title" label="资源组" />
             <el-form-item >
-              <el-button type="primary" icon="Plus" :disabled="workSectionList.length === 0" @click="handleShowEquipmentFormDialog()" v-hasPermi="['business:deptEquipment:add']">新增</el-button>
+              <el-button type="primary" icon="Plus" :disabled="workSectionList.length === 0" @click="handleShowResourceGroupDetailForm()" v-hasPermi="['business:deptEquipment:add']">新增</el-button>
             </el-form-item>
             <el-form-item label="资源组名称：">
           <el-input
@@ -61,7 +61,7 @@
                 <el-table-column label="资源组名称" prop="code" align="center" />
                 <el-table-column label="操作" width="150" align="center">
                   <template #default="scope">
-                    <el-button icon="edit" link type="warning" @click="handleShowEquipmentFormDialog(scope.row)" v-hasPermi="['business:deptEquipment:edit']">编辑
+                    <el-button icon="edit" link type="warning" @click="handleShowResourceGroupDetailForm(scope.row)" v-hasPermi="['business:deptEquipment:edit']">编辑
                     </el-button>
                     <el-button icon="delete" link type="danger" @click="handledelGroup(scope.row)" v-hasPermi="['business:deptEquipment:remove']">删除
                     </el-button>
@@ -103,17 +103,6 @@
                     <dict-tag :options="resource_group_detail" :value="scope.row.commonType" />
                   </template>
                 </el-table-column>
-                <!-- <el-table-column label="是否临时" prop="protemDayworkId" width="70" align="center">
-                  <template #default="scope">
-                    <dict-tag :options="temporary_status" :value="scope.row.protemDayworkId" />
-                  </template>
-                </el-table-column> -->
-                <!-- <el-table-column label="操作" width="150" align="center">
-                  <template #default="scope">
-                    <el-button icon="delete" link type="danger" @click="handledelGroupDetail(scope.row)" v-hasPermi="['business:deptEquipment:remove']">删除
-                    </el-button>
-                  </template>
-                </el-table-column> -->
               </el-table>
             </div>
           </div>
@@ -158,13 +147,12 @@
 <script setup>
 import { workSectionTree } from '@/api/system/dept'
 import { listResourceGroup, delResourceGroup } from '@/api/business/resourceGroup'
-import { delGroupDetail, listGroupDetail } from '@/api/business/resourceGroupDetail'
+import { listGroupDetail } from '@/api/business/resourceGroupDetail'
 import { listDeptProcess, addDeptProcess, delDeptProcess } from '@/api/business/deptProcess'
 import resourceGroupForm from './form'
 import processForm from './DialogProcessChoice'
 const { proxy } = getCurrentInstance()
 const { resource_group_detail } = proxy.useDict('resource_group_detail')
-const { temporary_status } = proxy.useDict('temporary_status')
 /** 设备档案 查询对象 */
 const data = reactive({
   form: {},
@@ -190,21 +178,23 @@ const data = reactive({
 const { queryParams, queryDeptProcessParams, queryDeptParams,queryResourceGroupDetailParams } = toRefs(data)
 
 /** 查询 对象 */
-const currentGroup = ref({})
+/**工段 */
 const workSectionList = ref([])
-const groupList = ref([])
-const deptProcessList = ref([])
 const workSectionLoading = ref(false)
-const groupDetailLoading = ref(false)
+const currentWorkSection = ref({})
+/**资源组 */
+const currentGroup = ref({})
+const groupList = ref([])
 const groupLoading = ref(false)
-const deptProcessLoading = ref(false)
-const groupTotal = ref(0)
+/**资源组明细 */
+const groupDetailLoading = ref(false)
 const groupDetailList = ref([])
+/**工序 */
+const deptProcessList = ref([])
+const deptProcessLoading = ref(false)
 const deptProcessTotal = ref(0)
-const single = ref(true)
-const currentWorkSection = ref({})
-const ids = ref([])
 const deptProcessIds = ref([])
+const single = ref(true)
 
 /****************************  工段方法区  ****************************/
 
@@ -231,17 +221,10 @@ const handleWorkSectionChange = (row) => {
   if (row) {
     currentWorkSection.value = row
     queryParams.value.deptId = row.id
-
     getResourceGroup()
     getDeptProcess()
   }
 }
-function handleQueryUser() {
-  queryParams.value.code = ''
-  queryResourceGroupDetailParams.value.commonCode = ''
-  queryDeptProcessParams.value.processAlias = ''
-  getWorkSections()
-}
 
 /****************************  资源组方法区  ****************************/
 function getResourceGroup() {
@@ -259,6 +242,7 @@ function getResourceGroup() {
     groupLoading.value = false
   })
 }
+/**资源组搜索 */
 function handleQueryResourceGroup() {
   getResourceGroup()
 }
@@ -270,11 +254,22 @@ function handleGroupChange(row) {
     getResourceGroupDetail()
   }
 }
+/**删除资源组 */
+function handledelGroup(row) {
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delResourceGroup(row.id)
+    })
+    .then(() => {
+      handleWorkSectionChange(currentWorkSection.value)
+      proxy.$modal.msgSuccess('删除成功！')
+    })
+}
 
-/** 打开设备对话框事件 */
-function handleShowEquipmentFormDialog(row) {
+/** 打开资源组明细表单 */
+function handleShowResourceGroupDetailForm(row) {
   if (row) {
-    console.log(row)
     row.deptId = currentWorkSection.value.id
     proxy.$refs.resourceGroupFormRef.open(row)
   } else {
@@ -287,8 +282,8 @@ function handleShowEquipmentFormDialog(row) {
 /** 刷新资源组事件 */
 function handleRefreshEquipment() {
   handleWorkSectionChange(currentWorkSection.value)
- // handleGroupChange(currentGroup.value)
 }
+/****************************  资源明细方法区  ****************************/
 /**资源组明细获取方法 */
 function getResourceGroupDetail() {
   groupDetailLoading.value = true
@@ -301,7 +296,7 @@ function getResourceGroupDetail() {
   })
   groupDetailLoading.value = false
 }
-
+/**资源组明细搜索 */
 function handleQueryResourceGroupDetail() {
   getResourceGroupDetail()
 }
@@ -317,6 +312,7 @@ const getDeptProcess = () => {
     deptProcessTotal.value = res.total
   })
 }
+/**工序搜索框 */
 function handleQueryProcess() {
   getDeptProcess()
 }
@@ -354,33 +350,7 @@ function deptProcessSelectionChange(selection) {
   deptProcessIds.value = selection.map((item) => item.id)
   single.value = selection.length != 1
 }
-/**删除资源组 */
-function handledelGroup(row) {
-  proxy.$modal
-    .confirm('是否确认删除选中的数据项？')
-    .then(function () {
-      return delResourceGroup(row.id)
-    })
-    .then(() => {
-      handleWorkSectionChange(currentWorkSection.value)
-      proxy.$modal.msgSuccess('删除成功！')
-    })
-}
-/**删除资源组明细 */
-function handledelGroupDetail(row) {
-  proxy.$modal
-    .confirm('是否确认删除选中的数据项？')
-    .then(function () {
-      return delGroupDetail(row.id)
-    })
-    .then(() => {
-      getResourceGroup()
-      proxy.$modal.msgSuccess('删除成功！')
-    })
-    .catch((e) => {
-      proxy.$modal.msg('操作失败！')
-    })
-}
+
 /**删除工序工段表数据 */
 function handledelDeptProcess() {
   proxy.$modal

src/views/business/resourcePlan/index.vue

@@ -201,12 +201,15 @@ function handleOpenPlanDetailDialog() {
 }
 /**多选删除生产计划 */
   function handleDeletePlanDetail() {
-    delResourcePlan(planDetailIds.value).then((res) => {
-    if (res.code === 200) {
-      getPlanDetail()
-      proxy.$modal.msgSuccess('删除成功')
-    }
-  })
+    proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      delResourcePlan(planDetailIds.value).then((res) => {
+        getPlanDetail()
+        proxy.$modal.msgSuccess('删除成功！')
+      })
+    })
+    .catch(() => {})
 }
 
 /** 生产计划带回 */
@@ -231,12 +234,15 @@ function handlePlanDetailSelected(selection) {
 
 /**生产计划删除 */
 function handleDelPlanDetail(row) {
-  delResourcePlan(row.id).then((res) => {
-    if (res.code === 200) {
-      getPlanDetail()
-      proxy.$modal.msgSuccess('删除成功')
-    }
-  })
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      delResourcePlan(row.id).then((res) => {
+        getPlanDetail()
+        proxy.$modal.msgSuccess('删除成功！')
+      })
+    })
+    .catch(() => {})
 }
 
 onMounted(() => {