williamet/cas_cloud_web_i18n
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug fixed

Browse Source
This commit is contained in:
cxc
2022-11-25 17:30:39 +08:00
parent 28808f6024
commit d4778207c7
38 changed files with 1623 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/views/admin/enterprise/demand/releaseService.vue
View File

@ -120,6 +120,7 @@ import {
// import CityOptions from "@/views/components/CityOptions";
import { ElMessage } from "element-plus";
import { onActivated } from "vue";
import { demandCategoryList } from "@/utils/parameter";
// import { onActivated } from "vue";
import { useRoute, useRouter } from "vue-router";
@ -154,24 +155,7 @@ const data = reactive({
const { form, rules } = toRefs(data);
const labelWidth = 140;
const checkList = reactive([
{
id: 1,
name: "成果推广",
},
{
id: 2,
name: "关键成果解决",
},
{
id: 3,
name: "对接专家院士",
},
{
id: 4,
name: "上市辅导",
},
]);
const checkList = reactive([...demandCategoryList]);
const checkInput = ref("");
// const cityFormRef = ref();
const formRef = ref();
@ -215,6 +199,8 @@ function addCheck() {
onMounted(() => {
formRef.value.resetFields();
if (route.query.id) {
const obj = Object.assign({}, route, { title: "修改服务需求" });
tab.updatePage(obj);
getDemand({ id: route.query.id }).then((resp) => {
if (resp.data.kinds) {
resp.data.kinds.forEach((el, index) => {

28
src/views/admin/enterprise/demand/releaseTechnology.vue
View File

@ -310,19 +310,19 @@ const submitForm = async (status) => {
// }
// });
};
function addCheck() {
if (!checkInput.value.trim().length) return proxy.$modal.msgError("请输入");
const flag = checkList.some((item) => {
return item.name.trim() == checkInput.value.trim();
});
if (!flag) {
checkList.push({
id: checkList.length + 1,
name: checkInput.value,
});
checkInput.value = "";
}
}
// function addCheck() {
// if (!checkInput.value.trim().length) return proxy.$modal.msgError("请输入");
// const flag = checkList.some((item) => {
// return item.name.trim() == checkInput.value.trim();
// });
// if (!flag) {
// checkList.push({
// id: checkList.length + 1,
// name: checkInput.value,
// });
// checkInput.value = "";
// }
// }
// 返回技术需求列表
const backToList = () => {
tab.closeOpenPage({ path: "/demand/technology" });
@ -332,6 +332,8 @@ onMounted(() => {
formRef.value.resetFields();
if (route.query.id) {
const obj = Object.assign({}, route, { title: "修改技术需求" });
tab.updatePage(obj);
getTechnologyDemand({ id: route.query.id }).then((resp) => {
form.value = resp.data;

7
src/views/admin/enterprise/demand/results.vue
View File

@ -13,7 +13,7 @@
<el-radio-button label="5">专家</el-radio-button>
<!-- <el-radio-button label="6">服务需求</el-radio-button> -->
<!-- <el-radio-button label="7">技术需求</el-radio-button> -->
<!-- <el-radio-button label="4">实验室</el-radio-button> -->
<el-radio-button label="8">实验室</el-radio-button>
</el-radio-group>
<div v-if="dataList.length" style="margin-top: 20px" v-loading="loading">
@ -79,6 +79,7 @@ const loading = ref(true);
const total = ref(0);
const queryType = computed(() => {
console.log(queryParams.value.searchType);
if (queryParams.value.searchType == 1) {
return 2;
} else if (queryParams.value.searchType == 2) {
@ -87,9 +88,9 @@ const queryType = computed(() => {
return 2;
} else if (queryParams.value.searchType == 5) {
return 2;
} else if (queryParams.value.searchType == 8) {
return 2;
}
// else if (queryParams.value.searchType == 6) {
// return 1;
// } else if (queryParams.value.searchType == 7) {
// return 1;
// }

37
src/views/admin/enterprise/extension/results.vue
View File

@ -12,8 +12,10 @@
<el-radio-button label="4">专利</el-radio-button>
<el-radio-button label="5">专家</el-radio-button>
<!-- <el-radio-button label="6">服务需求</el-radio-button> -->
<el-radio-button label="7">技术需求</el-radio-button>
<!-- <el-radio-button label="4">实验室</el-radio-button> -->
<el-radio-button label="8">实验室</el-radio-button>
<el-radio-button label="7" v-if="route.path != '/demand/results'"
>技术需求</el-radio-button
>
</el-radio-group>
<!-- <el-row :gutter="20">
@ -80,6 +82,10 @@
:data="item"
v-else-if="queryParams.searchType == 7"
></TechnologyDemandItem>
<LaboratoryItem
:data="item"
v-else-if="queryParams.searchType == 8"
></LaboratoryItem>
</div>
</section>
</div>
@ -102,16 +108,20 @@ import expertItem from "@/views/website/searchList/components/expertItem.vue";
import serviceDemandItem from "@/views/website/searchList/components/serviceDemandItem.vue";
import enterpriseItem from "../../components/enterpriseItem.vue";
import TechnologyDemandItem from "@/views/website/searchList/components/technologyDemandItem.vue";
import AchievementItem from "@/views/website/searchList/components/achievementItem.vue";
import { useRoute, useRouter } from "vue-router";
import useUserStore from "@/store/modules/user";
import LaboratoryItem from "@/views/website/searchList/components/laboratoryItem.vue";
const route = useRoute();
const router = useRouter();
const dataList = ref([]);
const loading = ref(true);
const total = ref(0);
const userStore = useUserStore();
const queryType = computed(() => {
console.log(queryParams.value.searchType);
if (queryParams.value.searchType == 1) {
return 2;
} else if (queryParams.value.searchType == 2) {
@ -124,6 +134,8 @@ const queryType = computed(() => {
return 1;
} else if (queryParams.value.searchType == 7) {
return 1;
} else if (queryParams.value.searchType == 8) {
return 2;
}
});
@ -134,6 +146,7 @@ const data = reactive({
query: route.query.keyword,
searchType: "1",
queryType: queryType,
isMatch: true,
},
});
@ -158,17 +171,17 @@ async function getList() {
// console.log(userStore.enterprise.id);
dataList.value = resp.list;
// 排除自己企业
if (queryParams.value.searchType === "1") {
dataList.value = dataList.value.filter(
(el) => el.id != userStore.enterprise?.id
);
}
// if (queryParams.value.searchType === "1") {
// dataList.value = dataList.value.filter(
// (el) => el.id != userStore.enterprise?.id
// );
// }
// 成果排除专家自己
else if (queryParams.value.searchType === "2") {
dataList.value = dataList.value.filter(
(el) => el.expertId != userStore.userId
);
}
// if (queryParams.value.searchType === "2") {
// dataList.value = dataList.value.filter(
// (el) => el.expertId != userStore.userId
// );
// }
total.value = resp.total;
loading.value = false;
}

5
src/views/admin/enterprise/index.vue
View File

@ -8,7 +8,10 @@
{{ vipData.vipType == 1 ? "VIP" : "SVIP" }}
</div> -->
<!-- <div class="text-right">续期</div> -->
<div v-if="vipData.vipType == 1">升级SVIP</div>
<div v-if="vipData.vipType == 1">
<div>VIP</div>
<div>升级SVIP</div>
</div>
<div v-else-if="!vipData.vipType">普通会员</div>
</div>
<div