修改统计报表

build/utils.js

@@ -16,7 +16,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 let devModules = ['all'];
-// let devModules = ['index','TMS','statisticalReport','RMS','inward'];
+// let devModules = ['index','appoint','TMS','queue','statisticalReport'];
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

config/index.js

@@ -57,6 +57,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
     target: "http://172.16.33.166:8080",
+    // target: "http://172.16.33.162:8019",
     // target: "http://192.168.1.109:8019",
     ws: true,
     pathRewrite: {

src/utils/util.js

@@ -148,11 +148,6 @@ export const transDate = (str) => {
  */
 export const setCookie = (name, value, expires, path, domain, secure, domainFlag) => {
   let str = name + '=' + encodeURIComponent(value);
-  // if (expires > 0) {
-  //   let date = new Date();
-  //   date.setTime(date.getTime() + expires * 3600 * 1000);
-  //   str += ';expires=' + date.toGMTString();
-  // }
   if (path) { str += ';path=' + path; }
   if (domain) { str += ';domain=' + domain; }
   if (secure) { str += ';secure=' + secure; }

src/views/TMS/components/purchase/addShipPrice.vue

@@ -25,7 +25,9 @@ export default {
     };
   },
   created(){
-    this.form1.priceDate = new Date();
+    this.form1 = {
+      priceDate:new Date(),
+    }
   },
   methods: {
     // 确定

src/views/TMS/components/purchase/addTruckPrice.vue

@@ -24,7 +24,9 @@ export default {
     };
   },
   created(){
-    this.form1.priceDate = new Date();
+    this.form1 = {
+      priceDate:new Date()
+    }
   },
   methods: {
     // 确定

src/views/inward/components/inwardImport/daZhou/addTruckLoad.vue

@@ -45,7 +45,9 @@ export default {
     };
   },
   created() {
-    this.form.loadTime = new Date();
+    this.form = {
+      loadTime:new Date(),
+    }
   }, 
   methods: {
     selectionChange(val) {

src/views/inward/components/inwardImport/oldAreaRailScale/addTruckLoad.vue

@@ -39,7 +39,9 @@ export default {
   },
 
   created() {
-    this.form.loadTime = new Date();
+    this.form = {
+      loadTime:new Date(),
+    }
     this.form.loadingId = '老区轨道衡'
   },
 

src/views/inward/components/offsetSteel/truckTrain/addApproveWagonPlease.vue

@@ -62,7 +62,9 @@ export default {
     // this.unit();
   },
   created(){
-      this.form1.resultApproveDate = new Date();
+      this.form1 = {
+        resultApproveDate: new Date(),
+      }
   },
   methods: {
     handleCheckedCitiesChange(value) {

src/views/inward/components/offsetSteel/truckTrain/addWagonPlease.vue

@@ -35,7 +35,8 @@ export default {
     // this.unit();
   },
   created(){
-      this.form1.resultPleaseDate = new Date();
+      this.form1 = {resultPleaseDate:new Date()}
+      
   },
   methods: {
     handleCheckedCitiesChange(value) {

src/views/queue/components/qmsEnFacotory/queueFApply.vue

@@ -6,7 +6,9 @@
             <el-input
                 placeholder="请输入内容"
                 v-model="inputText"
-                clearable>
+                clearable
+                class="input"
+            >
             </el-input>
             <el-button type="primary" class="btn" @click="onclick">
                 <i class="el-icon-search"></i>查询
@@ -35,7 +37,7 @@ export default {
     }
 }
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
     .sale{
         .top{
             width: 100%;height: 5rem;
@@ -43,5 +45,9 @@ export default {
             align-items: center;
             padding-left: 2.5rem;
         }
+        .input{
+            width: 250px;
+            margin-right: 20px;
+        }
     }
 </style>

src/views/statisticalReport/components/purchasFuelMonitor/purchasFuelNewMonitor.vue

@@ -2,7 +2,20 @@
 <template>
   <div class="purchasFuelNewMonitor">
     <div class="frameCalculation">
-      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span>进厂时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="date"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="date"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -14,18 +27,38 @@
 </template>
 
 <script>
+import { sjTime } from '@/utils/sharedJsFile'
 export default {
   data() {
     return {
       option: {
-        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=7",
+        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=7&startTime=null&endTime=null&i=" +new Date(),
       },
-      input: "",
+      startTime: null,
+      endTime: null,
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=7&con=" + this.input;
+      let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=7&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+        }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=7&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+      }
     },
   },
 };
@@ -39,8 +72,8 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
-    .input{
-      width: 250px;
+    .el-date-editor{
+      margin: 20px;
     }
   }
 }

src/views/statisticalReport/components/purchasFuelMonitor/purchasFuelOldMonitor.vue

@@ -2,7 +2,20 @@
 <template>
   <div class="purchasFuelOldMonitor">
     <div class="frameCalculation">
-      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span>进厂时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="date"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="date"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -14,18 +27,38 @@
 </template>
 
 <script>
+import { sjTime } from '@/utils/sharedJsFile'
 export default {
   data() {
     return {
       option: {
-        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=6",
+        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=6&startTime=null&endTime=null&i=" +new Date(),
       },
-      input: "",
+      startTime: null,
+      endTime: null,
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=6&con=" + this.input;
+      let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=6&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+        }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=6&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+      }
     },
   },
 };
@@ -39,8 +72,8 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
-    .input{
-      width: 250px;
+    .el-date-editor{
+      margin: 20px;
     }
   }
 }

src/views/statisticalReport/components/purchaseAccessoriesMonitor.vue

@@ -2,7 +2,20 @@
 <template>
   <div class="purchaseAccessoriesMonitor">
     <div class="frameCalculation">
-      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span>进厂时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="date"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="date"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -14,18 +27,38 @@
 </template>
 
 <script>
+import { sjTime } from '@/utils/sharedJsFile'
 export default {
   data() {
     return {
       option: {
-        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=5",
+        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=5&startTime=null&endTime=null&i=" +new Date(),
       },
-      input: "",
+      startTime: null,
+      endTime: null,
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=5&con=" + this.input;
+      let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=5&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+        }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=5&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+      }
     },
   },
 };
