bugfix and performance improves

This commit is contained in:
quantulr
2023-08-04 17:27:34 +08:00
parent fec49d35bc
commit 2177189c34
8 changed files with 351 additions and 341 deletions

View File

@ -4,11 +4,11 @@
#} #}
:4173 { :4173 {
handle_path /api/* { handle /api/* {
reverse_proxy http://101.34.131.16:1618 reverse_proxy http://101.34.251.155
} }
handle { handle {
root * "/Volumes/iMac Doc/WebstormProjects/cas_cloud_admin/dist" root * "/Volumes/iMac Doc/WebstormProjects/cas_cloud_admin_i18n/dist"
file_server file_server
try_files {path} / try_files {path} /
} }

View File

@ -2,42 +2,48 @@ import request from "@/utils/request";
// 获取成果审核列表 // 获取成果审核列表
export const expertAchievementList = (params) => export const expertAchievementList = (params) =>
request({ request({
url: "/business/dataReview/expertAchievementList", url: "/business/dataReview/expertAchievementList",
method: "get", method: "get",
params, params,
}); });
// 获取成果详情 // 获取成果详情
export const expertAchievementInfo = (params) => export const expertAchievementInfo = (params) =>
request({ request({
url: "/business/dataReview/expertAchievementInfo", url: "/business/dataReview/expertAchievementInfo",
method: "get", method: "get",
params, params,
}); });
// 修改成果 // 修改成果
export const updateExpertAchievement = (data) => export const updateExpertAchievement = (data) =>
request({ request({
url: "/business/dataReview/updateExpertAchievement", url: "/business/dataReview/updateExpertAchievement",
method: "put", method: "put",
data, 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) => export const deleteAchievementByIds = (ids) =>
request({ request({
url: `/business/dataReview/deleteAchievementByIds`, url: `/business/dataReview/deleteAchievementByIds`,
method: "DELETE", method: "DELETE",
data: { data: {
ids, ids,
}, },
}); });

View File

@ -2,25 +2,25 @@ import request from "@/utils/request";
// 修改企业技术需求审核 // 修改企业技术需求审核
export const updateTechnologyDemand = (data) => export const updateTechnologyDemand = (data) =>
request({ request({
url: "/business/dataReview/updateTechnologyDemand", url: "/business/dataReview/updateTechnologyDemand",
method: "POST", method: "POST",
data, data,
}); });
// 批量审核企业技术需求 // 批量审核企业技术需求
export const batchTechnologyDemand = (ids) => export const batchTechnologyDemand = (ids, status) =>
request({ request({
url: `/business/dataReview/batchTechnologyDemand/${ids}`, url: `/business/dataReview/batchTechnologyDemand/${ids}/${status}`,
method: "PUT", method: "PUT",
}); });
// 批量删除企业技术需求 // 批量删除企业技术需求
export const deleteTechnologyDemand = (ids) => export const deleteTechnologyDemand = (ids) =>
request({ request({
url: `/business/dataReview/deleteTechnologyDemand/${ids}`, url: `/business/dataReview/deleteTechnologyDemand/${ids}`,
method: "DELETE", method: "DELETE",
}); });
/** /**
* 企业技术需求指派经纪人 * 企业技术需求指派经纪人
@ -30,11 +30,11 @@ export const deleteTechnologyDemand = (ids) =>
* @return {*} * @return {*}
*/ */
export const dataReviewAppointBroker = ( export const dataReviewAppointBroker = (
demandId, // 企业技术需求id demandId, // 企业技术需求id
brokerId, // 经纪人id brokerId, // 经纪人id
brokerName // 经纪人姓名 // 获取企业技术需求详情 brokerName // 经纪人姓名 // 获取企业技术需求详情
) => ) =>
request({ request({
url: `/business/dataReview/appointBroker/${demandId}/${brokerId}/${brokerName}`, url: `/business/dataReview/appointBroker/${demandId}/${brokerId}/${brokerName}`,
method: "POST", method: "POST",
}); });

View File

@ -1,23 +1,25 @@
<template> <template>
<div class="component-upload-image"> <div class="component-upload-image">
<el-upload <el-upload
multiple multiple
:action="uploadImgUrl" :action="uploadImgUrl"
list-type="picture-card" list-type="picture-card"
:on-success="handleUploadSuccess" :on-success="handleUploadSuccess"
:before-upload="handleBeforeUpload" :before-upload="handleBeforeUpload"
:limit="limit" :limit="limit"
:on-error="handleUploadError" :on-error="handleUploadError"
:on-exceed="handleExceed" :on-exceed="handleExceed"
name="file" name="file"
:on-remove="handleRemove" :on-remove="handleRemove"
:show-file-list="true" :show-file-list="true"
:headers="headers" :headers="headers"
:file-list="fileList" :file-list="fileList"
:on-preview="handlePictureCardPreview" :on-preview="handlePictureCardPreview"
:class="{ hide: fileList.length >= limit }" :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> </el-upload>
<!-- 上传提示 --> <!-- 上传提示 -->
<div class="el-upload__tip" v-if="showTip"> <div class="el-upload__tip" v-if="showTip">
@ -32,21 +34,21 @@
</div> </div>
<el-dialog <el-dialog
v-model="dialogVisible" v-model="dialogVisible"
title="预览" title="预览"
width="800px" width="800px"
append-to-body append-to-body
> >
<img <img
:src="dialogImageUrl" :src="dialogImageUrl"
style="display: block; max-width: 100%; margin: 0 auto" style="display: block; max-width: 100%; margin: 0 auto"
/> />
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script setup> <script setup>
import { getToken } from "@/utils/auth"; import {getToken} from "@/utils/auth";
const props = defineProps({ const props = defineProps({
modelValue: [String, Object, Array], modelValue: [String, Object, Array],
@ -76,7 +78,7 @@ const props = defineProps({
}, },
}); });
const { proxy } = getCurrentInstance(); const {proxy} = getCurrentInstance();
const emit = defineEmits(); const emit = defineEmits();
const number = ref(0); const number = ref(0);
const uploadList = ref([]); const uploadList = ref([]);
@ -84,35 +86,35 @@ const dialogImageUrl = ref("");
const dialogVisible = ref(false); const dialogVisible = ref(false);
const baseUrl = import.meta.env.VITE_APP_BASE_API; const baseUrl = import.meta.env.VITE_APP_BASE_API;
const uploadImgUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传的图片服务器地址 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 fileList = ref([]);
const showTip = computed( const showTip = computed(
() => props.isShowTip && (props.fileType || props.fileSize) () => props.isShowTip && (props.fileType || props.fileSize)
); );
watch( watch(
() => props.modelValue, () => props.modelValue,
(val) => { (val) => {
if (val) { if (val) {
// 首先将值转为数组 // 首先将值转为数组
const list = Array.isArray(val) ? val : props.modelValue.split(","); const list = Array.isArray(val) ? val : props.modelValue.split(",");
// 然后将数组转为对象数组 // 然后将数组转为对象数组
fileList.value = list.map((item) => { fileList.value = list.map((item) => {
if (typeof item === "string") { if (typeof item === "string") {
if (item.indexOf(baseUrl) === -1) { if (item.indexOf(baseUrl) === -1) {
item = { name: baseUrl + item, url: baseUrl + item }; item = {name: baseUrl + "/file" + item, url: baseUrl + "/file" + item};
} else { } else {
item = { name: item, url: item }; item = {name: item, url: item};
}
} }
} return item;
return item; });
}); } else {
} else { fileList.value = [];
fileList.value = []; return [];
return []; }
} },
}, {deep: true, immediate: true}
{ deep: true, immediate: true }
); );
// 删除图片 // 删除图片
@ -122,11 +124,11 @@ function handleRemove(file, files) {
// 上传成功回调 // 上传成功回调
function handleUploadSuccess(res) { 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) { if (uploadList.value.length === number.value) {
fileList.value = fileList.value fileList.value = fileList.value
.filter((f) => f.url !== undefined) .filter((f) => f.url !== undefined)
.concat(uploadList.value); .concat(uploadList.value);
uploadList.value = []; uploadList.value = [];
number.value = 0; number.value = 0;
emit("update:modelValue", listToString(fileList.value)); emit("update:modelValue", listToString(fileList.value));
@ -152,7 +154,7 @@ function handleBeforeUpload(file) {
} }
if (!isImg) { if (!isImg) {
proxy.$modal.msgError( proxy.$modal.msgError(
`文件格式不正确, 请上传${props.fileType.join("/")}图片格式文件!` `文件格式不正确, 请上传${props.fileType.join("/")}图片格式文件!`
); );
return false; return false;
} }

View File

@ -2,10 +2,10 @@
<template> <template>
<el-dialog title="基本信息" :model-value="isShow" @close="close"> <el-dialog title="基本信息" :model-value="isShow" @close="close">
<el-form <el-form
ref="formRef" ref="formRef"
:model="modelValue" :model="modelValue"
:label-width="labelWidth + 'px'" :label-width="labelWidth + 'px'"
disabled disabled
> >
<p><b>基本信息</b></p> <p><b>基本信息</b></p>
<el-row> <el-row>
@ -22,10 +22,11 @@
<el-form-item label="需求类别:"> <el-form-item label="需求类别:">
<el-checkbox-group v-model="modelValue.kinds"> <el-checkbox-group v-model="modelValue.kinds">
<el-checkbox <el-checkbox
v-for="item in checkList" v-for="item in checkList"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
>{{ item.name }}</el-checkbox >{{ item.name }}
</el-checkbox
> >
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
@ -37,39 +38,39 @@
<el-form-item label="需求描述:" prop="introduce"> <el-form-item label="需求描述:" prop="introduce">
<!-- <Editor v-model="modelValue.add" :minHeight="150" /> --> <!-- <Editor v-model="modelValue.add" :minHeight="150" /> -->
<WangEditor <WangEditor
v-model="modelValue.introduce" v-model="modelValue.introduce"
width="100%" width="100%"
min-height="150px" min-height="150px"
readOnly readOnly
></WangEditor> ></WangEditor>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<FieldOptions <FieldOptions
v-model="modelValue" v-model="modelValue"
:labelWidth="labelWidth" :labelWidth="labelWidth"
disabled disabled
ref="fieldFormRef" ref="fieldFormRef"
/> />
<CityOptions <CityOptions
disabled disabled
v-model="modelValue" v-model="modelValue"
:labelWidth="labelWidth" :labelWidth="labelWidth"
ref="cityFormRef" ref="cityFormRef"
/> />
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item
label="技术需求预算:" label="技术需求预算:"
:prop="modelValue.budgetMode == 1 ? 'budget' : ''" :prop="modelValue.budgetMode == 1 ? 'budget' : ''"
> >
<el-input <el-input
v-model="modelValue.budget" 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, '')" oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
placeholder="请输入技术需求预算" placeholder="请输入技术需求预算"
> >
<template #append>万元</template> <template #append>万元</template>
</el-input> </el-input>
@ -78,10 +79,11 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label-width="50px"> <el-form-item label-width="50px">
<el-checkbox <el-checkbox
false-label="1" false-label="1"
true-label="2" true-label="2"
v-model="modelValue.budgetMode" v-model="modelValue.budgetMode"
>面议</el-checkbox >面议
</el-checkbox
> >
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -91,11 +93,11 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="截止时间:" prop="deadline"> <el-form-item label="截止时间:" prop="deadline">
<el-date-picker <el-date-picker
style="width: 100%" style="width: 100%"
v-model="modelValue.deadline" v-model="modelValue.deadline"
type="date" type="date"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
placeholder="请选择截止时间" placeholder="请选择截止时间"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -106,16 +108,16 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="需求联系人:" prop="name"> <el-form-item label="需求联系人:" prop="name">
<el-input <el-input
v-model="modelValue.name" v-model="modelValue.name"
placeholder="请输入需求联系人" placeholder="请输入需求联系人"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="联系人手机号:" prop="mobile"> <el-form-item label="联系人手机号:" prop="mobile">
<el-input <el-input
v-model="modelValue.mobile" v-model="modelValue.mobile"
placeholder="请输入联系人手机号" placeholder="请输入联系人手机号"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -143,13 +145,13 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<InputBoxAdd <InputBoxAdd
:labelWidth="labelWidth" :labelWidth="labelWidth"
v-model="modelValue" v-model="modelValue"
title="想合作的单位及模式" title="想合作的单位及模式"
placeholder="" placeholder=""
disabled disabled
fieldKey="wants" fieldKey="wants"
ref="directionsFormRef" ref="directionsFormRef"
/> />
</el-col> </el-col>
</el-row> </el-row>
@ -161,15 +163,16 @@
</el-dialog> </el-dialog>
</template> </template>
<script setup> <script setup>
import { updateTechnologyDemand } from "@/api/dataApproval/enterpriseTechnologyDemand"; import {demandCategoryList} from "@/utils/parameter";
import { demandCategoryList } from "@/utils/parameter";
import WangEditor from "@/components/WangEditor"; import WangEditor from "@/components/WangEditor";
import CityOptions from "@/views/components/CityOptions"; import CityOptions from "@/views/components/CityOptions";
import FieldOptions from "@/views/components/FieldOptions"; import FieldOptions from "@/views/components/FieldOptions";
import InputBoxAdd from "@/views/components/InputBoxAdd"; import InputBoxAdd from "@/views/components/InputBoxAdd";
import { ElMessage } from "element-plus"; import {ElMessage} from "element-plus";
import { ref, toRefs } from "vue"; import {toRefs} from "vue";
import useUserStore from "@/store/modules/user"; import useUserStore from "@/store/modules/user";
import {batchTechnologyDemand} from "@/api/dataApproval/enterpriseTechnologyDemand";
const userStore = useUserStore(); const userStore = useUserStore();
const emit = defineEmits(["update-list"]); const emit = defineEmits(["update-list"]);
const props = defineProps({ const props = defineProps({
@ -182,12 +185,13 @@ const props = defineProps({
required: true, required: true,
}, },
}); });
const { isShow, modelValue } = toRefs(props); const {isShow, modelValue} = toRefs(props);
const labelWidth = 160; const labelWidth = 160;
const checkList = reactive(demandCategoryList); const checkList = reactive(demandCategoryList);
const approve = async (status) => { const approve = async (status) => {
let title = status == 1 ? "通过" : "驳回"; 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(); userStore.getUnApprovedTechnology();
ElMessage.success(`${title}需求`); ElMessage.success(`${title}需求`);
emit("update:isShow", false); emit("update:isShow", false);

View File

@ -2,10 +2,10 @@
<div class="app-container"> <div class="app-container">
<div style="width: 55%"> <div style="width: 55%">
<el-form <el-form
ref="formRef" ref="formRef"
:model="form" :model="form"
:label-width="labelWidth + 'px'" :label-width="labelWidth + 'px'"
disabled disabled
> >
<div class="form_title"> <div class="form_title">
<p><b>基本信息</b></p> <p><b>基本信息</b></p>
@ -15,44 +15,44 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="成果名称:" prop="title"> <el-form-item label="成果名称:" prop="title">
<el-input <el-input
v-model="form.title" v-model="form.title"
placeholder="请输入成果名称" placeholder="请输入成果名称"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<FieldOptions <FieldOptions
v-model="form" v-model="form"
:labelWidth="labelWidth" :labelWidth="labelWidth"
disabled disabled
ref="fieldFormRef" ref="fieldFormRef"
/> />
<InputBoxAdd <InputBoxAdd
:labelWidth="labelWidth" :labelWidth="labelWidth"
disabled disabled
v-model="form" v-model="form"
title="应用客户" title="应用客户"
placeholder="请输入应用客户" placeholder="请输入应用客户"
fieldKey="customers" fieldKey="customers"
ref="customerFormRef" ref="customerFormRef"
/> />
<city-options <!-- <city-options-->
v-model="form" <!-- v-model="form"-->
disabled <!-- disabled-->
:labelWidth="labelWidth" <!-- :labelWidth="labelWidth"-->
ref="cityFormRef" <!-- ref="cityFormRef"-->
></city-options> <!-- ></city-options>-->
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="成果成熟度:" prop="maturity"> <el-form-item label="成果成熟度:" prop="maturity">
<el-select v-model="form.maturity" clearable placeholder="请选择"> <el-select v-model="form.maturity" clearable placeholder="请选择">
<el-option <el-option
v-for="item in maturityOptions" v-for="item in maturityOptions"
:key="item.key" :key="item.key"
:label="item.value" :label="item.value"
:value="item.key" :value="item.key"
> >
</el-option> </el-option>
</el-select> </el-select>
@ -63,15 +63,15 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="成果领先性:" prop="leadStandard"> <el-form-item label="成果领先性:" prop="leadStandard">
<el-select <el-select
v-model="form.leadStandard" v-model="form.leadStandard"
clearable clearable
placeholder="请选择" placeholder="请选择"
> >
<el-option <el-option
v-for="item in leadOptions" v-for="item in leadOptions"
:key="item.key" :key="item.key"
:label="item.value" :label="item.value"
:value="item.key" :value="item.key"
> >
</el-option> </el-option>
</el-select> </el-select>
@ -82,15 +82,15 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="合作模式:"> <el-form-item label="合作模式:">
<el-select <el-select
v-model="form.cooperationMode" v-model="form.cooperationMode"
clearable clearable
placeholder="请选择" placeholder="请选择"
> >
<el-option <el-option
v-for="item in cooperationOptions" v-for="item in cooperationOptions"
:key="item.key" :key="item.key"
:label="item.value" :label="item.value"
:value="item.key" :value="item.key"
> >
</el-option> </el-option>
</el-select> </el-select>
@ -99,29 +99,31 @@
</el-row> </el-row>
<InputBoxAdd <InputBoxAdd
:labelWidth="labelWidth" :labelWidth="labelWidth"
v-model="form" v-model="form"
disabled disabled
title="关键词" title="关键词"
placeholder="请输入关键词" placeholder="请输入关键词"
fieldKey="keywords" fieldKey="keywords"
ref="keywordsForm" ref="keywordsForm"
/> />
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="所属单位:" prop="unit"> <el-form-item label="所属单位:" prop="unit">
<el-input v-model="form.unit"></el-input> <el-input v-model="form.unit"></el-input>
</el-form-item> </el-col </el-form-item>
></el-row> </el-col
>
</el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="成果简介:" prop="description"> <el-form-item label="成果简介:" prop="description">
<wangEditor <wangEditor
readOnly readOnly
v-model="form.description" v-model="form.description"
min-height="150px" min-height="150px"
width="100%" width="100%"
ref="introduceRef" ref="introduceRef"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -129,7 +131,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="成果图片:" prop="image"> <el-form-item label="成果图片:" prop="image">
<ImageUpload v-model="form.image" :limit="1" /> <ImageUpload v-model="form.image" :limit="1"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -148,10 +150,11 @@
<el-form-item label="证明材料:" prop="image"> <el-form-item label="证明材料:" prop="image">
<!-- <ImageUpload v-model="form.image" :limit="1" :disabled="true" /> --> <!-- <ImageUpload v-model="form.image" :limit="1" :disabled="true" /> -->
<el-link <el-link
:disabled="!form.image" :disabled="!form.image"
type="primary" type="primary"
@click="downloadImage" @click="downloadImage"
>下载图片材料</el-link >下载图片材料
</el-link
> >
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -165,38 +168,29 @@
</div> </div>
</template> </template>
<script setup> <script setup>
import { demandCategoryList } from "@/utils/parameter"; import {cooperationOptions, demandCategoryList, leadOptions, maturityOptions} from "@/utils/parameter";
import CityOptions from "@/views/components/CityOptions";
import FieldOptions from "@/views/components/FieldOptions"; import FieldOptions from "@/views/components/FieldOptions";
import InputBoxAdd from "@/views/components/InputBoxAdd"; import InputBoxAdd from "@/views/components/InputBoxAdd";
import { reactive, toRefs } from "vue"; import {reactive, toRefs} from "vue";
import { useRoute, useRouter } from "vue-router"; import {useRoute, useRouter} from "vue-router";
import { ElMessage } from "element-plus"; import {ElMessage} from "element-plus";
import { import {batchAchievement, expertAchievementInfo,} from "@/api/dataApproval/achivement";
expertAchievementInfo, import {downloadFile} from "../../../utils/request";
updateExpertAchievement,
} from "@/api/dataApproval/achivement";
import { customDownload } from "@/utils/request";
import {
maturityOptions,
leadOptions,
cooperationOptions,
} from "@/utils/parameter";
import { downloadFile } from "../../../utils/request";
import useUserStore from "@/store/modules/user"; import useUserStore from "@/store/modules/user";
const userStore = useUserStore(); const userStore = useUserStore();
const router = useRouter(); const router = useRouter();
const route = useRoute(); const route = useRoute();
const data = reactive({ const data = reactive({
form: {}, form: {},
}); });
const { form } = toRefs(data); const {form} = toRefs(data);
const labelWidth = ref(120); const labelWidth = ref(120);
const checkList = reactive(demandCategoryList); const checkList = reactive(demandCategoryList);
const getAchievementInfo = async () => { 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 = resp.data;
form.value.keywords = form.value.keyword?.split(",") ?? []; form.value.keywords = form.value.keyword?.split(",") ?? [];
form.value.customers = form.value.customer?.split(",") ?? []; form.value.customers = form.value.customer?.split(",") ?? [];
@ -204,12 +198,13 @@ const getAchievementInfo = async () => {
const downloadImage = () => { const downloadImage = () => {
const filename = 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); downloadFile(form.value.image, filename);
}; };
const submitForm = async (status) => { const submitForm = async (status) => {
await updateExpertAchievement({ ...form.value, status }); // await updateExpertAchievement({ ...form.value, status });
await batchAchievement([form.value.id], status);
let successMessage; let successMessage;
switch (status) { switch (status) {
case "1": case "1":

View File

@ -86,7 +86,7 @@
{{ comeFromDict.find((el) => el.value === row.comeFrom)?.label }} {{ comeFromDict.find((el) => el.value === row.comeFrom)?.label }}
</template> </template>
</el-table-column> </el-table-column>
<!-- 来源名称--> <!-- 来源名称-->
<el-table-column <el-table-column
align="center" align="center"
label="来源名称" label="来源名称"
@ -224,7 +224,7 @@ const handleBatchApproval = async () => {
`是否确认批量审核通过编号为${selectedIds.value.join(",")}的数据项?` `是否确认批量审核通过编号为${selectedIds.value.join(",")}的数据项?`
) )
.then(async () => { .then(async () => {
await batchAchievement(selectedIds.value); await batchAchievement(selectedIds.value, 1);
userStore.getUnApprovedAchivement(); userStore.getUnApprovedAchivement();
getList(); getList();
ElMessage.success("批量审核成功"); ElMessage.success("批量审核成功");

View File

@ -6,9 +6,9 @@
<el-col> <el-col>
<el-form-item prop="status"> <el-form-item prop="status">
<el-radio-group <el-radio-group
v-model="queryParams.status" v-model="queryParams.status"
size="small" size="small"
@change="handleQuery" @change="handleQuery"
> >
<!-- <el-radio-button :label="1">已发布</el-radio-button> --> <!-- <el-radio-button :label="1">已发布</el-radio-button> -->
<el-radio-button :label="0">待审核</el-radio-button> <el-radio-button :label="0">待审核</el-radio-button>
@ -21,44 +21,44 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="所属站点" prop="tenantId"> <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-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-button <el-button
icon="search" icon="search"
size="default" size="default"
type="primary" type="primary"
@click="handleQuery" @click="handleQuery"
>搜索 >搜索
</el-button> </el-button>
<el-button icon="refresh" size="default" @click="resetQuery" <el-button icon="refresh" size="default" @click="resetQuery"
>重置 >重置
</el-button> </el-button>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-row> <el-row>
<el-button <el-button
v-if="queryParams.status == 0" v-if="queryParams.status == 0"
:disabled="!selectedIds.length" :disabled="!selectedIds.length"
size="small" size="small"
type="primary" type="primary"
@click="handleBatchApproval" @click="handleBatchApproval"
>批量审核 >批量审核
</el-button> </el-button>
<el-button <el-button
:disabled="!selectedIds.length" :disabled="!selectedIds.length"
size="small" size="small"
type="danger" type="danger"
@click="handleDelete(...selectedIds)" @click="handleDelete(...selectedIds)"
>批量删除 >批量删除
</el-button> </el-button>
<el-button <el-button
size="small" size="small"
type="primary" type="primary"
@click="userStore.resetUnApproval('technology', 'unApprovedTechnology')" @click="userStore.resetUnApproval('technology', 'unApprovedTechnology')"
>未读归零 >未读归零
</el-button> </el-button>
</el-row> </el-row>
<!-- 表格区域 --> <!-- 表格区域 -->
@ -66,29 +66,29 @@
<el-table-column type="selection" width="80"></el-table-column> <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="id"></el-table-column>
<el-table-column <el-table-column
align="center" align="center"
label="需求名称" label="需求名称"
prop="title" prop="title"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
align="center" align="center"
label="所属领域" label="所属领域"
prop="industryStr" prop="industryStr"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
align="center" align="center"
label="联系人" label="联系人"
prop="name" prop="name"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
align="center" align="center"
label="经纪人" label="经纪人"
prop="brokerName" prop="brokerName"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
align="center" align="center"
label="手机" label="手机"
prop="mobile" prop="mobile"
></el-table-column> ></el-table-column>
<!-- <el-table-column <!-- <el-table-column
label="所属经纪人" label="所属经纪人"
@ -102,72 +102,72 @@
></el-table-column> --> ></el-table-column> -->
<!-- <el-table-column label="站点" align="center" prop=""></el-table-column> --> <!-- <el-table-column label="站点" align="center" prop=""></el-table-column> -->
<el-table-column <el-table-column
align="center" align="center"
label="发布时间" label="发布时间"
prop="createTime" prop="createTime"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
align="center" align="center"
label="截至日期" label="截至日期"
prop="deadline" prop="deadline"
></el-table-column> ></el-table-column>
<el-table-column align="center" label="操作" width="320"> <el-table-column align="center" label="操作" width="320">
<template #default="{ row }"> <template #default="{ row }">
<el-button round size="small" type="text" @click="approval(row)" <el-button round size="small" type="text" @click="approval(row)"
>审批 >审批
</el-button> </el-button>
<el-button <el-button
round round
size="small" size="small"
type="text" type="text"
@click="handleAppointBroker(row)" @click="handleAppointBroker(row)"
>指派经纪人 >指派经纪人
</el-button> </el-button>
<el-button round size="small" type="text" @click="complete(row.id)" <el-button round size="small" type="text" @click="complete(row.id)"
>完成 >完成
</el-button> </el-button>
<el-button <el-button
icon="delete" icon="delete"
round round
size="small" size="small"
type="text" type="text"
@click="handleDelete(row.id)" @click="handleDelete(row.id)"
>删除 >删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total > 0" v-show="total > 0"
v-model:limit="queryParams.pageSize" v-model:limit="queryParams.pageSize"
v-model:page="queryParams.pageNum" v-model:page="queryParams.pageNum"
:total="total" :total="total"
@pagination="getList" @pagination="getList"
/> />
<!-- 审批详情 --> <!-- 审批详情 -->
<Edialog <Edialog
v-model="demandForm" v-model="demandForm"
v-model:isShow="isShow" v-model:isShow="isShow"
@update-list="handleQuery" @update-list="handleQuery"
></Edialog> ></Edialog>
<appoint-broker <appoint-broker
v-model="brokerForm.brokerId" v-model="brokerForm.brokerId"
v-model:show="showAppointBroker" v-model:show="showAppointBroker"
:default-label="appointBrokerName" :default-label="appointBrokerName"
@confirm="handleConfirmAppointBroker" @confirm="handleConfirmAppointBroker"
/> />
</div> </div>
</template> </template>
<script setup> <script setup>
import AppointBroker from "@/views/components/appoint-broker.vue"; 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 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 {tenantSelect} from "@/api/subPlatform/tenant";
import { reactive, ref, toRefs } from "vue"; import {reactive, ref, toRefs} from "vue";
import { cloneDeep } from "lodash"; import {cloneDeep} from "lodash";
import useUserStore from "@/store/modules/user"; import useUserStore from "@/store/modules/user";
import { import {
batchTechnologyDemand, batchTechnologyDemand,
@ -175,7 +175,7 @@ import {
deleteTechnologyDemand, deleteTechnologyDemand,
updateTechnologyDemand, updateTechnologyDemand,
} from "@/api/dataApproval/enterpriseTechnologyDemand"; } from "@/api/dataApproval/enterpriseTechnologyDemand";
import { ElMessage, ElMessageBox } from "element-plus"; import {ElMessage, ElMessageBox} from "element-plus";
const userStore = useUserStore(); const userStore = useUserStore();
const data = reactive({ const data = reactive({
@ -192,7 +192,7 @@ const siteList = ref([]);
const dataList = ref([]); const dataList = ref([]);
const total = ref(0); const total = ref(0);
const isShow = ref(false); const isShow = ref(false);
const { queryParams, demandForm, brokerForm } = toRefs(data); const {queryParams, demandForm, brokerForm} = toRefs(data);
const queryFormRef = ref(); const queryFormRef = ref();
const getList = async () => { const getList = async () => {
const resp = await businessList(queryParams.value); const resp = await businessList(queryParams.value);
@ -238,37 +238,40 @@ const handleSelectionChange = (val) => {
}; };
const handleDelete = async (...ids) => { const handleDelete = async (...ids) => {
ElMessageBox.confirm(`是否确认删除编号为${ids.join(",")}的数据项?`) ElMessageBox.confirm(`是否确认删除编号为${ids.join(",")}的数据项?`)
.then(async () => { .then(async () => {
await deleteTechnologyDemand(ids); await deleteTechnologyDemand(ids);
userStore.getUnApprovedTechnology(); userStore.getUnApprovedTechnology();
getList(); getList();
ElMessage.success("删除成功"); ElMessage.success("删除成功");
}) })
.catch(() => {}); .catch(() => {
});
}; };
const handleBatchApproval = async () => { const handleBatchApproval = async () => {
ElMessageBox.confirm( ElMessageBox.confirm(
`是否确认批量审核通过编号为${selectedIds.value.join(",")}的数据项?` `是否确认批量审核通过编号为${selectedIds.value.join(",")}的数据项?`
) )
.then(async () => { .then(async () => {
await batchTechnologyDemand(selectedIds.value); await batchTechnologyDemand(selectedIds.value.join(","), 1);
userStore.getUnApprovedTechnology(); userStore.getUnApprovedTechnology();
getList(); getList();
ElMessage.success("批量审核成功"); ElMessage.success("批量审核成功");
}) })
.catch(() => {}); .catch(() => {
});
}; };
// 修改为完成状态 // 修改为完成状态
const complete = (id) => { const complete = (id) => {
ElMessageBox.confirm(`是否确认结束编号为${id}的数据项?`) ElMessageBox.confirm(`是否确认结束编号为${id}的数据项?`)
.then(async () => { .then(async () => {
await updateTechnologyDemand({ id, status: 4 }); await updateTechnologyDemand({id, status: 4});
userStore.getUnApprovedTechnology(); userStore.getUnApprovedTechnology();
getList(); getList();
ElMessage.success("删除成功"); ElMessage.success("删除成功");
}) })
.catch(() => {}); .catch(() => {
});
}; };
const showAppointBroker = ref(false); const showAppointBroker = ref(false);
@ -288,9 +291,9 @@ const handleAppointBroker = (row) => {
*/ */
const handleConfirmAppointBroker = async (value) => { const handleConfirmAppointBroker = async (value) => {
await dataReviewAppointBroker( await dataReviewAppointBroker(
appointDemandId.value, appointDemandId.value,
value.brokerId, value.brokerId,
value.brokerName value.brokerName
); );
showAppointBroker.value = false; showAppointBroker.value = false;
getList(); getList();