批量审核和删除

src/api/dataApproval/achivement.js

@@ -1,23 +1,43 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 获取成果审核列表
-export const expertAchievementList = (params) => request({
+export const expertAchievementList = (params) =>
+  request({
     url: "/business/dataReview/expertAchievementList",
-    method: 'get',
+    method: "get",
-    params
+    params,
-})
+  });
 // 获取成果详情
-export const expertAchievementInfo = (params) => request({
+export const expertAchievementInfo = (params) =>
+  request({
     url: "/business/dataReview/expertAchievementInfo",
-    method: 'get',
+    method: "get",
-    params
+    params,
-})
+  });
 
 // 修改成果
-export const updateExpertAchievement = (data) => request({
+export const updateExpertAchievement = (data) =>
+  request({
     url: "/business/dataReview/updateExpertAchievement",
-    method: 'put',
+    method: "put",
-    data
+    data,
-})
+  });
-
 
+// 批量审核成果
+export const batchAchievement = (ids) =>
+  request({
+    url: `/business/dataReview/batchAchievement`,
+    method: "put",
+    data: {
+      ids,
+    },
+  });
+// 批量删除成果
+export const deleteAchievementByIds = (ids) =>
+  request({
+    url: `/business/dataReview/deleteAchievementByIds`,
+    method: "DELETE",
+    data: {
+      ids,
+    },
+  });

src/api/dataApproval/enterpriseProduct.js

@@ -1,19 +1,36 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 获取企业产品审核列表
-export const enterpriseProductApprovalList = (params) => request({
+export const enterpriseProductApprovalList = (params) =>
+  request({
     url: "/business/dataReview/enterpriseProductList",
-    method: 'get',
+    method: "get",
-    params
+    params,
-})
+  });
 // 获取企业产品审核详情
-export const getProductApprovalInfo = (id) => request({
+export const getProductApprovalInfo = (id) =>
+  request({
     url: `/business/dataReview/getProductInfo/${id}`,
-    method: 'get',
+    method: "get",
-})
+  });
 // 修改企业产品审核状态
-export const updateEnterpriseApprovalProduct = (data) => request({
+export const updateEnterpriseApprovalProduct = (data) =>
+  request({
     url: `/business/dataReview/updateEnterpriseProduct`,
-    method: 'post',
+    method: "post",
-    data
+    data,
-})
+  });
+
+// 批量审核企业产品
+export const batchEnterpriseProduct = (ids) =>
+  request({
+    url: `/business/dataReview/batchEnterpriseProduct/${ids}`,
+    method: "PUT",
+  });
+
+// 批量删除企业产品
+export const deleteEnterpriseProduct = (ids) =>
+  request({
+    url: `/business/dataReview/deleteEnterpriseProduct/${ids}`,
+    method: "DELETE",
+  });

src/api/dataApproval/enterpriseServiceDemand.js

@@ -22,9 +22,23 @@ export const updateCasDemand = (data) =>
     method: "PUT",
     data,
   });
-// 修改企业服务需求
+// 删除企业服务需求
 export const deleteCasDemand = (ids) =>
   request({
     url: `/business/dataReview/listCasDemand/${ids}`,
     method: "DELETE",
   });
+
+// 批量审核企业服务需求
+export const batchCasDemand = (ids) =>
+  request({
+    url: `/business/dataReview/batchCasDemand/${ids}`,
+    method: "PUT",
+  });
+
+// // 批量删除企业技术需求
+// export const deleteTechnologyDemand = (ids) =>
+//   request({
+//     url: `/business/dataReview/deleteTechnologyDemand/${ids}`,
+//     method: "DELETE",
+//   });

src/api/dataApproval/enterpriseTechnologyDemand.js

