代码上传

src/HDrpManagement/dataanalysis/index.vue

@@ -9,23 +9,22 @@
           <label  class="search__label" >范围:</label>
           <el-popover
               placement="bottom"
-              width="180"
               v-model="visible"
               :stretch="true"
               trigger="click">
             <el-tabs v-model="activeName" @tab-click="handleClick">
               <el-tab-pane label="部门" name="部门">
-                <el-cascader-panel ref="selectdep" :options="deplist" :props="{label:'label',value:'departmentid',children:'subdep'}"  emitPath="true" @change="selectDep" clearable></el-cascader-panel>
+                <el-cascader-panel ref="selectdep" :options="deplist" :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  @change="selectDep"  clearable></el-cascader-panel>
               </el-tab-pane>
               <el-tab-pane label="人员" name="人员">
-                <el-cascader-panel ref="selectPerson" :options="personnelList" :props="{label:'name',value:'userid'}"  emitPath="true" @change="selectPerson" clearable></el-cascader-panel>
+                <el-cascader-panel ref="selectPerson" :options="personnelList" :props="{label:'name',value:'userid'}"   @change="selectPerson"  clearable></el-cascader-panel>
               </el-tab-pane>
             </el-tabs>
             <el-input style="width: 200px" size="small" slot="reference" v-model="range" placeholder="请选择" @input="departmentrtment"></el-input>
           </el-popover>
         </div>
         <el-scrollbar >
-          <div style="margin: auto;min-width: 1400px;height: calc(100vh - 270px)">
+          <div style="margin: auto;min-width: 1800px;height: calc(100vh - 270px)">
             <div class="content" >
               作业数据
               <assignmentData ref="assignment" style="padding: 16px 2px 16px 2px" :param="dataParam" :isDep="isDep" :dataid="dataid" :isPerson="isPerson"></assignmentData>
