tj

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','statisticalReport','appoint','RMS'];
+let devModules = ['all'];
+// let devModules = ['index','statisticalReport','appoint','RMS'];
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

src/components/DilCommonUI/packages/table/src/table.js

@@ -91,22 +91,28 @@ export default {
         }else{
           // 发送请求
           this.axios
-          .post(url, data, {
-            // 请求地址 中
-            params: {
-              pageNum: pageNum || this.dataCurrentPage,
-              pageSize: pageSize || this.dataPageSize
-            }
-          })
-          .then(response => {
-            let d = response.data.data;
-            this.dataTabel = d.list;
-            this.dataTotal = d.total;
-            //执行成功的回调
-            this.$emit('func',response.data.data);
-            this.refreshColumnData(d.columnData);
-            this.isShow = true;
-          });
+            .post(url, data, {
+              // 请求地址 中
+              params: {
+                pageNum: pageNum || this.dataCurrentPage,
+                pageSize: pageSize || this.dataPageSize
+              }
+            })
+            .then(response => {
+              let d = response.data.data;
+              this.dataTabel = d.list;
+              this.dataTotal = d.total;
+              //执行成功的回调
+              this.$emit('func',response.data.data);
+              this.refreshColumnData(d.columnData);
+
+              this.isShow = true;
+              //若父组件存在要合计的值
+              if(this.$parent.totalNumber>=0){
+                //将筛选的字段传给父组件
+                this.$parent.calculationTotalNumber(this.dataRequestQuery);
+              }
+            });
         }
       } else {
         console.warn("requestUrl 参数不能为 null");

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicEnfactory/enFactory.vue

@@ -27,7 +27,7 @@ export default {
     };
   },
   created(){
-    if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+    if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=15"
       }else{
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=15&userId=" + getCookie("orgCode")
@@ -36,14 +36,14 @@ export default {
   methods: {
     onclick() {
       if(this.input != null){
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=15&con=" + this.input
           }else{
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=15&userId=" + getCookie("orgCode") + "&con=" + this.input
                }
       }else{
           this.$message.warning("未输入查询条件")
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=15"
           }else{
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=15&userId=" + getCookie("orgCode")

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicEnfactory/outFactory.vue

@@ -27,7 +27,7 @@ export default {
     };
   },
   created(){
-      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=15"
       }else{
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=15&userId=" + getCookie("orgCode")
@@ -36,14 +36,14 @@ export default {
   methods: {
     onclick() {
       if(this.input != null){
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=15&con=" + this.input
           }else{
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=15&userId=" + getCookie("orgCode") + "&con=" + this.input
                }
       }else{
           this.$message.warning("未输入查询条件")
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=15"
           }else{
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=15&userId=" + getCookie("orgCode")

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

@@ -27,7 +27,7 @@ export default {
     };
   },
   created(){
-      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=15"
       }else{
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=15&userId=" + getCookie("orgCode")
@@ -36,14 +36,14 @@ export default {
   methods: {
     onclick() {
       if(this.input != null){
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=15&con=" + this.input
           }else{
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=15&userId=" + getCookie("orgCode") + "&con=" + this.input
                }
       }else{
           this.$message.warning("未输入查询条件")
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=15"
           }else{
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=15&userId=" + getCookie("orgCode")

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

@@ -27,7 +27,7 @@ export default {
     };
   },
   created(){
-    if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+    if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16"
       }else{
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16&userId=" + getCookie("orgCode")
@@ -36,14 +36,14 @@ export default {
   methods: {
     onclick() {
       if(this.input != null){
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16&con=" + this.input
           }else{
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16&userId=" + getCookie("orgCode") + "&con=" + this.input
                }
       }else{
           this.$message.warning("未输入查询条件")
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16"
           }else{
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16&userId=" + getCookie("orgCode")

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

@@ -27,7 +27,7 @@ export default {
     };
   },
   created(){
-      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=16"
       }else{
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=16&userId=" + getCookie("orgCode")
@@ -36,14 +36,14 @@ export default {
   methods: {
     onclick() {
       if(this.input != null){
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=16&con=" + this.input
           }else{
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=16&userId=" + getCookie("orgCode") + "&con=" + this.input
                }
       }else{
           this.$message.warning("未输入查询条件")
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=16"
           }else{
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=16&userId=" + getCookie("orgCode")

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

@@ -27,7 +27,7 @@ export default {
     };
   },
   created(){
-      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=16"
       }else{
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=16&userId=" + getCookie("orgCode")
@@ -36,14 +36,14 @@ export default {
   methods: {
     onclick() {
       if(this.input != null){
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=16&con=" + this.input
           }else{
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=16&userId=" + getCookie("orgCode") + "&con=" + this.input
                }
       }else{
           this.$message.warning("未输入查询条件")
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=16"
           }else{
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=16&userId=" + getCookie("orgCode")

src/views/SporadicManage/components/sporadicMaterial/sporadicEnfactory/enFactory.vue

@@ -14,6 +14,7 @@
 </template>
 
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   name: "homeworkPath",
   data() {
@@ -21,13 +22,20 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=12",
+        requestUrl: "",
       },
     };
   },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=12"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=12&userId=" + getCookie("orgCode")
+      }
+  },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=394&orderType=12&con=" + this.input;
+      this.$message.info("功能暂时关闭")
     },
   },
 };

src/views/SporadicManage/components/sporadicMaterial/sporadicEnfactory/grossWeight.vue

@@ -14,6 +14,7 @@
 </template>
 
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   name: "homeworkPath",
   data() {
@@ -21,13 +22,20 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=12",
+        requestUrl: "",
       },
     };
   },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=12"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=12&userId=" + getCookie("orgCode")
+      }
+  },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=12&con=" + this.input;
+      this.$message.info("功能暂时关闭")
     },
   },
 };

src/views/SporadicManage/components/sporadicMaterial/sporadicEnfactory/outFactory.vue

@@ -14,6 +14,7 @@
 </template>
 
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   name: "homeworkPath",
   data() {
@@ -21,13 +22,20 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=12",
+        requestUrl: "",
       },
     };
   },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=12"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=12&userId=" + getCookie("orgCode")
+      }
+  },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=12&con=" + this.input;
+      this.$message.info("功能暂时关闭")
     },
   },
 };

