Merge branch 'orangeUrgent' into testBranch

src/HDrpManagement/projectData/index.vue

@@ -207,6 +207,17 @@
                         <el-option :label="$t('离职')" value="2"></el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">{{$t('项目状态')}}:</p>
+                      <el-select size="small" v-model="typeMapParam.content.where.status" multiple filterable placeholder="请选择" @change="typeTableParam.content.where.status = typeMapParam.content.where.status;typeTableParam.content.pageNumber = 1;$refs.typeTable.listData();typeInit()">
+                        <el-option
+                            v-for="item in option.statusTab"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                        </el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-16">
                       <el-button-group>
                         <el-button :type="typeTableParam.content.dateType === '全部'?'primary':''" size="small" @click="typeMapParam.content.dateType = '全部';typeTableParam.content.dateType = '全部';
@@ -249,9 +260,6 @@
                           :end-placeholder="$t('结束月份')">
                       </el-date-picker>
                     </div>
-                    <div class="mt-10 inline-16">
-                      <el-checkbox true-label="0" false-label="1" v-model="typeMapParam.content.where.unfinish" @change="typeTableParam.content.where.unfinish = typeMapParam.content.where.unfinish;typeTableParam.content.pageNumber = 1;$refs.typeTable.listData();typeInit()">包含失败、结案项目</el-checkbox>
-                    </div>
                     <div class="mt-10 inline-15">
                       <exportFile  :param="typeTableParam" :columns="tool.tabelCol($route.name).projectTable.tablecols" fileName="项目类型分析" :dataid="typeMapParam.content.dataid"></exportFile>
                     </div>
@@ -347,6 +355,17 @@
                         <el-option :label="$t('离职')" value="2"></el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">{{$t('项目状态')}}:</p>
+                      <el-select size="small" v-model="gradMapParam.content.where.status" multiple filterable placeholder="请选择" @change="gradTableParam.content.where.status = gradMapParam.content.where.status;gradTableParam.content.pageNumber = 1;$refs.gradTable.listData();gradInit()">
+                        <el-option
+                            v-for="item in option.statusTab"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                        </el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-16">
                       <el-button-group>
                         <el-button :type="gradTableParam.content.dateType === '全部'?'primary':''" size="small" @click="gradMapParam.content.dateType = '全部';gradTableParam.content.dateType = '全部';
@@ -389,9 +408,6 @@
                           :end-placeholder="$t('结束月份')">
                       </el-date-picker>
                     </div>
-                    <div class="mt-10 inline-16">
-                      <el-checkbox true-label="0" false-label="1" v-model="gradMapParam.content.where.unfinish" @change="gradTableParam.content.where.unfinish = gradMapParam.content.where.unfinish;gradTableParam.content.pageNumber = 1;$refs.gradTable.listData();gradInit()">包含失败、结案项目</el-checkbox>
-                    </div>
                     <div class="mt-10 inline-15">
                       <exportFile  :param="gradTableParam" :columns="tool.tabelCol($route.name).projectTable.tablecols" fileName="项目等级分析" :dataid="gradMapParam.content.dataid"></exportFile>
                     </div>
@@ -496,7 +512,15 @@
                     </el-select>
                   </div>
                   <div class="mt-10 inline-16">
-                    <el-checkbox true-label="0" false-label="1" v-model="scoreMapParam1.content.where.unfinish" @change="scoreTableParam1.content.where.unfinish = scoreMapParam1.content.where.unfinish;scoreTableParam1.content.pageNumber = 1;$refs.scoreTable.listData();scoreInit()">包含失败、结案项目</el-checkbox>
+                    <p class="search__label">{{$t('项目状态')}}:</p>
+                    <el-select size="small" v-model="scoreMapParam1.content.where.status" multiple filterable placeholder="请选择" @change="scoreTableParam1.content.where.status = scoreMapParam1.content.where.status;scoreTableParam1.content.pageNumber = 1;$refs.scoreTable.listData();scoreInit()">
+                      <el-option
+                          v-for="item in option.statusTab"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                      </el-option>
+                    </el-select>
                   </div>
                   <div class="mt-10 inline-15">
                     <exportFile  :param="scoreTableParam1" :columns="tool.tabelCol($route.name).projectTable2.tablecols.splice(0,tool.tabelCol($route.name).projectTable2.tablecols.length - 1)" fileName="项目评估分析" :dataid="scoreMapParam1.content.dataid"></exportFile>
