零星物流bug修改

build/utils.js

@@ -19,7 +19,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 
 
 //  let devModules = ['all']
-let devModules = ['index','SporadicManage','RMS']
+let devModules = ['index','SporadicManage','RMS','statisticalReport']
 // let devModules = ['index','inward','statisticalReport']
 //  let devModules = ['index','WMS','sale','TMS','inward','SporadicManage']
 // let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/LeaveFactory.vue

@@ -12,6 +12,22 @@
        <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
+      <span class="text">流向：</span>
+      <el-select
+        class="select"
+        v-model="flow"
+        placeholder="请选择"
+        @change="onchange()"
+      >
+        <el-option
+          v-for="item in flowList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <span class="span"></span>
     </div>
     <dilTable v-bind.sync="option">      
     </dilTable>
@@ -32,16 +48,37 @@ export default {
         // 表格请求数据的地址
         requestUrl: "",
       },
+      flow:null,
+      flowList:[{
+          value: 12,
+          label: "进厂",
+        },
+        {
+          value: 13,
+          label: "出厂",
+        },
+        {
+          value: 14,
+          label: "中转",
+        },
+        ]
     };
   },
   created(){
-      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=20"
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=100"
       }else{
-          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=20&userId=" + getCookie("orgCode")
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=100&userId=" + getCookie("orgCode")
       }
   },
   methods: {
+    onchange(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=" + this.flow
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&userId=" + getCookie("orgCode") + "&orderType=" + this.flow
+      }
+    },
     onclick() {
         let startTime = null;
       let endTime = null;

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/Load.vue

@@ -7,6 +7,22 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
+      <span class="text">流向：</span>
+      <el-select
+        class="select"
+        v-model="flow"
+        placeholder="请选择"
+        @change="onchange()"
+      >
+        <el-option
+          v-for="item in flowList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <span class="span"></span>
     </div>
     <dilTable v-bind.sync="option"></dilTable>
   </div>
@@ -24,16 +40,37 @@ export default {
         // 表格请求数据的地址
         requestUrl: "",
       },
+      flow:null,
+      flowList:[{
+          value: 12,
+          label: "进厂",
+        },
+        {
+          value: 13,
+          label: "出厂",
+        },
+        {
+          value: 14,
+          label: "中转",
+        },
+        ]
     };
   },
   created(){
-      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=430&orderType=20&status=0"
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=430&orderType=100&status=0"
       }else{
-          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=430&orderType=20&status=0&userId=" + getCookie("orgCode")
+          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=430&orderType=100&status=0&userId=" + getCookie("orgCode")
       }
   },
   methods: {
+    onchange(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=430&status=0" + "&orderType=" + this.flow
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=430&status=0&userId=" + getCookie("orgCode") + "&orderType=" + this.flow
+      }
+    },
     onclick() {
           this.$message.info("功能暂时关闭")
     },

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/enFactory.vue

@@ -12,6 +12,22 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
+      <span class="text">流向：</span>
+      <el-select
+        class="select"
+        v-model="flow"
+        placeholder="请选择"
+        @change="onchange()"
+      >
+        <el-option
+          v-for="item in flowList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <span class="span"></span>
     </div>
     <dilTable v-bind.sync="option">      
     </dilTable>
@@ -32,17 +48,37 @@ export default {
         // 表格请求数据的地址
         requestUrl: "",
       },