src/views/SporadicManage/components/sporadicMaterial/sporadicEnfactory/tareWeight.vue

@@ -14,6 +14,7 @@
 </template>
 
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   name: "homeworkPath",
   data() {
@@ -21,13 +22,20 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=12",
+        requestUrl: "",
       },
     };
   },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=12"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=12&userId=" + getCookie("orgCode")
+      }
+  },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=12&con=" + this.input;
+      this.$message.info("功能暂时关闭")
     },
   },
 };

src/views/SporadicManage/components/sporadicMaterial/sporadicEnfactory/unload.vue

@@ -13,6 +13,7 @@
 </template>
 
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   name: "homeworkPath",
   data() {
@@ -21,13 +22,20 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getUnloadResult?apiId=389&orderType=12",
+        requestUrl: "",
       },
     };
   },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=12"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=12&userId=" + getCookie("orgCode")
+      }
+  },
   methods: {
     onclick() {
-          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=12&con=" + this.input;
+          this.$message.info("功能暂时关闭")
     },
    }
 };

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/enFactory.vue

@@ -14,6 +14,7 @@
 </template>
 
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   name: "homeworkPath",
   data() {
@@ -21,13 +22,20 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=13",
+        requestUrl: "",
       },
     };
   },
+  created(){
+    if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=13"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=13&userId=" + getCookie("orgCode")
+      }
+  },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=13&con=" + this.input;
+      this.$message.info("功能暂时关闭")
     },
   },
 };

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/grossWeight.vue

@@ -14,6 +14,7 @@
 </template>
 
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   name: "homeworkPath",
   data() {
@@ -21,13 +22,20 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=398&orderType=13",
+        requestUrl: "",
       },
     };
   },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=398&orderType=13"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=398&orderType=13&userId=" + getCookie("orgCode")
+      }
+  },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=422&orderType=13&con=" + this.input;
+      this.$message.info("功能暂时关闭")
     },
   },
 };

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

@@ -13,6 +13,7 @@
 </template>
 
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   name: "homeworkPath",
   data() {
@@ -21,13 +22,20 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllLoadResult?apiId=430&orderType=13&status=0",
+        requestUrl: "",
       },
     };
   },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=430&orderType=13&status=0"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=430&orderType=13&status=0&userId=" + getCookie("orgCode")