@@ -39,8 +72,8 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
-    .input{
-      width: 250px;
+    .el-date-editor{
+      margin: 20px;
     }
   }
 }

src/views/statisticalReport/components/purchaseChemicalMaterials/purchaseChemicalMaterialsNew.vue

@@ -2,7 +2,20 @@
 <template>
   <div class="purchasFuelNewMonitor">
     <div class="frameCalculation">
-      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span>进厂时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="date"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="date"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -14,18 +27,38 @@
 </template>
 
 <script>
+import { sjTime } from '@/utils/sharedJsFile'
 export default {
   data() {
     return {
       option: {
-        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=18",
+        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=18&startTime=null&endTime=null&i=" +new Date(),
       },
-      input: "",
+      startTime: null,
+      endTime: null,
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=18&con=" + this.input;
+      let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=18&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+        }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=18&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+      }
     },
   },
 };
@@ -39,8 +72,8 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
-    .input{
-      width: 250px;
+    .el-date-editor{
+      margin: 20px;
     }
   }
 }

src/views/statisticalReport/components/purchaseChemicalMaterials/purchaseChemicalMaterialsOld.vue

@@ -2,7 +2,20 @@
 <template>
   <div class="purchasFuelOldMonitor">
     <div class="frameCalculation">
-      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span>进厂时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="date"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="date"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -14,18 +27,38 @@
 </template>
 
 <script>
+import { sjTime } from '@/utils/sharedJsFile'
 export default {
   data() {
     return {
       option: {
-        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=17",
+        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=17&startTime=null&endTime=null&i=" +new Date(),
       },
-      input: "",
+      startTime: null,
+      endTime: null,
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=17&con=" + this.input;
+      let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=17&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+        }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=17&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+      }
     },
   },
 };
@@ -39,8 +72,8 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
-    .input{
-      width: 250px;
+    .el-date-editor{
+      margin: 20px;
     }
   }
 }

