tj

build/utils.js

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

config/index.js

@@ -56,17 +56,17 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://172.16.33.166:8080",
+    // target: "http://172.16.33.166:8080",
     // target: "http://172.16.33.162:8019",
-    // target: "http://192.168.1.102:8019",
+    target: "http://192.168.1.101:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
     }
   },
   "/views/api/v1": {
-    // target: "http://172.16.33.166:8080",
-    target: "http://192.168.1.102:8019",
+    target: "http://172.16.33.166:8080",
+    // target: "http://192.168.1.102:8019",
     ws: true,
     pathRewrite: {
       "^/views/api/v1": "/api/v1"

package.json

@@ -53,6 +53,7 @@
     "vue-quill-editor": "^3.0.5",
     "vue-router": "^3.0.1",
     "vue-splitpane": "^1.0.2",
+    "vuescroll": "^4.17.3",
     "vuex": "^3.0.1",
     "vxe-table": "^3.4.12",
     "x2js": "^3.3.0",

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

@@ -33,7 +33,7 @@ export default {
     //行拖拽
     // this.rowDrop();
     //列拖拽
-    this.columnDrop();
+    // this.columnDrop();
   },
   methods: {
     // 通过请求获取数据

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

@@ -32,8 +32,7 @@
     <div class="lineId from">
       <span class="text">采购订单号：</span>
       <el-input class="input" v-model="purchaseOrderNo" disabled> </el-input>
-      <el-button type="primary" @click="ondrawer(6)" v-if="materialId && supplierId">浏览</el-button>
-      <span v-else class="span"></span>
+      <el-button type="primary" @click="ondrawer(6)">浏览</el-button>
     </div>
     <div class="orderType from">
       <span class="text">订单类别：</span>
@@ -271,8 +270,7 @@ export default {
         mapList1: [],
       },
       secend: {
-        requestUrl:
-          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=",
+        requestUrl:"",
         selectionType: "radio",
         mapList2: [],
       },
@@ -282,15 +280,15 @@ export default {
         mapList3: [],
       },
       unloadPoint: {
-        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        requestUrl: "",
         selectionType: "radio",
       },
       line: {
-        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
+        requestUrl: "",
         selectionType: "radio",
       },
       purchaseOrder:{
-        requestUrl: "/api/v1/ams/getPurchaseOrderList?apiId=81",
+        requestUrl: "",
         selectionType: "radio",
       }
     };
@@ -344,9 +342,9 @@ export default {
               this.purchaseOrderId = res.data.data.purchaseOrderId;
               this.purchaseOrderNo=res.data.data.purchaseOrderNo;
               if (res.data.data.receiveUnitId == 1) {
-                this.orderType = 6;
+                this.orderType = 17;
               } else {
-                this.orderType = 7;
+                this.orderType = 18;
               }
             }
           } else {
@@ -355,9 +353,6 @@ export default {
         });
       }
     },
