wucl hace 10 meses
padre
commit
37471bcef8

+ 1 - 1
src/layout/components/TagsView/index.vue

@@ -235,7 +235,7 @@ export default {
         return tagName;
       }
       return tagName;
-    }
+    },
   
   }
 }

+ 4 - 4
src/views/administration/major/checkList.vue

@@ -11,13 +11,13 @@
               </el-input>
               <el-input v-model="listQuery.reportNo" placeholder="报告号" clearable style="margin-left: 20px;width: 200px;float: left;">
               </el-input>
-              <el-select  clearable  v-model="listQuery.commissionRateId" placeholder="提成类型" style="margin-left: 20px;width: 200px;float: left;">
-                  <el-option v-for="(c,id) in cates" :value="c.id" :label="c.name">{{ c.name }}</el-option>
+              <el-select  clearable  v-model="listQuery.businessCate" placeholder="提成类型" style="margin-left: 20px;width: 200px;float: left;">
+                  <el-option v-for="(c,id) in cates" :value="c.name" :label="c.name">{{ c.name }}</el-option>
               </el-select>
-              <el-select  clearable  v-model="listQuery.declareType" placeholder="申报类型" style="margin-left: 20px;width: 200px;float: left;">
+              <!-- <el-select  clearable  v-model="listQuery.declareType" placeholder="申报类型" style="margin-left: 20px;width: 200px;float: left;">
                   <el-option :value="true" label="产品">产品</el-option>
                   <el-option :value="false" label="订单">订单</el-option>
-              </el-select>
+              </el-select> -->
               <el-button class="filter-item" style="margin-left:20px;float: left;" type="primary" @click="searchList" round>搜索
               </el-button>
               <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch()">重置

+ 1 - 1
src/views/finance/realFundStat.vue

@@ -67,7 +67,7 @@
               <span>{{ row.productionType==='REPORT'?'报告':(row.productionType==='STATEMENT'?'意见书':'复评函')}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="项目名称"  width="200"   align="center">
+          <el-table-column label="项目名称"  width="150" how-overflow-tooltip  align="center" >
             <template slot-scope="{row}">
               <span>{{ row.name }}</span>
             </template>

+ 6 - 0
src/views/income/major/evaluate.vue

@@ -203,8 +203,14 @@ export default {
     }
   },
   created() {
+    if (this.$route.query.name){
       this.listQuery.name = this.$route.query.name;
+    }
+      
+    if (this.$route.query.reportNo){
       this.listQuery.reportNo = this.$route.query.reportNo;
+    }
+      
      this.getList();
      this.getMajorEvaluateCate();
   },