+      }
+  },
   methods: {
     onclick() {
-          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=430&orderType=13&status=0&con=" + this.input;
+          this.$message.info("功能暂时关闭")
     },
    }
 };

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/outFactory.vue

@@ -14,6 +14,7 @@
 </template>
 
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   name: "homeworkPath",
   data() {
@@ -21,13 +22,20 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=13",
+        requestUrl: "",
       },
     };
   },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=13"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=13&userId=" + getCookie("orgCode")
+      }
+  },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=13&con=" + this.input;
+      this.$message.info("功能暂时关闭")
     },
   },
 };

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

@@ -14,6 +14,7 @@
 </template>
 
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   name: "homeworkPath",
   data() {
@@ -25,9 +26,16 @@ export default {
       },
     };
   },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=401&orderType=13"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=401&orderType=13&userId=" + getCookie("orgCode")
+      }
+  },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=401&orderType=13&con=" + this.input;
+      this.$message.info("功能暂时关闭")
     },
   },
 };

src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue

@@ -590,7 +590,7 @@ export default {
           carrierId: this.carrierId,
           receiveId: this.consigneeId,
           orderTime:this.materialTimes,
-          userId:getCookie("userId"),
+          userId:getCookie("orgCode"),
           mapList: this.tableData,
         };
         this.axios.post("/api/v1/ams/addSporadicOrders", amsOrder).then((res) => {

src/views/SporadicManage/components/sporadicMaterial/transportAppoint/transportAppoint.vue

@@ -100,9 +100,9 @@ export default {
             this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12",
             this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1"       
       }else{
-            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("userId"),
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&userId=" + getCookie("userId"),
-            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&userId=" + getCookie("userId")
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("orgCode"),
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&userId=" + getCookie("orgCode"),
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&userId=" + getCookie("orgCode")
       }
   },
   methods: {
@@ -112,9 +112,9 @@ export default {
             this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&test=" + new Date(),
             this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&test=" + new Date()
       }else{
-            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("userId") + "&test=" + new Date(),
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&userId=" + getCookie("userId") + "&test=" + new Date(),
-            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&userId=" + getCookie("userId") + "&test=" + new Date()
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("orgCode") + "&test=" + new Date(),
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&userId=" + getCookie("orgCode") + "&test=" + new Date(),
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&userId=" + getCookie("orgCode") + "&test=" + new Date()
      }
     },
     stopSpoOrder(scope){
@@ -169,11 +169,11 @@ export default {
         }else
         {
           if(this.activeName == "first"){
-            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("userId") + "&con=" + this.input
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("orgCode") + "&con=" + this.input
           }else if(this.activeName == "second"){
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&userId=" + getCookie("userId") + "&con=" + this.input
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&userId=" + getCookie("orgCode") + "&con=" + this.input
           }else{
-            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=11&userId=" + getCookie("userId") + "&con=" + this.input
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=11&userId=" + getCookie("orgCode") + "&con=" + this.input
           }       
         }
         }else{

src/views/SporadicManage/components/sporadicMaterial/transportOrder/addTransportOrder.vue

@@ -154,11 +154,15 @@ export default {
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
         getCookie("userId");
         this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12&dispatchStatus=0&carrierSsoId=" + getCookie("userId");
-    } else {
+    } else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "wuliuchuyunzhongxin"){
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
         this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12&dispatchStatus=0&sporadicStatus=0";
-    } 
+    } else{
+        this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
+        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12&dispatchStatus=0&userId=" + getCookie("orgCode");
+    }
   },
   methods: {
     onInput(val){
@@ -236,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
     },
   },
 };

src/views/SporadicManage/components/sporadicMaterial/transportOrder/transportOrder.vue

@@ -11,21 +11,6 @@
       </el-button>
     </div>
     <el-dialog title="车辆信息" :visible.sync="dialogTableVisible" :before-close="handleClose">
-     <el-input
-        placeholder="请输入内容"
-        v-model="truckText"
-        style="margin-top: 10px; margin-left: 20px; width: 250px"
-        clearable
-      >
-      </el-input>
-      <el-button
-        type="primary"
-        class="btn"
-        @click="selectTruckClick"
-        style="margin-left: 5px"
-      >
-        <i class="el-icon-search"></i>查询
-      </el-button>
     <dilTable
           v-bind.sync="truck"
           @radio-change="currentRadioChange1"
