Ver Fonte

销售订单统计报表修改

zouzhd há 3 anos atrás
pai
commit
7c737c9741

+ 1 - 1
config/index.js

@@ -58,7 +58,7 @@ let proxyTable = {
   "/api/v1": {
     target: "http://172.16.33.166:8080",
     // target: "http://172.16.33.162:8019",
-    // target: "http://localhost:8019",
+    // target: "http://localhost:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

+ 5 - 0
src/components/DilCommonUI/packages/table/src/table.js

@@ -101,6 +101,11 @@ export default {
               this.refreshColumnData(d.columnData);
 
               this.isShow = true;
+              //若父组件存在要合计的值
+              if(this.$parent.totalNumber>=0){
+                //将筛选的字段传给父组件
+                this.$parent.calculationTotalNumber(this.dataRequestQuery);
+              }
             });
         }
       } else {

+ 1 - 1
src/components/DilCommonUI/packages/table/src/table.vue

@@ -210,7 +210,7 @@ export default {
     },
     // 每页显示条目个数,支持 .sync 修饰符
     pageSize: {
-      default: 10,
+      default: 100,
     },
     //组件布局,子组件名用逗号分隔
     layout: {

+ 56 - 1
src/views/statisticalReport/components/salesLogisticsStatistics/transportationPerformance.vue

@@ -17,6 +17,9 @@
       <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
       </el-button>
+      <span style="margin-left: 1rem;">当前条件下总净重:</span>
+      <el-input v-model="totalNumber" :disabled="true" style="width: 150px;">
+    </el-input>
     </div>
     <div class="table">
       <dilTable ref="excelDom" v-bind.sync="option"></dilTable>
@@ -32,10 +35,17 @@ export default {
       option: {
         requestUrl: "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&i=" +new Date(),
       },
-      Time:'',
+      Time:null,
+      //总净重
+      totalNumber: 0,
       tableTitle:'销售统计报表'
     };
   },
+  created(){
+      var startTime = this.dataFormat(sjTime(new Date()));
+      var endTime = this.dataFormat(sjTime(new Date()));
+      this.tableTitle = startTime + ' 至 ' + endTime;
+  },
   methods: {
     refresh(){
       this.$router.go(0);
@@ -48,7 +58,52 @@ export default {
         endTime = sjTime(this.Time[1]);
       }
       this.option.requestUrl = "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+      //修改报表名称
+      this.tableTitle = this.dataFormat(startTime) + ' 至 ' + this.dataFormat(endTime);
+    },
+    //获取当前条件下的总净重
+    calculationTotalNumber(dataRequestQuery){
+      //初始化时间
+      let startTime = null;
+      let endTime = null;
+      if(this.Time != null){
+        startTime = sjTime(this.Time[0]);
+        endTime = sjTime(this.Time[1]);
+      }
+      //放入子组件筛选的值
+      let mapValue = undefined;
+          for (const key in dataRequestQuery) {
+         
+            const val = dataRequestQuery[key];
+            if (val||val==0) {
+             
+              if (!mapValue) mapValue = {};
+            
+              mapValue[key] = val;
+            }
+          }
+      this.axios.post("/api/v1/tms/getAllSaleReportTotal?startTime=" + startTime +"&endTime="+ endTime +"&i=" +new Date(),mapValue)
+      .then((res) => {
+          this.totalNumber = res.data.data;
+        });  
     },
+    //格式化日期
+    dataFormat(value){
+      let date = new Date(value);
+        let y = date.getFullYear();
+        let MM = date.getMonth() + 1;
+        MM = MM < 10 ? ('0' + MM) : MM;
+        let d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        let h = date.getHours();
+        h = h < 10 ? ('0' + h) : h;
+        let m = date.getMinutes();
+        m = m < 10 ? ('0' + m) : m;
+        let s = date.getSeconds();
+        s = s < 10 ? ('0' + s) : s;
+        return y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s;
+    }
+
   },
 };
 </script>