Sfoglia il codice sorgente

Merge branch 'develop_yh58' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh58

chenrui 1 mese fa
parent
commit
d05a48df64

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.553",
+    "version": "2.2.58",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 4 - 2
src/views/reportData/dailyReport/table.vue

@@ -256,7 +256,7 @@ export default {
       this.nowDate = moment().format('DD日HH点mm分')
       this.spinning = true
       const data = await salesReportDailyList({ reportType, reportDate }).then(res => res.data)
-      if (data) {
+      if (data && data.length) {
         this.tableData = data
         // 全国销售日报
         if (this.activeKey == 0) {
@@ -283,8 +283,10 @@ export default {
             this.$refs['table' + this.activeKey].pageInit()
           }
         })
-        this.spinning = false
+      } else {
+        this.tableData = []
       }
+      this.spinning = false
     },
     getColumns () {
       const row = this.tableData[0]

+ 1 - 1
src/views/reportData/dailyReport/table0.vue

@@ -103,7 +103,7 @@ export default {
         '本月销售实际完成|currRealTireFinish',
         '预估订单|currExpectTire',
         '预估完成|currExpectTireFinish',
-        '离目标差额|currTargetTireDiff'
+        '离目标差额条数|currTargetTireDiff'
       ]
       const row3 = ['本月实际销售额|totalCurrRealFinish', '本月预估完成|totalCurrExpectFinish']
       const getRows = function (row, arr, name) {