1

src/store/market/markettype.js

@@ -9,7 +9,7 @@ const state = () => ({});
 const mutations = {};
 
 const actions = {
-  async query({ commit }, { skip = 0, limit = 10, ...info } = {}) {
+  async query({ commit }, { skip = 0, limit = 100, ...info } = {}) {
     const res = await this.$axios.$get(api.codeitemInfo, { skip, limit, ...info });
     return res;
   },

src/views/market/list/achieve.vue

@@ -11,12 +11,15 @@
               <!-- 主要成果单位 -->
               <span v-for="(item, index) in firDroplist" :key="index" @click="change(item.name)">{{ item.name }}</span>
               <!-- 其他 -->
-              <el-dropdown trigger="click" @command="change">
+              <el-select v-model="dropTxt" clearable filterable placeholder="其他" @change="change" class="select">
+                <el-option v-for="(item, index) in dropList" :key="index" :label="item.name" :value="item.name"> </el-option>
+              </el-select>
+              <!-- <el-dropdown trigger="click" @command="change">
                 <span class="el-dropdown-link"> 其他<i class="el-icon-arrow-down el-icon--right"></i> </span>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item v-for="(item, index) in dropList" :key="index" :command="item.name">{{ item.name }}</el-dropdown-item>
                 </el-dropdown-menu>
-              </el-dropdown>
+              </el-dropdown> -->
             </el-col>
             <el-col :span="12" class="search">
               <el-input placeholder="请输入名称" v-model="infoName" class="input-with-select" clearable>
@@ -82,6 +85,7 @@ export default {
           name: '长春工业大学',
         },
       ],
+      dropTxt: '',
     };
   },
   created() {},
@@ -161,6 +165,16 @@ export default {
           cursor: pointer;
           color: #409eff;
         }
+        .select {
+          width: 19%;
+          /deep/.el-input__inner {
+            height: 30px;
+            line-height: 30px;
+          }
+          /deep/.el-input__icon {
+            line-height: 30px;
+          }
+        }
       }
       .search {
         /deep/.el-input__inner {

src/views/market/list/expert.vue

@@ -11,12 +11,15 @@
               <!-- 主要成果单位 -->
               <span v-for="(item, index) in firDroplist" :key="index" @click="change(item.name)">{{ item.name }}</span>
               <!-- 其他 -->
-              <el-dropdown trigger="click" @command="change">
+              <el-select v-model="dropTxt" clearable filterable placeholder="其他" @change="change" class="select">
+                <el-option v-for="(item, index) in dropList" :key="index" :label="item.name" :value="item.name"> </el-option>
+              </el-select>
+              <!-- <el-dropdown trigger="click" @command="change">
                 <span class="el-dropdown-link"> 其他<i class="el-icon-arrow-down el-icon--right"></i> </span>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item v-for="(item, index) in dropList" :key="index" :command="item.name">{{ item.name }}</el-dropdown-item>
                 </el-dropdown-menu>
-              </el-dropdown>
+              </el-dropdown> -->
             </el-col>
             <el-col :span="12" class="search">
               <el-input placeholder="请输入名称" v-model="infoName" class="input-with-select" clearable>
@@ -157,6 +160,16 @@ export default {
           cursor: pointer;
           color: #409eff;
         }
+        .select {
+          width: 19%;
+          /deep/.el-input__inner {
+            height: 30px;
+            line-height: 30px;
+          }
+          /deep/.el-input__icon {
+            line-height: 30px;
+          }
+        }
       }
       .search {
         /deep/.el-input__inner {

src/views/market/marketlists.vue

@@ -347,10 +347,18 @@ export default {
           }
         }
       } else {
-        let res = await this.productList({ type: '1', status: '1', company: data });
-        if (this.$checkRes(res)) {
-          this.$set(this, `achieveList`, res.data);
-          this.$set(this, `achieveTotal`, res.total);
+        if (data) {
+          let res = await this.productList({ type: '1', status: '1', company: data });
+          if (this.$checkRes(res)) {
+            this.$set(this, `achieveList`, res.data);
+            this.$set(this, `achieveTotal`, res.total);
+          }
+        } else {
+          let res = await this.productList({ type: '1', status: '1' });
+          if (this.$checkRes(res)) {
+            this.$set(this, `achieveList`, res.data);
+            this.$set(this, `achieveTotal`, res.total);
+          }
         }
       }
     },
@@ -368,10 +376,18 @@ export default {
           }
         }
       } else {
-        let res = await this.expertsuserList({ company: data });
-        if (this.$checkRes(res)) {
-          this.$set(this, `expertList`, res.data);
-          this.$set(this, `expertTotal`, res.total);
+        if (data) {
+          let res = await this.expertsuserList({ company: data });
+          if (this.$checkRes(res)) {
+            this.$set(this, `expertList`, res.data);
+            this.$set(this, `expertTotal`, res.total);
+          }
+        } else {
+          let res = await this.expertsuserList();
+          if (this.$checkRes(res)) {
+            this.$set(this, `expertList`, res.data);
+            this.$set(this, `expertTotal`, res.total);
+          }
         }
       }
     },