@@ -1,8 +1,23 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 修改企业技术需求审核
-export const updateTechnologyDemand = (data) => request({
+export const updateTechnologyDemand = (data) =>
+  request({
     url: "/business/dataReview/updateTechnologyDemand",
-    method: 'POST',
+    method: "POST",
-    data
+    data,
-})
+  });
+
+// 批量审核企业技术需求
+export const batchTechnologyDemand = (ids) =>
+  request({
+    url: `/business/dataReview/batchTechnologyDemand/${ids}`,
+    method: "PUT",
+  });
+
+// 批量删除企业技术需求
+export const deleteTechnologyDemand = (ids) =>
+  request({
+    url: `/business/dataReview/deleteTechnologyDemand/${ids}`,
+    method: "DELETE",
+  });

src/views/dataAuditList/Enterpriseproducts/index.vue

@@ -36,8 +36,30 @@
         </el-col>
       </el-row>
     </el-form>
+    <el-row>
+      <el-button
+        v-if="queryParams.status == 0"
+        size="small"
+        type="primary"
+        :disabled="!selectedIds.length"
+        @click="handleBatchApproval"
+        >批量审核</el-button
+      >
+      <el-button
+        size="small"
+        type="danger"
+        :disabled="!selectedIds.length"
+        @click="handleDelete(...selectedIds)"
+        >批量删除</el-button
+      >
+    </el-row>
     <!-- 表格区域 -->
-    <el-table :data="dataList" :loading="loading">
+    <el-table
+      :data="dataList"
+      :loading="loading"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="80"></el-table-column>
       <el-table-column
         label="产品名称"
         align="center"
@@ -73,6 +95,13 @@
             @click="handleApproval(row.id)"
             >审批</el-button
           >
+          <el-button
+            type="danger"
+            round
+            size="small"
+            @click="handleDelete(row.id)"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -90,8 +119,16 @@
 import { reactive, ref, toRefs } from "vue";
 import SiteOptions from "@/views/components/SiteOptions";
 import { tenantSelect } from "@/api/subPlatform/tenant";
-import { enterpriseProductApprovalList } from "@/api/dataApproval/enterpriseProduct";
+import {
+  enterpriseProductApprovalList,
+  batchEnterpriseProduct,
+  deleteEnterpriseProduct,
+} from "@/api/dataApproval/enterpriseProduct";
+import useUserStore from "@/store/modules/user";
+
 import { useRouter } from "vue-router";
+import { ElMessage, ElMessageBox } from "element-plus";
+const userStore = useUserStore();
 const router = useRouter();
 const dataList = ref([]);
 const siteList = ref([]);
@@ -142,41 +179,39 @@ const resetQuery = () => {
   }
   handleQuery();
 };
-// dataList.value = [
+
-//   {
-//     id: "123",
-//     name: "新型高功率LED路灯照明市场分析",
-//     obj: "电子信息",
-//     time: "2015-09-28 08:50:08",
-//   },
-//   {
-//     id: "123",
-//     name: "一种新型的自动调节升降按摩椅",
-//     obj: "电子信息",
-//     time: "2015-09-28 08:50:08",
-//   },
-//   {
-//     id: "123",
-//     name: "汽车用先进传感器成果",
-//     obj: "电子信息",
-//     time: "2015-09-28 08:50:08",
-//   },
-//   { id: "123", name: "微波遥感", obj: "电子信息", time: "2015-09-28 08:50:08" },
-//   {
-//     id: "123",
-//     name: "一种高压电柜的散热控",
-//     obj: "电子信息",
-//     time: "2015-09-28 08:50:08",
-//   },
-//   {
-//     id: "123",
-//     name: "高电压快充技术",
-//     obj: "电子信息",
-//     time: "2015-09-28 08:50:08",
-//   },
-// ];
 const handleApproval = (id) => {
   router.push(`/auditing/Enterpriseproducts/approval?id=${id}`);
 };
+
+const selectedIds = ref([]);
+// 选中状态改变
+const handleSelectionChange = (val) => {
+  selectedIds.value = val.map((el) => el.id);
+};
+
+const handleDelete = async (...ids) => {
+  ElMessageBox.confirm(`是否确认删除编号为${ids.join(",")}的数据项？`)
+    .then(async () => {
+      await deleteEnterpriseProduct(ids);
+      userStore.getApprovalCount();
+      getList();
+      ElMessage.success("删除成功");
+    })
+    .catch(() => {});
+};
+
+const handleBatchApproval = async () => {
+  ElMessageBox.confirm(
+    `是否确认批量审核通过编号为${selectedIds.value.join(",")}的数据项？`
+  )
+    .then(async () => {
+      await batchEnterpriseProduct(selectedIds.value);
+      userStore.getApprovalCount();
+      getList();
+      ElMessage.success("批量审核成功");
+    })
+    .catch(() => {});
+};
 </script>
 <style></style>