+      flow:null,
+      flowList:[{
+          value: 12,
+          label: "进厂",
+        },
+        {
+          value: 13,
+          label: "出厂",
+        },
+        {
+          value: 14,
+          label: "中转",
+        },
+        ]
     };
   },
   created(){
-    console.log("enter!")
-      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=20"
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=100"
       }else{
-          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=20&userId=" + getCookie("orgCode")
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=100&userId=" + getCookie("orgCode")
       }
   },
   methods: {
+    onchange(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=" + this.flow
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&userId=" + getCookie("orgCode") + "&orderType=" + this.flow
+      }
+    },
     onclick() {
       let startTime = null;
       let endTime = null;
@@ -55,7 +91,7 @@ export default {
       if (startTime && endTime) {
         if (startTime < endTime) {
           // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=100&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
 
           // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
           // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/grossWeight.vue

@@ -7,7 +7,24 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
+      <span class="text">流向：</span>
+      <el-select
+        class="select"
+        v-model="flow"
+        placeholder="请选择"
+        @change="onchange()"
+      >
+        <el-option
+          v-for="item in flowList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <span class="span"></span>
     </div>
+    
     <dilTable v-bind.sync="option">      
     </dilTable>
   </div>
@@ -24,16 +41,36 @@ export default {
         // 表格请求数据的地址
         requestUrl: "",
       },
+      flow:null,
+      flowList:[{
+          value: 12,
+          label: "进厂",
+        },
+        {
+          value: 13,
+          label: "出厂",
+        },
+        {
+          value: 14,
+          label: "中转",
+        },
+        ]
     };
   },
   created(){
-      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=20"
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=100"
       }else{
-          this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=20&userId=" + getCookie("orgCode")
+          this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=100&userId=" + getCookie("orgCode")
       }
   },
   methods: {
+    onchange(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=" + this.flow
+      }else{
+      }
+    },
     onclick() {
       this.$message.info("功能暂时关闭")
     },

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/tareWeight.vue

@@ -7,7 +7,24 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
+      <span class="text">流向：</span>
+      <el-select
+        class="select"
+        v-model="flow"
+        placeholder="请选择"
+        @change="onchange()"
+      >
+        <el-option
+          v-for="item in flowList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <span class="span"></span>
     </div>
+
     <dilTable v-bind.sync="option">      
     </dilTable>
   </div>
@@ -24,16 +41,37 @@ export default {
         // 表格请求数据的地址
         requestUrl: "",
       },
+      flow:null,
+      flowList:[{
+          value: 12,
+          label: "进厂",
+        },
+        {
+          value: 13,
+          label: "出厂",
+        },
+        {
+          value: 14,
+          label: "中转",
+        },
+        ]
     };
   },
   created(){
-      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=20"
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=100"
       }else{
-          this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=20&userId=" + getCookie("orgCode")
+          this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=100&userId=" + getCookie("orgCode")
       }
   },
   methods: {
+    onchange(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=" + this.flow
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&userId=" + getCookie("orgCode") + "&orderType=" + this.flow
+      }
+    },
     onclick() {
       this.$message.info("功能暂时关闭")
     },

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/unload.vue

@@ -7,6 +7,22 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
+      <span class="text">流向：</span>
+      <el-select
+        class="select"
+        v-model="flow"
+        placeholder="请选择"
+        @change="onchange()"
+      >
+        <el-option
+          v-for="item in flowList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <span class="span"></span>
     </div>
     <dilTable v-bind.sync="option"></dilTable>
   </div>
@@ -24,16 +40,37 @@ export default {
         // 表格请求数据的地址
         requestUrl: "",
       },
+      flow:null,
+      flowList:[{
+          value: 12,
+          label: "进厂",
+        },
+        {
+          value: 13,
+          label: "出厂",
+        },
+        {
+          value: 14,
+          label: "中转",
+        },
+        ]
     };
   },
   created(){
-      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=20"
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=100"
       }else{
-          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=20&userId=" + getCookie("orgCode")
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=100&userId=" + getCookie("orgCode")
       }
   },
   methods: {
+    onchange(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=" + this.flow
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=100&userId=" + getCookie("orgCode") + "&orderType=" + this.flow
+      }
+    },
     onclick() {
           this.$message.info("功能暂时关闭")
     },

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

