Your Name 3 years ago
parent
commit
58a9492ecf

+ 2 - 2
build/utils.js

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

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

@@ -70,6 +70,7 @@ export default {
         }
         //判断是否是带分页查询
         if(this.isKuang){
+          console.log(11111111111111111111111111);
           // 发送请求
           this.axios
           .post(url, data, {
@@ -89,6 +90,7 @@ export default {
             this.isShow = true;
           });
         }else{
+          console.log(2222222222222222222222222);
           // 发送请求
           this.axios
             .post(url, data, {

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

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

+ 3 - 3
src/views/SporadicManage/components/sporadicMaterial/transportOrder/addTransportOrder.vue

@@ -240,12 +240,12 @@ export default {
       if(getCookie("orgCode") == "chengyunshang") {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
-        getCookie("userId");
+        getCookie("userId") + "&t=" + new Date();
     } else {
       this.truck.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + + "&t=" + new Date();;
     } 
-        this.truckDrawer = true
+      this.truckDrawer = true
     },
   },
 };

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

@@ -23,7 +23,7 @@
       <el-input v-model="totalCapacity" :disabled="true" style="width: 150px;"></el-input>
     </div>
     <div class="table">
-      <dilTable ref="excelDom" v-bind.sync="option" :isKuang="isKuang" @func="func"></dilTable>
+      <dilTable ref="excelDom" v-bind.sync="option" :isKuang="isKuang" @func="func" :pageSize = "pageSize"></dilTable>
     </div>
   </div>
 </template>
@@ -33,6 +33,7 @@ import { sjTime } from '@/utils/sharedJsFile'
 export default {
   data() {
     return {
+      pageSize:100,
       isKuang:false,
       option: {
         requestUrl: "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&i=" +new Date(),