src/views/dataAuditList/achievement/index.vue

@@ -38,11 +38,25 @@
       </el-row>
     </el-form>
     <el-row>
-      <el-button size="small" type="primary">批量审核</el-button>
+      <el-button
+        v-if="queryParams.status == 0"
+        size="small"
+        type="primary"
+        :disabled="!selectedIds.length"
+        @click="handleBatchApproval"
+        >批量审核</el-button
+      >
+      <el-button
+        size="small"
+        type="danger"
+        :disabled="!selectedIds.length"
+        @click="handleDelete(...selectedIds)"
+        >批量删除</el-button
+      >
     </el-row>
     <!-- 表格区域 -->
-    <el-table :data="dataList">
+    <el-table :data="dataList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection"></el-table-column>
+      <el-table-column type="selection" width="80"></el-table-column>
       <el-table-column
         label="成果名称"
         align="center"
@@ -77,7 +91,16 @@
       ></el-table-column>
       <el-table-column label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="approval(row.id)">审批</el-button>
+          <el-button size="small" round type="primary" @click="approval(row.id)"
+            >审批</el-button
+          >
+          <el-button
+            size="small"
+            round
+            type="danger"
+            @click="handleDelete(row.id)"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -94,9 +117,17 @@
 <script setup>
 import { reactive, ref, toRefs } from "vue";
 import { tenantSelect } from "@/api/subPlatform/tenant";
-import { expertAchievementList } from "@/api/dataApproval/achivement";
+import {
+  expertAchievementList,
+  batchAchievement,
+  deleteAchievementByIds,
+} from "@/api/dataApproval/achivement";
 import SiteOptions from "@/views/components/SiteOptions";
+import useUserStore from "@/store/modules/user";
 import { useRouter } from "vue-router";