-    func(res){
-      this.isKuang = false;
-    },
     onclick() {
       if(this.input){
         this.isKuang = true;
@@ -373,38 +368,38 @@ export default {
             this.third.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null + "&index=" + this.input;
           }
         } else if (this.onDrawerNumber == 4) {
-          this.unloadPoint.requestUrl =  "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.input;
+          this.unloadPoint.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.input;
         } else if (this.onDrawerNumber == 5) {
           this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
         }else if (this.onDrawerNumber == 6) {
-          this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&con=" + this.input+"&i="+new Date();
+          this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId="+this.supplierId+"&con=" + this.input+"&i="+new Date();
         }
       }else{
         if (this.onDrawerNumber == 1) {
-          this.frist.requestUrl = "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050"
+          this.frist.requestUrl = "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&i="+new Date();
         } else if (this.onDrawerNumber == 2) {
-          this.secend.requestUrl = "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" + this.materialId;
+          this.secend.requestUrl = "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" + this.materialId+"&i="+new Date();
         } else if (this.onDrawerNumber == 3) {
           //判断是否是承运商查询车辆
           if (getCookie("orgCode") == "chengyunshang") {
-            this.third.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + getCookie("userId");
+            this.third.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + getCookie("userId")+"&i="+new Date();
           } else {
-            this.third.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null;
+            this.third.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null+"&i="+new Date();
           }
         } else if (this.onDrawerNumber == 4) {
-          this.unloadPoint.requestUrl =  "/api/v1/uc/getUnloadingMesByLike?apiId=374";
+          this.unloadPoint.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&i="+new Date();
         } else if (this.onDrawerNumber == 5) {
-          this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3";
+          this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i="+new Date();
         }else if (this.onDrawerNumber == 6) {
-          this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81";
+          this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId="+this.supplierId+"&i="+new Date();
         }
       }
     },
     ondrawer(num) {
-      this.onDrawerNumber = num;
       this.drawer = true;
+      this.onDrawerNumber = num;
       if(num == 1){
-        this.frist.requestUrl = "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050"
+        this.frist.requestUrl = "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" + this.input;
       }else if (num == 2) {
         this.secend.requestUrl = "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" + this.materialId;
       } else if (num == 3) {
@@ -417,9 +412,9 @@ export default {
       } else if (num == 4) {
         this.unloadPoint.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date();
       } else if (num == 5) {
-        this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
+        this.line.requestUrl ="/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
       }else if (num == 6) {
-        this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&i=" + new Date();
+        this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId="+ this.supplierId+"&i=" + new Date();
       }
     },
     // 返回
@@ -445,6 +440,16 @@ export default {
       this.lineId = selection.lineId;
     },
     currentRadioChange6(selection) {
+      console.log(selection)
+      if (selection.shipperId == 1) {
+        this.orderType = 6;
+      } else {
+        this.orderType = 7;
+      }
+      this.materialName = selection.materialName;
+      this.materialId = selection.materialId;
+      this.supplierId = selection.supplierId;
+      this.supplierName = selection.supplierName;
       this.purchaseOrderNo = selection.purchaseOrderNo;
       this.purchaseOrderId = selection.purchaseOrderId;
     },
@@ -452,6 +457,10 @@ export default {
       this.selectionList = [];
       this.selectionList = selection;
     },
+    func(res){
+      console.log(res)
+      this.isKuang = false;
+    },
     // 确认
     onClickConfirm() {
       var state = 0;
@@ -548,7 +557,7 @@ export default {
               message: "添加成功!",
               type: "success",
             });
-            this.$router.push("/transportReserveRan");
+            this.$router.push("/transportationReservation");
           }
         });
       }

src/views/TMS/components/purchaseChemicalMaterials/transportationReservationAdd.vue

@@ -32,8 +32,7 @@
     <div class="lineId from">
       <span class="text">采购订单号：</span>
       <el-input class="input" v-model="purchaseOrderNo" disabled> </el-input>
-      <el-button type="primary" @click="ondrawer(6)" v-if="materialId && supplierId">浏览</el-button>
-      <span v-else class="span"></span>
+      <el-button type="primary" @click="ondrawer(6)">浏览</el-button>
     </div>
     <div class="orderType from">
       <span class="text">订单类别：</span>
@@ -266,13 +265,12 @@ export default {
       direction: "rtl",
       input: "",
       frist: {
-        requestUrl: "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050",
+        requestUrl: "",
         selectionType: "radio",
         mapList1: [],
       },
       secend: {
-        requestUrl:
-          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=",
+        requestUrl:"",
         selectionType: "radio",
         mapList2: [],
       },
@@ -282,15 +280,15 @@ export default {
         mapList3: [],
       },
       unloadPoint: {
-        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        requestUrl: "",
         selectionType: "radio",
       },
       line: {
-        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
+        requestUrl: "",
         selectionType: "radio",
       },
       purchaseOrder:{
-        requestUrl: "/api/v1/ams/getPurchaseOrderList?apiId=81",
+        requestUrl: "",
         selectionType: "radio",
       }
     };
@@ -372,9 +370,9 @@ export default {
         } else if (this.onDrawerNumber == 4) {
           this.unloadPoint.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.input;
         } else if (this.onDrawerNumber == 5) {
-          this.option.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
+          this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
         }else if (this.onDrawerNumber == 6) {
-          this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&con=" + this.input+"&i="+new Date();
+          this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId="+this.supplierId+"&con=" + this.input+"&i="+new Date();
         }
       }else{
         if (this.onDrawerNumber == 1) {
@@ -391,9 +389,9 @@ export default {
         } else if (this.onDrawerNumber == 4) {
           this.unloadPoint.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&i="+new Date();
         } else if (this.onDrawerNumber == 5) {
-          this.option.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i="+new Date();
+          this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i="+new Date();
         }else if (this.onDrawerNumber == 6) {
-          this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&i="+new Date();
+          this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId="+this.supplierId+"&i="+new Date();
         }
       }
     },
