From 2177189c34cf0ba90b8afedb3ecd63f65cb9117d Mon Sep 17 00:00:00 2001
From: quantulr <35954003+quantulr@users.noreply.github.com>
Date: Fri, 4 Aug 2023 17:27:34 +0800
Subject: [PATCH] bugfix and performance improves

---
 Caddyfile                                     |   6 +-
 src/api/dataApproval/achivement.js            |  68 +++---
 .../enterpriseTechnologyDemand.js             |  42 ++--
 src/components/ImageUpload/index.vue          | 104 ++++-----
 .../Businessneeds/Approvaldetails.vue         | 106 ++++-----
 .../dataAuditList/achievement/approval.vue    | 155 +++++++------
 src/views/dataAuditList/achievement/index.vue |   4 +-
 src/views/dataAuditList/demand/index.vue      | 207 +++++++++---------
 8 files changed, 351 insertions(+), 341 deletions(-)

diff --git a/Caddyfile b/Caddyfile
index 1cfa33e..f738dae 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -4,11 +4,11 @@
 #}
 
 :4173 {
-	handle_path /api/* {
-		reverse_proxy http://101.34.131.16:1618
+	handle /api/* {
+		reverse_proxy http://101.34.251.155
 	}
 	handle {
-		root * "/Volumes/iMac Doc/WebstormProjects/cas_cloud_admin/dist"
+		root * "/Volumes/iMac Doc/WebstormProjects/cas_cloud_admin_i18n/dist"
 		file_server
 		try_files {path} /
 	}
diff --git a/src/api/dataApproval/achivement.js b/src/api/dataApproval/achivement.js
index b6d5f36..f8f79c6 100644
--- a/src/api/dataApproval/achivement.js
+++ b/src/api/dataApproval/achivement.js
@@ -2,42 +2,48 @@ import request from "@/utils/request";
 
 // 获取成果审核列表
 export const expertAchievementList = (params) =>
-  request({
-    url: "/business/dataReview/expertAchievementList",
-    method: "get",
-    params,
-  });
+    request({
+        url: "/business/dataReview/expertAchievementList",
+        method: "get",
+        params,
+    });
 // 获取成果详情
 export const expertAchievementInfo = (params) =>
-  request({
-    url: "/business/dataReview/expertAchievementInfo",
-    method: "get",
-    params,
-  });
+    request({
+        url: "/business/dataReview/expertAchievementInfo",
+        method: "get",
+        params,
+    });
 
 // 修改成果
 export const updateExpertAchievement = (data) =>
-  request({
-    url: "/business/dataReview/updateExpertAchievement",
-    method: "put",
-    data,
-  });
+    request({
+        url: "/business/dataReview/updateExpertAchievement",
+        method: "put",
+        data,
+    });
+
+/**
+ * 批量审核成果
+ * @param ids
+ * @param status 1->通过|2->驳回
+ * @returns {*}
+ */
+export const batchAchievement = (ids, status) =>
+    request({
+        url: `/business/dataReview/batchAchievement/${status}`,
+        method: "put",
+        data: {
+            ids,
+        },
+    });
 
-// 批量审核成果
-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,
-    },
-  });
+    request({
+        url: `/business/dataReview/deleteAchievementByIds`,
+        method: "DELETE",
+        data: {
+            ids,
+        },
+    });
diff --git a/src/api/dataApproval/enterpriseTechnologyDemand.js b/src/api/dataApproval/enterpriseTechnologyDemand.js
index 5e3cdd1..e1ddc03 100644
--- a/src/api/dataApproval/enterpriseTechnologyDemand.js
+++ b/src/api/dataApproval/enterpriseTechnologyDemand.js
@@ -2,25 +2,25 @@ import request from "@/utils/request";
 
 // 修改企业技术需求审核
 export const updateTechnologyDemand = (data) =>
-  request({
-    url: "/business/dataReview/updateTechnologyDemand",
-    method: "POST",
-    data,
-  });
+    request({
+        url: "/business/dataReview/updateTechnologyDemand",
+        method: "POST",
+        data,
+    });
 
 // 批量审核企业技术需求
-export const batchTechnologyDemand = (ids) =>
-  request({
-    url: `/business/dataReview/batchTechnologyDemand/${ids}`,
-    method: "PUT",
-  });
+export const batchTechnologyDemand = (ids, status) =>
+    request({
+        url: `/business/dataReview/batchTechnologyDemand/${ids}/${status}`,
+        method: "PUT",
+    });
 
 // 批量删除企业技术需求
 export const deleteTechnologyDemand = (ids) =>