@@ -72,6 +57,11 @@
           </el-table-column>
           </dilTable>
         </el-tab-pane>
+         <!-- 已完成 -->
+        <el-tab-pane label="已完成" name="completed">
+          <dilTable v-bind.sync="completed">
+          </dilTable>
+        </el-tab-pane>
       </el-tabs>
     </div> 
   </div>
@@ -103,6 +93,9 @@ export default {
       },
       Received:{
         requestUrl: "",
+      },
+      completed:{
+        requestUrl:"",
       },
        //车辆的表格
       truck: {
@@ -158,13 +151,16 @@ export default {
       }
       if(getCookie('orgCode') == "chengyunshang"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + getCookie("userId") ,
-        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + getCookie("userId")
-      }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + getCookie("userId"),
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&carrierId=" + getCookie("userId")
+      }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "wuliuchuyunzhongxin"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4"
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5"
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2"
       }else{
-        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4"
-        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5"
+        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&userId=" + getCookie("orgCode")
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&userId=" + getCookie("orgCode")
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&userId=" + getCookie("orgCode")
       }
   },
   methods: {
@@ -176,12 +172,15 @@ export default {
         if(getCookie('orgCode') == "chengyunshang"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + getCookie("userId") + "&test=" + new Date() ,
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + getCookie("userId") + "&test=" + new Date()
-      }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&carrierId=" + getCookie("userId") + "&test=" + new Date()
+      }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "wuliuchuyunzhongxin"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4" + "&test=" + new Date()
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5" + "&test=" + new Date()
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2" + "&test=" + new Date()
       }else{
-        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4" + "&test=" + new Date()
-        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5" + "&test=" + new Date()
+        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&userId=" + getCookie("orgCode") + "&test=" + new Date()
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&userId=" + getCookie("orgCode") + "&test=" + new Date()
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&userId=" + getCookie("orgCode") + "&test=" + new Date()
       }
     },
     getTruckRequestUrl(){

src/views/TMS/components/importedFuel/transportReserveRanAdd.vue

@@ -356,7 +356,6 @@ export default {
       }
     },
     func(res){
-      console.log(res);
       this.isKuang = false;
     },
     onclick() {

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

@@ -30,7 +30,7 @@ export default {
         }
     },
     created(){
-        if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+        if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
             this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=434&orderType=10"
         }else{
             this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=434&orderType=10&userId=" + getCookie("orgCode")

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

@@ -30,7 +30,7 @@ export default {
         }
     },
     created(){
-        if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+        if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
             this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=354&orderType=10"
         }else{
             this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=354&orderType=10&userId=" + getCookie("orgCode")

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

@@ -30,7 +30,7 @@ export default {
         }
     },
     created(){
-        if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+        if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
             this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=110&orderType=10"
         }else{
             this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=110&orderType=10&userId=" + getCookie("orgCode")

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

@@ -30,7 +30,7 @@ export default {
         }
     },
     created(){
-        if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+        if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
             this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=436&orderType=10"
         }else{
             this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=436&orderType=10&userId=" + getCookie("orgCode")

src/views/sale/components/transport_order/receiveOrder.vue

@@ -11,12 +11,35 @@
         <i class="el-icon-refresh"></i>刷新
       </el-button>
     </div>
+    <el-dialog title="车辆信息" :visible.sync="dialogTableVisible" :before-close="handleClose">
+    <el-input placeholder="请输入内容" v-model="inputTruck" clearable style="width:200px">
+      </el-input>
+      <el-button type="primary" class="btn" @click="onClickTruck">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    <dilTable
+          v-bind.sync="truck"
+          @radio-change="currentRadioChange1"
+        >
+    </dilTable>
+    <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogTableVisible = false">取 消</el-button>
+    <el-button type="primary" @click="updateTruckCapacity()">确 定</el-button>
+    </span>
+    </el-dialog>
         <el-tabs v-model="activeName">
           <!-- 未接收 -->
           <el-tab-pane label="未接收" name="third">
             <dilTable v-bind.sync="option3" ref="table2">
-              <el-table-column fixed="right" label="操作" width="120">
+              <el-table-column fixed="right" label="操作" width="180">
                 <template slot-scope="scope">
+                  <el-button
+                    @click="updateCapacity(scope.row)"
+                    type="text"
+                    size="small"
+                  >
+                    修改运力
+                  </el-button>
                   <el-button
                     @click="detailclick2(scope.row)"
                     type="text"
@@ -132,6 +155,7 @@ import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
+      inputTruck:null,
       inputText: "",
       option1: {
         // option1请求数据的地址，承运商(运输订单状态为已接收，接收状态为已接收)
@@ -151,6 +175,11 @@ export default {
           "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&carrierSsoId=" +
           getCookie("userId"),
       },
+      truck: {
+        requestUrl:
+          "",
+        selectionType:"radio"
+      },
       activeName: "third",
       //记录旧的row对象(已接收)
       oldRow: "",
@@ -189,12 +218,82 @@ export default {
       tableData: [],
       tableData1: [],
       tableData2: [],
+      capacityId:null,
+      dialogTableVisible:false,
+      orderId:null
     };
   },
   methods: {
+    onClickTruck(){
+        if (getCookie("orgCode") == "chengyunshang") {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+          getCookie("userId") + "&index="+this.inputTruck;
+      } else {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null + "&index="+this.inputTruck;
+      }
+    },
+    getRequestUrl(){
+        this.option1.requestUrl = "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&carrierSsoId=" +
+          getCookie("userId") + "&t=" + new Date(),
+        this.option2.requestUrl = "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&carrierSsoId=" +
+          getCookie("userId") + "&t=" + new Date(),
+        this.option3.requestUrl = "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&carrierSsoId=" +
+          getCookie("userId") + "&t=" + new Date()
+    },
     refresh(){
       this.$router.go(0);
     },
+    handleClose(done){
+      done()
+      this.$message.info("取消修改运力")
+    },
+    updateCapacity(row){
+      console.log("更新车牌号")
+      this.getTruckRequestUrl()
+      this.orderId = row.orderId
+      this.dialogTableVisible = true
+      console.log(row.orderId)
+    },
+    getTruckRequestUrl(){
+        if (getCookie("orgCode") == "chengyunshang") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+        getCookie("userId") + "&test=" + new Date();
+      } else {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null +  "&test=" + new Date();
+      }
+    },
+    updateClick(scope){
+      this.getTruckRequestUrl()
+      this.orderId = scope.row.orderId
+      this.dialogTableVisible = true
+      console.log(scope.row.orderId)
+    },
+    currentRadioChange1(row){
+      console.log(row)
+      this.capacityId = row.capacityId
+    },
+    updateTruckCapacity(){
+        if(this.capacityId == null){
+            this.$message.error("未选中运力")
+            return
+        }
+        this.axios.post("/api/v1/oms/updateCapacityId",{
+          capacityId:this.capacityId,
+          orderId :this.orderId
+        }).then((res) =>{
+          if(res.data.code == "200"){
+            this.$message.success("修改运力成功")
+            this.getRequestUrl()
+            this.dialogTableVisible = false
+          }else{
+            this.$message.error("修改运力失败")
+          }
+        })
+    },
     onClick() {
       if (this.activeName == "first") {
         this.option1.requestUrl =

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

@@ -17,9 +17,13 @@
       <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>
+      <span style="margin-left: 1rem;">合计车数：</span>
+      <el-input v-model="totalCapacity" :disabled="true" style="width: 150px;"></el-input>
     </div>
     <div class="table">
-      <dilTable ref="excelDom" v-bind.sync="option"></dilTable>
+      <dilTable ref="excelDom" v-bind.sync="option" :isKuang="isKuang" @func="func" :pageSize = "pageSize"></dilTable>
     </div>
   </div>
 </template>
@@ -29,17 +33,33 @@ 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(),
       },
-      Time:'',
+      Time:null,
+      //合计净重
+      totalNumber: 0,
+      //合计车数
+      totalCapacity: 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);
     },
