Merge branch 'orangeUrgent' into allTestUrgent

src/HDrpManagement/projectData/index.vue

@@ -172,6 +172,9 @@
                           end-placeholder="结束月份">
                       </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>
@@ -302,6 +305,9 @@
                           end-placeholder="结束月份">
                       </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>
@@ -398,6 +404,9 @@
                       </el-option>
                     </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>
+                  </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>
                   </div>
@@ -768,6 +777,9 @@
                           end-placeholder="结束月份">
                       </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>
@@ -896,6 +908,9 @@
                           end-placeholder="结束月份">
                       </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>
@@ -1024,6 +1039,9 @@
                           end-placeholder="结束月份">
                       </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>
@@ -1152,6 +1170,9 @@
                           end-placeholder="结束月份">
                       </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>
@@ -1268,6 +1289,9 @@
                           @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>
@@ -1500,7 +1524,8 @@ export default {
           "where":{
               "projecttype":"",
               "begdate":"",
-              "enddate":""
+              "enddate":"",
+              "unfinish":'0'
           }
         }
       },
@@ -1519,7 +1544,8 @@ export default {
               // "istask":"",// 有评估记录 无评估记录  ------ 项目评估情况统计列表使用该字段
               "projecttype":"",//   项目类型分析统计列表使用该最低端
               "begdate":"",
-              "enddate":""
+              "enddate":"",
+              "unfinish":'0'
           }
         }
       },
@@ -1539,7 +1565,8 @@ export default {
           "where":{
               "grade":"",
               "begdate":"",
-              "enddate":""
+              "enddate":"",
+              "unfinish":'0'
           }
         }
       },
@@ -1553,7 +1580,8 @@ export default {
           "where": {
               "grade": "", //  项目等级统计列表使用该字段
               "begdate":"",
-              "enddate":""
+              "enddate":"",
+              "unfinish":'0'
           }
         }
       },
@@ -1568,6 +1596,9 @@ export default {
           "type": '',
           "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
+          "where":{
+            "unfinish":'0'
+          }
         }
       },
       scoreTableParam1:{
@@ -1578,7 +1609,8 @@ export default {
           "occupancyratio":"",
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "where":{
-              "taskType":""
+              "taskType":"",
+              "unfinish":'0'
           },
           "pageSize":20,
           "pageNumber":1
@@ -1657,7 +1689,8 @@ export default {
           "where":{
               "grade":"",
               "begdate":"",
-              "enddate":""
+              "enddate":"",
+              "unfinish":'0'
           }
         }
       },
@@ -1671,7 +1704,8 @@ export default {
           "where": {
               "isfollowup": "", // 有跟进 无跟进 ------项目跟进情况统计列表使用该字段
               "begdate":"",
-              "enddate":""
+              "enddate":"",
+              "unfinish":'0'
           }
         }
       },
@@ -1691,7 +1725,8 @@ export default {
           "where":{
               "grade":"",
               "begdate":"",
-              "enddate":""
+              "enddate":"",
+              "unfinish":'0'
           }
         }
       },
@@ -1705,7 +1740,8 @@ export default {
           "where": {
               "iscontacts": "", //无联系人 有联系人  ------项目联系人情况统计列表使用该字段
               "begdate":"",
-              "enddate":""
+              "enddate":"",
+              "unfinish":'0'
           }
         }
       },
@@ -1725,7 +1761,8 @@ export default {
           "where":{
               "iscustomers":"",
               "begdate":"",
-              "enddate":""
+              "enddate":"",
+              "unfinish":'0'
           }
         }
       },
@@ -1739,7 +1776,8 @@ export default {
           "where": {
               "iscustomers": "", //无关联客户 有关联客户  ------项目关联客户情况统计列表使用该字段
               "begdate":"",
-              "enddate":""
+              "enddate":"",
+              "unfinish":'0'
           }
         }
       },
@@ -1759,7 +1797,8 @@ export default {
           "where":{
               "istask":"",
               "begdate":"",
-              "enddate":""
+              "enddate":"",
+              "unfinish":'0'
           }
         }
       },
@@ -1773,7 +1812,8 @@ export default {
           "where": {
               "istask":"",// 有评估记录 无评估记录  ------ 项目评估情况统计列表使用该字段
               "begdate":"",
-              "enddate":""
+              "enddate":"",
+              "unfinish":'0'
           }
         }
       },
@@ -1790,7 +1830,8 @@ export default {
             "dataid": '',
             "enddate":new Date().getFullYear() + '-' + (new Date().getMonth() + 1)  + '-' + new Date().getDate(),
             "where": {
-                "projecttype":""
+                "projecttype":"",
+                "unfinish":'0'
             }
         }
       },
@@ -1803,7 +1844,8 @@ export default {
           "enddate":new Date().getFullYear() + '-' + (new Date().getMonth() + 1)  + '-' + new Date().getDate(),
           "where": {
               "projecttype":"",
-              "dateType":""
+              "dateType":"",
+              "unfinish":'0'
           }
         }
       },

src/views/salesData/components/boxLine.vue

@@ -29,37 +29,37 @@
               <span v-else>{{tool.formatAmount(list.amount/10000,2)}}</span>
 
             <p class="box-title" style="color: #929292" v-if="list.tbxsje > 0">
