Merge branch 'master' into zm

# Conflicts:
#	config/index.js

src/views/crm/business/Detail.vue

@@ -68,7 +68,6 @@
                   <div class="state-arrow arrow-right"/>
                 </div>
               </el-popover>
-
               <el-popover
                 v-if="status.length -1 ==index"
                 :title="item.type == 0 ? '' : item.title"
@@ -91,6 +90,7 @@
                     <div class="state-handel-item-value">{{ item.value }}</div>
                   </flexbox>
                 </div>
+
                 <div
                   slot="reference"
                   :class="item.class"
@@ -106,7 +106,13 @@
             </a>
           </flexbox>
         </div>
-
+        <div
+          v-if="detailData.submit_end_status!=0 && detailData.is_end==0"
+          class="busi-state-main">
+          <a v-if="detailData.submit_end_status==1" style="color: #00ca9d;font-weight: 500;font-size: 20px;">赢单审批</a>
+          <a v-else-if="detailData.submit_end_status==2" style="color: #f94e4e;font-weight: 500;font-size: 20px;">输单审批</a>
+          <p v-if="detailData.submit_end_status==2" style="margin:10px 5px;">输单原因：{{ detailData.submit_remark }}</p>
+        </div>
         <examine-info
           v-if="detailData.flow_id"
           :id="id"

src/views/crm/customer/index.vue

@@ -41,7 +41,7 @@
       <el-table
         v-loading="loading"
         id="crm-table"
-        :row-height="40"
+        :row-height="50"
         :data="list"
         :height="tableHeight"
         :cell-class-name="cellClassName"

src/views/crm/workbench/components/SalesFunnel.vue

@@ -34,12 +34,12 @@
     <div id="sales-funnel" />
     <flexbox justify="center" class="info-box">
       <flexbox direction="column" class="info-item">
-        <!-- <button id="btn-win" class="btn-num" style="color: #6ca2ff;" @click="getView()">赢单单数</button> -->
-        <button class="btn-num" style="color: #6ca2ff;" @click="pushView()">赢单单数</button>
+        <button id="btn-win" class="btn-num" style="color: #6ca2ff;" @click="getWin()">赢单单数</button>
+        <!-- <button class="btn-num" style="color: #6ca2ff;" @click="pushView()">赢单单数</button> -->
         <div class="value">{{ funnelData.winSingle }}单</div>
       </flexbox>
       <flexbox direction="column" class="info-item">
-        <button class="btn-num" @click="pushView()">输单单数</button>
+        <button class="btn-num" @click="getLose()">输单单数</button>
         <div class="value">{{ funnelData.loseSingle }}单</div>
       </flexbox>
     </flexbox>
@@ -138,9 +138,9 @@ export default {
     this.getBusinessStatusList()
   },
   methods: {
-    pushView() {
-      this.$router.push('/crm/business')
-    },
+    // pushView() {
+    //   this.$router.push('/crm/business')
+    // },
     initChart() {
       this.chartObj = echarts.init(document.getElementById('sales-funnel'))
       this.chartObj.setOption(this.chartOption, true)
@@ -148,10 +148,14 @@ export default {
         this.$emit('chart-click', params, this.dataList[params.dataIndex])
       })
     },
-    // getView() {
-    //   console.log('aa' + this.dataList)
-    //   this.$emit('chart-click', [], this.dataList[1])
-    // },
+    getWin() {
+      console.log('aa' + this.dataList)
+      this.$emit('chart-click', [], this.dataList[4])
+    },
+    getLose() {
+      console.log('aa' + this.dataList)
+      this.$emit('chart-click', [], this.dataList[5])
+    },
     /**
      * 获取统计数据
      */