审核bug修改

src/components/Activity/ActivityDate.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main flex-1">
     <a-spin :spinning="showEdit">
-      <div style="width:100%" v-if="lists && lists.length > 0">
+      <div style="width: 100%" v-if="lists && lists.length > 0">
         <a-table
           :columns="columns"
           :data-source="lists"
@@ -19,45 +19,30 @@
           </template>
 
           <template slot="time" slot-scope="text, record">
-            <span v-if="record.releaseTime">{{ record.releaseTime}}</span>
+            <span v-if="record.releaseTime">{{ record.releaseTime }}</span>
-            <span v-if="record.closeTime">-{{record.closeTime}}</span>
+            <span v-if="record.closeTime">-{{ record.closeTime }}</span>
           </template>
 
           <template slot="auditStatus" slot-scope="text, record">
-            <a-tag
+            <a-tag :color="record.auditStatus === 2 ? 'green' : record.auditStatus === 1 ? 'red' : 'blue'">{{
-              :color="record.auditStatus === 2 ? 'green' : record.auditStatus === 1 ? 'red' : 'blue'"
+              record.auditStatus === 2 ? '已通过' : record.auditStatus === 1 ? '未通过' : '审核中'
-            >{{ record.auditStatus === 2 ? '已通过' : record.auditStatus === 1 ? '未通过' : '审核中' }}</a-tag>
+            }}</a-tag>
           </template>
 
           <template slot="examine" slot-scope="text, record">
             <div class="d-flex flex-column align-center">
-              <a-button
+              <a-button @click="handleApply(record, 2)" size="small" type="primary" v-if="record.auditStatus !== 2">通过</a-button>
-                @click="handleApply(record, 2)"
-                size="small"
-                type="primary"
-                v-if="record.auditStatus !== 2"
-              >通过</a-button>
               <a-button @click="handleApply(record, 1)" size="small" type="danger" v-else>不通过</a-button>
               <a-textarea class="fill-width mt-3" placeholder="备注" v-model="record.remark" />
             </div>
           </template>
 
           <template slot="edit" slot-scope="text, record">
-            <a-icon
+            <a-icon @click="showEditModal(record)" class="pointer mr-5" theme="twoTone" type="edit" />
-              @click="showEditModal(record)"
+            <a-button @click="openEnroll(record.activityId)" size="small" type="primary">查看报名信息</a-button>
-              class="pointer mr-5"
-              theme="twoTone"
-              type="edit"
-            />
-            <a-button @click="openEnroll(record.activityId)" size="small" type="primary">活动报名</a-button>
           </template>
 
-          <div
+          <div class="d-flex flex-column" slot="expandedRowRender" slot-scope="record" style="margin: 0">
-            class="d-flex flex-column"
-            slot="expandedRowRender"
-            slot-scope="record"
-            style="margin: 0"
-          >
             <a-spin :spinning="spinning" tip="详情加载中...">
               <div class="d-flex flex-nowrap justify-space-between mb-3">
                 <div class="d-flex flex-row">
@@ -68,10 +53,15 @@
                 <div class="d-flex flex-row">
                   <span class="font-bold-14">
                     活动类型：
-                    <a-tag
+                    <a-tag color="blue" v-if="record.info && record.info.activityType !== null">{{
-                      color="blue"
+                      record.info.activityType === 0
-                      v-if="record.info && record.info.activityType !== null"
+                        ? '路演'
-                    >{{ record.info.activityType === 0 ? '路演' : record.info.activityType === 1 ? '讲座' : record.info.activityType === 2 ? '沙龙' : '' }}</a-tag>
+                        : record.info.activityType === 1
+                        ? '讲座'
+                        : record.info.activityType === 2
+                        ? '沙龙'
+                        : ''
+                    }}</a-tag>
                   </span>
                 </div>
                 <div class="d-flex flex-row">
@@ -83,18 +73,15 @@
               <div class="d-flex flex-nowrap justify-space-between mb-3">
                 <div class="d-flex flex-row">
                   <span class="font-bold-14">组织单位：</span>