@@ -120,6 +119,7 @@ export default {
       const res = await this.$api.requested(this.depmentParam)
       this.deplist = this.createMenu(res.data.dep)
       this.personnelList = res.data.hr
+      this.range = JSON.parse(window.sessionStorage.getItem('active_account')).name
       this.$refs.assignment.queryList()
       this.$refs.sales.queryList()
       this.$refs.performance.queryList()
@@ -149,23 +149,40 @@ export default {
       let arr = []
       function convertToElementTree(node) {
         // 新节点
-        var elNode = {
-          label: node["depname"],
-          parentid:node['parentid'],
-          parentname:node['parentname'],
-          departmentid:node["departmentid"],
-          value:node["departmentid"],
-          remarks:node["remarks"],
-          isused:node["isused"],
-          changedate:node['changedate'],
-          changeby:node['changeby'],
-          createdate:node['createdate'],
-          createby:node['createby'],
-          depno:node['depno'],
-          disabled:that.pageOnlyRead,
-          children: []
+        if (node.subdep.length === 0){
+          var elNode = {
+            label: node["depname"],
+            parentid:node['parentid'],
+            parentname:node['parentname'],
+            departmentid:node["departmentid"],
+            value:node["departmentid"],
+            remarks:node["remarks"],
+            isused:node["isused"],
+            changedate:node['changedate'],
+            changeby:node['changeby'],
+            createdate:node['createdate'],
+            createby:node['createby'],
+            depno:node['depno'],
+            disabled:that.pageOnlyRead,
+          }
+        }else {
+          var elNode = {
+            label: node["depname"],
+            parentid:node['parentid'],
+            parentname:node['parentname'],
+            departmentid:node["departmentid"],
+            value:node["departmentid"],
+            remarks:node["remarks"],
+            isused:node["isused"],
+            changedate:node['changedate'],
+            changeby:node['changeby'],
+            createdate:node['createdate'],
+            createby:node['createby'],
+            depno:node['depno'],
+            disabled:that.pageOnlyRead,
+            children: []
+          }
         }
-
         if (node.subdep && node.subdep.length > 0) {
           // 如果存在子节点
           for (var index = 0; index < node.subdep.length; index++) {
@@ -180,12 +197,12 @@ export default {
       });
       return arr
     },
-    selectDep() {
+    selectDep(val) {
       let dataDep = this.$refs.selectdep.getCheckedNodes(true)[0].data
       this.range = dataDep.label
-     /* this.isDep = true
-      this.isPerson = false*/
-      this.dataid = dataDep.departmentid
+      this.isDep = true
+      this.isPerson = false
+      this.dataid = val[val.length -1]
       this.dataParam.content.type = 1
       this.dataParam.content.dataid = this.dataid
       this.tableParam.content.type = 1
@@ -197,20 +214,19 @@ export default {
       this.$refs.clue.queryAdd()
       this.$refs.clue.queryUpdate()
       this.$refs.clue.queryFollow()
-      this.$refs.selectPerson.clearCheckedNodes()
+      /*this.$refs.selectPerson.clearCheckedNodes()*/
     },
-    selectPerson(){
+    selectPerson(val){
       let dataperson = this.$refs.selectPerson.getCheckedNodes(true)[0].data
       this.range = dataperson.name
-    /*  this.isDep = false
-      this.isPerson = true*/
+      this.isDep = false
+      this.isPerson = true
 
-      this.dataid = dataperson.userid
+      this.dataid = val[val.length-1]
       this.dataParam.content.type = 0
       this.dataParam.content.dataid = this.dataid
       this.tableParam.content.type = 0
       this.tableParam.content.dataid = this.dataid
-      console.log(this.dataid)
       this.visible = false
 
       this.$refs.assignment.queryList()
@@ -219,7 +235,7 @@ export default {
       this.$refs.clue.queryAdd()
       this.$refs.clue.queryUpdate()
       this.$refs.clue.queryFollow()
-      this.$refs.selectdep.clearCheckedNodes()
+      /*this.$refs.selectdep.clearCheckedNodes()*/
     },
     handleClick(tab, event) {
       console.log(tab, event);

src/HDrpManagement/dataanalysis/modules/assignmentData.vue

@@ -146,10 +146,8 @@ export default {
      /* this.isDep ? this.param.content.type = 1: this.isPerson ? this.param.content.type = 0 : this.param.content.type = ''*/
       this.param.content.dataType = 1
       /*this.param.content.dataid = this.dataid*/
-      console.log(this.param)
       const res = await this.$api.requested(this.param)
       this.list = res.data
-      console.log(this.list,'作业数据')
     }
   },
    mounted() {

src/HDrpManagement/dataanalysis/modules/performanceData.vue

@@ -4,7 +4,7 @@
     <!--  本月    -->
       <el-col :span="8">
         <el-row :gutter="20">
-          <el-col :span="10" :offset="6">
+          <el-col :span="24" >
             <el-divider>
               <span class="title-font">本月</span>
             </el-divider>
@@ -14,108 +14,122 @@
           <el-col :span="8">
             <borderTemp>
               <template #content>
-                <el-row>
-                  <el-col class="title-fonts">订单目标</el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="12">
+                <div style="margin-left: 4px;margin-right: 10px">
+                  <el-row>
+                    <el-col class="title-fonts">订单目标</el-col>
+                  </el-row>
+                  <el-row :gutter="20" >
+                    <el-col :span="12">
                     <span style="font-size: 18px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listby.wcamount * 100,2) + '%'}}
                     </span>
-                  </el-col>
-                  <el-col :span="12">
-                    <span style="font-size: 12px;padding: 0 0 0 5px">
-                      <span v-if="listby.unamount < 0" style="color: #E13333">
-                        ¥{{tool.formatAmount(listby.unamount,2)}}
-                      </span>
-                      <span v-else style="color: #009270">
-                        ¥{{tool.formatAmount(listby.unamount,2)}}
-                      </span>
-                    </span>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col class="title-fonts" >实际/目标</el-col>
-                </el-row>
-                <el-row>
-                  <el-col>
+                    </el-col>
+                    <el-col :span="12">
+                      <div style="float: right">
+                        <span style="font-size: 12px;padding: 0 0 0 5px">
+                          <span v-if="listby.unamount < 0" style="color: #E13333">
+                            ¥{{tool.formatAmount(listby.unamount,2)}}
+                          </span>
+                          <span v-else style="color: #009270">
+                            ¥{{tool.formatAmount(listby.unamount,2)}}
+                          </span>
+                        </span>
+                      </div>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col class="title-fonts" >实际/目标</el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
                       {{'¥'+tool.formatAmount(listby.amount,2) + '/'+ '¥'+ tool.formatAmount(listby.target_l,2)}}
                     </span>
-                  </el-col>
-                </el-row>
+                    </el-col>
+                  </el-row>
+                </div>
+
               </template>
             </borderTemp>
           </el-col>
           <el-col :span="8">
             <borderTemp>
               <template #content>
-                <el-row>
-                  <el-col class="title-fonts">出货目标</el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="12">
+                <div style="margin-left: 4px;margin-right: 10px">
+                  <el-row>
+                    <el-col class="title-fonts">出货目标</el-col>
+                  </el-row>
+                  <el-row :gutter="20">
+                    <el-col :span="12">
                     <span style="font-size: 18px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listby.wcoutamount * 100,2) + '%'}}
                     </span>
-                  </el-col>
-                  <el-col :span="12">
-                    <span style="font-size: 12px;padding: 0 0 0 5px">
-                      <span v-if="listby.unoutamount < 0" style="color: #E13333">
-                        ¥{{tool.formatAmount(listby.unoutamount,2)}}
-                      </span>
-                      <span v-else style="color: #009270">
-                        ¥{{tool.formatAmount(listby.unoutamount,2)}}
-                      </span>
-                    </span>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col class="title-fonts" >实际/目标</el-col>
-                </el-row>
-                <el-row>
-                  <el-col>
+                    </el-col>
+                    <el-col :span="12">
+                      <div style="float: right">
+                        <span style="font-size: 12px;padding: 0 0 0 5px">
+                          <span v-if="listby.unoutamount < 0" style="color: #E13333">
+                            ¥{{tool.formatAmount(listby.unoutamount,2)}}
+                          </span>
+                          <span v-else style="color: #009270">
+                            ¥{{tool.formatAmount(listby.unoutamount,2)}}
+                          </span>
+                        </span>
+                      </div>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col class="title-fonts" >实际/目标</el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
                       {{'¥'+tool.formatAmount(listby.amount,2) + '/'+ '¥'+ tool.formatAmount(listby.target_l,2)}}
                     </span>
-                  </el-col>
-                </el-row>
+                    </el-col>
+                  </el-row>
+                </div>
+
               </template>
             </borderTemp>
           </el-col>
           <el-col :span="8">
             <borderTemp>
               <template #content>
-                <el-row>
-                  <el-col class="title-fonts">开票目标</el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="12">
+                <div style="margin-left: 4px;margin-right: 10px">
+                  <el-row>
+                    <el-col class="title-fonts">开票目标</el-col>
+                  </el-row>
+                  <el-row :gutter="20">
+                    <el-col :span="12">
                     <span style="font-size: 18px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listby.wcinvoiceamount * 100,2) + '%'}}
                     </span>
-                  </el-col>
-                  <el-col :span="12">
-                    <span style="font-size: 12px;padding: 0 0 0 5px">
-                      <span v-if="listby.uninvoiceamount < 0" style="color: #E13333">
-                        ¥{{tool.formatAmount(listby.uninvoiceamount,2)}}
-                      </span>
-                      <span v-else style="color: #009270">
-                        ¥{{tool.formatAmount(listby.uninvoiceamount,2)}}
-                      </span>
-                    </span>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col class="title-fonts" >实际/目标</el-col>
-                </el-row>
-                <el-row>
-                  <el-col>
+                    </el-col>
+                    <el-col :span="12">
+                      <div style="float: right">
+                        <span style="font-size: 12px;padding: 0 0 0 5px">
+                          <span v-if="listby.uninvoiceamount < 0" style="color: #E13333">
+                            ¥{{tool.formatAmount(listby.uninvoiceamount,2)}}
+                          </span>
+                          <span v-else style="color: #009270">
+                            ¥{{tool.formatAmount(listby.uninvoiceamount,2)}}
+                          </span>
+                        </span>
+                      </div>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col class="title-fonts" >实际/目标</el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
                       {{'¥'+tool.formatAmount(listby.amount,2) + '/'+ '¥'+ tool.formatAmount(listby.target_l,2)}}
                     </span>
-                  </el-col>
-                </el-row>
+                    </el-col>
+                  </el-row>
+                </div>
               </template>
             </borderTemp>
           </el-col>
@@ -124,7 +138,7 @@
       <!--  本季    -->
       <el-col :span="8">
         <el-row :gutter="20">
-          <el-col :span="10" :offset="6">
+          <el-col :span="24" >
             <el-divider>
               <span class="title-font">本季</span>
             </el-divider>
@@ -134,108 +148,124 @@
           <el-col :span="8">
             <borderTemp>
               <template #content>
-                <el-row>
-                  <el-col class="title-fonts">订单目标</el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="12">
+                <div style="margin-left: 4px;margin-right: 10px">
+                  <el-row>
+                    <el-col class="title-fonts">订单目标</el-col>
+                  </el-row>
+                  <el-row :gutter="20">
+                    <el-col :span="12">
                     <span style="font-size: 18px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listbj.wcamount * 100,2) + '%'}}
                     </span>
-                  </el-col>
-                  <el-col :span="12">
-                    <span style="font-size: 12px;padding: 0 0 0 5px">
-                      <span v-if="listby.unamount < 0" style="color: #E13333">
-                        ¥{{tool.formatAmount(listby.unamount,2)}}
-                      </span>
-                      <span v-else style="color: #009270">
-                        ¥{{tool.formatAmount(listby.unamount,2)}}
-                      </span>
-                    </span>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col class="title-fonts" >实际/目标</el-col>
-                </el-row>
-                <el-row>
-                  <el-col>
+                    </el-col>
+                    <el-col :span="12">
+                      <div style="float: right">
+                         <span style="font-size: 12px;padding: 0 0 0 5px">
+                          <span v-if="listby.unamount < 0" style="color: #E13333">
+                            ¥{{tool.formatAmount(listby.unamount,2)}}
+                          </span>
+                          <span v-else style="color: #009270">
+                            ¥{{tool.formatAmount(listby.unamount,2)}}
+                          </span>
+                        </span>
+                      </div>
+
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col class="title-fonts" >实际/目标</el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listbj.amount,2) + '/'+ tool.formatAmount(listbj.target_l,2)}}
                     </span>
-                  </el-col>
-                </el-row>
+                    </el-col>
+                  </el-row>
+                </div>
+
               </template>
             </borderTemp>
           </el-col>
           <el-col :span="8">
             <borderTemp>
               <template #content>
-                <el-row>
-                  <el-col class="title-fonts">出货目标</el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="12">
+                <div style="margin-left: 4px;margin-right: 10px">
+                  <el-row>
+                    <el-col class="title-fonts">出货目标</el-col>
+                  </el-row>
+                  <el-row :gutter="20">
+                    <el-col :span="12">
                     <span style="font-size: 18px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listbj.wcoutamount * 100,2) + '%'}}
                     </span>
-                  </el-col>
-                  <el-col :span="12">
-                    <span style="font-size: 12px;padding: 0 0 0 5px">
-                       <span v-if="listby.unoutamount < 0" style="color: #E13333">
-                        ¥{{tool.formatAmount(listby.unoutamount,2)}}
-                      </span>
-                      <span v-else style="color: #009270">
-                        ¥{{tool.formatAmount(listby.unoutamount,2)}}
-                      </span>
-                    </span>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col class="title-fonts" >实际/目标</el-col>
-                </el-row>
-                <el-row>
-                  <el-col>
+                    </el-col>
+                    <el-col :span="12">
+                      <div style="float: right">
+                         <span style="font-size: 12px;padding: 0 0 0 5px">
+                           <span v-if="listby.unoutamount < 0" style="color: #E13333">
+                            ¥{{tool.formatAmount(listby.unoutamount,2)}}
+                          </span>
+                          <span v-else style="color: #009270">
+                            ¥{{tool.formatAmount(listby.unoutamount,2)}}
+                          </span>
+                        </span>
+                      </div>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col class="title-fonts" >实际/目标</el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listbj.amount,2) + '/'+ tool.formatAmount(listbj.target_l,2)}}
                     </span>
-                  </el-col>
-                </el-row>
+                    </el-col>
+                  </el-row>
+                </div>
+
               </template>
             </borderTemp>
           </el-col>
           <el-col :span="8">
             <borderTemp>
               <template #content>
-                <el-row>
-                  <el-col class="title-fonts">开票目标</el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="12">
+                <div style="margin-left: 4px;margin-right: 10px">
+                  <el-row>
+                    <el-col class="title-fonts">开票目标</el-col>
+                  </el-row>
+                  <el-row :gutter="20">
+                    <el-col :span="12">
                     <span style="font-size: 18px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listbj.wcinvoiceamount * 100,2) + '%'}}
                     </span>
-                  </el-col>
-                  <el-col :span="12">
-                    <span style="font-size: 12px;padding: 0 0 0 5px">
-                       <span v-if="listby.uninvoiceamount < 0" style="color: #E13333">
-                        ¥{{tool.formatAmount(listby.uninvoiceamount,2)}}
-                      </span>
-                      <span v-else style="color: #009270">
-                        ¥{{tool.formatAmount(listby.uninvoiceamount,2)}}
-                      </span>
-                    </span>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col class="title-fonts" >实际/目标</el-col>
-                </el-row>
-                <el-row>
-                  <el-col>
+                    </el-col>
+                    <el-col :span="12">
+                      <div style="float: right">
+                        <span style="font-size: 12px;padding: 0 0 0 5px">
+                           <span v-if="listby.uninvoiceamount < 0" style="color: #E13333">
+                            ¥{{tool.formatAmount(listby.uninvoiceamount,2)}}
+                          </span>
+                          <span v-else style="color: #009270">
+                            ¥{{tool.formatAmount(listby.uninvoiceamount,2)}}
+                          </span>
+                        </span>
+                      </div>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col class="title-fonts" >实际/目标</el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listbj.amount,2) + '/'+ tool.formatAmount(listbj.target_l,2)}}
                     </span>