-  request({
-    url: `/business/dataReview/deleteTechnologyDemand/${ids}`,
-    method: "DELETE",
-  });
+    request({
+        url: `/business/dataReview/deleteTechnologyDemand/${ids}`,
+        method: "DELETE",
+    });
 
 /**
  * 企业技术需求指派经纪人
@@ -30,11 +30,11 @@ export const deleteTechnologyDemand = (ids) =>
  * @return {*}
  */
 export const dataReviewAppointBroker = (
-  demandId, // 企业技术需求id
-  brokerId, // 经纪人id
-  brokerName // 经纪人姓名 // 获取企业技术需求详情
+    demandId, // 企业技术需求id
+    brokerId, // 经纪人id
+    brokerName // 经纪人姓名 // 获取企业技术需求详情
 ) =>
-  request({
-    url: `/business/dataReview/appointBroker/${demandId}/${brokerId}/${brokerName}`,
-    method: "POST",
-  });
+    request({
+        url: `/business/dataReview/appointBroker/${demandId}/${brokerId}/${brokerName}`,
+        method: "POST",
+    });
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 4550d45..210c82b 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -1,23 +1,25 @@
 <template>
   <div class="component-upload-image">
     <el-upload
-      multiple
-      :action="uploadImgUrl"
-      list-type="picture-card"
-      :on-success="handleUploadSuccess"
-      :before-upload="handleBeforeUpload"
-      :limit="limit"
-      :on-error="handleUploadError"
-      :on-exceed="handleExceed"
-      name="file"
-      :on-remove="handleRemove"
-      :show-file-list="true"
-      :headers="headers"
-      :file-list="fileList"
-      :on-preview="handlePictureCardPreview"
-      :class="{ hide: fileList.length >= limit }"
+        multiple
+        :action="uploadImgUrl"
+        list-type="picture-card"
+        :on-success="handleUploadSuccess"
+        :before-upload="handleBeforeUpload"
+        :limit="limit"
+        :on-error="handleUploadError"
+        :on-exceed="handleExceed"
+        name="file"
+        :on-remove="handleRemove"
+        :show-file-list="true"
+        :headers="headers"
+        :file-list="fileList"
+        :on-preview="handlePictureCardPreview"
+        :class="{ hide: fileList.length >= limit }"
     >
-      <el-icon class="avatar-uploader-icon"><plus /></el-icon>
+      <el-icon class="avatar-uploader-icon">
+        <plus/>
+      </el-icon>
     </el-upload>
     <!-- 上传提示 -->
     <div class="el-upload__tip" v-if="showTip">
@@ -32,21 +34,21 @@
     </div>
 
     <el-dialog
-      v-model="dialogVisible"
-      title="预览"
-      width="800px"
-      append-to-body
+        v-model="dialogVisible"
+        title="预览"
+        width="800px"
+        append-to-body
     >
       <img
-        :src="dialogImageUrl"
-        style="display: block; max-width: 100%; margin: 0 auto"
+          :src="dialogImageUrl"
+          style="display: block; max-width: 100%; margin: 0 auto"
       />
     </el-dialog>
   </div>
 </template>
 
 <script setup>