@@ -861,6 +885,17 @@
                         <el-option :label="$t('离职')" value="2"></el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">{{$t('项目状态')}}:</p>
+                      <el-select size="small" v-model="fllowMapParam.content.where.status" multiple filterable placeholder="请选择" @change="fllowTableParam.content.where.status = fllowMapParam.content.where.status;fllowTableParam.content.pageNumber = 1;$refs.projectFllowTable.listData();fllowInit()">
+                        <el-option
+                            v-for="item in option.statusTab"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                        </el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-16">
                       <el-button-group>
                         <el-button :type="fllowTableParam.content.dateType === '全部'?'primary':''" size="small" @click="fllowMapParam.content.dateType = '全部';fllowTableParam.content.dateType = '全部';
@@ -903,9 +938,6 @@
                           :end-placeholder="$t('结束月份')">
                       </el-date-picker>
                     </div>
-                    <div class="mt-10 inline-16">
-                      <el-checkbox true-label="0" false-label="1" v-model="fllowMapParam.content.where.unfinish" @change="fllowTableParam.content.where.unfinish = fllowMapParam.content.where.unfinish;fllowTableParam.content.pageNumber = 1;$refs.projectFllowTable.listData();fllowInit()">包含失败、结案项目</el-checkbox>
-                    </div>
                     <div class="mt-10 inline-15">
                       <exportFile :param="fllowTableParam" :columns="tool.tabelCol($route.name).projectTable.tablecols" fileName="项目跟进情况统计" :dataid="fllowMapParam.content.dataid"></exportFile>
                     </div>
@@ -999,6 +1031,17 @@
                         <el-option :label="$t('离职')" value="2"></el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">{{$t('项目状态')}}:</p>
+                      <el-select size="small" v-model="contactMapParam.content.where.status" multiple filterable placeholder="请选择" @change="contactTableParam.content.where.status = contactMapParam.content.where.status;contactTableParam.content.pageNumber = 1;$refs.projectContactTable.listData();contactInit()">
+                        <el-option
+                            v-for="item in option.statusTab"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                        </el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-16">
                       <el-button-group>
                         <el-button :type="contactTableParam.content.dateType === '全部'?'primary':''" size="small" @click="contactMapParam.content.dateType = '全部';contactTableParam.content.dateType = '全部';
@@ -1041,9 +1084,6 @@
                           :end-placeholder="$t('结束月份')">
                       </el-date-picker>
                     </div>
-                    <div class="mt-10 inline-16">
-                      <el-checkbox true-label="0" false-label="1" v-model="contactMapParam.content.where.unfinish" @change="contactTableParam.content.where.unfinish = contactMapParam.content.where.unfinish;contactTableParam.content.pageNumber = 1;$refs.projectContactTable.listData();contactInit()">包含失败、结案项目</el-checkbox>
-                    </div>
                     <div class="mt-10 inline-15">
                       <exportFile  :param="contactTableParam" :columns="tool.tabelCol($route.name).projectTable.tablecols" fileName="项目联系人情况统计" :dataid="contactMapParam.content.dataid"></exportFile>
                     </div>
@@ -1137,6 +1177,17 @@
                         <el-option :label="$t('离职')" value="2"></el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">{{$t('项目状态')}}:</p>
+                      <el-select size="small" v-model="customerMapParam.content.where.status" multiple filterable placeholder="请选择" @change="customerTableParam.content.where.status = customerMapParam.content.where.status;customerTableParam.content.pageNumber = 1;$refs.projectCustomerTable.listData();customerInit()">
+                        <el-option
+                            v-for="item in option.statusTab"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                        </el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-16">
                       <el-button-group>
                         <el-button :type="customerTableParam.content.dateType === '全部'?'primary':''" size="small" @click="customerMapParam.content.dateType = '全部';customerTableParam.content.dateType = '全部';