-                  </el-col>
-                </el-row>
+                    </el-col>
+                  </el-row>
+                </div>
+
               </template>
             </borderTemp>
           </el-col>
@@ -244,7 +274,7 @@
       <!--  本年    -->
       <el-col :span="8">
         <el-row :gutter="20">
-          <el-col :span="10" :offset="6">
+          <el-col :span="24" >
             <el-divider>
               <span class="title-font">本年</span>
             </el-divider>
@@ -254,108 +284,124 @@
           <el-col :span="8">
             <borderTemp>
               <template #content>
-                <el-row>
-                  <el-col class="title-fonts">订单目标</el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="12">
+                <div style="margin-left: 4px;margin-right: 10px">
+                  <el-row>
+                    <el-col class="title-fonts">订单目标</el-col>
+                  </el-row>
+                  <el-row :gutter="20">
+                    <el-col :span="12">
                     <span style="font-size: 18px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listbn.wcamount * 100,2) + '%'}}
                     </span>
-                  </el-col>
-                  <el-col :span="12">
-                    <span style="font-size: 12px;padding: 0 0 0 5px">
-                      <span v-if="listby.unamount < 0" style="color: #E13333">
-                        ¥{{tool.formatAmount(listby.unamount,2)}}
-                      </span>
-                      <span v-else style="color: #009270">
-                        ¥{{tool.formatAmount(listby.unamount,2)}}
-                      </span>
-                    </span>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col class="title-fonts" >实际/目标</el-col>
-                </el-row>
-                <el-row>
-                  <el-col>
+                    </el-col>
+                    <el-col :span="12">
+                      <div style="float: right">
+                         <span style="font-size: 12px;padding: 0 0 0 5px">
+                          <span v-if="listby.unamount < 0" style="color: #E13333">
+                            ¥{{tool.formatAmount(listby.unamount,2)}}
+                          </span>
+                          <span v-else style="color: #009270">
+                            ¥{{tool.formatAmount(listby.unamount,2)}}
+                          </span>
+                        </span>
+                      </div>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col class="title-fonts" >实际/目标</el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listbn.amount,2) + '/'+ tool.formatAmount(listbn.target_l,2)}}
                     </span>