-              <span v-if="param.content.dateType == '本年'">年同比</span>
+              <span v-if="param.content.dateType == '本年' || param.content.dateType == '去年'">年同比</span>
               <span v-else-if="param.content.dateType == '本季'">季同比</span>
               <span v-else-if="param.content.dateType == '本月'">月同比</span>
               <i class="el-icon-caret-top" style="color: #2ad72a"></i><span class="box-size-color">{{Math.round((list.tbxsje * 100)*100)/100}}%</span>
             </p>
             <p class="box-title" style="color: #929292" v-if="list.tbxsje == 0">
-              <span v-if="param.content.dateType == '本年'">年同比</span>
+              <span v-if="param.content.dateType == '本年' || param.content.dateType == '去年'">年同比</span>
               <span v-else-if="param.content.dateType == '本季'">季同比</span>
               <span v-else-if="param.content.dateType == '本月'">月同比</span>
               <span class="box-size-color" style="margin-left: 10px">{{Math.round((list.tbxsje * 100)*100)/100}}%</span>
             </p>
             <p class="box-title" style="color: #929292" v-if="list.tbxsje < 0">
-              <span v-if="param.content.dateType == '本年'">年同比</span>
+              <span v-if="param.content.dateType == '本年' || param.content.dateType == '去年'">年同比</span>
               <span v-else-if="param.content.dateType == '本季'">季同比</span>
               <span v-else-if="param.content.dateType == '本月'">月同比</span>
               <i class="el-icon-caret-bottom" style="color: red"></i><span class="box-size-color">{{Math.round((list.tbxsje * 100)*100)/100}}%</span>
             </p>
             <p class="box-title" style="color: #929292" v-if="list.hbxsje > 0">
-              <span v-if="param.content.dateType == '本年'">年环比</span>
+              <span v-if="param.content.dateType == '本年' || param.content.dateType == '去年'">年环比</span>
               <span v-else-if="param.content.dateType == '本季'">季环比</span>
               <span v-else-if="param.content.dateType == '本月'">月环比</span>
               <i class="el-icon-caret-top" style="color: #2ad72a"></i><span class="box-size-color">{{Math.round((list.hbxsje * 100)*100)/100}}%</span>
             </p>
             <p class="box-title" style="color: #929292" v-if="list.hbxsje == 0">
-              <span v-if="param.content.dateType == '本年'">年环比</span>
+              <span v-if="param.content.dateType == '本年' || param.content.dateType == '去年'">年环比</span>
               <span v-else-if="param.content.dateType == '本季'">季环比</span>
               <span v-else-if="param.content.dateType == '本月'">月环比</span>
               <span class="box-size-color" style="margin-left: 10px">{{Math.round((list.hbxsje * 100)*100)/100}}%</span>
             </p>
             <p class="box-title" style="color: #929292" v-if="list.hbxsje < 0">
-              <span v-if="param.content.dateType == '本年'">年环比</span>
+              <span v-if="param.content.dateType == '本年' || param.content.dateType == '去年'">年环比</span>
               <span v-else-if="param.content.dateType == '本季'">季环比</span>
               <span v-else-if="param.content.dateType == '本月'">月环比</span>
               <i class="el-icon-caret-bottom" style="color: red"></i><span class="box-size-color">{{Math.round((list.hbxsje * 100)*100)/100}}%</span>
@@ -120,7 +120,7 @@ export default {
         "content": {
           "type": 1, // 0人员 1部门
           "dataid": 103,
-          "dateType":"本年",// 本年 本季 本月
+          "dateType":"去年",// 本年 本季 本月
           "datatype":2,// 1-订单 2-出货 3-开票 4-回款
         }
       },

src/views/salesData/modules/digitalSigns.vue

@@ -4,6 +4,7 @@
       <div class="div-line"></div>
       <div class="title">销售面板</div>
       <el-button-group class="container">
+        <el-button :type="dataType === '去年'?'primary':''" @click="onChange('去年')" size="small">去年</el-button>
         <el-button :type="dataType === '本年'?'primary':''" @click="onChange('本年')" size="small">本年</el-button>
         <el-button :type="dataType === '本季'?'primary':''" @click="onChange('本季')" size="small">本季</el-button>
         <el-button :type="dataType === '本月'?'primary':''" @click="onChange('本月')" size="small">本月</el-button>
@@ -26,7 +27,7 @@ export default {
   props:['windowWidth'],
   data(){
     return {
-      dataType:'本年',
+      dataType:'去年',
 
     }
   },
@@ -53,6 +54,16 @@ export default {
         this.$refs.invoicing.listData()
         this.$refs.returned.param.content.dateType = '本季'
         this.$refs.returned.listData()
+      }else if (val === '去年'){
+        this.dataType = '去年'
+        this.$refs.order.param.content.dateType = '去年'
+        this.$refs.order.listData()
+        this.$refs.shipment.param.content.dateType = '去年'
+        this.$refs.shipment.listData()
+        this.$refs.invoicing.param.content.dateType = '去年'
+        this.$refs.invoicing.listData()
+        this.$refs.returned.param.content.dateType = '去年'
+        this.$refs.returned.listData()
       }else {
         this.dataType = '本月'
         this.$refs.order.param.content.dateType = '本月'