Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-web

src/layout/components/Navbar.vue

@@ -135,6 +135,16 @@ export default {
         let m = JSON.parse(message.params);
         this.$router.push({ path: '/item/plan/list', query: { id: m.id, itemName: m.name } });
       }
+      if (message.type === 'MAJOR_DECLARE_REMIND') {
+        let m = JSON.parse(message.params);
+        let name = m.name?m.name:m.orderName;
+        if (m.businessType==='COMMISSION_DECLARE_MAJOR_EVALUATE'){
+          this.$router.push({ path: '/income/major/declare/evaluate', query: { name: name, reportNo: m.reportNo } });
+        }else{
+          this.$router.push({ path: '/income/major/declare/market', query: { name: name, reportNo: m.reportNo } });
+        }
+        
+      }
     },
 
     setRead(messageId) {

src/views/complex/index.vue

@@ -530,20 +530,20 @@
                 <el-table :data="majorDeclareCheckList" stripe border style="width: 100%">
                   <el-table-column label="审批类型" width="150" align="center">
                     <template slot-scope="{row}">
-                      <span>{{ row.businessType === 'COMMISSION_DECLARE_MAJOR_MARKET' ? '市场人员提成申报' : '评估人员提成申报' }}</span>
+                      <span style="color:red">{{ row.businessType === 'COMMISSION_DECLARE_MAJOR_MARKET' ? '市场人员提成申报' : '评估人员提成申报' }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column label="订单号" width="150" align="center">
+                  <el-table-column label="订单号" width="120" align="center">
                     <template slot-scope="{row}">
                       <span>{{ row.orderId }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column label="项目名称" width="150" align="center">
+                  <el-table-column label="项目名称" width="200" align="center" show-overflow-tooltip>
                     <template slot-scope="{row}">
                       <span>{{ row.name ? row.name : row.orderName }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column label="报告号" width="200" align="center">
+                  <el-table-column label="报告号" width="180" align="center">
                     <template slot-scope="{row}">
                       <span>{{ row.reportNo ? row.reportNo : '--' }}</span>
                     </template>

src/views/income/major/evaluate.vue

@@ -106,8 +106,10 @@
         <el-table-column fixed="right" label="操作" align="center">
           <template slot-scope="{row}">
             <div>
-              <el-button v-if ="row.declareResult==null || row.declareResult=='审核拒绝'" type="text" size="small" @click="openDeclareDialog(row)">申报</el-button>
-              <el-button v-if ="row.declareResult=='审核中' || row.declareResult=='审核通过'" type="text" size="small" @click="checkDetail(row.id)">查看</el-button>
+              <el-button v-if="row.declareResult == null || row.declareResult == '审核拒绝'" type="text" size="small"
+                @click="openDeclareDialog(row)">申报</el-button>
+              <el-button v-if="row.declareResult == '审核中' || row.declareResult == '审核通过' || row.declareResult == '审核拒绝'" type="text" size="small"
+                @click="checkDetail(row.id)">查看</el-button>
             </div>
           </template>
         </el-table-column>
@@ -201,6 +203,8 @@ export default {
     }
   },
   created() {
+      this.listQuery.name = this.$route.query.name;
+      this.listQuery.reportNo = this.$route.query.reportNo;
      this.getList();
      this.getMajorEvaluateCate();
   },