Merge branch 'redUrgent' into testToMerge

src/HDrpManagement/dataanalysis/components/quickDate.vue

@@ -1,11 +1,18 @@
 <template>
   <div>
-    <el-button-group size="small" class="inline-24">
-      <el-button :type="select === '日'?'primary':''" size="small" @click="selectQuick(1)" :disabled="disabled">{{$t(`日`)}}</el-button>
-      <el-button :type="select === '周'?'primary':''" size="small" @click="selectQuick(2)" :disabled="disabled">{{$t(`周`)}}</el-button>
-      <el-button :type="select === '月'?'primary':''" size="small" @click="selectQuick(3)" :disabled="disabled">{{$t(`月`)}}</el-button>
-      <el-button :type="select === '年'?'primary':''" size="small" @click="selectQuick(4)" :disabled="disabled">{{$t(`年`)}}</el-button>
+    <el-button-group size="small" class="inline-24" >
+      <el-button :type="select === '上月'?'primary':''" size="small" @click="selectQuick(5)" :disabled="disabled">{{$t(`上月`)}}</el-button>
+      <el-button :type="select === '日'?'primary':''" size="small" @click="selectQuick(1)" :disabled="disabled">{{$t(`本日`)}}</el-button>
+      <el-button :type="select === '周'?'primary':''" size="small" @click="selectQuick(2)" :disabled="disabled">{{$t(`本周`)}}</el-button>
+      <el-button :type="select === '月'?'primary':''" size="small" @click="selectQuick(3)" :disabled="disabled">{{$t(`本月`)}}</el-button>
+      <el-button :type="select === '年'?'primary':''" size="small" @click="selectQuick(4)" :disabled="disabled">{{$t(`本年`)}}</el-button>
     </el-button-group>
+<!--    <el-button-group size="small" class="inline-24" v-else>-->
+<!--      <el-button :type="select === '日'?'primary':''" size="small" @click="selectQuick(1)" :disabled="disabled">{{$t(`日`)}}</el-button>-->
+<!--      <el-button :type="select === '周'?'primary':''" size="small" @click="selectQuick(2)" :disabled="disabled">{{$t(`周`)}}</el-button>-->
+<!--      <el-button :type="select === '月'?'primary':''" size="small" @click="selectQuick(3)" :disabled="disabled">{{$t(`月`)}}</el-button>-->
+<!--      <el-button :type="select === '年'?'primary':''" size="small" @click="selectQuick(4)" :disabled="disabled">{{$t(`年`)}}</el-button>-->
+<!--    </el-button-group>-->
     <span style="font-size: 13px">{{$t(`时间`)}}：</span>
     <el-date-picker
         value-format="yyyy-MM-dd"
@@ -65,11 +72,35 @@ export default {
         this.select = '年'
         this.getYear('s')
         this.getYear('e')
+      }else if (val === 5){
+        this.select = '上月'
+        this.getMonthLast('s')
+        this.getMonthLast('e')
       }else {
         this.select = ''
       }
       this.$emit('selectQuick',this.begindate,this.enddate,this.select)
     },
+    selectData(val){
+      if (val === 2){
+        this.select = '周'
+        this.getMonday('s')
+        this.getMonday('e')
+        // this.updateCurrentWeek()
+      }else if (val === 3){
+        this.select = '月'
+        this.getMonth('s')
+        this.getMonth('e')
+      }else if (val === 4){
+        this.select = '年'
+        this.getYear('s')
+        this.getYear('e')
+      }else if (val === 5){
+        this.select = '上月'
+        this.getMonthLast('s')
+        this.getMonthLast('e')
+      }
+    },
     getMonday(type, dates) {
       var now = new Date()
       var nowTime = now.getTime()
@@ -121,6 +152,36 @@ export default {
       }
       this.value = [this.begindate,this.enddate]
     },
+    getMonthLast(type, months) {
+      var d = new Date();
+      var year = d.getFullYear()
+      var month = d.getMonth()
+      month = month < 10 ? "0" + month: month
+      var date = d.getDate();
+      var firstday = year + "-" + month + "-" + "01"
+      var lastday = ""
+      if (month == "01" || month == "03" || month == "05" || month == "07" || month == "08" || month == "10" || month == "12") {
+        lastday = year + "-" + month + "-" + 31
+      } else if (month == "02") {
+        if ((year % 4 == 0 && year % 100 != 0) || (year % 100 == 0 && year % 400 == 0)) {
+          lastday = year + "-" + month + "-" + 29
+        } else {
+          lastday = year + "-" + month + "-" + 28
+        }
+      } else {
+        lastday = year + "-" + month + "-" + 30
+      }
+      var day = ""
+      if (type == "s") {
+        day = firstday
+        this.begindate = firstday
+      } else {
+        day = lastday
+        this.enddate = lastday
+      }
+      this.value = [this.begindate,this.enddate]
+      console.log(this.value,'111111')
+    },
     getYear(type, dates) {
       var dd = new Date()
       var n = dates || 0

src/HDrpManagement/dataanalysis/index.vue

@@ -286,42 +286,49 @@ export default {
         this.$refs.documents.queryContract()
       }
     },