@@ -1,85 +0,0 @@
-//进厂
-<template>
-  <!-- 零星物资进厂作业页面 -->
-  <div class="homeworkPath">
-    <div class="top">
-      <span class="text">进门时间：</span>
-      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
-      </el-date-picker>
-      <span class="text">至</span>
-      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
-      </el-date-picker>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-    </div>
-    <dilTable v-bind.sync="option">      
-    </dilTable>
-  </div>
-</template>
-
-<script>
-import { sjTime } from "@/utils/sharedJsFile";
-import { getCookie } from "@/utils/util.js";
-export default {
-  name: "homeworkPath",
-  data() {
-    return {
-      input: "",
-      startTime: null,
-      endTime: null,
-      option: {
-        // 表格请求数据的地址
-        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() {
-      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) {
-          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=12&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
-
-          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
-          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
-          // }else{
-          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
-          // }
-        } else {
-          this.startTime = null;
-          this.endTime = null;
-          this.$message.warning("开始时间要比结束时间早");
-        }
-      } else {
-        this.getRequestUrl()
-      }
-    },
-  },
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-    .el-input{
-      width: 20%;
-    }
-  }
-}
-</style>

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

@@ -1,52 +0,0 @@
-//计毛
-<template>
-  <!-- 零星物资计毛作业页面 -->
-  <div class="homeworkPath">
-    <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-    </div>
-    <dilTable v-bind.sync="option">      
-    </dilTable>
-  </div>
-</template>
-
-<script>
-import { getCookie } from "@/utils/util.js";
-export default {
-  name: "homeworkPath",
-  data() {
-    return {
-      input: "",
-      option: {
-        // 表格请求数据的地址
-        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.$message.info("功能暂时关闭")
-    },
-  },
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-    .el-input{
-      width: 20%;
-    }
-  }
-}
-</style>

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

@@ -1,78 +0,0 @@
-//出厂
-<template>
-  <!-- 零星物资出厂作业页面 -->
-  <div class="homeworkPath">
-    <div class="top">
-     <span class="text">出厂时间：</span>
-      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
-      </el-date-picker>
-      <span class="text1">至</span>
-      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
-      </el-date-picker>
-       <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-    </div>
-    <dilTable v-bind.sync="option">      
-    </dilTable>
-  </div>
-</template>
-
-<script>
-import { getCookie } from "@/utils/util.js";
-import { sjTime } from "@/utils/sharedJsFile";
-export default {
-  name: "homeworkPath",
-  data() {
-    return {
-      input: "",
-      startTime: null,
-      endTime: null,
-      option: {
-        // 表格请求数据的地址
-        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() {
-      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/getLeaveFactoryResult?apiId=421&orderType=12&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
-          }else{
-          this.startTime = null;
-          this.endTime = null;
-          this.$message.warning('开始时间要比结束时间早')
-        }
-      }else{
-        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=12&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
-      }
-    },
-  },
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-    .el-input{
-      width: 20%;
-    }
-  }
-}
-</style>

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

@@ -1,52 +0,0 @@
-//计皮
-<template>
-  <!-- 零星物资计皮作业页面 -->
-  <div class="homeworkPath">
-    <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-    </div>
-    <dilTable v-bind.sync="option">      
-    </dilTable>
-  </div>
-</template>
-
-<script>
-import { getCookie } from "@/utils/util.js";
-export default {
-  name: "homeworkPath",
-  data() {
-    return {
-      input: "",
-      option: {
-        // 表格请求数据的地址
-        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.$message.info("功能暂时关闭")
-    },
-  },
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-    .el-input{
-      width: 20%;
-    }
-  }
-}
-</style>

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

@@ -1,52 +0,0 @@
-//卸货
-<template>
-  <!-- 零星物资卸货卸货实绩页面 -->
-  <div class="homeworkPath">
-   <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-    </div>
-    <dilTable v-bind.sync="option"></dilTable>
-  </div>
-</template>
-
-<script>
-import { getCookie } from "@/utils/util.js";
-export default {
-  name: "homeworkPath",
-  data() {
-    return {
-      restaurants: [],
-      input: "",
-      option: {
-        // 表格请求数据的地址
-        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.$message.info("功能暂时关闭")
-    },
-   }
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-    .el-input{
-      width: 20%;
-    }
-  }
-}
-</style>

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

