Forráskód Böngészése

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

chenrui 1 éve
szülő
commit
ed108c6cc6
1 módosított fájl, 7 hozzáadás és 2 törlés
  1. 7 2
      src/views/salesManagement/salesQueryNew/list.vue

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

@@ -126,7 +126,7 @@
             <div>
               <div>
                 总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
-                总款数:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '--' }}</strong>;
+                总款数:<strong>{{ totalData&&totalData.totalCategory || totalData.totalCategory == 0 ? totalData.totalCategory : '--' }}</strong>;
                 总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
                 已下推数量:<strong>{{ totalData&&(totalData.totalPushedQty || totalData.totalPushedQty==0) ? totalData.totalPushedQty : '--' }}</strong>;
                 已发货数量:<strong>{{ totalData&&(totalData.totalDispatchQty || totalData.totalDispatchQty==0) ? totalData.totalDispatchQty : '--' }}</strong>;
@@ -358,9 +358,14 @@ export default {
         this.spinning = true
         delete parameter.tableId
         delete parameter.index
+        if(parameter.sortOrder){
+          parameter["sortAlias"] = "sales_bill"
+        }else{
+          delete parameter.sortField
+        }
         // 查询总计
         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