-                  </el-col>
-                </el-row>
+                    </el-col>
+                  </el-row>
+                </div>
               </template>
             </borderTemp>
           </el-col>
           <el-col :span="8">
             <borderTemp>
               <template #content>
-                <el-row>
-                  <el-col class="title-fonts">出货目标</el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="12">
+                <div style="margin-left: 4px;margin-right: 10px">
+                  <el-row>
+                    <el-col class="title-fonts">出货目标</el-col>
+                  </el-row>
+                  <el-row :gutter="20">
+                    <el-col :span="12">
                     <span style="font-size: 18px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listbn.wcoutamount * 100,2) + '%'}}
                     </span>
-                  </el-col>
-                  <el-col :span="12">
-                    <span style="font-size: 12px;padding: 0 0 0 5px">
-                      <span v-if="listby.unoutamount < 0" style="color: #E13333">
-                        ¥{{tool.formatAmount(listby.unoutamount,2)}}
-                      </span>
-                      <span v-else style="color: #009270">
-                        ¥{{tool.formatAmount(listby.unoutamount,2)}}
-                      </span>
-                    </span>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col class="title-fonts" >实际/目标</el-col>
-                </el-row>
-                <el-row>
-                  <el-col>
+                    </el-col>
+                    <el-col :span="12">
+                      <div style="float: right">
+                        <span style="font-size: 12px;padding: 0 0 0 5px">
+                          <span v-if="listby.unoutamount < 0" style="color: #E13333">
+                            ¥{{tool.formatAmount(listby.unoutamount,2)}}
+                          </span>
+                          <span v-else style="color: #009270">
+                            ¥{{tool.formatAmount(listby.unoutamount,2)}}
+                          </span>
+                       </span>
+                      </div>
+
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col class="title-fonts" >实际/目标</el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listbn.amount,2) + '/'+ tool.formatAmount(listbn.target_l,2)}}
                     </span>
