Sfoglia il codice sorgente

Merge branch 'develop_yh37' of jianguan-web/qpls-md-html into pre-release

李磊 1 anno fa
parent
commit
222384039c

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1710914729546
+  "version": 1710991960808
 }

+ 1 - 1
src/views/salesManagement/salesQuery/list.vue

@@ -307,7 +307,7 @@ export default {
         this.spinning = true
         // 查询总计
         salesCount(Object.assign(parameter, this.queryParam)).then(res => {
-          this.totalData = Object.assign(this.totalData, res.data || {})
+          this.totalData = res.data
         })
         return salesList(Object.assign(parameter, this.queryParam)).then(res => {
           let data

+ 1 - 2
src/views/salesManagement/salesQueryNew/list.vue

@@ -307,8 +307,7 @@ export default {
         this.spinning = true
         // 查询总计
         salesCount(Object.assign(parameter, this.queryParam)).then(res => {
-          console.log(res, 'res')
-          this.totalData = Object.assign(this.totalData, res.data || {})
+          this.totalData = res.data
         })
         return salesList(Object.assign(parameter, this.queryParam)).then(res => {
           let data