src/views/statisticalReport/components/salesLogisticsStatistics/transportationPerformance.vue

@@ -1,7 +1,20 @@
 <template>
   <div class="purchasFuelNewMonitor">
     <div class="frameCalculation">
-      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span>进厂时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="date"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="date"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -13,26 +26,38 @@
 </template>
 
 <script>
-import { getCookie } from "@/utils/util.js";
+import { sjTime } from '@/utils/sharedJsFile'
 export default {
   data() {
     return {
       option: {
-        requestUrl: "",
+        requestUrl: "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&i=" +new Date(),
       },
-      input: "",
+      startTime: null,
+      endTime: null,
     };
   },
-  created(){
-      if(getCookie('orgCode') == 'chengyunshang'){
-          this.option.requestUrl = '/api/v1/tms/getAllSaleReport?apiId=423'
-      }else{
-          this.option.requestUrl = '/api/v1/tms/getAllSaleReport?apiId=423'
-      }
-  },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllSaleReport?api=423&con=" + this.input;
+      let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+        }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        this.option.requestUrl = "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+      }
     },
   },
 };
@@ -46,8 +71,8 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
-    .input{
-      width: 250px;
+    .el-date-editor{
+      margin: 20px;
     }
   }
 }

src/views/statisticalReport/components/sporadicReport/sporadicReportEnterFactory.vue

@@ -1,7 +1,20 @@
 <template>
   <div class="purchasFuelNewMonitor">
     <div class="frameCalculation">
-      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span>进厂时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="date"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="date"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -13,26 +26,38 @@
 </template>
 
 <script>
-import { getCookie } from "@/utils/util.js";
+import { sjTime } from '@/utils/sharedJsFile'
 export default {
   data() {
     return {
       option: {
-        requestUrl: "",
+        requestUrl: "/api/v1/tms/getSporadicSuppliesReport1?apiId=424&startTime=null&endTime=null&i=" +new Date(),
       },
-      input: "",
+      startTime: null,
+      endTime: null,
     };
   },
-  created(){
-      if(getCookie('orgCode') == 'chengyunshang'){
-          this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport1?apiId=424'
-      }else{
-          this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport1?apiId=424'
-      }
-  },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getSporadicSuppliesReport1?api=424&con=" + this.input;
+      let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = "/api/v1/tms/getSporadicSuppliesReport1?apiId=424&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+        }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        this.option.requestUrl = "/api/v1/tms/getSporadicSuppliesReport1?apiId=424&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+      }
     },
   },
 };
@@ -46,8 +71,8 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
-    .input{
-      width: 250px;
+    .el-date-editor{
+      margin: 20px;
     }
   }
 }

src/views/statisticalReport/components/sporadicReport/sporadicReportExFactory.vue

@@ -1,7 +1,20 @@
 <template>
   <div class="purchasFuelNewMonitor">
     <div class="frameCalculation">
-      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span>进厂时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="date"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="date"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -13,26 +26,38 @@
 </template>
 
 <script>
-import { getCookie } from "@/utils/util.js";
+import { sjTime } from '@/utils/sharedJsFile'
 export default {
   data() {
     return {
       option: {
-        requestUrl: "",
+        requestUrl: "/api/v1/tms/getSporadicSuppliesReport2?apiId=425&startTime=null&endTime=null&i=" +new Date(),
       },
-      input: "",
+      startTime: null,
+      endTime: null,
     };
   },
-  created(){
-      if(getCookie('orgCode') == 'chengyunshang'){
-          this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport2?apiId=425'
-      }else{
-          this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport2?apiId=425'
-      }
-  },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getSporadicSuppliesReport2?api=425&con=" + this.input;
+      let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = "/api/v1/tms/getSporadicSuppliesReport2?apiId=425&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+        }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        this.option.requestUrl = "/api/v1/tms/getSporadicSuppliesReport2?apiId=425&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+      }
     },
   },
 };
@@ -46,8 +71,8 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
-    .input{
-      width: 250px;
+    .el-date-editor{
+      margin: 20px;
     }
   }
 }