任务调整，销售数据调整

src/HDrpManagement/salerPortrait/modules/detail.vue

@@ -99,10 +99,10 @@
             <showIsNone title="订单明细">
               <div style="float: right;margin-bottom: 10px;margin-top: -40px">
                 <el-button-group>
-                  <el-button :type="param2.content.sort[0].sortid == '172'?'primary':''"  size="mini" @click="sortChange('订单')">订单</el-button>
-                  <el-button :type="param2.content.sort[0].sortid == '173'?'primary':''"  size="mini" @click="sortChange('出货')">出货</el-button>
-                  <el-button :type="param2.content.sort[0].sortid == '174'?'primary':''"  size="mini" @click="sortChange('开票')">开票</el-button>
-                  <el-button :type="param2.content.sort[0].sortid == '175'?'primary':''"  size="mini" @click="sortChange('回款')">回款</el-button>
+                  <el-button :type="param2.content.sort[0].sortid == '174'?'primary':''"  size="mini" @click="sortChange('订单')">订单</el-button>
+                  <el-button :type="param2.content.sort[0].sortid == '175'?'primary':''"  size="mini" @click="sortChange('出货')">出货</el-button>
+                  <el-button :type="param2.content.sort[0].sortid == '176'?'primary':''"  size="mini" @click="sortChange('开票')">开票</el-button>
+                  <el-button :type="param2.content.sort[0].sortid == '177'?'primary':''"  size="mini" @click="sortChange('回款')">回款</el-button>
                 </el-button-group>
                 <img v-if="param2.content.sort[0].reversed == 0" @click="upSort('down')" width="28" height="28" src="../../../assets/icons/upSort.svg" alt="" style="vertical-align: middle;margin-left: 10px;">
                 <img v-if="param2.content.sort[0].reversed == 1" @click="upSort('up')" width="28" height="28" src="../../../assets/icons/downSort.svg" alt="" style="vertical-align: middle;margin-left: 10px;">
@@ -122,16 +122,16 @@
                     {{scope.data.data.sumamount && tool.formatAmount(scope.data.data.sumamount || 0,2,'￥')  }}
                   </div>
                   <div v-else-if="scope.data.columnname == 'writeoffamount'">
-                    <span :style="{color:param2.content.sort[0].sortid == '175'?'#3874F6':''}">{{scope.data.data.writeoffamount && tool.formatAmount(scope.data.data.writeoffamount || 0,2,'￥')  }}</span>
+                    <span :style="{color:param2.content.sort[0].sortid == '177'?'#3874F6':''}">{{scope.data.data.writeoffamount && tool.formatAmount(scope.data.data.writeoffamount || 0,2,'￥')  }}</span>
                   </div>
                   <div v-else-if="scope.data.columnname == 'unoutOrderamount'">
-                    <span :style="{color:param2.content.sort[0].sortid == '172'?'#3874F6':''}">{{scope.data.data.unoutOrderamount && tool.formatAmount(scope.data.data.unoutOrderamount || 0,2,'￥')  }}</span>
+                    <span :style="{color:param2.content.sort[0].sortid == '174'?'#3874F6':''}">{{scope.data.data.unoutOrderamount && tool.formatAmount(scope.data.data.unoutOrderamount || 0,2,'￥')  }}</span>
                   </div>
                   <div v-else-if="scope.data.columnname == 'uninvoicamount'">
-                    <span :style="{color:param2.content.sort[0].sortid == '173'?'#3874F6':''}">{{scope.data.data.uninvoicamount && tool.formatAmount(scope.data.data.uninvoicamount || 0,2,'￥')  }}</span>
+                    <span :style="{color:param2.content.sort[0].sortid == '175'?'#3874F6':''}">{{scope.data.data.uninvoicamount && tool.formatAmount(scope.data.data.uninvoicamount || 0,2,'￥')  }}</span>
                   </div>
                   <div v-else-if="scope.data.columnname == 'unwriteoffamount'">
