Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

build/utils.js

@@ -23,10 +23,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 
 
 // let devModules = ['index','RMS','systemConfig','TMS']
-//let devModules = ['all'];
+// let devModules = ['all'];
 // let devModules = ['index','inward','appoint','sale']
 // let devModules = ['index','SporadicManage','RMS']
-
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicOutfactory/load.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getUnloadResult?apiId=404&orderType=16",
+        requestUrl: "/api/v1/tms/getAllLoadResult?apiId=404&orderType=16&status=0",
       },
     };
   },
   methods: {
     onclick() {
-          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=404&orderType=16&con=" + this.input;
+          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=404&orderType=16&status=0&con=" + this.input;
     },
    }
 };

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicOutfactory/tareWeight.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=401&orderType=16",
+        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=16",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=401&orderType=16&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=16&con=" + this.input;
     },
   },
 };

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

@@ -22,7 +22,7 @@ export default {
       },
       input: "",
     };
-  },
+  }, 
   created(){
       if(getCookie('orgCode') == 'chengyunshang'){
           this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport2?apiId=425'