@@ -1,85 +0,0 @@
-//进厂
-<template>
-  <!-- 零星物资进厂作业页面 -->
-  <div class="homeworkPath">
-    <div class="top">
-      <span class="text">进门时间：</span>
-      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
-      </el-date-picker>
-      <span class="text">至</span>
-      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
-      </el-date-picker>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-    </div>
-    <dilTable v-bind.sync="option">      
-    </dilTable>
-  </div>
-</template>
-
-<script>
-import { sjTime } from "@/utils/sharedJsFile";
-import { getCookie } from "@/utils/util.js";
-export default {
-  name: "homeworkPath",
-  data() {
-    return {
-      input: "",
-      startTime: null,
-      endTime: null,
-      option: {
-        // 表格请求数据的地址
-        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() {
-      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) {
-          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
-
-          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
-          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
-          // }else{
-          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
-          // }
-        } else {
-          this.startTime = null;
-          this.endTime = null;
-          this.$message.warning("开始时间要比结束时间早");
-        }
-      } else {
-        this.getRequestUrl()
-      }
-    },
-  },
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-    .el-input{
-      width: 20%;
-    }
-  }
-}
-</style>

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

@@ -1,52 +0,0 @@
-//计毛
-<template>
-  <!-- 零星物资计毛作业页面 -->
-  <div class="homeworkPath">
-    <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-    </div>
-    <dilTable v-bind.sync="option">      
-    </dilTable>
-  </div>
-</template>
-
-<script>
-import { getCookie } from "@/utils/util.js";
-export default {
-  name: "homeworkPath",
-  data() {
-    return {
-      input: "",
-      option: {
-        // 表格请求数据的地址
-        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.$message.info("功能暂时关闭")
-    },
-  },
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-    .el-input{
-      width: 20%;
-    }
-  }
-}
-</style>

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

@@ -1,52 +0,0 @@
-//卸货
-<template>
-  <!-- 零星物资卸货卸货实绩页面 -->
-  <div class="homeworkPath">
-   <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-    </div>
-    <dilTable v-bind.sync="option"></dilTable>
-  </div>
-</template>
-
-<script>
-import { getCookie } from "@/utils/util.js";
-export default {
-  name: "homeworkPath",
-  data() {
-    return {
-      restaurants: [],
-      input: "",
-      option: {
-        // 表格请求数据的地址
-        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.$message.info("功能暂时关闭")
-    },
-   }
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-    .el-input{
-      width: 20%;
-    }
-  }
-}
-</style>

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

@@ -1,78 +0,0 @@
-//出厂
-<template>
-  <!-- 零星物资出厂作业页面 -->
-  <div class="homeworkPath">
-    <div class="top">
-       <span class="text">出厂时间：</span>
-      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
-      </el-date-picker>
-      <span class="text1">至</span>
-      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
-      </el-date-picker>
-       <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-    </div>
-    <dilTable v-bind.sync="option">      
-    </dilTable>
-  </div>
-</template>
-
-<script>
-import { getCookie } from "@/utils/util.js";
-import { sjTime } from "@/utils/sharedJsFile";
-export default {
-  name: "homeworkPath",
-  data() {
-    return {
-      input: "",
-      startTime: null,
-      endTime: null,
-      option: {
-        // 表格请求数据的地址
-        requestUrl: "",
-      },
-    };
-  },
-  created(){
-      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
-          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() {
-           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/getLeaveFactoryResult?apiId=421&orderType=13&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
-          }else{
-          this.startTime = null;
-          this.endTime = null;
-          this.$message.warning('开始时间要比结束时间早')
-        }
-      }else{
-        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=13&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
-      }
-    },
-  },
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-    .el-input{
-      width: 20%;
-    }
-  }
-}
-</style>

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