-import { getToken } from "@/utils/auth";
+import {getToken} from "@/utils/auth";
 
 const props = defineProps({
   modelValue: [String, Object, Array],
@@ -76,7 +78,7 @@ const props = defineProps({
   },
 });
 
-const { proxy } = getCurrentInstance();
+const {proxy} = getCurrentInstance();
 const emit = defineEmits();
 const number = ref(0);
 const uploadList = ref([]);
@@ -84,35 +86,35 @@ const dialogImageUrl = ref("");
 const dialogVisible = ref(false);
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
 const uploadImgUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传的图片服务器地址
-const headers = ref({ Authorization: "Bearer " + getToken() });
+const headers = ref({Authorization: "Bearer " + getToken()});
 const fileList = ref([]);
 const showTip = computed(
-  () => props.isShowTip && (props.fileType || props.fileSize)
+    () => props.isShowTip && (props.fileType || props.fileSize)
 );
 
 watch(
-  () => props.modelValue,
-  (val) => {
-    if (val) {
-      // 首先将值转为数组
-      const list = Array.isArray(val) ? val : props.modelValue.split(",");
-      // 然后将数组转为对象数组
-      fileList.value = list.map((item) => {
-        if (typeof item === "string") {
-          if (item.indexOf(baseUrl) === -1) {
-            item = { name: baseUrl + item, url: baseUrl + item };
-          } else {
-            item = { name: item, url: item };
+    () => props.modelValue,
+    (val) => {
+      if (val) {
+        // 首先将值转为数组
+        const list = Array.isArray(val) ? val : props.modelValue.split(",");
+        // 然后将数组转为对象数组
+        fileList.value = list.map((item) => {
+          if (typeof item === "string") {
+            if (item.indexOf(baseUrl) === -1) {
+              item = {name: baseUrl + "/file" + item, url: baseUrl + "/file" + item};
+            } else {
+              item = {name: item, url: item};
+            }
           }
-        }
-        return item;
-      });
-    } else {
-      fileList.value = [];
-      return [];
-    }
-  },
-  { deep: true, immediate: true }
+          return item;
+        });
+      } else {
+        fileList.value = [];
+        return [];
+      }
+    },
+    {deep: true, immediate: true}
 );
 
 // 删除图片
@@ -122,11 +124,11 @@ function handleRemove(file, files) {
 
 // 上传成功回调
 function handleUploadSuccess(res) {
-  uploadList.value.push({ name: res.fileName, url: res.url });
+  uploadList.value.push({name: res.fileName, url: res.fileName});
   if (uploadList.value.length === number.value) {
     fileList.value = fileList.value
-      .filter((f) => f.url !== undefined)
-      .concat(uploadList.value);
+        .filter((f) => f.url !== undefined)
+        .concat(uploadList.value);
     uploadList.value = [];
     number.value = 0;
     emit("update:modelValue", listToString(fileList.value));
@@ -152,7 +154,7 @@ function handleBeforeUpload(file) {
   }
   if (!isImg) {
     proxy.$modal.msgError(
-      `文件格式不正确, 请上传${props.fileType.join("/")}图片格式文件!`
+        `文件格式不正确, 请上传${props.fileType.join("/")}图片格式文件!`
     );
     return false;
   }
diff --git a/src/views/components/Businessneeds/Approvaldetails.vue b/src/views/components/Businessneeds/Approvaldetails.vue
index 2b0e99a..e09920d 100644
--- a/src/views/components/Businessneeds/Approvaldetails.vue
+++ b/src/views/components/Businessneeds/Approvaldetails.vue
@@ -2,10 +2,10 @@
 <template>
   <el-dialog title="基本信息" :model-value="isShow" @close="close">
     <el-form
-      ref="formRef"
-      :model="modelValue"
-      :label-width="labelWidth + 'px'"
-      disabled
+        ref="formRef"
+        :model="modelValue"
+        :label-width="labelWidth + 'px'"
+        disabled
     >
       <p><b>基本信息</b></p>
       <el-row>
@@ -22,10 +22,11 @@
           <el-form-item label="需求类别:">
             <el-checkbox-group v-model="modelValue.kinds">
               <el-checkbox
-                v-for="item in checkList"
-                :key="item.id"
-                :label="item.name"
-                >{{ item.name }}</el-checkbox
+                  v-for="item in checkList"
+                  :key="item.id"
+                  :label="item.name"
+              >{{ item.name }}
+              </el-checkbox
               >
             </el-checkbox-group>
           </el-form-item>
@@ -37,39 +38,39 @@
           <el-form-item label="需求描述:" prop="introduce">
             <!-- <Editor v-model="modelValue.add" :minHeight="150" /> -->
             <WangEditor
-              v-model="modelValue.introduce"
-              width="100%"
-              min-height="150px"
-              readOnly
+                v-model="modelValue.introduce"
+                width="100%"
+                min-height="150px"
+                readOnly
             ></WangEditor>
           </el-form-item>
         </el-col>
       </el-row>
 
       <FieldOptions
-        v-model="modelValue"
-        :labelWidth="labelWidth"
-        disabled
-        ref="fieldFormRef"
+          v-model="modelValue"
+          :labelWidth="labelWidth"
+          disabled
+          ref="fieldFormRef"
       />
 
       <CityOptions
-        disabled
-        v-model="modelValue"
-        :labelWidth="labelWidth"
-        ref="cityFormRef"
+          disabled
+          v-model="modelValue"
+          :labelWidth="labelWidth"
+          ref="cityFormRef"
       />
 
       <el-row>
         <el-col :span="12">
           <el-form-item
-            label="技术需求预算:"
-            :prop="modelValue.budgetMode == 1 ? 'budget' : ''"
+              label="技术需求预算:"
+              :prop="modelValue.budgetMode == 1 ? 'budget' : ''"
           >
             <el-input
-              v-model="modelValue.budget"
-              oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
-              placeholder="请输入技术需求预算"
+                v-model="modelValue.budget"
+                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
+                placeholder="请输入技术需求预算"
             >
               <template #append>万元</template>
             </el-input>
@@ -78,10 +79,11 @@
         <el-col :span="12">
           <el-form-item label-width="50px">
             <el-checkbox
-              false-label="1"
-              true-label="2"
-              v-model="modelValue.budgetMode"
-              >面议</el-checkbox
+                false-label="1"
+                true-label="2"
+                v-model="modelValue.budgetMode"
+            >面议
+            </el-checkbox
             >
           </el-form-item>
         </el-col>
@@ -91,11 +93,11 @@
         <el-col :span="12">
           <el-form-item label="截止时间:" prop="deadline">
             <el-date-picker
-              style="width: 100%"
-              v-model="modelValue.deadline"
-              type="date"
-              value-format="YYYY-MM-DD"
-              placeholder="请选择截止时间"
+                style="width: 100%"
+                v-model="modelValue.deadline"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择截止时间"
             >
             </el-date-picker>
           </el-form-item>
@@ -106,16 +108,16 @@
         <el-col :span="12">
           <el-form-item label="需求联系人:" prop="name">
             <el-input
-              v-model="modelValue.name"
-              placeholder="请输入需求联系人"
+                v-model="modelValue.name"
+                placeholder="请输入需求联系人"
             ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="联系人手机号:" prop="mobile">
             <el-input
-              v-model="modelValue.mobile"
-              placeholder="请输入联系人手机号"
+                v-model="modelValue.mobile"
+                placeholder="请输入联系人手机号"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -143,13 +145,13 @@
       <el-row>
         <el-col :span="24">
           <InputBoxAdd
-            :labelWidth="labelWidth"
-            v-model="modelValue"
-            title="想合作的单位及模式"
-            placeholder=""
-            disabled
-            fieldKey="wants"
-            ref="directionsFormRef"
+              :labelWidth="labelWidth"
+              v-model="modelValue"
+              title="想合作的单位及模式"
+              placeholder=""
+              disabled
+              fieldKey="wants"
+              ref="directionsFormRef"
           />
         </el-col>
       </el-row>
@@ -161,15 +163,16 @@
   </el-dialog>
 </template>
 <script setup>
-import { updateTechnologyDemand } from "@/api/dataApproval/enterpriseTechnologyDemand";
-import { demandCategoryList } from "@/utils/parameter";
+import {demandCategoryList} from "@/utils/parameter";
 import WangEditor from "@/components/WangEditor";
 import CityOptions from "@/views/components/CityOptions";
 import FieldOptions from "@/views/components/FieldOptions";
 import InputBoxAdd from "@/views/components/InputBoxAdd";
-import { ElMessage } from "element-plus";
-import { ref, toRefs } from "vue";
+import {ElMessage} from "element-plus";
+import {toRefs} from "vue";
 import useUserStore from "@/store/modules/user";
+import {batchTechnologyDemand} from "@/api/dataApproval/enterpriseTechnologyDemand";
+
 const userStore = useUserStore();
 const emit = defineEmits(["update-list"]);
 const props = defineProps({
@@ -182,12 +185,13 @@ const props = defineProps({
     required: true,
   },
 });
-const { isShow, modelValue } = toRefs(props);
+const {isShow, modelValue} = toRefs(props);
 const labelWidth = 160;
 const checkList = reactive(demandCategoryList);
 const approve = async (status) => {
   let title = status == 1 ? "通过" : "驳回";
-  await updateTechnologyDemand({ id: modelValue.value.id, status });
+  // await updateTechnologyDemand({ id: modelValue.value.id, status });
+  await batchTechnologyDemand(modelValue.value.id, status)
   userStore.getUnApprovedTechnology();
   ElMessage.success(`已${title}需求`);
   emit("update:isShow", false);
diff --git a/src/views/dataAuditList/achievement/approval.vue b/src/views/dataAuditList/achievement/approval.vue
index 54d0248..16050cf 100644
--- a/src/views/dataAuditList/achievement/approval.vue
+++ b/src/views/dataAuditList/achievement/approval.vue
@@ -2,10 +2,10 @@
   <div class="app-container">
     <div style="width: 55%">
       <el-form
-        ref="formRef"
-        :model="form"
-        :label-width="labelWidth + 'px'"
-        disabled
+          ref="formRef"
+          :model="form"
+          :label-width="labelWidth + 'px'"
+          disabled
       >
         <div class="form_title">
           <p><b>基本信息</b></p>
@@ -15,44 +15,44 @@
           <el-col :span="24">
             <el-form-item label="成果名称:" prop="title">
               <el-input
-                v-model="form.title"
-                placeholder="请输入成果名称"
+                  v-model="form.title"
+                  placeholder="请输入成果名称"
               ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
 
         <FieldOptions
-          v-model="form"
-          :labelWidth="labelWidth"
-          disabled
-          ref="fieldFormRef"
+            v-model="form"
+            :labelWidth="labelWidth"
+            disabled
+            ref="fieldFormRef"
         />
 
         <InputBoxAdd
-          :labelWidth="labelWidth"
-          disabled
-          v-model="form"
-          title="应用客户"
-          placeholder="请输入应用客户"
-          fieldKey="customers"
-          ref="customerFormRef"
+            :labelWidth="labelWidth"
+            disabled
+            v-model="form"
+            title="应用客户"
+            placeholder="请输入应用客户"
+            fieldKey="customers"
+            ref="customerFormRef"
         />
-        <city-options
-          v-model="form"
-          disabled
-          :labelWidth="labelWidth"
-          ref="cityFormRef"
-        ></city-options>
+        <!--        <city-options-->
+        <!--            v-model="form"-->
+        <!--            disabled-->
+        <!--            :labelWidth="labelWidth"-->
+        <!--            ref="cityFormRef"-->
+        <!--        ></city-options>-->
         <el-row>
           <el-col :span="24">
             <el-form-item label="成果成熟度:" prop="maturity">
               <el-select v-model="form.maturity" clearable placeholder="请选择">
                 <el-option
-                  v-for="item in maturityOptions"
-                  :key="item.key"
-                  :label="item.value"
-                  :value="item.key"
+                    v-for="item in maturityOptions"
+                    :key="item.key"
+                    :label="item.value"
+                    :value="item.key"
                 >
                 </el-option>
               </el-select>
@@ -63,15 +63,15 @@
           <el-col :span="24">
             <el-form-item label="成果领先性:" prop="leadStandard">
               <el-select
-                v-model="form.leadStandard"
-                clearable
-                placeholder="请选择"
+                  v-model="form.leadStandard"
+                  clearable
+                  placeholder="请选择"
               >
                 <el-option
-                  v-for="item in leadOptions"
-                  :key="item.key"
-                  :label="item.value"
-                  :value="item.key"
+                    v-for="item in leadOptions"
+                    :key="item.key"
+                    :label="item.value"
+                    :value="item.key"
                 >
                 </el-option>
               </el-select>
@@ -82,15 +82,15 @@
           <el-col :span="24">
             <el-form-item label="合作模式:">
               <el-select
-                v-model="form.cooperationMode"
-                clearable
-                placeholder="请选择"
+                  v-model="form.cooperationMode"
+                  clearable
+                  placeholder="请选择"
               >
                 <el-option
-                  v-for="item in cooperationOptions"
-                  :key="item.key"
-                  :label="item.value"
-                  :value="item.key"
+                    v-for="item in cooperationOptions"
+                    :key="item.key"
+                    :label="item.value"
+                    :value="item.key"
                 >
                 </el-option>
               </el-select>
@@ -99,29 +99,31 @@
         </el-row>
 
         <InputBoxAdd
-          :labelWidth="labelWidth"
-          v-model="form"
-          disabled
-          title="关键词"
-          placeholder="请输入关键词"
-          fieldKey="keywords"
-          ref="keywordsForm"
+            :labelWidth="labelWidth"
+            v-model="form"
+            disabled
+            title="关键词"
+            placeholder="请输入关键词"
+            fieldKey="keywords"
+            ref="keywordsForm"
         />
         <el-row>
           <el-col :span="24">
             <el-form-item label="所属单位:" prop="unit">
               <el-input v-model="form.unit"></el-input>
-            </el-form-item> </el-col
-        ></el-row>
+            </el-form-item>
+          </el-col
+          >
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="成果简介:" prop="description">
               <wangEditor
-                readOnly
-                v-model="form.description"
-                min-height="150px"
-                width="100%"
-                ref="introduceRef"
+                  readOnly
+                  v-model="form.description"
+                  min-height="150px"
+                  width="100%"
+                  ref="introduceRef"
               />
             </el-form-item>
           </el-col>
@@ -129,7 +131,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="成果图片:" prop="image">
-              <ImageUpload v-model="form.image" :limit="1" />
+              <ImageUpload v-model="form.image" :limit="1"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -148,10 +150,11 @@
             <el-form-item label="证明材料:" prop="image">
               <!-- <ImageUpload v-model="form.image" :limit="1" :disabled="true" /> -->
               <el-link
-                :disabled="!form.image"
-                type="primary"
-                @click="downloadImage"
-                >下载图片材料</el-link
+                  :disabled="!form.image"
+                  type="primary"
+                  @click="downloadImage"
+              >下载图片材料
+              </el-link
               >
             </el-form-item>
           </el-col>
@@ -165,38 +168,29 @@
   </div>
 </template>
 <script setup>
-import { demandCategoryList } from "@/utils/parameter";
-import CityOptions from "@/views/components/CityOptions";
+import {cooperationOptions, demandCategoryList, leadOptions, maturityOptions} from "@/utils/parameter";
 import FieldOptions from "@/views/components/FieldOptions";
 import InputBoxAdd from "@/views/components/InputBoxAdd";
-import { reactive, toRefs } from "vue";
-import { useRoute, useRouter } from "vue-router";
-import { ElMessage } from "element-plus";
-import {
-  expertAchievementInfo,
-  updateExpertAchievement,
-} from "@/api/dataApproval/achivement";
-import { customDownload } from "@/utils/request";
-import {
-  maturityOptions,
-  leadOptions,
-  cooperationOptions,
-} from "@/utils/parameter";
-import { downloadFile } from "../../../utils/request";
+import {reactive, toRefs} from "vue";
+import {useRoute, useRouter} from "vue-router";
+import {ElMessage} from "element-plus";
+import {batchAchievement, expertAchievementInfo,} from "@/api/dataApproval/achivement";
+import {downloadFile} from "../../../utils/request";
 import useUserStore from "@/store/modules/user";
+
 const userStore = useUserStore();
 const router = useRouter();
 const route = useRoute();
 const data = reactive({
   form: {},
 });
-const { form } = toRefs(data);
+const {form} = toRefs(data);
 
 const labelWidth = ref(120);
 
 const checkList = reactive(demandCategoryList);
 const getAchievementInfo = async () => {
-  const resp = await expertAchievementInfo({ id: route.query.id });
+  const resp = await expertAchievementInfo({id: route.query.id});
   form.value = resp.data;
   form.value.keywords = form.value.keyword?.split(",") ?? [];
   form.value.customers = form.value.customer?.split(",") ?? [];
@@ -204,12 +198,13 @@ const getAchievementInfo = async () => {
 
 const downloadImage = () => {
   const filename =
-    form.value.image.split("/")[form.value.image.split("/").length - 1];
+      form.value.image.split("/")[form.value.image.split("/").length - 1];
   downloadFile(form.value.image, filename);
 };
 
 const submitForm = async (status) => {
-  await updateExpertAchievement({ ...form.value, status });
+  // await updateExpertAchievement({ ...form.value, status });
+  await batchAchievement([form.value.id], status);
   let successMessage;
   switch (status) {
     case "1":
diff --git a/src/views/dataAuditList/achievement/index.vue b/src/views/dataAuditList/achievement/index.vue
index 10c5d53..897379f 100644
--- a/src/views/dataAuditList/achievement/index.vue
+++ b/src/views/dataAuditList/achievement/index.vue
@@ -86,7 +86,7 @@
           {{ comeFromDict.find((el) => el.value === row.comeFrom)?.label }}
         </template>
       </el-table-column>
-<!--      来源名称-->
+      <!--      来源名称-->
       <el-table-column
           align="center"
           label="来源名称"
@@ -224,7 +224,7 @@ const handleBatchApproval = async () => {
       `是否确认批量审核通过编号为${selectedIds.value.join(",")}的数据项？`
   )
       .then(async () => {
-        await batchAchievement(selectedIds.value);
+        await batchAchievement(selectedIds.value, 1);
         userStore.getUnApprovedAchivement();
         getList();
         ElMessage.success("批量审核成功");
diff --git a/src/views/dataAuditList/demand/index.vue b/src/views/dataAuditList/demand/index.vue
index 59798ff..031bee4 100644
--- a/src/views/dataAuditList/demand/index.vue
+++ b/src/views/dataAuditList/demand/index.vue
@@ -6,9 +6,9 @@
         <el-col>
           <el-form-item prop="status">
             <el-radio-group
-              v-model="queryParams.status"
-              size="small"
-              @change="handleQuery"
+                v-model="queryParams.status"
+                size="small"
+                @change="handleQuery"
             >
               <!-- <el-radio-button :label="1">已发布</el-radio-button> -->
               <el-radio-button :label="0">待审核</el-radio-button>
@@ -21,44 +21,44 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="所属站点" prop="tenantId">
-            <SiteOptions v-model="queryParams.tenantId" :site-list="siteList" />
+            <SiteOptions v-model="queryParams.tenantId" :site-list="siteList"/>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-button
-            icon="search"
-            size="default"
-            type="primary"
-            @click="handleQuery"
-            >搜索
+              icon="search"
+              size="default"
+              type="primary"
+              @click="handleQuery"
+          >搜索
           </el-button>
           <el-button icon="refresh" size="default" @click="resetQuery"
-            >重置
+          >重置
           </el-button>
         </el-col>
       </el-row>
     </el-form>
     <el-row>
       <el-button
-        v-if="queryParams.status == 0"
-        :disabled="!selectedIds.length"
-        size="small"
-        type="primary"
-        @click="handleBatchApproval"
-        >批量审核
+          v-if="queryParams.status == 0"
+          :disabled="!selectedIds.length"
+          size="small"
+          type="primary"
+          @click="handleBatchApproval"
+      >批量审核
       </el-button>
       <el-button
-        :disabled="!selectedIds.length"
-        size="small"
-        type="danger"
-        @click="handleDelete(...selectedIds)"
-        >批量删除
+          :disabled="!selectedIds.length"
+          size="small"
+          type="danger"
+          @click="handleDelete(...selectedIds)"
+      >批量删除
       </el-button>
       <el-button
-        size="small"
-        type="primary"
-        @click="userStore.resetUnApproval('technology', 'unApprovedTechnology')"
-        >未读归零
+          size="small"
+          type="primary"
+          @click="userStore.resetUnApproval('technology', 'unApprovedTechnology')"
+      >未读归零
       </el-button>
     </el-row>
     <!-- 表格区域 -->
@@ -66,29 +66,29 @@
       <el-table-column type="selection" width="80"></el-table-column>
       <el-table-column align="center" label="编号" prop="id"></el-table-column>
       <el-table-column
-        align="center"
-        label="需求名称"
-        prop="title"
+          align="center"
+          label="需求名称"
+          prop="title"
       ></el-table-column>
       <el-table-column
-        align="center"
-        label="所属领域"
-        prop="industryStr"
+          align="center"
+          label="所属领域"
+          prop="industryStr"
       ></el-table-column>
       <el-table-column
-        align="center"
-        label="联系人"
-        prop="name"
+          align="center"
+          label="联系人"
+          prop="name"
       ></el-table-column>
       <el-table-column
-        align="center"
-        label="经纪人"
-        prop="brokerName"
+          align="center"
+          label="经纪人"
+          prop="brokerName"
       ></el-table-column>
       <el-table-column
-        align="center"
-        label="手机"
-        prop="mobile"
+          align="center"
+          label="手机"
+          prop="mobile"
       ></el-table-column>
       <!-- <el-table-column
         label="所属经纪人"
@@ -102,72 +102,72 @@
       ></el-table-column> -->
       <!-- <el-table-column label="站点" align="center" prop=""></el-table-column> -->
       <el-table-column
-        align="center"
-        label="发布时间"
-        prop="createTime"
+          align="center"
+          label="发布时间"
+          prop="createTime"
       ></el-table-column>
       <el-table-column
-        align="center"
-        label="截至日期"
-        prop="deadline"
+          align="center"
+          label="截至日期"
+          prop="deadline"
       ></el-table-column>
       <el-table-column align="center" label="操作" width="320">
         <template #default="{ row }">
           <el-button round size="small" type="text" @click="approval(row)"
-            >审批
+          >审批
           </el-button>
           <el-button
-            round
-            size="small"
-            type="text"
-            @click="handleAppointBroker(row)"
-            >指派经纪人
+              round
+              size="small"
+              type="text"
+              @click="handleAppointBroker(row)"
+          >指派经纪人
           </el-button>
           <el-button round size="small" type="text" @click="complete(row.id)"
-            >完成
+          >完成
           </el-button>
           <el-button
-            icon="delete"
-            round
-            size="small"
-            type="text"
-            @click="handleDelete(row.id)"
-            >删除
+              icon="delete"
+              round
+              size="small"
+              type="text"
+              @click="handleDelete(row.id)"
+          >删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total > 0"
-      v-model:limit="queryParams.pageSize"
-      v-model:page="queryParams.pageNum"
-      :total="total"
-      @pagination="getList"
+        v-show="total > 0"
+        v-model:limit="queryParams.pageSize"
+        v-model:page="queryParams.pageNum"
+        :total="total"
+        @pagination="getList"
     />
 
     <!-- 审批详情 -->
     <Edialog
-      v-model="demandForm"
-      v-model:isShow="isShow"
-      @update-list="handleQuery"
+        v-model="demandForm"
+        v-model:isShow="isShow"
+        @update-list="handleQuery"
     ></Edialog>
     <appoint-broker
-      v-model="brokerForm.brokerId"
-      v-model:show="showAppointBroker"
-      :default-label="appointBrokerName"
-      @confirm="handleConfirmAppointBroker"
+        v-model="brokerForm.brokerId"
+        v-model:show="showAppointBroker"
+        :default-label="appointBrokerName"
+        @confirm="handleConfirmAppointBroker"
     />
   </div>
 </template>
 <script setup>
 import AppointBroker from "@/views/components/appoint-broker.vue";
-import { businessList } from "@/api/Businessneeds/index.js";
+import {businessList} from "@/api/Businessneeds/index.js";
 import Edialog from "@/views/components/Businessneeds/Approvaldetails.vue";
 import SiteOptions from "@/views/components/SiteOptions";
-import { tenantSelect } from "@/api/subPlatform/tenant";
-import { reactive, ref, toRefs } from "vue";
-import { cloneDeep } from "lodash";
+import {tenantSelect} from "@/api/subPlatform/tenant";
+import {reactive, ref, toRefs} from "vue";
+import {cloneDeep} from "lodash";
 import useUserStore from "@/store/modules/user";
 import {
   batchTechnologyDemand,
@@ -175,7 +175,7 @@ import {
   deleteTechnologyDemand,
   updateTechnologyDemand,
 } from "@/api/dataApproval/enterpriseTechnologyDemand";
-import { ElMessage, ElMessageBox } from "element-plus";
+import {ElMessage, ElMessageBox} from "element-plus";
 
 const userStore = useUserStore();
 const data = reactive({
@@ -192,7 +192,7 @@ const siteList = ref([]);
 const dataList = ref([]);
 const total = ref(0);
 const isShow = ref(false);
-const { queryParams, demandForm, brokerForm } = toRefs(data);
+const {queryParams, demandForm, brokerForm} = toRefs(data);
 const queryFormRef = ref();
 const getList = async () => {
   const resp = await businessList(queryParams.value);
@@ -238,37 +238,40 @@ const handleSelectionChange = (val) => {
 };
 const handleDelete = async (...ids) => {
   ElMessageBox.confirm(`是否确认删除编号为${ids.join(",")}的数据项？`)
-    .then(async () => {
-      await deleteTechnologyDemand(ids);
-      userStore.getUnApprovedTechnology();
-      getList();
-      ElMessage.success("删除成功");
-    })
-    .catch(() => {});
+      .then(async () => {
+        await deleteTechnologyDemand(ids);
+        userStore.getUnApprovedTechnology();
+        getList();
+        ElMessage.success("删除成功");
+      })
+      .catch(() => {
+      });
 };
 const handleBatchApproval = async () => {
   ElMessageBox.confirm(
-    `是否确认批量审核通过编号为${selectedIds.value.join(",")}的数据项？`
+      `是否确认批量审核通过编号为${selectedIds.value.join(",")}的数据项？`
   )
-    .then(async () => {
-      await batchTechnologyDemand(selectedIds.value);
-      userStore.getUnApprovedTechnology();
-      getList();
-      ElMessage.success("批量审核成功");
-    })
-    .catch(() => {});
+      .then(async () => {
+        await batchTechnologyDemand(selectedIds.value.join(","), 1);
+        userStore.getUnApprovedTechnology();
+        getList();
+        ElMessage.success("批量审核成功");
+      })
+      .catch(() => {
+      });
 };
 
 // 修改为完成状态
 const complete = (id) => {
   ElMessageBox.confirm(`是否确认结束编号为${id}的数据项？`)
-    .then(async () => {
-      await updateTechnologyDemand({ id, status: 4 });
-      userStore.getUnApprovedTechnology();
-      getList();
-      ElMessage.success("删除成功");
-    })
-    .catch(() => {});
+      .then(async () => {
+        await updateTechnologyDemand({id, status: 4});
+        userStore.getUnApprovedTechnology();
+        getList();
+        ElMessage.success("删除成功");
+      })
+      .catch(() => {
+      });
 };
 
 const showAppointBroker = ref(false);
@@ -288,9 +291,9 @@ const handleAppointBroker = (row) => {
  */
 const handleConfirmAppointBroker = async (value) => {
   await dataReviewAppointBroker(
-    appointDemandId.value,
-    value.brokerId,
-    value.brokerName
+      appointDemandId.value,
+      value.brokerId,
+      value.brokerName
   );
   showAppointBroker.value = false;
   getList();