+    func(res){
+      //获取总记录条数作为合计车数
+      this.totalCapacity = res.total;
+      this.isKuang = false;
+    },
     onclick() {
       let startTime = null;
       let endTime = null;
@@ -48,7 +68,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>

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

@@ -46,17 +46,10 @@ export default {
       this.option.requestUrl =
         "/api/v1/tms/getSporadicSuppliesReport1?apiId=425&orderType=12&startTime=null&endTime=null&i=" +
         new Date();
-    }else if(getCookie("orgCode") == "baohua" || getCookie("orgCode") == "xiaoshougongsi"){
-            this.option.requestUrl =
-        "/api/v1/tms/getSporadicSuppliesReport1?apiId=424&userId=" +
-        getCookie("orgCode") +
-        "&startTime=null&endTime=null&i=" +
-        new Date();
-    }
-    else {
+    }else {
       this.option.requestUrl =
         "/api/v1/tms/getSporadicSuppliesReport1?apiId=424&userId=" +
-        getCookie("userId") +
+        getCookie("orgCode") +
         "&startTime=null&endTime=null&i=" +
         new Date();
     }
@@ -74,17 +67,10 @@ export default {
       this.option.requestUrl =
         "/api/v1/tms/getSporadicSuppliesReport1?apiId=425&orderType=12&startTime=null&endTime=null&i=" +
         new Date();
-    }else if(getCookie("orgCode") == "baohua" || getCookie("orgCode") == "xiaoshougongsi"){
-            this.option.requestUrl =
-        "/api/v1/tms/getSporadicSuppliesReport1?apiId=424&userId=" +
-        getCookie("orgCode") +
-        "&startTime=null&endTime=null&i=" +
-        new Date();
-    }
-    else {
+    }else {
       this.option.requestUrl =
         "/api/v1/tms/getSporadicSuppliesReport1?apiId=424&userId=" +
-        getCookie("userId") +
+        getCookie("orgCode") +
         "&startTime=null&endTime=null&i=" +
         new Date();
     }
@@ -104,11 +90,8 @@ export default {
           this.option.requestUrl = "/api/v1/tms/getSporadicSuppliesReport1?apiId=424&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
           this.option.requestUrl = "/api/v1/tms/getSporadicSuppliesReport1?apiId=424&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
-          }else if(getCookie("orgCode") == "baohua" || getCookie("orgCode") == "xiaoshougongsi"){
-          this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport1?apiId=424&userId=' + getCookie("orgCode")+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
-          }
-          else{
-          this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport1?apiId=424&userId=' + getCookie("userId")+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          }else{
+          this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport1?apiId=424&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
           }
         } else {
           this.startTime = null;

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

@@ -45,12 +45,9 @@ export default {
           this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport2?apiId=425&startTime=null&endTime=null&i=' +new Date();
       }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
           this.option.requestUrl = "/api/v1/tms/getSporadicSuppliesReport2?apiId=425&orderType=13&startTime=null&endTime=null&i=" +new Date();
-      }else if(getCookie("orgCode") == "baohua" || getCookie("orgCode") == "xiaoshougongsi"){
+      }else{
           this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport2?apiId=425&userId=' + getCookie("orgCode")+"&startTime=null&endTime=null&i=" +new Date();
       }
