尾部导航

src/views/admin/enterprise/account/basicInfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-card shadow="always" style="width: 55%; margin: 0 auto">
-      <p><b>基本资料</b></p>
+      <!-- <p><b>基本资料</b></p>
       <el-form
         ref="PersonalInfoFormRef"
         :model="PersonalInfoForm"
@@ -35,7 +35,7 @@
         <el-form-item>
           <el-button type="primary" @click="submitPersonalInfo">提交</el-button>
         </el-form-item>
-      </el-form>
+      </el-form> -->
       <p><b>企业资料</b></p>
       <EnterpriseForm
         v-model="enterpriseInfoForm"

src/views/admin/enterprise/account/joinMembership.vue

@@ -54,6 +54,9 @@
           </el-icon>
         </div>
       </div>
+      <div class="contact">
+        联系电话：<a href="tel:18156053255">18156053255</a> (微信同号)
+      </div>
     </div>
   </div>
 </template>
@@ -66,14 +69,8 @@ const serviceContent = ref([
   "一般企业的需求匹配推送",
 ]);
 const ordinaryMember = ref(["普通会员", true, false, false, false]);
-const vipMember = ref(["VIP会员服务(2999/年)", true, true, false, true]);
-const advanceVipMember = ref([
-  "高级VIP会员服务(3999/年)",
-  true,
-  true,
-  true,
-  true,
-]);
+const vipMember = ref(["VIP会员服务", true, true, false, true]);
+const advanceVipMember = ref(["高级VIP会员服务", true, true, true, true]);
 </script>
 <style lang="scss" scoped>
 .container {
@@ -98,5 +95,9 @@ const advanceVipMember = ref([
       // background-color: salmon;
     }
   }
+  .contact {
+    margin-top: 10px;
+    text-align: end;
+  }
 }
 </style>

src/views/admin/enterprise/demand/releaseService.vue

@@ -9,13 +9,13 @@
       >
         <p><b>基本信息</b></p>
 
-        <el-row>
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="需求名称:" prop="title">
               <el-input v-model="form.title"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
 
         <el-row>
           <el-col :span="24">
@@ -52,16 +52,17 @@
                 v-model="form.description"
                 width="100%"
                 min-height="150px"
+                @blur="formRef.validateField(`description`)"
               ></wangEditor>
             </el-form-item>
           </el-col>
         </el-row>
 
-        <CityOptions
+        <!-- <CityOptions
           v-model="form"
           :labelWidth="labelWidth"
           ref="cityFormRef"
-        />
+        /> -->
 
         <el-row>
           <el-col :span="12">
@@ -81,7 +82,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- 
+
         <el-row>
           <el-col :span="12">
             <el-form-item label="需求提交人:" prop="commitUserName">
@@ -99,10 +100,10 @@
               ></el-input>
             </el-form-item>
           </el-col>
-        </el-row> -->
+        </el-row>
       </el-form>
       <div :style="{ marginLeft: labelWidth + 'px' }">
-        <el-button @click="$router.go(-1)">取消</el-button>
+        <el-button @click="backToList">取消</el-button>
         <el-button type="primary" @click="submitForm">提交</el-button>
       </div>
     </el-card>
@@ -110,14 +111,16 @@
 </template>
 <script setup>
 // import { insertDemand } from "@/api/admin/enterprise";
+import tab from "../../../../plugins/tab";
 import {
   insertDemand,
   getDemand,
   updateDemand,
 } from "@/api/admin/enterprise/demand";
-import CityOptions from "@/views/components/CityOptions";
+// import CityOptions from "@/views/components/CityOptions";
 import { ElMessage } from "element-plus";
 import { onActivated } from "vue";
+// import { onActivated } from "vue";
 import { useRoute, useRouter } from "vue-router";
 
 const router = useRouter();
@@ -125,7 +128,7 @@ const route = useRoute();
 const data = reactive({
   form: {
     check: [],
-    status: 0,
+    status: 1,
   },
   queryParams: {
     pageNum: 1,
@@ -188,6 +191,11 @@ const submitForm = () => {
     }
   });
 };
+
+// 返回服务需求列表
+const backToList = () => {
+  tab.closeOpenPage({ path: "/demand/serviceDemand" });
+};
 // 添加需求类别时验证
 function addCheck() {
   if (!checkInput.value.trim().length) return ElMessage.error("请输入");
@@ -219,6 +227,14 @@ onMounted(() => {
       }
       form.value = resp.data;
     });
+  } else {
+    form.value = {
+      check: [],
+      status: 1,
+    };
+    if (formRef.value) {
+      formRef.value.resetFields();
+    }
   }
 });
 </script>

src/views/admin/enterprise/demand/releaseTechnology.vue

@@ -11,15 +11,15 @@
 
         <el-row>
           <el-col :span="24">