-                  </el-col>
-                </el-row>
+                    </el-col>
+                  </el-row>
+                </div>
+
               </template>
             </borderTemp>
           </el-col>
           <el-col :span="8">
             <borderTemp>
               <template #content>
-                <el-row>
-                  <el-col class="title-fonts">开票目标</el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="12">
+                <div style="margin-left: 4px;margin-right: 10px">
+                  <el-row>
+                    <el-col class="title-fonts">开票目标</el-col>
+                  </el-row>
+                  <el-row :gutter="20">
+                    <el-col :span="12">
                     <span style="font-size: 18px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listbn.wcinvoiceamount * 100,2) + '%'}}
                     </span>
-                  </el-col>
-                  <el-col :span="12">
-                    <span style="font-size: 12px;padding: 0 0 0 5px">
-                       <span v-if="listby.uninvoiceamount < 0" style="color: #E13333">
-                        ¥{{tool.formatAmount(listby.uninvoiceamount,2)}}
-                      </span>
-                      <span v-else style="color: #009270">
-                        ¥{{tool.formatAmount(listby.uninvoiceamount,2)}}
-                      </span>
-                    </span>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col class="title-fonts" >实际/目标</el-col>
-                </el-row>
-                <el-row>
-                  <el-col>
+                    </el-col>
+                    <el-col :span="12">
+                      <div style="float: right">
+                        <span style="font-size: 12px;padding: 0 0 0 5px">
+                         <span v-if="listby.uninvoiceamount < 0" style="color: #E13333">
+                          ¥{{tool.formatAmount(listby.uninvoiceamount,2)}}
+                          </span>
+                          <span v-else style="color: #009270">
+                            ¥{{tool.formatAmount(listby.uninvoiceamount,2)}}
+                          </span>
+                         </span>
+                      </div>
+
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col class="title-fonts" >实际/目标</el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listbn.amount,2) + '/'+ tool.formatAmount(listbn.target_l,2)}}
                     </span>
-                  </el-col>
-                </el-row>
+                    </el-col>
+                  </el-row>
+                </div>
+
               </template>
             </borderTemp>
           </el-col>

src/HDrpManagement/dataanalysis/modules/salesData.vue

@@ -230,7 +230,6 @@ export default {
      /* this.param.content.dataid = this.dataid*/
       const res = await this.$api.requested(this.param)
       this.list = res.data
-      console.log(this.list,'销售数据')
     }
   }
 }