@@ -1,52 +0,0 @@
-//计皮
-<template>
-  <!-- 零星物资计皮作业页面 -->
-  <div class="homeworkPath">
-    <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-    </div>
-    <dilTable v-bind.sync="option">      
-    </dilTable>
-  </div>
-</template>
-
-<script>
-import { getCookie } from "@/utils/util.js";
-export default {
-  name: "homeworkPath",
-  data() {
-    return {
-      input: "",
-      option: {
-        // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=401&orderType=13",
-      },
-    };
-  },
-  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.$message.info("功能暂时关闭")
-    },
-  },
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-    .el-input{
-      width: 20%;
-    }
-  }
-}
-</style>

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

@@ -107,6 +107,11 @@
         </el-form-item>
         </el-form>
     </div>
+    <div class="lineId from">
+      <span class="text">该批车辆是否一车多趟：</span>
+      <el-switch v-model="isMoreTrips" active-text="是" inactive-text="否">
+      </el-switch>
+    </div>
     <div class="swtichTop">
     <span class="titile">点击浏览选择物资之前请选择物资单位！</span>
     <div class="switch" v-if="tableData.length > 0">
@@ -289,6 +294,8 @@ export default {
       value: false,
       //物资模态框开关
       table: false,
+      //一车多趟开关
+      isMoreTrips: false,
       //物资表格表头
       tableTop: [
         {
@@ -374,14 +381,10 @@ export default {
       }
     },
   },
-  created(){
-     console.log("这里是老厂零星");
-  },
   methods: {
     //关闭运输线路
     handleClose(done){
         done()
-        console.log("这里")
         this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3"
     },
     onclickMaterial(){
@@ -567,8 +570,10 @@ export default {
           receiveId: this.consigneeId,
           userId:getCookie("orgCode"),
           mapList: this.tableData,
+          isMoreTrips:Number(this.isMoreTrips)
         }
         console.log(amOrder)
+        debugger
         this.disabled = true
         if(this.supplierId==null||this.lineId==null||this.consigneeId==null||this.carrierId==null){
           this.disabled = false
@@ -605,6 +610,8 @@ export default {
           receiveId: this.consigneeId,
           userId:getCookie("orgCode"),
           mapList: this.tableData,
+          isMoreTrips:Number(this.isMoreTrips)
+          
         };
         this.axios.post("/api/v1/ams/addSporadicOrders", amsOrder).then((res) => {
           if (res.data.code == "200") {
@@ -628,6 +635,25 @@ export default {
     width: 240px;
   }
 }
+.lineId {
+  display: flex;
+  justify-content: center;
+  .text {
+    display: inline-block;
+    width: 190px;
+    text-align: right;
+    font-size: 16px;
+  }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+  .span {
+    display: inline-block;
+    width: 70px;
+    height: 1px;
+  }
+}
 .swtichTop{
   display: flex;
   height: 40px;

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

@@ -43,6 +43,25 @@
               </el-button>
             </template>
           </el-table-column>
+          //物资详情抽屉
+          <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData" border >
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
           </dilTable>
         </el-tab-pane>
         <!-- 已接收 -->
@@ -62,6 +81,25 @@
               </el-button>
             </template>
           </el-table-column>
+          //物资详情抽屉
+          <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData1" border >
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
           </dilTable>
         </el-tab-pane>
          <!-- 已完成 -->
@@ -73,11 +111,30 @@
             width="100"
           >
             <template slot-scope="scope">
-              <el-button @click="ctrlZClick(scope)" type="text" size="small">
+              <el-button @click="getMatrialDetails3(scope.row)" type="text" size="small">
                 物资详情
               </el-button>
             </template>
           </el-table-column>
+          //物资详情抽屉
+          <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData2" border >
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
           </dilTable>
         </el-tab-pane>
          <!-- 已拒绝 -->
@@ -353,9 +410,9 @@ export default {
       }
       }
     },
-    //获取物资详情--未下发
+    //获取物资详情--未接收
     getMatrialDetails1(row){
-      console.log("wuzixq")
+      console.log(row)
       // 记录重复点击次数
       if (this.oldRow === row) {
         this.oldRowCount += 1;
@@ -382,6 +439,64 @@ export default {
         this.tableData = res.data.data
       })
     },
+     //获取物资详情--已接收
+    getMatrialDetails2(row){
+      console.log(row)
+      // 记录重复点击次数
+      if (this.oldRow1 === row) {
+        this.oldRowCount1 += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table1.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow1 != "") {
+        if (this.oldRow1 != row) {
+          if (this.oldRowCount1 % 2 === 1) {
+            this.$refs.table1.toggleRowExpansion(this.oldRow1);
+          } else {
+            this.oldRowCount1 = 1;
+          }
+        } else {
+          this.oldRow1 = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow1 = row;
+      this.axios.post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId).then((res) =>{
+        console.log(res.data.data)
+        this.tableData1 = res.data.data
+      })
+    },
+    //获取物资详情--已完成
+    getMatrialDetails3(row){
+      console.log(row)
+      // 记录重复点击次数
+      if (this.oldRow2 === row) {
+        this.oldRowCount2 += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table2.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow2 != "") {
+        if (this.oldRow2 != row) {
+          if (this.oldRowCount2 % 2 === 1) {
+            this.$refs.table2.toggleRowExpansion(this.oldRow2);
+          } else {
+            this.oldRowCount2 = 1;
+          }
+        } else {
+          this.oldRow2 = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow2 = row;
+      this.axios.post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId).then((res) =>{
+        console.log(res.data.data)
+        this.tableData2 = res.data.data
+      })
+    },
   },
 };
 </script>

src/views/SporadicManage/router/index.js

@@ -38,20 +38,14 @@ import editOldSporadicAppoint from '../components/oldAreaSporadic/transportAppoi
 //老厂零星物资运输派单
 import oldSporadicOrder from '../components/oldAreaSporadic/transportOrder/transportOrder.vue'
 import addOldSporadicOrder from '../components/oldAreaSporadic/transportOrder/addTransportOrder.vue'
-//老厂零星物资进厂
-import oldSporadicENenfactory from '../components/oldAreaSporadic/sporadicEnfactory/enFactory.vue'
-import oldSporadicENgrossWeight from '../components/oldAreaSporadic/sporadicEnfactory/grossWeight.vue'
-import oldSporadicENoutFactory from '../components/oldAreaSporadic/sporadicEnfactory/outFactory.vue'
-import oldSporadicENtareWeight from '../components/oldAreaSporadic/sporadicEnfactory/tareWeight.vue'
-import oldSporadicENunload from '../components/oldAreaSporadic/sporadicEnfactory/unload.vue'
-//老厂零星物资出厂
-import oldSporadicOUTenfactory from '../components/oldAreaSporadic/sporadicOutfactory/enFactory.vue'
-import oldSporadicgrossWeight from '../components/oldAreaSporadic/sporadicOutfactory/grossWeight.vue'
-import oldSporadicOUToutFactory from '../components/oldAreaSporadic/sporadicOutfactory/outFactory.vue'
-import oldSporadicOUTtareWeight from '../components/oldAreaSporadic/sporadicOutfactory/tareWeight.vue'
-import oldSporadicOUTload from '../components/oldAreaSporadic/sporadicOutfactory/load.vue'
-
 
+//老厂零星物资中转
+import oldSporadicInwardTenfactory from '../components/oldAreaSporadic/inwardSporadicFactory/enFactory.vue'
+import oldSporadicInwardGrossWeight from '../components/oldAreaSporadic/inwardSporadicFactory/grossWeight.vue'
+import oldSporadicInwardoutFactory from '../components/oldAreaSporadic/inwardSporadicFactory/LeaveFactory.vue'
+import oldSporadicInwardtareWeight from '../components/oldAreaSporadic/inwardSporadicFactory/tareWeight.vue'
+import oldSporadicInwardload from '../components/oldAreaSporadic/inwardSporadicFactory/tareWeight.vue'
+import oldSporadicInwardUnload from '../components/oldAreaSporadic/inwardSporadicFactory/unload.vue'
 
 //钢材退货运输预约
 import steelReturnTransportAppoint from '../components/steelReturn/transportAppoint/transportAppoint.vue'
@@ -177,18 +171,12 @@ const constantRouterMap = [
       //零星物资运输订单
       {path:'addOldSporadicOrder',name:'addOldSporadicOrder',meta:{code:'xtpzgl-jggl'},component:addOldSporadicOrder},
       {path:'oldSporadicOrder',name:'oldSporadicOrder',meta:{code:'xtpzgl-yhgl'},component:oldSporadicOrder},
-      //零星物资进厂
-      {path:'oldSporadicENenfactory',name:'oldSporadicENenfactory',meta:{code:'xtpzgl-yhgl'},component:oldSporadicENenfactory},
-      {path:'oldSporadicENgrossWeight',name:'oldSporadicENgrossWeight',meta:{code:'xtpzgl-yhgl'},component:oldSporadicENgrossWeight},
-      {path:'oldSporadicENoutFactory',name:'oldSporadicENoutFactory',meta:{code:'xtpzgl-yhgl'},component:oldSporadicENoutFactory},
-      {path:'oldSporadicENtareWeight',name:'oldSporadicENtareWeight',meta:{code:'xtpzgl-yhgl'},component:oldSporadicENtareWeight},
-      {path:'oldSporadicENunload',name:'oldSporadicENunload',meta:{code:'xtpzgl-yhgl'},component:oldSporadicENunload},
-      //零星物资出厂
-      {path:'oldSporadicOUTenfactory',name:'oldSporadicOUTenfactory',meta:{code:'xtpzgl-yhgl'},component:oldSporadicOUTenfactory},
-      {path:'oldSporadicgrossWeight',name:'oldSporadicgrossWeight',meta:{code:'xtpzgl-yhgl'},component:oldSporadicgrossWeight},
-      {path:'oldSporadicOUToutFactory',name:'oldSporadicOUToutFactory',meta:{code:'xtpzgl-yhgl'},component:oldSporadicOUToutFactory},
-      {path:'oldSporadicOUTtareWeight',name:'oldSporadicOUTtareWeight',meta:{code:'xtpzgl-yhgl'},component:oldSporadicOUTtareWeight},
-      {path:'oldSporadicOUTload',name:'oldSporadicOUTload',meta:{code:'xtpzgl-yhgl'},component:oldSporadicOUTload},
+      //零星物资运输执行
+      {path:'oldSporadicInwardTenfactory',name:'oldSporadicInwardTenfactory',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardTenfactory},
+      {path:'oldSporadicInwardGrossWeight',name:'oldSporadicInwardGrossWeight',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardGrossWeight},
+      {path:'oldSporadicInwardoutFactory',name:'oldSporadicInwardoutFactory',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardoutFactory},
+      {path:'oldSporadicInwardtareWeight',name:'oldSporadicInwardtareWeight',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardtareWeight},
+      {path:'oldSporadicInwardUnload',name:'oldSporadicInwardUnload',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardUnload},
 
     ]    
   }

src/views/statisticalReport/components/inwardReport/inwardFactory.vue

@@ -75,7 +75,7 @@ export default {
       }
       if(startTime && endTime){
         if(startTime < endTime){
-          this.option.requestUrl = '/api/v1/tms/getPurInwardReport?apiId=441' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          this.option.requestUrl = '/api/v1/tms/getInwardReport?apiId=441' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
         }else{
           this.startTime = null;
           this.endTime = null;

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

@@ -0,0 +1,110 @@
+<template>
+  <div class="purchasFuelNewMonitor">
+    <div class="frameCalculation">
+      <span>净重时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+      <span style="margin-left: 1rem;">首次/二次合计净重：</span>
+      <el-input v-model="totalNumberFrist" :disabled="true" style="width: 140px;"></el-input>
+      <span style="margin-left: 1rem;">合计车数：</span>
+      <el-input v-model="totalCapacity" :disabled="true" style="width: 100px;"></el-input>
+    </div>
+    <div class="table">
+      <dilTable ref="excelDom" v-bind.sync="option" @func="func"></dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+import { sjTime } from '@/utils/sharedJsFile';
+import { getCookie } from '@/utils/util.js';
+export default {
+  data() {
+    return {
+      totalNumberSecond:null,
+      totalNumberFrist:null,
+      totalCapacity:null,
+      option: {
+        requestUrl: "",
+      },
+      startTime: null,
+      endTime: null,
+      tableTitle:'零星出厂统计报表'
+    };
+  }, 
+  created(){
+          this.option.requestUrl = '/api/v1/tms/getLXInwardReport?apiId=457&startTime=null&endTime=null&i=' +new Date()
+  },
+  methods: {
+    func(res){
+        console.log(res)
+        var resultNetWeightTotalFirst = 0
+        var resultNetWeightTotalSecond = 0
+        var currentCapacityTotal = 0
+        res.list.forEach(e => {
+          currentCapacityTotal++
+          resultNetWeightTotalFirst = resultNetWeightTotalFirst+e.netWeightFirst
+          resultNetWeightTotalSecond = resultNetWeightTotalSecond + e.netWeightSecond
+        });
+        this.totalNumberFrist = resultNetWeightTotalFirst.toFixed(2) + "t" + "/" + resultNetWeightTotalSecond.toFixed(2) + "t"
+        this.totalCapacity = currentCapacityTotal;
+    },
+    getRequestUrl(){
+        this.option.requestUrl = '/api/v1/tms/getLXInwardReport?apiId=457&startTime=null&endTime=null&i=' +new Date();
+     
+    },
+    onclick() {
+      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/getLXInwardReport?apiId=457' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+        }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        console.log(startTime && endTime)
+        this.getRequestUrl()
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.purchasFuelNewMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+    .el-date-editor{
+      margin: 20px;
+    }
+  }
+}
+</style>

src/views/statisticalReport/router/index.js

@@ -20,6 +20,7 @@ import inwardFactory from '../components/inwardReport/inwardFactory.vue'
 import getLoading from '../components/inwardReport/getLoading.vue'
 import getUnLoading from '../components/inwardReport/getUnLoading.vue'
 import purchaseMineral from '../components/purachaseMineral.vue'
+import inwardSporadicReport from '../components/sporadicReport/inwardSporadicReport.vue'
 
 
 Vue.use(Router)
@@ -45,11 +46,11 @@ const constantRouterMap = [
       {path: 'inwardFactory', name: 'inwardFactory', meta: {code: 'xtpzgl-yhgl'}, component: inwardFactory},
       {path: 'getLoading', name: 'getLoading', meta: {code: 'xtpzgl-yhgl'}, component: getLoading},
       {path: 'getUnLoading', name: 'getUnLoading', meta: {code: 'xtpzgl-yhgl'}, component: getUnLoading},
-      {path: 'purchaseMineral', name: 'purchaseMineral', meta: {code: 'xtpzgl-yhgl'}, component: purchaseMineral}
+      {path: 'purchaseMineral', name: 'purchaseMineral', meta: {code: 'xtpzgl-yhgl'}, component: purchaseMineral},
+      {path: 'inwardSporadicReport', name: 'inwardSporadicReport', meta: {code: 'xtpzgl-yhgl'}, component: inwardSporadicReport}
     ]
   }
 ];
-
 const router = new Router({
   routes: constantRouterMap
 })