-            <el-form-item label="成果需求名称:" prop="title">
+            <el-form-item label="技术需求名称:" prop="title">
               <el-input v-model="form.title"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
 
-        <el-row>
+        <!-- <el-row>
           <el-col :span="24">
-            <!-- <el-checkbox label="0" @change="handleCheck">其他</el-checkbox> -->
+           //  <el-checkbox label="0" @change="handleCheck">其他</el-checkbox>
             <el-form-item label="需求类别:" prop="kinds">
               <el-checkbox-group v-model="form.kinds">
                 <el-checkbox
@@ -42,15 +42,17 @@
               </el-row>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
 
         <el-row>
           <el-col :span="24">
             <el-form-item label="需求描述:" prop="introduce">
               <wangEditor
                 v-model="form.introduce"
+                placeholder="请输入技术需求内容和详细的技术指标"
                 width="100%"
                 min-height="150px"
+                @blur="formRef.validateField(`introduce`)"
               ></wangEditor>
             </el-form-item>
           </el-col>
@@ -61,6 +63,11 @@
           :labelWidth="labelWidth"
           ref="fieldFormRef"
         />
+        <CityOptions
+          v-model="form"
+          :labelWidth="labelWidth"
+          ref="cityFormRef"
+        ></CityOptions>
 
         <el-row>
           <el-col :span="12">
@@ -145,10 +152,11 @@
         <el-row>
           <el-col :span="24">
             <InputBoxAdd
+              class="cooperation-mode"
               :labelWidth="labelWidth"
               v-model="form"
-              title="想合作的单位及模式"
-              placeholder=""
+              title="合作模式"
+              placeholder="合作开发、委托研发、技术转让、技术入股、技术许可"
               fieldKey="wants"
               ref="directionsFormRef"
             />