-                  <span
+                  <span v-if="record.info && record.info.organization">{{ record.info.organization }}</span>
-                    v-if="record.info && record.info.organization"
-                  >{{ record.info.organization }}</span>
                   <span v-else>暂无</span>
                 </div>
                 <div class="d-flex flex-row">
                   <span class="font-bold-14">
                     发布平台：
-                    <a-tag
+                    <a-tag color="green" v-if="record.info && record.info.publishPlatform !== null">{{
-                      color="green"
+                      record.info.publishPlatform === 0 ? '绿谷' : record.info.publishPlatform === 1 ? '创时代' : ''
-                      v-if="record.info && record.info.publishPlatform !== null"
+                    }}</a-tag>
-                    >{{ record.info.publishPlatform === 0 ? '绿谷' : record.info.publishPlatform === 1 ? '创时代' : '' }}</a-tag>
                   </span>
                 </div>
               </div>
@@ -123,8 +110,8 @@
 
       <!-- 编辑 -->
       <activity-edit
-        :editItem="editItem"
+        :edit-item="editItem"
-        :editVisible="editVisible"
+        :edit-visible="editVisible"
         @closeModal="closeModal"
         @getDetail="getDetail"
         @getSelectTeam="getSelectTeam"
@@ -191,9 +178,7 @@ const columns = [
 
 export default {
   name: 'ActivityDate',
-  components: {
+  components: { ActivityEdit },
-    ActivityEdit,
-  },
 
   props: { lists: { type: Array, default: () => [] }, pagination: { type: Object, default: () => {} } },
 

src/components/Activity/ActivitySearch.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Author: wally
+ * @email: 18603454788@163.com
+ * @Date: 2021-03-23 10:09:53
+ * @LastEditors: wally
+ * @LastEditTime: 2021-04-17 18:35:09
+-->
 <template>
   <div class="d-flex flex-wrap pb-3 align-center">
     <!-- 活动类型 0路演 1讲座 2沙龙 不传参数则查询全部 -->
@@ -6,13 +13,7 @@
       <a-checkbox-group :options="items" @change="onChange" />
     </div>
     <!-- 发布平台 -->
-    <div class="mb-3">
+
-      <span class="font-bold-14 ml-8">发布平台：</span>
-      <a-radio-group @change="getPlatform">
-        <a-radio :value="0">绿谷</a-radio>
-        <a-radio :value="1">创时代</a-radio>
-      </a-radio-group>
-    </div>
     <!-- 活动标题 -->
     <a-input class="ml-3 mb-3" placeholder="标题" style="width: 150px" v-model="titleKey" />
     <!-- 发布时间 -->
@@ -31,14 +32,12 @@ import ActivityAdd from 'components/Activity/ActivityAdd.vue';
 
 export default {
   name: 'ActivitySearch',
-  components: {
+  components: { ActivityAdd },
-    ActivityAdd,
-  },
   data() {
     return {
       visible: false,
       titleKey: '',
-      items: ['路演', '讲座', '沙龙'],
+      items: ['培训', '讲座', '交流', '路演', '论坛'],
       activityType: [],
       checkedValues: [],
       publishPlatform: '', // 发布平台

src/components/BtnCom/BtnCon.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Author: wally
+ * @email: 18603454788@163.com
+ * @Date: 2021-03-23 10:09:53
+ * @LastEditors: wally
+ * @LastEditTime: 2021-04-17 19:40:54
+-->
 <template>
   <div class="btn-box pa-3">
     <div class="font-bold-24">运维</div>
@@ -6,33 +13,34 @@
     <div @click="jump('/user-manage')" class="btn">用户管理</div>
     <div @click="jump('/banner-manage')" class="btn">轮播图管理</div>
     <!-- <div @click="jump('/communication-community')" class="btn">交流社区</div> -->
-    <div @click="jump('/event-announcement')" class="btn">活动公告</div>
+    <div @click="jump('/event-announcement')" class="btn">双创活动-公告</div>
+    <!-- <div @click="jump('/event-registration')" class="btn">双创活动-报道</div> -->
     <div @click="jump('/innovation-policy')" class="btn">创新政策</div>
     <div @click="jump('/Challenge')" class="btn">创新挑战</div>
     <div @click="jump('/College')" class="btn">创业学院</div>
     <!-- <div @click="jump('/talent-recruitment')" class="btn">人才招聘</div> -->
     <div @click="jump('/cooperative-partner')" class="btn">合作伙伴</div>
-    <div @click="jump('/about-us-derivative-enterprise')" class="btn">衍生企业</div>
+    <!-- <div @click="jump('/about-us-derivative-enterprise')" class="btn">衍生企业</div> -->
 
     <div class="font-bold-24">创新研究院</div>
     <!-- <div @click="jump('/cooperation-intention')" class="btn">合作意向</div> -->
     <!-- <div @click="jump('/demand-filling')" class="btn">需求填报</div> -->
     <div @click="jump('/innovative-service')" class="btn">服务</div>
-    <div @click="jump('/')" class="btn">合作伙伴</div>
+    <!-- <div @click="jump('/')" class="btn">合作伙伴</div> -->
-    <div @click="jump('/')" class="btn">衍生企业</div>
+    <!-- <div @click="jump('/')" class="btn">衍生企业</div> -->
     <!-- <div @click="jump('/innovative-lab')" class="btn">实验室</div> -->
-    <!-- <div @click="jump('/category-manage')" class="btn">分类管理</div> -->
+    <div @click="jump('/category-manage')" class="btn">分类管理</div>
     <!-- <div @click="jump('/innovative-equipment')" class="btn">设备</div> -->
     <!-- <div @click="jump('/innovative-achievements')" class="btn">成果</div> -->
 
     <div class="font-bold-24">孵化平台</div>
-    <div @click="jump('/entity-application')" class="btn">入驻实体申请</div>
+    <div @click="jump('/virtual-application?type=2')" class="btn">入驻实体申请</div>
-    <div @click="jump('/virtual-application')" class="btn">入驻数智创时代 专业孵化器申请</div>
+    <div @click="jump('/virtual-application?type=1')" class="btn">入驻数智创时代 专业孵化器申请</div>
-    <div @click="jump('/virtual-application')" class="btn">入驻线上孵化器</div>
+    <div @click="jump('/virtual-application?type=0')" class="btn">入驻线上孵化器</div>
     <div @click="jump('/incubation-services')" class="btn">服务</div>
     <!-- <div @click="jump('/hatching-demand-filling')" class="btn">需求填报</div> -->
     <div @click="jump('/')" class="btn">创业导师</div>
-    <div @click="jump('/hatch-cooperative-partner')" class="btn">合作伙伴</div>
+    <!-- <div @click="jump('/hatch-cooperative-partner')" class="btn">合作伙伴</div> -->
 
     <!-- <div class="font-bold-24">产业部</div>
     <div @click="jump('/industrial-services')" class="btn">服务</div>

src/components/EntityApply/EntityApplyAdd.vue

@@ -374,7 +374,7 @@ export default {
             patentGrented: this.platform.patentGrented,
             patentInvent: this.platform.patentInvent,
             phone: this.platform.tel,
-            placeType: this.placeType, //     store里面的 0:虚拟，1:实体
+            placeType: this.placeType, //     store里面的 0:线上，1:专业，2：高新众创
             plantKind: this.platform.plantKind,
             position: this.platform.position,
             productTech: this.platform.productTech,

src/components/EntityApply/EntityApplySearch.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Author: wally
+ * @email: 18603454788@163.com
+ * @Date: 2021-03-23 10:09:54
+ * @LastEditors: wally
+ * @LastEditTime: 2021-04-17 19:35:22
+-->
 <template>
   <div class="d-flex flex-wrap pb-3">
     <!-- 企业名称 -->
@@ -26,9 +33,7 @@ import EntityApplyAdd from 'components/EntityApply/EntityApplyAdd.vue';
 
 export default {
   name: 'EntityApplySearch',
-  components: {
+  components: { EntityApplyAdd },
-    EntityApplyAdd,
-  },
   data() {
     return {
       visible: false,

src/components/Manage/ManageAdd.vue

@@ -2,9 +2,9 @@
   <div class="d-flex flex-wrap pb-3">
     <!-- 添加 -->
     <a-modal
-      :maskClosable="false"
+      :mask-closable="false"
       @cancel="$emit('closeModal')"
-      destroyOnClose
+      destroy-on-close
       footer
       title="添加分类管理"
       v-model="visible"
@@ -12,48 +12,34 @@
     >
       <a-form :form="form" @submit="handleSubmit">
         <!-- 类型 -->
-        <a-form-item
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="类型">
-          :label-col="formItemLayout.labelCol"
-          :wrapper-col="formItemLayout.wrapperCol"
-          label="类型"
-        >
           <a-select
             placeholder="类型"
-            style="width:100%"
+            style="width: 100%"
             v-decorator="[
-                      'model',
+              'model',
-                      {
+              {
-                        rules: [
+                rules: [{ required: true, message: '类型不能为空' }],
-                          { required: true, message: '类型不能为空' },
+              },
-                        ],
+            ]"
-                      },
-                    ]"
           >
-            <a-select-option
+            <a-select-option :key="index" :value="item.id" v-for="(item, index) in types">{{ item.name }}</a-select-option>
-              :key="index"
-              :value="item.id"
-              v-for="(item, index) in types"
-            >{{ item.name }}</a-select-option>
           </a-select>
         </a-form-item>
         <!-- 分类名称 -->
-        <a-form-item
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="分类名称">
-          :label-col="formItemLayout.labelCol"
-          :wrapper-col="formItemLayout.wrapperCol"
-          label="分类名称"
-        >
           <a-input
             placeholder="分类名称"
             v-decorator="[
-                      'name',
+              'name',
-                      {
+              {
-                        rules: [
+                rules: [
-                          { required: true, message: '分类名称不能为空' },
+                  { required: true, message: '分类名称不能为空' },
-                          { whitespace: true, message: '分类名称不能为空' },
+                  { whitespace: true, message: '分类名称不能为空' },
-                          { max: 140, massage: '分类名称最多140个字符' },
+                  { max: 140, massage: '分类名称最多140个字符' },
-                        ],
+                ],
-                      },
+              },
-                    ]"
+            ]"
           />
         </a-form-item>
 
@@ -88,6 +74,9 @@ export default {
         { id: 0, name: '成果' },
         { id: 1, name: '仪器' },
         { id: 2, name: '实验室' },
+        { id: 3, name: '产品' },
+        { id: 4, name: '创业学院' },
+        { id: 5, name: '发榜' },
       ],
     };
   },

src/components/Manage/ManageDate.vue

@@ -18,8 +18,11 @@
 
         <template slot="model" slot-scope="text, record">
           <span v-if="record.model === 0">成果</span>
-          <span v-if="record.model === 1">仪器</span>
+          <span v-else-if="record.model === 1">仪器</span>
-          <span v-if="record.model === 2">实验室</span>
+          <span v-else-if="record.model === 2">实验室</span>
+          <span v-else-if="record.model === 3">产品</span>
+          <span v-else-if="record.model === 4">创业学院</span>
+          <span v-else-if="record.model === 5">发榜</span>
         </template>
 
         <template slot="edit" slot-scope="text, record">
@@ -33,7 +36,7 @@
     <a-empty v-else />
 
     <!-- 编辑 -->
-    <manage-edit :editItem="editItem" :editVisible="editVisible" @closeModal="closeModal" @selModelSearch="selModelSearch" />
+    <manage-edit :edit-item="editItem" :edit-visible="editVisible" @closeModal="closeModal" @selModelSearch="selModelSearch" />
   </div>
 </template>
 
@@ -74,9 +77,7 @@ const columns = [
 
 export default {
   name: 'ManageDate',
-  components: {
+  components: { ManageEdit },
-    ManageEdit,
-  },
 
   props: { lists: { type: Object, default: () => {} }, pagination: { type: Object, default: () => {} } },
 

src/components/Manage/ManageSearch.vue

@@ -1,16 +1,17 @@
+<!--
+ * @Author: wally
+ * @email: 18603454788@163.com
+ * @Date: 2021-03-23 10:09:54
+ * @LastEditors: wally
+ * @LastEditTime: 2021-04-17 18:30:23
+-->
 <template>
   <div class="d-flex flex-wrap pb-3">
     <!-- 团队名称 -->
     <div>
       <a-input @change="handleChangeName" placeholder="分类名称" style="width: 150px" v-model="name" />
 
-      <a-select
+      <a-select @change="handleChangeSelect('model', $event)" allow-clear class="ml-3" placeholder="类型" style="width: 150px">
-        @change="handleChangeSelect('model',$event)"
-        allow-clear
-        class="ml-3"
-        placeholder="类型"
-        style="width: 150px"
-      >
         <a-select-option :key="model.id" :value="model.id" v-for="model in models">{{ model.value }}</a-select-option>
       </a-select>
 
@@ -31,9 +32,7 @@ import ManageAdd from 'components/Manage/ManageAdd.vue';
 
 export default {
   name: 'ManageSearch',
-  components: {
+  components: { ManageAdd },
-    ManageAdd,
-  },
   data() {
     return {
       visible: false,
@@ -42,6 +41,9 @@ export default {
         { id: 0, value: '成果' },
         { id: 1, value: '仪器' },
         { id: 2, value: '实验室' },
+        { id: 3, value: '产品' },
+        { id: 4, value: '创业学院' },
+        { id: 5, value: '发榜' },
       ],
     };
   },

src/router/index.js

@@ -84,7 +84,7 @@ const routes = [
     component: () =>
       import(/* webpackChunkName: "about-us-derivative-enterprise" */ 'views/CooperativePartner/AboutUsDerivativeEnterprise.vue'),
   },
-  //  -------创新部
+  // 创新部
   // 合作意向
   {
     path: '/cooperation-intention',

src/views/College/components/CollegeAdd.vue

@@ -128,6 +128,7 @@ export default {
         const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
         if (!isJpgOrPng) {
           this.$message.error('仅支持 JPG/PNG 格式的图片!');
+          this.fileList = [];
         }
         return isJpgOrPng;
       },
@@ -195,7 +196,7 @@ export default {
               this.picId = this.fileList[0];
               const params = {
                 param: {
-                  banners: this.banners,
+                  banners: this.banner,
                   contentUrl: this.contentUrl,
                   coverPicture: this.fileList[0],
                   intro: this.intro,

src/views/CooperativePartner/CooperativePartner.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Author: wally
+ * @email: 18603454788@163.com
+ * @Date: 2021-03-23 10:09:55
+ * @LastEditors: wally
+ * @LastEditTime: 2021-04-17 19:20:58
+-->
 <template>
   <div class="pa-3 white fill-height d-flex flex-column">
     <partner-search @getBackendSearch="getBackendSearch" />
@@ -28,7 +35,8 @@ export default {
   computed: mapState(['partnerOptions']),
 
   async created() {
-    const options = { type: 1, typeOfPlatform: 2 };
+    const { query } = this.$route;
+    const options = { type: query.type1, typeOfPlatform: query.type2 };
     this.setPartnerOptions(options);
     await this.getBackendSearch();
   },

src/views/EntityApplication/VirtualApplication.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Author: wally
+ * @email: 18603454788@163.com
+ * @Date: 2021-03-23 10:09:55
+ * @LastEditors: wally
+ * @LastEditTime: 2021-04-17 19:41:42
+-->
 <template>
   <div class="pa-3 white fill-height d-flex flex-column">
     <entity-apply-search @entityApplicationSearch="entityApplicationSearch" />
@@ -28,7 +35,8 @@ export default {
   computed: mapState(['placeType']),
 
   async created() {
-    this.setPlaceType(0);
+    const { query } = this.$route;
+    this.setPlaceType(query.type);
     await this.entityApplicationSearch();
   },