@@ -414,9 +412,9 @@ export default {
       } else if (num == 4) {
         this.unloadPoint.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date();
       } else if (num == 5) {
-        this.option.requestUrl ="/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
+        this.line.requestUrl ="/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
       }else if (num == 6) {
-        this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&i=" + new Date();
+        this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId="+ this.supplierId+"&i=" + new Date();
       }
     },
     // 返回
@@ -442,6 +440,16 @@ export default {
       this.lineId = selection.lineId;
     },
     currentRadioChange6(selection) {
+      console.log(selection)
+      if (selection.shipperId == 1) {
+        this.orderType = 17;
+      } else {
+        this.orderType = 18;
+      }
+      this.materialName = selection.materialName;
+      this.materialId = selection.materialId;
+      this.supplierId = selection.supplierId;
+      this.supplierName = selection.supplierName;
       this.purchaseOrderNo = selection.purchaseOrderNo;
       this.purchaseOrderId = selection.purchaseOrderId;
     },

src/views/appoint/app.js

@@ -24,6 +24,10 @@ Vue.use(VueApollo)
 import DilCommonUI from "@/components/DilCommonUI";
 Vue.use(DilCommonUI);
 
+import vuescroll from "vuescroll";//引入vuescroll
+import "vuescroll/dist/vuescroll.css";//引入vuescroll样式
+Vue.use(vuescroll);//使用
+
 // 导出Excel全局组件
 import tableToExcel from '@/components/exportExcel/exportExcel'
 Vue.use(tableToExcel)

src/views/appoint/components/saleContract/addTransportPrice.vue

@@ -1,14 +1,79 @@
 <template>
   <!-- 添加汽运单价 -->
-  <div class="addSalePlan">
+  <div class="addTransportPrice">
     <page-title>新增</page-title>
-    <div class="form-box" style="margin-right: 10rem">
-      <dil-form :formId="287" v-model="form1" ref="from1"></dil-form>
+    <div class="form">
+      <div class="form_box">
+        <dil-form :formId="287" v-model="form1" ref="from1"></dil-form>
+      </div> 
+      <div class="liulan">
+          <el-button type="primary" class="btn" @click="lineClick">浏览</el-button>
+          <el-button type="primary" class="btn1" @click="addressClick">浏览</el-button>
+          <el-button type="primary" class="btn2">浏览</el-button>
+      </div>
     </div>