+// import {} from "../../../api/dataApproval/achivement";
+import { ElMessage, ElMessageBox } from "element-plus";
+const userStore = useUserStore();
 const router = useRouter();
 const data = reactive({
   queryParams: {
@@ -145,5 +176,34 @@ const approval = (id) => {
 };
 
 handleQuery();
+
+const selectedIds = ref([]);
+// 选中状态改变
+const handleSelectionChange = (val) => {
+  selectedIds.value = val.map((el) => el.id);
+};
+const handleDelete = async (...ids) => {
+  ElMessageBox.confirm(`是否确认删除编号为${ids.join(",")}的数据项？`)
+    .then(async () => {
+      await deleteAchievementByIds(ids);
+      userStore.getApprovalCount();
+      getList();
+      ElMessage.success("删除成功");
+    })
+    .catch(() => {});
+};
+
+const handleBatchApproval = async () => {
+  ElMessageBox.confirm(
+    `是否确认批量审核通过编号为${selectedIds.value.join(",")}的数据项？`
+  )
+    .then(async () => {
+      await batchAchievement(selectedIds.value);
+      userStore.getApprovalCount();
+      getList();
+      ElMessage.success("批量审核成功");
+    })
+    .catch(() => {});
+};
 </script>
 <style></style>

src/views/dataAuditList/demand/index.vue

@@ -14,6 +14,8 @@
               <el-radio-button :label="0">待审核</el-radio-button>
               <el-radio-button :label="1">已通过</el-radio-button>
               <el-radio-button :label="2">已驳回</el-radio-button>
+              <el-radio-button :label="4">已结束</el-radio-button>
+              <!-- <el-radio-button :label="2">已驳回</el-radio-button> -->
             </el-radio-group>
           </el-form-item>
         </el-col>
@@ -36,8 +38,26 @@
         </el-col>
       </el-row>
     </el-form>
+    <el-row>
+      <el-button
+        v-if="queryParams.status == 0"
+        size="small"
+        type="primary"
+        :disabled="!selectedIds.length"
+        @click="handleBatchApproval"
+        >批量审核</el-button
+      >
+      <el-button
+        size="small"
+        type="danger"
+        :disabled="!selectedIds.length"
+        @click="handleDelete(...selectedIds)"
+        >批量删除</el-button
+      >
+    </el-row>
     <!-- 表格区域 -->
-    <el-table :data="dataList">
+    <el-table :data="dataList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="80"></el-table-column>
       <el-table-column label="编号" align="center" prop="id"></el-table-column>
       <el-table-column
         label="需求名称"
@@ -82,11 +102,19 @@
       ></el-table-column>
       <el-table-column label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" size="small" @click="approval(row)"
+          <el-button type="text" round size="small" @click="approval(row)"
             >审批</el-button
           >
-          <el-button type="text" size="small" @click="approval(row)"
+          <el-button type="text" round size="small" @click="complete(row.id)"
-            >结束</el-button
+            >完成</el-button
+          >
+          <el-button
+            type="text"
+            round
+            size="small"
+            icon="delete"
+            @click="handleDelete(row.id)"
+            >删除</el-button
           >
         </template>
       </el-table-column>
@@ -115,7 +143,14 @@ import SiteOptions from "@/views/components/SiteOptions";
 import { tenantSelect } from "@/api/subPlatform/tenant";
 import { ref, toRefs, defineComponent } from "vue";
 import { cloneDeep } from "lodash";
-
+import useUserStore from "@/store/modules/user";
+import {
+  batchTechnologyDemand,
+  deleteTechnologyDemand,
+  updateTechnologyDemand,
+} from "@/api/dataApproval/enterpriseTechnologyDemand";
+import { ElMessage, ElMessageBox } from "element-plus";
+const userStore = useUserStore();
 const data = reactive({
   queryParams: {
     pageNum: 1,
@@ -124,6 +159,7 @@ const data = reactive({
   },
   demandForm: {},
 });
+
 const siteList = ref([]);
 const dataList = ref([]);
 const total = ref(0);
@@ -168,6 +204,45 @@ const resetQuery = () => {
   handleQuery();
 };
 
+const selectedIds = ref([]);
+// 选中状态改变
+const handleSelectionChange = (val) => {
+  selectedIds.value = val.map((el) => el.id);
+};
+const handleDelete = async (...ids) => {
+  ElMessageBox.confirm(`是否确认删除编号为${ids.join(",")}的数据项？`)
+    .then(async () => {
+      await deleteTechnologyDemand(ids);
+      userStore.getApprovalCount();
+      getList();
+      ElMessage.success("删除成功");
+    })
+    .catch(() => {});
+};
+const handleBatchApproval = async () => {
+  ElMessageBox.confirm(
+    `是否确认批量审核通过编号为${selectedIds.value.join(",")}的数据项？`
+  )
+    .then(async () => {
+      await batchTechnologyDemand(selectedIds.value);
+      userStore.getApprovalCount();
+      getList();
+      ElMessage.success("批量审核成功");
+    })
+    .catch(() => {});
+};
+
+// 修改为完成状态
+const complete = (id) => {
+  ElMessageBox.confirm(`是否确认结束编号为${id}的数据项？`)
+    .then(async () => {
+      await updateTechnologyDemand({ id, status: 4 });
+      userStore.getApprovalCount();
+      getList();
+      ElMessage.success("删除成功");
+    })
+    .catch(() => {});
+};
 getSiteList();
 getList();
 </script>

src/views/dataAuditList/serviceDemand/index.vue

@@ -4,7 +4,7 @@
     <el-form inline ref="queryFormRef" :model="queryParams">
       <el-row>
         <el-col>
-          <el-form-item prop="status">
+          <el-form-item>
             <el-radio-group
               v-model="queryParams.status"
               size="small"
@@ -14,12 +14,17 @@
               <el-radio-button :label="0">待审核</el-radio-button>
               <el-radio-button :label="1">已通过</el-radio-button>
               <el-radio-button :label="2">已驳回</el-radio-button>
+              <el-radio-button :label="4">已结束</el-radio-button>
             </el-radio-group>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="所属站点" prop="tenantId">
+          <el-form-item label="需求类型" prop="category">
-            <SiteOptions v-model="queryParams.tenantId" :site-list="siteList" />
+            <!-- <SiteOptions v-model="queryParams.tenantId" :site-list="siteList" /> -->
+            <el-select v-model="queryParams.category">
+              <el-option label="企业" value="1" />
+              <el-option label="专家" value="2" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -36,8 +41,22 @@
         </el-col>
       </el-row>
     </el-form>
-    <el-row style="margin-bottom: 20px">
+    <el-row>
-      <el-button size="small" type="primary">批量审核</el-button>
+      <el-button
+        v-if="queryParams.status == 0"
+        size="small"
+        type="primary"
+        :disabled="!selectedIds.length"
+        @click="handleBatchApproval"
+        >批量审核</el-button
+      >
+      <el-button
+        size="small"
+        type="danger"
+        :disabled="!selectedIds.length"
+        @click="handleDelete(...selectedIds)"
+        >批量删除</el-button
+      >
     </el-row>
     <!-- 表格区域 -->
     <el-table :data="dataList" @selection-change="handleSelectionChange">
@@ -100,8 +119,8 @@
           <el-button type="text" size="small" @click="approval(row.id)"
             >审批</el-button
           >
-          <el-button type="text" size="small" @click="approval(row.id)"
+          <el-button type="text" size="small" @click="complete(row.id)"
-            >结束</el-button
+            >完成</el-button
           >
           <el-button
             type="text"
@@ -128,10 +147,12 @@
 import {
   listCasDemand,
   deleteCasDemand,
+  batchCasDemand,
+  updateCasDemand,
 } from "@/api/dataApproval/enterpriseServiceDemand";
 
 // import Edialog from "@/views/components/Businessneeds/Approvaldetails.vue";
-import SiteOptions from "@/views/components/SiteOptions";
+// import SiteOptions from "@/views/components/SiteOptions";
 import { tenantSelect } from "@/api/subPlatform/tenant";
 import { ref, toRefs } from "vue";
 // import { cloneDeep } from "lodash";
@@ -200,8 +221,7 @@ const handleQuery = () => {
 const selectedIds = ref([]);
 // 选中状态改变
 const handleSelectionChange = (val) => {
-  selectedIds.value = val;
+  selectedIds.value = val.map((el) => el.id);
-  // console.log(val);
 };
 
 /** 重置按钮操作 */
@@ -212,17 +232,39 @@ const resetQuery = () => {
   handleQuery();
 };
 
-const handleDelete = async (id) => {
+const handleDelete = async (...ids) => {
-  ElMessageBox.confirm(`是否确认删除编号为${id}的数据项？`)
+  ElMessageBox.confirm(`是否确认删除编号为${ids.join(",")}的数据项？`)
     .then(async () => {
-      await deleteCasDemand(id);
+      await deleteCasDemand(ids);
+      userStore.getApprovalCount();
+      getList();
+      ElMessage.success("删除成功");
+    })
+    .catch(() => {});
+};
+const handleBatchApproval = async () => {
+  ElMessageBox.confirm(
+    `是否确认批量审核通过编号为${selectedIds.value.join(",")}的数据项？`
+  )
+    .then(async () => {
+      await batchCasDemand(selectedIds.value);
+      userStore.getApprovalCount();
+      getList();
+      ElMessage.success("批量审核成功");
+    })
+    .catch(() => {});
+};
+// 修改为完成状态
+const complete = (id) => {
+  ElMessageBox.confirm(`是否确认结束编号为${id}的数据项？`)
+    .then(async () => {
+      await updateCasDemand({ id, status: 4 });
       userStore.getApprovalCount();
       getList();
       ElMessage.success("删除成功");
     })
     .catch(() => {});
 };
-
 getSiteList();
 getList();
 </script>