-    clickFull(type,time){
+    clickFull(type,time,val){
+      console.log(val,'3333val99999')
       if (type == '新增线索'){
         this.tabName = '线索'
         this.$refs.clue.disabled = true
         this.$refs.clue.selectAdd = time
         this.$refs.clue.$refs.quickAdd.select = time
+        this.$refs.clue.$refs.quickAdd.selectData(val)
         this.$refs.clue.$refs.addFullRef.enterFullscreen()
       }else if (type == '跟进线索'){
         this.tabName = '线索'
         this.$refs.clue.disabled = true
         this.$refs.clue.selectFow = time
         this.$refs.clue.$refs.quickFow.select = time
+        this.$refs.clue.$refs.quickFow.selectData(val)
         this.$refs.clue.$refs.fowFullRef.enterFullscreen()
       }else if (type == '新增客户'){
         this.tabName = '客户'
         this.$refs.customer.disabled = true
         this.$refs.customer.selectAdd = time
         this.$refs.customer.$refs.quickAdd.select = time
+        this.$refs.customer.$refs.quickAdd.selectData(val)
         this.$refs.customer.$refs.addFullRef.enterFullscreen()
       }else if (type == '客户跟进'){
         this.tabName = '客户'
         this.$refs.customer.disabled = true
         this.$refs.customer.selectFow = time
         this.$refs.customer.$refs.quickFow.select = time
+        this.$refs.customer.$refs.quickFow.selectData(val)
         this.$refs.customer.$refs.fowFullRef.enterFullscreen()
       }else if (type == '新增项目'){
         this.tabName = '项目商机'
         this.$refs.project.disabled = true
         this.$refs.project.selectAdd = time
         this.$refs.project.$refs.quickAdd.select = time
+        this.$refs.project.$refs.quickAdd.selectData(val)
         this.$refs.project.$refs.addFullRef.enterFullscreen()
       }else if (type == '项目跟进'){
         this.tabName = '项目商机'
         this.$refs.project.disabled = true
         this.$refs.project.selectFow = time
         this.$refs.project.$refs.quickFow.select = time
+        this.$refs.project.$refs.quickFow.selectData(val)
         this.$refs.project.$refs.fowFullRef.enterFullscreen()
       }
 

src/HDrpManagement/dataanalysis/modules/assignmentData.vue

@@ -13,37 +13,37 @@
             </el-row>
             <el-row :gutter="20" class="content-title">
               <el-col :span="4" class="titleHover" >
-                <div @click="onClick('新增线索','周')">
+                <div @click="onClick('新增线索','周',2)">
                   <div>{{$t(`新增线索`)}}</div>
                   <div class="title-font" style="color: #3874F6">{{list.bzxsxz}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div  @click="onClick('跟进线索','周')">
+                <div  @click="onClick('跟进线索','周',2)">
                   <div>{{$t(`跟进线索`)}}</div>
                   <div class="title-font" style="color: #16BDFF">{{list.bzxsgj}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('新增客户','周')">
+                <div @click="onClick('新增客户','周',2)">
                   <div>{{$t(`新增客户`)}}</div>
                   <div class="title-font" style="color: #3874F6">{{list.bzkhxz}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('客户跟进','周')">
+                <div @click="onClick('客户跟进','周',2)">
                   <div>{{$t(`客户跟进`)}}</div>
                   <div class="title-font" style="color: #16BDFF">{{list.bzkhgj}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('新增项目','周')">
+                <div @click="onClick('新增项目','周',2)">
                   <div>{{$t(`新增项目`)}}</div>
                   <div class="title-font" style="color: #F09E00">{{list.bzxmxz}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('项目跟进','周')">
+                <div @click="onClick('项目跟进','周',2)">
                   <div>{{$t(`项目跟进`)}}</div>
                   <div class="title-font" style="color: #FF7602">{{list.bzxmgj}}</div>
                 </div>
@@ -64,37 +64,37 @@
             </el-row>
             <el-row :gutter="20" class="content-title">
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('新增线索','月')">
+                <div @click="onClick('新增线索','月',3)">
                   <div>{{$t(`新增线索`)}}</div>
                   <div class="title-font" style="color: #3874F6">{{list.byxsxz}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div  @click="onClick('跟进线索','月')">
+                <div  @click="onClick('跟进线索','月',3)">
                   <div>{{$t(`跟进线索`)}}</div>
                   <div class="title-font" style="color: #16BDFF">{{list.byxsgj}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('新增客户','月')">
+                <div @click="onClick('新增客户','月',3)">
                   <div>{{$t(`新增客户`)}}</div>
                   <div class="title-font" style="color: #3874F6">{{list.bykhxz}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('客户跟进','月')">
+                <div @click="onClick('客户跟进','月',3)">
                   <div>{{$t(`客户跟进`)}}</div>
                   <div class="title-font" style="color: #16BDFF">{{list.bykhgj}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div  @click="onClick('新增项目','月')">
+                <div  @click="onClick('新增项目','月',3)">
                   <div>{{$t(`新增项目`)}}</div>
                   <div class="title-font" style="color: #F09E00">{{list.byxmxz}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('项目跟进','月')">
+                <div @click="onClick('项目跟进','月',3)">
                   <div>{{$t(`项目跟进`)}}</div>
                   <div class="title-font" style="color: #FF7602">{{list.byxmgj}}</div>
                 </div>
@@ -115,37 +115,37 @@
             </el-row>
             <el-row :gutter="20" class="content-title">
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('新增线索','年')">
+                <div @click="onClick('新增线索','年',4)">
                   <div>{{$t(`新增线索`)}}</div>
                   <div class="title-font" style="color: #3874F6">{{list.bnxsxz}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('跟进线索','年')">
+                <div @click="onClick('跟进线索','年',4)">
                   <div>{{$t(`跟进线索`)}}</div>
                   <div class="title-font" style="color: #16BDFF">{{list.bnxsgj}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('新增客户','年')">
+                <div @click="onClick('新增客户','年',4)">
                   <div>{{$t(`新增客户`)}}</div>
                   <div class="title-font" style="color: #3874F6">{{list.bnkhxz}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('客户跟进','年')">
+                <div @click="onClick('客户跟进','年',4)">
                   <div>{{$t(`客户跟进`)}}</div>
                   <div class="title-font" style="color: #16BDFF">{{list.bnkhgj}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('新增项目','年')">
+                <div @click="onClick('新增项目','年',4)">
                   <div>{{$t(`新增项目`)}}</div>
                   <div class="title-font" style="color: #F09E00">{{list.bnxmxz}}</div>
                 </div>
               </el-col>
               <el-col :span="4" class="titleHover">
-                <div @click="onClick('项目跟进','年')">
+                <div @click="onClick('项目跟进','年',4)">
                   <div>{{$t(`项目跟进`)}}</div>
                   <div class="title-font" style="color: #FF7602">{{list.bnxmgj}}</div>
                 </div>
@@ -154,6 +154,57 @@
           </template>
         </borderTemp>
       </el-col>
+      <el-col style="margin-bottom: 20px" :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
+        <borderTemp>
+          <template #content>
+            <el-row>
+              <el-col :span="10" :offset="6">
+                <el-divider>
+                  <span class="title-font">{{$t(`上月`)}}</span>
+                </el-divider>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20" class="content-title">
+              <el-col :span="4" class="titleHover">
+                <div @click="onClick('新增线索','上月',5)">
+                  <div>{{$t(`新增线索`)}}</div>
+                  <div class="title-font" style="color: #3874F6">{{list.syxsxz}}</div>
+                </div>
+              </el-col>
+              <el-col :span="4" class="titleHover">
+                <div  @click="onClick('跟进线索','上月',5)">
+                  <div>{{$t(`跟进线索`)}}</div>
+                  <div class="title-font" style="color: #16BDFF">{{list.syxsgj}}</div>
+                </div>
+              </el-col>
+              <el-col :span="4" class="titleHover">
+                <div @click="onClick('新增客户','上月',5)">
+                  <div>{{$t(`新增客户`)}}</div>
+                  <div class="title-font" style="color: #3874F6">{{list.sykhxz}}</div>
+                </div>
+              </el-col>
+              <el-col :span="4" class="titleHover">
+                <div @click="onClick('客户跟进','上月',5)">
+                  <div>{{$t(`客户跟进`)}}</div>
+                  <div class="title-font" style="color: #16BDFF">{{list.sykhgj}}</div>
+                </div>
+              </el-col>
+              <el-col :span="4" class="titleHover">
+                <div  @click="onClick('新增项目','上月',5)">
+                  <div>{{$t(`新增项目`)}}</div>
+                  <div class="title-font" style="color: #F09E00">{{list.syxmxz}}</div>
+                </div>
+              </el-col>
+              <el-col :span="4" class="titleHover">
+                <div @click="onClick('项目跟进','上月',5)">
+                  <div>{{$t(`项目跟进`)}}</div>
+                  <div class="title-font" style="color: #FF7602">{{list.syxmgj}}</div>
+                </div>
+              </el-col>
+            </el-row>
+          </template>
+        </borderTemp>
+      </el-col>
     </el-row>
   </div>
 </template>
@@ -179,8 +230,8 @@ export default {
       const res = await this.$api.requested(this.param)
       this.list = res.data
     },
-    onClick(type,time){
-      this.$emit('clickFull',type,time)
+    onClick(type,time,val){
+      this.$emit('clickFull',type,time,val)
     }
   },
    mounted() {

src/HDrpManagement/dataanalysis/modules/clue.vue

@@ -188,11 +188,12 @@ export default {
     }
   },
   methods:{
-    async queryAdd(){
+    async queryAdd(type){
+      this.$refs.quickAdd.select = type?type:this.selectAdd
       this.clueAddParam.content.dataType = 1
       this.clueAddParam.content.where.begindate = this.selectAdd ? '' :this.begindate
       this.clueAddParam.content.where.enddate = this.selectAdd ? '' : this.enddate
-      this.clueAddParam.content.dateType = this.selectAdd
+      this.clueAddParam.content.dateType = type?type:this.selectAdd
       this.clueAddParam.content.dataid = this.dataid
       this.clueAddParam.content.type = this.isDep?1:0
       this.clueAddParam.content.sort = [this.sort[0]]
@@ -211,11 +212,12 @@ export default {
       this.clueAddParam.content.pageNumber = val
       this.queryAdd()
     },
-    async queryUpdate(){
+    async queryUpdate(type){
+      this.$refs.quickUpd.select = type?type:this.selectUpd
       this.clueUpdParam.content.dataType = 2
       this.clueUpdParam.content.where.begindate = this.selectUpd ? '' :this.begindate
       this.clueUpdParam.content.where.enddate = this.selectUpd ? '' : this.enddate
-      this.clueUpdParam.content.dateType = this.selectUpd
+      this.clueUpdParam.content.dateType = type?type:this.selectUpd
       this.clueUpdParam.content.dataid = this.dataid
       this.clueUpdParam.content.type = this.isDep?1:0
       this.clueUpdParam.content.sort = [this.sort[0]]
@@ -234,11 +236,12 @@ export default {
       this.clueUpdParam.content.pageNumber = val
       this.queryUpdate()
     },
-    async queryFollow(){
+    async queryFollow(type){
+      this.$refs.quickFow.select = type?type:this.selectFow
       this.clueFowParam.content.dataType = 3
       this.clueFowParam.content.where.begindate = this.selectFow ? '' :this.begindate
       this.clueFowParam.content.where.enddate = this.selectFow ? '' : this.enddate
-      this.clueFowParam.content.dateType = this.selectFow
+      this.clueFowParam.content.dateType = type?type:this.selectFow
       this.clueFowParam.content.dataid = this.dataid
       this.clueFowParam.content.type = this.isDep?1:0
       this.clueFowParam.content.sort = [this.sort[1]]
@@ -262,19 +265,22 @@ export default {
       this.begindate = begindate
       this.enddate = enddate
       this.selectAdd = select
-      this.queryAdd(this.param.content.pageNumber = 1)
+      this.param.content.pageNumber = 1
+      this.queryAdd()
     },
     selectQuickUpd(begindate,enddate,select){
       this.begindate = begindate
       this.enddate = enddate
       this.selectUpd = select
-      this.queryUpdate(this.param.content.pageNumber = 1)
+      this.param.content.pageNumber = 1
+      this.queryUpdate()
     },
     selectQuickFow(begindate,enddate,select){
       this.begindate = begindate
       this.enddate = enddate
       this.selectFow = select
-      this.queryFollow(this.param.content.pageNumber = 1)
+      this.param.content.pageNumber = 1
+      this.queryFollow()
     },
     /*全屏*/
     onAddFull(){
@@ -311,6 +317,7 @@ export default {
       this.clueUpdParam.content.dataType = 2
       this.clueUpdParam.content.pageNumber = 1
       this.clueUpdParam.content.pageSize = 10
+      this.disabled = false
       this.queryUpdate()
       this.isFull = false
     },
@@ -318,6 +325,7 @@ export default {
       this.clueFowParam.content.dataType = 3
       this.clueFowParam.content.pageNumber = 1
       this.clueFowParam.content.pageSize = 10
+      this.disabled = false
       this.queryFollow()
       this.isFull = false
     }

src/HDrpManagement/dataanalysis/modules/customer.vue

@@ -151,11 +151,12 @@ export default {
     }
   },
   methods:{
-    async queryAdd(){
+    async queryAdd(type){
+      this.$refs.quickAdd.select = type?type:this.selectAdd
       this.param.content.dataType = 4
       this.param.content.where.begindate = this.selectAdd ? '' :this.begindate
       this.param.content.where.enddate = this.selectAdd ? '' : this.enddate
-      this.param.content.dateType = this.selectAdd
+      this.param.content.dateType = type?type:this.selectAdd
       this.param.content.dataid = this.dataid
       this.param.content.type = this.isDep?1:0
       this.param.content.sort = [this.sort[0]]
@@ -174,11 +175,12 @@ export default {
       this.param.content.pageNumber = val
       this.queryAdd()
     },
-    async queryUpdate(){
+    async queryUpdate(type){
+      this.$refs.quickUpd.select = type?type:this.selectUpd
       this.param.content.dataType = 5
       this.param.content.where.begindate = this.selectUpd ? '' :this.begindate
       this.param.content.where.enddate = this.selectUpd ? '' : this.enddate
-      this.param.content.dateType = this.selectUpd
+      this.param.content.dateType = type?type:this.selectUpd
       this.param.content.dataid = this.dataid
       this.param.content.type = this.isDep?1:0
       this.param.content.sort = [this.sort[0]]
@@ -197,11 +199,12 @@ export default {
       this.param.content.pageNumber = val
       this.queryUpdate()
     },
-    async queryFollow(){
+    async queryFollow(type){
+      this.$refs.quickFow.select = type?type:this.selectFow
       this.param.content.dataType = 6
       this.param.content.where.begindate = this.selectFow ? '' :this.begindate
       this.param.content.where.enddate = this.selectFow ? '' : this.enddate
-      this.param.content.dateType = this.selectFow
+      this.param.content.dateType = type?type:this.selectFow
       this.param.content.dataid = this.dataid
       this.param.content.type = this.isDep?1:0
       this.param.content.sort = [this.sort[1]]
@@ -225,19 +228,22 @@ export default {
       this.begindate = begindate
       this.enddate = enddate
       this.selectAdd = select
-      this.queryAdd(this.param.content.pageNumber = 1)
+      this.param.content.pageNumber = 1
+      this.queryAdd()
     },
     selectQuickUpd(begindate,enddate,select){
       this.begindate = begindate
       this.enddate = enddate
       this.selectUpd = select
-      this.queryUpdate(this.param.content.pageNumber = 1)
+      this.param.content.pageNumber = 1
+      this.queryUpdate()
     },
     selectQuickFow(begindate,enddate,select){
       this.begindate = begindate
       this.enddate = enddate
       this.selectFow = select
-      this.queryFollow(this.param.content.pageNumber = 1)
+      this.param.content.pageNumber = 1
+      this.queryFollow()
     },
     onFull(type){
       if (type == '新增'){

src/HDrpManagement/dataanalysis/modules/performanceData.vue

@@ -1233,6 +1233,414 @@
           </el-col>
         </el-row>
       </el-col>
+      <!--  上月    -->
+      <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-divider>
+              <span class="title-font">{{ $t(`上月`) }}</span>
+            </el-divider>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <borderTemp>
+              <template #content>
+                <div style="margin-left: 4px; margin-right: 10px">
+                  <el-row>
+                    <el-col class="title-fonts">{{ $t(`订单目标`) }}</el-col>
+                  </el-row>
+                  <el-row :gutter="20">
+                    <el-col :span="5">
+                      <span style="font-size: 18px; padding: 0 0 0 5px">
+                        {{ tool.formatAmount(listsy.wcamount * 100, 2) + "%" }}
+                      </span>
+                    </el-col>
+                    <el-col :span="19">
+                      <div style="float: right">
+                        <span style="font-size: 12px; padding: 0 0 0 5px">
+                          <span
+                              v-if="listsy.unamount < 0"
+                              style="color: #e13333"
+                          >
+                            ¥{{
+                              listsy.unamount < -100000000
+                                  ? tool.formatAmount(
+                                      tool.unitConversion(
+                                          listsy.unamount,
+                                          100000000
+                                      ),
+                                      2
+                                  ) +
+                                  " " +
+                                  $t("亿")
+                                  : listsy.unamount < -10000
+                                      ? tool.formatAmount(
+                                          tool.unitConversion(listsy.unamount, 10000),
+                                          2
+                                      ) +
+                                      " " +
+                                      $t("万")
+                                      : tool.formatAmount(listsy.unamount, 2)
+                            }}
+                          </span>
+                          <span v-else style="color: #009270">
+                            ¥{{
+                              listsy.unamount > 100000000
+                                  ? tool.formatAmount(
+                                      tool.unitConversion(
+                                          listsy.unamount,
+                                          100000000
+                                      ),
+                                      2
+                                  ) +
+                                  " " +
+                                  $t("亿")
+                                  : listsy.unamount > 10000
+                                      ? tool.formatAmount(
+                                          tool.unitConversion(listsy.unamount, 10000),
+                                          2
+                                      ) +
+                                      " " +
+                                      $t("万")
+                                      : tool.formatAmount(listsy.unamount, 2)
+                            }}
+                          </span>
+                        </span>
+                      </div>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col class="title-fonts">{{ $t(`实际/目标`) }}</el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col>
+                      <span style="font-size: 12px; padding: 0 0 0 5px">
+                        <span>
+                          ¥
+                          {{
+                            listsy.amount > 100000000
+                                ? tool.formatAmount(
+                                    tool.unitConversion(listsy.amount, 100000000),
+                                    2
+                                ) +
+                                " " +
+                                $t("亿")
+                                : listsy.amount > 10000
+                                    ? tool.formatAmount(
+                                        tool.unitConversion(listsy.amount, 10000),
+                                        2
+                                    ) +
+                                    " " +
+                                    $t("万")
+                                    : tool.formatAmount(listsy.amount, 2)
+                          }}
+                        </span>
+                        <span>
+                          /¥
+                          {{
+                            listsy.target_l > 100000000
+                                ? tool.formatAmount(
+                                    tool.unitConversion(
+                                        listsy.target_l,
+                                        100000000
+                                    ),
+                                    2
+                                ) +
+                                " " +
+                                $t("亿")
+                                : listsy.target_l > 10000
+                                    ? tool.formatAmount(
+                                        tool.unitConversion(listsy.target_l, 10000),
+                                        2
+                                    ) +
+                                    " " +
+                                    $t("万")
+                                    : tool.formatAmount(listsy.target_l, 2)
+                          }}
+                        </span>
+                      </span>
+                    </el-col>
+                  </el-row>
+                </div>
+              </template>
+            </borderTemp>
+          </el-col>
+          <el-col :span="8">
+            <borderTemp>
+              <template #content>
+                <div style="margin-left: 4px; margin-right: 10px">
+                  <el-row>
+                    <el-col class="title-fonts">{{ $t(`出货目标`) }}</el-col>
+                  </el-row>
+                  <el-row :gutter="20">
+                    <el-col :span="5">
+                      <span style="font-size: 18px; padding: 0 0 0 5px">
+                        {{
+                          tool.formatAmount(listsy.wcoutamount * 100, 2) + "%"
+                        }}
+                      </span>
+                    </el-col>
+                    <el-col :span="19">
+                      <div style="float: right">
+                        <span style="font-size: 12px; padding: 0 0 0 5px">
+                          <span
+                              v-if="listsy.unoutamount < 0"
+                              style="color: #e13333"
+                          >
+                            ¥{{
+                              listsy.unamount < -100000000
+                                  ? tool.formatAmount(
+                                      tool.unitConversion(
+                                          listsy.unoutamount,
+                                          100000000
+                                      ),
+                                      2
+                                  ) +
+                                  " " +
+                                  $t("亿")
+                                  : listsy.unoutamount < -10000
+                                      ? tool.formatAmount(
+                                          tool.unitConversion(
+                                              listsy.unoutamount,
+                                              10000
+                                          ),
+                                          2
+                                      ) +
+                                      " " +
+                                      $t("万")
+                                      : tool.formatAmount(listsy.unoutamount, 2)
+                            }}
+                          </span>
+                          <span v-else style="color: #009270">
+                            ¥{{
+                              listsy.unamount > 100000000
+                                  ? tool.formatAmount(
+                                      tool.unitConversion(
+                                          listsy.unoutamount,
+                                          100000000
+                                      ),
+                                      2
+                                  ) +
+                                  " " +
+                                  $t("亿")
+                                  : listsy.unoutamount > 10000
+                                      ? tool.formatAmount(
+                                          tool.unitConversion(
+                                              listsy.unoutamount,
+                                              10000
+                                          ),
+                                          2
+                                      ) +
+                                      " " +
+                                      $t("万")
+                                      : tool.formatAmount(listsy.unoutamount, 2)
+                            }}
+                          </span>
+                        </span>
+                      </div>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col class="title-fonts">{{ $t(`实际/目标`) }}</el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col>
+                      <span style="font-size: 12px; padding: 0 0 0 5px">
+                        <span>
+                          ¥
+                          {{
+                            listsy.outamount > 100000000
+                                ? tool.formatAmount(
+                                    tool.unitConversion(
+                                        listsy.outamount,
+                                        100000000
+                                    ),
+                                    2
+                                ) +
+                                " " +
+                                $t("亿")
+                                : listsy.outamount > 10000
+                                    ? tool.formatAmount(
+                                        tool.unitConversion(listsy.outamount, 10000),
+                                        2
+                                    ) +
+                                    " " +
+                                    $t("万")
+                                    : tool.formatAmount(listsy.outamount, 2)
+                          }}
+                        </span>
+                        <span>
+                          /¥
+                          {{
+                            listsy.target_l > 100000000
+                                ? tool.formatAmount(
+                                    tool.unitConversion(
+                                        listsy.target_l,
+                                        100000000
+                                    ),
+                                    2
+                                ) +
+                                " " +
+                                $t("亿")
+                                : listsy.target_l > 10000
+                                    ? tool.formatAmount(
+                                        tool.unitConversion(listsy.target_l, 10000),
+                                        2
+                                    ) +
+                                    " " +
+                                    $t("万")
+                                    : tool.formatAmount(listsy.target_l, 2)
+                          }}
+                        </span>
+                        <!--                      {{'¥'+tool.formatAmount(listby.amount,2) + '/'+ '¥'+ tool.formatAmount(listby.target_l,2)}}-->
+                      </span>
+                    </el-col>
+                  </el-row>
+                </div>
+              </template>
+            </borderTemp>
+          </el-col>
+          <el-col :span="8">
+            <borderTemp>
+              <template #content>
+                <div style="margin-left: 4px; margin-right: 10px">
+                  <el-row>
+                    <el-col class="title-fonts">{{ $t(`开票目标`) }}</el-col>
+                  </el-row>
+                  <el-row :gutter="20">
+                    <el-col :span="5">
+                      <span style="font-size: 18px; padding: 0 0 0 5px">
+                        {{
+                          tool.formatAmount(listsy.wcinvoiceamount * 100, 2) +
+                          "%"
+                        }}
+                      </span>
+                    </el-col>
+                    <el-col :span="19">
+                      <div style="float: right">
+                        <span style="font-size: 12px; padding: 0 0 0 5px">
+                          <span
+                              v-if="listsy.uninvoiceamount < 0"
+                              style="color: #e13333"
+                          >
+                            ¥{{
+                              listsy.uninvoiceamount < -100000000
+                                  ? tool.formatAmount(
+                                      tool.unitConversion(
+                                          listsy.uninvoiceamount,
+                                          100000000
+                                      ),
+                                      2
+                                  ) +
+                                  " " +
+                                  $t("亿")
+                                  : listsy.uninvoiceamount < -10000
+                                      ? tool.formatAmount(
+                                          tool.unitConversion(
+                                              listsy.uninvoiceamount,
+                                              10000
+                                          ),
+                                          2
+                                      ) +
+                                      " " +
+                                      $t("万")
+                                      : tool.formatAmount(listsy.uninvoiceamount, 2)
+                            }}
+                          </span>
+                          <span v-else style="color: #009270">
+                            ¥{{
+                              listsy.uninvoiceamount > 100000000
+                                  ? tool.formatAmount(
+                                      tool.unitConversion(
+                                          listsy.uninvoiceamount,
+                                          100000000
+                                      ),
+                                      2
+                                  ) +
+                                  " " +
+                                  $t("亿")
+                                  : listsy.uninvoiceamount > 10000
+                                      ? tool.formatAmount(
+                                          tool.unitConversion(
+                                              listsy.uninvoiceamount,
+                                              10000
+                                          ),
+                                          2
+                                      ) +
+                                      " " +
+                                      $t("万")
+                                      : tool.formatAmount(listsy.uninvoiceamount, 2)
+                            }}
+                          </span>
+                        </span>
+                      </div>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col class="title-fonts">{{ $t(`实际/目标`) }}</el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col>
+                      <span style="font-size: 12px; padding: 0 0 0 5px">
+                        <span>
+                          ¥
+                          {{
+                            listsy.invoiceamount > 100000000
+                                ? tool.formatAmount(
+                                    tool.unitConversion(
+                                        listsy.invoiceamount,
+                                        100000000
+                                    ),
+                                    2
+                                ) +
+                                " " +
+                                $t("亿")
+                                : listsy.invoiceamount > 10000
+                                    ? tool.formatAmount(
+                                        tool.unitConversion(
+                                            listsy.invoiceamount,
+                                            10000
+                                        ),
+                                        2
+                                    ) +
+                                    " " +
+                                    $t("万")
+                                    : tool.formatAmount(listsy.invoiceamount, 2)
+                          }}
+                        </span>
+                        <span>
+                          /¥
+                          {{
+                            listsy.target_l > 100000000
+                                ? tool.formatAmount(
+                                    tool.unitConversion(
+                                        listsy.target_l,
+                                        100000000
+                                    ),
+                                    2
+                                ) +
+                                " " +
+                                $t("亿")
+                                : listsy.target_l > 10000
+                                    ? tool.formatAmount(
+                                        tool.unitConversion(listsy.target_l, 10000),
+                                        2
+                                    ) +
+                                    " " +
+                                    $t("万")
+                                    : tool.formatAmount(listsy.target_l, 2)
+                          }}
+                        </span>
+                      </span>
+                    </el-col>
+                  </el-row>
+                </div>
+              </template>
+            </borderTemp>
+          </el-col>
+        </el-row>
+      </el-col>
     </el-row>
   </div>
 </template>
@@ -1248,6 +1656,7 @@ export default {
       listby: "",
       listbj: "",
       listbn: "",
+      listsy: "",
     };
   },
   methods: {
@@ -1259,6 +1668,7 @@ export default {
       this.listby = res.data.by;
       this.listbj = res.data.bj;
       this.listbn = res.data.bn;
+      this.listsy = res.data.sy;
     },
   },
 };

src/HDrpManagement/dataanalysis/modules/project.vue

@@ -152,11 +152,12 @@ export default {
     }
   },
   methods:{
-    async queryAdd(){
+    async queryAdd(type){
+      this.$refs.quickAdd.select = type?type:this.selectAdd
       this.param.content.dataType = 7
       this.param.content.where.begindate = this.selectAdd ? '' :this.begindate
       this.param.content.where.enddate = this.selectAdd ? '' : this.enddate
-      this.param.content.dateType = this.selectAdd
+      this.param.content.dateType = type?type:this.selectAdd
       this.param.content.dataid = this.dataid
       this.param.content.type = this.isDep?1:0
       this.param.content.sort = [this.sort[0]]
@@ -175,11 +176,12 @@ export default {
       this.param.content.pageNumber = val
       this.queryAdd()
     },
-    async queryUpdate(){
+    async queryUpdate(type){
+      this.$refs.quickUpd.select = type?type:this.selectUpd
       this.param.content.dataType = 8
       this.param.content.where.begindate = this.selectUpd ? '' :this.begindate
       this.param.content.where.enddate = this.selectUpd ? '' : this.enddate
-      this.param.content.dateType = this.selectUpd
+      this.param.content.dateType = type?type:this.selectUpd
       this.param.content.dataid = this.dataid
       this.param.content.type = this.isDep?1:0
       this.param.content.sort = [this.sort[0]]
@@ -198,11 +200,12 @@ export default {
       this.param.content.pageNumber = val
       this.queryUpdate()
     },
-    async queryFollow(){
+    async queryFollow(type){
+      this.$refs.quickFow.select = type?type:this.selectFow
       this.param.content.dataType = 9
       this.param.content.where.begindate = this.selectFow ? '' :this.begindate
       this.param.content.where.enddate = this.selectFow ? '' : this.enddate
-      this.param.content.dateType = this.selectFow
+      this.param.content.dateType = type?type:this.selectFow
       this.param.content.dataid = this.dataid
       this.param.content.type = this.isDep?1:0
       this.param.content.sort = [this.sort[1]]
@@ -226,19 +229,22 @@ export default {
       this.begindate = begindate
       this.enddate = enddate
       this.selectAdd = select
-      this.queryAdd(this.param.content.pageNumber = 1)
+      this.param.content.pageNumber = 1
+      this.queryAdd()
     },
     selectQuickUpd(begindate,enddate,select){
       this.begindate = begindate
       this.enddate = enddate
       this.selectUpd = select
-      this.queryUpdate(this.param.content.pageNumber = 1)
+      this.param.content.pageNumber = 1
+      this.queryUpdate()
     },
     selectQuickFow(begindate,enddate,select){
       this.begindate = begindate
       this.enddate = enddate
       this.selectFow = select
-      this.queryFollow(this.param.content.pageNumber = 1)
+      this.param.content.pageNumber = 1
+      this.queryFollow()
     },
     onFull(type){
       if (type == '新增'){

src/HDrpManagement/dataanalysis/modules/salesData.vue

@@ -309,6 +309,109 @@
           </template>
         </borderTemp>
       </el-col>
+      <el-col
+          style="margin-bottom: 20px"
+          :xs="24"
+          :sm="24"
+          :md="24"
+          :lg="12"
+          :xl="8"
+      >
+        <borderTemp>
+          <template #content>
+            <el-row>
+              <el-col :span="10" :offset="6">
+                <el-divider>
+                  <span class="title-font">{{ $t(`上月`) }}</span>
+                </el-divider>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20" class="content-title">
+              <el-col :span="6">
+                <span>{{ $t(`订单金额`) }}</span>
+              </el-col>
+              <el-col :span="6">
+                <span>{{ $t(`出货金额`) }}</span>
+              </el-col>
+
+              <el-col :span="6">
+                <span>{{ $t(`开票金额`) }}</span>
+              </el-col>
+              <el-col :span="6">
+                <span>{{ $t(`回款金额`) }}</span>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20" class="content-title">
+              <el-col :span="6">
+                <span class="title-font" style="color: #333"
+                ><span style="font-size: 12px">¥</span>
+                  <span v-if="list.syxsje > 10000">
+                    {{
+                      tool.formatAmount(
+                          tool.unitConversion(list.syxsje, 10000),
+                          2
+                      ) + $t("万")
+                    }}
+                  </span>
+                  <span v-else>
+                    {{ tool.formatAmount(list.syxsje, 2) }}
+                  </span>
+                </span>
+              </el-col>
+              <el-col :span="6">
+                <span class="title-font" style="color: #333"
+                ><span style="font-size: 12px">¥</span>
+                  <span v-if="list.sychje > 10000">
+                    {{
+                      tool.formatAmount(
+                          tool.unitConversion(list.sychje, 10000),
+                          2
+                      ) + $t("万")
+                    }}
+                  </span>
+                  <span v-else>
+                    {{ tool.formatAmount(list.sychje, 2) }}
+                  </span>
+                </span>
+              </el-col>
+
+              <el-col :span="6">
+                <span class="title-font" style="color: #333"
+                ><span style="font-size: 12px">¥</span>
+                  <span v-if="list.sykpje > 10000">
+                    {{
+                      tool.formatAmount(
+                          tool.unitConversion(list.sykpje, 10000),
+                          2
+                      ) + $t("万")
+                    }}
+                  </span>
+                  <span v-else>
+                    {{ tool.formatAmount(list.sykpje, 2) }}
+                  </span>
+                </span>
+              </el-col>
+
+              <el-col :span="6">
+                <span class="title-font" style="color: #333"
+                ><span style="font-size: 12px">¥</span>
+                  <span v-if="list.syskje > 10000">
+                    {{
+                      tool.formatAmount(
+                          tool.unitConversion(list.syskje, 10000),
+                          2
+                      ) + $t("万")
+                    }}
+                  </span>
+                  <span v-else>
+                    {{ tool.formatAmount(list.syskje, 2) }}
+                  </span>
+                </span>
+              </el-col>
+            </el-row>
+          </template>
+        </borderTemp>
+      </el-col>
     </el-row>
   </div>
 </template>