@@ -1179,9 +1230,6 @@
                           :end-placeholder="$t('结束月份')">
                       </el-date-picker>
                     </div>
-                    <div class="mt-10 inline-16">
-                      <el-checkbox true-label="0" false-label="1" v-model="customerMapParam.content.where.unfinish" @change="customerTableParam.content.where.unfinish = customerMapParam.content.where.unfinish;customerTableParam.content.pageNumber = 1;$refs.projectCustomerTable.listData();customerInit()">包含失败、结案项目</el-checkbox>
-                    </div>
                     <div class="mt-10 inline-15">
                       <exportFile  :param="customerTableParam" :columns="tool.tabelCol($route.name).projectTable.tablecols" fileName="项目关联客户情况统计" :dataid="customerMapParam.content.dataid"></exportFile>
                     </div>
@@ -1275,6 +1323,17 @@
                         <el-option :label="$t('离职')" value="2"></el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">{{$t('项目状态')}}:</p>
+                      <el-select size="small" v-model="scoreMapParam.content.where.status" multiple filterable placeholder="请选择" @change="scoreTableParam.content.where.status = scoreMapParam.content.where.status;scoreTableParam.content.pageNumber = 1;$refs.projectScoreTable.listData();projectScoreInit()">
+                        <el-option
+                            v-for="item in option.statusTab"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                        </el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-16">
                       <el-button-group>
                         <el-button :type="scoreTableParam.content.dateType === '全部'?'primary':''" size="small" @click="scoreMapParam.content.dateType = '全部';scoreTableParam.content.dateType = '全部';
@@ -1317,9 +1376,6 @@
                           :end-placeholder="$t('结束月份')">
                       </el-date-picker>
                     </div>
-                    <div class="mt-10 inline-16">
-                      <el-checkbox true-label="0" false-label="1" v-model="scoreMapParam.content.where.unfinish" @change="scoreTableParam.content.where.unfinish = scoreMapParam.content.where.unfinish;scoreTableParam.content.pageNumber = 1;$refs.projectScoreTable.listData();projectScoreInit()">包含失败、结案项目</el-checkbox>
-                    </div>
                     <div class="mt-10 inline-15">
                       <exportFile  :param="scoreTableParam" :columns="tool.tabelCol($route.name).projectTable.tablecols" fileName="项目评估情况统计" :dataid="scoreMapParam.content.dataid"></exportFile>
                     </div>
@@ -1430,6 +1486,17 @@
                         </el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">{{$t('项目状态')}}:</p>
+                      <el-select size="small" v-model="unfllowMapParam.content.where.status" multiple filterable placeholder="请选择" @change="unfllowTableParam.content.where.status = unfllowMapParam.content.where.status;unfllowTableParam.content.pageNumber = 1;customerUnfllowInit();$refs.customerUnfllowTable.listData()">
+                        <el-option
+                            v-for="item in option.statusTab"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                        </el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-16">
                       <label  class="search__label" >{{$t('分析日期')}}:</label>
                       <el-date-picker
@@ -1443,9 +1510,6 @@
                           @change="unfllowTableParam.content.enddate=unfllowMapParam.content.enddate;unfllowTableParam.content.pageNumber = 1;customerUnfllowInit();$refs.customerUnfllowTable.listData()">
                       </el-date-picker>
                     </div>
-                    <div class="mt-10 inline-16">
-                      <el-checkbox true-label="0" false-label="1" v-model="unfllowMapParam.content.where.unfinish" @change="unfllowTableParam.content.where.unfinish = unfllowMapParam.content.where.unfinish;unfllowTableParam.content.pageNumber = 1;customerUnfllowInit();$refs.customerUnfllowTable.listData()">包含失败、结案项目</el-checkbox>
-                    </div>
                     <div class="mt-10 inline-15">
                       <exportFile  :param="unfllowTableParam" :columns="tool.tabelCol($route.name).projectTable1.tablecols.splice(0,tool.tabelCol($route.name).projectTable1.tablecols.length - 1)" fileName="有效项目未跟进天数分析" :dataid="unfllowMapParam.content.dataid"></exportFile>
                     </div>