运力新增修改备注功能

build/utils.js

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

config/index.js

@@ -64,14 +64,18 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://localhost:8080",
+      target: "http://172.16.33.166:8080",
+     //target: "http://localhost:8080",
+
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
     }
   },
   "/views/api/v1": {
-    target: "http://localhost:8080",
+    target: "http://172.16.33.166:8080",
+    // target: "http://192.168.1.109:8080",
+    ws: true,
     pathRewrite: {
       "^/views/api/v1": "/api/v1"
     }

src/views/sale/components/offSiteTransportation/checkGPS.vue

@@ -321,7 +321,7 @@ export default {
               that.initParkingMarkes(
                 20,
                 35,
-                require("@/assets/img/start.png"),
+                require("@/assets/img/park.png"),
                 calculationPoint.lon,
                 calculationPoint.lat,
                 message.split(".")[0] + "分钟"
@@ -355,7 +355,7 @@ export default {
             that.initLeaveMarkes(
               20,
               35,
-              require("@/assets/img/start.png"),
+              require("@/assets/img/leave.png"),
               item2.lon,
               item2.lat,
               message.split(".")[0] + "分钟"
@@ -488,8 +488,10 @@ export default {
           endTime: that.formatDate(that.time[1], "yyyy-MM-dd hh:mm:ss")
         })
         .then(res => {
-          if (res.data.startAndEndRoutes != "") {
-            that.listPath = res.data.startAndEndRoutes;
+          if(res.data.data=="-1"){
+             this.$message.error('自提车辆无权查看!');
+          }else if (res.data.data.startAndEndRoutes != "") {
+            that.listPath = res.data.data.startAndEndRoutes;
             that.initMap([105.602725, 37.076636]);
           } else {
             this.$message.error("车辆没有开启GPS");

src/views/sale/components/offSiteTransportation/currentLocation.vue

@@ -64,14 +64,19 @@ export default {
       that.axios
         .get("/api/v1/otms/getCurrentLocation?capcityNumber="+that.carNumber)
         .then(res => {
-          console.log(res);
-          console.log(res.data.data.result.lon);
-          console.log(res.data.data.result.lat);
-          that.map.setCenter([res.data.data.result.lon,res.data.data.result.lat]);
-          //画车
-          that.initMarkes( 45,60, require("@/assets/img/car1.png"),res.data.data.result.lon,res.data.data.result.lat,"现在所在位置");
-          //显示窗体
-          that.initCustomMarkes(that.carNumber,res.data.data.result.adr,res.data.data.result.lon,res.data.data.result.lat);
+              console.log(res.data.data)
+              if(res.data.data=='-1'){
+                 this.$message.error('自提车辆无权查看!');
+              }else if(res.data.data.status!='1006'){
+                console.log("res.data.data.status")
+                  that.map.setCenter([res.data.data.result.lon,res.data.data.result.lat]);
+                  //画车
+                  that.initMarkes( 45,60, require("@/assets/img/car1.png"),res.data.data.result.lon,res.data.data.result.lat,"现在所在位置");
+                  //显示窗体
+                  that.initCustomMarkes(that.carNumber,res.data.data.result.adr,res.data.data.result.lon,res.data.data.result.lat);
+              }else{
+                  this.$message.error("车辆暂时无GPS");
+              }
           });
           
     },
@@ -84,7 +89,7 @@ export default {
         that.map = new AMap.Map("amap-container", {
           //设置地图容器id
           viewMode: "2D", //是否为2D地图模式
-          zoom: 10, //初始化地图级别
+          zoom: 18, //初始化地图级别
           center: [lon,lat] //初始化地图中心点位置105.602725,37.076636
         });
       });

src/views/sale/components/offSiteTransportation/inTransit.vue

@@ -167,7 +167,7 @@ export default {
           label: '中联厂出口'
         }],
       dateValue:[new Date(), new Date()],
-      inputValue:"螺纹钢",
+      inputValue:"",
       exceptionType:"全部类型",
       selectOrderNumber:"",
       capacityNumber1:"",
@@ -371,7 +371,7 @@ export default {
                       "capacityNumbers": this.capacityNumber1,
                       "carrierNames":this.carrierName,
                       "outGatepostNames":this.gatepostName,
-                      "consigneeCompanyNames": this.consigneeCompanyName1});
+                      "receiveNames": this.consigneeCompanyName1});
       }
       if(this.activeName=="second"){
       //改变已完成条件              
@@ -381,7 +381,7 @@ export default {
                       "capacityNumbers": this.capacityNumber1,
                       "carrierNames":this.carrierName,
                       "outGatepostNames":this.gatepostName,
-                      "consigneeCompanyNames": this.consigneeCompanyName1});
+                      "receiveNames": this.consigneeCompanyName1});
       }
       if(this.activeName=="third"){
       //改变有异常条件              
@@ -392,7 +392,7 @@ export default {
                       "carrierName1":this.carrierName,
                       "abnormalType":this.exceptionType=="全部类型"?"":this.exceptionType,
                       "outGatepostNames":this.gatepostName,
-                      "consigneeCompanyName1": this.consigneeCompanyName1});
+                      "receiveNames": this.consigneeCompanyName1});
       }                              
     },
 
