销售漏斗，项目预计成交分析新增"包含失败、结案项目”查询条件

src/views/mediaStatistics/modules/futureTwelveMonths.vue

@@ -2,16 +2,21 @@
   <div>
     <boxBorder title="未来12月项目预计签约金额/预计成交金额分析" class1="20px 20px" :height="height + 'px'" :titleTip="true">
       <template slot="select">
-        <div>
-          <label class="search__label">{{$t(`项目阶段`)}}：</label>
-          <el-select ref="selectRef" v-model="stagename" multiple :placeholder="$t(`请选择`)"  size="small" @focus="getStage" @change="selectStage"  filterable >
-            <el-option
-                v-for="item in stagenameList"
-                :key="item.stagename"
-                :label="item.stagename"
-                :value="item.stagename">
-            </el-option>
-          </el-select>
+        <div style="display: flex;justify-content: left">
+          <div class="inline-16" style="margin-top: 2px">
+            <el-checkbox v-model="unfinish" true-label="0" false-label="1" @change="onCheck">{{$t(`包含失败、结案项目`)}}</el-checkbox>
+          </div>
+          <div class="inline-16">
+            <label class="search__label">{{$t(`项目阶段`)}}：</label>
+            <el-select ref="selectRef" v-model="stagename" multiple :placeholder="$t(`请选择`)"  size="small" @focus="getStage" @change="selectStage"  filterable >
+              <el-option
+                  v-for="item in stagenameList"
+                  :key="item.stagename"
+                  :label="item.stagename"
+                  :value="item.stagename">
+              </el-option>
+            </el-select>
+          </div>
         </div>
       </template>
       <template slot="content">
@@ -81,7 +86,8 @@ export default {
       stagename:[],
       stagenameList:[],
       selectHeight:null,
-      height:282
+      height:282,
+      unfinish:"1"
     }
   },
   methods:{
@@ -180,6 +186,9 @@ export default {
       this.$emit('selectStage',this.stagename)
 
     },
+    onCheck(){
+      this.$emit('onCheck',this.unfinish)
+    }
   },
 }
 </script>

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -95,7 +95,7 @@
     <div v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
       <p class="title">{{$t(`项目预计成交分析`)}}</p>
       <previousTwelveMonths :data="previousData"></previousTwelveMonths>
-      <futureTwelveMonths ref="futureTwelveMonthsRef" style="margin-top: 15px" @selectStage="selectStage" :dataBoxData="dataBoxData" @clickChart="clickChart"></futureTwelveMonths>
+      <futureTwelveMonths ref="futureTwelveMonthsRef" style="margin-top: 15px" @selectStage="selectStage" :dataBoxData="dataBoxData" @clickChart="clickChart" @onCheck="onCheck"></futureTwelveMonths>
     </div>
     <div style="margin-top: 40px">
       <p class="title">{{projectTile}}</p>
@@ -266,6 +266,7 @@ export default {
           "where": {
             "tradefield": "",
             "isleave":"",
+            "unfinish":'1'
           }
         }
       },
@@ -964,6 +965,10 @@ export default {
       this.transactionParam.content.stagename = val
       this.expectedTransaction(false)
     },
+    onCheck(val){
+      this.transactionParam.content.where.unfinish = val
+      this.expectedTransaction(false)
+    },
     clickChart(date){
       this.transactionParam.content.signdate_due = date
       this.queryProject(date)