合并

build/utils.js

@@ -15,19 +15,16 @@ 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','appoint','sale','RMS','statisticalReport'];
 // let devModules = ['index','appoint','WMS'];
-// let devModules = ['index','inward','SporadicManage']
+// let devModules = ['index','inward','ADMINISTRATORS']
 // let devModules = ['index','sale','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'];
 // let devModules = ['index','RMS'];
-
-
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

config/index.js

@@ -74,7 +74,7 @@ let proxyTable = {
   },
   "/views/api/v1": {
     target: "http://172.16.33.166:8080",
-    // target: "http://192.168.1.115:8080",
+    // target: "http://192.168.1.115:8019",
     ws: true,
     pathRewrite: {
       "^/views/api/v1": "/api/v1"
@@ -103,7 +103,6 @@ module.exports = {
       assetsSubDirectory: 'static',
       assetsPublicPath: '/',
       proxyTable: proxyTable,
-
     // Various Dev Server settings
     host: 'localhost', // can be overwritten by process.env.HOST
     port: 8802, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined

src/components/DilCommonUI/packages/table/src/table.vue

@@ -267,7 +267,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
 @media print {
   .el-pagination {
     display: none;

src/components/OffFactoryMapShow/packages/src/GAODEMap.js

@@ -2,278 +2,359 @@
 import { Loading } from 'element-ui';
 
 export default {
-props:{
-    orderNumber:'',
-    capacityNumber:'',
-},
-data() {
-    return {
-        loading : null,
-       
-    };
-},
-watch:{
-    orderNumber:{
-         deep: true,
-        handler(val, oldVal) {
-            console.log("111111111234646")
-            this.reloadData();
-        }
-    }
-},
-created(){
-  
-     this.reloadData();
-},
-mounted: function () {
-             
-        },
-methods: {
-    startLoading (){
-        this.loading = Loading.service({ lock: true, text: '加载中……', background: 'rgba(0, 0, 0, 0.7)' });
+    props:{
+        //运输订单号
+        orderNumber:'', 
+        //车牌号
+        capacityNumber:'',
     },
-    reloadData() {
-        let resultData = {
-            orderNumber: this.orderNumber,
+    data() {
+        return {
+            //地图对象
+            map:{},
+            //加载消息
+            loading : null,
+            //运输详情
+            transportDetails:{
+                //车牌号
+                capacityNumber:'',
+                //规划路线
+                planeRoute:[],
+                //已行驶轨迹
+                routeTraveled:[],
+                //当前位置
+                currentPoint:{
+                    currentPointLat:"",
+                    currentPointLon:""
+                },
+                //起点位置
+                startPoint:{
+                    currentPointLat:"",
+                    currentPointLon:""
+                },
+                //重点位置
+                endPoint:{
+                    currentPointLat:"",
+                    currentPointLon:""
+                },
+                //自定义标记
+                content:[],
+                //异常位置
+                abnormalLocation:[],
+            }
         };
-        this.startLoading(this.orderNumber);
-        console.log()
-        this.$axios.post(
-            "api/v1/getway/fullPathVisualization",resultData
-            ).then((res) => {
-            this.loading.close(); 
-            if(res.data.startAndEndRoutes!=null){
-                this.initMap(res.data);
-
-            
-            }else{
-                this.$message('车辆未入网或没有开启定位，不能访问');
-                this.newMap();
+    },
+    watch:{
+        //监听车牌号变化
+        orderNumber:{
+            deep: true,
+            handler(val, oldVal) {
+                this.reloadData();
             }
-            
-            
-        })
-        .catch(error => {
+        },
+        //进度条速度
+        sliderVal(newVal) {
+            if (!this.isOnSlider) {
+                return false;
+            }
+            this.sliderChange(newVal)
+        },
+    },
+    created(){
+        //加载数据
+        this.reloadData();
+    },
+    mounted: function () {
+                
+    },
+    methods: {
+        //加载中提示
+        startLoading (){
+            this.loading = Loading.service({ lock: true, text: '加载中……', background: 'rgba(0, 0, 0, 0.7)' });
+        },
+        //加载数据
+        reloadData() {
+            let resultData = {
+                orderNumber: this.orderNumber,
+            };
+            this.startLoading(this.orderNumber);
+            this.$axios.post(
+                "api/v1/getway/fullPathVisualization",resultData
+                ).then((res) => {
                 this.loading.close(); 
-               
-            if((error+"").indexOf("500") !== -1){
+                if(res.data.startAndEndRoutes!=null){
+                    this.initMap(res.data);
+                }else{
                     this.$message('车辆未入网或没有开启定位，不能访问');
                     this.newMap();
+                }
+            }).catch(error => {
+                    this.loading.close(); 
+                
+                if((error+"").indexOf("500") !== -1){
+                        this.$message('车辆未入网或没有开启定位，不能访问');
+                        this.newMap();
+                }
+            });    
+        },
+        //初始化一个地图
+        initMap1(){
+            lazyAMapApiLoaderInstance.load().then(() => {
+                this.map = new AMap.Map('test-map', {
+                  zooms: [13, 18], // 地图缩放范围
+                  center: new AMap.LngLat(116.397428, 39.90923)
+                })
+                this.initPathSimplifier()
+            })
+            let that = this;
+            let el = document.getElementsByClassName("el-slider__button-wrapper")[0];
+            let el2 = document.getElementsByClassName("el-slider__runway")[0];
+            el2.addEventListener("click", that.sliderChange,false);
+            el.addEventListener("mousedown", that.openSlider,false);
+            // 此处用document是因为，滑动较为随意时，mouseup可能不是作用在el上
+            document.addEventListener("mouseup",that.closeSlider,false);
+        },
+        // 初始化组件实例
+        initPathSimplifier() {
+            let that = this
+            AMapUI.load(['ui/misc/PathSimplifier'], (PathSimplifier) => {
+            if (!PathSimplifier.supportCanvas) {
+                alert('当前环境不支持 Canvas！')
+                return
             }
-                    
-                    
-            
+            //创建一个巡航轨迹路线
+            that.pathSimplifierIns = new PathSimplifier({
+                zIndex: 100,//地图层级，
+                map: this.map, //所属的地图实例
+                //巡航路线轨迹列表
+                getPath: (pathData, pathIndex) => {
+                    return pathData.path;
+                },
+                //hover每一个轨迹点，展示内容
+                getHoverTitle: function(pathData, pathIndex, pointIndex) {
+                    if (pointIndex >= 0) {
+                        return pathData.name + '，点：' + pointIndex + '/' + pathData.path.length;
+                    }
+                    return pathData.name + '，点数量' + pathData.path.length;
+                    },
+                    //自定义样式，可设置巡航器样式，巡航轨迹样式，巡航轨迹点击、hover等不同状态下的样式，不设置则用默认样式，详情请参考api文档 renderOptions:{}
+                    //绘制路线节点
+                    renderOptions: {
+                    renderAllPointsIfNumberBelow: 100 //绘制路线节点，如不需要可设置为-1
+                }
             });
-        
-        
-            
+
+            //设置数据
+            that.pathSimplifierIns.setData([{
+                name: '1',
+                path: that.actualList
+            }]);
+            //对第一条线路（即索引 0）创建一个巡航器
+            that.navgtr = that.pathSimplifierIns.createPathNavigator(0, {
+                loop: false, //循环播放
+                speed: that.navgtrSpeed //巡航速度，单位千米/小时
+            });
+
+            that.navgtr.on("start resume", function() {
+                that.navgtr._startTime = Date.now();
+                that.navgtr._startDist = this.getMovedDistance();
+            });
+            that.navgtr.on("stop pause", function() {
+                that.navgtr._movedTime = Date.now() - that.navgtr._startTime;
+                that.navgtr._movedDist = this.getMovedDistance() - that.navgtr._startDist;
+            });
+            that.navgtr.on("move", function(data,position) {
+                let idx = position.dataItem.pointIndex //走到了第几个点
+                let tail = position.tail //至下一个节点的比例位置
+                let totalIdx = idx + tail
+                let len = position.dataItem.pathData.path.length
+
+                // 计算下一个距离速度
+                if (idx < len - 1) {
+                that.navgtr.setSpeed(that.navgtrSpeed * that.times);
+                }
+                // 进度条实时展示tail
+                !that.isOnSlider && (that.sliderVal = (totalIdx / len) * 100);
+                // 如果到头了，回到初始状态
+                if (that.navgtr.isCursorAtPathEnd()) {
+                that.playIcon = "start";
+                that.isPlay = false;
+                that.sliderVal = 0;
+                that.passedTime = that.totalTime;
+                }
+            });
+            })
         },
+        //控制车辆跟随进度条移动
+        sliderChange(val){
+            let newVal = typeof(newVal)==='number' ? val : this.sliderVal
+            let num = parseInt((newVal / 100) * this.actualList.length);
+            let decimal = String((newVal / 100) * this.actualList.length).split('.')[1]||0
+            this.navgtr.moveToPoint(num, Number('0.'+decimal));
+            this.pathSimplifierIns.renderLater();
+        },
+         //创建一个地图
         newMap(){
-                var currentPointLat='32.483276';
-                var currentPointLon='114.03629';
-                this.map = new AMap.Map('container', {
-                    zoom:11,//级别
-                    center: [currentPointLon,currentPointLat],//中心点坐标
-                    viewMode:'3D'//使用3D视图
-                });
-                var content = [
-                        "<div  style='top:1px;width: 180px; background-color: rgba(0, 0, 0, 1);' ><b>"+this.capacityNumber+")</b>",
-                        "<div style='background-color:rgba(255, 255, 255, 0.5);'>提示 :"+'GPS没有开启'+"</div></div>"
-                
-                ];
-
-                // 创建 infoWindow 实例	
-                var infoWindow = new AMap.InfoWindow({
+            var currentPointLat='32.483276';//默认的中心点的纬度
+            var currentPointLon='114.03629';//默认的中心点的经度
+            this.map = new AMap.Map('container', {
+                zoom:11,//级别
+                center: [currentPointLon,currentPointLat],//中心点坐标
+                viewMode:'3D'//使用3D视图
+            });
+            //自定义的标记点
+            var content = [
+                    "<div  style='top:1px;width: 180px; background-color: rgba(0, 0, 0, 1);' ><b>"+this.capacityNumber+")</b>",
+                    "<div style='background-color:rgba(255, 255, 255, 0.5);'>提示 :"+'GPS没有开启'+"</div></div>"
+            ];
+            // 创建 infoWindow 实例	
+            var infoWindow = new AMap.InfoWindow({
                 content: content.join("<br>")  //传入 dom 对象，或者 html 字符串
-                });
-                
-                // 打开信息窗体
-                infoWindow.open(this.map,[currentPointLon,currentPointLat]);
-               
-               
+            });
+            // 打开信息窗体
+            infoWindow.open(this.map,[currentPointLon,currentPointLat]);
         },
-        //startLonlat=114.03629,32.483276
         initMap(data) {
-            console.log(1)
-                var currentPointLat='32.483276';
-                var currentPointLon='114.03629';
-                var polyline=[];
-                //初始化地图
-                if (data.startAndEndRoutes[0].currentPoint!=null){
-                    currentPointLat=data.startAndEndRoutes[0].currentPoint.lat;
-                    currentPointLon=data.startAndEndRoutes[0].currentPoint.lon;
-                }
-                
-            
-            
-                this.map = new AMap.Map('container', {
-                    zoom:11,//级别
-                    center: [currentPointLon,currentPointLat],//中心点坐标
-                    viewMode:'3D'//使用3D视图
+            var currentPointLat='32.483276';
+            var currentPointLon='114.03629';
+            var polyline=[];
+            //初始化地图
+            if (data.startAndEndRoutes[0].currentPoint!=null){
+                currentPointLat=data.startAndEndRoutes[0].currentPoint.lat;
+                currentPointLon=data.startAndEndRoutes[0].currentPoint.lon;
+            }
+            this.map = new AMap.Map('container', {
+                zoom:11,//级别
+                center: [currentPointLon,currentPointLat],//中心点坐标
+                viewMode:'3D'//使用3D视图
+            });
+            var limeList= [];
+            data.startAndEndRoutes.forEach((element,index) => {
+                var startPaths=[];
+                element.runRoute.forEach((element,index) => {
+                    var path= [element.lon,element.lat];
+                    startPaths.push(path);
                 });
-                var limeList= [];
-            
-                data.startAndEndRoutes.forEach((element,index) => {
-                    
-                    var startPaths=[];
-                    element.runRoute.forEach((element,index) => {
-                        var path= [element.lon,element.lat];
-                        startPaths.push(path);
-                    });
-                
-                    var endPaths=[];
-                    if(element.estimateRoute!=null){
-                        element.estimateRoute.forEach((element,index) => {
+                var endPaths=[];
+                if(element.estimateRoute!=null){
+                    element.estimateRoute.forEach((element,index) => {
                         var path= [element.lon,element.lat]
                         endPaths.push(path);
                     });
-                    }
-                    if (element.startPoint!=null){
-                    
-                        //当前点图标标记点
-                        let startPointicon = new AMap.Icon({
-                            size: new AMap.Size(25, 35), // 图标尺寸
-                            image: require('@/assets/img/start.png'), // Icon的图像
-                            imageOffset: new AMap.Pixel(0,0), // 图像相对展示区域的偏移量，适于雪碧图等
-                            imageSize: new AMap.Size(25, 35) // 根据所设置的大小拉伸或压缩图片
-                        });
-                        // 创建一个 Marker 实例：
-                        var startPointmarker = new AMap.Marker({
-                            position: new AMap.LngLat(element.startPoint.lon, element.startPoint.lat),   // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-                                icon: startPointicon, 
-                            title: '北京'
-                        });
-                        // 将创建的点标记添加到已有的地图实例：
-                        this.map.add(startPointmarker);
-                    }
-            
-
-
-
-                
-        
-
-                    
-            
-                    //终点
-                    if (element.endPoint!=null){
-
-                        //当前点图标标记点
-                        let endPointicon = new AMap.Icon({
-                            size: new AMap.Size(25, 35), // 图标尺寸
-                            image: require('@/assets/img/end.png'), // Icon的图像
-                            imageOffset: new AMap.Pixel(0,0), // 图像相对展示区域的偏移量，适于雪碧图等
-                            imageSize: new AMap.Size(25, 35) // 根据所设置的大小拉伸或压缩图片
-                        });
-                        // 创建一个 Marker 实例：
-                        var endPointmarker = new AMap.Marker({
-                            position: new AMap.LngLat(element.endPoint.lon, element.endPoint.lat),   // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-                                icon: endPointicon, 
-                            title: '北京'
-                        });
-
-                        // 将创建的点标记添加到已有的地图实例：
-                        this.map.add(endPointmarker);
-                    }
-                    
-                
-                //已行驶轨迹
-                    if(startPaths.length>0){
-                    
-                        var startLine = new AMap.Polyline({
-                            map:this.map,
-                            path: startPaths,
-                            isOutline: true,
-                            outlineColor: '#00FF00',
-                            borderWeight: 0,
-                            strokeColor: "#00FF00", 
-                            strokeOpacity: 1,
-                            strokeWeight: 5,
-                            // 折线样式还支持 'dashed'
-                            strokeStyle: "solid",
-                            // strokeStyle是dashed时有效
-                            strokeDasharray: [10, 5],
-                            lineJoin: 'round',
-                            lineCap: 'round',
-                            zIndex: 50,
-                        })
-                        
-                        limeList.push(startLine);
-                        
-                    }
-
-                if(endPaths.length>0){
-                    
-                        //预计轨迹
-                    
-                        var endLine = new AMap.Polyline({
-                            map:this.map,
-                            path: endPaths,
-                            isOutline: true,
-                            outlineColor: '#FF0000',
-                            borderWeight: 0,
-                            strokeColor: "#FF0000", 
-                            strokeOpacity: 1,
-                            strokeWeight: 5,
-                            // 折线样式还支持 'dashed'
-                            strokeStyle: "solid",
-                            // strokeStyle是dashed时有效
-                            strokeDasharray: [10, 5],
-                            lineJoin: 'round',
-                            lineCap: 'round',
-                            zIndex: 50,
-                        })
-                        limeList.push(endLine);
-                    
                 }
-                    
-                });
-
-                
-                var content = [
-                        "<div  style='top:1px;width: 180px; background-color: rgba(0, 0, 0, 1);' ><font color='white'>"+this.capacityNumber+'('+data.startAndEndRoutes[0].miled+")</font>",
-                        "<div style='background-color:rgba(255, 255, 255, 0.5);'><font color='white'>地址 :"+data.startAndEndRoutes[0].currentPointName+"</font></div></div>"
-                
-                ];
-                data.startAndEndRoutes.forEach((element,index) => {
-                        // 创建 infoWindow 实例	
-                        var infoWindow = new AMap.InfoWindow({
-                        content: content.join("<br>")  //传入 dom 对象，或者 html 字符串
-                        });
-                      
-
-                       //当前点图标标记点
-                    let currentPointicon = new AMap.Icon({
-                        size: new AMap.Size(40, 40), // 图标尺寸
-                        image: require('@/assets/img/car1.png'), // Icon的图像
+                if (element.startPoint!=null){
+                    //当前点图标标记点
+                    let startPointicon = new AMap.Icon({
+                        size: new AMap.Size(25, 35), // 图标尺寸
+                        image: require('@/assets/img/start.png'), // Icon的图像
                         imageOffset: new AMap.Pixel(0,0), // 图像相对展示区域的偏移量，适于雪碧图等
-                        imageSize: new AMap.Size(40, 40) // 根据所设置的大小拉伸或压缩图片
+                        imageSize: new AMap.Size(25, 35) // 根据所设置的大小拉伸或压缩图片
                     });
                     // 创建一个 Marker 实例：
-                    var currentPointmarker = new AMap.Marker({
-                        position: new AMap.LngLat(element.runRoute[element.runRoute.length-1].lon,element.runRoute[element.runRoute.length-1].lat),   // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-                            icon: currentPointicon, 
+                    var startPointmarker = new AMap.Marker({
+                        position: new AMap.LngLat(element.startPoint.lon, element.startPoint.lat),   // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+                            icon: startPointicon, 
+                        title: '北京'
+                    });
+                    // 将创建的点标记添加到已有的地图实例：
+                    this.map.add(startPointmarker);
+                }
+                //终点
+                if (element.endPoint!=null){
+                    //当前点图标标记点
+                    let endPointicon = new AMap.Icon({
+                        size: new AMap.Size(25, 35), // 图标尺寸
+                        image: require('@/assets/img/end.png'), // Icon的图像
+                        imageOffset: new AMap.Pixel(0,0), // 图像相对展示区域的偏移量，适于雪碧图等
+                        imageSize: new AMap.Size(25, 35) // 根据所设置的大小拉伸或压缩图片
+                    });
+                    // 创建一个 Marker 实例：
+                    var endPointmarker = new AMap.Marker({
+                        position: new AMap.LngLat(element.endPoint.lon, element.endPoint.lat),   // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+                        icon: endPointicon, 
                         title: '北京'
                     });
 
                     // 将创建的点标记添加到已有的地图实例：
-                    this.map.add(currentPointmarker);
-                        // 打开信息窗体
-                        infoWindow.open(this.map,[element.runRoute[element.runRoute.length-1].lon,element.runRoute[element.runRoute.length-1].lat]);
-                });
+                    this.map.add(endPointmarker);
+                }
+                //已行驶轨迹
+                if(startPaths.length>0){
+                    var startLine = new AMap.Polyline({
+                        map:this.map,
+                        path: startPaths,
+                        isOutline: true,
+                        outlineColor: '#00FF00',
+                        borderWeight: 0,
+                        strokeColor: "#00FF00", 
+                        strokeOpacity: 1,
+                        strokeWeight: 5,
+                        // 折线样式还支持 'dashed'
+                        strokeStyle: "solid",
+                        // strokeStyle是dashed时有效
+                        strokeDasharray: [10, 5],
+                        lineJoin: 'round',
+                        lineCap: 'round',
+                        zIndex: 50,
+                    })
+                    limeList.push(startLine);
+                }
+
+            if(endPaths.length>0){
+                //预计轨迹
+                var endLine = new AMap.Polyline({
+                    map:this.map,
+                    path: endPaths,
+                    isOutline: true,
+                    outlineColor: '#FF0000',
+                    borderWeight: 0,
+                    strokeColor: "#FF0000", 
+                    strokeOpacity: 1,
+                    strokeWeight: 5,
+                    // 折线样式还支持 'dashed'
+                    strokeStyle: "solid",
+                    // strokeStyle是dashed时有效
+                    strokeDasharray: [10, 5],
+                    lineJoin: 'round',
+                    lineCap: 'round',
+                    zIndex: 50,
+                })
+                limeList.push(endLine);
+            }
                 
+            });
+            var content = [
+                    "<div  style='top:1px;width: 180px; background-color: rgba(0, 0, 0, 1);' ><font color='white'>"+this.capacityNumber+'('+data.startAndEndRoutes[0].miled+")</font>",
+                    "<div style='background-color:rgba(255, 255, 255, 0.5);'><font color='white'>地址 :"+data.startAndEndRoutes[0].currentPointName+"</font></div></div>"
             
-                this.map.setFitView([ limeList ])
-
-
+            ];
+            data.startAndEndRoutes.forEach((element,index) => {
+                // 创建 infoWindow 实例	
+                var infoWindow = new AMap.InfoWindow({
+                content: content.join("<br>")  //传入 dom 对象，或者 html 字符串
+                });
 
-        
+                //当前点图标标记点
+                let currentPointicon = new AMap.Icon({
+                    size: new AMap.Size(40, 40), // 图标尺寸
+                    image: require('@/assets/img/car1.png'), // Icon的图像
+                    imageOffset: new AMap.Pixel(0,0), // 图像相对展示区域的偏移量，适于雪碧图等
+                    imageSize: new AMap.Size(40, 40) // 根据所设置的大小拉伸或压缩图片
+                });
 
+                // 创建一个 Marker 实例：
+                var currentPointmarker = new AMap.Marker({
+                    position: new AMap.LngLat(element.runRoute[element.runRoute.length-1].lon,element.runRoute[element.runRoute.length-1].lat),   // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+                        icon: currentPointicon, 
+                    title: '北京'
+                });
+                // 将创建的点标记添加到已有的地图实例：
+                this.map.add(currentPointmarker);
+                    // 打开信息窗体
+                    infoWindow.open(this.map,[element.runRoute[element.runRoute.length-1].lon,element.runRoute[element.runRoute.length-1].lat]);
+            });
             
-            
-                
-                // 缩放地图到合适的视野级别
-        
-            }
+            this.map.setFitView([ limeList ])
+        }
     }
 };

src/views/ADMINISTRATORS/components/ADMINISTRATORS1.vue

@@ -324,11 +324,9 @@ export default {
         }else{
             arr.push(mapFirst)
         }
-        this.axios.post("http://172.16.33.166:8066/api/v1/join/tmstruckweightresult/receiveTmsTruckWeightResult",arr).then((res) =>{
-            if(res.data.code == "200"){
-                this.$message.success("补录计量实绩成功")
-                this.$router.go(0)
-            }
+        this.axios.post("/api/v1/uc/recordingWeightResult",arr).then((res) =>{
+            this.$message.success("补录计量实绩成功")
+            this.$router.go(0)
         })
     },
     onClickCancel(){

src/views/RMS/components/addCapacity.vue

@@ -30,7 +30,7 @@
           <el-upload
             class="upload-demo"
             ref="upload1"
-            action="http://172.16.33.166:8080/api/v1/rms/uploadCarrier1"
+            action="/api/v1/rms/uploadCarrier1"
             :before-upload="beforeUpload"
             :multiple="false"
             list-type="picture"

src/views/RMS/components/addCarrier.vue

@@ -35,7 +35,7 @@
     <el-upload
       class="upload-demo"
       ref="upload1"
-      action="http://172.16.33.166:8080/api/v1/rms/uploadCarrier1"
+      action="/api/v1/rms/uploadCarrier1"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -59,7 +59,7 @@
     <el-upload
       class="upload-demo"
       ref="upload2"
-      action="http://172.16.33.166:8080/api/v1/rms/uploadCarrier1"
+      action="/api/v1/rms/uploadCarrier1"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -82,7 +82,7 @@
     <el-upload
       class="upload-demo"
       ref="upload3"
-      action="http://172.16.33.166:8080/api/v1/rms/uploadCarrier1"
+      action="/api/v1/rms/uploadCarrier1"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -234,6 +234,11 @@ export default {
       this.bidAreaId = selection.bidAreaId;
     },
     makeSure() {
+      console.log(this.input.length)
+      if(this.input.length > 14){
+        this.$message.error("账号长度不能大于十四个字")
+        return
+      }
       let status = false;
       this.form1.carrierContactNumber = parseInt(this.form1.carrierContactNumber);
       if (!this.input) {

src/views/TMS/components/bmsport/handlingFee.vue

@@ -10,9 +10,9 @@
     <dilTable v-bind.sync="option">
       <el-table-column fixed="right" label="操作" align="center" width="100">
         <template slot-scope="scope">
-          <el-button @click="click(scope.row.feeId)" type="text" size="small"
+          <!-- <el-button @click="click(scope.row.feeId)" type="text" size="small"
             >编辑</el-button
-          >
+          > -->
           <el-button
             type="text"
             size="small"
@@ -88,10 +88,8 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
+    padding: 1.25rem 1.875rem;
     .el-input {
-      margin-left: 2.5rem;
-      margin-top: 2.5rem;
-      margin-bottom: 2.5rem;
       width: 250px;
     }
   }

src/views/TMS/components/bmsport/updateHandlingFee.vue

@@ -4,9 +4,7 @@
     <page-title>编辑</page-title>
     <div class="contractTitle">
       <div class="form-box">
-        <div class="form-box">
           <dil-form :formId="223" v-model="form1"></dil-form>
-        </div>
       </div>
     </div>
     <div class="button-box">
@@ -86,5 +84,18 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-// @import "@/styles/appoint/contract/ContractInsert.scss";
+  .form-box {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .el-form-item {
+          display: flex;
+          .el-form-item__label {
+            width: 170px !important;
+          }
+          .el-input {
+            width: 210px !important;
+          }
+    }
+  }
 </style>

src/views/TMS/components/bmsship/detailsOrder.vue

@@ -41,6 +41,9 @@ export default {
 .purchaseOrder {
   .top {
     padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 250px;
+    }
   }
 }
 </style>

src/views/TMS/components/bmsship/detailsStatement.vue

@@ -7,13 +7,13 @@
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" @click="shipclick">
-        生成水运费账单
+        新增水运费账单
       </el-button>
       <el-button type="primary" @click="waterclick">
-        生成水分检测费账单
+        新增水分检测费账单
       </el-button>
       <el-button type="primary" @click="click()">
-        生成途损费账单
+        新增途损费账单
       </el-button>
     </div>
     <dilTable v-bind.sync="option" >
@@ -63,6 +63,9 @@ export default {
 .purchaseOrder {
   .top {
     padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 250px;
+    }
   }
 }
 </style>

src/views/TMS/components/bmsship/lossDetailsStatement.vue

@@ -6,18 +6,8 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <!-- <el-button type="primary" @click="click()">
-        生成途损费账单
-      </el-button> -->
     </div>
     <dilTable v-bind.sync="option">
-      <!-- <el-table-column fixed="right" label="操作" width="100">
-        <template slot-scope="scope">
-          <el-button @click="btnclick(scope.row)" type="text" size="small"
-            >详情</el-button
-          >
-        </template>
-      </el-table-column> -->
     </dilTable>
   </div>
 </template>

src/views/TMS/components/bmsship/toBeStatement.vue

@@ -1,6 +1,7 @@
 <template>
   <!-- 船运计费详单页面 -->
   <div class="purchaseOrder">
+    <page-title>船运账单</page-title>
     <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
@@ -11,35 +12,24 @@
       </el-button>
     </div>
     <dilTable v-bind.sync="option"  @radio-change="currentRadioChange">
-      <!-- <el-table-column fixed="right" label="操作" width="100"> -->
-        <!-- <template slot-scope="scope">
-          <el-button @click="click(scope.row.pathId)" type="text" size="small"
-            >编辑</el-button
-          >
-          <el-button
-            type="text"
-            size="small"
-            @click="deleteclick(scope.row.pathId)"
-            >删除</el-button
-          >
-        </template> -->
-      <!-- </el-table-column> -->
     </dilTable>
   </div>
 </template>
 
 <script>
+import PageTitle from "@/components/Page/Title";
 export default {
+  components: { PageTitle },
   name: "purchaseOrder",
   data() {
     return {
       input:"",
+      map:{},
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/bms/getBatch?apiId=115",
         // 控制显示当选列
         selectionType: "radio",
-        map:{},
       },
     };
   },
@@ -52,6 +42,11 @@ export default {
       this.option.requestUrl = "/api/v1/bms/getBatch?apiId=115&con="+this.input;
     },
     btnclick() {
+      console.log(JSON.stringify(this.map).length)
+      if(JSON.stringify(this.map).length == 2){
+        this.$message.error("请勾选品名！")
+        return
+      }
       this.$confirm("是否生成", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -59,23 +54,24 @@ export default {
         center: true,
       })
         .then(() => {
-         
       this.axios.post("/api/v1/bms/addLossStatement",this.map)
                   .then((res) => {
                     var  num = res.data.data;
                     console.log(num,"num");
+                    console.log(res)
                     if( num > 0){
                        this.$message({
                           type: "success",
                           message: "生成账单成功!",
                         });
+                        this.$router.go(-1);
                     }else{
                        this.$message({
                           type: "warning",
-                          message: "未产生途损费用!",
+                          message:res.data.data,
                         });
                     }
-              this.$router.go(-1);
+              
             });
         })
         .catch(() => {
@@ -93,6 +89,9 @@ export default {
 .purchaseOrder {
   .top {
     padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 250px;
+    }
   }
 }
 </style>

src/views/TMS/components/bmsship/uncomplateDetails.vue

@@ -1,6 +1,7 @@
 <template>
   <!-- 船运计费详单页面 -->
   <div class="purchaseOrder">
+    <page-title>船运账单</page-title>
     <div class="top">
       <el-input
         placeholder="请输入内容"
@@ -15,35 +16,24 @@
       </el-button>
     </div>
     <dilTable v-bind.sync="option" @selection-change="selectionChange">
-      <!-- <el-table-column fixed="right" label="操作" width="100"> -->
-        <!-- <template slot-scope="scope">
-          <el-button @click="click(scope.row.pathId)" type="text" size="small"
-            >编辑</el-button
-          >
-          <el-button
-            type="text"
-            size="small"
-            @click="deleteclick(scope.row.pathId)"
-            >删除</el-button
-          >
-        </template> -->
-      <!-- </el-table-column> -->
     </dilTable>
   </div>
 </template>
 
 <script>
+import PageTitle from "@/components/Page/Title";
 export default {
   name: "purchaseOrder",
+  components: { PageTitle },
   data() {
     return {
       input:"",
+      mapList:[],
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/bms/getUncomplateDetailsOrderList?apiId=93",
         // 控制显示多选列
         selectionType: "select",
-        mapList:[],
       },
     };
   },
@@ -55,6 +45,10 @@ export default {
       console.log(1);
     },
     btnclick() {
+      if(this.mapList.length == 0){
+        this.$message.error("请勾选详单！")
+        return
+      }
       this.$confirm("是否生成", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -86,6 +80,9 @@ export default {
 .purchaseOrder {
   .top {
     padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 250px;
+    }
   }
 }
 </style>

src/views/TMS/components/bmsship/uncomplateWater.vue

@@ -1,6 +1,7 @@
 <template>
   <!-- 船运计费详单页面 -->
   <div class="purchaseOrder">
+    <page-title>船运账单</page-title>
     <div class="top">
       <el-input
         placeholder="请输入内容"
@@ -15,35 +16,25 @@
       </el-button>
     </div>
     <dilTable v-bind.sync="option" @selection-change="selectionChange">
-      <!-- <el-table-column fixed="right" label="操作" width="100"> -->
-        <!-- <template slot-scope="scope">
-          <el-button @click="click(scope.row.pathId)" type="text" size="small"
-            >编辑</el-button
-          >
-          <el-button
-            type="text"
-            size="small"
-            @click="deleteclick(scope.row.pathId)"
-            >删除</el-button
-          >
-        </template> -->
-      <!-- </el-table-column> -->
     </dilTable>
   </div>
 </template>
 
 <script>
+import PageTitle from "@/components/Page/Title";
 export default {
   name: "purchaseOrder",
+  components: { PageTitle },
   data() {
+    
     return {
       input:"",
+      mapList:[],
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/bms/getWaterResult?apiId=114",
         // 控制显示多选列
         selectionType: "select",
-        mapList:[],
       },
     };
   },
@@ -55,6 +46,11 @@ export default {
       console.log(1);
     },
     btnclick() {
+      console.log(this.mapList.length)
+      if(this.mapList.length == 0 ){
+        this.$message.error("请选择需要生成账单的水分检测详单")
+        return
+      }
       this.$confirm("是否生成", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -86,6 +82,9 @@ export default {
 .purchaseOrder {
   .top {
     padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 250px;
+    }
   }
 }
 </style>

src/views/TMS/components/bmstrain/addTrainDetails.vue

@@ -1,6 +1,7 @@
 <template>
   <!-- 火运计费详单页面 -->
   <div class="purchaseOrder">
+    <page-title>火运详单</page-title>
     <div class="top">
       <el-input
         placeholder="请输入内容"
@@ -11,46 +12,32 @@
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" @click="btnclick">
-        生成火运详单
+        新增
       </el-button>
     </div>
     <dilTable v-bind.sync="option" @radio-change="currentRadioChange">
-      <!-- <el-table-column fixed="right" label="操作" width="100"> -->
-        <!-- <template slot-scope="scope">
-          <el-button @click="click(scope.row.pathId)" type="text" size="small"
-            >编辑</el-button
-          >
-          <el-button
-            type="text"
-            size="small"
-            @click="deleteclick(scope.row.pathId)"
-            >删除</el-button
-          >
-        </template> -->
-      <!-- </el-table-column> -->
     </dilTable>
   </div>
 </template>
 
 <script>
+import PageTitle from "@/components/Page/Title";
 export default {
+  components: { PageTitle },
   name: "purchaseOrder",
   data() {
     return {
       input:"",
+      map:{},
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/bms/getTrainResultList?apiId=122",
         // 控制显示当选列
         selectionType: "radio",
-        map:{},
       },
     };
   },
   methods: {
-    // selectionChange(selection) { 
-    //   this.mapList=selection
-    // },
     currentRadioChange(row) {
       this.map=row
       console.log(row);
@@ -59,6 +46,11 @@ export default {
       console.log(1);
     },
     btnclick() {
+      console.log()
+      if(JSON.stringify(this.map).length == 2){
+        this.$message.error("未勾选火运实绩")
+        return
+      }
       this.$confirm("是否生成", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -90,6 +82,9 @@ export default {
 .purchaseOrder {
   .top {
     padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 250px;
+    }
   }
 }
 </style>

src/views/TMS/components/bmstrain/detailsTrainOrder.vue

@@ -45,6 +45,9 @@ export default {
 <style lang='scss' scoped>
 .purchaseOrder {
   .top {
+    .el-input {
+      width: 250px;
+    }
     padding: 1.25rem 1.875rem;
   }
 }

src/views/TMS/components/bmstrain/uncomplateTrainDetails.vue

@@ -15,19 +15,6 @@
       </el-button>
     </div>
     <dilTable v-bind.sync="option" @selection-change="selectionChange">
-      <!-- <el-table-column fixed="right" label="操作" width="100"> -->
-        <!-- <template slot-scope="scope">
-          <el-button @click="click(scope.row.pathId)" type="text" size="small"
-            >编辑</el-button
-          >
-          <el-button
-            type="text"
-            size="small"
-            @click="deleteclick(scope.row.pathId)"
-            >删除</el-button
-          >
-        </template> -->
-      <!-- </el-table-column> -->
     </dilTable>
   </div>
 </template>
@@ -86,6 +73,9 @@ export default {
 .purchaseOrder {
   .top {
     padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 250px;
+    }  
   }
 }
 </style>

src/views/TMS/components/domesticMine/approveWagonPlease.vue

@@ -27,7 +27,6 @@
   </div>
 </template>
 
-
 <script>
 export default {
   name: "wagonPlease",

src/views/TMS/components/domesticMine/approveWagonPleaseAdd.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 新增批车作业页面 -->
-  <div id="contractDetails">
+  <div id="trainTransport">
     <page-title>返回</page-title>
     <div>
       <dilTable
@@ -19,7 +19,7 @@
         </div>
       </div>
     </div>
-    <div class="button-box">
+    <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
@@ -52,6 +52,11 @@ export default {
   mounted() {
     // this.unit();
   },
+  created() {
+    this.form1 = {
+      arrivalStationId: 1,
+    };
+  },
   methods: {
     handleCheckedCitiesChange(value) {
       console.log(value);
@@ -104,39 +109,37 @@ export default {
 </script>
 <style lang="scss">
 // @import "@/styles/appoint/contract/ContractInsert.scss";
-#contractDetails {
+#trainTransport {
   .form {
     display: flex;
     .form_box {
-      width: 240px;
+      width: 340px;
       margin-left: 35%;
       margin-top: 30px;
-      margin-right: 22px;
-     
-    }
-    .el-form-item {
-      .el-form-item__label {
-        display: inline-block;
-        width: 70px !important;
-        padding-right: 200px;
-        margin-bottom: 0px;
-      }
-      .el-form-item__content {
-        .el-select {
-          width: 230px;
-        }
-        .el-input {
-          width: 160px;
-          margin-left: -300px;
-          padding-bottom: 0%;
+      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;
+              }
+            }
+          }
         }
       }
     }
   }
-
-  .button-box {
-    margin-top: 50px;
-    margin-left: 550px;
+  .button_box {
+    margin-left: 42%;
+    margin-top: 55px;
   }
 }
 </style>

src/views/TMS/components/domesticMine/approveWagonPleaseEdit.vue

@@ -1,35 +1,28 @@
 <template>
   <!-- 修改批车作业页面 -->
-  <div id="contractDetails">
-    <page-title>批车作业</page-title>
-    <div class="main">
-      <span class="text">修改批车车作业</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="140" v-model="form1"></dil-form>
-        </div>
+  <div class="contractDetails">
+    <page-title>返回</page-title>
+    <div class="form">
+      <div class="form_box">
+        <dil-form :formId="140" v-model="form1"></dil-form>
       </div>
-    </div>  
- 
-    <div class="button-box">
+    </div>
+    <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
   </div>
 </template>
-
 <script>
 import PageTitle from "@/components/Page/Title";
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
-    data(){
-          return {
-          form1: {},
-        }
-    },
+  data() {
+    return {
+      form1: {},
+    };
+  },
   mounted() {
     this.information();
   },
@@ -37,14 +30,16 @@ export default {
     information() {
       //编辑批车作业 渲染数据
       this.axios
-        .post("/api/v1/tms/getApproveWagonPleaseById/" + this.$route.params.resultId)
+        .post(
+          "/api/v1/tms/getApproveWagonPleaseById/" + this.$route.params.resultId
+        )
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
           });
         });
     },
-     // 返回
+    // 返回
     onClickCancel() {
       this.$router.go(-1);
     },
@@ -52,12 +47,10 @@ export default {
     onClickConfirm() {
       let approveWagonPlease = {
         resultId: this.$route.params.resultId,
-        resultApproveDate: this.form1.resultApproveDate,
+        resultApproveDate: sjTime(this.form1.resultApproveDate),
         resultApproveNumber: this.form1.resultApproveNumber,
         shipperId: this.form1.shipperId,
-        resultCategory: this.form1.resultCategory,
-        sendStationId: this.form1.sendStationId,
-        toTheStationId: this.form1.toTheStationId
+        resultCategory: this.form1.resultCategory
       };
       function isNumber() {
         var value = approveWagonPlease.resultApproveNumber;
@@ -71,29 +64,58 @@ export default {
       }
       var val = this.value;
       if (
-        approveWagonPlease.resultApproveDate==null||
-        approveWagonPlease.resultApproveNumber==null||
-        approveWagonPlease.shipperId==null||
-        approveWagonPlease.resultCategory==null||
-        approveWagonPlease.sendStationId==null||
-        approveWagonPlease.toTheStationId==null
-      ) this.$message.error("存在空值！");
+        approveWagonPlease.resultApproveDate == null ||
+        approveWagonPlease.resultApproveNumber == null ||
+        approveWagonPlease.resultCategory == null
+      )
+        this.$message.error("存在空值！");
+      else if (!isNumber(val)) this.$message.error("请车数必须是数字！");
       else
-      if (!isNumber(val)) this.$message.error("请车数必须是数字！");
-      else
-      this.axios
-        .post("/api/v1/tms/updateApproveWagonPlease", approveWagonPlease)
-        .then(() => {
-          this.$message({
-            type: "success",  
-            message: "修改成功!",
+        this.axios
+          .post("/api/v1/tms/updateApproveWagonPlease", approveWagonPlease)
+          .then(() => {
+            this.$message({
+              type: "success",
+              message: "修改成功!",
+            });
+            this.$router.go(-1);
           });
-          this.$router.go(-1);
-        });
     },
   },
 };
 </script>
-<style lang="scss" scoped>
-// @import "@/styles/appoint/contract/ContractInsert.scss";
+<style lang="scss">
+.contractDetails {
+  .form {
+    display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 35%;
+      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;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .button_box {
+    margin-left: 42%;
+    margin-top: 55px;
+  }
+}
 </style>

src/views/TMS/components/domesticMine/entrustMine.vue

@@ -2,7 +2,13 @@
   <!-- 计量委托 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input
+        class="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>
@@ -36,7 +42,12 @@ export default {
         "/api/v1/tms/getLoadResultToSendMC?apiId=209&resultType=1&con=" +
         this.input;
     },
+
     btnclick() {
+      let map = {
+        resultIdList: this.selectionListMap,
+      };
+      console.log("map" + map);
       if (this.selectionListMap.length == 0) {
         this.$message({
           message: "请勾选要发送计量委托的实绩!",
@@ -44,9 +55,7 @@ export default {
         });
       } else {
         this.axios
-          .post("/api/v1/tms/batchSendMeasureCommission", {
-            resultIdList: this.selectionListMap,
-          })
+          .post("/api/v1/tms/batchSendMeasureCommission", map)
           .then((res) => {
             if (res.data.code == "200") {
               this.$message({
@@ -61,9 +70,8 @@ export default {
     },
     selectionChange(selection) {
       this.selectionListMap = [];
-      selection.forEach((element) => {
-        this.selectionListMap.push(element.resultId);
-      });
+      console.log(selection);
+      this.selectionListMap = selection;
     },
   },
 };
@@ -71,19 +79,19 @@ export default {
 <style lang='scss'>
 .homeworkPath {
   .top {
-     padding: 1.25rem 0.375rem;
-     .el-input{
-       width: 20%;
-       margin-right: 40rpx;
-     }
-     .btn{
-       width: 5.5%;
-       margin-left: 0.25rem;
-     }
-     .btn1{
-       width: 7%;
-       margin-left: 00.375rem;
-     }
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 40rpx;
+    }
+    .btn {
+      width: 5.5%;
+      margin-left: 0.25rem;
+    }
+    .btn1 {
+      width: 7%;
+      margin-left: 00.375rem;
+    }
   }
 }
 </style>

src/views/TMS/components/domesticMine/wagonLoadAdd.vue

@@ -2,9 +2,8 @@
   <!-- 添加车皮装车实绩 -->
   <div class="addWagonLoad">
     <page-title>新增</page-title>
-    <el-divider content-position="left">车皮装车实绩</el-divider>
     <div class="cp">
-      <span>车皮号：</span>
+      <span style="width:80px">车皮号:</span>
       <el-input
         placeholder="请输入内容"
         v-model="input"
@@ -42,6 +41,45 @@
       <el-input v-model="supplierName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
     </div>
+    <div class="forwardingUnit from" v-if="matching">
+      <span class="text">卸货点：</span>
+      <el-input v-model="unloadPointName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(3)">浏览</el-button>
+    </div>
+    <div class="fromOther">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:550px;">
+        <el-form-item label="发站:">
+          <el-autocomplete
+            class="inline-input"
+            v-model="sendStation"
+            :fetch-suggestions="querySearchSendStation"
+            placeholder="请输入发站名称"
+            :trigger-on-focus="false"
+            @select="handleSelectSendStation"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.arrivalName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:550px;">
+        <el-form-item label="到站:">
+          <el-autocomplete
+            class="inline-input"
+            v-model="toTheStation"
+            :fetch-suggestions="querySearchToTheStation"
+            placeholder="请输入到站名称"
+            :trigger-on-focus="false"
+            @select="handleSelectToTheStation"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.arrivalName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+    </div>
     <div class="remark from" v-if="matching">
       <span class="text">船名/备注：</span>
       <el-input
@@ -52,8 +90,8 @@
       </el-input>
       <span class="span"></span>
     </div>
-    <div class="purchaseOrder from" v-if="matching">
-      <span class="text">采购订单号：</span>
+    <div class="purchaseOrder from" v-if="matching" style="width:330px;margin-left:544px;padding-bottom:15px">
+      <span class="text" style="width:140px">采购订单号：</span>
       <el-input
         v-model="purchaseOrderNo"
         placeholder="请选择物资和发货单位"
@@ -62,13 +100,13 @@
       </el-input>
       <span class="span"></span>
     </div>
-
     <div class="form">
-      <div class="form-box" style="margin-right: 10rem">
+      <div class="form_box" style="margin-right: 10rem">
         <dil-form :formId="364" v-model="form1" ref="from1"></dil-form>
       </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>
@@ -100,6 +138,12 @@
           @radio-change="currentRadioChange2"
         ></dilTable>
       </div>
+       <div v-show="a == 3">
+        <dilTable
+          v-bind.sync="unloadPoint"
+          @radio-change="currentRadioChange3"
+        ></dilTable>
+      </div>
     </el-drawer>
   </div>
 </template>
@@ -107,7 +151,6 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { sjTime, isNumber } from "@/utils/sharedJsFile";
-import { getCookie } from "@/utils/util.js";
 export default {
   components: { PageTitle },
   data() {
@@ -132,6 +175,8 @@ export default {
       supplierId: null,
       //物资id
       materialId: null,
+      unloadPointName:null,
+      unloadPointId:null,
       //是否需要打开模态窗口
       drawer: false,
       a: 1,
@@ -152,6 +197,10 @@ export default {
         requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
         selectionType: "radio",
       },
+      sendStationId:null,
+      toTheStationId:1,
+      sendStation:null,
+      toTheStation:"老区轨道衡"
     };
   },
   watch: {
@@ -163,7 +212,7 @@ export default {
   },
   created() {
     this.form1 = {
-      arrivalStationId: 2,
+      arrivalStationId: 1,
     };
   },
   methods: {
@@ -182,6 +231,10 @@ export default {
         this.getPurchaseOrderNo();
       }
     },
+    currentRadioChange3(selection) {
+      this.unloadPointId = selection.warehouseId;
+      this.unloadPointName = selection.warehouseName;
+    },
     ondrawer(num) {
       this.drawer = true;
       this.a = num;
@@ -227,6 +280,72 @@ export default {
         });
       }
     },
+    //发站弹出层
+    handleSelectSendStation(item) {
+      this.sendStationId = item.arrivalId;
+      this.sendStation = item.arrivalName;
+    },
+    //以下是发站边输边查搜索
+    querySearchSendStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.sendStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterSendStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //发站
+    createFilterSendStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
+    //到站弹出层
+    handleSelectToTheStation(item) {
+      this.toTheStationId = item.arrivalId;
+      this.toTheStation = item.arrivalName;
+    },
+    //以下是到站边输边查搜索
+    querySearchToTheStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.toTheStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterToTheStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //到站
+    createFilterToTheStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
     onClick(a) {
       if (a == 1) {
         this.frist.requestUrl =
@@ -238,7 +357,7 @@ export default {
           this.materialId +
           "&index=" +
           this.inputText;
-      } else if (a == 4) {
+      } else if (a == 3) {
         this.unloadPoint.requestUrl =
           "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.inputText;
       }
@@ -297,8 +416,8 @@ export default {
       let state = 0;
       if (
         this.list.length > 0 &&
-        this.form1.sendStationId &&
-        this.form1.arrivalStationId &&
+        this.sendStationId &&
+        this.toTheStationId &&
         this.form1.resultLoadingDate
       ) {
         state = 1;
@@ -309,8 +428,8 @@ export default {
             message: "请输入车皮号！",
           });
         } else {
-          if (this.form1.sendStationId) {
-            if (this.form1.arrivalStationId) {
+          if (this.sendStationId) {
+            if (this.toTheStationId) {
               if (this.form1.resultLoadingDate) {
                 if (this.supplierId) {
                   if (this.materialId) {
@@ -349,8 +468,8 @@ export default {
       if (state == 1) {
         let map = {
           wagonNoList: this.list,
-          sendStationId: this.form1.sendStationId,
-          arrivalStationId: this.form1.arrivalStationId,
+          sendStationId: this.sendStationId,
+          arrivalStationId: this.toTheStationId,
           resultLoadingDate: sjTime(this.form1.resultLoadingDate),
           resultRemarks: this.form1.resultRemarks,
           resultType: 3,
@@ -360,8 +479,8 @@ export default {
         if (this.matching) {
           map = {
             wagonNoList: this.list,
-            sendStationId: this.form1.sendStationId,
-            arrivalStationId: this.form1.arrivalStationId,
+            sendStationId: this.sendStationId,
+            arrivalStationId: this.toTheStationId,
             resultLoadingDate: sjTime(this.form1.resultLoadingDate),
             resultRemarks: this.form1.resultRemarks,
             resultType: 3,
@@ -446,6 +565,7 @@ export default {
     display: flex;
     justify-content: center;
     align-items: center;
+    margin-left: 160px;
     .text {
       width: 8.75rem;
     }
@@ -493,6 +613,10 @@ export default {
       width: 1.875rem;
       height: 1.25rem;
     }
+    .el-input{
+      width: 13.5rem;
+      margin-right: 2.375rem;
+    }
   }
   .purchaseOrder {
     display: flex;
@@ -505,16 +629,46 @@ export default {
     }
   }
   .form {
-    margin-top: 1.25rem;
-    display: flex;
-    justify-content: center;
-    padding-left: 9.375rem;
+   display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 37%; 
+      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;
+              }
+              .el-textarea{
+                .el-textarea__inner{
+                  width: 220px;
+                
+                  margin-top: 0.03rem;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
   }
-  .button-box {
+  .button_box {
     display: flex;
     justify-content: center;
     padding-top: 30px;
   }
+   .fromOther  .el-input__inner{
+    width: 250px;
+  }
 }
 </style>
 

src/views/TMS/components/domesticMine/wagonLoadEdit.vue

@@ -1,20 +1,47 @@
 <template>
   <!-- 修改车皮装车实绩 -->
-  <div id="contractDetails">
-    <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">车皮装车实绩</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
+  <div class="contractDetails">
+    <page-title>返回</page-title>
+      <div class="form">
+        <div class="form_box">
           <dil-form :formId="254" v-model="form1"></dil-form>
         </div>
-      </div>
     </div>
-
-    <div class="button-box">
+    <div class="fromOther">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:520px;">
+        <el-form-item label="发站:">
+          <el-autocomplete
+            class="inline-input"
+            v-model="sendStation"
+            :fetch-suggestions="querySearchSendStation"
+            placeholder="请输入发站名称"
+            :trigger-on-focus="false"
+            @select="handleSelectSendStation"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.arrivalName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:520px;">
+        <el-form-item label="到站:">
+          <el-autocomplete
+            class="inline-input"
+            v-model="toTheStation"
+            :fetch-suggestions="querySearchToTheStation"
+            placeholder="请输入到站名称"
+            :trigger-on-focus="false"
+            @select="handleSelectToTheStation"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.arrivalName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
     </div>
@@ -23,12 +50,16 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
  data(){
      return {
       form1: {},
+      sendStationId:null,
+      toTheStationId:null,
+      sendStation:"",
+      toTheStation:""
   }
  },
   mounted() {
@@ -42,9 +73,11 @@ export default {
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
-            console.log(e);
-            console.log(this.form1);
-            console.log(this.$route.params.resultId);
+            console.log(e)
+            this.toTheStationId = e.arrivalStationId
+            this.sendStationId = e.sendStationId
+            this.sendStation = e.sendName
+            this.toTheStation = e.arrivalName
           });
         });
     },
@@ -58,15 +91,80 @@ export default {
     currentRadioChange(row) {
       this.aaaa = row;
     },
+    //发站弹出层
+    handleSelectSendStation(item) {
+      this.sendStationId = item.arrivalId;
+      this.sendStation = item.arrivalName;
+    },
+    //以下是发站边输边查搜索
+    querySearchSendStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.sendStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterSendStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //发站
+    createFilterSendStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
+    //到站弹出层
+    handleSelectToTheStation(item) {
+      this.toTheStationId = item.arrivalId;
+      this.toTheStation = item.arrivalName;
+    },
+    //以下是到站边输边查搜索
+    querySearchToTheStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.toTheStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterToTheStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //到站
+    createFilterToTheStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
     // 确认
     onClickConfirm() {
       let tmstrainLoadingResult = {
         resultId: this.$route.params.resultId,
         resultWagonNo: this.form1.resultWagonNo,
-        resultBillableTonnage: this.form1.resultBillableTonnage,
         resultClass: this.form1.resultClass,
-        sendStationId: this.form1.sendStationId,
-        arrivalStationId: this.form1.arrivalStationId,
+        sendStationId: this.sendStationId,
+        arrivalStationId: this.toTheStationId,
         resultLoadingDate: sjTime(this.form1.resultLoadingDate),
         batchId: this.form1.batchId,
         capacityId: this.form1.capacityId,
@@ -74,10 +172,9 @@ export default {
         resultMaterialTheoryweight: this.form1.resultMaterialTheoryweight,
         resultRemarks: this.form1.resultRemarks
       };
+      console.log(tmstrainLoadingResult)
       if (
       tmstrainLoadingResult.resultWagonNo==null||
-      tmstrainLoadingResult.resultBillableTonnage==null||
-      tmstrainLoadingResult.resultClass==null||
       tmstrainLoadingResult.sendStationId==null||
       tmstrainLoadingResult.arrivalStationId==null||
       tmstrainLoadingResult.resultLoadingDate==null||
@@ -99,5 +196,37 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-// @import "@/styles/TMS/addwagonload.scss";
+.contractDetails {
+  .form {
+    display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 35%;
+      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;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .button_box {
+    margin-left: 42%;
+    margin-top: 55px;
+  }
+}
 </style>

src/views/TMS/components/domesticMine/wagonLoadbu.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="wagonLoadbu">
-    <el-divider content-position="left">选择需要补录的装车信息</el-divider>
+    <page-title>返回</page-title>
     <div class="wagonLoadbu_table">
       <dilTable
         v-bind.sync="option"
@@ -19,14 +19,21 @@
       <el-input v-model="supplierName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
     </div>
+    <div class="forwardingUnit from">
+      <span class="text">卸货点：</span>
+      <el-input v-model="unloadPointName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(3)">浏览</el-button>
+    </div>
     <div class="remark from">
-      <span class="text">船名(备注)：</span>
-      <el-input v-model="remark" @blur="onBlur"> </el-input>
+      <span class="text" style="margin-left: 60px; ">船名(备注)：</span>
+      <el-input v-model="remark" @blur="onBlur" style="width: 230px; margin-right:140px"> </el-input>
       <span class="span"></span>
     </div>
 
     <div class="form">
+      <div class="form_box">
       <dil-form :formId="361" v-model="form1" ref="from1"></dil-form>
+      </div>
     </div>
     <div class="button_box">
       <el-button @click="cancel">取消</el-button>
@@ -60,13 +67,20 @@
           @radio-change="currentRadioChange2"
         ></dilTable>
       </div>
-
+      <div v-show="a == 3">
+        <dilTable
+          v-bind.sync="unloadPoint"
+          @radio-change="currentRadioChange3"
+        ></dilTable>
+      </div>
     </el-drawer>
   </div>
 </template>
 
 <script>
+import PageTitle from "@/components/Page/Title";
 export default {
+  components: { PageTitle },
   data() {
     return {
       form1: {},
@@ -162,6 +176,10 @@ export default {
       this.supplierId = selection.supplierId;
       this.getPurchaseOrderNo();
     },
+    currentRadioChange3(selection) {
+      this.unloadPointId = selection.warehouseId;
+      this.unloadPointName = selection.warehouseName;
+    },
     ondrawer(num) {
       this.drawer = true;
       this.a = num;
@@ -215,7 +233,7 @@ export default {
           this.materialId +
           "&index=" +
           this.inputText;
-      } else if (a == 4) {
+      } else if (a == 3) {
         this.third.requestUrl =
           "/api/v1/uc/getUnloadingMesByLike?apiId=347&index=" + this.inputText;
       }
@@ -226,14 +244,79 @@ export default {
 
 <style lang="scss">
 .wagonLoadbu {
+  color: #606266;
+  font-size: 0.675rem;
+  font-weight: 500;
+  .cp {
+    width: 49%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding-top: 0.625rem;
+    padding-bottom: 0.625rem;
+    margin-left: 364px;
+    .cp_title {
+      .cp_top {
+        width: 3.125rem;
+        padding-right: 1.55rem;
+      }
+    }
+  }
+  .cpList {
+    display: flex;
+    justify-content: center;
+    width: 100%;
+    height: 10rem;
+    .list {
+      width: 45%;
+      border: #000 0.0625rem solid;
+      padding: 0.625rem;
+      display: flex;
+      flex-wrap: wrap;
+      .cpList1 {
+        background-color: #c9c7c7;
+        height: 1.875rem;
+        margin-right: 0.5rem;
+        padding: 0.625rem;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        position: relative;
+        .itu {
+          position: absolute;
+          top: -0.125rem;
+          right: 0.0625rem;
+          width: 0.625rem;
+          height: 0.625rem;
+        }
+      }
+    }
+  }
+  .matching {
+    width: 100%;
+    height: 3.125rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .text {
+      width: 8.75rem;
+    }
+    .span {
+      display: inline-block;
+      width: 310px;
+      height: 0.0625rem;
+    }
+  }
   .material {
     display: flex;
     justify-content: center;
     align-items: center;
     height: 3.75rem;
+    margin-left: 27rem;
+    width: 20rem;
     .text {
       text-align: right;
-      width: 150px;
+      width: 8.125rem;
     }
   }
   .forwardingUnit {
@@ -241,9 +324,11 @@ export default {
     justify-content: center;
     align-items: center;
     height: 3.75rem;
+    margin-left: 27rem;
+    width: 20rem;
     .text {
       text-align: right;
-      width: 9.375rem;
+      width: 8.125rem;
     }
   }
   .remark {
@@ -253,20 +338,64 @@ export default {
     height: 3.75rem;
     .text {
       text-align: right;
-      width: 80px;
+      width: 5.625rem;
+    }
+    .span {
+      display: inline-block;
+      width: 1.875rem;
+      height: 1.25rem;
+    }
+    .el-input{
+      width: 13.5rem;
+      margin-right: 2.375rem;
     }
   }
-  .form {
-    margin-top: 1.25rem;
+  .purchaseOrder {
     display: flex;
     justify-content: center;
+    align-items: center;
+    .span {
+      display: inline-block;
+      width: 1.875rem;
+      height: 0.0625rem;
+    }
+  }
+  .form {
+   display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 37%; 
+      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;
+              }
+              .el-textarea{
+                .el-textarea__inner{
+                  width: 240px;  
+                  margin-top: 0.03rem;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
   }
   .button_box {
-    width: 100%;
-    height: 6.25rem;
     display: flex;
     justify-content: center;
-    align-items: center;
+    padding-top: 30px;
   }
 }
 </style>

src/views/TMS/components/domesticMine/wagonPleaseAdd.vue

@@ -1,44 +1,77 @@
 <template>
   <!-- 新增请作业页面 -->
- <div class="contractDetails">
+  <div class="contractDetails">
     <page-title>返回</page-title>
 
     <div class="form">
       <div class="form_box">
-         <dil-form :formId="122" v-model="form1" ></dil-form>
+        <dil-form :formId="122" v-model="form1"></dil-form>
       </div>
     </div>
 
-     <div class="fromOther">
-          <el-form
+    <div class="fromOther">
+      <el-form
         :inline="true"
         class="demo-form-inline"
         label-width="80px"
-        >
+        style="margin-left: 525px"
+      >
         <el-form-item label="发货单位">
-         <el-autocomplete
-          class="inline-input"
-          v-model="stateSupplier"
-          :fetch-suggestions="querySearchSupplier"
-          placeholder="请输入发货单位名称"
-          :trigger-on-focus="false"
-          @select="handleSelectSupplier"
-        >
-        <template slot-scope="{ item }">
-          <div class="name">{{ item.supplierName }}</div>
-        </template>
-        </el-autocomplete>
+          <el-autocomplete
+            class="inline-input"
+            v-model="stateSupplier"
+            :fetch-suggestions="querySearchSupplier"
+            placeholder="请输入发货单位名称"
+            :trigger-on-focus="false"
+            @select="handleSelectSupplier"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.supplierName }}</div>
+            </template>
+          </el-autocomplete>
         </el-form-item>
-        </el-form>
+      </el-form>
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:525px;">
+        <el-form-item label="发站">
+          <el-autocomplete
+            class="inline-input"
+            v-model="sendStation"
+            :fetch-suggestions="querySearchSendStation"
+            placeholder="请输入发站名称"
+            :trigger-on-focus="false"
+            @select="handleSelectSendStation"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.arrivalName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:525px;">
+        <el-form-item label="到站">
+          <el-autocomplete
+            class="inline-input"
+            v-model="toTheStation"
+            :fetch-suggestions="querySearchToTheStation"
+            placeholder="请输入到站名称"
+            :trigger-on-focus="false"
+            @select="handleSelectToTheStation"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.arrivalName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
     </div>
-  <div class="trainTransport">
-    <!-- 确定和取消 -->
-    <div class="button_box">
-      <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+    <div class="trainTransport">
+      <!-- 确定和取消 -->
+      <div class="button_box">
+        <el-button @click="onClickCancel">返回</el-button>
+        <el-button type="primary" @click="onClickConfirm">确认</el-button>
+      </div>
     </div>
   </div>
- </div>
 </template>
 
 <script>
@@ -54,15 +87,90 @@ export default {
       supplierId: null,
       supplierName: "",
       stateSupplier: "",
+      sendStationId:null,
+      toTheStationId:1,
+      sendStation:null,
+      toTheStation:"老区轨道衡"
     };
   },
   mounted() {
     // this.unit();
   },
+  created() {
+    this.form1 = {
+      toTheStationId: 1,
+    };
+  },
   methods: {
     handleCheckedCitiesChange(value) {
       console.log(value);
     },
+    //发站弹出层
+    handleSelectSendStation(item) {
+      this.sendStationId = item.arrivalId;
+      this.sendStation = item.arrivalName;
+    },
+    //以下是发站边输边查搜索
+    querySearchSendStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.sendStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterSendStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //发站
+    createFilterSendStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
+    //到站弹出层
+    handleSelectToTheStation(item) {
+      this.toTheStationId = item.arrivalId;
+      this.toTheStation = item.arrivalName;
+    },
+    //以下是到站边输边查搜索
+    querySearchToTheStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.toTheStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterToTheStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //到站
+    createFilterToTheStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
     //发货单位弹出层
     handleSelectSupplier(item) {
       this.supplierId = item.supplierId;
@@ -104,8 +212,8 @@ export default {
         resultPlanDate: sjTime(this.form1.resultPlanDate),
         resultCategory: this.form1.resultCategory,
         supplierId: this.supplierId,
-        sendStationId: this.form1.sendStationId,
-        toTheStationId: this.form1.toTheStationId,
+        sendStationId: this.sendStationId,
+        toTheStationId: this.toTheStationId,
         resultPleaseNumber: this.form1.resultPleaseNumber,
         userId: getCookie("orgCode"),
         resultType: 3,
@@ -135,11 +243,11 @@ export default {
         this.axios
           .post("/api/v1/tms/addWagonPlease", tmstrainPleaseApproveResult)
           .then(() => {
+            this.$router.go(-1);
             this.$message({
               type: "success",
               message: "新增成功!",
             });
-            this.$router.go(-1);
           });
     },
   },
@@ -174,19 +282,19 @@ export default {
               margin-top: 55px;
             }
           }
-          .fromOther {
-            margin-left: 34.5%;
-            width: 50%;
-            .inline-input {
-              width: 300px;
-              .button_box {
-                margin-left: 45%;
-              }
-            }
-          }
         }
       }
     }
   }
 }
+.trainTransport {
+  margin-left: 41.25%;
+  width: 50%;
+  .inline-input {
+    width: 300px;
+    .button_box {
+      margin-left: 52.5%;
+    }
+  }
+}
 </style>

src/views/TMS/components/domesticMine/wagonPleaseEdit.vue

@@ -1,34 +1,82 @@
 <template>
   <!-- 修改请车作业页面 -->
-  <div id="contractDetails">
-    <page-title>请车作业</page-title>
-    <div class="main">
-      <span class="text">修改请车作业</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
+  <div class="contractDetails">
+    <page-title>返回</page-title>
+      <div class="form">
+        <div class="form_box">
           <dil-form :formId="117" v-model="form1"></dil-form>
         </div>
-      </div>
-    </div>  
- 
-    <div class="button-box">
+    </div>
+    <div class="fromOther">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:525px;">
+        <el-form-item label="发货单位">
+          <el-autocomplete
+            class="inline-input"
+            v-model="stateSupplier"
+            :fetch-suggestions="querySearchSupplier"
+            placeholder="请输入发货单位名称"
+            :trigger-on-focus="false"
+            @select="handleSelectSupplier"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.supplierName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:525px;">
+        <el-form-item label="发站">
+          <el-autocomplete
+            class="inline-input"
+            v-model="sendStation"
+            :fetch-suggestions="querySearchSendStation"
+            placeholder="请输入发站名称"
+            :trigger-on-focus="false"
+            @select="handleSelectSendStation"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.arrivalName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:525px;">
+        <el-form-item label="到站">
+          <el-autocomplete
+            class="inline-input"
+            v-model="toTheStation"
+            :fetch-suggestions="querySearchToTheStation"
+            placeholder="请输入到站名称"
+            :trigger-on-focus="false"
+            @select="handleSelectToTheStation"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.arrivalName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+    </div> 
+    <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
   </div>
 </template>
-
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
     data(){
           return {
           form1: {},
+          stateSupplier:null,
+          supplierId:null,
+          sendStationId:null,
+          toTheStationId:null,
+          sendStation:"",
+          toTheStation:""
         }
     },
   mounted() {
@@ -42,12 +90,107 @@ export default {
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
+            console.log(e)
+            this.supplierId = e.supplierId
+            this.stateSupplier = e.supplierName
+            this.toTheStationId = e.toTheStationId
+            this.sendStationId = e.sendStationId
+            this.sendStation = e.sendName
+            this.toTheStation = e.arrivalName
+            
           });
         });
     },
      // 返回
     onClickCancel() {
       this.$router.go(-1);
+    },
+       //发货单位弹出层
+    handleSelectSupplier(item){
+      this.supplierId = item.supplierId
+      item.supplierName = this.stateSupplier
+    },
+    //以下是发货单位边输边查搜索
+    querySearchSupplier(queryString, cb) {
+        this.axios.post('/api/v1/uc/getSupplierMesByLike?index='+this.stateSupplier).then((res)=>{
+        if(res.data.code == "200"){    
+          var restaurantsSupplier = res.data.data
+          var results = queryString ? restaurantsSupplier.filter(this.createFilterSupplier(queryString)) :restaurantsSupplier;
+          // 调用 callback 返回建议列表的数据
+          cb(results);
+        }
+      })  
+      },
+    createFilterSupplier(queryString) {
+        return (restaurantsSupplier) => {
+          return (restaurantsSupplier.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+    //发站弹出层
+    handleSelectSendStation(item) {
+      this.sendStationId = item.arrivalId;
+      this.sendStation = item.arrivalName;
+    },
+    //以下是发站边输边查搜索
+    querySearchSendStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.sendStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterSendStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //发站
+    createFilterSendStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
+    //到站弹出层
+    handleSelectToTheStation(item) {
+      this.toTheStationId = item.arrivalId;
+      this.toTheStation = item.arrivalName;
+    },
+    //以下是到站边输边查搜索
+    querySearchToTheStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.toTheStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterToTheStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //到站
+    createFilterToTheStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
     },
      // 确认
     onClickConfirm() {
@@ -55,11 +198,12 @@ export default {
         resultId: this.$route.params.resultId,
         resultPlanDate: sjTime(this.form1.resultPlanDate),
         resultCategory: this.form1.resultCategory,
-        shipperId: this.form1.shipperId,
-        sendStationId: this.form1.sendStationId,
-        toTheStationId: this.form1.toTheStationId,
+        supplierId: this.supplierId,
+        sendStationId: this.sendStationId,
+        toTheStationId: this.toTheStationId,
         resultPleaseNumber: this.form1.resultPleaseNumber
       };
+      console.log(tmstrainPleaseApproveResult)
       function isNumber() {
         var value = tmstrainPleaseApproveResult.resultPleaseNumber;
         //验证是否为数字
@@ -74,7 +218,6 @@ export default {
       if (
         tmstrainPleaseApproveResult.resultPlanDate==null||
         tmstrainPleaseApproveResult.resultCategory==null||
-        tmstrainPleaseApproveResult.shipperId==null||
         tmstrainPleaseApproveResult.sendStationId==null||
         tmstrainPleaseApproveResult.toTheStationId==null||
         tmstrainPleaseApproveResult.resultPleaseNumber==null
@@ -95,6 +238,39 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-// @import "@/styles/appoint/contract/ContractInsert.scss";
+<style lang="scss">
+.contractDetails {
+  .form {
+    display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 35%;
+      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;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .button_box {
+    margin-left: 42%;
+    margin-top: 55px;
+  }
+}
+</style>
 </style>

src/views/TMS/components/domesticMine/wagonPleaseMine.vue

@@ -69,6 +69,10 @@ export default {
     };
   },
   methods: {
+    getRequestUrl(){
+      this.option1.requestUrl = "/api/v1/tms/getAllWagonPlease?apiId=57&status=0&resultType=3&i=" + new Date(),
+      this.option2.requestUrl = "/api/v1/tms/getAllWagonPlease?apiId=57&status=1&resultType=3&i=" + new Date()
+    },
     onclick() {
       if(this.activeName == "first"){
         this.option1.requestUrl = "/api/v1/tms/getAllWagonPlease?apiId=57&status=0&resultType=3&con=" +this.input;
@@ -92,7 +96,7 @@ export default {
           this.axios
             .post("/api/v1/tms/deleteApproveWagonPlease/" + resultId)
             .then(() => {
-              this.$router.go(0);
+              this.getRequestUrl()
             });
         })
         .catch(() => {
@@ -115,11 +119,10 @@ export default {
             type: "success",
             message: "下发成功!",
           });
-          // console.log(this.arr[0].text_prop);
           this.axios
             .post("/api/v1/tms/sendWagonPlease/" + resultId)
             .then(() => {
-              this.$router.go(0);
+              this.getRequestUrl()
             });
         })
         .catch(() => {

src/views/TMS/components/domesticMine/wagonUnLoadAdd.vue

@@ -27,8 +27,7 @@
 </template>
 <script>
 import PageTitle from "@/components/Page/Title";
-
-import { sjTime, isNumber } from "@/utils/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 import { getCookie } from "@/utils/util.js";
 export default {
   components: { PageTitle },
@@ -46,6 +45,11 @@ export default {
     };
   },
   mounted() {},
+  // created() {
+  //   this.form1 = {
+  //     arrivalStationId: 1,
+  //   };
+  // },
   methods: {
     selectionChange(selection) {
       this.list = [];
@@ -73,7 +77,7 @@ export default {
         tmstrainWagonUnloadResult.resultArrivalDate == null ||
         tmstrainWagonUnloadResult.resultUnloadTime == null
       )
-       this.$message.error("存在空值！");
+        this.$message.error("存在空值！");
       else
         this.axios
           .post(
@@ -87,11 +91,9 @@ export default {
                 message: "新增成功!",
               });
               this.$router.go(-1);
-            }else{
-               ({ type: "failed", message: "新增失败!" });
+            } else {
+              ({ type: "failed", message: "新增失败!" });
             }
-
-            
           });
     },
     // 取消
@@ -126,14 +128,9 @@ export default {
               }
               .el-textarea {
                 .el-textarea__inner {
-                  display: block;
-                  resize: vertical;
-                  padding: 5px 13px;
-                  line-height: 1.5;
-                  width: 70%;
-                  border-radius: 4px;
-                  margin-left: 56px;
-                  margin-top: -25px;
+                  width: 230px;
+                  // margin-left: 45px;
+                  margin-top: 0.03rem;
                 }
               }
             }

src/views/TMS/components/domesticMine/wagonUnLoadEdit.vue

@@ -1,29 +1,21 @@
 <template>
   <!-- 修改车皮装车实绩 -->
-  <div id="contractDetails">
-    <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">车皮卸车实绩</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
+  <div class="unloadWagon">
+    <page-title>返回</page-title>
+      <div class="form">
+        <div class="form_box">
           <dil-form :formId="118" v-model="form1"></dil-form>
         </div>
       </div>
-    </div>
-
-    <div class="button-box">
+    <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
     </div>
   </div>
 </template>
-
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
  data(){
@@ -73,9 +65,7 @@ export default {
       if (
         tmstrainWagonUnloadResult.resultArrivalDate==null||
       tmstrainWagonUnloadResult.resultUnloadTime==null||
-      tmstrainWagonUnloadResult.unloadingPointId==null||
-      tmstrainWagonUnloadResult.resultBigTicketWeight==null||
-      tmstrainWagonUnloadResult.resultRailHorizontalWeight==null
+      tmstrainWagonUnloadResult.unloadingPointId==null
       ) this.$message.error("存在空值！");
       else
       this.axios
@@ -95,5 +85,37 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-// @import "@/styles/TMS/addwagonload.scss";
+.unloadWagon {
+  .form {
+    display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 35%;
+      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;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .button_box {
+    margin-left: 42%;
+    margin-top: 55px;
+  }
+}
 </style>

src/views/TMS/components/domesticMine/wagonUnLoadMine.vue

@@ -17,12 +17,12 @@
           <el-button @click="click(scope.row.unloadingId)" type="text" size="small"
             >修改</el-button
           >
-          <el-button
+          <!-- <el-button
             type="text"
             size="small"
             @click="deleteclick(scope.row.unloadingId)"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </dilTable>
@@ -52,34 +52,34 @@ export default {
     click(unloadingId) {
       this.$router.push("/wagonUnLoadEdit/" + unloadingId);
     },
-    deleteclick(scope) {
-      let unloadingId = scope;
-      this.$confirm("是否删除", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-        .then(() => {
-          this.$message({
-            type: "success",
-            message: "删除成功!",
-          });
-          this.axios
-            .post(
-             "/api/v1/tms/deleteTmstrainWagonUnLoadResultByUnLoadingId?unloadingId=" + unloadingId
-            )
-            .then(() => {
-               this.$router.go(0);
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消删除!",
-          });
-        });
-    },
+    // deleteclick(scope) {
+    //   let unloadingId = scope;
+    //   this.$confirm("是否删除", "提示", {
+    //     confirmButtonText: "确定",
+    //     cancelButtonText: "取消",
+    //     type: "warning",
+    //     center: true,
+    //   })
+    //     .then(() => {
+    //       this.$message({
+    //         type: "success",
+    //         message: "删除成功!",
+    //       });
+    //       this.axios
+    //         .post(
+    //          "/api/v1/tms/deleteTmstrainWagonUnLoadResultByUnLoadingId?unloadingId=" + unloadingId
+    //         )
+    //         .then(() => {
+    //            this.$router.go(0);
+    //         });
+    //     })
+    //     .catch(() => {
+    //       this.$message({
+    //         type: "info",
+    //         message: "取消删除!",
+    //       });
+    //     });
+    // },
   },
 };
 </script>

src/views/TMS/components/importedEmergency/addWagonLoadEmergency.vue

@@ -4,7 +4,7 @@
     <page-title>新增</page-title>
  
     <div class="cp">
-      <span>车皮号：</span>
+      <span style="width:80px">车皮号：</span>
       <el-input
         placeholder="请输入内容"
         v-model="input"
@@ -43,6 +43,40 @@
       <el-input v-model="unloadPointName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
     </div>
+    <div class="fromOther">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:550px;">
+        <el-form-item label="发站:">
+          <el-autocomplete
+            class="inline-input"
+            v-model="sendStation"
+            :fetch-suggestions="querySearchSendStation"
+            placeholder="请输入发站名称"
+            :trigger-on-focus="false"
+            @select="handleSelectSendStation"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.arrivalName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:550px;">
+        <el-form-item label="到站:">
+          <el-autocomplete
+            class="inline-input"
+            v-model="toTheStation"
+            :fetch-suggestions="querySearchToTheStation"
+            placeholder="请输入到站名称"
+            :trigger-on-focus="false"
+            @select="handleSelectToTheStation"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.arrivalName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+    </div>
     <div class="form">
       <div class="form_box" style="margin-right: 10rem">
         <dil-form :formId="254" v-model="form1" ref="from1"></dil-form>
@@ -52,12 +86,13 @@
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
+
     <!-- 模态窗口 -->
     <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
       <el-input
         placeholder="请输入内容"
         v-model="inputText"
-        style="margin-top: 0.625rem; margin-left: 1.25rem"
+        style="margin-top: 0.625rem; margin-left: 1.25rem;width:250px"
         clearable
       ></el-input>
       <el-button
@@ -137,12 +172,15 @@ export default {
         requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
         selectionType: "radio",
       },
+      sendStationId:null,
+      toTheStationId:1,
+      sendStation:null,
+      toTheStation:"老区轨道衡"
     };
   },
   created(){
     this.form1 = {
-      sendStationId:1,
-      arrivalStationId:2,
+      arrivalStationId:1,
     }
   },
   methods: {
@@ -263,6 +301,72 @@ export default {
     onclick(index) {
       this.list.splice(index, 1);
     },
+    //发站弹出层
+    handleSelectSendStation(item) {
+      this.sendStationId = item.arrivalId;
+      this.sendStation = item.arrivalName;
+    },
+    //以下是发站边输边查搜索
+    querySearchSendStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.sendStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterSendStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //发站
+    createFilterSendStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
+    //到站弹出层
+    handleSelectToTheStation(item) {
+      this.toTheStationId = item.arrivalId;
+      this.toTheStation = item.arrivalName;
+    },
+    //以下是到站边输边查搜索
+    querySearchToTheStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.toTheStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterToTheStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //到站
+    createFilterToTheStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
     // 确定
     makeSure() {
       let state = 0;
@@ -272,8 +376,8 @@ export default {
         this.supplierId &&
         this.unloadPointId &&
         this.purchaseOrderId &&
-        this.form1.sendStationId &&
-        this.form1.arrivalStationId &&
+        this.sendStationId &&
+        this.toTheStationId &&
         this.form1.resultLoadingDate
       ) {
         state = 1;
@@ -289,8 +393,8 @@ export default {
             if (this.supplierId) {
               if (this.unloadPointId) {
                 if (this.purchaseOrderId) {
-                      if (this.form1.sendStationId) {
-                        if (this.form1.arrivalStationId) {
+                      if (this.sendStationId) {
+                        if (this.toTheStationId) {
                           if (this.form1.resultLoadingDate) {
                           } else {
                             this.$message({
@@ -345,8 +449,8 @@ export default {
           sendUnitId:this.supplierId,
           resultIsclear:this.form1.resultIsclear,
           resultClass: this.form1.resultClass,
-          sendStationId: this.form1.sendStationId,
-          arrivalStationId: this.form1.arrivalStationId,
+          sendStationId: this.sendStationId,
+          arrivalStationId: this.toTheStationId,
           resultLoadingDate: sjTime(this.form1.resultLoadingDate),
           resultRemarks: this.form1.resultRemarks,
           resultType:2,
@@ -512,7 +616,7 @@ export default {
               .el-textarea{
                 .el-textarea__inner{
                   width: 220px;
-                  margin-left: 65px;
+                
                   margin-top: 0.03rem;
                 }
               }
@@ -527,6 +631,9 @@ export default {
     justify-content: center;
     padding-top: 30px;
   }
+  .fromOther .el-input__inner{
+    width: 250px;
+  }
 }
 </style>
 

src/views/TMS/components/importedEmergency/addWagonUnLoadEmergency.vue

@@ -44,17 +44,21 @@ export default {
   },
   mounted() {},
   methods: {
+
     selectionChange(selection) {
       this.list = [];
       selection.forEach((e) => {
         this.list.push({
           resultWagonNo: e.resultWagonNo,
           resultId: e.resultId,
+          purchaseOrderId: e.purchaseOrderId,
+          unloadingPointId: e.unloadingPointId,
         });
       });
     },
     // 确定
     makeSure() {
+      console.log("wagonNoList" +this.list)
       let tmstrainWagonUnloadResult = {
         wagonNoList: this.list,
         resultArrivalDate: sjTime(this.form1.resultArrivalDate),
@@ -115,14 +119,14 @@ export default {
               .el-input {
                 width: 250px;
               }
-            }
-            .el-textarea {
+               .el-textarea {
                 .el-textarea__inner {
                   width: 230px;
-                  margin-left: 65px;
                   margin-top: 0.03rem;
                 }
               }
+            }
+           
           }
         }
       }

src/views/TMS/components/importedEmergency/editWagonLoadEmergency.vue

@@ -1,20 +1,48 @@
 <template>
   <!-- 修改车皮装车实绩 -->
-  <div id="contractDetails">
+  <div class="addWagonLoad">
     <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">车皮装车实绩</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="254" v-model="form1"></dil-form>
-        </div>
+
+    <div class="form">
+      <div class="form_box">
+        <dil-form :formId="254" v-model="form1"></dil-form>
       </div>
     </div>
-
-    <div class="button-box">
+    <div class="fromOther">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:520px;">
+        <el-form-item label="发站:">
+          <el-autocomplete
+            class="inline-input"
+            v-model="sendStation"
+            :fetch-suggestions="querySearchSendStation"
+            placeholder="请输入发站名称"
+            :trigger-on-focus="false"
+            @select="handleSelectSendStation"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.arrivalName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:520px;">
+        <el-form-item label="到站:">
+          <el-autocomplete
+            class="inline-input"
+            v-model="toTheStation"
+            :fetch-suggestions="querySearchToTheStation"
+            placeholder="请输入到站名称"
+            :trigger-on-focus="false"
+            @select="handleSelectToTheStation"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.arrivalName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
     </div>
@@ -23,28 +51,43 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
- data(){
-     return {
+  data() {
+    return {
       form1: {},
-  }
- },
+      sendStationId:null,
+      toTheStationId:null,
+      sendStation:"",
+      toTheStation:""
+    };
+  },
+  created() {
+    this.form1 = {
+      arrivalStationId: 1,
+    };
+  },
   mounted() {
     this.information();
   },
   methods: {
     information() {
+      console.log("add", this.$route.params);
       //编辑车皮装车作业
       this.axios
-        .post("/api/v1/tms/getTmstrainLoadingResultByResultId/" + this.$route.params.resultId)
+        .post(
+          "/api/v1/tms/getTmstrainLoadingResultByResultId/" +
+            this.$route.params.unloadingId
+        )
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
-            console.log(e);
-            console.log(this.form1);
-            console.log(this.$route.params.resultId);
+            console.log(e)
+            this.toTheStationId = e.arrivalStationId
+            this.sendStationId = e.sendStationId
+            this.sendStation = e.sendName
+            this.toTheStation = e.arrivalName
           });
         });
     },
@@ -58,45 +101,156 @@ export default {
     currentRadioChange(row) {
       this.aaaa = row;
     },
+    //发站弹出层
+    handleSelectSendStation(item) {
+      this.sendStationId = item.arrivalId;
+      this.sendStation = item.arrivalName;
+    },
+    //以下是发站边输边查搜索
+    querySearchSendStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.sendStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterSendStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //发站
+    createFilterSendStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
+    //到站弹出层
+    handleSelectToTheStation(item) {
+      this.toTheStationId = item.arrivalId;
+      this.toTheStation = item.arrivalName;
+    },
+    //以下是到站边输边查搜索
+    querySearchToTheStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.toTheStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterToTheStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //到站
+    createFilterToTheStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
     // 确认
     onClickConfirm() {
       let tmstrainLoadingResult = {
-        resultId: this.$route.params.resultId,
+        resultId: this.$route.params.unloadingId,
         resultWagonNo: this.form1.resultWagonNo,
         resultBillableTonnage: this.form1.resultBillableTonnage,
         resultClass: this.form1.resultClass,
-        sendStationId: this.form1.sendStationId,
-        arrivalStationId: this.form1.arrivalStationId,
+        sendStationId: this.sendStationId,
+        arrivalStationId: this.toTheStationId,
         resultLoadingDate: sjTime(this.form1.resultLoadingDate),
         batchId: this.form1.batchId,
         capacityId: this.form1.capacityId,
         resultMaterialNumber: this.form1.resultMaterialNumber,
         resultMaterialTheoryweight: this.form1.resultMaterialTheoryweight,
-        resultRemarks: this.form1.resultRemarks
+        resultRemarks: this.form1.resultRemarks,
       };
+      console.log(tmstrainLoadingResult)
       if (
-      tmstrainLoadingResult.resultWagonNo==null||
-      tmstrainLoadingResult.resultBillableTonnage==null||
-      tmstrainLoadingResult.resultClass==null||
-      tmstrainLoadingResult.sendStationId==null||
-      tmstrainLoadingResult.arrivalStationId==null||
-      tmstrainLoadingResult.resultLoadingDate==null||
-      tmstrainLoadingResult.batchId==null
-      ) this.$message.error("必填项存在空值！");
+        tmstrainLoadingResult.resultWagonNo == null ||
+        tmstrainLoadingResult.sendStationId == null ||
+        tmstrainLoadingResult.arrivalStationId == null ||
+        tmstrainLoadingResult.resultLoadingDate == null ||
+        tmstrainLoadingResult.batchId == null
+      )
+        this.$message.error("必填项存在空值！");
       else
-      this.axios
-        .post("/api/v1/tms/upadteTmstrainLoadingResultByResultId",tmstrainLoadingResult)
-        .then(() => {
-          this.$message({
-            type: "success",  
-            message: "修改成功!",
+        this.axios
+          .post(
+            "/api/v1/tms/upadteTmstrainLoadingResultByResultId",
+            tmstrainLoadingResult
+          )
+          .then(() => {
+            this.$message({
+              type: "success",
+              message: "修改成功!",
+            });
+            this.$router.go(-1);
           });
-          this.$router.go(-1);
-        });
     },
   },
 };
 </script>
 <style lang="scss" scoped>
-// @import "@/styles/TMS/addwagonload.scss";
+.addWagonLoad {
+  color: #606266;
+  font-size: 0.675rem;
+  font-weight: 500;
+  .form {
+    display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 37%;
+      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;
+              }
+              .el-textarea {
+                .el-textarea__inner {
+                  width: 220px;
+                  margin-top: 0.03rem;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .button_box {
+    display: flex;
+    justify-content: center;
+    padding-top: 30px;
+    margin-left: 3.5%;
+  }
+}
 </style>

src/views/TMS/components/importedEmergency/editWagonUnLoadEmergency.vue

@@ -1,20 +1,13 @@
 <template>
   <!-- 修改车皮装车实绩 -->
-  <div id="contractDetails">
-    <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">车皮卸车实绩</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
+  <div class="contractDetails">
+    <page-title>返回</page-title>
+      <div class="form">
+        <div class="form_box">
           <dil-form :formId="118" v-model="form1"></dil-form>
         </div>
       </div>
-    </div>
-      
-    <div class="button-box">
+    <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
     </div>
@@ -23,7 +16,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
  data(){
@@ -31,6 +24,7 @@ export default {
       form1: {},
   }
  },
+
   mounted() {
     this.information();
   },
@@ -42,9 +36,6 @@ export default {
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
-            console.log(e);
-            console.log(this.form1);
-            console.log(this.$route.params.unloadingId);
           });
         });
     },
@@ -70,13 +61,8 @@ export default {
         resultRailHorizontalWeight: this.form1.resultRailHorizontalWeight,
         resultRemark: this.form1.resultRemark
       };
-      console.log(tmstrainWagonUnloadResult);
       if (tmstrainWagonUnloadResult.resultWagonNo==null
-      ||tmstrainWagonUnloadResult.resultArrivalDate==null||
-      tmstrainWagonUnloadResult.resultUnloadTime==null||
-      tmstrainWagonUnloadResult.unloadingPointId==null||
-      tmstrainWagonUnloadResult.resultBigTicketWeight==null||
-      tmstrainWagonUnloadResult.resultRailHorizontalWeight==null
+      ||tmstrainWagonUnloadResult.resultArrivalDate==null
       ) this.$message.error("存在空值！");
       else
       this.axios
@@ -96,5 +82,47 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-// @import "@/styles/TMS/addwagonload.scss";
+.contractDetails {
+  color: #606266;
+  font-size: 0.675rem;
+  font-weight: 500;
+  .form {
+    display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 37%;
+      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;
+              }
+              .el-textarea {
+                .el-textarea__inner {
+                  width: 220px;
+                  margin-top: 0.03rem;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .button_box {
+    display: flex;
+    justify-content: center;
+    padding-top: 30px;
+    margin-left: 3.5%;
+  }
+}
 </style>

src/views/TMS/components/importedEmergency/entrustEmergency.vue

@@ -2,7 +2,13 @@
   <!-- 计量委托 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input
+        class="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>
@@ -14,8 +20,6 @@
     </dilTable>
   </div>
 </template>
-
-
 <script>
 export default {
   data() {
@@ -27,29 +31,44 @@ export default {
         // 控制显示多选列
         selectionType: "select",
       },
-      selectionListMap:[],
+      selectionListMap: [],
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getTmstrainWagonLoad?apiId=58&resultType=1&con="+this.input;
+      this.option.requestUrl =
+        "/api/v1/tms/getTmstrainWagonLoad?apiId=58&resultType=1&con=" +
+        this.input;
     },
     btnclick() {
-      this.axios.post('/api/v1/tms/batchSendMeasureCommission',{resultIdList:this.selectionListMap}).then((res)=>{
-        if(res.data.code == "200"){
-          this.$message({
-            type: "success",
-            message: "发送成功",
+      let map = {
+        resultIdList: this.selectionListMap,
+      };
+      if (this.selectionListMap.length == 0) {
+        this.$message({
+          message: "请勾选要发送计量委托的实绩!",
+          type: "warning",
+        });
+      } else {
+        this.axios
+          .post("/api/v1/tms/batchSendMeasureCommission", map)
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$message({
+                type: "success",
+                message: "发送成功",
+              });
+              this.option.requestUrl =
+                "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=2&i=" +
+                new Date();
+            }
           });
-          this.option.requestUrl = "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=2&i=" + new Date();
-        }
-      })
+      }
     },
     selectionChange(selection) {
-      this.selectionListMap = [] 
-      selection.forEach(element => {
-        this.selectionListMap.push(element.resultId);
-      });
+      this.selectionListMap = [];
+      console.log(selection);
+      this.selectionListMap = selection;
     },
   },
 };
@@ -57,19 +76,19 @@ export default {
 <style lang='scss'>
 .homeworkPath {
   .top {
-     padding: 1.25rem 0.375rem;
-     .el-input{
-       width: 20%;
-       margin-right: 40rpx;
-     }
-     .btn{
-       width: 5.5%;
-       margin-left: 0.25rem;
-     }
-     .btn1{
-       width: 7%;
-       margin-left: 00.375rem;
-     }
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 40rpx;
+    }
+    .btn {
+      width: 5.5%;
+      margin-left: 0.25rem;
+    }
+    .btn1 {
+      width: 7%;
+      margin-left: 00.375rem;
+    }
   }
 }
 </style>

src/views/TMS/components/importedEmergency/wagonLoadEmergency.vue

@@ -46,6 +46,7 @@ export default {
       } else if (num == 1) {
         this.$router.push("/addWagonLoadEmergency")
       } else if (num == 2) {
+        // console.log("resultId",resultId);
          this.$router.push("/editWagonLoadEmergency/" + resultId)
       }
     },

src/views/TMS/components/importedEmergency/wagonUnLoadEmergency.vue

@@ -20,12 +20,12 @@
             size="small"
             >修改</el-button
           >
-          <el-button
+          <!-- <el-button
             type="text"
             size="small"
             @click="deleteclick(scope.row.unloadingId)"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </dilTable>
@@ -56,42 +56,50 @@ export default {
         this.$router.push("/editWagonUnLoadEmergency/" + unloadingId);
       }
     },
-    deleteclick(scope) {
-      let unloadingId = scope;
-      this.$confirm("是否删除", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-        .then(() => {
-          this.$message({
-            type: "success",
-            message: "删除成功!",
-          });
-          this.axios
-            .post(
-              "/api/v1/tms/deleteTmstrainWagonUnLoadResultByUnLoadingId?unloadingId=" +
-                unloadingId
-            )
-            .then(() => {
-              this.$router.go(0);
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消删除!",
-          });
-        });
-    },
+    // deleteclick(scope) {
+    //   let unloadingId = scope;
+    //   this.$confirm("是否删除", "提示", {
+    //     confirmButtonText: "确定",
+    //     cancelButtonText: "取消",
+    //     type: "warning",
+    //     center: true,
+    //   })
+    //     .then(() => {
+    //       this.$message({
+    //         type: "success",
+    //         message: "删除成功!",
+    //       });
+    //       this.axios
+    //         .post(
+    //           "/api/v1/tms/deleteTmstrainWagonUnLoadResultByUnLoadingId?unloadingId=" +
+    //             unloadingId
+    //         )
+    //         .then(() => {
+    //           this.$router.go(0);
+    //         });
+    //     })
+    //     .catch(() => {
+    //       this.$message({
+    //         type: "info",
+    //         message: "取消删除!",
+    //       });
+    //     });
+    // },
   },
 };
 </script>
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+     padding: 1.25rem 0.375rem;
+     .el-input{
+       width: 20%;
+       margin-right: 40rpx;
+     }
+     .btn{
+       width: 5.5%;
+       margin-left: 0.25rem;
+     }
   }
 }
 </style>

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

@@ -15,6 +15,22 @@
       <el-button type="primary" class="btn" @click="insertClick">
         <i class="el-icon-plus"></i>新增
       </el-button>
+      <el-input
+        class="input"
+        placeholder="请从表格复制采购订单号"
+        v-model="inputPurOrder"
+        clearable
+        v-if="activeName == 'second'"
+      >
+      </el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="closePurOrder"
+        v-if="activeName == 'second'"
+      >
+        关闭一车多趟
+      </el-button>
       <el-button
         type="primary"
         class="btn"
@@ -24,6 +40,33 @@
         <i class="el-icon-plus"></i>下发
       </el-button>
     </div>
+    <el-dialog
+      title="提醒"
+      :visible.sync="dialogVisible"
+      width="30%"
+    >
+      <div v-if="this.isMoreTrips != 1" style="color:red">
+        <span>该订单不是一车多趟的订单</span>
+      </div>
+      <div>
+        <span>采购订单号:</span>
+        <span>{{inputPurOrder}}</span>
+      </div>
+      <div>
+        <span>发货单位:</span>
+        <span>{{supplierName}}</span>
+      </div>
+      <div>
+        <span>物资名称:</span>
+        <span>{{materialName}}</span>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="closePurOrder1" v-if="this.isMoreTrips == 1"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
     <el-tabs v-model="activeName">
       <!-- 未下发 -->
       <el-tab-pane label="未下发" name="first">
@@ -68,7 +111,7 @@
       </el-tab-pane>
       <!-- 已下发 -->
       <el-tab-pane label="已下发" name="second">
-        <dilTable v-bind.sync="option2"> </dilTable>
+        <dilTable v-bind.sync="option2" @func="func"> </dilTable>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -93,6 +136,12 @@ export default {
         // 表格请求数据的地址
         requestUrl: "",
       },
+      purOrderList: [],
+      isMoreTrips:null,
+      dialogVisible: false,
+      materialName: null,
+      supplierName: null,
+      inputPurOrder:null,
     };
   },
   created() {
@@ -165,6 +214,36 @@ export default {
         }
       }
     },
+    closePurOrder() {
+      if(this.inputPurOrder == null){
+        this.$message.warning("请输入需要关闭一车多趟的采购订单号")
+        return
+      }
+      this.purOrderList.forEach((e) => {
+        if (e.purchaseOrderNo == this.inputPurOrder) {
+          this.materialName = e.materialName;
+          this.supplierName = e.supplierName;
+          this.isMoreTrips = e.isMoreTrips
+        }
+      });
+      console.log(this.isMoreTrips)
+      this.dialogVisible = true
+    },
+    closePurOrder1(){
+      this.axios.post("/api/v1/bp/closePurOrderMoreTrips?purchaseOrderNo=" + this.inputPurOrder).then((res) =>{
+        console.log(res)
+        if(res.data.code == '200'){
+          this.$message.success("关闭成功")
+        }else{
+          this.$message.error(res.data.data)
+        }
+      })
+      this.dialogVisible = false
+    },
+    func(res) {
+      this.purOrderList = res.list;
+      console.log(res.list);
+    },
     selectionChange(selection) {
       this.mapList = selection;
     },

src/views/TMS/components/importedIngredients/transportReserveFu.vue

@@ -15,6 +15,22 @@
       <el-button type="primary" class="btn" @click="insertClick">
         <i class="el-icon-plus"></i>新增
       </el-button>
+      <el-input
+        class="input"
+        placeholder="请从表格复制采购订单号"
+        v-model="inputPurOrder"
+        clearable
+        v-if="activeName == 'second'"
+      >
+      </el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="closePurOrder"
+        v-if="activeName == 'second'"
+      >
+        关闭一车多趟
+      </el-button>
       <el-button
         type="primary"
         class="btn"
@@ -24,6 +40,33 @@
         <i class="el-icon-plus"></i>下发
       </el-button>
     </div>
+    <el-dialog
+      title="提醒"
+      :visible.sync="dialogVisible"
+      width="30%"
+    >
+      <div v-if="this.isMoreTrips != 1" style="color:red">
+        <span>该订单不是一车多趟的订单</span>
+      </div>
+      <div>
+        <span>采购订单号:</span>
+        <span>{{inputPurOrder}}</span>
+      </div>
+      <div>
+        <span>发货单位:</span>
+        <span>{{supplierName}}</span>
+      </div>
+      <div>
+        <span>物资名称:</span>
+        <span>{{materialName}}</span>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="closePurOrder1" v-if="this.isMoreTrips == 1"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
     <el-tabs v-model="activeName" tab-click="handleClick">
       <!-- 未下发 -->
       <el-tab-pane label="未下发" name="first">
@@ -68,7 +111,7 @@
       </el-tab-pane>
       <!-- 已下发 -->
       <el-tab-pane label="已下发" name="second">
-        <dilTable v-bind.sync="option2"> </dilTable>
+        <dilTable v-bind.sync="option2" @func="func"> </dilTable>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -83,16 +126,23 @@ export default {
       input: "",
       Time: "",
       activeName: "first",
+      dialogVisible: false,
+      materialName: null,
+      supplierName: null,
+      inputPurOrder:null,
       option1: {
         // 表格请求数据的地址
         requestUrl: "",
         selectionType: "select",
         mapList: [],
+        
       },
+      isMoreTrips:null,
       option2: {
         // 表格请求数据的地址
-        requestUrl: "",
+        requestUrl: ""
       },
+      purOrderList: []
     };
   },
   created() {
@@ -114,26 +164,34 @@ export default {
     }
   },
   methods: {
-    handleClick(){
-      this.getRequestUrl()
+    handleClick() {
+      this.getRequestUrl();
     },
-    getRequestUrl(){
-        //判断是否是承运商
-    if (getCookie("orgCode") == "chengyunshang") {
-      this.option1.requestUrl =
-        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&carrierSSOId=" +
-        getCookie("userId") + "&i=" + new Date();
-      this.option2.requestUrl =
-        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=5&carrierSSOId=" +
-        getCookie("userId") + "&i=" + new Date();
-    } else {
-      this.option1.requestUrl =
-        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&carrierSSOId=" +
-        null + "&i=" + new Date();
-      this.option2.requestUrl =
-        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=5&carrierSSOId=" +
-        null + "&i=" + new Date();
-    }
+    getRequestUrl() {
+      //判断是否是承运商
+      if (getCookie("orgCode") == "chengyunshang") {
+        this.option1.requestUrl =
+          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&carrierSSOId=" +
+          getCookie("userId") +
+          "&i=" +
+          new Date();
+        this.option2.requestUrl =
+          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=5&carrierSSOId=" +
+          getCookie("userId") +
+          "&i=" +
+          new Date();
+      } else {
+        this.option1.requestUrl =
+          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&carrierSSOId=" +
+          null +
+          "&i=" +
+          new Date();
+        this.option2.requestUrl =
+          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=5&carrierSSOId=" +
+          null +
+          "&i=" +
+          new Date();
+      }
     },
     onclick() {
       if (this.activeName == "first") {
@@ -171,14 +229,43 @@ export default {
     selectionChange(selection) {
       this.mapList = selection;
     },
+    closePurOrder() {
+      if(this.inputPurOrder == null){
+        this.$message.warning("请输入需要关闭一车多趟的采购订单号")
+        return
+      }
+      this.purOrderList.forEach(e => {
+        if (e.purchaseOrderNo == this.inputPurOrder) {
+          this.materialName = e.materialName;
+          this.supplierName = e.supplierName;
+          this.isMoreTrips = e.isMoreTrips
+        }
+      });
+      this.dialogVisible = true
+    },
+    closePurOrder1(){
+      this.axios.post("/api/v1/bp/closePurOrderMoreTrips?purchaseOrderNo=" + this.inputPurOrder).then((res) =>{
+        console.log(res)
+        if(res.data.code == '200'){
+          this.$message.success("关闭成功")
+        }else{
+          this.$message.error(res.data.data)
+        }
+      })
+      this.dialogVisible = false
+    },
+    func(res) {
+      this.purOrderList = res.list;
+      console.log(res.list);
+    },
     issue() {
       let mapvalue = {
-        mapList: this.mapList,
+        mapList: this.mapList
       };
       this.axios.post("/api/v1/oms/dispatchOrder", mapvalue).then(() => {
         this.$message({
           type: "success",
-          message: "下发成功!",
+          message: "下发成功!"
         });
         this.option1.requestUrl =
           "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&i=" +
@@ -188,27 +275,27 @@ export default {
     // 下发
     sendClick(orderId) {
       let mapvalue = {
-        mapList: [{ orderId: orderId }],
+        mapList: [{ orderId: orderId }]
       };
       this.$confirm("是否下发", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true,
+        center: true
       })
         .then(() => {
           this.axios.post("/api/v1/oms/dispatchOrder", mapvalue).then(() => {
             this.$message({
               type: "success",
-              message: "下发成功!",
+              message: "下发成功!"
             });
-            this.getRequestUrl()
+            this.getRequestUrl();
           });
         })
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消下发!",
+            message: "取消下发!"
           });
         });
     },
@@ -218,26 +305,26 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true,
+        center: true
       })
         .then(() => {
           this.$message({
             type: "success",
-            message: "删除成功!",
+            message: "删除成功!"
           });
           this.axios
             .post("/api/v1/oms/deleteOrder", {
               orderId: orderId,
-              capacityNumber: capacityNumber,
+              capacityNumber: capacityNumber
             })
             .then(() => {
-              this.getRequestUrl()
+              this.getRequestUrl();
             });
         })
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消删除!",
+            message: "取消删除!"
           });
         });
     },
@@ -248,11 +335,11 @@ export default {
     //修改
     updateClick(orderId) {
       this.$router.push("/transportReserveFuEdit/" + orderId);
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .homeworkPath {
   .top {
     padding: 40px;
@@ -265,4 +352,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/TMS/components/importedMine/addApproveWagonPlease.vue

@@ -1,44 +1,7 @@
 <template>
   <!-- 新增批车作业页面 -->
   <div id="trainTransport">
-    <!-- <page-title>批车作业</page-title>
-    <div class="main">
-      <span class="text">选择已下发请车作业</span>
-      <span class="a"></span>
-    </div>
-    <div>
-      <dilTable
-        v-bind.sync="option"
-        v-model="table1"
-        @change="handleCheckedCitiesChange"
-        ref="table"
-        @radio-change="currentRadioChange"
-      >
-      </dilTable>
-    </div>
-    <div class="main">
-      <span class="text">填写批车信息</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="105" v-model="form1"></dil-form>
-        </div>
-      </div>
-    </div>
-    <div class="button-box">
-      <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
-    </div> -->
     <page-title>返回</page-title>
-    <!-- 第一部分 -->
-      <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" v-model="table1" @change="handleCheckedCitiesChange" 
       ref="table" @radio-change="currentRadioChange">
       </dilTable>
@@ -133,43 +96,40 @@ export default {
 };
 </script>
 <style lang="scss">
-.shipTransport{
-  .form{
+#trainTransport {
+  .form {
     display: flex;
-    .form_box{
-      width: 320px;
+    .form_box {
+      width: 340px;
       margin-left: 35%;
       margin-top: 30px;
       margin-right: 20px;
-      .el-form{
-        .preview-group{
-          .el-form-item{
-            .el-form-item__label{
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
               display: inline-block;
               width: 70px !important;
             }
-            .el-form-item__content{
-              .el-select{
+            .el-form-item__content {
+              .el-select {
                 width: 250px;
               }
-              .el-input{
+              .el-input {
                 width: 250px;
               }
             }
+           
           }
+      
         }
       }
     }
+     
   }
-  .top {
-    padding: 1.25rem 0.375rem;
-    .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
-    }
-  }
-  .button_box{
-    margin-left: 45%;
-  }
+  .button_box {
+         margin-left: 42%;
+         margin-top: 55px;
+      }
 }
 </style>

src/views/TMS/components/importedMine/addWagonLoad.vue

@@ -2,9 +2,8 @@
   <!-- 添加车皮装车实绩 -->
   <div class="addWagonLoad">
     <page-title>新增</page-title>
- 
     <div class="cp">
-      <span>车皮号：</span>
+      <span style="width:80px">车皮号:</span>
       <el-input
         placeholder="请输入内容"
         v-model="input"
@@ -43,6 +42,40 @@
       <el-input v-model="unloadPointName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
     </div>
+    <div class="fromOther">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:550px;">
+        <el-form-item label="发站:">
+          <el-autocomplete
+            class="inline-input"
+            v-model="sendStation"
+            :fetch-suggestions="querySearchSendStation"
+            placeholder="请输入发站名称"
+            :trigger-on-focus="false"
+            @select="handleSelectSendStation"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.arrivalName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:550px;">
+        <el-form-item label="到站:">
+          <el-autocomplete
+            class="inline-input"
+            v-model="toTheStation"
+            :fetch-suggestions="querySearchToTheStation"
+            placeholder="请输入到站名称"
+            :trigger-on-focus="false"
+            @select="handleSelectToTheStation"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.arrivalName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+    </div>
     <div class="form">
       <div class="form_box" style="margin-right: 10rem">
         <dil-form :formId="102" v-model="form1" ref="from1"></dil-form>
@@ -57,7 +90,7 @@
       <el-input
         placeholder="请输入内容"
         v-model="inputText"
-        style="margin-top: 0.625rem; margin-left: 1.25rem"
+        style="margin-top: 0.625rem; margin-left: 1.25rem;width:250px"
         clearable
       ></el-input>
       <el-button
@@ -92,7 +125,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime,isNumber } from "@/utils/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -137,14 +170,12 @@ export default {
         requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
         selectionType: "radio",
       },
+      sendStationId:2,
+      toTheStationId:1,
+      sendStation:"万州港",
+      toTheStation:"老区轨道衡"
     };
   },
-  created(){
-    this.form1 = {
-      sendStationId:1,
-      arrivalStationId:2,
-    }
-  },
   methods: {
     currentRadioChange1(selection) {
       this.input = null;
@@ -219,6 +250,72 @@ export default {
           "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.inputText;
       }
     },
+    //发站弹出层
+    handleSelectSendStation(item) {
+      this.sendStationId = item.arrivalId;
+      this.sendStation = item.arrivalName;
+    },
+    //以下是发站边输边查搜索
+    querySearchSendStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.sendStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterSendStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //发站
+    createFilterSendStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
+    //到站弹出层
+    handleSelectToTheStation(item) {
+      this.toTheStationId = item.arrivalId;
+      this.toTheStation = item.arrivalName;
+    },
+    //以下是到站边输边查搜索
+    querySearchToTheStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.toTheStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterToTheStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //到站
+    createFilterToTheStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
     onchang() {
       var state = false;
       var cptop = this.input.substring(0, 2);
@@ -274,8 +371,8 @@ export default {
         this.purchaseOrderId &&
         this.form1.resultIsclear &&
         this.form1.resultClass &&
-        this.form1.sendStationId &&
-        this.form1.arrivalStationId &&
+        this.sendStationId &&
+        this.toTheStationId &&
         this.form1.resultLoadingDate
       ) {
         state = 1;
@@ -361,8 +458,8 @@ export default {
           sendUnitId:this.supplierId,
           resultIsclear:this.form1.resultIsclear,
           resultClass: this.form1.resultClass,
-          sendStationId: this.form1.sendStationId,
-          arrivalStationId: this.form1.arrivalStationId,
+          sendStationId: this.sendStationId,
+          arrivalStationId: this.toTheStationId,
           resultLoadingDate: sjTime(this.form1.resultLoadingDate),
           resultRemarks: this.form1.resultRemarks,
           resultType:1,
@@ -509,7 +606,6 @@ export default {
     .form_box {
       width: 340px;
       margin-left: 37%;
-     
       margin-right: 20px;
       .el-form {
         .preview-group {
@@ -527,8 +623,7 @@ export default {
               }
               .el-textarea{
                 .el-textarea__inner{
-                  width: 220px;
-                  margin-left: 65px;
+                  width: 225px;     
                   margin-top: 0.03rem;
                 }
               }
@@ -543,6 +638,9 @@ export default {
     justify-content: center;
     padding-top: 30px;
   }
+  .fromOther  .el-input__inner{
+    width: 250px;
+  }
 }
 </style>
 

src/views/TMS/components/importedMine/addWagonPlease.vue

@@ -1,49 +1,76 @@
 <template>
   <!-- 新增请作业页面 -->
- <div class="contractDetails">
+  <div class="contractDetails">
     <page-title>返回</page-title>
 
     <div class="form">
       <div class="form_box">
-         <dil-form :formId="122" v-model="form1" ></dil-form>
+        <dil-form :formId="122" v-model="form1"></dil-form>
       </div>
     </div>
-
-     <div class="fromOther">
-          <el-form
-        :inline="true"
-        class="demo-form-inline"
-        label-width="80px"
-        >
+    <div class="fromOther">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:525px;">
         <el-form-item label="发货单位">
-         <el-autocomplete
-          class="inline-input"
-          v-model="stateSupplier"
-          :fetch-suggestions="querySearchSupplier"
-          placeholder="请输入发货单位名称"
-          :trigger-on-focus="false"
-          @select="handleSelectSupplier"
-        >
-        <template slot-scope="{ item }">
-          <div class="name">{{ item.supplierName }}</div>
-        </template>
-        </el-autocomplete>
+          <el-autocomplete
+            class="inline-input"
+            v-model="stateSupplier"
+            :fetch-suggestions="querySearchSupplier"
+            placeholder="请输入发货单位名称"
+            :trigger-on-focus="false"
+            @select="handleSelectSupplier"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.supplierName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:525px;">
+        <el-form-item label="发站">
+          <el-autocomplete
+            class="inline-input"
+            v-model="sendStation"
+            :fetch-suggestions="querySearchSendStation"
+            placeholder="请输入发站名称"
+            :trigger-on-focus="false"
+            @select="handleSelectSendStation"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.arrivalName }}</div>
+            </template>
+          </el-autocomplete>
         </el-form-item>
-        </el-form>
+      </el-form>
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:525px;">
+        <el-form-item label="到站">
+          <el-autocomplete
+            class="inline-input"
+            v-model="toTheStation"
+            :fetch-suggestions="querySearchToTheStation"
+            placeholder="请输入到站名称"
+            :trigger-on-focus="false"
+            @select="handleSelectToTheStation"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.arrivalName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
     </div>
-  <div class="trainTransport">
-    <!-- 确定和取消 -->
-    <div class="button_box">
-      <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+    <div class="trainTransport">
+      <!-- 确定和取消 -->
+      <div class="button_box">
+        <el-button @click="onClickCancel">返回</el-button>
+        <el-button type="primary" @click="onClickConfirm">确认</el-button>
+      </div>
     </div>
   </div>
- </div>
 </template>
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime, isNumber } from "@/utils/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 import { getCookie } from "@/utils/util.js";
 export default {
   components: { PageTitle },
@@ -54,15 +81,85 @@ export default {
       supplierId: null,
       supplierName: "",
       stateSupplier: "",
+      sendStationId:2,
+      toTheStationId:1,
+      sendStation:"万州港",
+      toTheStation:"老区轨道衡"
     };
   },
-  mounted() {
-    // this.unit();
+  created() {
+    
   },
   methods: {
     handleCheckedCitiesChange(value) {
       console.log(value);
     },
+    //发站弹出层
+    handleSelectSendStation(item) {
+      this.sendStationId = item.arrivalId;
+      this.sendStation = item.arrivalName;
+    },
+    //以下是发站边输边查搜索
+    querySearchSendStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.sendStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterSendStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //发站
+    createFilterSendStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
+    //到站弹出层
+    handleSelectToTheStation(item) {
+      this.toTheStationId = item.arrivalId;
+      this.toTheStation = item.arrivalName;
+    },
+    //以下是到站边输边查搜索
+    querySearchToTheStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.toTheStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterToTheStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //到站
+    createFilterToTheStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
     //发货单位弹出层
     handleSelectSupplier(item) {
       this.supplierId = item.supplierId;
@@ -104,8 +201,8 @@ export default {
         resultPlanDate: sjTime(this.form1.resultPlanDate),
         resultCategory: this.form1.resultCategory,
         supplierId: this.supplierId,
-        sendStationId: this.form1.sendStationId,
-        toTheStationId: this.form1.toTheStationId,
+        sendStationId: this.sendStationId,
+        toTheStationId: this.toTheStationId,
         resultPleaseNumber: this.form1.resultPleaseNumber,
         userId: getCookie("orgCode"),
         resultType: 1,
@@ -174,19 +271,16 @@ export default {
               margin-top: 55px;
             }
           }
-          .fromOther {
-            margin-left: 34.5%;
-            width: 50%;
-            .inline-input {
-              width: 300px;
-              .button_box {
-                margin-left: 45%;
-              }
-            }
-          }
         }
       }
     }
   }
+  .trainTransport{
+    .button_box{
+      margin-left: 40%;
+      margin-bottom: 2px;
+
+    }
+  }
 }
 </style>

src/views/TMS/components/importedMine/addWagonUnLoad.vue

@@ -123,15 +123,15 @@ export default {
               .el-input {
                 width: 250px;
               }
-            }
             .el-textarea {
               .el-textarea__inner {
                 width: 230px;
-                margin-left: 65px;
+                // margin-left: 45px;
                 margin-top: 0.03rem;
               }
             }
-          }
+           }
+         }
         }
       }
     }

src/views/TMS/components/importedMine/editApproveWagonPlease.vue

@@ -1,8 +1,6 @@
 <template>
  <div class="contractDetails">
     <page-title>返回</page-title>
-
-
     <div class="form">
       <div class="form_box">
        <dil-form :formId="140" v-model="form1"></dil-form>
@@ -19,6 +17,7 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
     data(){
@@ -48,12 +47,10 @@ export default {
     onClickConfirm() {
       let approveWagonPlease = {
         resultId: this.$route.params.resultId,
-        resultApproveDate: this.form1.resultApproveDate,
+        resultApproveDate: sjTime(this.form1.resultApproveDate),
         resultApproveNumber: this.form1.resultApproveNumber,
         // shipperId: this.form1.shipperId,
         resultCategory: this.form1.resultCategory,
-        sendStationId: this.form1.sendStationId,
-        toTheStationId: this.form1.toTheStationId,
         userId:getCookie("orgCode"),
       };
       function isNumber() {
@@ -71,9 +68,7 @@ export default {
         approveWagonPlease.resultApproveDate==null||
         approveWagonPlease.resultApproveNumber==null||
         // approveWagonPlease.shipperId==null||
-        approveWagonPlease.resultCategory==null||
-        approveWagonPlease.sendStationId==null||
-        approveWagonPlease.toTheStationId==null
+        approveWagonPlease.resultCategory==null
       ) this.$message.error("存在空值！");
       else
       if (!isNumber(val)) this.$message.error("请车数必须是数字！");

src/views/TMS/components/importedMine/editWagonLoad.vue

@@ -8,7 +8,40 @@
         <dil-form :formId="103" v-model="form1"></dil-form>
       </div>
     </div>
-
+    <div class="fromOther">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:520px;">
+        <el-form-item label="发站:">
+          <el-autocomplete
+            class="inline-input"
+            v-model="sendStation"
+            :fetch-suggestions="querySearchSendStation"
+            placeholder="请输入发站名称"
+            :trigger-on-focus="false"
+            @select="handleSelectSendStation"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.arrivalName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:520px;">
+        <el-form-item label="到站:">
+          <el-autocomplete
+            class="inline-input"
+            v-model="toTheStation"
+            :fetch-suggestions="querySearchToTheStation"
+            placeholder="请输入到站名称"
+            :trigger-on-focus="false"
+            @select="handleSelectToTheStation"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.arrivalName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+    </div>
     <!-- 确定和取消 -->
     <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
@@ -25,6 +58,10 @@ export default {
   data() {
     return {
       form1: {},
+      sendStationId:null,
+      toTheStationId:null,
+      sendStation:"",
+      toTheStation:""
     };
   },
   mounted() {
@@ -32,6 +69,7 @@ export default {
   },
   methods: {
     information() {
+      console.log("resultId"+this.$route.params.resultId);
       //编辑车皮装车作业
       this.axios
         .post(
@@ -41,9 +79,11 @@ export default {
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
-            console.log(e);
-            console.log(this.form1);
-            console.log(this.$route.params.resultId);
+            this.toTheStationId = e.arrivalStationId
+            this.sendStationId = e.sendStationId
+            this.sendStation = e.sendName
+            this.toTheStation = e.arrivalName
+            console.log(e)
           });
         });
     },
@@ -57,14 +97,80 @@ export default {
     currentRadioChange(row) {
       this.aaaa = row;
     },
+    //发站弹出层
+    handleSelectSendStation(item) {
+      this.sendStationId = item.arrivalId;
+      this.sendStation = item.arrivalName;
+    },
+    //以下是发站边输边查搜索
+    querySearchSendStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.sendStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterSendStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //发站
+    createFilterSendStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
+    //到站弹出层
+    handleSelectToTheStation(item) {
+      this.toTheStationId = item.arrivalId;
+      this.toTheStation = item.arrivalName;
+    },
+    //以下是到站边输边查搜索
+    querySearchToTheStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.toTheStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterToTheStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //到站
+    createFilterToTheStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
     // 确认
     onClickConfirm() {
       let tmstrainLoadingResult = {
         resultId: this.$route.params.resultId,
         resultIsclear: this.form1.resultIsclear,
         resultClass: this.form1.resultClass,
-        sendStationId: this.form1.sendStationId,
-        arrivalStationId: this.form1.arrivalStationId,
+        sendStationId: this.sendStationId,
+        arrivalStationId: this.toTheStationId,
         resultLoadingDate: sjTime(this.form1.resultLoadingDate),
         capacityId: this.form1.capacityId,
         resultMaterialNumber: this.form1.resultMaterialNumber,
@@ -139,12 +245,8 @@ export default {
     margin-left: 42%;
     margin-top: 55px;
   }
-}
-.fromOther {
-  margin-left: 34.5%;
-  width: 50%;
-  .inline-input {
-    width: 300px;
+  .fromOther  .el-input__inner{
+    width: 250px;
   }
 }
 </style>

src/views/TMS/components/importedMine/editWagonPlease.vue

@@ -7,7 +7,6 @@
         <dil-form :formId="117" v-model="form1"></dil-form>
       </div>
     </div>
-
     <div class="fromOther">
       <el-form :inline="true" class="demo-form-inline" label-width="80px">
         <el-form-item label="发货单位">
@@ -25,6 +24,38 @@
           </el-autocomplete>
         </el-form-item>
       </el-form>
+        <el-form :inline="true" class="demo-form-inline" label-width="80px" >
+        <el-form-item label="发站:">
+          <el-autocomplete
+            class="inline-input"
+            v-model="sendStation"
+            :fetch-suggestions="querySearchSendStation"
+            placeholder="请输入发站名称"
+            :trigger-on-focus="false"
+            @select="handleSelectSendStation"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.arrivalName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" >
+        <el-form-item label="到站:">
+          <el-autocomplete
+            class="inline-input"
+            v-model="toTheStation"
+            :fetch-suggestions="querySearchToTheStation"
+            placeholder="请输入到站名称"
+            :trigger-on-focus="false"
+            @select="handleSelectToTheStation"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.arrivalName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
     </div>
 
     <!-- 确定和取消 -->
@@ -37,7 +68,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime,isNumber } from "@/utils/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -46,6 +77,10 @@ export default {
       supplierId: null,
       supplierName: "",
       stateSupplier: "",
+      sendStationId:null,
+      toTheStationId:null,
+      sendStation:"",
+      toTheStation:""
     };
   },
   mounted() {
@@ -59,7 +94,13 @@ export default {
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
+            console.log(e)
+            this.toTheStationId = e.toTheStationId
+            this.sendStationId = e.sendStationId
+            this.sendStation = e.sendName
+            this.toTheStation = e.arrivalName
           });
+          
           this.stateSupplier = res.data.data[0].supplierName;
           this.supplierId = res.data.data[0].supplierId;
         });
@@ -89,7 +130,72 @@ export default {
           return (restaurantsSupplier.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
         };
       },
-
+    //发站弹出层
+    handleSelectSendStation(item) {
+      this.sendStationId = item.arrivalId;
+      this.sendStation = item.arrivalName;
+    },
+    //以下是发站边输边查搜索
+    querySearchSendStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.sendStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterSendStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //发站
+    createFilterSendStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
+    //到站弹出层
+    handleSelectToTheStation(item) {
+      this.toTheStationId = item.arrivalId;
+      this.toTheStation = item.arrivalName;
+    },
+    //以下是到站边输边查搜索
+    querySearchToTheStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.toTheStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier)
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterToTheStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //到站
+    createFilterToTheStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
 
     // 确认
     onClickConfirm() {
@@ -98,10 +204,11 @@ export default {
         resultPlanDate: sjTime(this.form1.resultPlanDate),
         resultCategory: this.form1.resultCategory,
         supplierId: this.supplierId,
-        sendStationId: this.form1.sendStationId,
-        toTheStationId: this.form1.toTheStationId,
+        sendStationId: this.sendStationId,
+        toTheStationId: this.toTheStationId,
         resultPleaseNumber: this.form1.resultPleaseNumber,
       };
+      console.log(tmstrainPleaseApproveResult)
       function isNumber() {
         var value = tmstrainPleaseApproveResult.resultPleaseNumber;
         //验证是否为数字
@@ -173,12 +280,14 @@ export default {
     margin-left: 42%;
     margin-top: 55px;
   }
-}
-.fromOther {
+  .fromOther {
   margin-left: 34.5%;
   width: 50%;
-  .inline-input {
-    width: 300px;
+  .el-input__inner{
+    width: 250px;
+  
   }
 }
+}
+
 </style>

src/views/TMS/components/importedMine/editWagonUnLoad.vue

@@ -2,7 +2,6 @@
   <!-- 新增请作业页面 -->
   <div class="contractDetails">
     <page-title>返回</page-title>
-
     <div class="form">
       <div class="form_box">
         <dil-form :formId="118" v-model="form1"></dil-form>
@@ -120,14 +119,14 @@ export default {
               .el-input {
                 width: 250px;
               }
-            }
-            .el-textarea {
+               .el-textarea {
               .el-textarea__inner {
                 width: 230px;
-                margin-left: 65px;
                 margin-top: 0.03rem;
               }
             }
+            }
+          
           }
         }
       }

src/views/TMS/components/importedMine/entrust.vue

@@ -2,7 +2,13 @@
   <!-- 发送计量委托界面 -->
   <div class="trainTransport">
     <div class="top">
-      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input
+        class="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>
@@ -27,29 +33,46 @@ export default {
         // 控制显示多选列
         selectionType: "select",
       },
-      selectionListMap:[],
+      selectionListMap: [],
+      resultIdList: [],
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=1&con="+this.input;
+      this.option.requestUrl =
+        "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=1&con=" +
+        this.input;
     },
     btnclick() {
-      this.axios.post('/api/v1/tms/batchSendMeasureCommission',{resultIdList:this.selectionListMap}).then((res)=>{
-        if(res.data.code == "200"){
-          this.$message({
-            type: "success",
-            message: "发送成功",
+      let map = {
+        resultIdList: this.selectionListMap,
+      };
+      if (this.selectionListMap.length == 0) {
+        this.$message({
+          message: "请勾选要发送计量委托的实绩!",
+          type: "warning",
+        });
+      } else {
+        this.axios
+          .post("/api/v1/tms/batchSendMeasureCommission", map)
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$message({
+                type: "success",
+                message: "发送成功",
+              });
+              this.option.requestUrl =
+                "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=1" +
+                "&i=" +
+                new Date();
+            }
           });
-          this.option.requestUrl = "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=1"+"&i=" + new Date();
-        }
-      })
+      }
     },
     selectionChange(selection) {
-      this.selectionListMap = [] 
-      selection.forEach(element => {
-        this.selectionListMap.push(element.resultId);
-      });
+      this.selectionListMap = [];
+      console.log(selection);
+      this.selectionListMap = selection;
     },
   },
 };

src/views/TMS/components/importedMine/wagonLoad.vue

@@ -53,9 +53,8 @@ export default {
       this.getRequestUrl();
     },
   methods: {
- 
      getRequestUrl(){
-      this.option.requestUrl = "/api/v1/tms/getTmstrainWagonLoad?apiId=58&resultType=1"  
+      this.option.requestUrl = "/api/v1/tms/getTmstrainWagonLoad?apiId=58&resultType=1&i=" + new Date()  
     },
     onclick() {
       this.option.requestUrl =

src/views/TMS/components/importedMine/wagonPlease.vue

@@ -58,23 +58,27 @@ export default {
       activeName: "first",
       option1: {
         // 表格请求数据的地址
-        requestUrl:
-          "",
+        requestUrl: ""
       },
       option2: {
         // 表格请求数据的地址
-        requestUrl:
-          "",
-      },
+        requestUrl: ""
+      }
     };
   },
-  created(){
-      this.getRequestUrl()
+  created() {
+    this.getRequestUrl();
   },
   methods: {
-    getRequestUrl(){
-      this.option1.requestUrl = "/api/v1/tms/getAllWagonPlease?apiId=57&status=0&resultType=1" + "&i=" + new Date() 
-      this.option2.requestUrl = "/api/v1/tms/getAllWagonPlease?apiId=57&status=1&resultType=1" + "&i=" + new Date() 
+    getRequestUrl() {
+      this.option1.requestUrl =
+        "/api/v1/tms/getAllWagonPlease?apiId=57&status=0&resultType=1" +
+        "&i=" +
+        new Date();
+      this.option2.requestUrl =
+        "/api/v1/tms/getAllWagonPlease?apiId=57&status=1&resultType=1" +
+        "&i=" +
+        new Date();
     },
     onclick() {
       if (this.activeName == "first") {
@@ -93,26 +97,19 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true,
+        center: true
       })
         .then(() => {
-          this.$message({
-            type: "success",
-            message: "删除成功!",
-          });
-          // console.log(this.arr[0].text_prop);
-          this.$axios
+          this.axios
             .post("/api/v1/tms/deleteApproveWagonPlease/" + resultId)
             .then(() => {
-              this.$router.go(0);
+              this.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+              this.getRequestUrl();
             });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消删除!",
-          });
-        });
+        })  
     },
     // 下发
     sendClick(resultId) {
@@ -120,29 +117,28 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true,
+        center: true
       })
         .then(() => {
-          console.log("enter!1!")
-           this.axios
+          console.log("enter!1!");
+          this.axios
             .post("/api/v1/tms/sendWagonPlease/" + resultId)
-            .then((res) => {
-              if(res.data.code == "200"){
-                 this.getRequestUrl()
-              }              
+            .then(res => {
+              if (res.data.code == "200") {
+                this.getRequestUrl();
+              }
             });
           this.$message({
             type: "success",
-            message: "下发成功!",
+            message: "下发成功!"
           });
           // console.log(this.arr[0].text_prop);
-         
         })
         .catch(() => {
-          console.log("out!S")
+          console.log("out!S");
           this.$message({
             type: "info",
-            message: "取消下发!",
+            message: "取消下发!"
           });
         });
     },
@@ -154,12 +150,12 @@ export default {
     //修改
     updateClick(resultId) {
       this.$router.push("/editWagonPlease/" + resultId);
-    },
-  },
+    }
+  }
 };
 </script>
 
-<style lang='scss' >
+<style lang="scss">
 .trainTransport {
   .top {
     padding: 1.25rem 0.375rem;
@@ -167,7 +163,6 @@ export default {
       width: 20%;
       margin-right: 1.25rem;
     }
-
   }
 }
-</style>
+</style>

src/views/TMS/components/importedMine/wagonUnLoad.vue

@@ -20,12 +20,12 @@
             size="small"
             >修改</el-button
           >
-          <el-button
+          <!-- <el-button
             type="text"
             size="small"
             @click="deleteclick(scope.row.unloadingId)"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </dilTable>
@@ -55,35 +55,35 @@ export default {
     click(unloadingId) {
       this.$router.push("/editWagonUnLoad/" + unloadingId);
     },
-    deleteclick(scope) {
-      let unloadingId = scope;
-      this.$confirm("是否删除", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-        .then(() => {
-          this.$message({
-            type: "success",
-            message: "删除成功!",
-          });
-          this.axios
-            .post(
-              "/api/v1/tms/deleteTmstrainWagonUnLoadResultByUnLoadingId?unloadingId=" +
-                unloadingId
-            )
-            .then(() => {
-              this.$router.go(0);
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消删除!",
-          });
-        });
-    },
+    // deleteclick(scope) {
+    //   let unloadingId = scope;
+    //   this.$confirm("是否删除", "提示", {
+    //     confirmButtonText: "确定",
+    //     cancelButtonText: "取消",
+    //     type: "warning",
+    //     center: true,
+    //   })
+    //     .then(() => {
+    //       this.$message({
+    //         type: "success",
+    //         message: "删除成功!",
+    //       });
+    //       this.axios
+    //         .post(
+    //           "/api/v1/tms/deleteTmstrainWagonUnLoadResultByUnLoadingId?unloadingId=" +
+    //             unloadingId
+    //         )
+    //         .then(() => {
+    //           this.$router.go(0);
+    //         });
+    //     })
+    //     .catch(() => {
+    //       this.$message({
+    //         type: "info",
+    //         message: "取消删除!",
+    //       });
+    //     });
+    // },
   },
 };
 </script>

src/views/TMS/components/importedShip/updateShipmentInstructions.vue

@@ -56,7 +56,7 @@ export default {
     onClickConfirm() {
       let omsshipShipmentInstructions = {
         shipmentInstructionsId:this.$route.params.instructionsId,
-        batchId: this.form1.batchId,
+        // batchId: this.form1.batchId,
         instructionsTotalTonnage: this.form1.instructionsTotalTonnage,
         instructionTime: sjTime(
           this.form1.instructionTime

src/views/WMS/components/billingOrder/updateBill.vue

@@ -0,0 +1,353 @@
+// 采购内转需求
+<template>
+  <div class="admin">
+    <template>
+      <div class="admin1">
+        <el-tabs v-model="activeName">
+          <el-tab-pane label="修改提货单" name="first">
+          <div class="admin2">
+            <div class="carrier from">
+                <el-form
+                    :inline="true"
+                    class="demo-form-inline"
+                    label-width="80px"
+                    >
+                    <el-form-item label="车牌号:">
+                    <el-autocomplete
+                    class="inline-input"
+                    v-model="capacityName"
+                    :fetch-suggestions="querySearchCapacity"
+                    placeholder="车牌号"
+                    :trigger-on-focus="false"
+                    @select="handleSelectCapacity"
+                    >
+                    <template slot-scope="{ item }">
+                    <div class="name">{{ item.capacityNumber }}</div>
+                    </template>
+                    </el-autocomplete>
+                    </el-form-item>
+                </el-form>
+            </div>
+            <div></div>
+            <div class="poundNo from">
+                <span class="text">运输订单号:</span>
+                <el-select v-model="orderId" placeholder="请选择" @change="changeOrderNo">
+                <el-option
+                    v-for="item in orderList"
+                    :key="item.orderId"
+                    :label="item.orderNumber" 
+                    :value="item.orderId"
+                >
+                </el-option>
+                </el-select>
+            </div>
+            <div class="material from">
+                <span class="text">物资:</span>
+                <el-select v-model="materialId" placeholder="请选择" @change="changeMaterial">
+                <el-option
+                    v-for="item in materialList"
+                    :key="item.materialId"
+                    :label="item.materialName" 
+                    :value="item.materialId"
+                >
+                </el-option>
+                </el-select>
+            </div>
+            <div class="material from"> 
+                <span class="text">物资件数:</span>
+                <el-input v-model="materialNum" ></el-input>
+            </div>
+            <div class="material from"> 
+                <span class="text">发货单位:</span>
+                <el-input v-model="shipperName" disabled></el-input>
+            </div>
+            <div class="material from"> 
+                <span class="text">收货单位:</span>
+                <el-input v-model="consigneeCompanyName" disabled></el-input>
+            </div>
+            <div class="material from"> 
+                <span class="text">收货地址:</span>
+                <el-input v-model="receiveAddressName" disabled></el-input>
+            </div>
+            <div class="material from"> 
+                <span class="text">截止日期:</span>
+                <el-input v-model="saleDateOfReceipt" disabled></el-input>
+            </div>
+        </div>
+          <div class="button_box">
+            <el-button type="primary" @click="onClickConfirm" :disabled = "disabled">确认</el-button>
+          </div>
+          </el-tab-pane>
+
+        </el-tabs>
+      </div>
+    </template>
+  </div>
+</template>
+<script>
+import { isNumber } from "@/utils/sharedJsFile";
+export default {
+  data() {
+    return {
+        orderNumber:null,
+        activeName:"first",
+        capacityName:null,    
+        stateCapacity:null,
+        materialList:[],
+        capacityId:null,
+        materialId:null,
+        disabled:false,
+        orderId:null,
+        orderList:[],
+        materialNum:null,
+        saleDateOfReceipt:null,
+        consigneeCompanyName:null,
+        receiveAddressName:null,
+        shipperName:null
+    };
+  },
+  methods: {    
+    //运力弹出层
+    handleSelectCapacity(item){
+      console.log(item)
+      this.capacityId = item.capacityId
+      this.capacityName = item.capacityNumber
+      this.axios.get("/api/v1/oms/getSteelOrderNum?capacityId=" + this.capacityId).then((res) =>{
+          if(res.data.code == "200"){
+              console.log(res.data.data)
+              this.orderList = res.data.data
+          }
+      })
+    },
+    changeOrderNo(){
+        console.log(this.orderNumber)
+        this.axios.get("/api/v1/oms/getMesToSteelDepartment?orderId=" + this.orderId).then((res) => {
+            this.materialList = res.data.data.materialMes
+            this.saleDateOfReceipt = res.data.data.saleDateOfReceipt
+            this.consigneeCompanyName = res.data.data.consigneeCompanyName
+            this.receiveAddressName = res.data.data.receiveAddressName
+            this.shipperName = res.data.data.shipperName
+        })
+    },
+    changeMaterial(){
+        console.log(this.materialId)
+        this.materialList.forEach((e) => {
+            if(e.materialId == this.materialId){
+                this.materialNum = e.materialNum
+                this.maxMaterialNum = e.materialNum
+            }
+        })
+    },
+    //以下是运力边输边查搜索
+    querySearchCapacity(queryString, cb) {
+        if(queryString.length < 3){
+            return
+        }
+        this.axios.get('/api/v1/uc/getCapacityNumber?index='+queryString).then((res)=>{
+        if(res.data.code == "200"){
+          var restaurantsCarrier = res.data.data
+          console.log(restaurantsCarrier,"restaurantsCarrier");
+          var results = queryString ? restaurantsCarrier.filter(this.createFilterCarrier(queryString)) :restaurantsCarrier;
+           // 调用 callback 返回建议列表的数据
+          cb(results);
+        }
+        })     
+      },
+    createFilterCarrier(queryString) {
+        return (restaurantsCarrier)  =>  {
+          return (restaurantsCarrier.capacityNumber.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+    //以上是承运商边输边查搜索
+    onClickConfirm(){
+        if(!isNumber(this.materialNum)){
+            this.$message.error("件数请输入数字")
+            return
+        }
+        if((parseInt(this.materialNum) > parseInt(this.maxMaterialNum))){
+            this.$message.error("修改后的数量不得大于提货单数量")
+            return
+        }
+        if(this.materialNum == 0){
+            this.$message.error("不能将物资数量修改为0")
+            return
+        }
+        let updateNumMap = {
+            orderId:this.orderId,
+            materialId:this.materialId,
+            materialNum:parseInt(this.materialNum)
+        }
+        this.axios.post("/api/v1/oms/updateMaterialMes",updateNumMap).then((res) => {
+            console.log(res)
+            if(res.data.code == '200'){
+                this.$message.success("修改物资数量成功")
+            }else{
+                this.$message.error("新增失败请联系管理员")
+            }
+        })
+
+    },
+  },
+};
+</script>
+<style lang="scss">
+.admin{
+  .admin1 {
+
+      margin-top: 40px;
+      margin-left: 40px;
+      .switch {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          margin-top: 20px;
+          color: aqua;
+      }
+      .button_box {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            width: 100%;
+            height: 100px;
+        }
+      .admin2 {    
+        margin-top: 40px; 
+        .from {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-top: 20px;
+        margin-bottom: 20px;
+        }
+        .carrier{
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            .el-form-item {
+                text-align: right;
+            }
+            .el-autocomplete{
+            width: 250px;
+            }
+        }
+        .material {
+        display: flex;
+        justify-content: center;
+        margin-top: 20px;
+        margin-right: 100px;
+        .text {
+            display: inline-block;
+            width: 170px;
+            text-align: right;
+        }
+        .el-input {
+            width: 250px;
+        }
+        }
+        .poundNo {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin-top: 20px;
+            margin-right: 100px;
+            .text {
+            display: inline-block;
+            width: 170px;
+            text-align: right;
+                  }
+            .el-input {
+            width: 250px;
+                    }
+        }  
+        .block {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin-top: 20px;
+            margin-right: 100px;
+            .el-input {
+                width: 250px;
+            }
+            .text {
+            display: inline-block;
+            width: 170px;
+            text-align: right;
+            }
+        }
+        .truckCalFirst {
+            display: flex;
+            justify-content: center;
+            margin-top: 20px;
+            margin-right: 100px;
+            .text {
+                display: inline-block;
+                width: 170px;
+                text-align: right;
+            }
+            .el-input {
+                width: 250px;
+            }
+        }
+        .truckCalSecond {
+            display: flex;
+            justify-content: center;
+            margin-top: 20px;
+            margin-right: 100px;
+            .text {
+                display: inline-block;
+                width: 170px;
+                text-align: right;
+            }
+            .el-input {
+                width: 250px;
+            }
+        }
+        .secondWeight {
+           display: flex;
+            justify-content: center;
+            align-items: center;
+            margin-top: 20px;
+            margin-right: 100px;
+            .text {
+            display: inline-block;
+            width: 170px;
+            text-align: right;
+                  }
+            .el-input {
+            width: 250px;
+                    } 
+        }
+        .firstWeight {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin-top: 20px;
+            margin-right: 100px;
+            .text {
+            display: inline-block;
+            width: 170px;
+            text-align: right;
+                  }
+            .el-input {
+            width: 250px;
+                    }
+        }
+        .netWeight {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin-top: 20px;
+            margin-right: 100px;
+            .text {
+            display: inline-block;
+            width: 170px;
+            text-align: right;
+                  }
+            .el-input {
+            width: 250px;
+                    }
+        }
+      }      
+  }
+  }
+</style>

src/views/WMS/components/steel/addSteelInbound.vue

@@ -55,6 +55,8 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      startTime:null,
+      endTime:null,
       max:null,
       disabled:false,
       //仓库名称
@@ -95,20 +97,44 @@ export default {
     },
   },
   created() {
-      
+      let strTime=this.formatDate(new Date(),"yyyy-MM-dd hh:mm:ss")
+      this.startTime= Date.parse(new Date(strTime));
+      this.endTime=new Date(this.startTime+86400000);
   },
   methods: {
+    formatDate (date, fmt) {
+        if (/(y+)/.test(fmt)) {
+          fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
+        }
+        let o = {
+          'M+': date.getMonth() + 1,
+          'd+': date.getDate(),
+          'h+': 0,
+          'm+': 0,
+          's+': 0
+      }
+      for (let k in o) {
+        if (new RegExp(`(${k})`).test(fmt)) {
+          let str = o[k] + ''
+          fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? str : this.padLeftZero(str))
+        }
+            }
+      return fmt
+    },
+    padLeftZero (str) {
+        return ('00' + str).substr(str.length)
+    },
     onclick(a) {
       if (a == 1) {
         console.log(this.input)
-        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+3+"&status="+1+"&con="+this.input
+        this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+3+"&status="+1+"&con="+this.input+"&startTime=" + sjTime(this.startTime) + "&endTime=" + sjTime(this.endTime)
       }
     },
     ondrawer(num) {
       this.drawer = true;
       this.a = num;
       if(num==1){
-          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+3+"&status="+1+"&con="+""
+          this.first.requestUrl = "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId="+3+"&status="+1+"&con="+""+"&startTime=" + sjTime(this.startTime) + "&endTime=" + sjTime(this.endTime)
       }
     },
     // 返回

src/views/WMS/components/steel/bar1_steel/bar1_steel_inboundReal.vue

@@ -14,9 +14,7 @@
         <el-option label="中班" value="2"></el-option>
         <el-option label="晚班" value="3"></el-option>
       </el-select>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+
       <!-- <el-button type="primary" class="btn" @click="onreserved">
         预留
       </el-button> -->
@@ -86,7 +84,7 @@ export default {
           });
         });
     },
-    },
+
     // 获取当前月份的最后一天
     getdaysinmonth(year,month){
       month = parseInt(month,10)+1;
@@ -197,7 +195,7 @@ export default {
       if (startTime && endTime) {
         if (startTime < endTime) {
           // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.options.requestUrl = "/api/v1/wms/getWmsInboundResults?apiId=350&warehouseId="+1+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          this.options.requestUrl = "/api/v1/wms/getWmsInboundResults?apiId=450&warehouseId="+1+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
           // this.options.requestUrl = "/api/v1/wms/getWmsInboundResults?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
           // }else{
@@ -269,6 +267,7 @@ export default {
       }
     }
   }
+}
 
 </script>
 

src/views/WMS/components/steel/steel_inbound.vue

@@ -3,11 +3,19 @@
   <div class="steel_inbound">
     <div class="sache">
       <span class="text">入库时间：</span>
-      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      <el-date-picker disabled 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 disabled v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
+      <span class="text">物资类型</span>
+      <el-autocomplete
+      class="inputStyle"
+      v-model="inputText"
+      :fetch-suggestions="querySearch"
+      placeholder="请输入内容"
+      @select="handleSelect"
+    ></el-autocomplete>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -16,7 +24,7 @@
       </el-button>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="options" >
+      <dilTable v-if="tableShow" :selectionType="selectionType"  v-bind.sync="options" >
       </dilTable>
     </div>
   </div>
@@ -28,6 +36,8 @@ import { getCookie } from '@/utils/util.js';
 export default {
   data(){
     return{
+      tableShow:false,
+      selectionType:"",
       inputText:"",
       startTime: null,
       endTime: null,
@@ -39,8 +49,55 @@ export default {
       },
     }
   },
-  
+  mounted(){
+
+    var date = new Date();
+    let dateStr=this.formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+    
+    this.startTime= Date.parse(new Date(dateStr));
+    this.endTime=new Date(this.startTime+86400000);
+
+    this.options.requestUrl= "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId="+3+"&startTime=" + sjTime(this.startTime) + "&endTime=" + sjTime(this.endTime) ;
+    this.tableShow=true;
+  },
   methods:{
+    formatDate (date, fmt) {
+        if (/(y+)/.test(fmt)) {
+          fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
+        }
+        let o = {
+          'M+': date.getMonth() + 1,
+          'd+': date.getDate(),
+          'h+': 0,
+          'm+': 0,
+          's+': 0
+      }
+      for (let k in o) {
+        if (new RegExp(`(${k})`).test(fmt)) {
+          let str = o[k] + ''
+          fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? str : this.padLeftZero(str))
+        }
+            }
+      return fmt
+    },
+    padLeftZero (str) {
+        return ('00' + str).substr(str.length)
+    },
+     querySearch(queryString, cb) {
+        var restaurants = [ 
+                            {"value":"螺纹钢"},
+                            {"value":"盘螺"},
+                            {"value":"乱尺"}
+                          ];
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+        // 调用 callback 返回建议列表的数据
+        cb(results);
+      },
+      createFilter(queryString) {
+        return (restaurant) => {
+          return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+        };
+      },
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
@@ -56,26 +113,27 @@ export default {
       }
       if (startTime && endTime) {
         if (startTime < endTime) {
-          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
           this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId="+3+"&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(); 
-          // }
+          this.options.requestQuery={
+            "materialNames":this.inputText
+          }
+          // this.selectionType="select";
         } else {
           this.startTime = null;
           this.endTime = null;
           this.$message.warning("开始时间要比结束时间早");
         }
       } else {
-        this.getRequestUrl()
+         this.$message.warning("没有选择时间段");
+        // this.getRequestUrl()
       }
     },
     selectionChange(selection) {
       this.options.mapList = selection;
     },
+    handleSelect(item) {
+        console.log(item);
+    },
     onreserved(){
       this.$router.push({
         path: "/addSteelInbound",
@@ -89,10 +147,16 @@ export default {
 .steel_inbound{
   margin-top: 30px;
   margin-left: 20px;
+   
     .sache{
       display: flex;
       margin-bottom: 10px;
       padding-right: 10px;
+       .inputStyle{
+          width: 200px;
+          margin-right: 5px;
+        margin-left: 5px;
+        }
       .text {
         text-align: left;
         line-height: 40px;

src/views/WMS/components/steel/steel_inboundReal.vue

@@ -66,6 +66,7 @@ export default {
       return days;
     },
     onclick(){
+      console.log("nihaohhh")
       let startTime = null;
       let endTime = null;
       

src/views/WMS/router/index.js

@@ -5,6 +5,7 @@ import routerBefore from '@/config/routerBefore.js'
 // 主要
 import main from '@/components/main.vue'
 // 系统配置管理
+import editBill from '../components/billingOrder/updateBill.vue'
 import intrainst_real from '../components/intrainst/intrainst_real.vue'
 import offsite_check from '../components/offsite/offsite_check.vue'
 import offsite_close from '../components/offsite/offsite_close.vue'
@@ -199,7 +200,7 @@ const constantRouterMap = [
 		{path: 'bar2_addSteelReserved', name: 'bar2_addSteelReserved', meta: {code: 'xtpzgl-yhgl'}, component: bar2_addSteelReserved},
 		{path: 'bar2_steel_inboundStatistics', name: 'bar2_steel_inboundStatistics', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_inboundStatistics},
 		{path: 'bar2_steel_outboundStatistics', name: 'bar2_steel_outboundStatistics', meta: {code: 'xtpzgl-yhgl'}, component: bar2_steel_outboundStatistics},
-
+		{path: 'editBill', name: 'editBill', meta: {code: 'xtpzgl-yhgl'}, component: editBill},
 	  ]
 	}
   ];

src/views/appoint/components/purchase/addTrainPrice.vue

@@ -1,27 +1,20 @@
 <template>
   <!-- 添加水运价格 -->
-  <div class="addShipPrice">
+  <div class="addTrainPrice">
     <page-title>新增</page-title>
-    <el-divider content-position="left">添加火运价格</el-divider>
-     <div class="form-box" style="margin-right: 10rem">
+     <div class="form-box" >
         <dil-form :formId="192" v-model="form1" ref="from1"></dil-form>
       </div>
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
-    <!-- <div class="primarybtn">
-      <el-button class="btn" @click="goback">取消</el-button>
-      <el-button type="primary" class="btn" @click="submitclick"
-        >确定</el-button
-      >
-    </div> -->
   </div>
 </template>
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime, isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -52,8 +45,6 @@ export default {
           amsContractTrainPrice
         )
         .then((res) => {
-        //   console.log(res);
-        //   console.log(this.form4);
           this.$router.go(-1);
         });
     },
@@ -65,5 +56,26 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-
+.addTrainPrice {
+  .form-box {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+    .el-form-item {
+      display: flex !important;
+      .el-form-item__label {
+        width: 170px !important;
+      }
+      .el-input {
+        width: 210px !important;
+      }
+    }
+  }
+  .button-box {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}
 </style>

src/views/appoint/components/purchase/shipPrice.vue

@@ -103,6 +103,9 @@ export default {
 .homeworkPath {
   .top {
     padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 250px;
+    }
   }
 }
 </style>

src/views/appoint/components/purchase/trainPrice.vue

@@ -35,6 +35,7 @@ export default {
     return {
       restaurants: [],
       state: "",
+      input:"",
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/ams/getTrainPriceList?apiId=116",
@@ -57,18 +58,6 @@ export default {
     click(priceId) {
       this.$router.push("/updateTrainPrice/" + priceId);
     },
-    // deleteclick(scope) {
-    //   let pathId = scope;
-    //   this.axios
-    //     .post("/api/v1/tms/operationPath/operationPathDelete?pathId=" + pathId)
-    //     .then((res) => {
-    //       this.$message({
-    //         message: "删除成功",
-    //         type: "success",
-    //       });
-    //       this.$router.go(0);
-    //     });
-    // },
     deleteclick(scope) {
       let priceId = scope;
       this.$confirm("是否删除", "提示", {
@@ -104,6 +93,9 @@ export default {
 .homeworkPath {
   .top {
     padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 250px;
+    }
   }
 }
 </style>

src/views/appoint/components/purchase/updateTrainPrice.vue

@@ -1,19 +1,10 @@
 <template>
   <!-- 修改水运价格信息 -->
-  <div id="contractDetails">
+  <div class="addTrainPrice">
     <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">修改火运价格信息</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
       <div class="form-box">
-        <div class="form-one">
           <dil-form :formId="192" v-model="form1"></dil-form>
-        </div>
       </div>
-    </div>
-
     <div class="button-box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
@@ -23,7 +14,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime, isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
  data(){
@@ -42,9 +33,7 @@ export default {
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
-            // console.log(e);
-            // console.log(this.form1);
-            // console.log(this.$route.params.loadingId);
+          
           });
         });
     },
@@ -73,14 +62,35 @@ export default {
           amsContractTrainPrice
         )
         .then((res) => {
-          console.log(res);
-          console.log(this.form1);
-          this.$router.go(-1);
+          if(res.data.code == 200){
+            this.$router.go(-1);
+          }
         });
     },
   },
 };
 </script>
 <style lang="scss" scoped>
-
+  .addTrainPrice {
+  .form-box {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+    .el-form-item {
+      display: flex !important;
+      .el-form-item__label {
+        width: 170px !important;
+      }
+      .el-input {
+        width: 210px !important;
+      }
+    }
+  }
+  .button-box {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}
 </style>

src/views/appoint/components/ship/modifyDeliveryAttroney.vue

@@ -4,7 +4,7 @@
     <page-title>返回</page-title>
     <div class="form">
       <div class="form_box">
-          <dil-form :formId="228" v-model="form1"></dil-form>
+          <dil-form :formId="113" v-model="form1"></dil-form>
       </div>        
     </div>
     <!-- 确定和取消 -->
@@ -17,6 +17,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
+import { sjTime } from '../../../ADMINISTRATORS/app';
 export default {
   components: { PageTitle },
     data(){
@@ -44,33 +45,17 @@ export default {
     },
      // 确认
     onClickConfirm() {
-      let mes = {
-        resultId: this.$route.params.resultId,
-        batchId: this.form1.batchId,
+      let AmsshipDeliveryAttorney = {
+        resultId: this.$route.params.attorneyId,
         portId: this.form1.portId,
-        resultMaterialNumber: this.form1.resultMaterialNumber
+        attorneyContactTelephone:this.form1.attorneyContactTelephone,
+        attorenyPickupIdcard:this.form1.attorenyPickupIdcard,
+        attorneyPickupContactPerson:this.form1.attorneyPickupContactPerson,
+        downSwimPortId:this.form1.downSwimPortId,
+        attorneyTime:sjTime(this.form1.attorneyTime),
       };
-      function isNumber() {
-        var value = mes.resultMaterialNumber;
-        //验证是否为数字
-        var patrn = /^(-)?\d+(\.\d+)?$/;
-        if (patrn.exec(value) == null || value == "") {
-          return false;
-        } else {
-          return true;
-        }
-      }
-      var val = this.value;
-      if (
-        mes.batchId==null||
-        mes.portId==null||
-        mes.resultMaterialNumber==null
-      ) this.$message.error("存在空值！");
-      else
-      if (!isNumber(val)) this.$message.error("物资件数必须是数字");
-      else
       this.axios
-        .post("/api/v1/tms/editDeliveryAttroney" , AmsshipDeliveryAttorney
+        .post("/api/v1/tms/editDeliveryAttroney",AmsshipDeliveryAttorney
         )
         .then(() => {
           this.$message({

src/views/appoint/components/ship/modifyDeliveryNotice.vue

@@ -17,6 +17,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
     data(){
@@ -36,7 +37,7 @@ export default {
           res.data.data.forEach((e) => {
             this.form1 = e;
             console.log(e);
-            console.log(this.form1);
+            console.log("aaa" +this.form1);
             console.log(this.$route.params.pathId);
           });
           
@@ -88,7 +89,7 @@ export default {
       // else
       // if (!isNumber(val)) this.$message.error("联系电话必须是数字！");
       // else
-      
+      console.log("AmsshipDeliveryNotice",AmsshipDeliveryNotice);
       this.axios
         .post("/api/v1/tms/editDeliveryNotice" ,AmsshipDeliveryNotice
         )

src/views/inward/components/inwardFactory/timeTaskResult.vue

@@ -23,7 +23,7 @@
                 <template slot-scope="scope">
                     <div class="step">
                         <el-button
-                        @click="getStepsList(scope.row)"
+                        @click="detailclick1(scope.row)"
                         type="text"
                         size="small"
                         >运输详情</el-button>
@@ -33,14 +33,34 @@
                   </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>
         </div>
+        
         <!-- 运输进程详情 -->
-        <el-drawer
+        <!-- <el-drawer
             :visible.sync="drawer"
-            :direction="direction">
+            :direction="direction"> -->
             <!-- 步骤条显示 -->
-            <div style="height: 200px;content-align:center" >
+            <!-- <div style="height: 200px;content-align:center" >
                 <el-table
                 :data="stepList"
                 style="width: 100%">
@@ -56,7 +76,7 @@
                 </el-table-column>
                 </el-table>
             </div>
-        </el-drawer>
+        </el-drawer> -->
     </div>
 </template>
 <script>
@@ -70,6 +90,19 @@ export default {
                 // 表格请求数据的地址
                 requestUrl: "",
             },
+            tableHead: [
+                {
+                prop: "linkName",
+                label: "计时状态",
+                width: 150,
+                },
+                {
+                prop: "pointDate",
+                label: "时间",
+                width: 150,
+                }
+            ],
+            tableData1: [],
             tableData: [],
             startTime: null,
             endTime: null,
@@ -91,6 +124,41 @@ export default {
         }
     },
     methods:{
+        // -------查看物资详情(已拒绝)
+        detailclick1(row) {
+        // 记录重复点击次数
+        if (this.oldRow1 === row) {
+            this.oldRowCount1 += 1;
+        }
+        this.orderId = row.orderId
+        let map = {
+            orderId : this.orderId
+        }
+        // 切换当前详情表
+        this.$refs.excelDom.toggleRowExpansion(row);
+        // 打开前关闭上一个详情表
+        if (this.oldRow1 != "") {
+            if (this.oldRow1 != row) {
+            if (this.oldRowCount1 % 2 === 1) {
+                this.$refs.excelDom.toggleRowExpansion(this.oldRow1);
+            } else {
+                this.oldRowCount1 = 1;
+            }
+            } else {
+            this.oldRow1 = null;
+            return;
+            }
+        }
+        // 重置上一个点击对象
+        this.oldRow1 = row;
+        // 根据销售订单物资中间表id查询物资信息
+        this.axios
+            .post("/api/v1/oms/getOrderResult?orderId=",map)
+            .then((res) => {
+            console.log("res",res)
+            this.tableData1 = res.data;
+            });
+        },
         getStepsList(row){
             console.log(row.orderId)
             this.orderId = row.orderId

src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -333,6 +333,12 @@ export default {
         }, {
           value: '烧结矿',
           label: '烧结矿'
+        },{
+          value: '打堆、装车',
+          label: '打堆、装车'
+        },{
+          value: '回收废旧物资',
+          label: '回收废旧物资'
         }],
         installremark: '',
       options: [],

src/views/sale/app.html

@@ -17,5 +17,6 @@
   </head>
   <body>
     <div id="app"></div>
+    <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=自己申请的key&plugin=AMap.CitySearch"></script>
   </body>
 </html>

src/views/sale/app.js

@@ -17,8 +17,6 @@ import apollo from '@/config/apolloConfig.js'
 
 import Print from 'vue-print-nb';
 Vue.use(Print);
-
-
 import 'xe-utils' 
 import VXETable from 'vxe-table'
 import 'vxe-table/lib/style.css'

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

@@ -0,0 +1,618 @@
+<template>
+    <div class="container">
+        <div id="amap-container"></div>
+         <div class="controller">
+             <div class="in_transit_information">
+                <span class="item_details">车牌号:</span> <el-input style="width: 100px;" class="inputStyle" v-model="carNumber"> </el-input>
+                
+             </div>
+             <div class="in_transit_information2">
+                <span class="item_details">时间段:</span>
+                <el-date-picker
+                class="date_picker_style"
+                v-model="time"
+                @change="changeTime"
+                type="datetimerange"
+                format="yyyy-MM-dd HH:mm:ss"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期">
+                </el-date-picker>
+                <el-button type="primary" class="searchstyle" @click="initData">查询</el-button>
+             </div>
+            
+             <div class="driving_information">  
+                <span class="item_details">时间:{{runRoute.gtm}}</span>
+                <br/>
+                <span class="item_details">车速:{{runRoute.spd}}千米/小时</span>
+                <br/>
+                <!--控制条-->
+               
+             </div>
+              <div class="map-control" v-show="isActual">
+                    <!--播放暂停按钮-->
+                    进度:
+                  <Icon v-if="!isPlay" class="play-icon play"  type="ios-play" @click="isPlay=true;play();navgControl(playIcon)"/>
+                    <Icon v-else class="play-icon pause" type="ios-pause" @click="isPlay=false;stop();navgControl('pause')"/>
+                    <Icon class="play-icon quickly"  type="ios-play" @click="addIndex()"/>
+                    <div class="mySlider"><Slider class="map-slider" v-model="sliderVal" :tip-format="hideFormat" :step="0.0001"></Slider></div>
+
+                     <!--播放暂停按钮-->
+                    
+                    <!-- <Icon class="play-icon quickly"  type="ios-play" @click="addIndexSpeed()"/> -->
+                    <!-- <Slider class="map-slider" v-model="speedVal" :tip-format="speedFormat" :step="0.0001"></Slider> -->
+                    <div class="mySlider2"><el-slider
+                    v-model="speedVal"
+                    show-input>
+                    </el-slider></div>
+            </div>
+            <div class="map-control" v-show="isActual">
+                   
+                    
+            </div>
+         </div>
+    
+    </div>
+</template>
+
+<script>
+import AMapLoader from '@amap/amap-jsapi-loader';
+import { shallowRef } from '@vue/reactivity'
+import { sjTime } from "@/utils/sharedJsFile";
+import { Loading } from 'element-ui';
+import { lazyAMapApiLoaderInstance } from 'vue-amap';
+import Slider from './slider.vue'
+Vue.use(Slider)
+import AMapJS from "amap-js";
+import Vue from 'vue';
+export default {
+    name: "PathView",
+
+    setup(){
+        const map = shallowRef(null);
+        return{
+            map,
+        }
+    },
+     watch:{
+        speedVal:{
+            deep: true,
+            handler(val, oldVal) {
+                let that=this;
+                 if(that.pathNavigator!=null){
+                        that.pathNavigator.setSpeed(100*val)
+                }
+            }
+        }
+    },
+    data() {
+        return {
+            startTime:'',
+            endTime:'',
+            time:[],
+            carNumber:"",
+            orderNumber:'',
+            ///che
+            isTimesChoose:false,
+            isActual:true,
+            isPlay:true,
+            passedTime:"12:02:10",
+            sliderVal:0,
+            speedVal:10,
+            speed:1000,
+            times:1,
+           
+            totalTime:"11",
+            speedList:["1倍数","2倍数","3倍数"],
+            //已行驶轨迹
+            runRoute:
+            {
+                agl: "44",
+                gtm: "2022年03月09日 16:47:24",
+                hgt: "13",
+                lat: "32.906411535084985",
+                lon: "115.76177868692135",
+                mil: "429409.2",
+                spd: "17.0"
+            },
+            point:"",
+            pointNext:"",
+            loading : null,
+            navgtrSpeed:1,
+            //地图中心位置
+            centerPoint:{
+                    pointLat:"",
+                    pointLon:""
+            },
+            //自定义窗体信息
+            ctmarkes:{
+                lat:"33.015888071433764",
+                lon : "115.96995235868168",
+                title:"豫SE8888",
+                details:"安徽省阜阳市颍东区阜阳舜岳水泥公司,西北方向,155.1米"
+            },
+            //运输详情
+            transportDetail:{
+                //车牌号
+                capacityNumber:'',
+                //规划路线
+                estimateRoute:[
+                    {
+                        lat:"33.015888071433764",
+                        lon : "115.96995235868168"
+                    }
+                ],
+                //规划线路
+                estimatePath:[
+                    [
+                        114.03046212985384,
+                        32.49786984660489
+                    ],
+                    
+                ],
+                //已行驶轨迹
+                runRoute:[
+                      {
+                        agl: "44",
+                        gtm: "2022年03月09日 16:47:24",
+                        hgt: "13",
+                        lat: "32.906411535084985",
+                        lon: "115.76177868692135",
+                        mil: "429409.2",
+                        spd: "17.0"
+                    },
+                ],
+                runPath: [
+                    [
+                        114.03922119568348,
+                        32.49746162481379
+                    ],
+                ],
+                //当前位置
+                currentPointName:"中国达州市通川区",
+                //当前位置经纬度
+                currentPoint:{
+                    lat:"",
+                    lon:""
+                },
+                //起点位置
+                startPointName:"中国达州市通川区", 
+                //起点位置经纬度
+                startPoint:{
+                    lon:"114.03922119568348",
+                    lat:"32.49746162481379"
+                },
+                //终点位置
+                endPointName:"中国成都萧山",
+                //终点位置经纬度   
+                endPoint:{
+                    lon:"115.96995737755431",
+                    lat:"33.01595479752097"
+                },
+                //自定义标记
+                content:[],
+                //异常位置
+                abnormalLocation:[],
+            
+            },
+            listPath:[
+                
+            ],
+            //组件
+            pathSimplifierIns:{},
+            pathNavigator:{}
+        };
+    },
+    created(){
+        let that=this;
+      
+    },
+    mounted() {
+        
+    },
+    methods: {
+         formatDate (date, fmt) {
+        if (/(y+)/.test(fmt)) {
+          fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
+        }
+        let o = {
+          'M+': date.getMonth() + 1,
+          'd+': date.getDate(),
+         "h+": date.getHours(),
+        "m+": date.getMinutes(),
+        "s+": date.getSeconds(),
+      }
+      for (let k in o) {
+        if (new RegExp(`(${k})`).test(fmt)) {
+          let str = o[k] + ''
+          fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? str : this.padLeftZero(str))
+        }
+            }
+      return fmt
+    },
+    padLeftZero (str) {
+        return ('00' + str).substr(str.length)
+    },
+        geocoder(){
+            AMap.plugin('AMap.Geocoder', function() {
+            var geocoder = new AMap.Geocoder({
+                // city 指定进行编码查询的城市，支持传入城市名、adcode 和 citycode
+                city: '全球'
+            })
+            
+            var lnglat = [116.396574, 39.992706]
+            console.log("fsdaf")
+            geocoder.getAddress(lnglat, function(status, result) {
+                console.log(result)
+                if (status === 'complete' && result.info === 'OK') {
+                    // result为对应的地理位置详细信息
+                    console.log(result)
+                }
+            })
+            })
+        },
+        play(){
+            let that =this;
+            that.pathNavigator.resume();
+        },
+        stop(){
+            let that =this;
+            that.pathNavigator.pause();
+            this.geocoder()
+        },
+        addIndexSpeed(){
+
+        },
+        addIndex(){
+            console.log("1123")
+
+            let that =this;
+            let increment=(that.listPath[0].runPath.length*0.1)
+            that.pathNavigator.start(((that.point+increment)%that.listPath[0].runPath.length))
+        },
+        ///che
+        navgControl(){
+
+        },
+        speedFormat(value){
+             let that=this;
+             that.speedVal=value
+           
+            if(that.pathNavigator!=null){
+               
+                that.pathNavigator.setSpeed(1000*value)
+            }
+           
+        },
+        hideFormat(value){
+            let that=this;
+            that.sliderVal=value;
+        },
+        initData(orderNumber){
+            let that=this;
+            that.listPath=[];
+            if(that.carNumber==""){
+                this.$message.error('车牌号不能为空！');
+                return;
+            }
+            if(that.time==[]){
+                 this.$message.error('请选择时间');
+            }
+             that.axios.post("/api/v1/otms/fullPathVisualizationByCarNumber",
+             {
+                "capacityNumber":that.carNumber,
+                "startTime":that.formatDate(that.time[0],"yyyy-MM-dd hh:mm:ss"),
+                "endTime":that.formatDate(that.time[1],"yyyy-MM-dd hh:mm:ss"),
+            }
+             ).then((res) => {
+                 if(res.data.startAndEndRoutes!=''){
+                     that.listPath=res.data.startAndEndRoutes
+                    that.initMap();
+                 }else{
+                     this.$message.error('车辆没有开启GPS');
+                 }
+            });
+        },
+        endline(){
+            let that=this;
+            that.initPolyline(that.listPath[0].estimatePath,"#FF0000");
+        },
+        //创建起点终点当前点
+        threeMarker(){
+            let that=this;
+            that.listPath.forEach((element,index) => {
+                //开始标记点
+                if(element.startPoint.lon!=''&&element.startPoint.lat!=''){
+                    that.initMarkes(20,35,require('@/assets/img/start.png'),element.startPoint.lon,element.startPoint.lat,'起点');
+                }
+                //结束标记点
+                console.log(element.endPoint,"element.endPoint")
+                if(element.endPoint!={}&&element.endPoint!=''&&element.endPoint!=null){
+                    console.log("1111")
+                    that.initMarkes(20,35,require('@/assets/img/end.png'),element.endPoint.lon,element.endPoint.lat,'终点');
+                }else{
+                     console.log(element)
+                    that.initMarkes(20,35,require('@/assets/img/end.png'),element.runRoute[element.runRoute.length-1].lon,element.runRoute[element.runRoute.length-1].lat,'终点');
+                }
+            });
+           
+        },
+        //初始化地图
+        initMap(){
+            lazyAMapApiLoaderInstance.load().then(() => {
+                let that=this;
+                that.map = new AMap.Map("amap-container",{  //设置地图容器id
+                    viewMode:"2D",    //是否为2D地图模式
+                    zoom:10,           //初始化地图级别
+                    center:[105.602725,37.076636], //初始化地图中心点位置
+                });
+                that.initPathSimplifier();
+                that.threeMarker();
+                console.log("that.listPath[0]",that.listPath)
+                that.initCustomMarkes(that.carNumber+"("+that.listPath[0].miled+")",that.listPath[0].currentPointName,that.listPath[0].currentPoint.lon,that.listPath[0].currentPoint.lat)
+                that.endline();
+            });
+        },
+        initCustomMarkes(title,details,lon,lat){
+             let that=this;
+            //自定义窗体内容
+            var content = [
+                "<div  style='top:1px;width: 180px; background-color: rgba(0, 0, 0, 1);' ><font color='white'>"+title+"</font>",
+                "<div style='background-color:rgba(255, 255, 255, 0.5);'><font color='white'>"+details+"</font></div></div>"
+            ];
+            // 创建 infoWindow 实例	
+            var infoWindow = new AMap.InfoWindow({
+                content: content.join("<br>")  //传入 dom 对象，或者 html 字符串
+            });
+            // 打开信息窗体
+            infoWindow.open(that.map,[lon,lat]);
+        },
+        initPolyline(path,color){
+            let that=this;
+             //预计轨迹
+            var endLine = new AMap.Polyline({
+                map:that.map,
+                path: path,
+                isOutline: true,
+                outlineColor: color,
+                borderWeight: 0,
+                strokeColor: "#FF0000", 
+                strokeOpacity: 1,
+                strokeWeight: 5,
+                // 折线样式还支持 'dashed'
+                strokeStyle: "solid",
+                // strokeStyle是dashed时有效
+                strokeDasharray: [10, 5],
+                lineJoin: 'round',
+                lineCap: 'round',
+                zIndex: 50,
+            })
+            that.map.setFitView([[ endLine ]])
+        },
+        //创建简单的标记
+        initMarkes(weight,height,image,lon,lat,title){
+            let that=this;
+            //图标标记点
+            let pointicon = new AMap.Icon({
+                size: new AMap.Size(weight, height), // 图标尺寸
+                image: image, // Icon的图像
+                imageOffset: new AMap.Pixel(0,0), // 图像相对展示区域的偏移量，适于雪碧图等
+                imageSize: new AMap.Size(weight, height) // 根据所设置的大小拉伸或压缩图片
+            });
+            // 创建一个 Marker 实例：
+            var pointmarker = new AMap.Marker({
+                position: new AMap.LngLat(lon, lat),   // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+                icon: pointicon, 
+                title: title
+            });
+            // 将创建的点标记添加到已有的地图实例：
+            that.map.add(pointmarker);
+        },
+        //创建轨迹和巡航器
+        initPathSimplifier() {
+            let that=this;
+            // ...你的操作
+            new AMapUI.load(['ui/misc/PathSimplifier'], (PathSimplifier) => {
+                if (!PathSimplifier.supportCanvas) {
+                    alert('当前环境不支持 Canvas！')
+                    return
+                }
+                //创建轨迹和巡航器
+                // 创建组件实例
+                that.pathSimplifierIns = new PathSimplifier({
+                    map: that.map,
+                    zIndex: 100, // 图层叠加顺序
+                    data: that.listPath, // 巡航路径
+                    // 获取巡航路径中的路径坐标数组
+                    getPath: (pathData, pathIndex) => {
+                        return pathData.runPath;
+                    },
+                    //鼠标悬浮停时显示消息
+                    getHoverTitle: function(pathData, pathIndex, pointIndex) {
+                        //返回鼠标悬停时显示的信息
+                        if (pointIndex >= 0) {
+                            if(pathData.runRoute[pointIndex].gtm!=='undefined'){
+                                 //鼠标悬停在某个轨迹节点上
+                                return pathData.runRoute[pointIndex].gtm + '，速度'+ pathData.runRoute[pointIndex].spd+'千米/小时，点:' + pointIndex + '/' + pathData.runPath.length;
+                            }
+                        }
+                    },
+                    //设置轨迹样式
+                    renderOptions: {
+                        //轨迹线的样式
+                        pathLineStyle: {
+                            strokeStyle: 'black',
+                            lineWidth: 6,
+                            dirArrowStyle: true
+                        }
+                    }
+                })
+                // 创建巡航器
+                that.pathNavigator = that.pathSimplifierIns.createPathNavigator(0, {
+                    loop: true, // 是否循环
+                    speed: that.speed ,// 速度(km/h)
+                    pathNavigatorStyle: {
+                        width: 20,
+                        height: 40,
+                        content:PathSimplifier.Render.Canvas.getImageContent( require('@/assets/img/smallcar.png'), onload, onerror),
+                        strokeStyle: null,
+                        fillStyle: null
+                    }
+                })
+                //开启巡航
+                that.pathNavigator.start()
+                
+                //开始事件
+                that.pathNavigator.on("start resume", function() {
+                    // that.navgtr._startTime = Date.now();
+                    // that.navgtr._startDist = this.getMovedDistance();
+                });
+                //暂停
+                that.pathNavigator.on("stop pause", function() {
+                    // that.navgtr._movedTime = Date.now() - that.navgtr._startTime;
+                    // that.navgtr._movedDist = this.getMovedDistance() - that.navgtr._startDist;
+                });
+                that.pathNavigator.on('move', function (data,value) {
+                    that.updateLable(value)
+                });
+            })
+        },
+        updateLable(value){
+            let that=this;
+            that.point=value.dataItem.pointIndex;
+            that.runRoute=value.dataItem.pathData.runRoute[that.point];
+            that.sliderVal=(value.dataItem.pointIndex/value.dataItem.pathData.runRoute.length)*100;
+        },
+        changeSpeed(value){
+            // console.log(value)
+            // let that=this;
+            // that.times=value;
+            
+        },
+        playIcon(){
+           
+        },
+        changeTime(){
+            let that=this;
+            console.log((that.time[1]-that.time[0])-(86400000*3))
+            if((that.time[1]-that.time[0])>86400000*3){
+                 this.$message.error('时间查询范围不能超过3天');
+                 that.time=[];
+            }
+        }
+                  
+    }
+};
+</script>
+<style>
+.inputStyle{
+    position: absolute;
+    width: 200px;
+    left: 30px;
+}
+
+.controller{
+    width: 100%; height: 50px;
+    background: white;
+   position: absolute;z-index:99;top:0;left:0;
+   
+}
+.in_transit_information{
+   
+    width: 200px;
+    float: left;
+     height: 40px;
+}
+.in_transit_information2 {
+   
+    height: 40px;
+    float: left;
+    width: 580px;
+}
+.container{
+    width: 100%;
+	height: 100%;
+    
+}
+.date_picker_style{
+    position: relative;
+    left: 40px;
+}
+.item_details {
+    position: relative;
+    left: 30px;
+    top: 5px;
+    height: 0px;
+}
+#amap-container {
+    position: relative;
+	width: 100%;
+	height: 100%;
+	overflow: hidden;
+	margin: 0;
+	font-family: "微软雅黑";
+}
+
+
+/* 进度条 */
+.mySlider {
+
+    width: 150px;
+    height: 20px;
+    display: inline-block;
+    position: relative;
+    left: 32px;
+}
+/* 进度条 */
+.mySlider2 {
+
+    width: 400px;
+    height: 20px;
+    display: inline-block;
+    position: relative;
+    left: 32px;
+}
+.play {
+    position: relative;
+    left: 28px;
+}
+.quickly
+{
+    float: right;
+    position: relative;
+    left: -20px;
+    top: 10px;
+}
+.pause {
+    position: relative;
+    left: 28px;
+}
+.passed-time{
+    position: relative;
+    left: 5px;
+}
+.end-time{
+    position: relative;
+    left: 5px;
+}
+.map-times {
+    position: relative;
+    width: 40px;
+}
+.searchstyle{
+     position: relative;
+    left: 5px;
+}
+.map-control{
+     float: left;
+     width: 270px;
+}
+.driving_information {
+    height: 40px;
+    width: 240px;
+     float: left;
+}
+
+
+
+</style>

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

@@ -1,64 +1,53 @@
 <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>
-     <label class="el-form-item__label" style="width: auto;">产品分类</label>
-      <el-input v-model="inputValue" placeholder="请输入内容"></el-input>
-  </el-form-item>
-  <el-form-item>
-      <label class="el-form-item__label" style="width: auto;">车牌号</label>
-      <el-input v-model="capacityNumber1" placeholder="请输入内容"></el-input>
-  </el-form-item>
-  <el-form-item>
-      <label class="el-form-item__label" style="width: auto;">收货单位</label>
-      <el-input v-model="consigneeCompanyName1" placeholder="请输入内容"></el-input>
-  </el-form-item> 
-  <el-form-item>
-      <label class="el-form-item__label" style="width: auto;">承运单位</label>
-      <el-input v-model="carrierName" placeholder="请输入内容"></el-input>
-  </el-form-item> 
-   <el-form-item>
-     <label class="el-form-item__label" style="width: auto;">门岗名称</label>
-     <el-input v-model="gatepostName" placeholder="请输入内容"></el-input>
-  </el-form-item> 
-  <el-form-item>
-    <label class="el-form-item__label" style="width: auto;">报警类型</label>
-      <el-select v-model="exceptionType" placeholder="报警类型">
-        <el-option
-          v-for="item in exceptionTypes"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value">
-        </el-option>
-      </el-select>
-      <!-- <label class="el-form-item__label" style="width: auto;">报警类型</label>
-       <el-autocomplete
-            popper-class="my-autocomplete"
-            v-model="exceptionType"
-            :fetch-suggestions="querySearch3"
-            placeholder="请输入内容" 
-          >
-            <i class="el-icon-edit el-input__icon" slot="suffix"> </i>
-          </el-autocomplete> -->
-  </el-form-item> 
-  <el-form-item>
-    <el-button type="primary" @click="onSearch"><i class="el-icon-search"></i>查询</el-button>
-    <el-button type="primary" @click="exportData">导出</el-button>
-  </el-form-item>
-</el-form>
-  
+      <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>
+        <label class="el-form-item__label" style="width: auto;">产品分类</label>
+          <el-input v-model="inputValue" placeholder="请输入内容"></el-input>
+      </el-form-item>
+      <el-form-item>
+          <label class="el-form-item__label" style="width: auto;">车牌号</label>
+          <el-input v-model="capacityNumber1" placeholder="请输入内容"></el-input>
+      </el-form-item>
+      <el-form-item>
+          <label class="el-form-item__label" style="width: auto;">收货单位</label>
+          <el-input v-model="consigneeCompanyName1" placeholder="请输入内容"></el-input>
+      </el-form-item> 
+      <el-form-item>
+          <label class="el-form-item__label" style="width: auto;">承运单位</label>
+          <el-input v-model="carrierName" placeholder="请输入内容"></el-input>
+      </el-form-item> 
+      <el-form-item>
+        <label class="el-form-item__label" style="width: auto;">门岗名称</label>
+        <el-input v-model="gatepostName" placeholder="请输入内容"></el-input>
+      </el-form-item> 
+      <el-form-item>
+        <label class="el-form-item__label" style="width: auto;">报警类型</label>
+          <el-select v-model="exceptionType" placeholder="报警类型">
+            <el-option
+              v-for="item in exceptionTypes"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+      </el-form-item> 
+      <el-form-item>
+        <el-button type="primary" @click="onSearch"><i class="el-icon-search"></i>查询</el-button>
+        <el-button type="primary" @click="exportData">导出</el-button>
+      </el-form-item>
+    </el-form>
     <!-- 执行中 -->
 <el-tabs v-model="activeName" >
     <el-tab-pane label="执行中" name="first">
@@ -78,7 +67,7 @@
          <el-table-column fixed="right" label="操作" width="220">
         <template slot-scope="scope">
           <el-button @click="historyclick(scope.row)" type="text" size="small" style="font-size: 17px">历史轨迹</el-button>
-          <el-button @click="allDistanceclick(scope.row.orderNumber)" type="text" size="small" style="font-size: 17px">总距离</el-button>
+          <!-- <el-button @click="allDistanceclick(scope.row.orderNumber)" type="text" size="small" style="font-size: 17px">总距离</el-button> -->
         </template>
       </el-table-column>
         </dilTable>
@@ -100,7 +89,6 @@
     <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>
@@ -108,42 +96,31 @@
     <!-- <div style="height: 100%">
       <vxe-modal width="1237" height="731" v-model="value6" show-zoom resize>
             <template #default>
-              
               <inTransitOrderMileage v-bind.sync="mileOption"></inTransitOrderMileage>
             </template>
           </vxe-modal>
-    </div>
-     <div style="height: 100%">
-      <vxe-modal width="1237" height="731" v-model="value5" show-zoom resize>
-            <template #default>
-              
-              <inTransitAlarm v-bind.sync="alarmOption"></inTransitAlarm>
-            </template>
-          </vxe-modal>
     </div> -->
-         
+    <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";
-
-//PathView组件注册
-// import PageTitle from "@/offSiteTransportation/mapTest.vue";
 import PathView from "./mapTest.vue"
-// import InTransitOrderMileage from "@/views/TMS/tms-offsite/inTransitOrderMileage.vue"
-// import inTransitAlarm from "@/views/TMS/tms-offsite/inTransitAlarm.vue"
 export default {
   name: "inTransit",
-    components: { 
-      PathView,
-      // InTransitOrderMileage,
-      // inTransitAlarm
+  components: { 
+    PathView,
   },
   data() {
     return {
-      
       exceptionTypes:[{
           value: '全部类型',
           label: '全部类型'
@@ -212,6 +189,9 @@ export default {
         // 表格请求数据的地址
         requestUrl: "/api/v1/otms/getFinishTruckOrderInfo?apiId=468",
       },
+      optionAlarm:{
+        requestUrl: "",
+      },
       pathOption:{
            orderNumber:'',
         capacityNumber:'',
@@ -226,7 +206,7 @@ export default {
       },
        option3: {
         // 表格请求数据的地址
-        // requestUrl: "/api/v1/tms/getHaveAbnormalTruckOrderInfo?apiId=160",
+        requestUrl: "/api/v1/otms/getHaveAbnormalTruckOrderInfo?apiId=468",
       }
     };
   },
@@ -374,17 +354,17 @@ 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;
-      // this.$router.push("/offsite/pathView?orderNumber="+row.orderNumber+"&capacityNumber="+row.capacityNumber);
+
     },
     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;
-      //this.$router.push("/offsite/pathView?orderNumber="+row.orderNumber+"&capacityNumber="+row.capacityNumber);
     },
     allDistanceclick(orderNumber){
       //this.$router.push("/offsite/inTransitOrderMileage?orderNumber="+orderNumber);
@@ -393,8 +373,7 @@ export default {
       this.value6=true;
     },
     inTransitAlarmclick(orderNumber){
-      // this.$router.push("/offsite/inTransitAlarm?orderNumber="+orderNumber);
-      this.alarmOption.orderNumber=orderNumber;
+      this.optionAlarm.requestUrl="/api/v1/otms/getTransportAbnormalInfo?apiId=472&orderNumbers="+orderNumber;
       this.value5=true;
     },
     },

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

@@ -0,0 +1,73 @@
+<template>
+  <!-- 是否开启运输预警开关 -->
+  
+  <div class="addWagonLoad">
+    <page-title>请选择需要开启的预警物料</page-title>
+    <el-divider content-position="left">请选择报警类型</el-divider>
+    <div style="width:100%;text-align:center;">
+            <el-radio v-model="radio" label="0">关闭</el-radio>
+            <el-radio v-model="radio" label="1">异常线路预警</el-radio>
+            <el-radio v-model="radio" label="2">异常线路预警+停车</el-radio>
+            <el-radio v-model="radio" label="3">异常线路预警+离线</el-radio>
+            <el-radio v-model="radio" label="4">异常线路预警+停车+离线</el-radio>
+    </div>
+    <div class="button-box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      checkList:[],
+      checktype:[],
+      form1: {},
+      radio:'0',
+      value: undefined,
+    };
+  },
+  created(){
+     this.switchEcho();
+  },
+  mounted() {},
+  methods: {
+    
+    // 确定
+    makeSure() {
+
+      this.axios.post(
+          "/api/v1/otms/inTransitWarn?warnSwitch="+1+"&radio="+this.radio,
+        )
+        .then((res) => {
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+    switchEcho(){
+      let that=this;
+       that.axios.post("/api/v1/otms/selectWarnSwitch").then((res) => {
+                if(res.data.status=="succeed"){
+                  let arry=res.data.data.switch;
+                  this.radio=res.data.data.type;
+                  console.log(this.radio)
+                }
+       });
+     
+    }
+  },
+};
+</script>
+<style lang='scss' scoped>
+</style>

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

@@ -241,11 +241,12 @@ export default {
         initData(orderNumber){
             let that=this;
              that.axios.post("/api/v1/otms/fullPath?orderNumber="+orderNumber).then((res) => {
-                that.listPath=res.data.startAndEndRoutes
-                // res.startAndEndRoutes.forEach((item,index)=>{
-                //     that.transportDetail.estimateRoute=item.estimateRoute;
-                     that.initMap();
-                // });
+                 if(res.data.startAndEndRoutes!='0'){
+                     that.listPath=res.data.startAndEndRoutes
+                    that.initMap();
+                 }else{
+                     this.$message.error('车辆没有开启GPS');
+                 }
             });
         },
         endline(){

src/views/sale/router/index.js

@@ -102,7 +102,9 @@ import bmsTruckStatement from '../components/transportFreight/saleTruckSettlemen
 import getBmsTruckStatementOrder from '../components/transportFreight/saleTruckSettlement/getBmsTruckStatementOrder.vue'
 import getTransportResult from '../components/transportFreight/saleTruckSettlement/getTransportResult.vue'
 import mapTest from '../components/offSiteTransportation/mapTest.vue'
-import inTransit from '../components/offSiteTransportation/inTransit.vue'
+import checkGPS from '../components/offSiteTransportation/checkGPS.vue'
+import inTransit from '../components/offSiteTransportation/inTransit.vue'  
+import inTransitWarn from '../components/offSiteTransportation/inTransitWarn.vue'
 //测试数据
 
 Vue.use(Router)
@@ -210,7 +212,9 @@ const constantRouterMap = [
 		{path: 'bmsTruckStatement', name: 'bmsTruckStatement', meta: {code: 'xtpzgl-yhgl'}, component: bmsTruckStatement},
 		{path: 'getBmsTruckStatementOrder/:statementId', name: 'getBmsTruckStatementOrder', meta: {code: 'xtpzgl-yhgl'}, component: getBmsTruckStatementOrder},
 		{path: 'getTransportResult/:orderId', name: 'getTransportResult', meta: {code: 'xtpzgl-yhgl'}, component: getTransportResult},
-		{path: 'mapTest', name: 'mapTest', meta: {code: 'xtpzgl-yhgl'}, component: mapTest},
+		{path: 'mapTest', name: 'mapTest', meta: {code: 'xtpzgl-yhgl'}, component: mapTest},  
+		{path: 'checkGPS', name: 'checkGPS', meta: {code: 'xtpzgl-yhgl'}, component: checkGPS},
+		{path: 'inTransitWarn', name: 'inTransitWarn', meta: {code: 'xtpzgl-yhgl'}, component: inTransitWarn},
 	  ]
 	}
   ];

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

@@ -44,7 +44,7 @@ export default {
       },
       startTime: null,
       endTime: null,
-      tableTitle:'零星出厂统计报表'
+      tableTitle:'采购内转统计报表'
     };
   }, 
   created(){