@@ -413,7 +413,6 @@ export default {
         this.pathOption.capacityNumber=row.capacityNumber;
         this.pathOption.startPointName="达钢集团"+row.outGatepostName,
         this.pathOption.endPointName=row.deliveryAddress,
-         console.log(this.pathOption,"this.pathOption")
         this.value7=true;
     },
     allDistanceclick(orderNumber){

src/views/sale/components/offSiteTransportation/mapTest.vue

@@ -294,7 +294,7 @@ export default {
                         that.initParkingMarkes(
                             20,
                             35,
-                            require("@/assets/img/start.png"),
+                            require("@/assets/img/park.png"),
                             calculationPoint.lon,
                             calculationPoint.lat,
                             message.split(".")[0] + "分钟"
@@ -337,7 +337,7 @@ export default {
                         that.initLeaveMarkes(
                         20,
                         35,
-                        require("@/assets/img/start.png"),
+                        require("@/assets/img/leave.png"),
                         item2.lon,
                         item2.lat,
                         message.split(".")[0] + "分钟"
@@ -432,8 +432,11 @@ export default {
         initData(orderNumber){
             let that=this;
              that.axios.post("/api/v1/otms/fullPath?orderNumber="+orderNumber).then((res) => {
-                 if(res.data.startAndEndRoutes!=null){
-                     that.listPath=res.data.startAndEndRoutes
+                 console.log(res.data)
+                 if(res.data.data=='-1'){
+                     this.$message.error('自提车辆无权查看!');
+                 }else if(res.data.data.startAndEndRoutes!=null){
+                     that.listPath=res.data.data.startAndEndRoutes
                     that.initMap();
                  }else{
                      that.listPath=[];

src/views/sale/components/offSiteTransportation/transportationPerformance.vue

@@ -0,0 +1,326 @@
+<template>
+  <!-- 在途运输信息选择页面 -->
+  <div class="inTransit">
+    <el-form :inline="true">
+      <el-form-item>
+        <label class="el-form-item__label" style="width: auto;">时间段</label>
+            <el-date-picker
+          v-model="dateValue"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <span class="el-form-item__span" style="width: auto;">产品分类</span>
+          <el-input v-model="inputValue" placeholder="请输入内容"></el-input>
+      </el-form-item>
+      <el-form-item>
+          <span class="el-form-item__span" style="width: auto;">车牌号</span>
+          <el-input v-model="capacityNumber1" placeholder="请输入内容"></el-input>
+      </el-form-item>
+      <el-form-item>
+          <span class="el-form-item__span" style="width: auto;">收货单位</span>
+          <el-input v-model="consigneeCompanyName1" placeholder="请输入内容"></el-input>
+      </el-form-item> 
+      <el-form-item>
+          <span class="el-form-item__span" style="width: auto;">承运单位</span>
+          <el-input v-model="carrierName" placeholder="请输入内容"></el-input>
+      </el-form-item> 
+      <el-form-item>
+        <span class="el-form-item__span" style="width: auto;">门岗名称</span>
+        <el-input v-model="gatepostName" placeholder="请输入内容"></el-input>
+      </el-form-item> 
+      <el-form-item>
+        <el-button type="primary" @click="onSearch"><i class="el-icon-search"></i>查询</el-button>
+      
+      </el-form-item>
+    </el-form>
+    <!-- 执行中 -->
+
+    <mergeRowTable ref="tab" v-bind.sync="option">
+      <el-table-column fixed="right" label="操作" width="180">
+        <template slot-scope="scope">
+          <el-button @click="click(scope.row)" type="text" size="small" style="font-size: 17px">轨迹</el-button>
+          <el-button @click="toPhotoClick(scope.row.orderNumber)" type="text" size="small" style="font-size: 17px">抵达图</el-button>
+          <el-button @click="receipctPhotoClick(scope.row.orderNumber)" type="text" size="small" style="font-size: 17px">签收图</el-button>
+        </template>
+      </el-table-column>
+    </mergeRowTable>
+
+    <div style="height: 100%">
+      <vxe-modal width="1237" height="731" v-model="value7" show-zoom resize>
+            <template #default>
+              <PathView v-bind.sync="pathOption"></PathView>
+            </template>
+      </vxe-modal>
+    </div>
+     <vxe-modal width="549px" height="731px" v-model="isShow" show-footer>
+      <div class="demo-image__preview">
+        <el-image
+          style=" height:731px;text-align:center"
+          :src="src"
+          :preview-src-list="srcList"
+        >
+        </el-image>
+      </div>
+    </vxe-modal>
+     <vxe-modal width="549px" height="731px" v-model="isShow2" show-footer>
+      <div class="demo-image__preview">
+        <el-image
+          style=" height:731px;text-align:center"
+          :src="src2"
+          :preview-src-list="srcList2"
+        >
+        </el-image>
+      </div>
+    </vxe-modal>
+    <div style="height: 100%">
+      <vxe-modal width="1237" height="731" v-model="value5" show-zoom resize>
+        <template #default>
+          <dilTable ref="tableAlarm" v-bind.sync="optionAlarm"></dilTable>
+        </template>
+      </vxe-modal>
+    </div> 
+  </div>
+</template>
+
+
+<script>
+import { sjTime } from "@/utils/sharedJsFile";
+import PathView from "./mapTest.vue"
+export default {
+  name: "inTransit",
+  components: { 
+    PathView,
+  },
+  data() {
+    return {
+      dateValue:[new Date(), new Date()],
+      inputValue:"",
+      exceptionType:"全部类型",
+      selectOrderNumber:"",
+      capacityNumber1:"",
+      carrierName:"",
+       gatepostName:"",
+       value7:false,
+       value6:false,
+       value5:false,
+       dialogVisible:false,
+      consigneeCompanyName1:"",
+      status: "",
+      state: "",
+      activeName: "first",
+      option: {       
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/otms/transportationPerformance?apiId=479",
+        comparison:"orderNumber",
+        columnIndexs:[1,2,8,9,10,11,12,13,14,15,16,17,18,19],  
+      },
+      
+      optionAlarm:{
+        requestUrl: "",
+      },
+      pathOption:{
+           orderNumber:'',
+        capacityNumber:'',
+         startPointName:'',
+        endPointName:'',
+      },
+      mileOption:{
+        orderNumber:''
+      },
+      alarmOption:{
+        orderNumber:''
+      },
+      srcList: [],
+      src: "",
+      isShow:false,
+      srcList2: [],
+      src2: "",
+      isShow2:false,
+    };
+  },
+  mounted() {
+    console.log("nijfdsojfosafj")
+    this.restaurants = this.loadAll();
+    // this.onSearch();
+    
+  },
+  methods: {
+    receipctPhotoClick(orderNumber){
+      this.axios
+       .post("/api/v1/otms/getReceivingPhotoByUrl?orderNumber="+orderNumber)
+       .then((res)=>{
+         console.log(res.data)
+          this.isShow2=true;
+          this.srcList2=[];
+          this.src2=res.data.resultSignedNotePhoto;
+          this.srcList2.push(res.data.resultSignedNotePhoto);
+          this.srcList2.push(res.data.resultEmptyContainerPhoto);
+          if(res.data.resultReceiveNotePhoto!=null){
+             this.srcList2.push(res.data.resultReceiveNotePhoto);
+          }
+       });
+    },
+    toPhotoClick(orderNumber) {
+      this.axios
+        .post("/api/v1/otms/getArrivalPhoto?orderNumber=" + orderNumber)
+        .then(res => {
+          this.srcList = [];
+          this.src = res.data.data;
+          this.isShow = true;
+          this.srcList.push(res.data.data);
+        });
+    },
+   
+    showPathView(data){
+      this.dialogVisible=!this.dialogVisible;
+      this.selectOrderNumber=data.orderNumber;
+    },
+ 
+    createFilter(queryString) {
+      return (restaurant) => {
+        return (
+          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
+          0
+        );
+      };
+    },
+    loadAll() {
+      return [
+        { value: "螺纹钢"},
+         { value: "微粉"},
+        { value: "带钢"},
+        { value: "钢坯"},
+        { value: "其他"},
+      ];
+    },
+    exportData(){
+        
+
+        let tHeader = [];
+        let filterVal = [];
+        if(this.activeName=="first"){
+          this.$refs.tab.dataColumnData.filter( (item,i) =>{
+                    tHeader.push(item.label);
+                        filterVal.push(item.prop);
+                    } )
+            this.export2Excel(tHeader,filterVal,this.$refs.tab.dataTabel,'执行中表格');
+        }else if(this.activeName=="second"){
+            this.$refs.tab2.dataColumnData.filter( (item,i) =>{
+              tHeader.push(item.label);
+                  filterVal.push(item.prop);
+              } )
+          this.export2Excel(tHeader,filterVal,this.$refs.tab2.dataTabel,'已完成表格');
+        } else if(this.activeName=="third"){
+            this.$refs.tab3.dataColumnData.filter( (item,i) =>{
+                      tHeader.push(item.label);
+                          filterVal.push(item.prop);
+                      } )
+            this.export2Excel(tHeader,filterVal,this.$refs.tab3.dataTabel,'有异常表格');
+        }
+        
+        
+    },
+    export2Excel(tHeader,filterVal,dataTabel,exeName) {
+      var that = this;
+       this.downloadLoading = true
+      require.ensure([], () => {
+        const { export_json_to_excel } = require("@/assets/excel/Export2Excel.js"); //这里必须使用绝对路径，使用@/+存放export2Excel的路径
+        console.log("export_json_to_excel",export_json_to_excel)
+        let list = dataTabel;
+        let data = that.formatJson(filterVal, list);
+        export_json_to_excel(tHeader, data, exeName); // 导出的表格名称
+      });
+    },
+    //3.格式转换
+    formatJson(filterVal, jsonData) {
+      return jsonData.map((v) => filterVal.map((j) => v[j]));
+    },
+    onSearch(){
+  
+      if(this.activeName=="first"){
+      //改变执行中条件
+      console.log(this.$refs.tab)
+      console.log("this.$refs.tab")
+      this.$refs.tab.setDataRequestQuery({"startTime":sjTime(this.dateValue[0]),
+                      "endTime": sjTime(this.dateValue[1]),
+                      "materialNames": this.inputValue,
+                      "capacityNumbers": this.capacityNumber1,
+                      "carrierNames":this.carrierName,
+                      "outGatepostNames":this.gatepostName,
+                      "receiveNames": this.consigneeCompanyName1});
+      }
+      if(this.activeName=="second"){
+      //改变已完成条件              
+      this.$refs.tab2.setDataRequestQuery({"startTime":sjTime(this.dateValue[0]),
+                      "endTime": sjTime(this.dateValue[1]),
+                      "materialNames": this.inputValue,
+                      "capacityNumbers": this.capacityNumber1,
+                      "carrierNames":this.carrierName,
+                      "outGatepostNames":this.gatepostName,
+                      "receiveNames": this.consigneeCompanyName1});
+      }
+      if(this.activeName=="third"){
+      //改变有异常条件              
+      this.$refs.tab3.setDataRequestQuery({"startTime":sjTime(this.dateValue[0]),
+                      "endTime": sjTime(this.dateValue[1]),
+                      "materialNames": this.inputValue,
+                      "capacityNumber1": this.capacityNumber1,
+                      "carrierName1":this.carrierName,
+                      "abnormalType":this.exceptionType=="全部类型"?"":this.exceptionType,
+                      "outGatepostNames":this.gatepostName,
+                      "receiveNames": this.consigneeCompanyName1});
+      }                              
+    },
+
+
+    //other
+    click(row) {
+     
+        this.pathOption.orderNumber=row.orderNumber;
+        this.pathOption.capacityNumber=row.capacityNumber;
+        this.pathOption.startPointName="达钢集团"+row.outGatepostName,
+        this.pathOption.endPointName=row.deliveryAddress,
+        this.value7=true;
+
+    },
+    historyclick(row){
+      
+      this.pathOption.orderNumber=row.orderNumber;
+        this.pathOption.capacityNumber=row.capacityNumber;
+        this.pathOption.startPointName="达钢集团"+row.outGatepostName,
+        this.pathOption.endPointName=row.deliveryAddress,
+         console.log(this.pathOption,"this.pathOption")
+        this.value7=true;
+    },
+    allDistanceclick(orderNumber){
+      //this.$router.push("/offsite/inTransitOrderMileage?orderNumber="+orderNumber);
+    
+      this.mileOption.orderNumber=orderNumber;
+      this.value6=true;
+    },
+    inTransitAlarmclick(orderNumber){
+      this.optionAlarm.requestUrl="/api/v1/otms/getTransportAbnormalInfo?apiId=472&orderNumbers="+orderNumber;
+      this.value5=true;
+    },
+    },
+};
+</script>
+<style lang='scss' scoped>
+.el-input {
+    width: 150px;
+    margin-left: 5px;
+}
+span.el-form-item__span {
+    float: left;
+    margin-top: 7px;
+}
+.homeworkPath {
+  .top {
+    padding: 20px 30px;
+  }
+}
+</style>

src/views/sale/components/transport_excute/tms-offsite/arrivalResult.vue

@@ -1,8 +1,9 @@
 <template>
   <!-- 抵达页面 -->
   <div class="purchasFuelNewMonitor">
-    <div class="frameCalculation">
-      <span>抵达时间：</span>
+    <el-form :inline="true">
+      <el-form-item>
+        <span>抵达时间：</span>
       <el-date-picker
         v-model="startTime"
         type="datetime"
@@ -12,11 +13,31 @@
       <span>至</span>
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
-      <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>
+      </el-form-item>
+      <el-form-item>
+        <span class="el-form-item__span" style="width: auto;">产品分类</span>
+          <el-input v-model="inputValue" placeholder="请输入内容"></el-input>
+      </el-form-item>
+      <el-form-item>
+          <span class="el-form-item__span" style="width: auto;">车牌号</span>
+          <el-input v-model="capacityNumber1" placeholder="请输入内容"></el-input>
+      </el-form-item>
+      <el-form-item>
+          <span class="el-form-item__span" style="width: auto;">收货单位</span>
+          <el-input v-model="consigneeCompanyName1" placeholder="请输入内容"></el-input>
+      </el-form-item> 
+      <el-form-item>
+          <span class="el-form-item__span" style="width: auto;">承运单位</span>
+          <el-input v-model="carrierName" placeholder="请输入内容"></el-input>
+      </el-form-item> 
+      <el-form-item>
+        <span class="el-form-item__span" style="width: auto;">门岗名称</span>
+        <el-input v-model="gatepostName" placeholder="请输入内容"></el-input>
+      </el-form-item> 
+      <el-form-item>
+        <el-button type="primary" @click="onclick"><i class="el-icon-search"></i>查询</el-button>
+      </el-form-item>
+    </el-form>
     <div class="table">
       <el-table
         @filter-change="filterChange"
@@ -95,6 +116,13 @@ export default {
   name: "homeworkPath",
   data() {
     return {
+      inputValue:"",
+      consigneeCompanyName1:"",
+      exceptionType:"全部类型",
+      selectOrderNumber:"",
+      capacityNumber1:"",
+      carrierName:"",
+       gatepostName:"",
       spanArr: [],
       dataTabel: [],
       // 自己的数据总条数
@@ -234,7 +262,13 @@ export default {
         if (this.isKuang) {
           // 发送请求
           this.axios
-            .post(url, data, {
+            .post(url, {"startTime":sjTime(this.startTime),
+                      "endTime": sjTime(this.endTime),
+                      "materialNames": this.inputValue,
+                      "capacityNumbers": this.capacityNumber1,
+                      "carrierNames":this.carrierName,
+                      "outGatepostNames":this.gatepostName,
+                      "receiveNames": this.consigneeCompanyName1}, {
               // 请求地址 中
               params: {
                 pageNum: 1,
@@ -253,7 +287,13 @@ export default {
         } else {
           // 发送请求
           this.axios
-            .post(url, data, {
+            .post(url, {"startTime":sjTime(this.startTime),
+                      "endTime": sjTime(this.endTime),
+                      "materialNames": this.inputValue,
+                      "capacityNumbers": this.capacityNumber1,
+                      "carrierNames":this.carrierName,
+                      "outGatepostNames":this.gatepostName,
+                      "receiveNames": this.consigneeCompanyName1}, {
               // 请求地址 中
               params: {
                 pageNum: pageNum || this.dataCurrentPage,
@@ -327,6 +367,14 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.el-input {
+    width: 150px;
+    margin-left: 5px;
+}
+span.el-form-item__span {
+    float: left;
+    margin-top: 7px;
+}
 .purchasFuelNewMonitor {
   .frameCalculation {
     width: 100%;

src/views/sale/components/transport_excute/tms-offsite/receiptResult.vue

@@ -1,8 +1,9 @@
 <template>
   <!-- 收货页面 -->
    <div class="purchasFuelNewMonitor">
-    <div class="frameCalculation">
-      <span>收货时间：</span>
+    <el-form :inline="true">
+      <el-form-item>
+        <span>抵达时间：</span>
       <el-date-picker
         v-model="startTime"
         type="datetime"
@@ -10,25 +11,33 @@
       >
       </el-date-picker>
       <span>至</span>
-      <el-date-picker
-        v-model="endTime"
-        type="datetime"
-        placeholder="选择日期"
-      >
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
-        <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>
-      <!-- <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
-      <el-button type="primary" @click="refresh">
-        <i class="el-icon-refresh"></i>刷新
-      </el-button> -->
-    </div>
+      </el-form-item>
+      <el-form-item>
+        <span class="el-form-item__span" style="width: auto;">产品分类</span>
+          <el-input v-model="inputValue" placeholder="请输入内容"></el-input>
+      </el-form-item>
+      <el-form-item>
+          <span class="el-form-item__span" style="width: auto;">车牌号</span>
+          <el-input v-model="capacityNumber1" placeholder="请输入内容"></el-input>
+      </el-form-item>
+      <el-form-item>
+          <span class="el-form-item__span" style="width: auto;">收货单位</span>
+          <el-input v-model="consigneeCompanyName1" placeholder="请输入内容"></el-input>
+      </el-form-item> 
+      <el-form-item>
+          <span class="el-form-item__span" style="width: auto;">承运单位</span>
+          <el-input v-model="carrierName" placeholder="请输入内容"></el-input>
+      </el-form-item> 
+      <el-form-item>
+        <span class="el-form-item__span" style="width: auto;">门岗名称</span>
+        <el-input v-model="gatepostName" placeholder="请输入内容"></el-input>
+      </el-form-item> 
+      <el-form-item>
+        <el-button type="primary" @click="onclick"><i class="el-icon-search"></i>查询</el-button>
+      </el-form-item>
+    </el-form>
     <div class="table">
       <el-table
         @filter-change="filterChange"
@@ -106,6 +115,13 @@ export default {
   name: "homeworkPath",
   data() {
     return {
+      inputValue:"",
+      consigneeCompanyName1:"",
+      exceptionType:"全部类型",
+      selectOrderNumber:"",
+      capacityNumber1:"",
+      carrierName:"",
+       gatepostName:"",
        spanArr: [],
       dataTabel: [],
       // 自己的数据总条数
@@ -245,7 +261,13 @@ export default {
         if (this.isKuang) {
           // 发送请求
           this.axios
-            .post(url, data, {
+            .post(url,  {"startTime":sjTime(this.startTime),
+                      "endTime": sjTime(this.endTime),
+                      "materialNames": this.inputValue,
+                      "capacityNumbers": this.capacityNumber1,
+                      "carrierNames":this.carrierName,
+                      "outGatepostNames":this.gatepostName,
+                      "receiveNames": this.consigneeCompanyName1}, {
               // 请求地址 中
               params: {
                 pageNum: 1,
@@ -264,7 +286,13 @@ export default {
         } else {
           // 发送请求
           this.axios
-            .post(url, data, {
+            .post(url,  {"startTime":sjTime(this.startTime),
+                      "endTime": sjTime(this.endTime),
+                      "materialNames": this.inputValue,
+                      "capacityNumbers": this.capacityNumber1,
+                      "carrierNames":this.carrierName,
+                      "outGatepostNames":this.gatepostName,
+                      "receiveNames": this.consigneeCompanyName1}, {
               // 请求地址 中
               params: {
                 pageNum: pageNum || this.dataCurrentPage,
@@ -333,7 +361,7 @@ export default {
       }
       if(startTime && endTime){
         if(startTime < endTime){
-          this.requestUrl = '/api/v1/tms/getReceiptResult?apiId=471' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date()+"&con="+this.input; 
+          this.requestUrl = '/api/v1/otms/getReceiptResult?apiId=471' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date()+"&con="+this.input; 
            this.requestData(this.option);
        }else{
           this.startTime = null;
@@ -341,15 +369,23 @@ export default {
           this.$message.warning('开始时间要比结束时间早')
         }
       }else{
-        console.log(startTime && endTime)
-         this.requestUrl = '/api/v1/tms/getReceivingResult?apiId=471' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date()+"&con="+this.input; 
-        this.requestData(this.option);
+        // console.log(startTime && endTime)
+        //  this.requestUrl = '/api/v1/otms/getReceiptResult?apiId=471' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date()+"&con="+this.input; 
+        // this.requestData(this.option);
       }
     },
    }
 };
 </script>
 <style lang='scss' scoped>
+.el-input {
+    width: 150px;
+    margin-left: 5px;
+}
+span.el-form-item__span {
+    float: left;
+    margin-top: 7px;
+}
 .purchasFuelNewMonitor {
   .frameCalculation {
     width: 100%;

src/views/sale/router/index.js

@@ -58,7 +58,8 @@ import newNotice from '../components/dilNotice/newNotice.vue'
 import outFactoryResult from '../components/transport_excute/outFactory/outFactoryResult.vue'
 import smsResult from '../components/transport_excute/outFactory/smsResult.vue'
 import arrivalPhoto from '../components/transport_excute/tms-offsite/arrivalPhoto.vue'
-import arrivalResult from '../components/transport_excute/tms-offsite/arrivalResult.vue'
+import arrivalResult from '../components/transport_excute/tms-offsite/arrivalResult.vue' 
+import transportationPerformance from '../components/offSiteTransportation/transportationPerformance.vue' 
 import distance from '../components/transport_excute/tms-offsite/distance.vue'
 // import inTransit from '../components/transport_excute/offSiteTransportation/inTransit.vue'
 import inTransitAbnormal from '../components/transport_excute/tms-offsite/inTransitAbnormal.vue'
@@ -217,7 +218,8 @@ const constantRouterMap = [
 		{path: 'checkGPS', name: 'checkGPS', meta: {code: 'xtpzgl-yhgl'}, component: checkGPS},
 		{path: 'currentLocation', name: 'currentLocation', meta: {code: 'xtpzgl-yhgl'}, component: currentLocation},
 		{path: 'inTransitWarn', name: 'inTransitWarn', meta: {code: 'xtpzgl-yhgl'}, component: inTransitWarn},
-	  ]
+		{path: 'transportationPerformance', name: 'transportationPerformance', meta: {code: 'xtpzgl-yhgl'}, component: transportationPerformance},
+	  ] 
 	}
   ];
   const router = new Router({

src/views/statisticalReport/components/defendCapacity/getCapacityByDefend.vue

@@ -28,17 +28,15 @@
         :disabled="true"
         style="width: 100px"
       ></el-input>
-    </div>
-    <div
-      class="input_box"
-      style="width: 225px; margin-left: 30px; margin-top: 20px"
-    >
-      <el-input placeholder="请输入车牌号/出厂门岗" v-model="input" clearable>
+         <el-input placeholder="请输入车牌号/出厂门岗" v-model="input" style="width: 220px;margin-left: 1rem;" clearable>
       </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
+   
+   
+   
     <div class="table">
       <mergeRowTable
         ref="excelDom"

src/views/statisticalReport/components/loadCapacityDetail/loadCapacityDetail.vue

@@ -0,0 +1,170 @@
+<template>
+  <!-- 装机计重明细查询 -->
+  <div class="loadCapacityDetail">
+    <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="onclickSearch">
+        <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="totalNumber" :disabled="true" style="width: 100px;"></el-input>
+      <span style="margin-left: 1rem;">合计车数：</span>
+      <el-input v-model="totalCapacity" :disabled="true" style="width: 100px;"></el-input>
+     
+       <el-input placeholder="请输入装机车牌号/可查询当天车辆数据" v-model="input" style="width: 220px;margin-left: 1rem;" clearable>
+      </el-input>
+         <el-button type="primary" class="btn" @click="onclickCapacity">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+   
+    </div>
+    <div class="table">
+      <mergeRowTable ref="excelDom" v-bind.sync="option" @func="func"></mergeRowTable>
+    </div>
+  </div>
+</template>
+
+<script>
+import { sjTime } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
+export default {
+  data() {
+    return {
+      totalNumber: null,
+      totalCapacity: null,
+      startTime: null,
+      endTime: null,
+
+      input: "",
+      tableTitle: "装机计重明细报表",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "api/v1/tms/getLoaderForResultDetail?apiId=480",
+        comparison: "orderNumber",
+        columnIndexs: [0, 1, 2, 4, 5, 6],
+      },
+    };
+  },
+  created() {
+    if (
+      getCookie("orgCode") == "dagangadmin" ||
+      getCookie("orgCode") == "zidonghuabu"
+    ) {
+      this.option.requestUrl =
+        "/api/v1/tms/getLoaderForResultDetail?apiId=480&startTime=null&endTime=null&i=" +
+        new Date();
+    } else if (getCookie("orgCode") == "wuliuchuyunzhongxin") {
+      this.option.requestUrl =
+        "/api/v1/tms/getLoaderForResultDetail?apiId=480&orderType=13&startTime=null&endTime=null&i=" +
+        new Date();
+    } else {
+      this.option.requestUrl =
+        "/api/v1/tms/getLoaderForResultDetail?apiId=480&userId=" +
+        getCookie("orgCode") +
+        "&startTime=null&endTime=null&i=" +
+        new Date();
+    }
+  },
+  methods: {
+    func(res) {
+      console.log(res);
+      var resultNetWeightTotal = 0;
+      var currentCapacityTotal = 0;
+      res.list.forEach((e) => {
+        currentCapacityTotal++;
+        resultNetWeightTotal = resultNetWeightTotal + e.resultNetWeight;
+      });
+      this.totalNumber = resultNetWeightTotal.toFixed(2) + "t";
+      this.totalCapacity = currentCapacityTotal;
+    },
+    onclickCapacity() {
+      this.option.requestUrl =
+        "/api/v1/tms/getLoaderForResultDetail?apiId=480&con=" + this.input;
+    },
+    getRequestUrl() {
+      if (
+        getCookie("orgCode") == "dagangadmin" ||
+        getCookie("orgCode") == "zidonghuabu"||
+        getCookie("orgCode")=="wuliuchuyunzhongxin"
+      ) {
+        this.option.requestUrl =
+          "/api/v1/tms/getLoaderForResultDetail?apiId=480&startTime=null&endTime=null&i=" +
+          new Date();
+      }  else {
+        this.option.requestUrl =
+          "/api/v1/tms/getLoaderForResultDetail?apiId=480&userId=" +
+          getCookie("orgCode") +
+          "&startTime=null&endTime=null&i=" +
+          new Date();
+      }
+    },
+
+    // 添加开始结束时间筛选
+    onclickSearch() {
+      console.log("aaaa");
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+        // console.log("startTime", startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+        // console.log("endTime", endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          if (
+            getCookie("orgCode") == "dagangadmin" ||
+            getCookie("orgCode") == "zidonghuabu"
+          ) {
+            this.option.requestUrl =
+              "/api/v1/tms/getLoaderForResultDetail?apiId=480&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i=" +
+              new Date();
+          } else if (getCookie("orgCode") == "wuliuchuyunzhongxin") {
+            this.option.requestUrl =
+              "/api/v1/tms/getLoaderForResultDetail?apiId=480&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>
+.purchasFuelNewMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+    .el-date-editor {
+      margin: 20px;
+    }
+  }
+}
+</style>

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

@@ -1,50 +1,61 @@
 //化产焦炭统计报表
 <template>
   <div class="purchasFuelNewMonitor">
-    <div class="frameCalculation">
-      <span style="width:68px">计毛时间：</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-input
+    <el-form :inline="true" style="margin-top :5px">
+      <el-form-item>
+        <label class="el-form-item__label" style="width: auto;">计毛时间：</label>
+            <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-form-item>
+      <el-form-item>
+        <el-input
         v-model="inputReceiveName"
         style="width:200px"
         placeholder="输入收货单位"
         clearable="true"
       ></el-input>
       <el-button type="primary" @click="getReceiveName">查询</el-button>
-      <el-button type="primary" @click="exportData()"
-        ><i class="el-icon-download"></i>导出(Excel)</el-button
-      >
-      <el-button type="primary" @click="refresh">
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="exportData()"
+        ><i class="el-icon-download"></i>导出(Excel)</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
       </el-button>
-      <span style="margin-left: 1rem;width:68px">合计净重：</span>
+      </el-form-item>
+      <el-form-item>
+        <span style="margin-left: 1rem;width:68px">合计净重：</span>
       <el-input
         v-model="totalNumber"
         :disabled="true"
         style="width: 150px;"
       ></el-input>
-      <span style="margin-left: 1rem;width:68px">合计车数：</span>
+      </el-form-item>
+      <el-form-item>
+        <span style="margin-left: 1rem;width:68px">合计车数：</span>
       <el-input
         v-model="totalCapacity"
         :disabled="true"
         style="width: 150px;"
       ></el-input>
-    </div>
+      </el-form-item>
+    </el-form> 
     <div class="table">
       <dilTable
         ref="excelDom"
@@ -241,16 +252,4 @@ export default {
 </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/components/salesLogisticsStatistics/saleCoproductForm.vue

@@ -1,49 +1,61 @@
 //副产品统计报表
 <template>
   <div class="purchasFuelNewMonitor">
-    <div class="frameCalculation">
-      <span style="width:68px">计毛时间：</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-input
+    <el-form :inline="true" style="margin-top :5px">
+      <el-form-item>
+        <label class="el-form-item__label" style="width: auto;">计毛时间：</label>
+            <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-form-item>
+      <el-form-item>
+        <el-input
         v-model="inputReceiveName"
         style="width:200px"
         placeholder="输入收货单位"
+        clearable="true"
       ></el-input>
       <el-button type="primary" @click="getReceiveName">查询</el-button>
-      <el-button type="primary" @click="exportData()"
-        ><i class="el-icon-download"></i>导出(Excel)</el-button
-      >
-      <el-button type="primary" @click="refresh">
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="exportData()"
+        ><i class="el-icon-download"></i>导出(Excel)</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
       </el-button>
-      <span style="margin-left: 1rem;width:68px">合计净重：</span>
+      </el-form-item>
+      <el-form-item>
+        <span style="margin-left: 1rem;width:68px">合计净重：</span>
       <el-input
         v-model="totalNumber"
         :disabled="true"
         style="width: 150px;"
       ></el-input>
-      <span style="margin-left: 1rem;width:68px">合计车数：</span>
+      </el-form-item>
+      <el-form-item>
+        <span style="margin-left: 1rem;width:68px">合计车数：</span>
       <el-input
         v-model="totalCapacity"
         :disabled="true"
         style="width: 150px;"
       ></el-input>
-    </div>
+      </el-form-item>
+    </el-form>       
     <div class="table">
       <dilTable
         ref="excelDom"
@@ -239,16 +251,4 @@ export default {
 </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/components/salesLogisticsStatistics/saleSteelForm.vue

@@ -1,43 +1,52 @@
 //钢材统计报表
 <template>
   <div class="purchasFuelNewMonitor">
-    <div class="frameCalculation">
-      <span style="width:68px">计毛时间：</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
-      >
-      <el-button type="primary" @click="refresh">
+    <el-form :inline="true" style="margin-top :5px">
+      <el-form-item>
+        <label class="el-form-item__label" style="width: auto;">计毛时间：</label>
+            <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-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="exportData()"
+        ><i class="el-icon-download"></i>导出(Excel)</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
       </el-button>
-      <span style="margin-left: 1rem;width:68px">合计净重：</span>
+      </el-form-item>
+      <el-form-item>
+        <span style="margin-left: 1rem;width:68px">合计净重：</span>
       <el-input
         v-model="totalNumber"
         :disabled="true"
         style="width: 150px;"
       ></el-input>
-      <span style="margin-left: 1rem;width:68px">合计车数：</span>
+      </el-form-item>
+      <el-form-item>
+        <span style="margin-left: 1rem;width:68px">合计车数：</span>
       <el-input
         v-model="totalCapacity"
         :disabled="true"
         style="width: 150px;"
       ></el-input>
-    </div>
+      </el-form-item>
+    </el-form> 
     <div class="table">
       <!-- <dilTable ref="excelDom" v-bind.sync="option" :isHeigth="isHeigth" :shiyHeigth="shiyHeigth" :isKuang="isKuang" @func="func" @requestQuery="requestQuery" :pageSize = "pageSize"></dilTable> -->
       <mergeRowTable ref="excelDom" v-bind.sync="option"> </mergeRowTable>
@@ -192,16 +201,4 @@ export default {
 </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

@@ -27,6 +27,7 @@ import inwardSporadicReport from '../components/sporadicReport/inwardSporadicRep
 import getInstall from '../components/inwardReport/getInstall.vue'
 import getCapacityByDefend from '../components/defendCapacity/getCapacityByDefend.vue'
 import inwardAssemble from '../components/inwardAssemble/inwardAssemble.vue'
+import loadCapacityDetail from '../components/loadCapacityDetail/loadCapacityDetail.vue'
 Vue.use(Router)
 
 const constantRouterMap = [
@@ -57,7 +58,8 @@ const constantRouterMap = [
       {path: 'inwardSporadicReport', name: 'inwardSporadicReport', meta: {code: 'xtpzgl-yhgl'}, component: inwardSporadicReport},
       {path: 'getInstall', name: 'getInstall', meta: {code: 'xtpzgl-yhgl'}, component: getInstall},
       {path: 'getCapacityByDefend', name: 'getCapacityByDefend', meta: {code: 'xtpzgl-yhgl'}, component: getCapacityByDefend},
-      {path: 'inwardAssemble', name: 'inwardAssemble', meta: {code: 'xtpzgl-yhgl'}, component: inwardAssemble}
+      {path: 'inwardAssemble', name: 'inwardAssemble', meta: {code: 'xtpzgl-yhgl'}, component: inwardAssemble},
+      {path: 'loadCapacityDetail', name: 'loadCapacityDetail', meta: {code: 'xtpzgl-yhgl'}, component: loadCapacityDetail}
     ]
   }
 ];