-      else{
-          this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport2?apiId=425&userId=' + getCookie("userId")+"&startTime=null&endTime=null&i=" +new Date();
-      }
   },
   methods: {
     getRequestUrl(){
@@ -58,12 +55,9 @@ export default {
           this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport2?apiId=425&startTime=null&endTime=null&i=' +new Date();
       }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
           this.option.requestUrl = "/api/v1/tms/getSporadicSuppliesReport2?apiId=425&orderType=13&startTime=null&endTime=null&i=" +new Date();
-      }else if(getCookie("orgCode") == "baohua" || getCookie("orgCode") == "xiaoshougongsi"){
+      }else{
           this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport2?apiId=425&userId=' + getCookie("orgCode")+"&startTime=null&endTime=null&i=" +new Date();
       }
-      else{
-          this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport2?apiId=425&userId=' + getCookie("userId")+"&startTime=null&endTime=null&i=" +new Date();
-      }
     },
     onclick() {
       let startTime = null;
@@ -80,12 +74,9 @@ export default {
           this.option.requestUrl = "/api/v1/tms/getSporadicSuppliesReport2?apiId=425&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
           this.option.requestUrl = "/api/v1/tms/getSporadicSuppliesReport2?apiId=425&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
-          }else if(getCookie("orgCode") == "baohua" || getCookie("orgCode") == "xiaoshougongsi"){
+          }else{
           this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport2?apiId=425&userId=' + getCookie("orgCode")+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
           }
-          else{
-          this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport2?apiId=425&userId=' + getCookie("userId")+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
-          }
         }else{
           this.startTime = null;
           this.endTime = null;