-    <div class="button-box">
+    <div class="button_box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
+    <!-- 线路模态框 -->
+    <el-drawer
+      title="请选择线路"
+      :visible.sync="LineDrawer"
+      :direction="direction"
+      :before-close="handleClose"
+      close-on-press-escape
+      modal
+      wrapperClosable
+      size="40%"
+    >
+      <div class="selectText">
+        <!-- <span></span> -->
+        <el-input v-model="LineText" placeholder="请输入内容"></el-input>
+        <el-button type="primary" @click="selectLineClick" :loading="selectLineLoading"><i class="el-icon-search"></i>查询</el-button>
+      </div>
+      <div class="LineTable">
+        <vue-scroll :ops="ops" style="width:100%;height:100%">
+          <dilTable 
+            v-bind.sync="line"
+            @radio-change="currentRadioChange"
+            :isKuang="isKuang"
+            :loading="tableLoading"
+            :drawer="LineDrawer"
+            @func="func"
+          ></dilTable>
+        </vue-scroll>
+      </div>
+    </el-drawer>
+    <!-- 地址模态框 -->
+    <el-drawer
+      title="请选择收货地址"
+      :visible.sync="addresDrawer"
+      :direction="direction"
+      :before-close="handleClose"
+      close-on-press-escape
+      wrapperClosable
+      modal
+      size="40%"
+    >
+      <div class="selectText">
+        <!-- <span></span> -->
+        <el-input v-model="addresText" placeholder="请输入内容"></el-input>
+        <el-button type="primary" @click="selectAddresClick" :loading="selectLineLoading"><i class="el-icon-search"></i>查询</el-button>
+      </div>
+      <div class="LineTable">
+        <vue-scroll :ops="ops" style="width:100%;height:100%">
+          <dilTable 
+            v-bind.sync="addres"
+            @radio-change="currentRadioChange1"
+            :isKuang="isKuang"
+            :loading="tableLoading"
+            :drawer="addresDrawer"
+            @func="func"
+          ></dilTable>
+        </vue-scroll>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
@@ -19,68 +84,206 @@ export default {
   components: { PageTitle },
   data() {
     return {
-      form1: {},
-      value: undefined,
+      //是否打开收货地址模态框
+      addresDrawer:false,
+      //收货地址查询条件
+      addresText:null,
+      //收货地址模态框数据
+      addres:{
+        requestUrl:"",
+        selectionType: "radio",
+      },
+
+      //是否点击查询
+      isKuang:false,
+      //表格加载状态
+      tableLoading:false,
+      //是否打开线路的模态窗口
+      LineDrawer:false,
+      //线路查询条件
+      LineText:null,
+      //线路模态框查询按钮状态
+      selectLineLoading:false,
+      //线路模态窗口的数据
+      line:{
+        requestUrl:"",
+        selectionType: "radio",
+      },
+      //模态窗口的打开的方向
+      direction: 'rtl',
+      //表单数据
+      form1: {
+        priceDate:new Date(),
+      },
+      //提交给后端的数据
+      map:{},
+      ops: {
+        vuescroll: {},
+        scrollPanel: {},
+        rail: {
+          keepShow: true
+        },
+        bar: {
+          hoverStyle: true,
+          onlyShowBarOnScroll: false, //是否只有滚动的时候才显示滚动条
+          background: "#5f9ea0",//滚动条颜色
+          opacity: 0.8,//滚动条透明度
+          "overflow-x": "hidden"
+        }
+      }
     };
   },
-  created(){
-    this.form1.priceDate=new Date()
-  },
   methods: {
-    // 确定
-    makeSure() {
-      let amsContractTransportPrice = {
-        shipperId: this.form1.shipperId,
-        carrierId: this.form1.carrierId,
-        lineId: this.form1.lineId,
-        addressId: this.form1.addressId,
-        priceValue: this.form1.priceValue,
-        priceDate: sjTime(this.form1.priceDate),
-      };
-      if (
-        amsContractTransportPrice.shipperId && 
-        amsContractTransportPrice.carrierId && 
-        amsContractTransportPrice.lineId && 
-        amsContractTransportPrice.addressId && 
-        amsContractTransportPrice.priceValue && 
-        amsContractTransportPrice.priceDate
-      ){
-        this.axios
-          .post(
-            "/api/v1/ams/addAmsContractTransportUnitPrice1",
-            amsContractTransportPrice
-          )
-          .then((res) => {
-            console.log(res.data.data);
-            if (res.data.code == "200") {
-              this.$router.go(-1);
-            }
-          });
-      }else {
-        this.$message.error("必填项存在空值！");
+    func(res){
+        this.selectLineLoading = false;
+        this.isKuang = false;
+        this.tableLoading = false;
+    },
+    selectAddresClick(){
+      this.tableLoading = true;
+      this.selectLineLoading = true;
+      this.isKuang = true;
+      if(this.addresText){
+        this.addres.requestUrl = "/api/v1/ams/getAddressDeliveryAddress?apiId=255&con="+this.addresText;
+      }else{
+        this.addres.requestUrl = "/api/v1/ams/getAddressDeliveryAddress?apiId=255&i=" + new Date();
+      }
+    },
+    selectLineClick(){
+      this.tableLoading = true;
+      this.selectLineLoading = true;
+      this.isKuang = true;
+      if(this.LineText){
+        this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con="+this.LineText;
+      }else{
+        this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
+      }
+    },
+    currentRadioChange(val){
+      let mapvalue = {
+        shipperId:this.form1.shipperId,
+        lineName:val.lineName,
+        carrierId:this.form1.carrierId,
+        addressName:this.form1.addressName,
+        priceValue:this.form1.priceValue,
+        materialId:this.form1.materialId,
+        type:this.form1.type,
+        priceDate:this.form1.priceDate,
       }
+      this.form1 = mapvalue
+      this.map.lineId = val.lineId;
+    },
+    currentRadioChange1(val){
+      let mapvalue = {
+        shipperId:this.form1.shipperId,
+        lineName:this.form1.lineName,
+        carrierId:this.form1.carrierId,
+        addressName:val.address,
+        priceValue:this.form1.priceValue,
+        materialId:this.form1.materialId,
+        type:this.form1.type,
+        priceDate:this.form1.priceDate,
+      }
+      this.form1 = mapvalue
+      this.map.addressId = val.addressId;
+    },
+    //打开线路的模态窗口
+    lineClick(){
+      this.LineDrawer = true;
+      this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3"
+    },
+    addressClick(){
+      this.addresDrawer = true;
+      this.addres.requestUrl = "/api/v1/ams/getAddressDeliveryAddress?apiId=255"
+    },
+    //模态窗口关闭时调用
+    handleClose(){
+      if(this.LineDrawer){
+        this.LineDrawer = false;
+        this.LineText = null;
+      }
+      if(this.addresDrawer){
+        this.addresDrawer = false;
+        this.addresText = null;
+      }
+    },
+    makeSure() {
+      
     },
     // 取消
     cancel() {
-      this.$router.go(-1);
+      this.$router.push('/transportPrice');
     },
   },
 };
 </script>
-<style lang='scss' scoped>
-.form-box{
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-top: 5px;
-  margin-bottom: 20px;
-}
-.button-box{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
+<style lang='scss'>
+.addTransportPrice{
+  .form{
+    display: flex;
+    .form_box{
+      width: 320px;
+      margin-left: 30%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form{
+        .preview-group{
+          .el-form-item{
+            .el-form-item__label{
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content{
+              .el-select{
+                width: 250px;
+              }
+              .el-input{
+                width: 250px;
+              }
+            }
+          }
+        }
+      }
+    }
+    .liulan{
+      width: 120px;
+      margin-top: 30px;
+      .el-button{
+        width: 100px !important;
+        margin: auto;
+      }
+      .btn{
+        margin-top: 105px;
+      }
+      .btn1{
+        margin-top: 13px;
+      }
+      .btn2{
+        margin-top: 67px;
+      }
+    }
+  }
+  .button_box{
+    margin-left: 45%;
+  }
+  .selectText{
+    .el-input{
+      width: 250px;
+    }
+  }
+  .LineTable{
+    width: 100%;
+    height: 480px;
+    overflow: hidden;
+    margin-top: 10px;
+  }
 }
+</style>
+<style lang='scss'>
+  /deep/.__bar-is-vertical {
+    right: -1px !important;
+  }
+  /deep/.__bar-is-horizontal {
+    display: none !important;
+  }
 </style>

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

@@ -2,13 +2,24 @@
   <div class="purchasFuelNewMonitor">
     <div class="frameCalculation">
       <span>计毛时间：</span>
-      <el-date-picker
+      <!-- <el-date-picker
         v-model="Time"
         :editable="true"
         type="datetimerange"
         range-separator="至"
         start-placeholder="开始日期"
         end-placeholder="结束日期">
+      </el-date-picker> -->
+      <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>查询
@@ -38,7 +49,8 @@ export default {
       option: {
         requestUrl: "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&i=" +new Date(),
       },
-      Time:null,
+      startTime:null,
+      endTime:null,
       //合计净重
       totalNumber: 0,
       //合计车数
@@ -47,7 +59,8 @@ export default {
     };
   },
   created(){
-      var startTime = this.dataFormat(sjTime(new Date()));
+      const start = new Date(new Date(new Date().toLocaleDateString()).getTime());
+      var startTime = this.dataFormat(sjTime(start));
       var endTime = this.dataFormat(sjTime(new Date()));
       this.tableTitle = startTime + ' 至 ' + endTime;
   },
@@ -63,13 +76,20 @@ export default {
     onclick() {
       let startTime = null;
       let endTime = null;
-      if(this.Time != null){
-        startTime = sjTime(this.Time[0]);
-        endTime = sjTime(this.Time[1]);
+      if(this.startTime && this.endTime){
+        startTime = sjTime(this.startTime);
+        endTime = sjTime(this.endTime);
+        //修改报表名称
+        this.tableTitle = this.dataFormat(startTime) + ' 至 ' + this.dataFormat(endTime);
+        this.option.requestUrl = "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+      }else{
+        if(this.startTime){
+          startTime = sjTime(this.startTime);
+        }else if(this.endTime){
+          endTime = sjTime(this.endTime);
+        }
+        this.option.requestUrl = "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
       }
-      this.option.requestUrl = "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
-      //修改报表名称
-      this.tableTitle = this.dataFormat(startTime) + ' 至 ' + this.dataFormat(endTime);
     },
     //获取当前条件下的总净重
     calculationTotalNumber(dataRequestQuery){