-                    <span :style="{color:param2.content.sort[0].sortid == '174'?'#3874F6':''}">{{scope.data.data.unwriteoffamount && tool.formatAmount(scope.data.data.unwriteoffamount || 0,2,'￥')  }}</span>
+                    <span :style="{color:param2.content.sort[0].sortid == '176'?'#3874F6':''}">{{scope.data.data.unwriteoffamount && tool.formatAmount(scope.data.data.unwriteoffamount || 0,2,'￥')  }}</span>
                   </div>
                   <div v-else>
                     {{ scope.data.data[scope.data.columnname] }}
@@ -473,7 +473,7 @@ export default {
           "sort":[{
             "reversed": 1,//1降序，0升序
             "sorted": 1,
-            "sortid": 172,//订单：172,出货：173,开票：174,回款：175
+            "sortid": 174,//订单：174,出货：175,开票：176,回款：177
           }]
         }
       },
@@ -627,13 +627,13 @@ export default {
     /*订单明细排序*/
     sortChange(val){
       if (val === '订单'){
-        this.param2.content.sort[0].sortid = 172
+        this.param2.content.sort[0].sortid = 174
       }else if (val === '出货'){
-        this.param2.content.sort[0].sortid = 173
+        this.param2.content.sort[0].sortid = 175
       }else if (val === '开票'){
-        this.param2.content.sort[0].sortid = 174
+        this.param2.content.sort[0].sortid = 176
       }else if (val === '回款'){
-        this.param2.content.sort[0].sortid = 175
+        this.param2.content.sort[0].sortid = 177
       }
       this.$refs.dingdan.listData()
     },

src/HManagement/task/components/followData.vue

@@ -4,7 +4,7 @@
       <el-divider></el-divider>
       <div style="display: flex;justify-content: space-between;padding: 16px">
         <div>
-          <span >总计:{{total}}</span>
+          <span style="font-size: 13px">总计:{{total}}个</span>
         </div>
       </div>
       <div style="padding: 0px 16px 16px 16px">

src/components/dynamic-newTable/index.vue

@@ -7,7 +7,7 @@
           type="selection"
           width="35" fixed v-if="checkbox">
       </el-table-column>
-      <el-table-column v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="!width ? 150 : col.width" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false">
+      <el-table-column show-overflow-tooltip v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="!width ? 150 : col.width" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false">
         <template v-slot:header="{ column,$index }" v-if="customHeader">
           <slot name="header" :data="column"></slot>
         </template>

src/views/salesData/modules/uninvoiceAmountAnalysis.vue

@@ -53,10 +53,10 @@ const meta = {
   threetosix: {
     alias: '3-6月出货未开票金额(万元)',
   },
-  twelveup:{
+  sixtotwelve:{
     alias: '6-12月出货未开票金额(万元)'
   },
-  sixtotwelve:{
+  twelveup:{
     alias: '一年以上出货未开票金额(万元)'
   },
 };
@@ -106,15 +106,15 @@ export default {
           "zerotothree":Math.round(((item.zerotothree/10000)*100)/100),
           "threetosix":Math.round(((item.threetosix/10000)*100)/100),
           "date":item.date,
+          "sixtotwelve":Math.round(((item.sixtotwelve/10000)*100)/100),
           "twelveup":Math.round(((item.twelveup/10000)*100)/100),
-          "sixtotwelve":Math.round(((item.sixtotwelve/10000)*100)/100)
         }
       })
-      this.chartLine.changeData(this.processData(this.list, ['zerotothree', 'threetosix','twelveup','sixtotwelve'], meta))
+      this.chartLine.changeData(this.processData(this.list, ['zerotothree', 'threetosix','sixtotwelve','twelveup'], meta))
     },
     renderPie(val){
       this.chartLine = new Line('uninvoiceAmountChart',{
-        data:this.processData(this.list, ['zerotothree', 'threetosix','twelveup','sixtotwelve'], meta),
+        data:this.processData(this.list, ['zerotothree', 'threetosix','sixtotwelve','twelveup',], meta),
         xField: 'date',
         yField: valueKey,
         seriesField: seriesKey,