@@ -194,7 +202,7 @@ const data = reactive({
   rules: {
     title: [{ required: true, message: "需求名称不能为空", trigger: "blur" }],
     introduce: [
-      { required: true, message: "需求描述不能为空", trigger: "blur" },
+      { required: true, message: "需求描述不能为空", trigger: "change" },
     ],
     name: [{ required: true, message: "需求联系人不能为空", trigger: "blur" }],
     mobile: [
@@ -247,6 +255,7 @@ const checkList = reactive([
 const formRef = ref(null);
 const fieldFormRef = ref(null);
 const directionsFormRef = ref(null);
+const cityFormRef = ref(null);
 const checkInput = ref("");
 const submitForm = async (status) => {
   let formValid;
@@ -258,7 +267,8 @@ const submitForm = async (status) => {
   form.value.status = status;
   const fieldFormValid = await fieldFormRef.value.validateForm();
   const directionsFormValid = await directionsFormRef.value.validateForm();
-  if (formValid && fieldFormValid && directionsFormValid) {
+  const cityFormValid = await cityFormRef.value.validateForm();
+  if (formValid && fieldFormValid && directionsFormValid && cityFormValid) {
     if (route.query.id) {
       await updateTechnologyDemand(form.value);
       ElMessage.success("修改企业需求成功");
@@ -328,6 +338,20 @@ onMounted(() => {
         form.value.wants = resp.data.want?.split(",") ?? [];
       }
     });
+  } else {
+    form.value = {
+      check: [],
+    };
+    if (formRef.value) {
+      formRef.value.resetFields();
+    }
   }
 });
 </script>
+<style lang="scss" scoped>
+:deep(.cooperation-mode) {
+  .input-add-bar {
+    width: 100%;
+  }
+}
+</style>

src/views/admin/enterprise/demand/results.vue

@@ -11,8 +11,8 @@
       <el-radio-button label="2">成果</el-radio-button>
       <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="6">服务需求</el-radio-button> -->
+      <!-- <el-radio-button label="7">技术需求</el-radio-button> -->
       <!-- <el-radio-button label="4">实验室</el-radio-button> -->
     </el-radio-group>
 
@@ -35,14 +35,14 @@
             :data="item"
             v-else-if="queryParams.searchType == 5"
           ></expertItem>
-          <serviceDemandItem
+          <!-- <serviceDemandItem
             :data="item"
             v-else-if="queryParams.searchType == 6"
           ></serviceDemandItem>
           <TechnologyDemandItem
             :data="item"
             v-else-if="queryParams.searchType == 7"
-          ></TechnologyDemandItem>
+          ></TechnologyDemandItem> -->
         </div>
       </section>
     </div>
@@ -62,16 +62,18 @@
 import { search } from "@/api/website/home/index";
 import gainItem from "@/views/website/searchList/components/gainItem.vue";
 import expertItem from "@/views/website/searchList/components/expertItem.vue";
-import serviceDemandItem from "@/views/website/searchList/components/serviceDemandItem.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 TechnologyDemandItem from "@/views/website/searchList/components/technologyDemandItem.vue";
 import AchievementItem from "@/views/website/searchList/components/achievementItem.vue";
 import { useRoute, useRouter } from "vue-router";
-import { watch } from "vue";
+
+// import { watch } from "vue";
 
 const route = useRoute();
 const router = useRouter();
 
+// console.log(userStore.userId);
 const dataList = ref([]);
 const loading = ref(true);
 const total = ref(0);
@@ -85,11 +87,12 @@ const queryType = computed(() => {
     return 2;
   } else if (queryParams.value.searchType == 5) {
     return 2;
-  } else if (queryParams.value.searchType == 6) {
-    return 1;
-  } else if (queryParams.value.searchType == 7) {
-    return 1;
   }
+  //  else if (queryParams.value.searchType == 6) {
+  //   return 1;
+  // } else if (queryParams.value.searchType == 7) {
+  //   return 1;
+  // }
 });
 
 // router.replace({
@@ -121,6 +124,7 @@ const { queryParams } = toRefs(data);
 /** 查询列表 */
 async function getList() {
   const resp = await search(queryParams.value);
+  // if()
   dataList.value = resp.list;
   total.value = resp.total;
   loading.value = false;

src/views/admin/enterprise/demand/serviceDemand.vue

@@ -23,7 +23,7 @@
     </el-radio-group>
 
     <el-table v-loading="loading" :data="dataList" style="margin-top: 20px">
-      <el-table-column label="需求名称" align="center" prop="title" />
+      <!-- <el-table-column label="需求名称" align="center" prop="title" /> -->
       <el-table-column label="需求类别" align="center" prop="kind" />
       <!-- <el-table-column label="状态" align="center" prop="status" /> -->
       <el-table-column label="联系人" align="center" prop="name" />

src/views/admin/enterprise/extension/results.vue

@@ -11,7 +11,7 @@
       <el-radio-button label="2">成果</el-radio-button>
       <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="6">服务需求</el-radio-button> -->
       <el-radio-button label="7">技术需求</el-radio-button>
       <!-- <el-radio-button label="4">实验室</el-radio-button> -->
     </el-radio-group>
@@ -104,13 +104,13 @@ 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";
 const route = useRoute();
 const router = useRouter();
 const dataList = ref([]);
 const loading = ref(true);
 const total = ref(0);
-
+const userStore = useUserStore();
 const queryType = computed(() => {
   if (queryParams.value.searchType == 1) {
     return 2;
@@ -155,7 +155,20 @@ watch(
 /** 查询列表 */
 async function getList() {
   const resp = await search(queryParams.value);
+  // 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
+    );
+  }
+  // 成果排除专家自己
+  else if (queryParams.value.searchType === "2") {
+    dataList.value = dataList.value.filter(
+      (el) => el.expertId != userStore.userId
+    );
+  }
   total.value = resp.total;
   loading.value = false;
 }

src/views/admin/enterprise/index.vue

@@ -3,26 +3,33 @@
     <div class="card-panel surplus-currency" :class="flag ? 'vip-box' : ''">
       <div class="_tit">
         <span style="visibility: hidden"> 会员banner图 </span>
-        <div class="fr" v-if="flag">
-          <div class="text-right">
+        <div class="fr">
+          <!-- <div class="text-right">
             {{ vipData.vipType == 1 ? "VIP" : "SVIP" }}
-          </div>
-          <div class="text-right">续期</div>
-          <div>升级VIP</div>
+          </div> -->
+          <!-- <div class="text-right">续期</div> -->
+          <div v-if="vipData.vipType == 1">升级SVIP</div>
+          <div v-else-if="vipData.vipType == 0">普通会员</div>
         </div>
-        <div class="text-right" style="margin-top: 50px" v-if="flag">
-          会员到期时间：{{ vipData.expireTime }}
+        <div
+          class="text-right"
+          style="margin-top: 50px"
+          v-if="vipData.vipType == 1 || vipData.vipType == 2"
+        >
+          {{ vipData.vipType == 1 ? "VIP" : "SVIP" }}到期时间：{{
+            vipData.expireTime
+          }}
         </div>
       </div>
-      <span
-        class="pointer"
-        style="font-size: 14px"
-        v-if="flag"
-        @click="vipBenefits"
-      >
+      <span class="pointer" style="font-size: 14px" @click="vipBenefits">
         查看会员权益
       </span>
-      <p class="text-center pointer" v-else>开通VIP</p>
+      <p
+        class="text-center pointer"
+        v-if="!vipData.vipType || vipData.vipType == 0"
+      >
+        开通VIP
+      </p>
     </div>
     <!-- 
     <div class="card-panel surplus-currency">