销售钢材整合其他

build/utils.js

@@ -20,8 +20,16 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
  let devModules = ['all']
 // let devModules = ['index','statisticalReport','appoint','sale','RMS','TMS'];
 // let devModules = ['index','appoint','WMS'];
+// let devModules = ['index','inward','SporadicManage']
+// 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) {
+
+if (pathSrc.indexOf('node_modules') > -1) {c
     devModules = require('../../../cors.js').devModules;
 }
 // 获取入口集合

config/index.js

@@ -141,6 +141,7 @@ module.exports = {
     }
   },
 
+  
   build: {
     // Template for index.html
     index: path.resolve(__dirname, dist + '/index.html'),

package.json

@@ -15,18 +15,21 @@
     "testc": "cross-env NODE_ENV=test nyc mocha-webpack --webpack-config build/webpack.test.conf.js --require test/setup.js test/**/*.spec.js"
   },
   "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
     "@antv/g6": "1.2.8",
+    "@vue/reactivity": "^3.2.31",
+    "amap-js": "^2.4.0",
     "apollo-cache-inmemory": "^1.5.1",
     "apollo-client": "^2.5.1",
     "apollo-link": "^1.2.11",
     "apollo-link-error": "^1.1.11",
     "apollo-link-http": "^1.5.14",
-    "axios": "^0.18.0",
+    "axios": "^0.26.1",
     "babel-polyfill": "^6.26.0",
     "crypto": "^1.0.1",
     "echarts": "^4.1.0",
     "el-cascader-multi": "^1.1.8",
-    "element-ui": "2.4.2",
+    "element-ui": "2.13.2",
     "file-saver": "^1.3.8",
     "graphql": "^14.1.1",
     "graphql-tag": "^2.10.1",
@@ -44,7 +47,9 @@
     "socket.io-stream": "^0.9.1",
     "sockjs-client": "^1.3.0",
     "uuid": "^3.3.2",
+    "view-design": "^4.7.0",
     "vue": "^2.5.2",
+    "vue-amap": "^0.5.10",
     "vue-apollo": "^3.0.0-beta.28",
     "vue-baidu-map": "^0.21.19",
     "vue-clipboard2": "^0.2.1",
@@ -53,13 +58,14 @@
     "vue-property-decorator": "^8.2.1",
     "vue-quill-editor": "^3.0.5",
     "vue-router": "^3.0.1",
+    "vue-social-share": "0.0.3",
     "vue-splitpane": "^1.0.2",
     "vuescroll": "^4.17.3",
     "vuex": "^3.0.1",
     "vxe-table": "^3.4.12",
     "x2js": "^3.3.0",
-    "xe-utils": "^3.5.1",
-    "xlsx": "^0.11.19",
+    "xe-utils": "^3.5.4",
+    "xlsx": "^0.18.4",
     "xterm": "3.12.0"
   },
   "devDependencies": {
@@ -124,7 +130,7 @@
     "sass-loader": "^6.0.6",
     "selenium-server": "^3.0.1",
     "semver": "^5.3.0",
-    "shelljs": "^0.7.6",
+    "shelljs": "^0.8.5",
     "uglifyjs-webpack-plugin": "^1.1.1",
     "url-loader": "^0.5.8",
     "vue-jest": "^1.0.2",

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

@@ -7,7 +7,7 @@
       row-key="ROW_ID"
       :stripe="stripe"
       :border="border"
-      :row-class-name="rowClassName"
+      :row-class-name="tableRowClassName"
       :cell-class-name="cellClassName"
       :height="height"
       :highlight-current-row="highlightCurrentRow"
@@ -162,7 +162,7 @@ export default {
     },
     // 是否在数据翻页后保留之前选中的数据（需指定 row-key）
     reserveSelection: {
-      default: false,
+      default: true,
     },
     // 是否为斑马纹 table
     stripe: {
@@ -200,11 +200,11 @@ export default {
       default: true,
     },
     // 行的 className 的回调方法，也可以使用字符串为所有行设置一个固定的 className。
-    rowClassName: {
-      default() {
-        return ({ row, rowIndex }) => "";
-      },
-    },
+    // rowClassName: {
+    //   default() {
+    //     return ({ row, rowIndex }) => "";
+    //   },
+    // },
     // 单元格的 className 的回调方法，也可以使用字符串为所有单元格设置一个固定的 className。
     cellClassName: {
       default() {
@@ -256,7 +256,7 @@ export default {
     // 刷新表格数据
     refreshData() {
       this.requestData();
-      //多选表格，清空用户的选择
+      // 多选表格清空用户的选择
       this.$refs.mainTable.clearSelection();
     },
     toggleRowExpansion(row, expanded) {
@@ -268,18 +268,36 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@media print {
-  .el-pagination {
-    display: none;
+
+.el-table .warning-row {
+    background: #fff ;
+    font-size: 22px;
+    height: 44px;
+    line-height: 46px;
+    font-size: 22px;
+    font-weight: 700;
   }
-  
-}
- /deep/.el-table .success-row {
-    background: #fff !important;
-    color: #f56c6c;
+
+  .el-table .success-row {
+    background: #fff ;
+    font-size: 22px;
     height: 44px;
     line-height: 46px;
     font-size: 22px;
     font-weight: 700;
   }
+@media print {
+  .el-pagination {
+    display: none;
+  }
+  
+}
+//  /deep/.el-table .success-row {
+//     background: #fff !important;
+//     color: #f56c6c;
+//     height: 44px;
+//     line-height: 46px;
+//     font-size: 22px;
+//     font-weight: 700;
+//   }
 </style>

src/components/OffFactoryMapShow/index.js

@@ -0,0 +1,20 @@
+import GAODEMap from "./packages/src/GAODEMap.js";
+
+
+const components = [GAODEMap];
+
+const install = function(Vue) {
+  components.forEach(component => {
+    Vue.component(component.name, component);
+  });
+};
+
+if (typeof window !== "undefined" && window.Vue) {
+  install(window.Vue);
+}
+
+export default {
+  version: "0.1.0",
+  install,
+  GAODEMap
+};

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

@@ -0,0 +1,279 @@
+
+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)' });
+    },
+    reloadData() {
+        let resultData = {
+            orderNumber: this.orderNumber,
+        };
+        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();
+            }
+            
+            
+        })
+        .catch(error => {
+                this.loading.close(); 
+               
+            if((error+"").indexOf("500") !== -1){
+                    this.$message('车辆未入网或没有开启定位，不能访问');
+                    this.newMap();
+            }
+                    
+                    
+            
+            });
+        
+        
+            
+        },
+        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({
+                content: content.join("<br>")  //传入 dom 对象，或者 html 字符串
+                });
+                
+                // 打开信息窗体
+                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 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 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的图像
+                        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/components/OffFactoryMapShow/packages/src/GAODEMap.vue

@@ -0,0 +1,144 @@
+<template>
+    <div id="demo">
+        <el-main id="container" style="position:relative;"></el-main>
+        <!--控制条-->
+        <div class="map-control" v-show="isActual">
+            <!--播放暂停按钮-->
+            <Icon
+                v-if="!isPlay"
+                class="play-icon"
+                type="ios-play"
+                @click="isPlay=true;navgControl('start')"
+            />
+            <Icon v-else class="play-icon" type="ios-pause" @click="isPlay=false;navgControl('pause')"/>
+            <!--已播放时间-->
+            <span class="passed-time">{{passedTime}}</span>
+            <!--进度条-->
+            <el-slider v-model="sliderVal" :format-tooltip="hideFormat" :step="0.0001"></el-slider>
+            <!--倍速-->
+            <div class="map-times" @mouseenter="isTimesChoose=true" @mouseleave="isTimesChoose=false">
+                <div class="times-show">倍速 {{times}}</div>
+                <div class="choose-box">
+                <ul v-show="isTimesChoose">
+                    <li v-for="item in speedList" :key="item.value" :class="{active:times==item.value}" @click="changeSpeed(item.value)">{{item.label}}</li>
+                </ul>
+            </div>
+        </div>
+        <!--结束时间-->
+        <span class="passed-time">{{totalTime}}</span>
+        </div>
+    </div>
+</template>
+
+<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=eed46ea40bbcadbf8a9cdd5dc1a94642"></script>
+<script>
+import GAODEMap from "./GAODEMap.js";
+export default {
+  name: "GAODEMap",
+  extends: GAODEMap,
+  data() {
+        return {
+            //地图展示中心点
+            centerPoint:{
+                pointLat:"",
+                pointLon:""
+            },
+        };
+    },
+}
+</script>
+<style>
+
+#container {
+	width: 100%;
+	height: 100%;
+	overflow: hidden;
+	margin: 0;
+	font-family: "微软雅黑";
+}
+.info_card {
+    display: inline-block;margin: 50px auto;position: absolute;width: 200px;height:150px;background-color: #c7c9c8AA;border: 5px solid #ffffff;color: #000000;
+}
+.info_card .title{
+    width: 100%;
+    height:40px;
+    background-color: #000000AA;
+    color: #ffffff;
+}
+
+.title span.title_name{
+    position: relative;
+    top: 7px;
+    left: 10px;
+    font-size: 18px;
+}
+
+
+.info_card .title .close_img{
+    position: absolute;
+    top:10px;
+    right: 10px;
+    width: 20px;
+    height: 20px;
+    background-color: #ffffff;
+}
+.info_card .title .close_img .min {
+    width: 0;
+    height: 0;
+    font-size:0;
+    overflow:hidden;
+    position:absolute;
+    border-width:10px;
+}
+
+.info_card .title .close_img .top_img {
+    border-style:solid dashed dashed;
+    border-color:#000000 transparent transparent transparent;
+    top:-2px;
+}
+
+.info_card .title .close_img .right_img {
+    border-style:solid dashed dashed;
+    border-color:transparent #000000 transparent transparent;
+    left:2px;
+}
+
+.info_card .title .close_img .bottom_img{
+    border-style:solid dashed dashed;
+    border-color:transparent transparent #000000 transparent;
+    top:2px;
+}
+
+.info_card .title .close_img .left_img{
+    border-style:solid dashed dashed;
+    border-color:transparent transparent transparent #000000;
+    left:-2px;
+}
+
+.info_card span.cancle{
+    width:0;
+    height:0;
+    font-size:0;
+    overflow:hidden;
+    position:absolute;
+}
+
+.info_card span.bot{
+    border-width:20px;
+    border-style:solid dashed dashed;
+    border-color:#ffffff transparent transparent;
+    left:80px;
+    bottom:-40px;
+}
+.info_card span.top{
+    border-width:20px;
+    border-style:solid dashed dashed;
+    border-color:#c7c9c8AA transparent transparent;
+    left:80px;
+    bottom:-33px;
+}
+.info_card .content{
+    margin-top: 10px;
+    margin-left: 10px;
+}
+</style>

src/components/OffFactoryMapShow/packages/src/README.md

@@ -0,0 +1,214 @@
+## 通用表格使用说明
+### 属性说明
+
+
+
+#### requestUrl : string
+
+表格请求的地址
+
+示例：
+
+``` js
+//全地址
+requestUrl:http://192.168.10.113:8081/api/v1/truck/type/status2;
+//后半截地址
+requestUrl:/api/v1/truck/type/status2;
+```
+
+
+
+#### requestQuery : object
+
+表格请求的参数：用于自己触发筛选和排序时使用
+
+可传入参数
+
+
+
+
+
+#### current-page : number
+
+当前页数，支持 .sync 修饰符
+
+默认是第一页
+
+
+
+#### page-size : number
+
+每页显示条目个数，支持 .sync 修饰符
+
+默认是 每页十条
+
+
+
+#### page-sizes : number[]
+
+每页显示个数选择器的选项设置
+
+默认是 [1,2,5,10]
+
+
+
+#### type : string
+
+表格类型：目前支持：base , common
+
+之后会根据需求增加更多的类型
+
+
+
+#### lastColumnData : array[object]
+
+表格最右边列的数据信息，数组中是放一个对象，对象中的属性如下，
+
+基本和Table-column Attributes的相同，
+
+``` js
+lastColumnData:[{
+    // 表头显示的文案
+    label: "操作",
+    // 设置列的宽度
+    width: 100,
+    // 固定操作列
+    fixed: 'right',
+    // 注意！！！
+    // 操作列按钮点击触发的操作改为 $emit 抛事件的形式
+    // 默认可以获取 scope 属性；里面的具体内容和el-table一样
+    template: `
+		<el-button type="text" size="mini" @click="$emit('transportProgress',scope.row)" > 
+			运输进度 
+		</el-button>
+	`,
+}]
+```
+
+
+
+
+
+### 事件说明
+
+#### radio-change(row)
+
+用于当选表格，当用户改变选中行数据时调用，返回选中行的数据对象 **row**
+
+用户再次点击取消选中时，会返回一个**空对象 {}**
+
+
+
+#### selection-change(rows)
+
+用于多选表格，当选择项发生变化时会触发该事件
+
+返回所有被选中的行的数据的数组 rows[]
+
+即使换页，依然保留被选中的数据
+
+
+
+### 方法说明
+
+#### refreshData()
+
+用户主动刷新表格数据
+
+
+
+## 接口相关说明
+
+### 请求参数说明
+
+链接后的参数
+
+``` json
+// 表格头接口的唯一标识
+apiId:13
+// 控制当前显示第几页
+pageNum:1
+// 控制当前每页显示几条
+pageSize:10
+```
+
+请求体的参数
+
+``` json
+// 排序的数据的参数字段
+orderField:""
+// 排序类型 asc : 升序；  desc : 降序；
+orderType:""
+
+// 需要筛选时，键值对的键，是需要筛选的参数的字段名，
+// 键值对的值，是个数组，存放符合条件的字段值，
+// 筛选的字段可以同时存在多条
+[筛选字段名]:[筛选字段值1，筛选字段值2]
+```
+
+
+
+### 回调参数要求
+
+``` json
+{
+    // 状态码 0:标识成功
+    "code": "0",
+    // 后端自定义给前端的数据对象
+    "data": {
+        // 表格的数据源
+        "list": [
+            // 每行表的数据内容
+            {
+                // 每行数据的唯一标识 必设项
+                "ROW_ID":"",
+            }
+        ],
+
+        // 表头的数据内容
+        // 表头按需要的显示顺序排序
+        "columnData": [
+            // 每个表头的相关信息
+            // 这个之后会根据需求不断添加
+            {
+                // 唯一标识 必设项
+                "data_id": "",
+                // 对应列内容的字段名 必设项
+                "prop": "",
+                // 显示的标题 必设项
+                "label": "",
+
+                // 一下为 非必填选项
+                // 自定义列模板
+                // html的字符串
+                // 当有这个属性时,会忽略label属性
+                "template": "",
+
+                // 列的宽度 非必填选项
+                "width": "",
+                // 当前列对应的 筛选功能数组 非必填选项
+                "filters":[
+                    {
+                        // 筛选选项 所对应的后端数值
+                        value:0,
+                        // 筛选选项 的中文名称
+                        text:"",
+                    },
+                ],
+            },
+        ],
+        
+        // 总条目数
+        "total": 0
+    }
+}
+```
+
+
+
+## 相关网站说明
+
+### 配置表头数据地址
+
+https://diluitable.steerinfo.com/#/
+

src/views/ADMINISTRATORS/app.js

@@ -58,7 +58,7 @@ export function sjTime(orderPlanInTime) {
 }
 //验证电话号码
 export function VerifyPhoneNumber(Phone) {
-  var myreg=/^(13[0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\d{8}$/;
+  var myreg=/^(13[0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9]|19[0|1|2|3|5|6|7|8|9])\d{8}$/;
   if (!myreg.test(Phone)) {
       return false;
   } else {

src/views/RMS/app.js

@@ -25,6 +25,10 @@ Vue.use(VueApollo)
 import DilCommonUI from "@/components/DilCommonUI";
 Vue.use(DilCommonUI);
 
+// 导出Excel全局组件
+import tableToExcel from '@/components/exportExcel/exportExcel'
+Vue.use(tableToExcel)
+
 const apolloProvider = new VueApollo({
     defaultClient: apollo
 })

src/views/RMS/components/addCapacity.vue

@@ -23,7 +23,35 @@
             </template>
           </el-autocomplete>
         </el-form-item>
+        
       </el-form>
+       <el-form :inline="true" class="demo-form-inline" label-width="80px">
+         <el-form-item label="上传行驶证">
+          <el-upload
+            class="upload-demo"
+            ref="upload1"
+            action="http://172.16.33.166:8080/api/v1/rms/uploadCarrier1"
+            :before-upload="beforeUpload"
+            :multiple="false"
+            list-type="picture"
+            :show-file-list="false"
+            :on-success="handleAvatarSuccess"
+            :on-error="onError(1)"
+          >
+            <span class="span"></span>
+            <el-input
+              class="shippingCertificate"
+              placeholder="请选择运输证(必填项)"
+              v-model="shippingCertificate"
+              disabled
+            >
+            </el-input>
+            <el-button size="small" type="primary" @click="upCLick(1)"
+              >点击上传运输证</el-button
+            >
+          </el-upload>
+        </el-form-item>
+       </el-form>
     </div>
 
     <div class="button_box">
@@ -42,8 +70,10 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      driverLicence:"",
       addLoading: false,
       form1: {},
+      shippingCertificate:"",
       form1Initialization: {
         capacityTypeId: 1,
         capacityNumber: "",
@@ -84,6 +114,56 @@ export default {
       });
   },
   methods: {
+     upCLick(val) {
+      this.num = val;
+    },
+    beforeUpload(file) {
+      this.upBool = true;
+      const isLt2M = file.size < 1024 * 1024 * 0.5;
+      if (!isLt2M) {
+        this.$message.error("上传文件大小不能超过500kb!");
+      } else {
+        let size = file.size / 1024;
+        let _URL = window.URL || window.webkitURL;
+        let img = new Image();
+        img.src = _URL.createObjectURL(file);
+      }
+      return isLt2M;
+    },
+    onError(err) {
+      if (this.upBool) {
+        if (this.num == 1) {
+          this.shippingCertificate = null;
+          this.imageUrl1 = null;
+          // this.$message.error("上传失败");
+        } else if (this.num == 2) {
+          this.businessLicense = null;
+          this.imageUrl2 = null;
+          // this.$message.error("上传失败");
+        } else if (this.num == 3) {
+          this.businessLicense1 = null;
+          this.imageUrl3 = null;
+          // this.$message.error("上传失败");
+        }
+      }
+    },
+    handleAvatarSuccess(res, file) {
+      console.log(res,file)
+      if (res.code) {
+        this.upBool = false;
+        if (this.num == 1) {
+          this.driverLicence = res.data;
+          this.shippingCertificate = file.name;
+        } else if (this.num == 2) {
+          this.imageUrl2 = res.data;
+          this.businessLicense = file.name;
+        } else if (this.num == 3) {
+          this.imageUrl3 =res.data;
+          this.businessLicense1 = file.name;
+        }
+        this.$message.success("上传成功");
+      }
+    },
     //承运商弹出层
     handleSelect(item) {
       this.carrierIds = item.carrierId;
@@ -145,18 +225,18 @@ export default {
       var result = false;
       if (vehicleNumber.length == 7) {
         var express =
-          /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/;
+          /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使场领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/;
         result = express.test(vehicleNumber);
       }
       return result;
     },
     makeSure() {
       this.addLoading = true;
-      if (!this.isVehicleNumber(this.form1.capacityNumber.toUpperCase())) {
-        this.$message.error("车牌号格式不正确");
-        this.addLoading = false;
-        return;
-      }
+      // if (!this.isVehicleNumber(this.form1.capacityNumber.toUpperCase())) {
+      //   this.$message.error("车牌号格式不正确");
+      //   this.addLoading = false;
+      //   return;
+      // }
       if (this.carrierIds == null) {
         this.$message.error("请选择承运商");
         this.addLoading = false;
@@ -169,10 +249,12 @@ export default {
         capacityOwneris: this.form1.capacityOwneris,
         capacityVip: this.form1.capacityVip,
         capacityBlacklist: this.form1.capacityBlacklist,
+        driverLicence:this.driverLicence,
         remark: this.form1.remark,
         carrierId: this.carrierIds,
         state: this.state,
       };
+      console.log(RmsCapacity)
       if (
         RmsCapacity.capacityNumber == null ||
         RmsCapacity.capacityCorlor == null ||
@@ -188,6 +270,7 @@ export default {
         formData.append("userCode", this.form1.capacityNumber.toUpperCase());
         formData.append("orgCode", "yunli");
         formData.append("orgName", "运力");
+        
         formData.append("groupId", "506514577756917769");
         formData.append("companyId", "713710108567277568");
         formData.append("orgId", "924126716337721344");
@@ -260,6 +343,15 @@ export default {
 };
 </script>
 <style lang='scss' >
+.shippingCertificate{
+  width: 200px;
+}
+.el-form--inline .el-form-item__content {
+    display: inline-block;
+    vertical-align: top;
+    position: relative;
+    left: 37px;
+}
 .addCapacity {
   .elForm {
     margin-left: 40%;

src/views/RMS/components/addCarrier.vue

@@ -1,26 +1,33 @@
 <template>
+
+
   <!-- 添加承运商信息 -->
   <div class="addCarrier">
     <PageTitle>返回</PageTitle>
     <div class="user_code">
       <span class="text">账号</span>
-      <el-input
-        class="input"
-        placeholder="请输入账号(必填项)"
-        v-model="input"
-        clearable
-      >
-      </el-input>
+      <div class="site">
+        <el-input
+          class="input"
+          placeholder="请输入账号(必填项)"
+          v-model="input"
+          clearable
+        >
+        </el-input>
+      </div>
     </div>
     <div class="user_code">
       <span class="text">用户名</span>
-      <el-input
-        class="input"
-        placeholder="请输入用户名(必填项)"
-        v-model="user_Name"
-        clearable
-      >
-      </el-input>
+      <div class="site">
+           <el-input
+            class="input"
+            placeholder="请输入用户名(必填项)"
+            v-model="user_Name"
+            clearable
+          >
+          </el-input>
+      </div>
+     
     </div>
     <div class="form_box" style="margin-right: 10rem">
       <dil-form :formId="330" v-model="form1"></dil-form>
@@ -28,7 +35,7 @@
     <el-upload
       class="upload-demo"
       ref="upload1"
-      action="https://wl.dasteel.cn:32322/api/v1/rms/rmscarrier/uploadCarrier1"
+      action="http://172.16.33.166:8080/api/v1/rms/uploadCarrier1"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -48,10 +55,11 @@
         >点击上传运输证</el-button
       >
     </el-upload>
+     <!-- action="https://wl.dasteel.cn:32322/api/v1/rms/uploadCarrier1" -->
     <el-upload
       class="upload-demo"
       ref="upload2"
-      action="https://wl.dasteel.cn:32322/api/v1/rms/rmscarrier/uploadCarrier2"
+      action="http://172.16.33.166:8080/api/v1/rms/uploadCarrier1"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -74,7 +82,7 @@
     <el-upload
       class="upload-demo"
       ref="upload3"
-      action="https://wl.dasteel.cn:32322/api/v1/rms/rmscarrier/uploadCarrier3"
+      action="http://172.16.33.166:8080/api/v1/rms/uploadCarrier1"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -189,29 +197,30 @@ export default {
         if (this.num == 1) {
           this.shippingCertificate = null;
           this.imageUrl1 = null;
-          this.$message.error("上传失败");
+          // this.$message.error("上传失败");
         } else if (this.num == 2) {
           this.businessLicense = null;
           this.imageUrl2 = null;
-          this.$message.error("上传失败");
+          // this.$message.error("上传失败");
         } else if (this.num == 3) {
           this.businessLicense1 = null;
           this.imageUrl3 = null;
-          this.$message.error("上传失败");
+          // this.$message.error("上传失败");
         }
       }
     },
     handleAvatarSuccess(res, file) {
+      console.log(res,file)
       if (res.code) {
         this.upBool = false;
         if (this.num == 1) {
-          this.imageUrl1 = URL.createObjectURL(file.raw);
+          this.imageUrl1 = res.data;
           this.shippingCertificate = file.name;
         } else if (this.num == 2) {
-          this.imageUrl2 = URL.createObjectURL(file.raw);
+          this.imageUrl2 = res.data;
           this.businessLicense = file.name;
         } else if (this.num == 3) {
-          this.imageUrl3 = URL.createObjectURL(file.raw);
+          this.imageUrl3 =res.data;
           this.businessLicense1 = file.name;
         }
         this.$message.success("上传成功");
@@ -229,7 +238,10 @@ export default {
       this.form1.carrierContactNumber = parseInt(this.form1.carrierContactNumber);
       if (!this.input) {
         this.$message.error("账号不能为空");
-      } else if(!this.user_Name){
+      }else if(this.input.length<3){
+        this.$message.error("账号不能少于3位数！");
+      }
+       else if(!this.user_Name){
         this.$message.error("用户名不能为空");
       }else if (!this.form1.carrierName) {
         this.$message.error("承运商名称不能为空");
@@ -345,6 +357,9 @@ export default {
       justify-content: center;
       align-items: center;
       margin-right: 10px;
+      width: 40px;
+      position: relative;
+       left: 40px;
     }
     .input {
       width: 250px;
@@ -395,6 +410,16 @@ export default {
       width: 250px;
     }
   }
+  .site{
+    position: relative;
+    left: -50px;
+  
+  }
+  span.text {
+    position: relative;
+    align-content: center;
+    left: -35px;
+  }
   .form-box {
     display: flex;
     justify-content: center;

src/views/RMS/components/addOtherCapacity.vue

@@ -0,0 +1,308 @@
+<template>
+  <!-- 添加运力信息 -->
+  <div class="addCapacity">
+    <PageTitle>返回</PageTitle>
+    <div class="form_box" style="margin-right: 10rem">
+      <dil-form :formId="309" v-model="form1" ref="from1"></dil-form>
+    </div>
+    <div class="elForm">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px">
+        <el-form-item label="选择承运商">
+          <el-autocomplete
+            class="inline-input"
+            v-model="state"
+            :fetch-suggestions="querySearch"
+            placeholder="请输入承运商名称"
+            :trigger-on-focus="false"
+            @select="handleSelect"
+          >
+            <template slot-scope="{ item }">
+              <div class="name" v-if="item.carrierName">
+                {{ item.carrierName }}
+              </div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <div class="button_box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure" :loading="addLoading"
+        >确定</el-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { getCookie } from "@/utils/util.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      addLoading: false,
+      form1: {},
+      form1Initialization: {
+        capacityTypeId: 1,
+        capacityNumber: "",
+        capacityCorlor: "黄",
+        capacityOwneris: "否",
+        capacityVip: "否",
+        capacityBlacklist: "否",
+      },
+      value: undefined,
+      carrierIds: null,
+      state: null,
+      userId: null,
+      restaurants: [],
+      accessToken: null,
+      userCode: null,
+      carrierUserId: null,
+      carrierId: null,
+    };
+  },
+  created() {
+    this.carrierUserId = getCookie("userId");
+    this.form1 = this.form1Initialization;
+    // console.log(this.carrierUserId, "carrierUserId");
+  },
+  mounted() {
+    this.axios
+      .post(
+        "/api/v1/rms/getCarrierNameBySSOId?carrierSSOId=" + this.carrierUserId
+      )
+      .then((res) => {
+        if (res.data.code == "200") {
+          // console.log(res.data.data);
+          if (res.data.data) {
+            this.state = res.data.data.carrierName;
+            this.carrierIds = res.data.data.carrierId;
+          }
+        }
+      });
+  },
+  methods: {
+    //承运商弹出层
+    handleSelect(item) {
+      this.carrierIds = item.carrierId;
+      item.carrierName = this.state;
+    },
+    //以下是承运商边输边查搜索
+    querySearch(queryString, cb) {
+      this.axios
+        .post("/api/v1/uc/getCarrierMesByLike?index=" + queryString)
+        .then((res) => {
+          if (res.data.code == "200") {
+            // console.log(res.data.data);
+            var restaurants = res.data.data;
+            // console.log(restaurants, "restaurants");
+            var results = queryString
+              ? restaurants.filter(this.createFilter(queryString))
+              : restaurants;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    createFilter(queryString) {
+      return (restaurants) => {
+        return (
+          restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) >
+          -1
+        );
+      };
+    },
+    //以上是承运商边输边查搜索
+    deleteUser(userId) {
+      this.axios.delete("pass/v1/sysusers/" + userId).then((res) => {
+        this.$message.error("添加失败,车牌可能重复");
+      });
+    },
+    insertRole(userId, userCode) {
+      this.axios
+        .post(
+          "pass/v1/sysuserroles/addUserroles?userId=" +
+            userId +
+            "&userCode=" +
+            userCode +
+            "&roleId=" +
+            "923693668269953024"
+        )
+        .then((res) => {
+          if (res.code === "0") {
+            this.$message.success("操作成功");
+            this.saveLoading = false;
+            this.rolesTree.loading = false;
+          } else {
+            this.$message.error(res.message);
+          }
+        });
+    },
+    makeSure() {
+      this.addLoading = true;
+      // if (!this.isVehicleNumber(this.form1.capacityNumber.toUpperCase())) {
+      //   this.$message.error("车牌号格式不正确");
+      //   this.addLoading = false;
+      //   return;
+      // }
+      if(this.form1.capacityNumber.length<=2){
+        this.$message.error("车牌号必须大于三位");
+        this.addLoading = false;
+        return;
+      }
+      if (this.carrierIds == null) {
+        this.$message.error("请选择承运商");
+        this.addLoading = false;
+        return;
+      }
+      let RmsCapacity = {
+        capacityTypeId: this.form1.capacityTypeId,
+        capacityNumber: this.form1.capacityNumber.toUpperCase(),
+        capacityCorlor: this.form1.capacityCorlor,
+        capacityOwneris: this.form1.capacityOwneris,
+        capacityVip: this.form1.capacityVip,
+        capacityBlacklist: this.form1.capacityBlacklist,
+        remark: this.form1.remark,
+        carrierId: this.carrierIds,
+        state: this.state,
+      };
+      if (
+        RmsCapacity.capacityNumber == null ||
+        RmsCapacity.capacityCorlor == null ||
+        RmsCapacity.capacityOwneris == null ||
+        RmsCapacity.capacityVip == null ||
+        RmsCapacity.capacityBlacklist == null
+      ) {
+        this.$message.error("存在空值！");
+        this.addLoading = false;
+      } else {
+        //新增SSO运力账号
+        var formData = new FormData();
+        formData.append("userCode", this.form1.capacityNumber.toUpperCase());
+        formData.append("orgCode", "yunli");
+        formData.append("orgName", "运力");
+        formData.append("groupId", "506514577756917769");
+        formData.append("companyId", "713710108567277568");
+        formData.append("orgId", "924126716337721344");
+        // console.log(formData.get("userCode"));
+        // console.log(typeof formData);
+        this.$store
+          .dispatch("system/usersManage/addUser", formData)
+          .then((res) => {
+            // console.log(res);
+            if (res.code === "0") {
+              // console.log(res.data.userId);
+              this.userId = res.data.userId;
+              this.userCode = res.data.userCode;
+              RmsCapacity.ssoId = res.data.userId;
+              this.axios
+                .post("/api/v1/rms/insertCapacity", RmsCapacity)
+                .then((res) => {
+                  if (res.data.data == 1) {
+                    this.insertRole(this.userId, this.userCode);
+                    this.$message.success("添加成功");
+                    this.$router.push("capacity");
+                  } else if (res.data.code == "201") {
+                    this.deleteUser(this.userId);
+                  } else {
+                    this.deleteUser(this.userId);
+                  }
+                });
+            } else {
+              // console.log(RmsCapacity, "RmsCapacity");
+              if (res.message == "账号已被注册") {
+                this.$confirm(
+                  "该账号已经被注册, 是否确定新增承运商绑定关系?",
+                  "提示",
+                  {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                  }
+                )
+                  .then(() => {
+                    this.axios
+                      .post("/api/v1/rms/insertCapacity", RmsCapacity)
+                      .then((res) => {
+                        // console.log(res, "res");
+                        if (res.data.data == 0) {
+                          this.$message.success("新增承运商绑定关系成功!");
+                          this.$router.push("capacity");
+                        } else {
+                          this.$message.error("该绑定关系已存在!");
+                        }
+                      });
+                  })
+                  .catch(() => {
+                    this.$message({
+                      type: "info",
+                      message: "已取消删除",
+                    });
+                  });
+              }
+            }
+          });
+        this.addLoading = false;
+      }
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' >
+.addCapacity {
+  .elForm {
+    margin-left: 40%;
+  }
+  .form_box {
+    width: 100%;
+    margin-top: 30px;
+    margin-left: 50px;
+    display: flex;
+    justify-content: center;
+    .el-form-item {
+      display: flex;
+      justify-content: center;
+      .el-form-item__label {
+        display: flex;
+        align-items: center;
+      }
+      .el-form-item__content {
+        .el-select {
+          width: 250px;
+        }
+        .el-input {
+          width: 250px;
+        }
+      }
+    }
+  }
+  .inputBox {
+    display: flex;
+    justify-content: center;
+    margin-bottom: 30px;
+    .text {
+      text-align: right;
+      display: flex;
+      align-items: center;
+      margin-right: 5px;
+    }
+    .input {
+      width: 250px;
+    }
+  }
+  .button_box {
+    display: flex;
+    justify-content: center;
+    .el-button {
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/RMS/components/addRmsShipper.vue

@@ -6,6 +6,22 @@
        <!-- 323 -->
         <dil-form :formId="323" v-model="form1" ref="from1"></dil-form>
       </div>
+      <div class="department2">
+         <span>二级部门：</span>
+        <el-select v-model="value1" placeholder="请选择" @change="onchange1">
+          <el-option
+            v-for="(item,i) in options1"
+            :key="i"
+            :label="item.label"
+            :value="item.value"
+            >
+            </el-option>
+          </el-select>       
+      </div>
+      <div class="department2">
+        <span>三级部门：</span>
+        <el-input v-model="input" placeholder="请输入内容"></el-input>
+      </div>
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
@@ -23,22 +39,59 @@ export default {
       form1: {},
       value: undefined,
       shipperName:"四川达钢",
-      shipperAbbreviation:"四川达钢"
+      shipperAbbreviation:"四川达钢",
+      //二级部门
+      options1:[],
+      //选中的二级部门名称
+      value1:'',
+      input:''
     };
   },
   mounted() {
     this.form1.shipperName = this.shipperName;
     this.form1.shipperAbbreviation = this.shipperAbbreviation;
+    //初始化二级机构和角色
+    this.initialization();
   },
   methods: {
+    initialization(){
+       //初始化选择二级机构
+         this.axios.get('/api/v1/rms/getSecondShipper').then((res)=>{
+             this.options1 = res.data.data;
+         })
+         //初始化角色
+        const formData = new FormData();
+        this.$store.dispatch('system/rolesManage/list',formData)
+        .then((res)=>{
+          var roleList = [];
+          roleList=res.data;
+          roleList.forEach((item,i)=>{
+              if(item.roleId!='superadmin'){
+                this.options3.push(item);
+              }
+          })
+          // this.options3 = res.data;
+        })
+     },
+    onchange1(val){
+            //  查询选中的二级机构下的三级机构
+             this.value2 = '';
+             this.axios.get('/api/v1/rms/getThirdShipper?shipperId='+val).then((res)=>{
+             this.options2 = res.data.data;    
+         })
+         //获取二级部门的机构ID和机构编码
+         this.axios.post('/api/v1/rms/getShipperMap?shipperId='+val).then((res)=>{
+             this.map1 = res.data.data;
+         })
+     },
      makeSure() {
        console.log(this.form1)
        let RmsShipper={
         shipperName: this.form1.shipperName,
         shipperAbbreviation: this.form1.shipperAbbreviation,
         shipperId:this.form1.shipperId,
-        shipperCompanyBranch:this.form1.shipperCompanyBranch,
-        shipperBranchFactory:this.form1.shipperBranchFactory
+        shipperCompanyBranch:this.value1,
+        shipperBranchFactory:this.input
       };
       if(
         RmsShipper.shipperName==null ||
@@ -102,4 +155,10 @@ export default {
     }
   }
 }
+.department2{
+  display: flex;
+  justify-content: center;
+  margin-left: 36%;
+  width: 250px;
+}
 </style>

src/views/RMS/components/capacity.vue

@@ -13,9 +13,15 @@
        <el-button type="primary" class="btn" @click="toInsert">
         <i class="el-icon-plus"></i>新增
       </el-button>
+      <el-button type="primary" class="btn" @click="toInsert1">
+        <i class="el-icon-plus"></i>新增特殊车牌
+      </el-button>
+      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+
     </div>
     <div class="table">
-      <dilTable 
+      <dilTable
+        ref="excelDom"
         v-bind.sync="options"
         :loading="tableloading"
         @func="func"
@@ -37,6 +43,13 @@
               v-if="show==true">
               删除
             </el-button>
+             <el-button
+              type="text"
+              size="small"
+              @click="showCapacity(scope.row.capacityId)"
+              v-if="show==false">
+              查看详情
+            </el-button>
           </template>
         </el-table-column>
       </dilTable>
@@ -111,9 +124,15 @@ export default {
      toInsert() {
       this.$router.push("/addCapacity");
     },
+    toInsert1() {
+      this.$router.push("/addOtherCapacity");
+    },
     updateCapacity(capacityId){
       this.$router.push("/editCapacity/" + capacityId)
     },
+    showCapacity(capacityId){
+      this.$router.push("/showCapacity/" + capacityId)
+    },
     deleteUser(userId){
       this.axios.delete("pass/v1/sysusers/" + userId) .then((res) => {
       });

src/views/RMS/components/carrier.vue

@@ -18,6 +18,10 @@
             <el-button type="text" size="small" @click="updateCarrier(scope)">
               修改
             </el-button>
+            <el-button type="text" size="small" @click="showCarrier(scope)">
+              查看详情
+            </el-button>
+
             <!-- <el-button type="text" size="mini" @click="deleteCarrier(scope)">
               删除
             </el-button> -->
@@ -51,6 +55,10 @@ export default {
       console.log(scope.row.settlementId);
       this.$router.push("/editCarrier/" + scope.row.carrierId);
     },
+    showCarrier(scope) {
+      console.log(scope.row.settlementId);
+      this.$router.push("/showCarrier/" + scope.row.carrierId);
+    },
     deleteCarrier(scope) {
       this.$confirm("是否删除", "提示", {
         confirmButtonText: "确定",

src/views/RMS/components/rmsShipper.vue

@@ -46,13 +46,13 @@ export default {
       inputText:"",
       options:{
         // first请求数据的地址
-        requestUrl: "/api/v1/rms/getShipperList?apiId=344",
+        requestUrl: "/api/v1/rms/getShipperList?apiId=451",
       },
     }
   },
   methods:{
     onclick(){
-      this.options.requestUrl="/api/v1/rms/getShipperList?apiId=344&con=" + this.inputText;
+      this.options.requestUrl="/api/v1/rms/getShipperList?apiId=451&con=" + this.inputText;
       console.log(this.textInput)
     },
     toInsert() {

src/views/RMS/components/showCapacity.vue

@@ -0,0 +1,252 @@
+<template>
+  <!-- 修改运力信息 -->
+<div class="editCapacity">
+  <div id="contractDetails">
+    <page-title>编辑</page-title>
+    <div class="contractimage">
+      <el-image  class="imageStyle"
+            :src="src" 
+            :preview-src-list="srcList" >
+      </el-image>
+    </div>
+    <div class="contractTitle">
+      <div class="form_box" style="margin-right: 10rem">
+          <dil-form :formId="310" v-model="form1"></dil-form>
+      </div>
+    </div>
+<div class="elForm">
+  <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+      >
+        <el-form-item label="选择承运商">
+         <el-autocomplete
+          class="inline-input"
+          v-model="state"
+          :fetch-suggestions="querySearch"
+          placeholder="请输入承运商名称"
+          :trigger-on-focus="false"
+          @select="handleSelect"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.carrierName }}</div>
+        </template>
+        </el-autocomplete>
+        </el-form-item>
+    </el-form>
+</div>
+    
+</div>
+    <div class="button_box">
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+    </div>
+  </div>
+
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { getCookie } from "@/utils/util.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      srcList:[],
+      src:"",
+      state: "",
+      userId:null,
+      restaurants: [],
+      accessToken:null,
+      userCode:null,
+      carrierUserId:null,
+      carrierId:null,
+      carrierIds:null,
+      direction: 'rtl',
+      inputText:"",
+      form1: {},
+      carrierUserId:null,
+      carrierName:"",
+      options:{
+        requestUrl:"/api/v1/rms/getCarrierList?apiId=417",
+        selectionType:"radio",
+        mapList:[]
+      }
+    };
+  },
+  created(){
+      this.carrierUserId = getCookie("userId");
+      console.log(this.carrierUserId ,'carrierUserId')     
+  },
+  mounted() {
+   this.information();
+   this.axios.post(
+       "/api/v1/rms/getCarrierNameBySSOId?carrierSSOId=" + this.carrierUserId
+      )
+      .then((res) => {
+        if(res.data.code == "200"){
+        console.log(res.data.data)
+        this.state = res.data.data.carrierName
+        this.carrierIds = res.data.data.carrierId
+        }      
+  })},
+  methods: {
+    //承运商弹出层
+    handleSelect(item){    
+      this.carrierIds = item.carrierId
+      item.carrierName = this.state
+    },
+    //以下是承运商边输边查搜索
+    querySearch(queryString, cb) {
+        this.axios.post('/api/v1/uc/getCarrierMesByLike?index='+queryString).then((res)=>{
+        if(res.data.code == "200"){
+          console.log(res.data.data)
+          var restaurants = res.data.data
+          console.log(restaurants,"restaurants");
+          var results = queryString ? restaurants.filter(this.createFilter(queryString)) :restaurants;
+           // 调用 callback 返回建议列表的数据
+          cb(results);
+        }
+        })     
+      },
+    createFilter(queryString) {
+        return (restaurants)  =>  {
+          return (restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+    //以上是承运商边输边查搜索
+    currentRadioChange(selection){
+      this.mapList=selection,
+      console.log(this.mapList)
+      this.carrierName=this.mapList.carrierName
+    },
+    onclick(){
+      this.options.requestUrl="/api/v1/rms/getCarrierList?apiId=417&con=" +this.inputText;
+    },
+    information() {
+      //编辑 
+    console.log(this.$route.params)            
+     
+      this.axios
+        .post(
+          "/api/v1/rms/getCapacityById/" +
+            this.$route.params.capacityId
+        )
+        .then((res) => {
+            console.log(res.data.data)
+          res.data.data.forEach((e) => {          
+            this.form1 = e;
+            console.log(e);
+            console.log(this.form1);
+            console.log( this.$route.params.capacityId);
+            this.srcList=[];
+            this.isShow=true;
+            this.src=e.driverLicenceUrl;
+            this.srcList.push(e.driverLicenceUrl)
+          }); 
+        this.axios
+        .post(
+          "/api/v1/rms/getCarrierNameById/" +
+          this.$route.params.capacityId
+        )
+        .then((res) => {
+          this.state=res.data.data.carrierName
+          console.log("carrierName",this.carrierName);
+        }); 
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      console.log(this.form1)
+       let RmsCapacity={
+         capacityId:this.form1.capacityId,
+         capacityTypeId:this.form1.capacityTypeId,
+         capacityNumber:this.form1.capacityNumber.toUpperCase(),
+         capacityCorlor:this.form1.capacityCorlor,
+         capacityOwneris:this.form1.capacityOwneris,
+         capacityVip:this.form1.capacityVip,
+         capacityBlacklist:this.form1.capacityBlacklist,
+         carrierId:this.carrierIds,
+       };if(
+         RmsCapacity.capacityNumber==null ||
+         RmsCapacity.capacityCorlor==null ||
+         RmsCapacity.capacityOwneris==null ||
+         RmsCapacity.capacityVip==null ||
+         RmsCapacity.capacityBlacklist==null 
+         //RmsCapacity.carrierId==null
+       )this.$message.error("存在空值！");  
+        console.log( this.$route.params.capacityId);
+        this.axios
+          .post(
+            "/api/v1/rms/updateCapacity",
+           RmsCapacity
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$message.success("修改成功")
+              this.$router.go(-1);           
+            }
+          });
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+  .contractimage{
+    text-align: center;
+    position: relative;
+    left: 35px;
+  }
+.editCapacity{
+    .elForm{
+      margin-left: 40%;
+    }
+    .form_box {
+    width: 100%;
+    margin-top: 30px;
+    display: flex;
+    justify-content: center;
+    .el-form-item{
+      display: flex;
+      justify-content: center;
+      .el-form-item__label{
+        display: flex;
+        align-items: center;
+      }
+      .el-form-item__content{
+         .el-select{
+            width: 250px;
+          }
+          .el-input{
+            width: 250px;
+          }
+      }
+    }
+ }
+ .imageStyle{
+    height:150px;
+    text-align:center
+ }
+ .button_box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+ }
+ .disableBox{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 1.5rem;
+  margin-bottom: 1.25rem;
+}
+}
+ 
+</style>

src/views/RMS/components/showCarrier.vue

@@ -0,0 +1,234 @@
+<template>
+  <!-- 修改承运商信息 -->
+  <div id="contractDetails">
+    <page-title>查看详情</page-title>
+    <div class="main">
+    </div>
+    <div class="contractimage">
+      <el-image  class="imageStyle"
+            :src="src" 
+            :preview-src-list="srcList">
+      </el-image>
+          
+          <el-image   class="imageStyle"
+            :src="src1" 
+            :preview-src-list="srcList1">
+            </el-image>
+          <el-image 
+            class="imageStyle"
+            :src="src2" 
+            :preview-src-list="srcList2">
+          </el-image>
+    </div>
+    <div class="contractTitle">
+      <div class="form_box">
+          <dil-form :disabled=true :formId="330" v-model="form1">
+          </dil-form>
+         
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      direction2:"",
+      formInline:{},
+      isShow:false,
+      src:"",
+      srcList:[],
+      src1:"",
+      srcList1:[],
+      src2:"",
+      srcList2:[],
+      inputText:"",
+      form1: {},
+      registerDate:"",
+      mapValue:"",
+      drawer: false,
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getCarrierBidAreaList?apiId=406",
+        selectionType: "radio",
+         mapList:[],
+         registerDate:"",
+         mapValue:""
+      },
+    };
+  },
+ 
+  mounted() {
+      console.log(this.$route)
+    this.information();
+  },
+
+  methods: {
+
+    
+    handleClose(){
+
+    },
+
+    onclick(){
+      this.options.requestUrl="/api/v1/rms/getCarrierBidAreaList?apiId=406&con=" +this.inputText;
+    },
+    currentRadioChange(selection){
+      this.mapList=selection, 
+      console.log(this.mapList) 
+      this.bidArea=this.mapList.bidArea
+     
+    },
+    information() {
+      //编辑
+      this.axios
+        .post(
+          "/api/v1/rms/getCarrierById/" +
+            this.$route.params.carrierId
+        )
+        .then((res) => {
+            
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            this.srcList=[];
+            this.srcList1=[];
+            this.srcList2=[];
+            this.isShow=true;
+            this.src=e.carrierBusinessAblelicense;
+            this.srcList.push(e.carrierBusinessAblelicense);
+            this.src1=e.carrierBusinessLicense;
+            this.srcList1.push(e.carrierBusinessLicense);
+            this.src2=e.carrierTransportCertificate;
+            this.srcList2.push(e.carrierTransportCertificate);
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {  
+       let RmsCarrier={
+        carrierId:this.$route.params.carrierId,
+        carrierName:this.form1.carrierName,
+        carrierTransportCertificate:this.form1.carrierTransportCertificate,
+        carrierBusinessLicense:this.form1.carrierBusinessLicense,
+        carrierBusinessAblelicense:this.form1.carrierBusinessAblelicense,
+        carrierAbbreviation:this.form1.carrierAbbreviation,
+        carrierAddress:this.form1.carrierAddress,
+        registerNo:this.form1.registerNo,
+        carrierBidAreaId:this.mapList.bidAreaId,
+        carrierLegalRepresentative:this.form1.carrierLegalRepresentative,
+        registerCapital:this.form1.registerCapital,
+        businessScope:this.form1.businessScope,
+        annualDate:this.form1.annualDate,
+        companyStatusDesc:this.form1.companyStatusDesc,
+        companyTypeDesc:this.form1.companyTypeDesc,
+        operationPeriod:this.form1.operationPeriod,
+        registerOrganization:this.form1.registerOrganization,
+        registerAptitudes:this.form1.registerAptitudes,
+        contactsName:this.form1.contactsName,
+        carrierContactNumber:this.form1.carrierContactNumber,
+        carrierType:this.form1.carrierType,
+        carrierTransportType:this.form1.carrierTransportType
+      };
+       let registerDate={
+        registerDate: this.form1.registerDate,
+      };
+      let mapValue={
+        RmsCarrier:RmsCarrier,
+        registerDate:registerDate
+      };
+       if(
+        RmsCarrier.carrierName ==null ||
+       // RmsCarrier.carrierTransportCertificate ==null ||
+       // RmsCarrier.carrierBusinessLicense ==null ||
+       // RmsCarrier.carrierBusinessAblelicense ==null ||
+        RmsCarrier.carrierAbbreviation ==null ||
+        RmsCarrier.carrierAddress ==null ||
+        RmsCarrier.registerNo ==null ||
+        RmsCarrier.carrierBidAreaId ==null || 
+        RmsCarrier.carrierLegalRepresentative ==null ||
+        RmsCarrier.registerCapital ==null ||
+        RmsCarrier.businessScope ==null ||
+        RmsCarrier.annualDate ==null ||
+        RmsCarrier.companyStatusDesc ==null ||
+        RmsCarrier.companyTypeDesc ==null ||
+        RmsCarrier.operationPeriod ==null ||
+        registerDate.registerDate ==null ||
+        RmsCarrier.registerOrganization ==null ||
+        RmsCarrier.registerAptitudes ==null ||
+        RmsCarrier.contactsName ==null ||
+        RmsCarrier.carrierContactNumber ==null ||
+        RmsCarrier.carrierType ==null ||
+        RmsCarrier.carrierTransportType ==null 
+      )this.$message.error("存在空值！");
+        this.axios
+          .post(
+            "/api/v1/rms/updateCarrier",
+            mapValue
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$router.go(-1);
+            }
+          });
+    },
+  },
+};
+</script>
+<style lang='scss'>
+
+.imageStyle{
+    height:150px;
+    text-align:center
+ }
+  .contractimage{
+    text-align: center;
+    position: relative;
+    left: 85px;
+  }
+  .form_box {
+    display: flex;
+    justify-content: center;
+    margin-left: 170px;
+    margin-top: 15px;
+    .el-form-item {
+      display: flex;
+      justify-content: center;
+      .el-form-item__label {
+        display: flex;
+        align-items: center;
+      }
+      .el-form-item__content {
+        width: 250px;
+        .el-radio-group {
+          width: 500px;
+        }
+        .el-date-editor {
+          width: 250px;
+        }
+        .el-input__inner {
+          width: 250px;
+        }
+      }
+    }
+  }
+.center{
+   display: flex;
+    justify-content: center;
+}
+.button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
+</style>

src/views/RMS/router/index.js

@@ -24,6 +24,7 @@ import addTruckCalculate from '../components/addTruckCalculate.vue'
 import capacity from '../components/capacity.vue'
 import carDriver from '../components/carDriver.vue'
 import carrier from '../components/carrier.vue'
+import addOtherCapacity from '../components/addOtherCapacity'
 
 import editCapacity from '../components/editCapacity.vue'
 import editCarDriver from '../components/editCarDriver.vue'
@@ -51,7 +52,9 @@ import rawMaterialManufacturer from '../components/rawMaterialManufacturer.vue'
 import rawWarehouse from '../components/rawWarehouse.vue'
 import rmsShipper from '../components/rmsShipper.vue'
 import supplier from '../components/supplier.vue'
-import transitRoute from '../components/transitRoute.vue'
+import transitRoute from '../components/transitRoute.vue'  
+import showCarrier from '../components/showCarrier.vue'
+import showCapacity from '../components/showCapacity.vue'
 import transitRouteAdd from '../components/transitRouteAdd.vue'
 import truckCalculate from '../components/truckCalculate.vue'
 import consignee from '../components/consignee.vue'
@@ -80,12 +83,15 @@ const constantRouterMap = [
 		{path: 'addRmsShipper', name: 'addRmsShipper', meta: {code: 'xtpzgl-yhgl'}, component: addRmsShipper},
 		{path: 'addSupplier', name: 'addSupplier', meta: {code: 'xtpzgl-yhgl'}, component: addSupplier},
 		{path: 'addTruckCalculate', name: 'addTruckCalculate', meta: {code: 'xtpzgl-yhgl'}, component: addTruckCalculate},
+		{path: 'addOtherCapacity', name: 'addOtherCapacity', meta: {code: 'xtpzgl-yhgl'}, component: addOtherCapacity},
 		{path: 'capacity', name: 'capacity', meta: {code: 'xtpzgl-yhgl'}, component: capacity},
 		{path: 'carDriver', name: 'carDriver', meta: {code: 'xtpzgl-yhgl'}, component: carDriver},
-		{path: 'carrier', name: 'carrier', meta: {code: 'xtpzgl-yhgl'}, component: carrier},
+		{path: 'carrier', name: 'carrier', meta: {code: 'xtpzgl-yhgl'}, component: carrier},  
 		{path: 'editCapacity/:capacityId', name: 'editCapacity', meta: {code: 'xtpzgl-yhgl'}, component: editCapacity},
 		{path: 'editCarDriver/:driverId', name: 'editCarDriver', meta: {code: 'xtpzgl-yhgl'}, component: editCarDriver},
 		{path: 'editCarrier/:carrierId', name: 'editCarrier', meta: {code: 'xtpzgl-yhgl'}, component: editCarrier},
+		{path: 'showCarrier/:carrierId', name: 'showCarrier', meta: {code: 'xtpzgl-yhgl'}, component: showCarrier},
+		{path: 'showCapacity/:capacityId', name: 'showCapacity', meta: {code: 'xtpzgl-yhgl'}, component: showCapacity},
 		{path: 'editConsignee/:consigneeId',name: 'editConsignee',meta:{code: 'xtpzgl-yhgl'},component: editConsignee},
 		{path: 'editGatepost/:gatepostId', name: 'editGatepost', meta: {code: 'xtpzgl-yhgl'}, component: editGatepost},
 		{path: 'editMaterial/:materialId', name: 'editMaterial', meta: {code: 'xtpzgl-yhgl'}, component: editMaterial},

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

@@ -3,7 +3,12 @@
   <!-- 零星物资进厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -15,11 +20,14 @@
 
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
       input: null,
+      startTime: null,
+      endTime: null,
       option: {
         // 表格请求数据的地址
         requestUrl: "",
@@ -35,12 +43,23 @@ export default {
   },
   methods: {
     onclick() {
-      if(this.input != null){
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
           if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
-          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=15&con=" + this.input
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=15&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           }else{
-          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=15&userId=" + getCookie("orgCode") + "&con=" + this.input
-               }
+            this.startTime = null;
+            this.endTime = null;
+            this.$message.warning("开始时间要比结束时间早");
+          }
       }else{
           this.$message.warning("未输入查询条件")
           if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
@@ -48,10 +67,11 @@ export default {
           }else{
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=15&userId=" + getCookie("orgCode")
           }
-      }  
-    },
-  },
-};
+      }
+      }
+    }
+  }
+}
 </script>
 <style lang='scss' scoped>
 .homeworkPath {

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

@@ -3,7 +3,12 @@
   <!-- 零星物资出厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -15,11 +20,14 @@
 
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
       input: null,
+      startTime: null,
+      endTime: null,
       option: {
         // 表格请求数据的地址
         requestUrl: "",
@@ -35,12 +43,23 @@ export default {
   },
   methods: {
     onclick() {
-      if(this.input != null){
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
           if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
-          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16&con=" + this.input
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           }else{
-          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16&userId=" + getCookie("orgCode") + "&con=" + this.input
-               }
+          this.startTime = null;
+            this.endTime = null;
+            this.$message.warning("开始时间要比结束时间早");
+          }
       }else{
           this.$message.warning("未输入查询条件")
           if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
@@ -48,7 +67,8 @@ export default {
           }else{
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16&userId=" + getCookie("orgCode")
           }
-      }  
+        }  
+      }
     },
   },
 };

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

@@ -0,0 +1,120 @@
+//出厂
+<template>
+  <!-- 零星物资出厂作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+       <span class="text">出厂时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text1">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+       <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <span class="text">流向：</span>
+      <el-select
+        class="select"
+        v-model="flow"
+        placeholder="请选择"
+        @change="onchange()"
+      >
+        <el-option
+          v-for="item in flowList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <span class="span"></span>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      startTime: null,
+      endTime: null,
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+      flow:null,
+      flowList:[{
+          value: 12,
+          label: "进厂",
+        },
+        {
+          value: 13,
+          label: "出厂",
+        },
+        {
+          value: 14,
+          label: "中转",
+        },
+        {
+          value: 19,
+          label: "退货",
+        },
+        ]
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=100"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=100&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onchange(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=" + this.flow
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&userId=" + getCookie("orgCode") + "&orderType=" + this.flow
+      }
+    },
+    onclick() {
+        let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=20&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+          }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=20&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+        
+      }  
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,93 @@
+//卸货
+<template>
+  <!-- 零星物资卸货卸货实绩页面 -->
+  <div class="homeworkPath">
+   <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <span class="text">流向：</span>
+      <el-select
+        class="select"
+        v-model="flow"
+        placeholder="请选择"
+        @change="onchange()"
+      >
+        <el-option
+          v-for="item in flowList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <span class="span"></span>
+    </div>
+    <dilTable v-bind.sync="option"></dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+      flow:null,
+      flowList:[{
+          value: 12,
+          label: "进厂",
+        },
+        {
+          value: 13,
+          label: "出厂",
+        },
+        {
+          value: 14,
+          label: "中转",
+        },
+        {
+          value: 19,
+          label: "退货",
+        },
+        ]
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=430&orderType=100&status=0"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=430&orderType=100&status=0&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onchange(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=430&status=0" + "&orderType=" + this.flow
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=430&status=0&userId=" + getCookie("orgCode") + "&orderType=" + this.flow
+      }
+    },
+    onclick() {
+          this.$message.info("功能暂时关闭")
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

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

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

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

@@ -0,0 +1,93 @@
+//计毛
+<template>
+  <!-- 零星物资计毛作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <span class="text">流向：</span>
+      <el-select
+        class="select"
+        v-model="flow"
+        placeholder="请选择"
+        @change="onchange()"
+      >
+        <el-option
+          v-for="item in flowList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <span class="span"></span>
+    </div>
+    
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+      flow:null,
+      flowList:[{
+          value: 12,
+          label: "进厂",
+        },
+        {
+          value: 13,
+          label: "出厂",
+        },
+        {
+          value: 14,
+          label: "中转",
+        },
+        {
+          value: 19,
+          label: "退货",
+        },
+        ]
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=100"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=100&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onchange(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=" + this.flow
+      }else{
+      }
+    },
+    onclick() {
+      this.$message.info("功能暂时关闭")
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,94 @@
+//计皮
+<template>
+  <!-- 零星物资计皮作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <span class="text">流向：</span>
+      <el-select
+        class="select"
+        v-model="flow"
+        placeholder="请选择"
+        @change="onchange()"
+      >
+        <el-option
+          v-for="item in flowList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <span class="span"></span>
+    </div>
+
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+      flow:null,
+      flowList:[{
+          value: 12,
+          label: "进厂",
+        },
+        {
+          value: 13,
+          label: "出厂",
+        },
+        {
+          value: 14,
+          label: "中转",
+        },
+        {
+          value: 19,
+          label: "退货",
+        },
+        ]
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=100"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=100&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onchange(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=" + this.flow
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&userId=" + getCookie("orgCode") + "&orderType=" + this.flow
+      }
+    },
+    onclick() {
+      this.$message.info("功能暂时关闭")
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,93 @@
+//卸货
+<template>
+  <!-- 零星物资卸货卸货实绩页面 -->
+  <div class="homeworkPath">
+   <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <span class="text">流向：</span>
+      <el-select
+        class="select"
+        v-model="flow"
+        placeholder="请选择"
+        @change="onchange()"
+      >
+        <el-option
+          v-for="item in flowList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <span class="span"></span>
+    </div>
+    <dilTable v-bind.sync="option"></dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+      flow:null,
+      flowList:[{
+          value: 12,
+          label: "进厂",
+        },
+        {
+          value: 13,
+          label: "出厂",
+        },
+        {
+          value: 14,
+          label: "中转",
+        },
+        {
+          value: 19,
+          label: "退货",
+        },
+        ]
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=100"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=100&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onchange(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=" + this.flow
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=100&userId=" + getCookie("orgCode") + "&orderType=" + this.flow
+      }
+    },
+    onclick() {
+          this.$message.info("功能暂时关闭")
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,726 @@
+//新增运输需求
+<template>
+  <!-- 新增运输作业页面 -->
+  <div class="addSporadic">
+    <page-title>运输预约</page-title>
+    <div class="form-box">
+        <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+        >
+        <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"
+        >
+        <el-form-item label="收货单位">
+         <el-autocomplete
+          class="inline-input"
+          v-model="stateConsignee"
+          :fetch-suggestions="querySearchConsignee"
+          placeholder="请输入收货单位名称"
+          :trigger-on-focus="false"
+          @select="handleSelectConsignee"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.consigneeCompanyName }}</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-select v-model="orderType" placeholder="请选择" @change="flowChange">
+        <el-option
+          v-for="item in orderTypeList"
+          :key="item.value"
+          :label="item.label" 
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      </el-form-item>
+        </el-form>
+        <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+      >
+        <el-form-item label="选择路线">
+          <el-input v-model="lineName" placeholder="必填" disabled>
+          </el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="ondrawer(5)">浏览</el-button>
+        </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="stateCarrier"
+          :fetch-suggestions="querySearchCarrier"
+          placeholder="请输入承运商名称"
+          :trigger-on-focus="false"
+          @select="handleSelectCarrier"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.carrierName }}</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-input
+          class="inline-input"
+          v-model="materialTimes"
+          placeholder="趟次-非必填"
+          :trigger-on-focus="false"
+          @input="onInputTimes()"
+          @blur="onblur()"
+        >
+        </el-input>
+        </el-form-item>
+        </el-form>
+        <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+      >
+        <el-form-item label="选择物资">      
+        </el-form-item>
+        <el-form-item > 
+          <el-button type="primary" @click="drawTable" class="truckBtn"
+          >浏览</el-button>
+        </el-form-item>
+        </el-form>
+    </div>
+    <div class="lineId from">
+      <span class="text">该批车辆是否一车多趟：</span>
+      <el-switch v-model="isMoreTrips" active-text="是" inactive-text="否">
+      </el-switch>
+    </div>
+    <div class="swtichTop">
+    <span class="titile">点击浏览选择物资之前请选择物资单位！</span>
+    <div class="switch" v-if="tableData.length > 0">
+      <el-tooltip placement="top">
+        <div slot="content">下面表格已有数据，不能进行更改！！！</div>
+        <el-switch
+          v-model="value"
+          active-text="件数"
+          inactive-text="重量"
+          disabled
+        >
+        </el-switch>
+      </el-tooltip>
+    </div>
+    <div class="switch" v-else>
+      <el-tooltip placement="top">
+        <div slot="content">当下面表格有数据之后，将不能进行更改！！！</div>
+        <el-switch v-model="value" active-text="件数" inactive-text="重量">
+        </el-switch>
+      </el-tooltip>
+    </div>
+    </div>
+    <!-- 物资表格 -->
+    <div class="truckListTable">
+    <div class="selectionTable">
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+        highlight-current-row
+      >
+        <el-table-column
+          v-for="(item, i) in tableTop"
+          :key="i"
+          :prop="item.prop"
+          :label="item.label"
+          align="center"
+          show-overflow-tooltip
+        >
+          <template slot="scope" v-if="item.label !== '件数'">
+            <span>{{ item.label }}</span>
+          </template>
+          <!-- 插入输入框 -->
+          <template slot-scope="scope">
+            <template v-if="item.slot">
+                <!-- 装卸货优先级 -->
+               <template v-if="item.prop == 'materialPriority'">
+                <el-input
+                  class="textinput"
+                  v-model.number="scope.row.materialPriority"
+                  @input="onInputPriority(scope.row.materialPriority)"
+                ></el-input>
+              </template>
+              <!-- 物资件数 -->
+              <template v-if="item.prop == 'orderMaterialNumber'">
+                <el-input
+                  class="textinput"
+                  v-model.number="scope.row.orderMaterialNumber"
+                  @input="onInputNumber(scope.row.orderMaterialNumber)"
+                ></el-input>
+              </template>
+              <!-- 物资重量 -->
+               <template v-if="item.prop == 'orderMaterialWeight'">
+                <el-input
+                  v-model.number="scope.row.orderMaterialWeight"
+                  @input="onInputWeight(scope.row.orderMaterialWeight)"
+                ></el-input>
+              </template>           
+            </template>
+            <template v-else>
+              <span>{{ scope.row[item.prop] }}</span>
+            </template>
+          </template>
+        </el-table-column>
+        <!-- 操作列 -->
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              @click.native.prevent="deleteRow(scope.$index, tableData)"
+              type="text"
+              icon="el-icon-close"
+              size="big"
+            ></el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    </div>
+    <!-- 物资模态框 -->
+    <div class="drawSty">
+      <el-drawer
+      title="选择物资信息"
+      :visible.sync="table"
+      direction="rtl"
+      size="40%"
+      :show-close="false"
+    >
+      <el-input placeholder="请输入内容" v-model="inputMaterial" clearable > </el-input
+      ><el-button type="primary" class="btn" @click="onclickMaterial">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <!-- <el-button @click="open">取消</el-button> -->
+      <el-button type="primary" @click="makeSure1">确定</el-button>
+      <div class="tablecls">
+        <!-- 查询所有的物资 -->
+        <dilTable ref="materialTable" v-bind.sync="materialOptions" @selection-change="selectionChange" :drawer="aaadrawer">
+        </dilTable>
+      </div>
+    </el-drawer>
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" size="30%" :before-close="handleClose">
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        style="margin-top: 20px"
+        clearable
+      ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="onclick(a)"
+        style="margin-bottom: 0.9375rem"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <div v-show="a == 5">
+        <dilTable
+          v-bind.sync="line"
+          @radio-change="currentRadioChange5"
+        ></dilTable>
+      </div>
+    </el-drawer>
+    </div>  
+    <div class="button-box">
+      <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="makeSure" :disabled = "disabled">确认</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      inputLine:null,
+      aaadrawer:false,
+      disabled:false,
+      materialTimes:null,
+      options: [],
+      value: '',
+      receiveName:'',
+      stateCarrier:null,
+      stateSupplier:null,
+      stateConsignee:null,
+      restaurantsConsignee:null,
+      restaurantsSupplier:null,
+      orderTypeList:[
+        {
+          value:12,
+          label:'进厂'
+        },{
+          value:13,
+          label:'出厂'
+        },
+        {
+          value:14,
+          label:'中转'
+        },
+        {
+          value:19,
+          label:'退货'
+        }
+      ],
+      orderType:null,
+      restaurantsCarrier:null,
+      // 线路名称
+      lineName: "",
+      //线路id
+      lineId: null,
+      // 件数与重量的开关
+      value: false,
+      //物资模态框开关
+      table: false,
+      //一车多趟开关
+      isMoreTrips: false,
+      //物资表格表头
+      tableTop: [
+        {
+          prop: "materialCode",
+          label: "物资编码",
+          width: "160",
+        },
+        {
+          prop: "materialName",
+          label: "物资名称",
+          width: "140",
+        },
+        {
+          prop: "materialSpecification",
+          label: "规格型号",
+          width: "140",
+        },
+        {
+          prop: "materialPriority",
+          label: "装卸货优先级",
+          slot: true,
+        },
+        {
+          prop: "orderMaterialWeight",
+          label: "重量",
+          slot: true,
+        },
+      ],
+      // 收货单位ID
+      receiveId:null,
+      //承运商ID
+      carrierId:null,
+      //物资表格数据
+      tableData: [],
+      selectionList1: [],
+      newsArr:[],
+      //物资名称
+      materialName: "",
+      //发货单位名称
+      supplierName: "",
+      //发货单位id
+      supplierId: null,
+      //物资id
+      materialId: null,
+      //承运商id
+      carrierId:null,
+      //是否需要打开模态窗口
+      drawer: false,
+      a: 1,
+      direction: "rtl",
+      inputMaterial:null,
+      input:null,
+      //物资模态框
+      materialOptions:{
+          requestUrl:"",
+          selectionType: "select",
+      },
+      line: {
+        requestUrl: "",
+        selectionType: "radio",
+      },
+      row: {},
+    };
+  },
+  watch: {
+    value() {
+      if (this.value) {
+        console.log(this.value)
+        console.log(this.tableTop.length)
+        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.push({
+          prop: "orderMaterialNumber",
+          label: "件数",
+          slot: true,
+        });
+      } else {
+        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.push({
+          prop: "orderMaterialWeight",
+          label: "重量",
+          slot: true,
+        });
+      }
+    },
+  },
+  methods: {
+    //关闭运输线路
+    handleClose(done){
+        done()
+        this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3"
+    },
+    onclickMaterial(){
+        if(this.inputMaterial != null){
+          this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395&index=" + this.inputMaterial
+        }
+        else{
+          this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395"
+        }
+    },
+    onInputTimes(){
+      if(!isNumber(this.materialTimes)){
+        this.$message.warning('趟次请输入数字')
+      }
+    },
+    onblur(){
+      this.isMoreTrips = false
+      if(this.materaialTimes <= 0){
+        this.$message.warning('趟次必须大于0')
+        this.materialTimes = null
+      }
+      if(this.materialTimes > 1 ){
+        this.isMoreTrips = true
+      }
+    },
+    onInputPriority(scope){
+      if(!isNumber(scope)){
+        this.$message.warning('装卸货次序请输入数字')
+      }
+    },
+    onInputWeight(scope){
+      if(!isNumber(scope)){
+        this.$message.warning('重量请输入数字')
+      }
+    },
+    onInputNumber(scope){
+      if(!isNumber(scope)){
+        this.$message.warning('件数请输入数字')
+      }
+    },
+    //流向选择框变动后
+    flowChange(){
+      if(this.orderType == 12){
+        this.inputLine = "零星进厂"
+      }
+      if(this.orderType == 13){
+        this.inputLine = "零星出厂"
+      }
+      if(this.orderType == 14){
+        this.inputLine = "零星中转"
+      }
+      if(this.orderType == 19){
+        this.inputLine = "退货"
+      }
+    },
+    drawTable(){
+      this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395" +"&test=" + new Date()
+      this.selectionList1 = []
+      this.table = true
+    },
+    //收货单位弹出层
+    handleSelectConsignee(item){   
+      this.consigneeId = item.consigneeId
+      item.consigneeCompanyName = this.consigneeCompanyName
+  
+    },
+    //以下是发货单位边输边查搜索
+    querySearchConsignee(queryString, cb) {
+      this.axios.post('/api/v1/uc/getConsigneeByLike?index='+queryString).then((res)=>{
+        if(res.data.code == "200"){
+          console.log(res)
+          var restaurantsConsignee = res.data.data
+          var results = queryString ? restaurantsConsignee.filter(this.createFilterConsignee(queryString)) :restaurantsConsignee;
+            // 调用 callback 返回建议列表的数据
+          cb(results);
+        }
+      })    
+      },
+    createFilterConsignee(queryString) {
+        return (restaurantsConsignee) => {
+          return (restaurantsConsignee.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+      //以上是返回单位边输边查搜索
+     //发货单位弹出层
+    handleSelectSupplier(item){
+      this.supplierId = item.supplierId
+      item.supplierName = this.supplierName
+    },
+    //以下是发货单位边输边查搜索
+    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);
+        };
+      },
+    //承运商弹出层
+    handleSelectCarrier(item){    
+      this.carrierId = item.carrierId
+      item.carrierName = this.stateCarrier
+    },
+    //以下是承运商边输边查搜索
+    querySearchCarrier(queryString, cb) {
+        this.axios.post('/api/v1/uc/getCarrierMesByLike?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.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+    //以上是承运商边输边查搜索
+    //删除行
+    deleteRow(index, rows) {
+      rows.splice(index, 1);
+    },
+    // 返回主界面
+    makeSure1() {
+        var arr = []
+        for (let i = 0; i < this.newsArr.length; i++) {
+        if(arr.indexOf(this.newsArr[i]) === -1){
+            arr.push(this.newsArr[i]);
+        }
+        }
+        arr.forEach( (e) => {
+          let addmap = {
+            materialSpecification:e.materialSpecification,
+            materialName:e.materialName,
+            materialCode:e.materialCode,
+            materialId:e.materialId,
+            materialPriority:1
+          }
+          this.tableData.push(addmap)
+        })
+        this.newsArr = []
+        this.table = false
+    },
+      // 返回选中的物资信息
+    selectionChange(selection) {
+      console.log(selection)
+      this.selectionList1 = []
+      this.selectionList1 = selection
+      this.newsArr = []
+      for (let i = 0; i < this.selectionList1.length; i++) {
+        if(this.newsArr.indexOf(this.selectionList1[i]) === -1){
+        this.newsArr.push(this.selectionList1[i]);
+        }
+        }
+    },
+    onclick(a) {
+      if (a == 5) {
+        this.line.requestUrl =
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
+      }
+    },
+    ondrawer(num) {
+      this.line.requestUrl =
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3" + "&t=" + new Date() + "&con=" + this.inputLine;
+      this.drawer = true;
+      this.a = num;
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.push("/oldSporadicAppoint");
+    },
+    currentRadioChange5(selection) {
+      if(selection.lineName == null &&selection.lineDesk == null){
+          this.lineName = ''
+      }else{
+          this.lineName = selection.lineName+'  '+selection.lineDesk 
+          this.lineId = selection.lineId;
+      }    
+    },
+    // 确认
+    makeSure() {
+        if(this.isMoreTrips == false){
+          this.materialTimes = 1
+        }
+        if(Number(this.materialTimes) != 0){
+          this.isMoreTrips = true
+        }
+        this.disabled = true
+        if(this.supplierId==null||this.lineId==null||this.consigneeId==null||this.carrierId==null){
+          this.disabled = false
+          this.$message.warning("存在值未填写")
+          return
+        }else if(this.tableData.length == 0){
+          this.disabled = false
+          this.$message.warning("请点击浏览勾选物资")
+          return
+        }
+        var i = 0;
+        var j = 0;
+        this.tableData.forEach((e) => {
+          if(e.materialPriority == null){
+            i++
+          }else if(e.orderMaterialWeight == null){            
+            j++
+          }            
+        })
+        if(i != 0){
+           this.$message.warning("装卸货优先级未填写")
+           this.disabled = false
+           return
+        }else if(j != 0){
+           this.$message.warning("物资重量未填写")
+           this.disabled = false
+           return
+        }
+        let amsOrder = {
+          supplierId:this.supplierId,
+          lineId:this.lineId,
+          carrierId: this.carrierId,
+          orderType:this.orderType,
+          receiveId: this.consigneeId,
+          userId:getCookie("orgCode"),
+          orderTime:this.materialTimes,
+          mapList: this.tableData,
+          isMoreTrips:Number(this.isMoreTrips)
+          
+        };
+        console.log(amsOrder)
+        debugger
+        this.axios.post("/api/v1/ams/addSporadicOrders", amsOrder).then((res) => {
+          if (res.data.code == "200") {
+            this.onClickCancel()
+            this.disabled = false
+          }else{
+            this.disabled = false
+          }
+        });
+      }
+    },
+};
+</script>
+<style lang="scss" scoped>
+.addSporadic{
+  .contractDetails {
+  width: 100%;
+}
+.drawSty{
+  .el-input{
+    width: 240px;
+  }
+}
+.lineId {
+  display: flex;
+  justify-content: center;
+  .text {
+    display: inline-block;
+    width: 190px;
+    text-align: right;
+    font-size: 16px;
+  }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+  .span {
+    display: inline-block;
+    width: 70px;
+    height: 1px;
+  }
+}
+.swtichTop{
+  display: flex;
+  height: 40px;
+  align-content: center;
+  justify-content: center;
+  padding-right:20px ;
+  .titile{
+    color: red;
+    font-size: 14px;
+  }
+  .switch{
+    margin-right: -60px
+  }
+}
+.form-box {
+  display: inline-block !important;
+  margin-left: 488px;
+  .el-input {
+    width: 320px;
+  }
+  .el-select{
+    width: 320px;
+  }
+  .el-autocomplete{
+    width: 320px;
+  }
+  .el-form {
+    padding: 10px;
+  }
+  .truckBtn{
+    width: 320px;
+  }
+}
+.button-box {
+  margin-left: 45% ;
+}
+}
+</style>

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

@@ -0,0 +1 @@
+//编辑运输预约

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

@@ -0,0 +1,455 @@
+//运输预约展现
+<template>
+  <!-- 零星物资运输预约 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="insertClick">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+      <el-button
+        type="primary"
+        @click="sendClick()"
+        v-if="this.activeName == 'first'"
+      >
+        <i class="el-icon-bottom"></i>下发
+      </el-button>
+    </div>
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <!-- 未下发 -->
+      <el-tab-pane label="未下发" name="first">
+        <dilTable
+          v-bind.sync="option1"
+          ref="table"
+          @selection-change="selectionChange"
+        >
+          <el-table-column
+            fixed="right"
+            label="操作"
+            width="120"
+          >
+            <template slot-scope="scope">
+              <el-button @click="deleteClick(scope)" type="text" size="small">
+                删除
+              </el-button>
+              <el-button @click="getMatrialDetails1(scope.row)" type="text" size="small">
+                物资详情
+              </el-button>
+            </template>
+          </el-table-column>
+          //物资详情抽屉
+          <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData" border >
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
+        </dilTable>
+      </el-tab-pane>
+      <!-- 已下发 -->
+      <el-tab-pane label="已下发" name="second">
+        <dilTable v-bind.sync="option2" ref="table1">
+          <el-table-column
+            fixed="right"
+            label="操作"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <el-button @click="getMatrialDetails2(scope.row)" type="text" size="small">
+                物资详情
+              </el-button>
+              <el-button @click="stopSpoOrder(scope)" type="text" size="small">
+                停止
+              </el-button>
+            </template>
+          </el-table-column>
+          //物资详情抽屉
+          <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData1" border >
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
+        </dilTable>
+      </el-tab-pane>
+       <!-- 已接单 -->
+      <el-tab-pane label="已接单" name="third">
+        <dilTable v-bind.sync="option3" ref="table2">
+           <el-table-column
+            fixed="right"
+            label="操作"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <el-button @click="getMatrialDetails3(scope.row)" type="text" size="small">
+                物资详情
+              </el-button>
+            </template>
+          </el-table-column>
+          //物资详情抽屉
+          <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData1" border >
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
+        </dilTable>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "inplantTMS",
+  data() {
+    return {
+      input: null,
+      Time: "",
+      activeName: "first",
+      option1: {
+        // 表格请求数据的地址
+        requestUrl:
+          "",
+        // 控制显示多选列
+        selectionType: "select",
+      },
+      option2: {
+        // 表格请求数据的地址
+        requestUrl:
+          "",
+      },
+      option3: {
+        // 表格请求数据的地址
+        requestUrl:
+          "",
+      },
+      selection: [],
+      maplist:[],
+       //记录旧的row对象
+      oldRow: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
+      oldRowCount: 1,
+      //记录旧的row对象
+      oldRow1: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
+      oldRowCount1: 1,
+      oldRow2: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
+      oldRowCount2: 1,
+      tableHead: [
+        {
+          prop: "materialName",
+          label: "物资名称",
+          width: 150,
+        },
+        {
+          prop: "specificationModel",
+          label: "规格型号",
+          width: 150,
+        },
+        {
+          prop: "materialNumber",
+          label: "物资件数",
+          width: 100,
+        },
+        {
+          prop: "materialWeight",
+          label: "物资重量",
+          width: 100,
+        },
+      ],
+      tableData: [],
+      tableData1:[],
+      tableData2:[]
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0",
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1",
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1"       
+      }else{
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&userId=" + getCookie("orgCode"),
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&userId=" + getCookie("orgCode"),
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&userId=" + getCookie("orgCode")
+      } 
+  },
+  methods: {
+    getRequestUrl(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&test=" + new Date(),
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&test=" + new Date(),
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&test=" + new Date()
+      }else{
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&userId=" + getCookie("orgCode") + "&test=" + new Date(),
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&userId=" + getCookie("orgCode") + "&test=" + new Date(),
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&userId=" + getCookie("orgCode") + "&test=" + new Date()
+     }
+    },
+    stopSpoOrder(scope){
+      this.$confirm("是否停止", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/ams/closeSporadicOrder" ,{
+              sporadicOrderId : scope.row.sporadicOrderId
+            })
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "成功停止!",
+                });
+              this.getRequestUrl()
+              } else {
+                this.$message({
+                  message: "停止失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "停止操作已取消!",
+          });
+        });
+    },
+    //获取选中的订单
+    selectionChange(selection) {
+      this.maplist = selection;
+    },
+    onclick() {
+      if(this.input != null){
+        if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu")
+        {
+          if(this.activeName == "first"){
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&orderType=12&dispatchStatus=0&con=" + this.input
+          }else if(this.activeName == "second"){
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&con=" + this.input
+          }else{
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=11&con=" + this.input
+          }                
+        }else
+        {
+          if(this.activeName == "first"){
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("orgCode") + "&con=" + this.input
+          }else if(this.activeName == "second"){
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&userId=" + getCookie("orgCode") + "&con=" + this.input
+          }else{
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=11&userId=" + getCookie("orgCode") + "&con=" + this.input
+          }       
+        }
+        }else{
+        this.$message.warning("未输入查询条件")
+        }
+    },
+    handleClick(tab, event) {
+      this.getRequestUrl()
+    },
+    // 下发
+    sendClick() {
+      if(this.maplist.length == 0){
+        this.$message.warning('未选择零星订单')
+        return
+      }
+      this.axios
+        .post("/api/v1/ams/issueSporadicOrders", this.maplist)
+        .then((res) => {
+          if (res.data.code == "200") {
+            this.getRequestUrl()
+            // this.$router.go(0)
+            this.$message({
+              type: "success",
+              message: "下发成功!",
+            });
+            this.maplist = []
+          }
+        });
+    },
+    // 删除
+    deleteClick(scope) {
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+          .post(
+          "/api/v1/ams/deleteSporadicOrders?sporadicOrderId=" +
+            scope.row.sporadicOrderId
+            )
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "成功删除!",
+                });
+              this.getRequestUrl()
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    //新增
+    insertClick() {
+      this.$router.push("addOldSporadicAppoint");
+    },
+    //获取物资详情--未下发
+    getMatrialDetails1(row){
+      console.log("wuzixq")
+      // 记录重复点击次数
+      if (this.oldRow === row) {
+        this.oldRowCount += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow != "") {
+        if (this.oldRow != row) {
+          if (this.oldRowCount % 2 === 1) {
+            this.$refs.table.toggleRowExpansion(this.oldRow);
+          } else {
+            this.oldRowCount = 1;
+          }
+        } else {
+          this.oldRow = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow = row;
+      this.axios.post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId).then((res) =>{
+        console.log(res.data.data)
+        this.tableData = res.data.data
+      })
+    },
+    //获取物资详情--已下发
+
+    getMatrialDetails2(row){
+      console.log("wuzixq")
+      // 记录重复点击次数
+      if (this.oldRow1 === row) {
+        this.oldRowCount1 += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table1.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow1 != "") {
+        if (this.oldRow1 != row) {
+          if (this.oldRowCount1 % 2 === 1) {
+            this.$refs.table1.toggleRowExpansion(this.oldRow1);
+          } else {
+            this.oldRowCount1 = 1;
+          }
+        } else {
+          this.oldRow1 = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow1 = row;
+      this.axios.post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId).then((res) =>{
+        console.log(res.data.data)
+        this.tableData1 = res.data.data
+      })
+    },
+    getMatrialDetails3(row){
+      // 记录重复点击次数
+      if (this.oldRow2 === row) {
+        this.oldRowCount2 += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table2.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow2 != "") {
+        if (this.oldRow2 != row) {
+          if (this.oldRowCount2 % 2 === 1) {
+            this.$refs.table2.toggleRowExpansion(this.oldRow2);
+          } else {
+            this.oldRowCount2 = 1;
+          }
+        } else {
+          this.oldRow2 = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow2 = row;
+      this.axios.post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId).then((res) =>{
+        console.log(res.data.data)
+        this.tableData1 = res.data.data
+      })
+    }
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 40px;
+    .el-input {
+      width: 250px;
+      margin-right: 20px;
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,401 @@
+//新增运输派单
+//新增运输订单
+<template>
+  <div class="addSaleOrderSend">
+    <page-title>新增运输订单派车</page-title>
+    <!-- 零星订单表的数据 -->
+    <div class="saleOrder">
+      <dilTable
+        v-bind.sync="option"
+        @radio-change="currentRadioChange"
+        ref="table"
+      >
+        <el-table-column
+            fixed="right"
+            label="操作"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <el-button @click="getMatrialDetails1(scope.row)" type="text" size="small">
+                物资详情
+              </el-button>
+            </template>
+          </el-table-column>
+          //物资详情抽屉
+          <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData" border >
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+    <!-- 表单选择车辆-->
+    <div class="from">
+      <div class="vehicle">
+        <span class="text">车辆</span>
+        <el-button type="primary" @click="onClick(2)">浏览</el-button>
+        <span class="span"></span>
+      </div>
+    </div>
+    <!-- 派车表格 -->
+    <div class="selectionTable from">
+      <el-table
+        :data="selectionList"
+        border
+        style="width: 100%"
+        highlight-current-row
+      >
+        <el-table-column type="index" label="序号" width="50">
+        </el-table-column>
+        <el-table-column
+          v-for="(item, i) in tableTop"
+          :key="i"
+          :prop="item.prop"
+          :label="item.label"
+          :width="item.width"
+          align="center"
+          show-overflow-tooltip
+        >
+        </el-table-column>
+        <!-- 操作列 -->
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              @click="deleteRow(scope.$index)"
+              type="text"
+              icon="el-icon-close"
+              size="big"
+            ></el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!-- 车辆模态框 -->
+    <el-drawer 
+      :visible.sync="truckDrawer" 
+      :with-header="false"
+      :destroy-on-close="false"
+      direction="rtl"
+      size="40%"
+      :show-close="false"
+      :wrapperClosable="false"
+      modal
+      close-on-press-escape
+    
+    >
+      <el-input
+        placeholder="请输入内容"
+        v-model="truckText"
+        style="margin-top: 10px; margin-left: 20px; width: 250px"
+        clearable
+      >
+      </el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="selectTruckClick"
+        style="margin-left: 5px"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="AddTruckClick"
+        style="margin-left: 5px"
+      >
+        <i class="el-icon-check"></i>确定
+      </el-button>
+      <div class="tablecls">
+        <!-- 查询所有的车辆 -->
+        <dilTable
+          v-bind.sync="truck"
+          @selection-change="currentRadioChange1"
+        ></dilTable>
+      </div>
+    </el-drawer>
+    <div class="button_box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure" :disabled = "disabled" >确定</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import PageTitle from "@/components/Page/Title";
+import { getCookie } from "@/utils/util.js";
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      disabled:false,
+      //零星订单ID
+      sporadicOrderId:null,
+      //运输订单ID
+      orderId:null,
+      //线路名称
+      lineName:null,
+      //已经选择车辆物资信息
+      selectionList:[],
+      //销售订单物资信息
+      option: {
+        // 表格请求数据的地址
+        requestUrl:"",
+        // 控制显示当选列
+        selectionType: "radio",
+        isPagination: false,
+      },
+      //当前选中的物资id
+      materialId: null,
+      //当前选中的物资名称
+      materialName: null,   
+      //是否打开选择车辆的模态框
+      truckDrawer:false,
+      //车辆的表格
+      truck: {
+        requestUrl: "",
+        selectionType: "select",
+      },
+      tableTop: [
+        {
+          prop: "capacityNumber",
+          label: "车牌号",
+        }
+      ],
+      truckText:null,
+      //当前多选选中的车辆
+      selectTruck:[],
+       //记录旧的row对象
+      oldRow: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
+      oldRowCount: 1,
+      tableHead: [
+        {
+          prop: "materialName",
+          label: "物资名称",
+          width: 150,
+        },
+        {
+          prop: "specificationModel",
+          label: "规格型号",
+          width: 150,
+        },
+        {
+          prop: "materialNumber",
+          label: "物资件数",
+          width: 100,
+        },
+        {
+          prop: "materialWeight",
+          label: "物资重量",
+          width: 100,
+        },
+      ],
+      tableData: [],
+    };
+  },
+  created() {
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+        getCookie("userId");
+        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&dispatchStatus=0&sporadicStatus=0&carrierSsoId=" + getCookie("userId");
+    } else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "wuliuchuyunzhongxin"){
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
+        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&dispatchStatus=0&sporadicStatus=0";
+    }else{
+        this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
+        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&dispatchStatus=0&sporadicStatus=0&userId=" + getCookie("orgCode");
+    }
+  },
+  methods: {
+    //点击确定按钮的事件
+    makeSure(){
+       console.log(this.selectionList)
+        this.disabled = true
+        console.log(this.orderId)
+        if(this.orderId == null){
+          this.$message.error("未勾选零星订单")
+          this.disabled = false
+          return 
+        }else if(this.selectionList.length == 0){
+          this.$message.error("未选择车辆")
+          this.disabled = false
+          return
+        }
+        this.axios.post('/api/v1/ams/addSporadicOrderTimes',{
+          orderId:this.orderId,
+          sporadicOrderId:this.sporadicOrderId,
+          mapList:this.selectionList,
+        }).then((res)=>{
+          if(res.data.code == '200'){
+            this.$message.success('派车成功')
+            this.disabled = false
+            this.cancel();
+          }
+        })
+    },
+    //点击取消按钮的事件
+    cancel(){
+      this.$router.push('/oldSporadicOrder')
+    },
+    //点击删除按钮删除当前点击的对象
+    deleteRow(index){
+      this.selectionList.splice(index,1)
+    },
+    //车辆模态框的确定事件
+    AddTruckClick(){
+      this.selectTruck.forEach(e => {
+        this.selectionList.push({
+          capacityId:e.capacityId,
+          capacityNumber:e.capacityNumber,
+        })
+      });
+      this.truckDrawer = false;
+    },
+    //车辆模态框框计算
+    selectTruckClick(){
+      if(this.truckText != null){
+        if (getCookie("orgCode") == "chengyunshang") {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+          getCookie("userId") + "&index="+this.truckText;
+      }else {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&index="+this.truckText;
+      }
+        this.truckText = null
+      }else{
+         if (getCookie("orgCode") == "chengyunshang") {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+          getCookie("userId") + "&i=" + new Date()
+      }else {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&i=" + new Date()
+      }
+      }
+    
+    },
+    //车辆表格
+    currentRadioChange1(select){
+      this.selectTruck = [];
+      this.selectTruck = select;
+    },
+    //主界面表格单选
+    currentRadioChange(row) {
+      console.log(row)
+      this.sporadicOrderId = row.sporadicOrderId
+      this.orderId = row.orderId
+    },
+    //获取物资详情--未下发
+    getMatrialDetails1(row){
+      console.log("wuzixq")
+      // 记录重复点击次数
+      if (this.oldRow === row) {
+        this.oldRowCount += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow != "") {
+        if (this.oldRow != row) {
+          if (this.oldRowCount % 2 === 1) {
+            this.$refs.table.toggleRowExpansion(this.oldRow);
+          } else {
+            this.oldRowCount = 1;
+          }
+        } else {
+          this.oldRow = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow = row;
+      this.axios.post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId).then((res) =>{
+        console.log(res.data.data)
+        this.tableData = res.data.data
+      })
+    },
+    onClick() {
+      if(getCookie("orgCode") == "chengyunshang") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+        getCookie("userId") + "&t=" + new Date();
+    }else if(getCookie("orgCode") == "biemeierchejian") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&con=" + "铁专线精煤" + "&t=" + new Date();
+    }
+     else {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null  + "&t=" + new Date();
+    } 
+      this.truckDrawer = true
+    },
+  },
+};
+</script>
+<style lang='scss'>
+.addSaleOrderSend {
+  .el-drawer__body {
+   overflow: auto;
+  }
+  .el-drawer__container ::-webkit-scrollbar{
+    display: none;
+  }
+  .from {
+    margin-top: 20px;
+    .line {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .el-input {
+        width: 250px;
+        margin-left: 10px;
+        margin-right: 10px;
+      }
+    }
+    .vehicle {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin-top: 20px;
+      .el-button {
+        width: 250px;
+        margin-left: 10px;
+        margin-right: 10px;
+      }
+      .span {
+        width: 70px;
+      }
+    }
+  }
+  .tablecls{
+    margin-top: 20px;
+  }
+  .button_box{
+    display: flex;
+    justify-content: center;
+    margin: 20px;
+    .el-button{
+      width: 100px;
+      margin-left: 20px;
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,524 @@
+//运输派单
+<template>
+  <div class="transportOrder">
+    <div class="transportOrder_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>
+      <el-button type="primary" @click="Insert" v-if="activeName == 'first'">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <el-dialog title="车辆信息" :visible.sync="dialogTableVisible" :before-close="handleClose">
+    <el-input style="width:250px" v-model="truckText"></el-input>
+    <el-button type="primary" @click="getCapacity" >查询</el-button>
+    <dilTable
+          v-bind.sync="truck"
+          @radio-change="currentRadioChange1"
+        ></dilTable>
+    <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogTableVisible = false">取 消</el-button>
+    <el-button type="primary" @click="updateTruckCapacity()">确 定</el-button>
+    </span>
+    </el-dialog>
+    <div class="transportOrder_bottom">
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tab-pane label="未接收" name="first">
+          <dilTable v-bind.sync="first" ref="table">
+            <el-table-column
+            fixed="right"
+            label="操作"
+            width="150"
+          >
+            <template slot-scope="scope">
+               <el-button @click="updateClick(scope)" type="text" size="small">
+                修改
+              </el-button>
+             <el-button @click="deleteClick(scope)" type="text" size="small">
+                删除
+              </el-button>
+              <el-button @click="getMatrialDetails1(scope.row)" type="text" size="small">
+                物资详情
+              </el-button>
+            </template>
+          </el-table-column>
+          //物资详情抽屉
+          <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData" border >
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
+          </dilTable>
+        </el-tab-pane>
+        <!-- 已接收 -->
+        <el-tab-pane label="已接收" name="Received">
+          <dilTable v-bind.sync="Received" ref="table1">
+            <el-table-column
+            fixed="right"
+            label="操作"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <el-button @click="deleteClick(scope)" type="text" size="small">
+                关闭
+              </el-button>
+              <el-button @click="getMatrialDetails2(scope.row)" type="text" size="small">
+                物资详情
+              </el-button>
+            </template>
+          </el-table-column>
+          //物资详情抽屉
+          <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData1" border >
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
+          </dilTable>
+        </el-tab-pane>
+         <!-- 已完成 -->
+        <el-tab-pane label="已完成" name="completed">
+          <dilTable v-bind.sync="completed" ref="table2">
+            <el-table-column
+            fixed="right"
+            label="操作"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <el-button @click="getMatrialDetails3(scope.row)" type="text" size="small">
+                物资详情
+              </el-button>
+            </template>
+          </el-table-column>
+          //物资详情抽屉
+          <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData2" border >
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
+          </dilTable>
+        </el-tab-pane>
+         <!-- 已拒绝 -->
+        <el-tab-pane label="已拒绝" name="refused">
+          <dilTable v-bind.sync="refused">
+            <el-table-column
+            fixed="right"
+            label="操作"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <el-button @click="ctrlZClick(scope)" type="text" size="small">
+                撤销
+              </el-button>
+            </template>
+          </el-table-column>
+          </dilTable>
+        </el-tab-pane>
+      </el-tabs>
+    </div> 
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  data() {
+    return {
+      carrierUserId:'',
+      //模态窗的框计算
+      inputText: null,
+      //车辆输入框
+      truckText:null,
+      //是否弹出对话框
+      dialogTableVisible: false,
+      //输入框的值
+      input: "",
+      //选项卡的当前选中的值
+      activeName: "first",
+      //已下发的表格
+      first: {
+        requestUrl:"",
+      },
+      //车辆信息的表格
+      truck: {
+        requestUrl: "" ,
+        // 控制显示当选列
+        selectionType: "radio",
+      },
+      Received:{
+        requestUrl: "",
+      },
+      completed:{
+        requestUrl:"",
+      },
+      refused:{
+        requestUrl:"",
+      },
+       //车辆的表格
+      truck: {
+        requestUrl: "",
+        selectionType: "radio",
+      },
+      //记录旧的row对象
+      oldRow: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
+      oldRowCount: 1,
+      //记录旧的row对象
+      oldRow1: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
+      oldRowCount1: 1,
+      oldRow2: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
+      oldRowCount2: 1,
+      tableHead: [
+        {
+          prop: "materialName",
+          label: "物资名称",
+          width: 150,
+        },
+        {
+          prop: "specificationModel",
+          label: "规格型号",
+          width: 150,
+        },
+        {
+          prop: "materialNumber",
+          label: "物资件数",
+          width: 100,
+        },
+        {
+          prop: "materialWeight",
+          label: "物资重量",
+          width: 100,
+        },
+      ],
+      tableData: [],
+      tableData1:[],
+      tableData2:[],
+      //当前选中的订单id
+      selectOrderId: null,
+      //选中的车辆号
+      capacityNumber: "",
+      //选中的运力id
+      capacityId: null,
+      //是否关闭模态框
+      drawer: false,
+      //模态框从左往右打开
+      direction: "rtl",
+
+      orderId:null,
+      //多选的选中的订单id
+      selectionList: [],
+      //区别点击的是添加运力，还是修改
+      index: null,
+    };
+  },
+  created(){
+      if (getCookie("orgCode") == "chengyunshang") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+        getCookie("userId");
+      } else {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
+      }
+      if(getCookie('orgCode') == "chengyunshang"){
+        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + getCookie("userId") ,
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + getCookie("userId"),
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&carrierId=" + getCookie("userId"),
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&carrierId=" + getCookie("userId")
+      }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "wuliuchuyunzhongxin"){
+        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4"
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5"
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2"
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6"
+      }else{
+        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&userId=" + getCookie("orgCode")
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&userId=" + getCookie("orgCode")
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&userId=" + getCookie("orgCode")
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    //撤销已拒绝的运输订单
+    ctrlZClick(scope){
+        console.log(scope.row.orderId)
+        this.axios.post("/api/v1/oms/refuseCtrlZ",{
+          orderId:scope.row.orderId
+        }).then((res) => {
+          if(res.data.code == '200'){
+             this.$message.success("撤单成功")
+             this.getRequestUrl()
+          }
+        })
+    },
+    handleClose(done){
+      done()
+      this.$message.info("取消修改运力")
+    },
+    getRequestUrl(){
+        if(getCookie('orgCode') == "chengyunshang"){
+        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + getCookie("userId") + "&test=" + new Date() ,
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + getCookie("userId") + "&test=" + new Date()
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&carrierId=" + getCookie("userId") + "&test=" + new Date()
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&carrierId=" + getCookie("userId") + "&test=" + new Date()
+      }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "wuliuchuyunzhongxin"){
+        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4" + "&test=" + new Date()
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5" + "&test=" + new Date()
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2" + "&test=" + new Date()
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6" + "&test=" + new Date()
+      }else{
+        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&userId=" + getCookie("orgCode") + "&test=" + new Date()
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&userId=" + getCookie("orgCode") + "&test=" + new Date()
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&userId=" + getCookie("orgCode") + "&test=" + new Date()
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&userId=" + getCookie("orgCode") + "&test=" + new Date()
+      }
+    },
+    getTruckRequestUrl(){
+        if (getCookie("orgCode") == "chengyunshang") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+        getCookie("userId") + "&test=" + new Date();
+      } else {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null +  "&test=" + new Date();
+      }
+    },
+    currentRadioChange1(row){
+      console.log(row)
+      this.capacityId = row.capacityId
+    },
+     //删除运输订单
+    deleteClick(scope){
+      this.$confirm('是否删除?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+            this.axios
+            .post("/api/v1/oms/closeOmstruckOrder?orderId=" + scope.row.orderId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.getRequestUrl()
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          });          
+        });
+    },
+    //修改运输订单
+    updateClick(scope){
+      this.getTruckRequestUrl()
+      this.orderId = scope.row.orderId
+      this.dialogTableVisible = true
+      console.log(scope.row.orderId)
+    },
+    updateTruckCapacity(){
+        if(this.capacityId == null){
+            this.$message.error("未选中运力")
+            return
+        }
+        this.axios.post("/api/v1/oms/updateCapacityId",{
+          capacityId:this.capacityId,
+          orderId :this.orderId
+        }).then((res) =>{
+          if(res.data.code == "200"){
+            this.$message.success("修改运力成功")
+            this.getRequestUrl()
+            this.dialogTableVisible = false
+          }else{
+            this.$message.error("修改运力失败")
+          }
+        })
+    },
+    handleClick(tab, event) {
+      this.getRequestUrl()
+    },
+    Insert(){
+      this.$router.push("addOldSporadicOrder")
+    },
+    getCapacity(){
+      if(this.truckText != null){
+        if (getCookie("orgCode") == "chengyunshang") {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+          getCookie("userId") + "&index="+this.truckText;
+      }else {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&index="+this.truckText;
+      }
+        this.truckText = null
+      }else{
+         if (getCookie("orgCode") == "chengyunshang") {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+          getCookie("userId") + "&i=" + new Date()
+      }else {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&i=" + new Date()
+      }
+      }
+    },
+    //获取物资详情--未接收
+    getMatrialDetails1(row){
+      console.log(row)
+      // 记录重复点击次数
+      if (this.oldRow === row) {
+        this.oldRowCount += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow != "") {
+        if (this.oldRow != row) {
+          if (this.oldRowCount % 2 === 1) {
+            this.$refs.table.toggleRowExpansion(this.oldRow);
+          } else {
+            this.oldRowCount = 1;
+          }
+        } else {
+          this.oldRow = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow = row;
+      this.axios.post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId).then((res) =>{
+        console.log(res.data.data)
+        this.tableData = res.data.data
+      })
+    },
+     //获取物资详情--已接收
+    getMatrialDetails2(row){
+      console.log(row)
+      // 记录重复点击次数
+      if (this.oldRow1 === row) {
+        this.oldRowCount1 += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table1.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow1 != "") {
+        if (this.oldRow1 != row) {
+          if (this.oldRowCount1 % 2 === 1) {
+            this.$refs.table1.toggleRowExpansion(this.oldRow1);
+          } else {
+            this.oldRowCount1 = 1;
+          }
+        } else {
+          this.oldRow1 = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow1 = row;
+      this.axios.post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId).then((res) =>{
+        console.log(res.data.data)
+        this.tableData1 = res.data.data
+      })
+    },
+    //获取物资详情--已完成
+    getMatrialDetails3(row){
+      console.log(row)
+      // 记录重复点击次数
+      if (this.oldRow2 === row) {
+        this.oldRowCount2 += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table2.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow2 != "") {
+        if (this.oldRow2 != row) {
+          if (this.oldRowCount2 % 2 === 1) {
+            this.$refs.table2.toggleRowExpansion(this.oldRow2);
+          } else {
+            this.oldRowCount2 = 1;
+          }
+        } else {
+          this.oldRow2 = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow2 = row;
+      this.axios.post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId).then((res) =>{
+        this.tableData2 = res.data.data
+      })
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+
+.transportOrder {
+  .transportOrder_top {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+    .el-input{
+  width: 20%;
+}
+  }
+  .drawer_top {
+    width: 100%;
+    height: 50px;
+    padding-left: 20px;
+    display: flex;
+    align-items: center;
+  }
+}
+</style>

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

@@ -3,7 +3,12 @@
   <!-- 零星物资进厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -15,11 +20,14 @@
 
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
       input: "",
+      startTime: null,
+      endTime: null,
       option: {
         // 表格请求数据的地址
         requestUrl: "",
@@ -36,7 +44,32 @@ export default {
   },
   methods: {
     onclick() {
-      this.$message.info("功能暂时关闭")
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }else{
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        this.getRequestUrl()
+      }
     },
   },
 };

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

@@ -3,7 +3,12 @@
   <!-- 零星物资进厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -14,12 +19,15 @@
 </template>
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 import { getCookie } from "@/utils/util.js";
 export default {
   name: "homeworkPath",
   data() {
     return {
       input: "",
+      startTime: null,
+      endTime: null,
       option: {
         // 表格请求数据的地址
         requestUrl: "",
@@ -35,7 +43,32 @@ export default {
   },
   methods: {
     onclick() {
-      this.$message.info("功能暂时关闭")
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=12&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }else{
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        this.getRequestUrl()
+      }
     },
   },
 };

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

@@ -3,7 +3,12 @@
   <!-- 零星物资进厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -14,12 +19,15 @@
 </template>
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 import { getCookie } from "@/utils/util.js";
 export default {
   name: "homeworkPath",
   data() {
     return {
       input: "",
+      startTime: null,
+      endTime: null,
       option: {
         // 表格请求数据的地址
         requestUrl: "",
@@ -35,7 +43,32 @@ export default {
   },
   methods: {
     onclick() {
-      this.$message.info("功能暂时关闭")
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }else{
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        this.getRequestUrl()
+      }
     },
   },
 };

src/views/SporadicManage/router/index.js

@@ -30,6 +30,22 @@ import sporadicOUToutFactory from '../components/sporadicMaterial/sporadicOutfac
 import sporadicOUTtareWeight from '../components/sporadicMaterial/sporadicOutfactory/tareWeight.vue'
 import sporadicOUTload from '../components/sporadicMaterial/sporadicOutfactory/load.vue'
 
+//老区零星进出厂
+//老厂零星物资运输预约
+import oldSporadicAppoint from '../components/oldAreaSporadic/transportAppoint/transportAppoint.vue'
+import addOldSporadicAppoint from '../components/oldAreaSporadic/transportAppoint/addSporadicTransportAppoint.vue'
+import editOldSporadicAppoint from '../components/oldAreaSporadic/transportAppoint/editTransportAppoint.vue'
+//老厂零星物资运输派单
+import oldSporadicOrder from '../components/oldAreaSporadic/transportOrder/transportOrder.vue'
+import addOldSporadicOrder from '../components/oldAreaSporadic/transportOrder/addTransportOrder.vue'
+
+//老厂零星物资中转
+import oldSporadicInwardTenfactory from '../components/oldAreaSporadic/inwardSporadicFactory/enFactory.vue'
+import oldSporadicInwardGrossWeight from '../components/oldAreaSporadic/inwardSporadicFactory/grossWeight.vue'
+import oldSporadicInwardoutFactory from '../components/oldAreaSporadic/inwardSporadicFactory/LeaveFactory.vue'
+import oldSporadicInwardtareWeight from '../components/oldAreaSporadic/inwardSporadicFactory/tareWeight.vue'
+import oldSporadicInwardload from '../components/oldAreaSporadic/inwardSporadicFactory/Load.vue'
+import oldSporadicInwardUnload from '../components/oldAreaSporadic/inwardSporadicFactory/unload.vue'
 
 //钢材退货运输预约
 import steelReturnTransportAppoint from '../components/steelReturn/transportAppoint/transportAppoint.vue'
@@ -147,6 +163,21 @@ const constantRouterMap = [
        {path:'sporadicLoadInward',name:'sporadicLoadInward',meta:{code:'xtpzgl-yhgl'},component:sporadicLoadInward},
        {path:'sporadicTareWeightInward',name:'sporadicTareWeightInward',meta:{code:'xtpzgl-yhgl'},component:sporadicTareWeightInward},
        {path:'sporadicUnloadInward',name:'sporadicUnloadInward',meta:{code:'xtpzgl-yhgl'},component:sporadicUnloadInward},
+
+      //老厂零星物资运输预约
+      {path:'addOldSporadicAppoint',name:'addOldSporadicAppoint',meta:{code:'xtpzgl-jggl'},component:addOldSporadicAppoint},
+      {path:'oldSporadicAppoint',name:'oldSporadicAppoint',meta:{code:'xtpzgl-yhgl'},component:oldSporadicAppoint},
+      {path: 'editSporadicTransportAppoint', name: 'editSporadicTransportAppoint', meta: {code: 'xtpzgl-yhgl'}, component: editSporadicTransportAppoint},
+      //零星物资运输订单
+      {path:'addOldSporadicOrder',name:'addOldSporadicOrder',meta:{code:'xtpzgl-jggl'},component:addOldSporadicOrder},
+      {path:'oldSporadicOrder',name:'oldSporadicOrder',meta:{code:'xtpzgl-yhgl'},component:oldSporadicOrder},
+      //零星物资运输执行
+      {path:'oldSporadicInwardTenfactory',name:'oldSporadicInwardTenfactory',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardTenfactory},
+      {path:'oldSporadicInwardGrossWeight',name:'oldSporadicInwardGrossWeight',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardGrossWeight},
+      {path:'oldSporadicInwardoutFactory',name:'oldSporadicInwardoutFactory',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardoutFactory},
+      {path:'oldSporadicInwardtareWeight',name:'oldSporadicInwardtareWeight',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardtareWeight},
+      {path:'oldSporadicInwardUnload',name:'oldSporadicInwardUnload',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardUnload},
+      {path:'oldSporadicInwardload',name:'oldSporadicInwardload',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardload},
     ]    
   }
 ];

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

@@ -114,6 +114,24 @@ export default {
     }
   },
   methods: {
+    getRequestUrl(){
+         //判断是否是承运商
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option1.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=1&carrierSSOId=" +
+        getCookie("userId") + "&i=" + new Date();
+      this.option2.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1&carrierSSOId=" +
+        getCookie("userId") + "&i=" + new Date();;
+    } else {
+      this.option1.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=1&carrierSSOId=" +
+        null + "&i=" + new Date();;
+      this.option2.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1&carrierSSOId=" +
+        null + "&i=" + new Date();;
+    }
+    },
     onclick() {
       if (this.activeName == "first") {
         //判断是否是承运商
@@ -159,9 +177,7 @@ export default {
           type: "success",
           message: "下发成功!",
         });
-        this.option1.requestUrl =
-          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=1&i=" +
-          new Date();
+        this.getRequestUrl()
       });
     },
     // 下发
@@ -181,9 +197,7 @@ export default {
               type: "success",
               message: "下发成功!",
             });
-            this.option1.requestUrl =
-              "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=1&i=" +
-              new Date();
+            this.getRequestUrl()
           });
         })
         .catch(() => {
@@ -212,7 +226,7 @@ export default {
               capacityNumber: capacityNumber,
             })
             .then(() => {
-              this.$router.go(0);
+              this.getRequestUrl()
             });
         })
         .catch(() => {

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

@@ -2,7 +2,13 @@
   <!-- 新增运输作业页面 -->
   <div id="contractDetails">
     <page-title>运输预约</page-title>
-    <div class="orderType from">
+    <div style="text-align: center; font-size:20px; font-weight:bold; margin-top:15px; color:green">
+      <span>燃料预约界面</span>
+    </div>
+    <div style="text-align: center; font-size:15px; margin-top:15px; color:red">
+      <span>温馨提示：卸货到达钢请选择一厂，达兴二焦化请选择二厂<br>如选错厂区将会影响车辆上秤计量！！！</span>
+    </div>
+    <div class="orderType from" style="margin-top:15px">
       <span class="text">卸货厂区：</span>
       <el-select
         class="select"
@@ -49,7 +55,7 @@
     </div>
     <div class="remark from">
       <span class="text">船名：</span>
-      <el-input class="input" v-model="remark" @blur="onBlur"> </el-input>
+      <el-input class="input" v-model="remark" @blur="onBlur" :disabled="true"> </el-input>
       <span class="span"></span>
     </div>
     <div class="forwardingUnit from">
@@ -409,17 +415,13 @@ export default {
                 type: "warning",
               });
               this.purchaseOrderNo = null
+              this.purchaseOrderId = null
+              this.remark = null
               this.form1 = [];
             } else {
-              console.log();
               this.remark = res.data.data.remark;
               this.purchaseOrderId = res.data.data.purchaseOrderId;
               this.purchaseOrderNo = res.data.data.purchaseOrderNo;
-              // if (res.data.data.receiveUnitId == 1) {
-              //   this.orderType = 6;
-              // } else {
-              //   this.orderType = 7;
-              // }
             }
           } else {
             this.$message.error("请求失败");
@@ -521,7 +523,7 @@ export default {
       if (num == 1) {
         this.frist.requestUrl =
           "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
-          this.input + "&supplierId=" + this.supplierId;;
+          this.input + "&supplierId=" + this.supplierId;
       } else if (num == 2) {
         this.secend.requestUrl =
           "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
@@ -562,6 +564,7 @@ export default {
     currentRadioChange1(selection) {
       this.materialName = selection.materialName;
       this.materialId = selection.materialId;
+      this.remark = null
       this.getPurchaseOrderNo();
     },
     currentRadioChange2(selection) {
@@ -579,7 +582,7 @@ export default {
     },
     currentRadioChange6(selection) {
       console.log(selection);
-      if (selection.shipperId == 1) {
+      if (selection.orgId == 1) {
         this.orderType = 6;
       } else {
         this.orderType = 7;

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

@@ -90,6 +90,17 @@ export default {
     }
   },
   methods: {
+    getRequestUrl(){
+      if (getCookie("orgCode") == "chengyunshang") {
+      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
+      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
+      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
+    } else {
+      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&carrierSSOId=" + null +"&i="+new Date();
+      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&carrierSSOId=" + null +"&i="+new Date();
+      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&carrierSSOId=" + null +"&i="+new Date();
+    }
+    },
     onclick() {
     if (getCookie("orgCode") == "chengyunshang") {
        if(this.activeName == "option"){
@@ -118,7 +129,7 @@ export default {
         this.axios.post('/api/v1/oms/deleteOrders',{list:this.list}).then((res)=>{
           if(res.data.code == "200"){
             this.$message.success('关闭成功')
-            this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&con=" + this.input +"&i="+new Date();
+            this.getRequestUrl()
           }
         })
       }

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

@@ -1,8 +1,12 @@
 <template>
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>      <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
@@ -13,11 +17,14 @@
 </template>
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
       restaurants: [],
+      startTime: null,
+      endTime: null,
       input: "",
       option: {
         // 表格请求数据的地址
@@ -28,7 +35,32 @@ export default {
 
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=6&con=" + this.input;
+let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=6&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }else{
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        this.getRequestUrl()
+      }
     },
     updateClick(resultId) {
       this.$router.push("/truckLoadResultEdit/" + resultId);

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

@@ -1,7 +1,12 @@
 <template>
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -13,11 +18,14 @@
 </template>
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
       restaurants: [],
+      startTime: null,
+      endTime: null,
       input: "",
       option: {
         // 表格请求数据的地址
@@ -28,7 +36,32 @@ export default {
  
   methods: {
     onclick() {
-            this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=7&con=" + this.input;
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=210&orderType=2&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }else{
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        this.getRequestUrl()
+      }
     },
     updateClick(resultId) {
       this.$router.push("/truckLoadResultEdit/" + resultId);

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

@@ -24,7 +24,7 @@
         <i class="el-icon-plus"></i>下发
       </el-button>
     </div>
-    <el-tabs v-model="activeName">
+    <el-tabs v-model="activeName" tab-click="handleClick">
       <!-- 未下发 -->
       <el-tab-pane label="未下发" name="first">
         <dilTable
@@ -114,6 +114,27 @@ export default {
     }
   },
   methods: {
+    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();
+    }
+    },
     onclick() {
       if (this.activeName == "first") {
         //判断是否是承运商
@@ -181,9 +202,7 @@ export default {
               type: "success",
               message: "下发成功!",
             });
-            this.option1.requestUrl =
-              "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&i=" +
-              new Date();
+            this.getRequestUrl()
           });
         })
         .catch(() => {
@@ -212,7 +231,7 @@ export default {
               capacityNumber: capacityNumber,
             })
             .then(() => {
-              this.$router.go(0);
+              this.getRequestUrl()
             });
         })
         .catch(() => {

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

@@ -2,6 +2,9 @@
   <!-- 新增运输作业页面 -->
   <div id="contractDetails">
     <page-title>运输预约</page-title>
+     <div style="text-align: center; font-size:20px; font-weight:bold; margin-top:15px; color:green">
+      <span>辅料预约界面</span>
+    </div>
     <div class="supplieUnit">
       <el-form
         :inline="true"
@@ -31,7 +34,7 @@
     </div>
     <div class="remark from">
       <span class="text">船名：</span>
-      <el-input class="input" v-model="remark" @blur="onBlur"> </el-input>
+      <el-input class="input" v-model="remark" @blur="onBlur" :disabled="true"> </el-input>
       <span class="span"></span>
     </div>
     <div class="forwardingUnit from">
@@ -60,6 +63,34 @@
         >
       </div>
     </div>
+    <div class="lineId from">
+      <span class="text">该批车辆是否一车多趟：</span>
+      <el-switch v-model="isMoreTrips" active-text="是" inactive-text="否">
+      </el-switch>
+    </div>
+      <!-- 物资和装卸点以及装卸货次序 -->
+    <div class="swtichTop">
+    <span class="titile">选择车辆前请选择物资单位！</span>
+    <div class="switch" v-if="selectionList.length > 0">
+      <el-tooltip placement="top">
+        <div slot="content">下面表格已有数据，不能进行更改！！！</div>
+        <el-switch
+          v-model="value"
+          active-text="件数"
+          inactive-text="重量"
+          disabled
+        >
+        </el-switch>
+      </el-tooltip>
+    </div>
+    <div class="switch" v-else>
+      <el-tooltip placement="top">
+        <div slot="content">当下面表格有数据之后，将不能进行更改！！！</div>
+        <el-switch v-model="value" active-text="件数" inactive-text="重量">
+        </el-switch>
+      </el-tooltip>
+    </div>
+    </div>
     <div class="truckListTable">
       <el-table
         :data="selectionList"
@@ -89,6 +120,14 @@
                   v-model.number="scope.row.orderMaterialWeight"
                 ></el-input>
               </template>
+              <!-- 物资件数 -->
+              <template v-if="item.prop == 'orderMaterialNumber'">
+                <el-input
+                  class="textinput"
+                  v-model.number="scope.row.orderMaterialNumber"
+                  @input="onInputNumber(scope.row.orderMaterialNumber)"
+                ></el-input>
+              </template>
             </template>
             <template v-else>
               <span>{{ scope.row[item.prop] }}</span>
@@ -144,11 +183,8 @@
         <dilTable
           v-bind.sync="third"
           @selection-change="currentRadioChange3"
-          :isKuang="isKuang"
-          @func="func"
           :isHeigth="isHeigth2"
           :shiyHeigth="shiyHeigth2"
-          :drawer="drawer"
         ></dilTable>
       </div>
       <div v-show="onDrawerNumber == 4">
@@ -221,17 +257,6 @@ export default {
       //采购订单号
       purchaseOrderNo: "",
       isMoreTrips: false,
-      //订单类别
-      orderTypeList: [
-        {
-          value: 6,
-          label: "老厂区",
-        },
-        {
-          value: 7,
-          label: "新厂区",
-        },
-      ],
       // 线路名称
       lineName: "",
       //线路id
@@ -314,12 +339,30 @@ export default {
         requestUrl: "",
         selectionType: "radio",
       },
+      truckList:[]
     };
   },
   watch: {
     drawer(val) {
       if (val) {
         this.input = null;
+      }   
+    },
+    value() {
+      if (this.value) {
+        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.push({
+          prop: "orderMaterialNumber",
+          label: "件数",
+          slot: true,
+        });
+      } else {
+        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.push({
+          prop: "orderMaterialWeight",
+          label: "重量",
+          slot: true,
+        });
       }
     },
   },
@@ -380,16 +423,14 @@ export default {
                 type: "warning",
               });
               this.form1 = [];
+              this.purchaseOrderId = null
+              this.purchaseOrderNo = null
+              this.remark = null
             } else {
               console.log();
               this.remark = res.data.data.remark;
               this.purchaseOrderId = res.data.data.purchaseOrderId;
               this.purchaseOrderNo = res.data.data.purchaseOrderNo;
-              // if (res.data.data.receiveUnitId == 1) {
-              //   this.orderType = 6;
-              // } else {
-              //   this.orderType = 7;
-              // }
             }
           } else {
             this.$message.error("请求失败");
@@ -481,12 +522,15 @@ export default {
         }
       }
     },
+    func(res) {
+      console.log(res);
+      this.isKuang = false;
+    },
     ondrawer(num) {
       if(this.supplierId == null){
           this.$message.warning("请先选择发货单位")
           return
       }
-      console.log(num)
       if(num != 1 && this.materialId == null){
           this.$message.warning("请先选择物资")
           return
@@ -535,6 +579,7 @@ export default {
       this.$router.push("/transportReserveRan");
     },
     currentRadioChange1(selection) {
+      this.remark = null ;
       this.materialName = selection.materialName;
       this.materialId = selection.materialId;
       this.getPurchaseOrderNo();
@@ -548,6 +593,7 @@ export default {
       this.lineId = selection.lineId;
     },
     currentRadioChange6(selection) {
+      console.log(selection.orgId);
       this.materialName = selection.materialName;
       this.materialId = selection.materialId;
       this.supplierId = selection.supplierId;
@@ -559,10 +605,6 @@ export default {
       this.selectionList = [];
       this.selectionList = selection;
     },
-    func(res) {
-      console.log(res);
-      this.isKuang = false;
-    },
     // 确认
     onClickConfirm() {
       var state = 0;
@@ -583,13 +625,6 @@ export default {
           });
           return;
         } 
-        // else if (!this.orderType) {
-        //   this.$message({
-        //     message: "请选择订单类别!",
-        //     type: "warning",
-        //   });
-        //   return;
-        // }
          else if (!this.supplierId) {
           this.$message({
             message: "请选择发货单位!",
@@ -722,6 +757,20 @@ export default {
     height: 1px;
   }
 }
+.swtichTop{
+  display: flex;
+  height: 40px;
+  align-content: center;
+  justify-content: center;
+  padding-right:20px ;
+  .titile{
+    color: red;
+    font-size: 14px;
+  }
+  .switch{
+    margin-right: -30px
+  }
+}
 .supplieUnit {
   display: flex;
   justify-content: center;

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

@@ -90,6 +90,18 @@ export default {
     }
   },
   methods: {
+    getRequestUrl(){
+      //判断是否是承运商
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
+      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
+      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
+    } else {
+      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&carrierSSOId=" + null +"&i="+new Date();
+      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&carrierSSOId=" + null +"&i="+new Date();
+      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&carrierSSOId=" + null +"&i="+new Date();
+    }
+    },
     onclick() {
     if (getCookie("orgCode") == "chengyunshang") {
        if(this.activeName == "option"){
@@ -118,7 +130,7 @@ export default {
         this.axios.post('/api/v1/oms/deleteOrders',{list:this.list}).then((res)=>{
           if(res.data.code == "200"){
             this.$message.success('关闭成功')
-            this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&con=" + this.input +"&i="+new Date();
+            this.getRequestUrl()
           }
         })
       }

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

@@ -1,7 +1,12 @@
 <template>
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -13,11 +18,14 @@
 </template>
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
       restaurants: [],
+      startTime: null,
+      endTime: null,
       input: "",
       option: {
         // 表格请求数据的地址
@@ -28,7 +36,32 @@ export default {
 
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=5&con=" + this.input;
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=5&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }else{
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        this.getRequestUrl()
+      }
     },
     updateClick(resultId) {
       this.$router.push("/truckLoadResultEdit/" + resultId);

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

@@ -67,7 +67,6 @@ export default {
         }
       }else{
         this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=5&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
-        
       }  
     },
   },

src/views/TMS/components/importedMineral/addTransportAppoint.vue

@@ -0,0 +1,874 @@
+<template>
+  <!-- 新增运输作业页面 -->
+  <div id="contractDetails">
+    <page-title>运输预约</page-title>
+     <div style="text-align: center; font-size:20px; font-weight:bold; margin-top:15px; color:green">
+      <span>进口矿预约界面</span>
+    </div>
+    <div class="supplieUnit">
+      <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+        >
+        <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>
+    </div>
+    <div class="material from">
+      <span class="text">物资：</span>
+      <el-input class="input" v-model="materialName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
+    </div>
+    <div class="remark from">
+      <span class="text">船名：</span>
+      <el-input class="input" v-model="remark" @blur="onBlur" :disabled="true"> </el-input>
+      <span class="span"></span>
+    </div>
+    <div class="forwardingUnit from">
+      <span class="text">卸货点：</span>
+      <el-input class="input" v-model="unloadPointName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
+    </div>
+    <div class="lineId from">
+      <span class="text">选择路线：</span>
+      <el-input class="input" v-model="lineName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(5)">浏览</el-button>
+    </div>
+    <div class="lineId from">
+      <span class="text">采购订单号：</span>
+      <el-input class="input" v-model="purchaseOrderNo" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(6)">浏览</el-button>
+    </div>
+    <div class="contractTitle from">
+      <dil-form :formId="219" v-model="form1"></dil-form>
+    </div>
+    <div class="truckList1">
+      <div class="truckList from">
+        <span class="text">选择车辆：</span>
+        <el-button type="primary" @click="ondrawer(3)" class="truckBtn"
+          >浏览</el-button
+        >
+      </div>
+    </div>
+    <div class="lineId from">
+      <span class="text">该批车辆是否一车多趟：</span>
+      <el-switch v-model="isMoreTrips" active-text="是" inactive-text="否">
+      </el-switch>
+    </div>
+      <!-- 物资和装卸点以及装卸货次序 -->
+    <div class="swtichTop">
+    <span class="titile">选择车辆前请选择物资单位！</span>
+    <div class="switch" v-if="selectionList.length > 0">
+      <el-tooltip placement="top">
+        <div slot="content">下面表格已有数据，不能进行更改！！！</div>
+        <el-switch
+          v-model="value"
+          active-text="件数"
+          inactive-text="重量"
+          disabled
+        >
+        </el-switch>
+      </el-tooltip>
+    </div>
+    <div class="switch" v-else>
+      <el-tooltip placement="top">
+        <div slot="content">当下面表格有数据之后，将不能进行更改！！！</div>
+        <el-switch v-model="value" active-text="件数" inactive-text="重量">
+        </el-switch>
+      </el-tooltip>
+    </div>
+    </div>
+    <div class="truckListTable">
+      <el-table
+        :data="selectionList"
+        border
+        style="width: 100%"
+        highlight-current-row
+      >
+        <el-table-column type="index" width="50" label="序号" align="center">
+        </el-table-column>
+        <el-table-column
+          v-for="(item, i) in tableTop"
+          :key="i"
+          :prop="item.prop"
+          :label="item.label"
+          align="center"
+          show-overflow-tooltip
+        >
+          <template slot="scope" v-if="item.th_name !== '重量'">
+            <span>{{ item.label }}</span>
+          </template>
+          <!-- 插入输入框 -->
+          <template slot-scope="scope">
+            <template v-if="item.slot">
+              <template v-if="item.prop == 'orderMaterialWeight'">
+                <el-input
+                  style="width: 250px"
+                  v-model.number="scope.row.orderMaterialWeight"
+                ></el-input>
+              </template>
+              <!-- 物资件数 -->
+              <template v-if="item.prop == 'orderMaterialNumber'">
+                <el-input
+                  class="textinput"
+                  v-model.number="scope.row.orderMaterialNumber"
+                  @input="onInputNumber(scope.row.orderMaterialNumber)"
+                ></el-input>
+              </template>
+            </template>
+            <template v-else>
+              <span>{{ scope.row[item.prop] }}</span>
+            </template>
+          </template>
+        </el-table-column>
+
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="onClick(scope.$index)"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" size="40%">
+      <div class="drawer_top">
+        <el-input
+          placeholder="请输入内容"
+          v-model="input"
+          style="margin-top: 10px; margin-right: 10px; width: 250px"
+          clearable
+        ></el-input>
+        <el-button type="primary" class="btn" @click="onclick">
+          <i class="el-icon-search"></i>查询
+        </el-button>
+      </div>
+      <div class="drawer_table1" v-show="onDrawerNumber == 1">
+        <dilTable
+          v-bind.sync="frist"
+          @radio-change="currentRadioChange1"
+          :isKuang="isKuang"
+          @func="func"
+          :isHeigth="isHeigth"
+          :shiyHeigth="shiyHeigth"
+          :drawer="drawer"
+        ></dilTable>
+      </div>
+      <div v-show="onDrawerNumber == 2">
+        <dilTable
+          v-bind.sync="secend"
+          @radio-change="currentRadioChange2"
+          :isKuang="isKuang"
+          @func="func"
+          :isHeigth="isHeigth1"
+          :shiyHeigth="shiyHeigth1"
+          :drawer="drawer"
+        ></dilTable>
+      </div>
+      <div v-show="onDrawerNumber == 3">
+        <dilTable
+          v-bind.sync="third"
+          @selection-change="currentRadioChange3"
+          :isHeigth="isHeigth2"
+          :shiyHeigth="shiyHeigth2"
+        ></dilTable>
+      </div>
+      <div v-show="onDrawerNumber == 4">
+        <dilTable
+          v-bind.sync="unloadPoint"
+          @radio-change="currentRadioChange4"
+          :isKuang="isKuang"
+          @func="func"
+          :isHeigth="isHeigth3"
+          :shiyHeigth="shiyHeigth3"
+          :drawer="drawer"
+        ></dilTable>
+      </div>
+      <div v-show="onDrawerNumber == 5">
+        <dilTable
+          v-bind.sync="line"
+          @radio-change="currentRadioChange5"
+          :isKuang="isKuang"
+          @func="func"
+          :isHeigth="isHeigth4"
+          :shiyHeigth="shiyHeigth4"
+          :drawer="drawer"
+        ></dilTable>
+      </div>
+      <div v-show="onDrawerNumber == 6">
+        <dilTable
+          v-bind.sync="purchaseOrder"
+          @radio-change="currentRadioChange6"
+          :isKuang="isKuang"
+          @func="func"
+          :isHeigth="isHeigth5"
+          :shiyHeigth="shiyHeigth5"
+          :drawer="drawer"
+        ></dilTable>
+      </div>
+    </el-drawer>
+    <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, isIntegerNumber } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      //限定first
+      isHeigth:true,
+      shiyHeigth:140,
+      //限定second
+      isHeigth1:true,
+      shiyHeigth1:140,
+      //限定third
+      isHeigth2:true,
+      shiyHeigth2:140,
+      //限定unloadPoint
+      isHeigth3:true,
+      shiyHeigth3:140,
+      //限定line
+      isHeigth4:true,
+      shiyHeigth4:140,
+      //限定purchaseOrder
+      isHeigth5:true,
+      shiyHeigth5:140,
+      isKuang: false,
+      //采购订单号
+      purchaseOrderNo: "",
+      isMoreTrips: false,
+      // 线路名称
+      lineName: "",
+      //线路id
+      lineId: null,
+      // 件数与重量的开关
+      value: false,
+      //船名
+      remark: null,
+      // 车辆表格表头
+      tableTop: [
+        {
+          prop: "capacityNumber",
+          label: "车牌号",
+          width: "140",
+        },
+        {
+          prop: "carrierName",
+          label: "承运商",
+          width: "140",
+        },
+        {
+          prop: "orderMaterialWeight",
+          label: "重量",
+          slot: true,
+        },
+      ],
+      //发货单位名称
+      supplierName: "",
+      stateSupplier:null,
+      restaurantsSupplier:null,
+      //车辆表格数据
+      selectionList: [],
+      // 表单
+      form1: {},
+      //采购订单id
+      purchaseOrderId: "",
+      //物资名称
+      materialName: "",
+      //发货单位名称
+      supplierName: "",
+      //发货单位id
+      supplierId: null,
+      //物资id
+      materialId: null,
+      //是否需要打开模态窗口
+      drawer: false,
+      //卸货点id
+      unloadPointId: "",
+      //卸货点名称
+      unloadPointName: "",
+      //订单类别
+      orderType: 5,
+      onDrawerNumber: 1,
+      direction: "rtl",
+      input: "",
+      frist: {
+        requestUrl: "",
+        selectionType: "radio",
+        mapList1: [],
+      },
+      secend: {
+        requestUrl: "",
+        selectionType: "radio",
+        mapList2: [],
+      },
+      third: {
+        requestUrl: "",
+        selectionType: "select",
+        mapList3: [],
+      },
+      unloadPoint: {
+        requestUrl: "",
+        selectionType: "radio",
+      },
+      line: {
+        requestUrl: "",
+        selectionType: "radio",
+      },
+      purchaseOrder: {
+        requestUrl: "",
+        selectionType: "radio",
+      },
+      truckList:[]
+    };
+  },
+  watch: {
+    drawer(val) {
+      if (val) {
+        this.input = null;
+      }   
+    },
+    value() {
+      if (this.value) {
+        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.push({
+          prop: "orderMaterialNumber",
+          label: "件数",
+          slot: true,
+        });
+      } else {
+        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.push({
+          prop: "orderMaterialWeight",
+          label: "重量",
+          slot: true,
+        });
+      }
+    },
+  },
+  created() {
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.third.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+        getCookie("userId");
+    } else {
+      this.third.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null;
+    }
+  },
+  methods: {
+    onClick(index) {
+      this.selectionList.splice(index, 1);
+    },
+    onBlur() {
+      this.getPurchaseOrderNo();
+    },
+      //发货单位弹出层
+    handleSelectSupplier(item){
+      this.supplierId = item.supplierId
+      this.supplierName = item.supplierName
+    },
+    //以下是发货单位边输边查搜索
+    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);
+        };
+      },
+    getPurchaseOrderNo() {
+      let map = {
+        materialId: this.materialId,
+        supplierId: this.supplierId,
+      };
+      if (this.remark) {
+        map.remark = this.remark;
+      }
+      console.log(this.map);
+      if (this.materialId && this.supplierId) {
+        this.axios.post("/api/v1/oms/selectNewOrderId", map).then((res) => {
+          console.log(res);
+          if (res.data.code == "200") {
+            if (res.data.data == null) {
+              this.$message({
+                message: "没有匹配的采购订单号!",
+                type: "warning",
+              });
+              this.form1 = [];
+              this.remark = null;
+              this.purchaseOrderNo = null;
+              this.purchaseOrderId = null
+            } else {
+              console.log();
+              this.remark = res.data.data.remark;
+              this.purchaseOrderId = res.data.data.purchaseOrderId;
+              this.purchaseOrderNo = res.data.data.purchaseOrderNo;
+            }
+          } else {
+            this.$message.error("请求失败");
+          }
+        });
+      }
+    },
+    onclick() {
+      if (this.input) {
+        this.isKuang = true;
+        if (this.onDrawerNumber == 1) {
+          this.frist.requestUrl =
+            "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+            this.input + "&supplierId=" + this.supplierId;
+        } else if (this.onDrawerNumber == 2) {
+          this.secend.requestUrl =
+            "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+            this.materialId +
+            "&index=" +
+            this.input;
+        } else if (this.onDrawerNumber == 3) {
+          //判断是否是承运商查询车辆
+          if (getCookie("orgCode") == "chengyunshang") {
+            this.third.requestUrl =
+              "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+              getCookie("userId") +
+              "&index=" +
+              this.input;
+          } else {
+            this.third.requestUrl =
+              "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+              null +
+              "&index=" +
+              this.input;
+          }
+        } else if (this.onDrawerNumber == 4) {
+          this.unloadPoint.requestUrl =
+            "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.input;
+        } else if (this.onDrawerNumber == 5) {
+          this.line.requestUrl =
+            "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
+        } else if (this.onDrawerNumber == 6) {
+          this.purchaseOrder.requestUrl =
+            "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId=" +
+            this.supplierId +
+            "&con=" +
+            this.input +
+            "&i=" +
+            new Date();
+        }
+      } else {
+        if (this.onDrawerNumber == 1) {
+          this.frist.requestUrl =
+            "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&i=" +
+            new Date() + "&supplierId=" + this.supplierId;
+        } else if (this.onDrawerNumber == 2) {
+          this.secend.requestUrl =
+            "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+            this.materialId +
+            "&i=" +
+            new Date();
+        } else if (this.onDrawerNumber == 3) {
+          //判断是否是承运商查询车辆
+          if (getCookie("orgCode") == "chengyunshang") {
+            this.third.requestUrl =
+              "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+              getCookie("userId") +
+              "&i=" +
+              new Date();
+          } else {
+            this.third.requestUrl =
+              "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+              null +
+              "&i=" +
+              new Date();
+          }
+        } else if (this.onDrawerNumber == 4) {
+          this.unloadPoint.requestUrl =
+            "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date();
+        } else if (this.onDrawerNumber == 5) {
+          this.line.requestUrl =
+            "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
+        } else if (this.onDrawerNumber == 6) {
+          this.purchaseOrder.requestUrl =
+            "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId=" +
+            this.supplierId +
+            "&i=" +
+            new Date();
+        }
+      }
+    },
+    func(res) {
+      console.log(res);
+      this.isKuang = false;
+    },
+    refreshTable(){
+    },
+    ondrawer(num) {
+        console.log(this.supplierId)
+      if(this.supplierId == null){
+          this.$message.warning("请先选择发货单位")
+          return
+      }
+      if(num != 1 && this.materialId == null){
+          this.$message.warning("请先选择物资")
+          return
+      }
+      this.drawer = true;
+      this.onDrawerNumber = num;
+      this.refreshTable()
+      if (num == 1) {
+          this.frist.requestUrl =
+          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+          this.input + "&supplierId=" + this.supplierId;   
+      } else if (num == 2) {
+        this.secend.requestUrl =
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+          this.materialId;
+      } else if (num == 3) {
+        //判断是否是承运商查询车辆
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.third.requestUrl =
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date();
+        } else {
+          this.third.requestUrl =
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+            null +
+            "&i=" +
+            new Date();
+        }
+      } else if (num == 4) {
+        this.unloadPoint.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date();
+      } else if (num == 5) {
+        this.line.requestUrl =
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=进口矿&i=" + new Date();
+      } else if (num == 6) {
+        this.purchaseOrder.requestUrl =
+          "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId=" +
+          this.supplierId +
+          "&i=" +
+          new Date();
+      }
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.push("/transportReserveRan");
+    },
+    currentRadioChange1(selection) {
+      this.remark = null
+      this.materialName = selection.materialName;
+      this.materialId = selection.materialId;
+      this.getPurchaseOrderNo();
+    },
+    currentRadioChange4(selection) {
+      this.unloadPointId = selection.warehouseId;
+      this.unloadPointName = selection.warehouseName;
+    },
+    currentRadioChange5(selection) {
+      this.lineName = selection.lineName;
+      this.lineId = selection.lineId;
+    },
+    currentRadioChange6(selection) {
+      this.materialName = selection.materialName;
+      this.materialId = selection.materialId;
+      this.supplierId = selection.supplierId;
+      this.supplierName = selection.supplierName;
+      this.purchaseOrderNo = selection.purchaseOrderNo;
+      this.purchaseOrderId = selection.purchaseOrderId;
+    },
+    currentRadioChange3(selection) {
+      this.selectionList = []
+      this.selectionList = selection;
+    },
+    // 确认
+    onClickConfirm() {
+      var state = 0;
+      if (
+        this.materialId &&
+        this.supplierId &&
+        this.form1.purchaseOrderId &&
+        this.unloadPointId &&
+        sjTime(this.form1.orderEntryTime) &&
+        this.lineId
+      ) {
+        state = 1;
+      } else {
+        if (!this.materialId) {
+          this.$message({
+            message: "请选择物资!",
+            type: "warning",
+          });
+          return;
+        } 
+         else if (!this.supplierId) {
+          this.$message({
+            message: "请选择发货单位!",
+            type: "warning",
+          });
+          return;
+        } else if (!this.purchaseOrderId) {
+          this.$message({
+            message: "没有匹配的采购订单号!",
+            type: "warning",
+          });
+          return;
+        } else if (!this.unloadPointId) {
+          this.$message({
+            message: "请选择卸货地点!",
+            type: "warning",
+          });
+          return;
+        } else if (!this.lineId) {
+          this.$message({
+            message: "请选择运输路线!",
+            type: "warning",
+          });
+          return;
+        } else if (!sjTime(this.form1.orderEntryTime)) {
+          this.$message({
+            message: "请选择预估进厂时间!",
+            type: "warning",
+          });
+          return;
+        }
+      }
+      if (this.selectionList.length == 0) {
+        this.$message({
+          message: "请选择车辆!",
+          type: "warning",
+        });
+        return;
+      } else {
+        this.selectionList.forEach((e) => {
+          if (e.orderMaterialWeight) {
+            if (isNumber(e.orderMaterialWeight)) {
+              if (isIntegerNumber(e.orderMaterialWeight)) {
+                state = 1;
+              } else {
+                this.$message({
+                  message: "重量只能是整数!",
+                  type: "warning",
+                });
+                return;
+              }
+            } else {
+              this.$message({
+                message: "重量只能是数字!",
+                type: "warning",
+              });
+              return;
+            }
+          }
+        });
+      }
+      let map = {
+        materialId: this.materialId,
+        supplierId: this.supplierId,
+        purchaseOrderId: this.purchaseOrderId,
+        unloadPointId: this.unloadPointId,
+        orderEntryTime: sjTime(this.form1.orderEntryTime),
+        driverCapacityIdList: this.selectionList,
+        orderType: 8,
+        lineId: this.lineId,
+        isMoreTrips: this.isMoreTrips,
+      };
+      this.axios.post("/api/v1/oms/addPurOrder", map).then((res) => {
+        if (res.data.code == "200") {
+          this.$message({
+            message: "添加成功!",
+            type: "success",
+          });
+          this.$router.push("/mineralTransportAppoint");
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss">
+.contractDetails {
+  width: 100%;
+}
+
+.el-drawer__container ::-webkit-scrollbar {
+  display: none;
+}
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.remark {
+  display: flex;
+  justify-content: center;
+  .text {
+    display: inline-block;
+    width: 100px;
+    text-align: right;
+  }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+}
+.lineId {
+  display: flex;
+  justify-content: center;
+  .text {
+    display: inline-block;
+    width: 170px;
+    text-align: right;
+  }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+  .span {
+    display: inline-block;
+    width: 70px;
+    height: 1px;
+  }
+}
+.swtichTop{
+  display: flex;
+  height: 40px;
+  align-content: center;
+  justify-content: center;
+  padding-right:20px ;
+  .titile{
+    color: red;
+    font-size: 14px;
+  }
+  .switch{
+    margin-right: -30px
+  }
+}
+.supplieUnit {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 20px;
+  .el-input {
+    width: 250px;
+  }
+}
+.material {
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
+  .text {
+    display: inline-block;
+    width: 170px;
+    text-align: right;
+  }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+}
+.orderType {
+  display: flex;
+  justify-content: center;
+  .text {
+    display: inline-block;
+    width: 110px;
+    text-align: right;
+  }
+  .select {
+    width: 250px;
+  }
+  .span {
+    display: inline-block;
+    width: 30px;
+    height: 10px;
+  }
+}
+.contractTitle {
+  display: flex;
+  justify-content: center;
+  .el-form-item {
+    display: flex;
+    justify-content: center;
+    .el-form-item__label {
+      display: flex;
+      align-items: center;
+    }
+    .el-input {
+      width: 250px;
+    }
+  }
+}
+.forwardingUnit {
+  display: flex;
+  justify-content: center;
+  .text {
+    display: inline-block;
+    width: 170px;
+    text-align: right;
+  }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+}
+.truckList1 {
+  width: 100%;
+  .truckList {
+    width: 96%;
+    .text {
+      display: inline-block;
+      width: 120px;
+      text-align: right;
+    }
+    .truckBtn {
+      width: 250px;
+    }
+  }
+}
+.drawer_top{
+  margin-top: -50px;
+  width: 100%;height: 60px;
+  display: flex;
+  align-items: center;
+}
+.drawer_table1{
+  width: 100%;height: 500px;
+}
+.button_box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100px;
+}
+</style>

src/views/TMS/components/importedMineral/transportAppoint.vue

@@ -0,0 +1,262 @@
+<template>
+  <!-- 辅料运输预约 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input
+        class="input"
+        placeholder="请输入内容"
+        v-model="input"
+        clearable
+      >
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" class="btn" @click="insertClick">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="issue"
+        v-if="activeName == 'first'"
+      >
+        <i class="el-icon-plus"></i>下发
+      </el-button>
+    </div>
+    <el-tabs v-model="activeName" tab-click="handleClick">
+      <!-- 未下发 -->
+      <el-tab-pane label="未下发" name="first">
+        <dilTable
+          v-bind.sync="option1"
+          ref="table"
+          @selection-change="selectionChange"
+        >
+          <el-table-column
+            fixed="right"
+            align="center"
+            label="操作"
+            width="120"
+          >
+            <template slot-scope="scope">
+              <el-button
+                @click="sendClick(scope.row.orderId)"
+                type="text"
+                size="small"
+              >
+                下发
+              </el-button>
+              <el-button
+                @click="updateClick(scope.row.orderId)"
+                type="text"
+                size="small"
+              >
+                修改
+              </el-button>
+              <el-button
+                @click="
+                  deleteClick(scope.row.orderId, scope.row.capacityNumber)
+                "
+                type="text"
+                size="small"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </dilTable>
+      </el-tab-pane>
+      <!-- 已下发 -->
+      <el-tab-pane label="已下发" name="second">
+        <dilTable v-bind.sync="option2"> </dilTable>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "inplantTMS",
+  data() {
+    return {
+      input: "",
+      Time: "",
+      activeName: "first",
+      option1: {
+        // 表格请求数据的地址
+        requestUrl: "",
+        selectionType: "select",
+        mapList: [],
+      },
+      option2: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+    };
+  },
+  created() {
+    //判断是否是承运商
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option1.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=8&carrierSSOId=" +
+        getCookie("userId");
+      this.option2.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=8&carrierSSOId=" +
+        getCookie("userId");
+    } else {
+      this.option1.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=8&carrierSSOId=" +
+        null;
+      this.option2.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=8&carrierSSOId=" +
+        null;
+    }
+  },
+  methods: {
+    handleClick(){
+      this.getRequestUrl()
+    },
+    getRequestUrl(){
+        //判断是否是承运商
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option1.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=8&carrierSSOId=" +
+        getCookie("userId") + "&i=" + new Date();
+      this.option2.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=8&carrierSSOId=" +
+        getCookie("userId") + "&i=" + new Date();
+    } else {
+      this.option1.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=8&carrierSSOId=" +
+        null + "&i=" + new Date();
+      this.option2.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=8&carrierSSOId=" +
+        null + "&i=" + new Date();
+    }
+    },
+    onclick() {
+      if (this.activeName == "first") {
+        //判断是否是承运商
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=8&carrierSSOId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input;
+        } else {
+          this.option1.requestUrl =
+            "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=8&carrierSSOId=" +
+            null +
+            "&con=" +
+            this.input;
+        }
+      } else {
+        //判断是否是承运商
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=8&carrierSSOId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input;
+        } else {
+          this.option1.requestUrl =
+            "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=8&carrierSSOId=" +
+            null +
+            "&con=" +
+            this.input;
+        }
+      }
+    },
+    selectionChange(selection) {
+      this.mapList = selection;
+    },
+    issue() {
+      let mapvalue = {
+        mapList: this.mapList,
+      };
+      this.axios.post("/api/v1/oms/dispatchOrder", mapvalue).then(() => {
+        this.$message({
+          type: "success",
+          message: "下发成功!",
+        });
+        this.getRequestUrl()
+      });
+    },
+    // 下发
+    sendClick(orderId) {
+      let mapvalue = {
+        mapList: [{ orderId: orderId }],
+      };
+      this.$confirm("是否下发", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios.post("/api/v1/oms/dispatchOrder", mapvalue).then(() => {
+            this.$message({
+              type: "success",
+              message: "下发成功!",
+            });
+            this.getRequestUrl()
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消下发!",
+          });
+        });
+    },
+    // 删除
+    deleteClick(orderId, capacityNumber) {
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+          this.axios
+            .post("/api/v1/oms/deleteOrder", {
+              orderId: orderId,
+              capacityNumber: capacityNumber,
+            })
+            .then(() => {
+              this.getRequestUrl()
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+    //新增
+    insertClick() {
+      this.$router.push("/addMineralTransportAppoint");
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 40px;
+    .input {
+      width: 250px;
+      margin-right: 20px;
+    }
+    .btn {
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/importedMineral/transportExcute/enfactory.vue

@@ -0,0 +1,78 @@
+<template>
+  <div class="homeworkPath">
+    <div class="top">
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import { sjTime } from "@/utils/sharedJsFile";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      startTime: null,
+      endTime: null,
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=8",
+      },
+    };
+  },
+
+  methods: {
+    onclick() {
+let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=8&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }else{
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        this.getRequestUrl()
+      }
+    },
+  },
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/importedMineral/transportExcute/grossResult.vue

@@ -0,0 +1,47 @@
+<template>
+  <!-- 辅料计毛实绩页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=8",
+      },
+    };
+  },
+
+  methods: {
+    onclick() {
+     this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=8&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/importedMineral/transportExcute/outfactory.vue

@@ -0,0 +1,75 @@
+<template>
+  <!-- 辅料出厂作业页面 -->
+  <div class="homeworkPath">
+   <div class="top"> 
+      <span class="text">出厂时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text1">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+       <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import { sjTime } from "@/utils/sharedJsFile";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      startTime: null,
+      endTime: null,
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=8",
+      },
+    };
+  },
+
+  methods: {
+    
+    onclick() {
+       let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=8&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+          }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=8&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+        
+      }  
+    },
+   }
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/importedMineral/transportExcute/qualityResult.vue

@@ -0,0 +1,56 @@
+<template>
+  <!-- 辅料质检作业 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" class="input" 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">
+      <el-table-column fixed="right" label="操作" width="50">
+        <template slot-scope="scope">
+          <el-button @click="updateClick(scope.row.resultId)" type="text" size="small">
+            修改
+          </el-button>
+        </template>
+      </el-table-column>
+    </dilTable>
+  </div>
+</template>
+
+
+<script>
+export default {
+  name: "wagonPlease",
+  data() {
+    return {
+      status: "",
+      input: "",
+      option: {       
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getQualityResult?apiId=150&orderType=8",
+      },
+    };
+  },
+
+  methods: {
+    onclick() {
+         this.option.requestUrl = "/api/v1/tms/getQualityResult?apiId=150&orderType=8&con=" + this.input;
+    },
+  },
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/importedMineral/transportExcute/tareResult.vue

@@ -0,0 +1,48 @@
+<template>
+  <!-- 辅料计皮实绩页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=8",
+      },
+    };
+  },
+
+  methods: {
+
+    onclick() {
+     this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=8&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/importedMineral/transportExcute/unload.vue

@@ -0,0 +1,45 @@
+<template>
+  <!-- 卸货实绩页面 -->
+  <div class="homeworkPath">
+   <div class="top">
+      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option"></dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getUnloadResult?apiId=145&orderType=8",
+      },
+    };
+  },
+ 
+  methods: {
+    onclick() {
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=145&orderType=8&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/importedMineral/transportOrder.vue

@@ -0,0 +1,158 @@
+<template>
+  <!-- 辅料运输派单 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input
+        placeholder="请输入内容"
+        class="input"
+        v-model="input"
+        clearable
+      >
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" class="btn" @click="clickClose" v-if="activeName == 'option'">
+        <i class="el-icon-close"></i>关闭
+      </el-button>
+    </div>
+    <el-tabs v-model="activeName">
+      <el-tab-pane label="未接收" name="option">
+        <dilTable v-bind.sync="option" @selection-change="selectionChange"> </dilTable>
+      </el-tab-pane>
+      <el-tab-pane label="已接收" name="first">
+        <dilTable v-bind.sync="option1"> </dilTable>
+      </el-tab-pane>
+      <el-tab-pane label="已拒绝" name="second">
+        <dilTable v-bind.sync="option2"> </dilTable>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "inplantTMS",
+  data() {
+    return {
+      input: "",
+      Time: "",
+      activeName: "option",
+      option: {
+        // 表格请求数据的地址
+        requestUrl:"",
+        selectionType: "select",
+      },
+      option1: {
+        // 表格请求数据的地址
+        requestUrl:"",
+      },
+      option2: {
+        // 表格请求数据的地址
+        requestUrl:"",
+      },
+      list:[],
+    };
+  },
+  watch:{
+    activeName(val){
+      if (getCookie("orgCode") == "chengyunshang") {
+        if(val == "option"){
+          this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=4&i="+new Date()+"&carrierSSOId=" + null;
+        }else if(val == "first"){
+          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=5&i="+new Date()+"&carrierSSOId=" + null;
+        }else if(val == "second"){
+          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=8&orderStatus=6&i="+new Date()+"&carrierSSOId=" + null;
+        }
+      }else{
+        if(val == "option"){
+          this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=4&i="+new Date()+"&carrierSSOId=" + null;
+        }else if(val == "first"){
+          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=5&i="+new Date()+"&carrierSSOId=" + null;
+        }else if(val == "second"){
+          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=8&orderStatus=6&i="+new Date()+"&carrierSSOId=" + null;
+        }
+      }
+      
+    }
+  },
+  created() {
+    //判断是否是承运商
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=4&carrierSSOId=" + getCookie("userId");
+      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=5&carrierSSOId=" + getCookie("userId");
+      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=8&orderStatus=6&carrierSSOId=" + getCookie("userId");
+    } else {
+      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=4&carrierSSOId=" + null;
+      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=5&carrierSSOId=" + null;
+      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=8&orderStatus=6&carrierSSOId=" + null;
+    }
+  },
+  methods: {
+    getRequestUrl(){
+      //判断是否是承运商
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=4&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
+      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=5&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
+      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=8&orderStatus=6&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
+    } else {
+      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=4&carrierSSOId=" + null +"&i="+new Date();
+      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=5&carrierSSOId=" + null +"&i="+new Date();
+      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=8&orderStatus=6&carrierSSOId=" + null +"&i="+new Date();
+    }
+    },
+    onclick() {
+    if (getCookie("orgCode") == "chengyunshang") {
+       if(this.activeName == "option"){
+        this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=4&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + getCookie("userId");
+      }else if (this.activeName == "first") {
+        this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=8&orderStatus=5&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + getCookie("userId");
+      } else if (this.activeName == "second") {
+        this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=8&orderStatus=6&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + getCookie("userId");
+      }
+    }else{
+      if(this.activeName == "option"){
+        this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=4&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + null;
+      }else if (this.activeName == "first") {
+        this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=8&orderStatus=5&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + null;
+      } else if (this.activeName == "second") {
+        this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=8&orderStatus=6&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + null;
+      }
+    }
+      
+    },
+    clickClose(){
+      console.log(this.list)
+      if(this.list.length == 0){
+        this.$message.warning('请选择订单之后在关闭')
+      }else{
+        this.axios.post('/api/v1/oms/deleteOrders',{list:this.list}).then((res)=>{
+          if(res.data.code == "200"){
+            this.$message.success('关闭成功')
+            this.getRequestUrl()
+          }
+        })
+      }
+
+    },
+    selectionChange(selection){
+      this.list = [],
+      selection.forEach(e => {
+        this.list.push(e.orderId)
+      });
+    }
+  },
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+  .top {
+    padding: 40px;
+    .input {
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/importedTruck/truckEnfactoryResult.vue

@@ -2,7 +2,12 @@
   <!-- 进厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input class="" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span class="text">进厂时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -12,11 +17,14 @@
 </template>
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
       input:'',
+      startTime: null,
+      endTime: null,
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=99&orderType=8",
@@ -25,7 +33,32 @@ export default {
   },
   methods: {
     onclick(){
-      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=99&orderType=8&con=" + this.input;
+let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=99&orderType=8&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }else{
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        this.getRequestUrl()
+      }
     },
     updateClick(resultId) {
       this.$router.push("/truckLoadResultEdit/" + resultId);

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsNEW/enterFactoryNew.vue

@@ -2,7 +2,12 @@
 <template>
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -14,11 +19,14 @@
 </template>
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
       restaurants: [],
+      startTime: null,
+      endTime: null,
       input: "",
       option: {
         // 表格请求数据的地址
@@ -29,7 +37,32 @@ export default {
  
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=18&con=" + this.input;
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=18&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }else{
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        this.getRequestUrl()
+      }
     },
   }
 };

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/enterFactoryOld.vue

@@ -2,7 +2,12 @@
 <template>
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -14,10 +19,13 @@
 </template>
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
+      startTime: null,
+      endTime: null,
       restaurants: [],
       input: "",
       option: {
@@ -29,7 +37,32 @@ export default {
  
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=17&con=" + this.input;
+let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=17&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }else{
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        this.getRequestUrl()
+      }
     },
   }
 };

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

@@ -123,6 +123,16 @@ export default {
     }
   },
   methods: {
+    getRequestUrl(){
+       //判断是否是承运商
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" + getCookie("userId") + "&i=" + new Date();
+      this.option2.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" + getCookie("userId") + "&i=" + new Date();
+    } else {
+      this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" + null + "&i=" + new Date();
+      this.option2.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" + null + "&i=" + new Date();
+    }
+    },
     onclick() {
       if (this.activeName == "first") {
         //判断是否是承运商
@@ -152,9 +162,7 @@ export default {
           type: "success",
           message: "下发成功!",
         });
-        this.option1.requestUrl =
-          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&i=" +
-          new Date();
+        this.getRequestUrl()
       });
     },
     // 下发
@@ -174,9 +182,7 @@ export default {
               type: "success",
               message: "下发成功!",
             });
-            this.option1.requestUrl =
-              "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&i=" +
-              new Date();
+            this.getRequestUrl()
           });
         })
         .catch(() => {
@@ -205,7 +211,7 @@ export default {
               capacityNumber: capacityNumber,
             })
             .then(() => {
-              this.$router.go(0);
+              this.getRequestUrl()
             });
         })
         .catch(() => {

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

@@ -2,12 +2,19 @@
   <!-- 新增运输作业页面 -->
   <div id="contractDetails">
     <page-title>运输预约</page-title>
-    <div class="orderType from">
-      <span class="text">订单类别：</span>
+    <div style="text-align: center; font-size:20px; font-weight:bold; margin-top:15px; color:green">
+      <span>设备材料预约界面</span>
+    </div>
+    <div style="text-align: center; font-size:15px; margin-top:15px; color:red">
+      <span>温馨提示：卸货到达钢请选择一厂，达兴二焦化、化工厂请选择二厂<br>如选错厂区将会影响车辆上秤计量！！！</span>
+    </div>
+    <div class="orderType from" style="margin-top: 15px;">
+      <span class="text">卸货厂区：</span>
       <el-select
         class="select"
         v-model="orderType"
         placeholder="请选择"
+        @change="onchange()"
       >
         <el-option
           v-for="item in orderTypeList"
@@ -48,7 +55,7 @@
     </div>
     <div class="remark from">
       <span class="text">船名：</span>
-      <el-input class="input" v-model="remark" @blur="onBlur"> </el-input>
+      <el-input class="input" v-model="remark" @blur="onBlur" :disabled="true"> </el-input>
       <span class="span"></span>
     </div>
     <div class="forwardingUnit from">
@@ -243,11 +250,11 @@ export default {
       orderTypeList: [
         {
           value: 17,
-          label: "老厂区",
+          label: "一厂",
         },
         {
           value: 18,
-          label: "新厂区",
+          label: "二厂",
         },
       ],
       stateSupplier:null,
@@ -352,6 +359,14 @@ export default {
     onClick(index) {
       this.selectionList.splice(index, 1);
     },
+    onchange(){
+      if(this.orderType == 17){
+        this.purchaseOrgId = 1
+      }else{
+        this.purchaseOrgId = 2
+      }
+      this.getPurchaseOrderNo()
+    },
     onBlur() {
       this.getPurchaseOrderNo();
     },
@@ -359,12 +374,13 @@ export default {
       let map = {
         materialId: this.materialId,
         supplierId: this.supplierId,
+        purchaseOrgId:this.purchaseOrgId
       };
       if (this.remark) {
         map.remark = this.remark;
       }
       console.log(this.map);
-      if (this.materialId && this.supplierId) {
+      if (this.materialId && this.supplierId && this.purchaseOrgId) {
         this.axios.post("/api/v1/oms/selectNewOrderId", map).then((res) => {
           console.log(res);
           if (res.data.code == "200") {
@@ -374,16 +390,13 @@ export default {
                 type: "warning",
               });
               this.form1 = [];
+              this.purchaseOrderNo = null;
+              this.purchaseOrderId = null
             } else {
               console.log();
               this.remark = res.data.data.remark;
               this.purchaseOrderId = res.data.data.purchaseOrderId;
               this.purchaseOrderNo=res.data.data.purchaseOrderNo;
-              // if (res.data.data.receiveUnitId == 1) {
-              //   this.orderType = 17;
-              // } else {
-              //   this.orderType = 18;
-              // }
             }
           } else {
             this.$message.error("请求失败");
@@ -477,7 +490,7 @@ export default {
       } else if (num == 5) {
         this.line.requestUrl ="/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date() + "&con=化工材料";
       }else if (num == 6) {
-        this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&i=" + new Date();
+        this.purchaseOrder.requestUrl =  "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId="+this.supplierId+"&i="+new Date();
       }
       
     },
@@ -505,7 +518,7 @@ export default {
     },
     currentRadioChange6(selection) {
       console.log(selection)
-      if (selection.shipperId == 1) {
+      if (selection.orgId == 1) {
         this.orderType = 17;
       } else {
         this.orderType = 18;

src/views/TMS/router/index.js

@@ -198,6 +198,15 @@ import receivingOld from '../components/purchaseChemicalMaterials/purchaseChemic
 import skinCountingOld from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/skinCountingOld.vue'
 import woolCountingOld from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/woolCountingOld.vue'
 
+import mineralTransportAppoint from '../components/importedMineral/transportAppoint.vue'
+import addMineralTransportAppoint from '../components/importedMineral/addTransportAppoint.vue'
+import mineralTransportOrder from '../components/importedMineral/transportOrder.vue'
+import mineralEnfactory from '../components/importedMineral/transportExcute/enfactory.vue'
+import mineralOutfactory from '../components/importedMineral/transportExcute/outfactory.vue'
+import mineralGrossResult from '../components/importedMineral/transportExcute/grossResult.vue'
+import mineralTareResult from '../components/importedMineral/transportExcute/tareResult.vue'
+import mineralUnload from '../components/importedMineral/transportExcute/unload.vue'
+import mineralQuality from '../components/importedMineral/transportExcute/qualityResult.vue'
 
 Vue.use(Router)
 
@@ -388,6 +397,16 @@ const constantRouterMap = [
       {path: 'receivingOld', name: 'receivingOld', meta: {code: 'xtpzgl-jggl'}, component: receivingOld},
       {path: 'skinCountingOld', name: 'skinCountingOld', meta: {code: 'xtpzgl-jggl'}, component: skinCountingOld},
       {path: 'woolCountingOld', name: 'woolCountingOld', meta: {code: 'xtpzgl-jggl'}, component: woolCountingOld},
+    
+      {path: 'mineralTransportAppoint', name: 'mineralTransportAppoint', meta: {code: 'xtpzgl-jggl'}, component: mineralTransportAppoint},
+      {path: 'addMineralTransportAppoint', name: 'addMineralTransportAppoint', meta: {code: 'xtpzgl-jggl'}, component: addMineralTransportAppoint},
+      {path: 'mineralTransportOrder', name: 'mineralTransportOrder', meta: {code: 'xtpzgl-jggl'}, component: mineralTransportOrder},
+      {path: 'mineralUnload', name: 'mineralUnload', meta: {code: 'xtpzgl-jggl'}, component: mineralUnload},
+      {path: 'mineralTareResult', name: 'mineralTareResult', meta: {code: 'xtpzgl-jggl'}, component: mineralTareResult},
+      {path: 'mineralGrossResult', name: 'mineralGrossResult', meta: {code: 'xtpzgl-jggl'}, component: mineralGrossResult},
+      {path: 'mineralOutfactory', name: 'mineralOutfactory', meta: {code: 'xtpzgl-jggl'}, component: mineralOutfactory},
+      {path: 'mineralEnfactory', name: 'mineralEnfactory', meta: {code: 'xtpzgl-jggl'}, component: mineralEnfactory},      
+      {path: 'mineralQuality', name: 'mineralQuality', meta: {code: 'xtpzgl-jggl'}, component: mineralQuality},
     ]
   }
 ];

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

@@ -63,6 +63,10 @@ export default {
       materialName: null,
       //物资编码
       materialCode:null,
+      // 物资规格
+      materialSpecification:null,
+      // 物资型号
+      materialModel:null,
       //盘点数量
       materialNumber:null,
       //物资id
@@ -114,6 +118,9 @@ export default {
     currentRadioChange1(selection) {
       console.log(selection);
       this.materialName = selection.materialName;
+      this.materialCode = selection.materialCode;
+      this.materialSpecification = selection.materialSpecification;
+      this.materialModel = selection.materialModel;
       this.max = selection.max;
     },
     currentRadioChange2(selection) {

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

@@ -63,6 +63,10 @@ export default {
       materialName: null,
       //物资编码
       materialCode:null,
+       // 物资规格
+      materialSpecification:null,
+      // 物资型号
+      materialModel:null,
       //盘点数量
       materialNumber:null,
       //物资id

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

@@ -63,6 +63,10 @@ export default {
       materialName: null,
       //物资编码
       materialCode:null,
+       // 物资规格
+      materialSpecification:null,
+      // 物资型号
+      materialModel:null,
       //盘点数量
       materialNumber:null,
       //物资id

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

@@ -63,6 +63,10 @@ export default {
       materialName: null,
       //物资编码
       materialCode:null,
+       // 物资规格
+      materialSpecification:null,
+      // 物资型号
+      materialModel:null,
       //盘点数量
       materialNumber:null,
       //物资id
@@ -113,6 +117,9 @@ export default {
     currentRadioChange1(selection) {
       console.log(selection);
       this.materialName = selection.materialName;
+      this.materialCode = selection.materialCode;
+      this.materialSpecification = selection.materialSpecification;
+      this.materialModel = selection.materialModel;
       this.max = selection.max;
     },
     currentRadioChange2(selection) {

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

@@ -23,13 +23,13 @@
     </div>
     <div class="table">
       <dilTable v-bind.sync="options" @selection-change="selectionChange" ref="table">
-        <!-- <el-table-column fixed="right" label="操作" width="150">
+        <el-table-column fixed="right" label="操作" width="150">
 								<template slot-scope="scope">
-									<el-button type="text" size="mini" @click="inboundDetails(scope)">
-										详情
+									<el-button type="text" size="mini" @click="deleteInbound(scope)">
+										删除
 									</el-button>
 								</template>
-				</el-table-column> -->
+				</el-table-column>
       </dilTable>
     </div>
   </div>
@@ -47,16 +47,46 @@ export default {
       region: "0",
       options:{
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsInboundResults?apiId=371&warehouseId="+1,
+        requestUrl: "/api/v1/wms/getWmsInboundResults?apiId=450&warehouseId="+1,
         // selectionType: "select",
         // mapList: [],
       },
     }
   },
   methods:{
-    // inboundDetails(scope){
-    //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
-    // },
+    deleteInbound(scope){
+       this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/wms/undoInbound?inboundId=" + scope.row.inboundId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    },
     // 获取当前月份的最后一天
     getdaysinmonth(year,month){
       month = parseInt(month,10)+1;
@@ -167,7 +197,7 @@ export default {
       if (startTime && endTime) {
         if (startTime < endTime) {
           // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.options.requestUrl = "/api/v1/wms/getWmsInboundResults?apiId=371&warehouseId="+1+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          this.options.requestUrl = "/api/v1/wms/getWmsInboundResults?apiId=350&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{
@@ -239,7 +269,7 @@ export default {
       }
     }
   }
-}
+
 </script>
 
 <style lang="scss" scoped>

src/views/WMS/components/steel/bar2_steel/bar2_addSteelInbound.vue

@@ -63,6 +63,10 @@ export default {
       materialName: null,
       //物资编码
       materialCode:null,
+       // 物资规格
+      materialSpecification:null,
+      // 物资型号
+      materialModel:null,
       //盘点数量
       materialNumber:null,
       //物资id

src/views/WMS/components/steel/bar2_steel/bar2_addSteelReserved.vue

@@ -63,6 +63,10 @@ export default {
       materialName: null,
       //物资编码
       materialCode:null,
+       // 物资规格
+      materialSpecification:null,
+      // 物资型号
+      materialModel:null,
       //盘点数量
       materialNumber:null,
       //物资id

src/views/WMS/components/steel/bar2_steel/bar2_steel_inboundReal.vue

@@ -23,13 +23,13 @@
     </div>
     <div class="table">
       <dilTable v-bind.sync="options" @selection-change="selectionChange" ref="table">
-        <!-- <el-table-column fixed="right" label="操作" width="150">
+        <el-table-column fixed="right" label="操作" width="150">
 								<template slot-scope="scope">
-									<el-button type="text" size="mini" @click="inboundDetails(scope)">
-										详情
+									<el-button type="text" size="mini" @click="deleteInbound(scope)">
+										删除
 									</el-button>
 								</template>
-				</el-table-column> -->
+				</el-table-column>
       </dilTable>
     </div>
   </div>
@@ -47,16 +47,47 @@ export default {
       region: "0",
       options:{
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsInboundResults?apiId=371&warehouseId="+2,
+        requestUrl: "/api/v1/wms/getWmsInboundResults?apiId=450&warehouseId="+2,
         // selectionType: "select",
         // mapList: [],
       },
     }
   },
   methods:{
-    // inboundDetails(scope){
-    //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
-    // },
+    deleteInbound(scope){
+       this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/wms/undoInbound?inboundId=" + scope.row.inboundId)
+            .then((res) => {
+              console.log("res.data.code",res.data.code)
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    },
     // 获取当前月份的最后一天
     getdaysinmonth(year,month){
       month = parseInt(month,10)+1;
@@ -167,7 +198,7 @@ export default {
       if (startTime && endTime) {
         if (startTime < endTime) {
           // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.options.requestUrl = "/api/v1/wms/getWmsInboundResults?apiId=371&warehouseId="+2+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          this.options.requestUrl = "/api/v1/wms/getWmsInboundResults?apiId=350&warehouseId="+2+"&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{
@@ -239,7 +270,7 @@ export default {
       }
     }
   }
-}
+
 </script>
 
 <style lang="scss" scoped>

src/views/appoint/components/inward/addTransPrice.vue

@@ -0,0 +1,402 @@
+<template>
+  <!-- 添加汽运单价 111-->
+  <div class="addTransportPrice">
+    <page-title>新增</page-title>
+    <div class="form">
+      <div class="form_box">
+        <dil-form :formId="379" v-model="form1" ref="from1"></dil-form>
+        <el-form>
+          <el-form-item label="承运起止地点">
+            <el-select v-model="rangeId" placeholder="请选择承运起止地点">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+         </el-form-item>
+         <el-button type="primary" class="btnml" @click="materialDrawer">浏览物资</el-button>
+         </el-form>
+      </div>
+      <div class="liulan">
+        <el-button type="primary" class="btn" @click="oilPriceFormulaClick"
+          >浏览</el-button
+        >
+      </div>
+      <div class="rangeStyle"></div>
+    </div>
+     <!-- 物资表格 -->
+    <div class="selectionTable from">
+      <el-table
+        :data="selectionList"
+        border
+        style="width: 100%"
+        highlight-current-row
+      >
+        <el-table-column type="index" label="序号" width="50">
+        </el-table-column>
+        <el-table-column
+          v-for="(item, i) in tableTop"
+          :key="i"
+          :prop="item.prop"
+          :label="item.label"
+          :width="item.width"
+          align="center"
+          show-overflow-tooltip
+        >
+        </el-table-column>
+        <!-- 操作列 -->
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              @click="deleteRow(scope.$index)"
+              type="text"
+              icon="el-icon-close"
+              size="big"
+            ></el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="button_box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+    <!-- 油价联动公式模态框 -->
+    <el-drawer
+      title="请选择油价联动公式"
+      :visible.sync="oilPriceFormulaDrawer"
+      :direction="direction"
+      :before-close="handleClose"
+      close-on-press-escape
+      modal
+      wrapperClosable
+      size="40%"
+    >
+      <div class="selectText">
+        <!-- <span></span> -->
+        <el-input v-model="LineText" placeholder="请输入内容"></el-input>
+        <el-button
+          type="primary"
+          @click="selectLineClick"
+          :loading="selectLineLoading"
+          ><i class="el-icon-search"></i>查询</el-button
+        >
+        <el-button type="primary" @click="addoilPriceFormula">确定</el-button>
+      </div>
+      <div class="LineTable">
+        <vue-scroll :ops="ops" style="width:100%;height:100%">
+          <dilTable
+            v-bind.sync="oilPriceFormula"
+            @radio-change="currentRadioChange"
+            :isKuang="isKuang"
+            :loading="tableLoading"
+            :drawer="oilPriceFormulaDrawer"
+            @func="func"
+          ></dilTable>
+        </vue-scroll>
+      </div>
+    </el-drawer>
+     <!-- 物资模态框 -->
+    <el-drawer
+      title="请选择物资"
+      :visible.sync="drawerMaterial"
+      :direction="direction"
+      close-on-press-escape
+      modal
+      wrapperClosable
+      size="40%"
+    >
+      <div class="selectText">
+        <el-input v-model="materialText" placeholder="请输入内容"></el-input>
+        <el-button
+          type="primary"
+          @click="selectMaterial"
+          :loading="selectLineLoading"
+          ><i class="el-icon-search"></i>查询</el-button
+        >
+        <el-button type="primary" @click="addMaterialList">确定</el-button>
+      </div>
+      <div class="LineTable">
+        <vue-scroll :ops="ops" style="width:100%;height:100%">
+          <dilTable
+            v-bind.sync="materialOptions"
+            @selection-change="selectionChange"
+            :isKuang="isKuang"
+            :loading="tableLoading"
+            :drawer="oilPriceFormulaDrawer"
+            @func="func"
+          ></dilTable>
+        </vue-scroll>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime, isNumber } from "@/utils/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      //物资模态框默认隐藏
+      drawerMaterial:false,
+      //物资查询框
+      materialText:null,
+      selectionList:[],
+      rangeId: null,
+      //是否点击查询
+      isKuang: false,
+      //表格加载状态
+      tableLoading: false,
+      //公式内容
+      formulaString: null,
+      //油价联动公式Id
+      oilPriceFormulaId: null,
+      //是否打开油价联动公式的模态窗口
+      oilPriceFormulaDrawer: false,
+      //油价联动公式查询条件
+      LineText: null,
+      //油价联动公式模态框查询按钮状态
+      selectLineLoading: false,
+      //油价联动公式模态窗口的数据
+      oilPriceFormula: {
+        requestUrl: "",
+        selectionType: "radio"
+      },
+      options: [],
+      newsArr:[],
+      //模态窗口的打开的方向
+      direction: "rtl",
+      materialOptions:{
+          requestUrl:"",
+          selectionType: "select",
+      },
+      //表单数据
+      form1: {
+        priceDate: new Date(),
+        oilTypeId: 10,
+        capacityTypeId: 1
+      },
+      tableTop: [
+        {
+          prop: "materialName",
+          label: "物资名称",
+        }
+      ],
+      
+      //提交给后端的数据
+      // map:{},
+      ops: {
+        vuescroll: {},
+        scrollPanel: {},
+        rail: {
+          keepShow: true
+        },
+        bar: {
+          hoverStyle: true,
+          onlyShowBarOnScroll: false, //是否只有滚动的时候才显示滚动条
+          background: "#5f9ea0", //滚动条颜色
+          opacity: 0.8, //滚动条透明度
+          "overflow-x": "hidden"
+        }
+      }
+    };
+  },
+  mounted() {
+    this.axios.get("/api/v1/uc/getTransRange").then(res => {
+      console.log(res.data.data)
+      this.options = res.data.data;
+    });
+  },
+  methods: {
+    func(res) {
+      this.selectLineLoading = false;
+      this.isKuang = false;
+      this.tableLoading = false;
+    },
+    materialDrawer(){
+      this.drawerMaterial = true
+      this.materialOptions.requestUrl = "/api/v1/uc/queryMaterialByLike?apiId=244&i=" + new Date()
+    },
+    selectMaterial(){
+      if(this.materialText == null){
+          this.materialOptions.requestUrl = "/api/v1/uc/queryMaterialByLike?apiId=244&i=" + new Date()
+      }else{
+          this.materialOptions.requestUrl = "/api/v1/uc/queryMaterialByLike?apiId=244&index=" + this.materialText
+      }
+    },
+    addMaterialList(){
+      this.drawerMaterial = false
+      this.newsArr.forEach((e) => {
+          console.log((e.materialName))
+          var addmap = {
+              materialName:e.materialName,
+              materialId:e.materialId
+          }
+          this.selectionList.push(addmap)
+      })
+      console.log(this.selectionList)
+      this.newsArr = []
+    },
+     //点击删除按钮删除当前点击的对象
+    deleteRow(index){
+      this.selectionList.splice(index,1)
+    },
+    selectionChange(selection){
+        console.log(selection)
+        for (let i = 0; i < selection.length; i++) {
+        if(this.newsArr.indexOf(selection[i]) === -1){
+        this.newsArr.push(selection[i]);
+        }
+        }
+    },
+    selectLineClick() {
+      this.tableLoading = true;
+      this.selectLineLoading = true;
+      this.isKuang = true;
+      if (this.LineText) {
+        this.oilPriceFormula.requestUrl =
+          "api/v1/uc/getOilFormula?apiId=444&con=" + this.LineText;
+      } else {
+        this.oilPriceFormula.requestUrl =
+          "api/v1/uc/getOilFormula?apiId=444&i=" + new Date();
+      }
+    },
+    //选定联动公式确定
+    addoilPriceFormula() {
+      let mapvalue = {
+        shipperId: this.form1.shipperId,
+        oilPriceFormula: this.formulaString,
+        cargonameId: this.oilPriceFormulaId,
+        capacityTypeId: this.form1.capacityTypeId,
+        priceValue: this.form1.priceValue,
+        priceDate: this.form1.priceDate,
+        type: this.form1.type,
+        oilpriceBase: this.form1.oilpriceBase,
+        oilTypeId: this.form1.oilTypeId,
+        oilpriceChangeThreshold: this.form1.oilpriceChangeThreshold
+      };
+      this.form1 = mapvalue;
+      this.oilPriceFormulaDrawer = false;
+    },
+    currentRadioChange(val) {
+      this.formulaString = val.formulaString;
+      this.oilPriceFormulaId = val.formulaId;
+    },
+    //打开线路的模态窗口
+    oilPriceFormulaClick() {
+      this.oilPriceFormulaDrawer = true;
+      this.oilPriceFormula.requestUrl = "/api/v1/uc/getOilFormula?apiId=444";
+    },
+    //模态窗口关闭时调用
+    handleClose() {
+      if (this.oilPriceFormulaDrawer) {
+        this.oilPriceFormulaDrawer = false;
+        this.LineText = null;
+      }
+    },
+    makeSure() {
+      let mapValue = {
+        cargonameId: this.oilPriceFormulaId,
+        capacityTypeId: this.form1.capacityTypeId,
+        priceValue: this.form1.priceValue,
+        priceDate: sjTime(this.form1.priceDate),
+        type: this.form1.type,
+        oilpriceBase: this.form1.oilpriceBase,
+        oilTypeId: this.form1.oilTypeId,
+        oilpriceChangeThreshold: this.form1.oilpriceChangeThreshold,
+        rangeId:this.rangeId,
+        mapList:this.selectionList
+      };
+      this.axios
+        .post("/api/v1/ams/insertInwardPrice", mapValue)
+        .then(res => {
+          if (res.data.code == "200") {
+            this.$router.go(-1);
+          }
+          this.$message({
+            type: "success",
+            message: "新增运输单价成功!"
+          });
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.push("/inwardTransPrice");
+    }
+  }
+};
+</script>
+<style lang="scss">
+.elForm {
+  margin-left: 30%;
+}
+.addTransportPrice {
+  .form {
+    display: flex;
+    .form_box {
+      width: 320px;
+      margin-left: 30%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+              .el-input {
+                width: 250px;
+              }
+            }
+          }
+        }
+      }
+    }
+    .liulan {
+      width: 120px;
+      margin-top: 30px;
+      .el-button {
+        width: 100px !important;
+        margin: auto;
+      }
+      .btn {
+        margin-top: 54px;
+      }
+    }
+  }
+  .button_box {
+    margin-left: 45%;
+  }
+  .selectText {
+    .el-input {
+      width: 250px;
+    }
+  }
+  .LineTable {
+    width: 100%;
+    height: 480px;
+    overflow: hidden;
+    margin-top: 10px;
+  }
+  .btnml {
+      width: 250px;
+      margin-left: 50px;
+  }}
+</style>
+<style lang="scss">
+/deep/.__bar-is-vertical {
+  right: -1px !important;
+}
+/deep/.__bar-is-horizontal {
+  display: none !important;
+}
+</style>

src/views/appoint/components/inward/transPrice.vue

@@ -0,0 +1,83 @@
+<template>
+  <!-- 内转汽运单价页面 -->
+  <div class="salePlan">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick" :loading="loading">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="btnclick(0)">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+       <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+    </div>
+
+<el-tabs v-model="activeName">
+      <!-- 正在启用 -->
+       <el-tab-pane label="正在启用" name="first">
+          <dilTable ref="excelDom" v-bind.sync="option" :loading="loading" :isKuang="isKuang" @func="func">
+        </dilTable>
+      </el-tab-pane>
+      <!-- 历史启用 -->
+      <el-tab-pane label="历史启用" name="second">
+          <dilTable ref="excelDom" v-bind.sync="option2" :loading="loading" :isKuang="isKuang" @func="func">
+          </dilTable>
+      </el-tab-pane>
+      
+    </el-tabs>
+  </div>
+</template>
+<script>
+export default {
+  name: "TransportPrice",
+  data() {
+    return {
+      activeName: "first",
+      isKuang:false,
+      loading:false,
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl:
+          "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=0",
+      },
+      option2: {
+        // 表格请求数据的地址
+        requestUrl:
+          "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=1",
+      },
+      tableTitle:'汽运单价'
+    };
+  },
+  methods: {
+    func(){
+      this.loading = false;
+      this.isKuang = false;
+    },
+    onclick() {
+      this.loading = true;
+      this.isKuang = true;
+      if(this.input){
+        this.option.requestUrl ="/api/v1/ams/getInwardContractPrice?apiId=464&con=" +this.input;
+      }else{
+        this.option.requestUrl ="/api/v1/ams/getInwardContractPrice?apiId=464&i="+new Date();
+      }
+    },
+    btnclick() {
+      this.$router.push("/inwardAddTransPrice");
+    },
+  },
+  
+};
+</script>
+<style lang='scss' scoped>
+.salePlan {
+  .top{
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+}
+</style>

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

@@ -77,7 +77,6 @@
             </el-form>
           </template>
         </el-table-column>
-
         </dilTable>
       </el-tab-pane>
       

src/views/appoint/router/index.js

@@ -63,6 +63,8 @@ import saleOrderSteelEmpower from '../components/saleContract/saleOrderSteelEmpo
 import saleOrderUpdateLog from '../components/saleContract/saleOrderUpdateLog.vue'
 import salePlan from '../components/saleContract/salePlan.vue'
 import transportPrice from '../components/saleContract/transportPrice.vue'
+import inwardTransPrice from '../components/inward/transPrice.vue'
+import inwardAddTransPrice from '../components/inward/addTransPrice.vue'
 Vue.use(Router)
 
 const constantRouterMap = [
@@ -132,10 +134,11 @@ const constantRouterMap = [
       {path: 'saleOrderUpdateLog/:saleOrderId', name: 'saleOrderUpdateLog', meta: {code: 'xtpzgl-yhgl'}, component: saleOrderUpdateLog},
       {path: 'salePlan', name: 'salePlan', meta: {code: 'xtpzgl-yhgl'}, component: salePlan},
       {path: 'transportPrice', name: 'transportPrice', meta: {code: 'xtpzgl-yhgl'}, component: transportPrice},
+      {path: 'inwardTransPrice', name: 'inwardTransPrice', meta: {code: 'xtpzgl-yhgl'}, component: inwardTransPrice},
+      {path: 'inwardAddTransPrice', name: 'inwardAddTransPrice', meta: {code: 'xtpzgl-yhgl'}, component: inwardAddTransPrice},
     ]
   }
 ];
-
 const router = new Router({
   routes: constantRouterMap
 })

src/views/inward/app.js

@@ -20,7 +20,6 @@ import DilCommonUI from "@/components/DilCommonUI";
 Vue.use(DilCommonUI);
 
 import 'xe-utils' 
-
 import VXETable from 'vxe-table'
 import 'vxe-table/lib/style.css'
 Vue.use(VXETable)

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

@@ -41,11 +41,11 @@ export default {
 </script>
 <style lang="scss">
     .sale{
-        .top{
-            width: 100%;height: 5rem;
-            display: flex;
-            align-items: center;
-            padding-left: 2.5rem;
+        .top {
+            padding: 1.25rem 1.875rem;
+            .el-input{
+            width: 20%;
+            }
         }
     }
 </style>

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

@@ -3,7 +3,12 @@
   <!-- 内转运输实绩 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -15,11 +20,14 @@
 
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
       input: "",
+      startTime: null,
+      endTime: null,
       option: {
         // 表格请求数据的地址
         requestUrl: "",
@@ -35,7 +43,32 @@ export default {
   },
   methods: {
     onclick() {
-      this.$message.info("功能暂时关闭")
+      let startTime = null;
+            let endTime = null;
+            if (this.startTime) {
+                startTime = sjTime(this.startTime);
+            }
+            if (this.endTime) {
+                endTime = sjTime(this.endTime);
+            }
+            if (startTime && endTime) {
+                if (startTime < endTime) {
+                // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+                this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=357&orderType=11&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
+                // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+                // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+                // }else{
+                // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+                // }
+                } else {
+                this.startTime = null;
+                this.endTime = null;
+                this.$message.warning("开始时间要比结束时间早");
+                }
+            } else {
+                this.getRequestUrl()
+            }
     },
   },
 };

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

@@ -3,21 +3,61 @@
     <div class="sale">
         <div class="top">
             <!-- 框计算 -->
-            <el-input
-                placeholder="请输入内容"
-                v-model="inputText"
-                clearable>
-            </el-input>
+            <span class="text">计时时间：</span>
+            <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+            </el-date-picker>
+            <span class="text">至</span>
+            <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+            </el-date-picker>
             <el-button type="primary" class="btn" @click="onclick">
                 <i class="el-icon-search"></i>查询
             </el-button>
         </div>
         <div class="tab">
-            <dilTable v-bind.sync="option"></dilTable>
+            <dilTable v-bind.sync="option" ref="table1">
+                <el-table-column fixed="right" label="操作" width="180">
+                <template slot-scope="scope">
+                    <div class="step">
+                        <el-button
+                        @click="getStepsList(scope.row)"
+                        type="text"
+                        size="small"
+                        >运输详情</el-button>
+                    </div>
+                  <!-- <el-button @click="" type="primary" style="margin-left: 16px;">
+                    运输详情
+                  </el-button> -->
+                </template>
+                </el-table-column>
+            </dilTable>
         </div>
+        <!-- 运输进程详情 -->
+        <el-drawer
+            :visible.sync="drawer"
+            :direction="direction">
+            <!-- 步骤条显示 -->
+            <div style="height: 200px;content-align:center" >
+                <el-table
+                :data="stepList"
+                style="width: 100%">
+                <el-table-column
+                    prop="linkName"
+                    label="计时状态"
+                    width="180">
+                </el-table-column>
+                <el-table-column
+                    prop="pointDate"
+                    label="时间"
+                    width="180">
+                </el-table-column>
+                </el-table>
+            </div>
+        </el-drawer>
     </div>
 </template>
 <script>
+import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
     data(){
         return{
@@ -26,25 +66,126 @@ export default {
                 // 表格请求数据的地址
                 requestUrl: "",
             },
+            tableData: [],
+            startTime: null,
+            endTime: null,
+            oldRow1: "",
+            oldRowCount1: 1,
+            drawer: false,
+            direction: 'rtl',
+            orderId: 0,
+            stepList:[]
         }
     },
     created(){
-        this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=363"
+        if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode") == "zidonghuabu"||getCookie("orgCode") == "wuliuchuyunzhongxin"){
+            this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=458"
+        }else{
+            console.log("cookier"+getCookie("userId"))
+            this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=458&orgCode="+getCookie("userId");
+        }
     },
     methods:{
-        onclick(){
-            this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=363&con="+this.inputText;
+        getStepsList(row){
+            console.log(row.orderId)
+            this.orderId = row.orderId
+            this.drawer = true
+            let map = {
+                orderId : this.orderId
+            }
+            this.axios.post("/api/v1/oms/getOrderResult",map)
+                .then((res) => {
+                    console.log(res)
+                if (res.status == 200) {
+                    this.stepList = res.data
+                } else {
+                    this.$message.error("展示失败！");
+                }
+            });
+            console.log(this.stepList)
+        },
+        getRequirementMaterial1(row) {
+        // 记录重复点击次数
+        if (this.oldRow1 === row) {
+            this.oldRowCount1 += 1;
+        }
+        // 切换当前详情表
+        this.$refs.table1.toggleRowExpansion(row);
+        // 打开前关闭上一个详情表
+        if (this.oldRow1 != "") {
+            if (this.oldRow1 != row) {
+            if (this.oldRowCount1 % 2 === 1) {
+                this.$refs.table1.toggleRowExpansion(this.oldRow1);
+            } else {
+                this.oldRowCount1 = 1;
+            }
+            } else {
+            this.oldRow1 = null;
+            return;
+            }
         }
+        // 重置上一个点击对象
+        this.oldRow1 = row;
+        this.getMaterial(row.orderId);
+        },
+        onclick(){
+            let startTime = null;
+            let endTime = null;
+            if (this.startTime) {
+                startTime = sjTime(this.startTime);
+            }
+            if (this.endTime) {
+                endTime = sjTime(this.endTime);
+            }
+            if (startTime && endTime) {
+                if (startTime < endTime) {
+                    console.log(startTime)
+                    console.log(endTime)
+                if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode") == "zidonghuabu"||getCookie("orgCode") == "wuliuchuyunzhongxin"){
+                    this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=458&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+                }else{
+                    this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=458&orgCode="+getCookie("userId")+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+                }
+                } else {
+                this.startTime = null;
+                this.endTime = null;
+                this.$message.warning("开始时间要比结束时间早");
+                }
+            } else {
+               
+            }
+        },
+        getMaterial(orderId){
+            console.log(orderId)
+            this.axios.post("/api/v1/oms/getPauseTimeTaskDetail/" + orderId).then((res) => {
+                console.log(res)
+                this.tableData = res.data.data
+            })
+        },
     }
 }
 </script>
 <style lang="scss">
     .sale{
-        .top{
-            width: 100%;height: 5rem;
-            display: flex;
-            align-items: center;
-            padding-left: 2.5rem;
+        .top {
+            padding: 1.25rem 1.875rem;
+            .el-input{
+            width: 20%;
+            }
         }
     }
+    .el-table th.el-table__cell>.cell {
+        display: inline-block;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        position: relative;
+        vertical-align: middle;
+        padding-left: 10px;
+        padding-right: 10px;
+        width: 100%;
+        text-align: center;
+    }
+    .step {
+    text-align: center;
+    }
 </style>

src/views/inward/components/inwardImport/daZhou/enFactoryResult.vue

@@ -3,11 +3,12 @@
     <div class="sale">
         <div class="top">
             <!-- 框计算 -->
-            <el-input
-                placeholder="请输入内容"
-                v-model="inputText"
-                clearable>
-            </el-input>
+            <span class="text">进门时间：</span>
+            <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+            </el-date-picker>
+            <span class="text">至</span>
+            <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+            </el-date-picker>
             <el-button type="primary" class="btn" @click="onclick">
                 <i class="el-icon-search"></i>查询
             </el-button>
@@ -18,10 +19,13 @@
     </div>
 </template>
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
     data(){
         return{
             inputText:'',
+            startTime: null,
+            endTime: null,
             option: {       
                 // 表格请求数据的地址
                 requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=99&orderType=9",
@@ -30,7 +34,32 @@ export default {
     },
     methods:{
         onclick(){
-            this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=99&orderType=9&con=" + this.inputText;
+           let startTime = null;
+            let endTime = null;
+            if (this.startTime) {
+                startTime = sjTime(this.startTime);
+            }
+            if (this.endTime) {
+                endTime = sjTime(this.endTime);
+            }
+            if (startTime && endTime) {
+                if (startTime < endTime) {
+                // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+                this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=99&orderType=9&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
+                // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+                // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+                // }else{
+                // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+                // }
+                } else {
+                this.startTime = null;
+                this.endTime = null;
+                this.$message.warning("开始时间要比结束时间早");
+                }
+            } else {
+                this.getRequestUrl()
+            }
         }
     }
 }

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

@@ -3,11 +3,12 @@
     <div class="sale">
         <div class="top">
             <!-- 框计算 -->
-            <el-input
-                placeholder="请输入内容"
-                v-model="inputText"
-                clearable>
-            </el-input>
+            <span class="text">进门时间：</span>
+            <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+            </el-date-picker>
+            <span class="text">至</span>
+            <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+            </el-date-picker>
             <el-button type="primary" class="btn" @click="onclick">
                 <i class="el-icon-search"></i>查询
             </el-button>
@@ -19,10 +20,13 @@
 </template>
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
     data(){
         return{
             inputText:null,
+            startTime: null,
+            endTime: null,
             option: {       
                 // 表格请求数据的地址
                 requestUrl: "",
@@ -37,14 +41,39 @@ export default {
         }
     },
     methods:{
-        // onclick(){
-        //     if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-        //     this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=434&orderType=10"
-        //     }else{
-        //     this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=434&orderType=10&userId=" + getCookie("orgCode")
-        //     }
-        //     this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=434&orderType=10&con=" + this.inputText;
-        //     }
+        onclick(){
+            let startTime = null;
+            let endTime = null;
+            if (this.startTime) {
+                startTime = sjTime(this.startTime);
+            }
+            if (this.endTime) {
+                endTime = sjTime(this.endTime);
+            }
+            if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+            this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=434&orderType=10"
+            }else{
+            this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=434&orderType=10&userId=" + getCookie("orgCode")
+            }
+            if (startTime && endTime) {
+                if (startTime < endTime) {
+                // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+                    this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=434&orderType=10&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
+                    // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+                    // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+                    // }else{
+                    // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+                    // }
+                    } else {
+                    this.startTime = null;
+                    this.endTime = null;
+                    this.$message.warning("开始时间要比结束时间早");
+                    }
+                } else {
+                    this.getRequestUrl()
+                }
+            }
     }
 }
 </script>

src/views/inward/components/inwardSettlement/countDetailOrder.vue

@@ -0,0 +1,133 @@
+// 计费详单
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <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>
+    <div class="table">
+      <el-tabs v-model="activeName">
+        <!-- 未结算 -->
+        <el-tab-pane label="未结算" name="first">
+        <dilTable v-bind.sync="options1">
+        </dilTable>
+        </el-tab-pane>
+        <!-- 已结算 -->
+        <el-tab-pane label="已结算" name="second">
+        <dilTable v-bind.sync="options2">
+        </dilTable>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  data(){
+    return{
+      //单价
+      Fee:null,
+      //加载
+      selectLineLoading:false,
+      input:"",
+      activeName:"first",
+      ssoId:null,
+      //详单Id
+      detailsId:null,
+      options1:{
+        // first请求数据的地址
+        requestUrl: "",
+      },
+      options2:{
+        // second请求数据的地址
+        requestUrl: "",
+      },
+      //是否打开修改详单地址弹出框
+      dialogFormVisible:false,
+      //原详单单价
+      originalPriceValue:null,
+      //新详单单价
+      newPriceValue:null,
+      //原详单地址
+      originalAddress:null,
+      //新详单地址
+      newAddress:null,
+      //新单价Id
+      priceId:null,
+      //是否打开运输单价的模态框
+      addressDrawer:false,
+      //运输单价的表格
+      Address: {
+        requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=255",
+        selectionType: "radio",
+      },
+      // addressText:null,
+      //缓存当前选中的运输单价
+      priceMap:{},
+      formLabelWidth: '125px'
+    }
+  },
+  created(){
+     this.options1GetRequestUrl();
+     this.options2GetRequestUrl();
+  },
+  methods:{
+    //未结算数据
+    options1GetRequestUrl(){
+    if(getCookie("orgCode") == "chengyunshang"){
+      this.ssoId=getCookie('userId');
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&carrierSsoId="+ getCookie('userId');
+    }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0"
+    }else{
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&userId=" + getCookie("orgCode");  
+    }
+    },
+    //已结算数据
+    options2GetRequestUrl(){
+     if(getCookie("orgCode") == "chengyunshang"){
+      this.ssoId=getCookie('userId');
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1&carrierSsoId="+ getCookie('userId');
+    }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1"
+    }else{
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1&userId=" + getCookie("orgCode");  
+    }
+    },
+     toInsert() {
+      this.$router.push("/insertCheckInventory");
+    },
+
+    onclick(){
+      console.log("查询待定值")
+      // this.options.requestUrl = "/api/v1/bms/getTruckDetailsOrderList?apiId=176&orderType=1&con="+this.input;
+    },
+    //运输订单点击浏览的事件
+    select(){
+      this.addressDrawer = true;
+    },
+    //运输单价模态窗口的框计算
+    selectAddressClick(){
+      this.Price.requestUrl = '/api/v1/ams/getAddressDeliveryAddress?apiId=255&con='+this.addressText;
+    },
+   
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
+  }
+}
+</style>

src/views/inward/components/inwardSettlement/detailOrder.vue

@@ -0,0 +1,198 @@
+// 计费详单
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <span>详单时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+      <span style="margin-left: 1rem;">合计净重：</span>
+      <el-input v-model="totalNetWeight" :disabled="true" style="width: 140px;"></el-input>
+      <span style="margin-left: 1rem;">合计金额：</span>
+      <el-input v-model="totalMoney" :disabled="true" style="width: 100px;"></el-input>
+    </div>
+    <div class="table">
+      <el-tabs v-model="activeName" tab-click="handClick">
+        <!-- 未结算 -->
+        <el-tab-pane label="未结算" name="first">
+        <div class="table">
+        <dilTable v-bind.sync="options1" ref="excelDom" @func="func"></dilTable>
+        </div>
+        </el-tab-pane>
+        <!-- 已结算 -->
+        <el-tab-pane label="已结算" name="second">
+        <dilTable v-bind.sync="options2">
+        </dilTable>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+import { sjTime } from '@/utils/sharedJsFile';
+export default {
+  data(){
+    return{
+      startTime: null,
+      endTime: null,
+      //合计净重
+      totalNetWeight:null,
+      //合计金额
+      totalMoney:null,
+      //单价
+      Fee:null,
+      //加载
+      selectLineLoading:false,
+      input:"",
+      activeName:"first",
+      ssoId:null,
+      //详单Id
+      detailsId:null,
+      options1:{
+        // first请求数据的地址
+        requestUrl: "",
+      },
+      options2:{
+        // second请求数据的地址
+        requestUrl: "",
+      },
+      //是否打开修改详单地址弹出框
+      dialogFormVisible:false,
+      //原详单单价
+      originalPriceValue:null,
+      //新详单单价
+      newPriceValue:null,
+      //原详单地址
+      originalAddress:null,
+      //新详单地址
+      newAddress:null,
+      //新单价Id
+      priceId:null,
+      //是否打开运输单价的模态框
+      addressDrawer:false,
+      //运输单价的表格
+      Address: {
+        requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=255",
+        selectionType: "radio",
+      },
+      // addressText:null,
+      //缓存当前选中的运输单价
+      priceMap:{},
+      formLabelWidth: '125px',
+      tableTitle:'内转计重详单'
+    }
+  },
+  created(){
+     this.options1GetRequestUrl();
+     this.options2GetRequestUrl();
+  },
+  methods:{
+    func(res){
+      console.log(res.list)
+      var totalWeight = 0;
+      var totalAllMoney = 0;
+      res.list.forEach(e => {
+        console.log(e.resultNetWeight)
+        totalWeight = totalWeight + e.resultNetWeight
+        totalAllMoney = totalAllMoney + e.detailsAmount
+        console.log(e.detailsAmount);
+      });
+      this.totalNetWeight = totalWeight.toFixed(2) + 't';
+      this.totalMoney = totalAllMoney.toFixed(2) + '元'
+    },
+    //未结算数据
+    options1GetRequestUrl(){
+    if(getCookie("orgCode") == "chengyunshang"){
+      this.ssoId=getCookie('userId');
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&carrierSsoId="+ getCookie('userId') + "&startTime=null&endTime=null&i=" +new Date();
+    }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&startTime=null&endTime=null&i=" +new Date();
+    }else{
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&userId=" + getCookie("orgCode") + "&startTime=null&endTime=null&i=" +new Date(); 
+    }
+    },
+    //已结算数据
+    options2GetRequestUrl(){
+     if(getCookie("orgCode") == "chengyunshang"){
+      this.ssoId=getCookie('userId');
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1&carrierSsoId="+ getCookie('userId') + "&startTime=null&endTime=null&i=" +new Date();
+    }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1" + "&startTime=null&endTime=null&i=" +new Date();
+    }else{
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1&userId=" + getCookie("orgCode") + "&startTime=null&endTime=null&i=" +new Date();
+    }
+    },
+     toInsert() {
+      this.$router.push("/insertCheckInventory");
+    },
+    onclick(){
+      let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
+          this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0" + "&startTime=" + startTime + "&endTime=" + endTime + "&i" +new Date();
+          this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1" + "&startTime=" + startTime + "&endTime=" + endTime + "&i" +new Date();
+          }else if(getCookie("orgCode") == "chengyunshang"){
+          this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&carrierSsoId="+ getCookie('userId') + "&startTime=" + startTime + "&endTime=" + endTime + "&i" +new Date();
+          this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1&carrierSsoId="+ getCookie('userId') + "&startTime=" + startTime + "&endTime=" + endTime + "&i" +new Date();
+          }else{
+            this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&userId=" + getCookie("orgCode") + "&startTime=" + startTime + "&endTime=" + endTime + "&i" +new Date();
+            this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1&userId=" + getCookie("orgCode") + "&startTime=" + startTime + "&endTime=" + endTime + "&i" +new Date();
+          }
+        }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+
+      }
+    },
+    //运输订单点击浏览的事件
+    select(){
+      this.addressDrawer = true;
+    },
+    //运输单价模态窗口的框计算
+    selectAddressClick(){
+      this.Price.requestUrl = '/api/v1/ams/getAddressDeliveryAddress?apiId=255&con='+this.addressText;
+    },
+   
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
+  }
+}
+</style>

src/views/inward/components/inwardSettlement/purInwardDetailsOrder.vue

@@ -0,0 +1,192 @@
+// 计费详单
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <span>详单时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+        <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+        <span style="margin-left: 1rem;">合计净重：</span>
+        <el-input v-model="totalNetWeight" :disabled="true" style="width: 140px;"></el-input>
+        <span style="margin-left: 1rem;">合计金额：</span>
+        <el-input v-model="totalMoney" :disabled="true" style="width: 100px;"></el-input>
+    </div>
+    <div class="table">
+      <el-tabs v-model="activeName">
+        <!-- 未结算 -->
+        <el-tab-pane label="未结算" name="first">
+        <dilTable v-bind.sync="options1" ref="excelDom" @func="func">
+        </dilTable>
+        </el-tab-pane>
+        <!-- 已结算 -->
+        <el-tab-pane label="已结算" name="second">
+        <dilTable v-bind.sync="options2">
+        </dilTable>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+import { sjTime } from '@/utils/sharedJsFile';
+export default {
+  data(){
+    return{
+      startTime: null,
+      endTime: null,
+      totalNetWeight:null,
+      totalMoney:null,
+      //单价
+      Fee:null,
+      //加载
+      selectLineLoading:false,
+      input:"",
+      activeName:"first",
+      ssoId:null,
+      //详单Id
+      detailsId:null,
+      options1:{
+        // first请求数据的地址
+        requestUrl: "",
+      },
+      options2:{
+        // second请求数据的地址
+        requestUrl: "",
+      },
+      //是否打开修改详单地址弹出框
+      dialogFormVisible:false,
+      //原详单单价
+      originalPriceValue:null,
+      //新详单单价
+      newPriceValue:null,
+      //原详单地址
+      originalAddress:null,
+      //新详单地址
+      newAddress:null,
+      //新单价Id
+      priceId:null,
+      //是否打开运输单价的模态框
+      addressDrawer:false,
+      //运输单价的表格
+      Address: {
+        requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=255",
+        selectionType: "radio",
+      },
+      // addressText:null,
+      //缓存当前选中的运输单价
+      priceMap:{},
+      formLabelWidth: '125px'
+    }
+  },
+  created(){
+     this.options1GetRequestUrl();
+     this.options2GetRequestUrl();
+  },
+  methods:{
+    func(res){
+      console.log(res.list);
+      var totalWeight = 0;
+      var totalAllMoney = 0;
+      res.list.forEach(e => {
+        totalWeight = totalWeight + e.netWeightSecond
+        totalAllMoney = totalAllMoney + e.secondAmount
+      });
+      this.totalNetWeight = totalWeight.toFixed(2) + 't';
+      this.totalMoney = totalAllMoney.toFixed(2) + '元'
+    },
+    //未结算数据
+    options1GetRequestUrl(){
+    if(getCookie("orgCode") == "chengyunshang"){
+      this.ssoId=getCookie('userId');
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=462&orderType=10&detailStatus=0&carrierSsoId="+ getCookie('userId');
+    }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=462&orderType=10&detailStatus=0"
+    }else{
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=462&orderType=10&detailStatus=0&userId=" + getCookie("orgCode");  
+    }
+    },
+    //已结算数据
+    options2GetRequestUrl(){
+     if(getCookie("orgCode") == "chengyunshang"){
+      this.ssoId=getCookie('userId');
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=462&orderType=10&detailStatus=1&carrierSsoId="+ getCookie('userId');
+    }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=462&orderType=10&detailStatus=1"
+    }else{
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=462&orderType=10&detailStatus=1&userId=" + getCookie("orgCode");  
+    }
+    },
+     toInsert() {
+      this.$router.push("/insertCheckInventory");
+    },
+
+    onclick(){
+      let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
+          this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=462&orderType=10&detailStatus=0" + "&startTime=" + startTime + "&endTime=" + endTime + "&i" +new Date();
+          this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=462&orderType=10&detailStatus=1" + "&startTime=" + startTime + "&endTime=" + endTime + "&i" +new Date();
+          }else if(getCookie("orgCode") == "chengyunshang"){
+          this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=462&orderType=10&detailStatus=0&carrierSsoId="+ getCookie('userId') + "&startTime=" + startTime + "&endTime=" + endTime + "&i" +new Date();
+          this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=462&orderType=10&detailStatus=1&carrierSsoId="+ getCookie('userId') + "&startTime=" + startTime + "&endTime=" + endTime + "&i" +new Date();
+          }else{
+            this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=462&orderType=10&detailStatus=0&userId=" + getCookie("orgCode") + "&startTime=" + startTime + "&endTime=" + endTime + "&i" +new Date();
+            this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=462&orderType=10&detailStatus=1&userId=" + getCookie("orgCode") + "&startTime=" + startTime + "&endTime=" + endTime + "&i" +new Date();
+          }
+        }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+
+      }
+    },
+    //运输订单点击浏览的事件
+    select(){
+      this.addressDrawer = true;
+    },
+    //运输单价模态窗口的框计算
+    selectAddressClick(){
+      this.Price.requestUrl = '/api/v1/ams/getAddressDeliveryAddress?apiId=255&con='+this.addressText;
+    },
+   
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
+  }
+}
+</style>

src/views/inward/components/inwardSettlement/timeDetailsWeight.vue

@@ -0,0 +1,193 @@
+// 计费详单
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <span>详单时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+    <span style="margin-left: 1rem;">合计时间：</span>
+      <el-input v-model="totalTime" :disabled="true" style="width: 140px;"></el-input>
+      <span style="margin-left: 1rem;">合计金额：</span>
+      <el-input v-model="totalMoney" :disabled="true" style="width: 100px;"></el-input>
+    </div>
+    <div class="table">
+      <el-tabs v-model="activeName">
+        <!-- 未结算 -->
+        <el-tab-pane label="未结算" name="first">
+        <dilTable v-bind.sync="options1" ref="excelDom" @func="func">
+        </dilTable>
+        </el-tab-pane>
+        <!-- 已结算 -->
+        <el-tab-pane label="已结算" name="second">
+        <dilTable v-bind.sync="options2">
+        </dilTable>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import { sjTime } from '@/utils/sharedJsFile';
+import { getCookie } from '@/utils/util.js';
+export default {
+  data(){
+    return{
+      startTime: null,
+      endTime: null,
+      totalMoney:null,
+      totalTime:null,
+      //单价
+      Fee:null,
+      //加载
+      selectLineLoading:false,
+      input:"",
+      activeName:"first",
+      ssoId:null,
+      //详单Id
+      detailsId:null,
+      options1:{
+        // first请求数据的地址
+        requestUrl: "",
+      },
+      options2:{
+        // second请求数据的地址
+        requestUrl: "",
+      },
+      //是否打开修改详单地址弹出框
+      dialogFormVisible:false,
+      //原详单单价
+      originalPriceValue:null,
+      //新详单单价
+      newPriceValue:null,
+      //原详单地址
+      originalAddress:null,
+      //新详单地址
+      newAddress:null,
+      //新单价Id
+      priceId:null,
+      //是否打开运输单价的模态框
+      addressDrawer:false,
+      //运输单价的表格
+      Address: {
+        requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=255",
+        selectionType: "radio",
+      },
+      // addressText:null,
+      //缓存当前选中的运输单价
+      priceMap:{},
+      formLabelWidth: '125px',
+      tableTitle:'内转计时计费详单'
+    }
+  },
+  created(){
+     this.options1GetRequestUrl();
+     this.options2GetRequestUrl();
+  },
+  methods:{
+    //未结算数据
+    options1GetRequestUrl(){
+    if(getCookie("orgCode") == "chengyunshang"){
+      this.ssoId=getCookie('userId');
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=21&detailStatus=0&carrierSsoId="+ getCookie('userId');
+    }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=21&detailStatus=0"
+    }else{
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=21&detailStatus=0&userId=" + getCookie("orgCode");  
+    }
+    },
+    //已结算数据
+    options2GetRequestUrl(){
+     if(getCookie("orgCode") == "chengyunshang"){
+      this.ssoId=getCookie('userId');
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=21&detailStatus=1&carrierSsoId="+ getCookie('userId');
+    }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=21&detailStatus=1"
+    }else{
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=21&detailStatus=1&userId=" + getCookie("orgCode");  
+    }
+    },
+     toInsert() {
+      this.$router.push("/insertCheckInventory");
+    },
+    func(res){
+      console.log(res);
+      var totalAllTime = 0;
+      var totalAllMoney = 0;
+      res.list.forEach(e => {
+        totalAllTime = totalAllTime + e.resultTime
+        totalAllMoney = totalAllMoney + e.detailsAmount
+      });
+      this.totalMoney = totalAllMoney;
+      this.totalTime = totalAllTime;      
+    },
+    onclick(){
+      let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
+          this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=21&detailStatus=0" + "&startTime=" + startTime + "&endTime=" + endTime + "&i" +new Date();
+          this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=21&detailStatus=1" + "&startTime=" + startTime + "&endTime=" + endTime + "&i" +new Date();
+          }else if(getCookie("orgCode") == "chengyunshang"){
+          this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=21&detailStatus=0&carrierSsoId="+ getCookie('userId') + "&startTime=" + startTime + "&endTime=" + endTime + "&i" +new Date();
+          this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=21&detailStatus=1&carrierSsoId="+ getCookie('userId') + "&startTime=" + startTime + "&endTime=" + endTime + "&i" +new Date();
+          }else{
+            this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=21&detailStatus=0&userId=" + getCookie("orgCode") + "&startTime=" + startTime + "&endTime=" + endTime + "&i" +new Date();
+            this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=21&detailStatus=1&userId=" + getCookie("orgCode") + "&startTime=" + startTime + "&endTime=" + endTime + "&i" +new Date();
+          }
+        }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+
+      }
+    },
+    //运输订单点击浏览的事件
+    select(){
+      this.addressDrawer = true;
+    },
+    //运输单价模态窗口的框计算
+    selectAddressClick(){
+      this.Price.requestUrl = '/api/v1/ams/getAddressDeliveryAddress?apiId=255&con='+this.addressText;
+    },
+   
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
+  }
+}
+</style>

src/views/inward/components/offsetSteel/truckTransport/enFactoryResult.vue

@@ -3,8 +3,12 @@
   <div class="sale">
     <div class="top">
       <!-- 框计算 -->
-      <el-input placeholder="请输入内容" v-model="inputText" clearable>
-      </el-input>
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -34,10 +38,13 @@
   </div>
 </template>
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   data() {
     return {
       inputText: "",
+      startTime: null,
+      endTime: null,
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=261&orderType=4",
@@ -82,9 +89,32 @@ export default {
         "/api/v1/uc/getMaterialMesByOrderId?apiId=352&orderId=" + orderId;
     },
     onclick() {
-      this.option.requestUrl =
-        "/api/v1/tms/getAllEnFactoryResult?apiId=261&orderType=4&con=" +
-        this.inputText;
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=261&orderType=4&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }else{
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        this.getRequestUrl()
+      }
     },
   },
 };

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

@@ -21,7 +21,7 @@
   <div class="truckNum">
     <el-form  class="demo-form-inline"  label-width="80px" label-position="left">
     <el-form-item label="车数">
-    <el-input   v-model="planTruckNumber" placeholder="必填" class="input"></el-input>
+    <el-input   v-model="planTruckNumber" placeholder="非必填" class="input"></el-input>
     </el-form-item>
   </el-form>
   </div>
@@ -32,30 +32,11 @@
 			<dilTable v-bind.sync="first" @radio-change="currentRadioChange" ref="table">
             <el-table-column fixed="right" label="操作" width="120">
                 <template slot-scope="scope">
-                  <el-button type="text" size="mini" @click="getRequirementMaterial(scope.row)">
-                    物资详情
+                  <el-button type="text" size="mini" @click="deleteRequirement(scope)">
+                    拒绝需求
                   </el-button>
                 </template>
               </el-table-column>
-              <!-- 物资详情抽屉 -->
-          <el-table-column type="expand" width="1">
-          <template slot-scope="props">
-            <el-form label-position="center" inline class="demo-table-expand">
-              <div v-if="false">{{ props }}</div>
-              <div>
-                <el-table :data="tableData" border >
-                  <el-table-column
-                    v-for="(item, i) in tableHead"
-                    :key="i"
-                    :prop="item.prop"
-                    :label="item.label"
-                    :width="item.width"
-                  ></el-table-column>
-                </el-table>
-              </div>
-            </el-form>
-          </template>
-          </el-table-column>
 			</dilTable>
       </div>
 		</template>
@@ -86,82 +67,9 @@ export default {
       numberValidateForm: {
           planTruckNumber: null,
       },
-      //记录旧的row对象(未下发)
-      oldRow: "",
-      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(未下发)
-      oldRowCount: 1,
-      //记录旧的row对象(已下发)
-      oldRow1: "",
-      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(已下发)
-      oldRowCount1: 1,
-      tableHead: [
-        {
-          prop: "materialName",
-          label: "物资名称",
-          width: 150,
-        },
-        {
-          prop:"loadName",
-          label:"装货点",
-          width:150
-        },
-        {
-          prop:"unloadName",
-          label:"卸货点",
-          width:150
-        },
-        {
-          prop:"loadSequence",
-          label:"装卸货次序",
-          width:150
-        },
-        {
-          prop: "materialWeight",
-          label: "物资重量",
-          width: 150,
-        },
-        {
-          prop: "materialCount",
-          label: "物资数量",
-          width: 150,
-        },
-      ],
-      tableData: [],
-      tableData1: [],
     };
   },
   methods: {
-    getRequirementMaterial(row) {
-      // 记录重复点击次数
-      if (this.oldRow === row) {
-        this.oldRowCount += 1;
-      }
-      // 切换当前详情表
-      this.$refs.table.toggleRowExpansion(row);
-      // 打开前关闭上一个详情表
-      if (this.oldRow != "") {
-        if (this.oldRow != row) {
-          if (this.oldRowCount % 2 === 1) {
-            this.$refs.table.toggleRowExpansion(this.oldRow);
-          } else {
-            this.oldRowCount = 1;
-          }
-        } else {
-          this.oldRow = null;
-          return;
-        }
-      }
-      // 重置上一个点击对象
-      this.oldRow = row;
-      this.getMaterial(row.requirementId);
-    },
-    getMaterial(requirementId){
-      console.log(requirementId)
-      this.axios.post("/api/v1/ams/getRequirementMaterial/" + requirementId).then((res) => {
-        this.tableData = res.data.data
-        console.log(res.data.data)
-      })
-    },
     handleSelect(item){
       this.carrierId = item.carrierId
       this.state2 = item.carrierName 
@@ -196,16 +104,13 @@ export default {
       if(this.carrierId == null){
         this.$alert('请输入承运商！')
         return
-      }else if(this.planTruckNumber == null){
-        this.$alert('请输入车数！')
-        return
       }else if(this.requirementId== null){
         this.$alert('请选择需要制定计划的需求！')
         return
       }
       let plan = {
         requirementId : this.mapList.requirementId,
-        planTruckNumber: this.planTruckNumber,
+        planTruckNumber: Number(this.planTruckNumber),
         carrierId: this.carrierId
       };
       this.axios
@@ -230,6 +135,40 @@ export default {
     cancel() {
       this.$router.go(-1);
     },
+    deleteRequirement(scope) {
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post(
+              "/api/v1/ams/deleteTruckRequirement/" + scope.row.requirementId
+            )
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "拒绝成功!",
+                });
+                this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=250&requirementStatus=2&i=" + new Date()
+              } else {
+                this.$message({
+                  message: "拒绝失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
   },
 };
 </script>

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

@@ -110,6 +110,7 @@ export default {
       disabled:false,
       //船名
       remark: null,
+      rangeId:null,
       //车辆表格数据
       selectionList: [],
       stateCarrier:null,
@@ -192,10 +193,10 @@ export default {
       console.log(this.purchaseOrgId)
       if(this.purchaseOrgId == 1) {
         this.purchaseOrgLable = "一厂"
-        console.log(this.purchaseOrgLable)
+        this.rangeId = 2
       }else{
         this.purchaseOrgLable = "二厂"
-        console.log(this.purchaseOrgLable)
+        this.rangeId = 3
       }  
     },
     getPurchaseOrderNo() {
@@ -305,7 +306,6 @@ export default {
     // 确认
     onClickConfirm() {
       console.log(this.purchaseOrgLable,this.materialName,this.supplierName,this.purchaseOrderNo,this.unloadPointName,this.stateCarrier)
-      debugger
       this.disabled = true
       var state = 0;
       if (
@@ -348,6 +348,7 @@ export default {
           purchaseOrderId: this.purchaseOrderId,
           unloadPointId: this.unloadPointId,
           carrierId:this.carrierId,
+          rangeId:this.rangeId,
           userId:getCookie("orgCode")
         };
         console.log(map, map);

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

@@ -27,7 +27,7 @@
     </el-form>
       </div>
       <div class="form-box">
-        <dil-form :formId="300" v-model="form"></dil-form>
+        <dil-form :formId="377" v-model="form"></dil-form>
       </div>
 
       <div class="DueTime">
@@ -51,6 +51,51 @@
           </div>
           </el-form>
       </div>
+     <!--选择车辆类型--> 
+     <div class="capacity">
+      <div class="capacityName">
+         <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+      >
+        <el-form-item label="选择车辆类型">    
+        </el-form-item>  
+        <el-form-item>
+         <el-input
+          el-input v-model="capacityTypeName" disabled>  
+       </el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="ondrawer(3)" class="truckBtn"
+          >浏览</el-button>
+        </el-form-item>
+        </el-form>
+      </div>
+      <el-drawer
+      title="选择车辆类型"
+      :visible.sync="drawer2"
+      direction="rtl"
+      size="40%"
+      :show-close="false"
+      >
+      <div style="margin-left:-300px">
+        <el-input placeholder="请输入内容" v-model="inputCapacityType" style="margin-left:20px;width: 250px" clearable > </el-input
+      ><el-button type="primary" class="btn" @click="onclickCapacity">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      </div>
+      
+     
+      <!-- <el-button @click="open">取消</el-button> -->
+    
+      <div class="tablecls">
+      
+        <dilTable ref="options3" v-bind.sync="options3" @radio-change="selectionChange1" :drawer="aaadrawer">
+        </dilTable>
+      </div>
+      </el-drawer>
+</div> 
       <div class="materialDrawer">
          <el-form
         :inline="true"
@@ -112,7 +157,7 @@
           <template slot-scope="scope">
             <template v-if="item.slot">
                 <!-- 装货点 -->
-               <template v-if="item.prop == 'requirementPlatformName'">
+               <template v-if="item.prop == 'requirementPlatformName'" style="width:400px">
                 <el-input
                   class="textinput"
                   v-model="scope.row.requirementPlatformName"
@@ -236,7 +281,7 @@
       </el-drawer>
     </div>
     <div class="button-box">
-      <el-button type="primary" @click="makeSure">确认新增</el-button>
+      <el-button type="primary" @click="makeSure" :disabled = "disabled">确认新增</el-button>
       <el-button type="primary" @click="cancel">返回</el-button>
     </div>
   </div>
@@ -246,6 +291,7 @@
 import PageTitle from "@/components/Page/Title";
 import { sjTime } from "@/utils/sharedJsFile";
 import { getCookie } from "@/utils/util.js";
+import { checkTel } from "@/utils/validator.js";
 export default {
   components: { PageTitle },
   data() {
@@ -254,11 +300,13 @@ export default {
       disabled:false,
       options: [],
       value: '',
-      isOpenDueTime : false,
+      isOpenDueTime : true,
+      inputCapacityType:null,
       DueTime:null,
       // 件数与重量的开关
       value: false,
       //物资模态框开关
+      drawer2:false,
       table: false,
       //物资表格表头
       tableTop: [
@@ -303,21 +351,30 @@ export default {
       materialId: null,
       requireUnitName:null,
       inputMaterial:null,
+      inputCapacityType:null,
       shipperId:null,
       truckPoint1: "",
       drawer: false,
       selectionList1: [],
       form: {},
+      capacityTypeId: "",
+      capacityTypeName:"",
       materialTable: {
         requestUrl: "",
         selectionType: "select",
         mapList1: []
       },
       second1: {
-        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        requestUrl: "",
         selectionType: "radio",
         mapList2: []
-      }
+      },
+      options3:{
+        requestUrl:"",
+        selectionType:"radio",
+        mapList3: []
+      },
+      form:{}
     };
   },
   watch: {
@@ -354,6 +411,9 @@ export default {
       this.shipperId = item.shipperId
       this.requireUnitName = item.shipperName 
     },
+    getUnloadRequestUrl(){
+      this.second1.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date()
+    },
     //以下是用车单位边输边查搜索
     querySearchCarrier(queryString, cb) {
         this.axios.post('/api/v1/uc/getRequireUnitName?index='+queryString).then((res)=>{
@@ -375,24 +435,28 @@ export default {
     selectionChange(selection) {
       this.selectionList1 = [];
       this.selectionList1 = selection;
+      console.log("selection",selection)
     },
     unloadPoint(index) {
-      // console.log(index)
+      this.getUnloadRequestUrl()
       this.index= index
       this.a = 3
-      this.drawer = true;
+      this.drawer = true; 
     },
     loadPoint(index) {
-      // console.log(index)
+      this.getUnloadRequestUrl()
       this.index = index
       this.a = 4
-      this.drawer = true;
+      this.drawer = true; 
     },
     //以上是用车单位边输边查搜索
     ondrawer(num) {   
       if(num==1){
         this.table = true
         this.materialTable.requestUrl = "/api/v1/uc/queryMaterialByLike?apiId=244&i=" + new Date()
+      }else if(num==3){
+        this.drawer2 = true
+        this.options3.requestUrl = "/api/v1/uc/getCapacityType?apiId=460"
       }else{
         this.drawer = true;
       }  
@@ -409,6 +473,14 @@ export default {
         this.inputMaterial = null
       }
     },
+    onclickCapacity(){
+      if(this.inputCapacityType == null){
+        this.options3.requestUrl = "/api/v1/uc/getCapacityType?apiId=460"
+      }else{
+        this.options3.requestUrl = "/api/v1/uc/getCapacityType?apiId=460&index="+this.inputCapacityType
+        this.inputCapacityType = null
+      }
+    },
     //删除行
     deleteRow(index, rows) {
       // console.log(index)
@@ -417,6 +489,15 @@ export default {
     },
      // 返回主界面
     makeSure1() {
+        console.log(this.tableData.length);
+        if(this.tableData.length > 0&&this.selectionList1.length>0){
+          this.$message.warning("一个需求只允许填写一个物资")
+          return
+        }
+        if(this.selectionList1.length > 1){
+          this.$message.warning("一个需求只允许填写一个物资")
+          return
+        }
         this.selectionList1.forEach((e) => {
           // console.log(e.materialModel,e.materialSpecification)
         if(e.materialSpecification == null){
@@ -476,6 +557,11 @@ export default {
       }
       this.materialId = selection.materialId;
     },
+    selectionChange1(radio){
+      console.log(radio)
+      this.capacityTypeName  = radio.capacityTypeName,
+      this.capacityTypeId = radio.capacityTypeId
+    },
     currentRadioChange2(selection) {
       console.log(selection);
       if (this.a == 2) {
@@ -495,24 +581,42 @@ export default {
     },
     // 新增
     makeSure() {
+      console.log(this.form.isMineral)
+      this.disabled = true
       if(this.shipperId == null){
         this.$message.error("请选择用车单位")
+        this.disabled = false
         return
-      }if(typeof(this.form.requirementEstimatedDuration) == 'undefined'){
-        this.$message.error("请输入预计用车时长")
-        return
-      }if(typeof(this.form.requirementTruckTime) == 'undefined'){
+      }
+      if(typeof(this.form.requirementTruckTime) == 'undefined'){
         this.$message.error("请输入用车时间")
+        this.disabled = false
         return
-      }if(typeof(this.form.requirementType) == 'undefined'){
-        this.$message.error("请选择需求类型")
+      }
+      if(typeof(this.form.transRange) == 'undefined'){
+        this.$message.error("请选择运输起止范围")
+        this.disabled = false
         return
-      }if(typeof(this.form.requirementWorkType) == 'undefined'){
-        this.$message.error("请输入费用类别")
+      }
+      if(typeof(this.form.requirementType) == 'undefined'){
+        this.$message.error("请选择需求类型")
+        this.disabled = false
         return
       }if(this.tableData.length == 0){
         this.$message.error("请点击浏览选择物资")
+        this.disabled = false
         return
+      }if(typeof(this.form.requirementOverlimit) != 'undefined'){
+        console.log((typeof(this.form.remark) == 'undefined'))
+        if((typeof(this.form.remark) == 'undefined')){
+          this.$message.error("请填写超限备注")
+          this.disabled = false
+          return
+        }
+      }if(typeof(this.form.Tel) == 'undefined'){
+          this.$message.error("请填写联系电话")
+          this.disabled = false
+          return
       }
       var i=0
       this.tableData.forEach((e) =>{
@@ -522,30 +626,54 @@ export default {
       })
       if(i==0){
          this.$message.error("请选择装卸点")
+         this.disabled = false
          return
       }
       // console.log(this.tableData)
       var DueTime;
+      if(this.DueTime == null){
+        this.$message.warning("截止日期必填")
+        this.disabled = false
+        return
+      }
       if(this.DueTime==null){
         DueTime = null;
       }else{
-        DueTime = sjTime(this.DueTime);
+        // 判断当前用户填写的截止日期是否大于当前时间
+        let date2 = new Date();
+        if(date2.getTime()>this.DueTime.getTime()){
+          this.$message.warning("截止日期必须大于当前时间！");
+          this.disabled = false
+          return
+        }else{
+          DueTime = sjTime(this.DueTime);
+        }
+      }
+      if(this.form.capacityType==undefined){
+        this.form.capacityType=""
+      }
+      if(this.form.typeRemarks==undefined){
+        this.form.typeRemarks=""
       }
       let requiremnet = {
         requirementEstimatedDuration: this.form.requirementEstimatedDuration,
-        requirementOverlimit: this.form.requirementOverlimit,
+        requirementOverlimit: this.form.requirementOverlimit + this.form.remark + '米',
         requirementTruckTime: sjTime(this.form.requirementTruckTime),
         requirementType: this.form.requirementType,
         requirementWorkContent: this.form.requirementWorkContent,
         requirementWorkEnvironment: this.form.requirementWorkEnvironment,
         requirementWorkType: this.form.requirementWorkType,
         requirementShipperId: this.shipperId,
+        rangeId:this.form.transRange,
         // 用车截日期
         DueTime:DueTime,
+        // 用车类型Id
+        capacityTypeId:this.capacityTypeId,
         mapList:this.tableData,
-        orgCode:getCookie("orgCode")
+        orgCode:getCookie("orgCode"),
+        remark:this.form.Tel + this.capacityTypeName+this.form.typeRemarks
       };
-      // console.log("requirement",requiremnet);
+      console.log("requirement",requiremnet);
       this.axios
         .post("/api/v1/ams/addTruckRequirement", requiremnet)
         .then(res => {
@@ -557,8 +685,13 @@ export default {
             this.$router.go(-1);
           } else {
             this.$message.error("新增失败！");
+            this.disabled = false
           }
         });
+    },
+     func(res) {
+      console.log(res);
+      this.isKuang = false;
     },
     // 返回
     cancel() {
@@ -592,6 +725,15 @@ export default {
       margin-right: 70px;
     }
   }
+.capacity{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 2rem;
+  margin-bottom: 1.25rem;
+  margin-right: 10px;
+}
 .materialDrawer {
   display: flex;
   justify-content: center;

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

@@ -0,0 +1,199 @@
+// 分派计划
+<template>
+  <div class="inwardOrder">
+    <div class="sache">
+      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      </el-input>
+      <el-button type="primary" class="btn">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" class="btn" @click="cancel">
+        返回
+      </el-button>
+    </div>
+     <!-- 车辆信息 -->
+    <el-dialog
+        title="车辆信息"
+        :visible.sync="dialogTableVisible"
+        :before-close="handleClose"
+    >
+      <el-input v-model="truckInput" style="width:250px"></el-input>
+      <el-button type="primary" @click="clickTruck">查询</el-button>
+      <dilTable
+        v-bind.sync="truck"
+        @radio-change="currentRadioChange1"
+        >
+      </dilTable>
+      <span slot="footer" class="dialog-footer">
+      <el-button @click="cancelUpdate()">取 消</el-button>
+      <el-button type="primary" @click="updateTruckCapacity()"
+      >确 定</el-button>
+      </span>
+    </el-dialog>
+    <template>
+      <div>
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="待接收" name="first">
+            <dilTable v-bind.sync="first" ref="table">
+            </dilTable>
+          </el-tab-pane>
+          <el-tab-pane label="已接收" name="second">
+            <dilTable v-bind.sync="second"> </dilTable>
+          </el-tab-pane>
+          <el-tab-pane label="已完成" name="third">
+            <dilTable v-bind.sync="third"> </dilTable>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </template>
+  </div>
+</template>
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  data() {
+    return {
+      inputText: "",
+      truckInput:null,
+      userCarrierId: "",
+      //是否弹出对话框
+      dialogTableVisible: false,
+      first: {
+        //
+        requestUrl:
+          "" ,
+      },
+      //车辆信息的表格
+      truck: {
+        requestUrl:
+          "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + "",
+        // 控制显示当选列
+        selectionType: "radio",
+      },
+      //选中的运力id
+      capacityId: null,
+      activeName: "first",
+      second: {
+        requestUrl: "",
+      },
+      third: {
+        requestUrl: "",
+      },
+    };
+  },
+  created() {
+      this.first.requestUrl =
+        "/api/v1/ams/getPlanOrder?apiId=455&orderStatus=4" + "&requirementId=" + this.$route.params.requirementId
+      this.second.requestUrl =
+        "/api/v1/ams/getPlanOrder?apiId=455&orderStatus=5" + "&requirementId=" + this.$route.params.requirementId
+      this.third.requestUrl =
+        "/api/v1/ams/getPlanOrder?apiId=455&orderStatus=2" + "&requirementId=" + this.$route.params.requirementId
+  },
+  methods: {
+    getRequest() {
+      this.first.requestUrl =
+        "/api/v1/ams/getPlanOrder?apiId=455&orderStatus=4" + "&i=" + new Date() + "&requirementId=" + this.$route.params.requirementId
+      this.second.requestUrl =
+        "/api/v1/ams/getPlanOrder?apiId=455&orderStatus=5" + "&i=" + new Date() + "&requirementId=" + this.$route.params.requirementId
+    },
+    cancel(){
+        this.$router.go(-1)
+    },
+    handleClick() {
+      this.getRequest()
+    },
+    handleClose(done){
+      done()
+      this.$message.info("取消修改运力")
+    },
+    currentRadioChange1(row){
+      console.log(row)
+      this.capacityId = row.capacityId
+    },
+    getTruckRequestUrl(){
+      if (getCookie("orgCode") == "chengyunshang") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+        getCookie("userId") + "&test=" + new Date();
+      } else {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null +  "&test=" + new Date();
+      }
+    },
+    //修改运输订单
+    updatePlan(scope){
+      this.getTruckRequestUrl()
+      this.orderId = scope.row.orderId
+      this.dialogTableVisible = true
+      console.log(scope.row.orderId)
+    },
+    updateTruckCapacity(){
+        if(this.capacityId == null){
+            this.$message.error("未选中运力")
+            return
+        }
+        this.axios.post("/api/v1/oms/updateCapacityId",{
+          capacityId:this.capacityId,
+          orderId :this.orderId
+        }).then((res) =>{
+          if(res.data.code == "200"){
+            this.$message.success("修改运力成功")
+            this.dialogTableVisible = false
+            this.getRequest()
+            
+          }else{
+            this.$message.error("修改运力失败")
+            this.dialogTableVisible = false
+            this.getRequest()
+          }
+        })
+    },
+    clickTruck(){
+      this.truck.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&index=" + this.truckInput
+    },
+      //删除运输订单
+    deleteClick(scope){
+      this.$confirm('是否删除?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+            this.axios
+            .post("/api/v1/oms/closeOmstruckOrder?orderId=" + scope.row.orderId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.getRequest()
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          });          
+        });
+    },
+  },
+};
+</script>
+<style lang="scss">
+.inwardOrder {
+  margin-top: 20px;
+  margin-left: 20px;
+  .sache {
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+}
+</style>

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

@@ -1,13 +1,15 @@
 // 制定计划
 <template>
   <div class="inwardPlan">
+    
     <div class="sache">
       <el-input placeholder="请输入内容" v-model="inputText" clearable>
       </el-input>
-      <el-button type="primary" class="btn">
+      <el-button type="primary" class="btn" @click="bofang">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button
+      <el-badge :value="addPlanCount" class="item" v-if="activeName == 'second'">
+        <el-button
         type="primary"
         class="btn"
         @click="toInsert"
@@ -15,6 +17,14 @@
       >
         <i class="el-icon-plus"></i>制定计划
       </el-button>
+      </el-badge>
+      <!-- <audio 
+       id="audioId"
+       controls="controls"
+       preload="auto"
+       loop = "isloop"
+       src="/static/music/y682.mp3">
+      </audio> -->
       <el-button
         type="primary"
         class="btn"
@@ -23,6 +33,7 @@
       >
         <i class="el-icon-download"></i>下发
       </el-button>
+      
     </div>
     <template>
       <div>
@@ -211,15 +222,42 @@ export default {
         },
       ],
       tableData: [],
+      addPlanCount:0,
+      timer:""
     };
   },
   created(){
-      this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1",
+      
       this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=257&planStatus=0",
       this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1",
-      this.fourth.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4"
+      this.fourth.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4"  
+  },
+  mounted(){
+    this.getAddPlan()
+    this.start()
+  },
+  beforeDestroy(){
+    this.timer
   },
   methods: {
+    getAddPlan(){
+        this.axios.post("/api/v1/uc/getPlanCount").then((res) =>{
+          this.addPlanCount = res.data
+        })
+    },
+    start(){
+        this.timer = setInterval(this.getAddPlan,60000)
+    },
+    bofang(){
+      let obj = new Object();
+      obj = document.getElementById('audioId');
+      console.log(obj)
+      if(obj.paused){
+        obj.play()
+      }else{
+        obj.paused
+      }
+    },
     getRequirementMaterial(row) {
       // 记录重复点击次数
       if (this.oldRow === row) {
@@ -392,6 +430,7 @@ export default {
                   message: "删除成功!",
                 });
                 this.getRequestUrl()
+                this.getAddPlan()
               } else {
                 this.$message({
                   message: "删除失败",
@@ -429,6 +468,7 @@ export default {
                   message: "下发成功!",
                 });
                 this.getRequestUrl()
+                this.getAddPlan()
                 this.activeName = 'third'
               } else {
                 this.$message({

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

@@ -15,14 +15,6 @@
       >
         <i class="el-icon-plus"></i>新增
       </el-button>
-      <el-button
-        type="primary"
-        class="btn"
-        @click="Issue"
-        v-if="activeName == 'first'"
-      >
-        <i class="el-icon-download"></i>下发
-      </el-button>
     </div>
     <template>
       <div>
@@ -31,13 +23,6 @@
             <dilTable v-bind.sync="first" @selection-change="selectionChange" ref="table1">
               <el-table-column fixed="right" label="操作" width="120">
                 <template slot-scope="scope">
-                  <el-button
-                    type="text"
-                    size="mini"
-                    @click="getRequirementMaterial1(scope.row)"
-                  >
-                    物资详情
-                  </el-button>
                   <el-button
                     type="text"
                     size="mini"
@@ -47,59 +32,15 @@
                   </el-button>
                 </template>
               </el-table-column>
-                      <!-- 物资详情抽屉 -->
-        <el-table-column type="expand" width="1">
-          <template slot-scope="props">
-            <el-form label-position="center" inline class="demo-table-expand">
-              <div v-if="false">{{ props }}</div>
-              <div>
-                <el-table :data="tableData1" border >
-                  <el-table-column
-                    v-for="(item, i) in tableHead"
-                    :key="i"
-                    :prop="item.prop"
-                    :label="item.label"
-                    :width="item.width"
-                  ></el-table-column>
-                </el-table>
-              </div>
-            </el-form>
-          </template>
-        </el-table-column>
             </dilTable>
           </el-tab-pane>
           <el-tab-pane label="已下发" name="second">
             <dilTable v-bind.sync="second" ref="table">
             <el-table-column fixed="right" label="操作" width="80">
                 <template slot-scope="scope">
-                  <el-button
-                    type="text"
-                    size="mini"
-                    @click="getRequirementMaterial(scope.row)"
-                  >
-                    物资详情
-                  </el-button>
+                 <el-button type="text" size="mini" @click="getRequirementOrder(scope)">运单</el-button>
                 </template>
               </el-table-column>
-        <!-- 物资详情抽屉 -->
-        <el-table-column type="expand" width="1">
-          <template slot-scope="props">
-            <el-form label-position="center" inline class="demo-table-expand">
-              <div v-if="false">{{ props }}</div>
-              <div>
-                <el-table :data="tableData" border >
-                  <el-table-column
-                    v-for="(item, i) in tableHead"
-                    :key="i"
-                    :prop="item.prop"
-                    :label="item.label"
-                    :width="item.width"
-                  ></el-table-column>
-                </el-table>
-              </div>
-            </el-form>
-          </template>
-        </el-table-column>
             </dilTable>
           </el-tab-pane>
         </el-tabs>
@@ -113,6 +54,7 @@ export default {
   data() {
     return {
       inputText: "",
+      orgCode:"",
       first: {
         // first请求数据的地址
         requestUrl:
@@ -178,67 +120,15 @@ export default {
       this.second.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&orgCode=" + getCookie("orgCode")
     }
   },
-  
   methods: {
-    getRequirementMaterial(row) {
-      // 记录重复点击次数
-      if (this.oldRow === row) {
-        this.oldRowCount += 1;
-      }
-      // 切换当前详情表
-      this.$refs.table.toggleRowExpansion(row);
-      // 打开前关闭上一个详情表
-      if (this.oldRow != "") {
-        if (this.oldRow != row) {
-          if (this.oldRowCount % 2 === 1) {
-            this.$refs.table.toggleRowExpansion(this.oldRow);
-          } else {
-            this.oldRowCount = 1;
-          }
-        } else {
-          this.oldRow = null;
-          return;
-        }
-      }
-      // 重置上一个点击对象
-      this.oldRow = row;
-      this.getMaterial(row.requirementId);
-    },
-    getRequirementMaterial1(row) {
-      // 记录重复点击次数
-      if (this.oldRow1 === row) {
-        this.oldRowCount1 += 1;
-      }
-      // 切换当前详情表
-      this.$refs.table1.toggleRowExpansion(row);
-      // 打开前关闭上一个详情表
-      if (this.oldRow1 != "") {
-        if (this.oldRow1 != row) {
-          if (this.oldRowCount1 % 2 === 1) {
-            this.$refs.table1.toggleRowExpansion(this.oldRow1);
-          } else {
-            this.oldRowCount1 = 1;
-          }
-        } else {
-          this.oldRow1 = null;
-          return;
-        }
-      }
-      // 重置上一个点击对象
-      this.oldRow1 = row;
-      this.getMaterial(row.requirementId);
+    //查看需求下面的运单
+    getRequirementOrder(scope){
+      this.$router.push(
+        "/getRequirementOrder/" + scope.row.requirementId
+      );
     },
     handleClick(tab, event) {
-      this.getRequestUrl()
-      this.getRequirementMaterial()      
-    },
-    getMaterial(requirementId){
-      console.log(requirementId)
-      this.axios.post("/api/v1/ams/getRequirementMaterial/" + requirementId).then((res) => {
-        this.tableData = res.data.data
-        this.tableData1 = res.data.data
-        console.log(res.data.data)
-      })
+      this.getRequestUrl()   
     },
     getRequestUrl(){
       if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode") == "zidonghuabu"){
@@ -300,6 +190,7 @@ export default {
         this.$message.warning("请选择需求")
         return
       }
+      // 权限控制，判断用户是否属于轧钢厂下面的车间
       this.$confirm("是否下发", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

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

@@ -0,0 +1,255 @@
+// 提出需求
+<template>
+  <div class="inwardRequirement">
+    <div class="sache">
+      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      </el-input>
+      <el-button type="primary" class="btn">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="toInsert2"
+        v-if="activeName == 'first'"
+      >
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="Issue"
+        v-if="activeName == 'first'"
+      >
+        <i class="el-icon-download"></i>下发
+      </el-button>
+    </div>
+    <template>
+      <div>
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="未下发" name="first">
+            <dilTable v-bind.sync="first" @selection-change="selectionChange" ref="table1">
+              <el-table-column fixed="right" label="操作" width="120">
+                <template slot-scope="scope">
+                  <el-button
+                    type="text"
+                    size="mini"
+                    @click="deleteRequirement(scope)"
+                  >
+                    删除
+                  </el-button>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+          <el-tab-pane label="已下发" name="second">
+            <dilTable v-bind.sync="second" ref="table">
+            <el-table-column fixed="right" label="操作" width="80">
+                <template slot-scope="scope">
+                 <el-button type="text" size="mini" @click="getRequirementOrder(scope)">运单</el-button>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </template>
+  </div>
+</template>
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  data() {
+    return {
+      inputText: "",
+      orgCode:"",
+      first: {
+        // first请求数据的地址
+        requestUrl:
+          "",
+        selectionType: "select",
+        mapList: [],
+      },
+      second: {
+        // second请求数据的地址
+        requestUrl:
+          "",
+      },
+      //记录旧的row对象(未下发)
+      oldRow: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(未下发)
+      oldRowCount: 1,
+      //记录旧的row对象(已下发)
+      oldRow1: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(已下发)
+      oldRowCount1: 1,
+      tableHead: [
+        {
+          prop: "materialName",
+          label: "物资名称",
+          width: 150,
+        },
+        {
+          prop:"loadName",
+          label:"装货点",
+          width:150
+        },
+        {
+          prop:"unloadName",
+          label:"卸货点",
+          width:150
+        },
+        {
+          prop: "materialWeight",
+          label: "物资重量",
+          width: 150,
+        },
+        {
+          prop: "materialCount",
+          label: "物资数量",
+          width: 150,
+        },
+      ],
+      tableData: [],
+      tableData1: [
+        {
+          materialCount : 100
+        }
+      ],
+      activeName: "first",
+    };
+  },
+  created(){
+    if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode") == "zidonghuabu"){
+      this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0"
+      this.second.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1"
+    }else{
+      this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&orgCode=" + getCookie("orgCode")
+      this.second.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&orgCode=" + getCookie("orgCode")
+    }
+  },
+  methods: {
+    //查看需求下面的运单
+    getRequirementOrder(scope){
+      this.$router.push(
+        "/getRequirementOrder/" + scope.row.requirementId
+      );
+    },
+    handleClick(tab, event) {
+      this.getRequestUrl()   
+    },
+    getRequestUrl(){
+      if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode") == "zidonghuabu"){
+      this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&i=" + new Date()
+      this.second.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&i=" + new Date()
+      }else{
+      this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&orgCode=" + getCookie("orgCode") + "&i=" + new Date()
+      this.second.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&orgCode=" + getCookie("orgCode") + "&i=" + new Date()
+      }
+    },
+    selectionChange(selection) {
+      this.first.mapList = selection;
+    },
+    toInsert2() {
+      this.$router.push("/addRequirement2");
+    },
+    updateRequirement(scope) {
+      this.$router.push(
+        "/updateRequirement/" + scope.row.requirementId
+      );
+    },
+    deleteRequirement(scope) {
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post(
+              "/api/v1/ams/deleteTruckRequirement/" + scope.row.requirementId
+            )
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });
+                this.getRequestUrl()
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    Issue() {
+      console.log(this.first.mapList);
+      if(this.first.mapList.length == 0){
+        this.$message.warning("请选择需求")
+        return
+      }
+  	// 权限控制，判断用户是否属于炼铁厂下面的车间
+      for(let i=0;i<this.first.mapList.length;i++){
+        if((this.first.mapList[i].requirementType=="计时")&&(getCookie("orgCode")=="liantiechang-yuanliaochejian"||getCookie("orgCode")=="liantiechang-shaojiechejian"||getCookie("orgCode")=="liantiechang-dagaoluchejian"||getCookie("orgCode")=="liantiechang-xiaogaoluchejian"||getCookie("orgCode")=="liantiechang-rongjichejian"||getCookie("orgCode")=="liantiechang-weijianchejian")){
+          this.$message.warning("请选择联系炼铁厂相关负责人完成计时作业下发")
+          return
+        }
+      }                              
+      this.$confirm("是否下发", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/ams/downRequirement", this.first.mapList)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "下发成功!",
+                });
+              this.getRequestUrl()
+              this.activeName = 'second'
+              } else {
+                this.$message({
+                  message: "下发失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消下发!",
+          });
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+  .inwardRequirement{
+      margin-top: 20px;
+      margin-left: 20px;
+      .sache{
+          margin-top: 30px;
+          padding-bottom: 10px;
+          .el-input {
+            width: 20%;
+            }
+          }
+  }
+</style>

src/views/inward/components/truckOrder/decomposePlan.vue

@@ -107,7 +107,7 @@
           </vxe-column>
 		</vxe-table>
 		<div class="button-box">
-			<el-button type="primary" @click="makeSure">确认分解</el-button>
+			<el-button type="primary" @click="makeSure" :disabled = "disabled">确认分解</el-button>
 			<el-button type="primary" @click="cancel">返回</el-button>
 		</div>
 	</div>
@@ -122,11 +122,11 @@ export default {
   },
   data() {
     return {
+      disabled:false,
       truckText:null,
       shiyHeigth:140,
       isHeigth:true,
       isKuang:false,
-      lineId:null,
       requirementId:null,
       capacityNumber:null,
       userCarrierId:null,
@@ -142,7 +142,7 @@ export default {
       carrierId:null,
       form: {},
       first:{
-       requestUrl: "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&planId="+this.$route.params.planId,
+       requestUrl: "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=100&planId="+this.$route.params.planId,
       },
       second:{
         requestUrl:"/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null,
@@ -185,16 +185,39 @@ export default {
         },
       ],
       tableData1: [],
+      newsArr:[]
     };
   },
   created(){
-    this.userCarrierId = getCookie("userId")
-    this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246"
+      if (getCookie("orgCode") == "chengyunshang") {
+      this.second.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+        getCookie("userId");
+    } else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+      this.second.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&con="+"物流储运中心";
+    }else {
+      this.second.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null
+    }
   },
   mounted(){
       this.information()
   },
   methods: {
+    getInwardRequestUrl(){
+      if (getCookie("orgCode") == "chengyunshang") {
+      this.second.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+        getCookie("userId") + "&i=" + new Date();
+    } else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+      this.second.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&con="+"物流储运中心" + "&i=" + new Date();
+    }else {
+      this.second.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&i=" + new Date();
+    }
+    },
     getRequirementMaterial(row) {
       // 记录重复点击次数
       if (this.oldRow === row) {
@@ -226,25 +249,22 @@ export default {
         this.tableData1 = res.data.data
       })
     },
-    drawerCapacity(){ 
+    drawerCapacity(){
+      this.getInwardRequestUrl()
       this.drawer = true;
-      //重新初始化
-      this.second.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&i=" + new Date();
+      //重新初始化  
     },
     onConfirm(){
       console.log(this.mapList1)
       this.drawer = false
-      this.mapList1.forEach((e) => {
+      this.newsArr.forEach((e) => {
           console.log((e.capacityNumber))
           this.capacityNumber = e.capacityNumber
           this.insertEvent()
       })
-    },
-    drawerLine(){
-      this.linedrawer = true
+      this.newsArr = []
     },
     onclick(){
-      console.log(this.truckText,"truckText")
       if(this.truckText != null){
         this.second.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId="+this.input +"&carrierId=" + getCookie('userId') + "&index=" + this.truckText;
       }else{
@@ -252,14 +272,12 @@ export default {
       }     
     },
     currentRadioChange(selection){
-      this.mapList1=selection,
-      console.log(this.mapList1)
-    },
-    currentRadioChange1(selection){
-      this.mapList0=selection
-      this.lineName = this.mapList0.lineName
-      this.lineId = this.mapList0.lineId
-      console.log(this.mapList0.lineId)
+      this.mapList1=selection
+      for (let i = 0; i < selection.length; i++) {
+        if(this.newsArr.indexOf(selection[i]) === -1){
+        this.newsArr.push(selection[i]);
+        }
+        }
     },
    handleClose(done){
       done();
@@ -275,7 +293,7 @@ export default {
       //查看需求详情
       this.axios
         .post(
-          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&planId=" + this.$route.params.planId
+          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=200&planId=" + this.$route.params.planId
         )
         .then((res) => {
             console.log(res.data.data)
@@ -309,9 +327,11 @@ export default {
             },
     // 修改
     makeSure() {
+      this.disabled = true
       for(var i=0;i<this.$refs.xTable.getInsertRecords().length;i++){
         if(this.$refs.xTable.getInsertRecords()[i].capacityNumber == null){
           this.$alert('未选择车牌，请选择车牌')
+          this.disabled = false
           return
         }     
       }
@@ -319,20 +339,22 @@ export default {
           planId:Number(this.$route.params.planId),
           orderType:11,
           carrierId:this.carrierId,
+          userId:getCookie("userId"),
           mapList:this.$refs.xTable.getInsertRecords()
       };
       this.axios
         .post("/api/v1/oms/addInwardOrder", BmsTrainFreight)
         .then((res) => {
           if (res.data.code == 200) {
-            this.$router.go(-1);
             this.$message({
               type: "success",
               message: "分解成功!",
             });
-            
+            this.cancel()
+            this.disabled = false
           } else {
             this.$message.error("分解失败！");
+            this.disabled = false
           }
         });
     },

src/views/inward/components/truckOrder/getPlanOrder.vue

@@ -0,0 +1,209 @@
+// 分派计划
+<template>
+  <div class="inwardOrder">
+    <div class="sache">
+      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      </el-input>
+      <el-button type="primary" class="btn">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" class="btn" @click="cancel">
+        返回
+      </el-button>
+    </div>
+     <!-- 车辆信息 -->
+    <el-dialog
+        title="车辆信息"
+        :visible.sync="dialogTableVisible"
+        :before-close="handleClose"
+    >
+      <el-input v-model="truckInput" style="width:250px"></el-input>
+      <el-button type="primary" @click="clickTruck">查询</el-button>
+      <dilTable
+        v-bind.sync="truck"
+        @radio-change="currentRadioChange1"
+        >
+      </dilTable>
+      <span slot="footer" class="dialog-footer">
+      <el-button @click="cancelUpdate()">取 消</el-button>
+      <el-button type="primary" @click="updateTruckCapacity()"
+      >确 定</el-button>
+      </span>
+    </el-dialog>
+    <template>
+      <div>
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="待接收" name="first">
+            <dilTable v-bind.sync="first" ref="table">
+              <el-table-column fixed="right" label="操作" width="180">
+                <template slot-scope="scope">
+                  <el-button type="text" size="mini" @click="updatePlan(scope)">
+                    修改
+                  </el-button>
+                  <el-button type="text" size="mini" @click="deleteClick(scope)">
+                    删除
+                  </el-button>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+          <el-tab-pane label="已接收" name="second">
+            <dilTable v-bind.sync="second"> </dilTable>
+          </el-tab-pane>
+          <el-tab-pane label="已完成" name="third">
+            <dilTable v-bind.sync="third"> </dilTable>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </template>
+  </div>
+</template>
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  data() {
+    return {
+      inputText: "",
+      truckInput:null,
+      userCarrierId: "",
+      //是否弹出对话框
+      dialogTableVisible: false,
+      first: {
+        //
+        requestUrl:""
+      },
+      //车辆信息的表格
+      truck: {
+        requestUrl:
+          "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + "",
+        // 控制显示当选列
+        selectionType: "radio",
+      },
+      //选中的运力id
+      capacityId: null,
+      activeName: "first",
+      second: {
+        requestUrl: "",
+      },
+      third: {
+        requestUrl: "",
+      },
+    };
+  },
+  created() {
+      this.first.requestUrl =
+        "/api/v1/ams/getPlanOrder?apiId=260&orderStatus=4" + "&planId=" + this.$route.params.planId
+      this.second.requestUrl =
+        "/api/v1/ams/getPlanOrder?apiId=260&orderStatus=5" + "&planId=" + this.$route.params.planId
+      this.third.requestUrl =
+        "/api/v1/ams/getPlanOrder?apiId=260&orderStatus=2" + "&planId=" + this.$route.params.planId
+  },
+  methods: {
+    getRequest() {
+      this.first.requestUrl =
+        "/api/v1/ams/getPlanOrder?apiId=260&orderStatus=4" + "&i=" + new Date() + "&planId=" + this.$route.params.planId
+      this.second.requestUrl =
+        "/api/v1/ams/getPlanOrder?apiId=260&orderStatus=5" + "&i=" + new Date() + "&planId=" + this.$route.params.planId
+    },
+    cancel(){
+        this.$router.go(-1)
+    },
+    handleClick() {
+      this.getRequirementMaterial();
+      this.getRequest()
+    },
+    handleClose(done){
+      done()
+      this.$message.info("取消修改运力")
+    },
+    currentRadioChange1(row){
+      console.log(row)
+      this.capacityId = row.capacityId
+    },
+    getTruckRequestUrl(){
+      if (getCookie("orgCode") == "chengyunshang") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+        getCookie("userId") + "&test=" + new Date();
+      } else {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null +  "&test=" + new Date();
+      }
+    },
+    //修改运输订单
+    updatePlan(scope){
+      this.getTruckRequestUrl()
+      this.orderId = scope.row.orderId
+      this.dialogTableVisible = true
+      console.log(scope.row.orderId)
+    },
+    updateTruckCapacity(){
+        if(this.capacityId == null){
+            this.$message.error("未选中运力")
+            return
+        }
+        this.axios.post("/api/v1/oms/updateCapacityId",{
+          capacityId:this.capacityId,
+          orderId :this.orderId
+        }).then((res) =>{
+          if(res.data.code == "200"){
+            this.$message.success("修改运力成功")
+            this.dialogTableVisible = false
+            this.getRequest()
+            
+          }else{
+            this.$message.error("修改运力失败")
+            this.dialogTableVisible = false
+            this.getRequest()
+          }
+        })
+    },
+    clickTruck(){
+      this.truck.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&index=" + this.truckInput
+    },
+      //删除运输订单
+    deleteClick(scope){
+      this.$confirm('是否删除?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+            this.axios
+            .post("/api/v1/oms/closeOmstruckOrder?orderId=" + scope.row.orderId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.getRequest()
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          });          
+        });
+    },
+  },
+};
+</script>
+<style lang="scss">
+.inwardOrder {
+  margin-top: 20px;
+  margin-left: 20px;
+  .sache {
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+}
+</style>

src/views/inward/components/truckOrder/plan.vue

@@ -16,9 +16,6 @@
             <dilTable v-bind.sync="second" ref="table1">
               <el-table-column fixed="right" label="操作" width="100">
                 <template slot-scope="scope">
-                  <el-button type="text" size="mini" @click="getRequirementMaterial1(scope.row)">
-                    物资详情
-                  </el-button>
                   <el-button
                     type="text"
                     size="mini"
@@ -51,10 +48,13 @@
           </el-tab-pane>
           <el-tab-pane label="已分解" name="third">
             <dilTable v-bind.sync="third" ref="table2">
-             <el-table-column fixed="right" label="操作" width="100">
+             <el-table-column fixed="right" label="操作" width="150">
                 <template slot-scope="scope">
-                  <el-button type="text" size="mini" @click="getRequirementMaterial2(scope.row)">
-                    物资详情
+                  <el-button type="text" size="mini" @click="desponsePlan(scope)">
+                    继续分解
+                  </el-button>
+                  <el-button type="text" size="mini" @click="getPlanOrder(scope)">
+                    运单
                   </el-button>
                 </template>
               </el-table-column>
@@ -79,6 +79,11 @@
           </el-table-column> 
             </dilTable>
           </el-tab-pane>
+          
+          <el-tab-pane label="已完成" name="four">
+            <dilTable v-bind.sync="four" ref="table3">
+            </dilTable>
+          </el-tab-pane>
         </el-tabs>
       </div>
     </template>
@@ -91,15 +96,6 @@ export default {
     return {
       inputText: "",
       carrierId:40,
-      oldRow: "",
-      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(未下发)
-      oldRowCount: 1,
-      oldRow1: "",
-      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(未下发)
-      oldRowCount1: 1,
-       oldRow2: "",
-      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(未下发)
-      oldRowCount2: 1,
       first: {
         // first请求数据的地址
         requestUrl:"",
@@ -114,137 +110,44 @@ export default {
         requestUrl:
           "" 
       },
+      four:{
+        requestUrl:""
+      },
       activeName: "second",
-      tableHead: [
-        {
-          prop: "materialName",
-          label: "物资名称",
-          width: 150,
-        },
-        {
-          prop:"loadName",
-          label:"装货点",
-          width:150
-        },
-        {
-          prop:"unloadName",
-          label:"卸货点",
-          width:150
-        },
-        {
-          prop:"loadSequence",
-          label:"装卸货次序",
-          width:150
-        },
-        {
-          prop: "materialWeight",
-          label: "物资重量",
-          width: 150,
-        },
-        {
-          prop: "materialCount",
-          label: "物资数量",
-          width: 150,
-        },
-      ],
       tableData: [],
     };
   },
   created(){
-      this.carrierId = getCookie('userId')
-      this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1"
-      this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2"
-      this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3"
+      if(getCookie("orgCode") == "chengyunshang"){
+        this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&carrierId=" + getCookie("userId")
+        this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=" + getCookie("userId")
+        this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&carrierId=" + getCookie("userId")
+        this.four.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4&carrierId=" + getCookie("userId")
+      }else{
+        this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1"
+        this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2"
+        this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3"
+        this.four.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4"
+      } 
   },
   methods: {
-    getRequirementMaterial(row) {
-      // 记录重复点击次数
-      if (this.oldRow === row) {
-        this.oldRowCount += 1;
-      }
-      // 切换当前详情表
-      this.$refs.table.toggleRowExpansion(row);
-      // 打开前关闭上一个详情表
-      if (this.oldRow != "") {
-        if (this.oldRow != row) {
-          if (this.oldRowCount % 2 === 1) {
-            this.$refs.table.toggleRowExpansion(this.oldRow);
-          } else {
-            this.oldRowCount = 1;
-          }
-        } else {
-          this.oldRow = null;
-          return;
-        }
-      }
-      // 重置上一个点击对象
-      this.oldRow = row;
-      this.getMaterial(row.requirementId);
-    },
-    getRequirementMaterial1(row) {
-      // 记录重复点击次数
-      if (this.oldRow1 === row) {
-        this.oldRowCount1 += 1;
-      }
-      // 切换当前详情表
-      this.$refs.table1.toggleRowExpansion(row);
-      // 打开前关闭上一个详情表
-      if (this.oldRow1 != "") {
-        if (this.oldRow1 != row) {
-          if (this.oldRowCount1 % 2 === 1) {
-            this.$refs.table1.toggleRowExpansion(this.oldRow1);
-          } else {
-            this.oldRowCount1 = 1;
-          }
-        } else {
-          this.oldRow1 = null;
-          return;
-        }
-      }
-      // 重置上一个点击对象
-      this.oldRow1 = row;
-      this.getMaterial(row.requirementId);
-    },
-    getRequirementMaterial2(row) {
-      // 记录重复点击次数
-      if (this.oldRow2 === row) {
-        this.oldRowCount2 += 1;
-      }
-      // 切换当前详情表
-      this.$refs.table2.toggleRowExpansion(row);
-      // 打开前关闭上一个详情表
-      if (this.oldRow2 != "") {
-        if (this.oldRow2 != row) {
-          if (this.oldRowCount2 % 2 === 1) {
-            this.$refs.table2.toggleRowExpansion(this.oldRow2);
-          } else {
-            this.oldRowCount2 = 1;
-          }
-        } else {
-          this.oldRow2 = null;
-          return;
-        }
-      }
-      // 重置上一个点击对象
-      this.oldRow2 = row;
-      this.getMaterial(row.requirementId);
-    },
-    getMaterial(requirementId){
-      console.log(requirementId)
-      this.axios.post("/api/v1/ams/getRequirementMaterial/" + requirementId).then((res) => {
-        this.tableData = res.data.data
-        console.log(res.data.data)
-      })
-    },
      handleClick(tab, event) {
       console.log("zhix")
       this.getRequestUrl()
       this.getRequirementMaterial()
     },
     getRequestUrl(){
-      this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&i=" + new Date()
-      this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&i="  + new Date()
-      this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&i=" + new Date()
+      if(getCookie("orgCode") == "chengyunshang"){
+        this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&carrierId=" + getCookie("userId") + "&i=" + new Date()
+        this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=" + getCookie("userId") + "&i=" + new Date()
+        this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&carrierId=" + getCookie("userId") + "&i=" + new Date()
+        this.four.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4&carrierId=" + getCookie("userId") + "&i=" + new Date()
+      }else{
+        this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1" + "&i=" + new Date()
+        this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2" + "&i=" + new Date()
+        this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3" + "&i=" + new Date()
+        this.four.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4" + "&i=" + new Date()
+      } 
     },
     receiver(scope) {
       this.$confirm("是否接收", "提示", {
@@ -284,6 +187,9 @@ export default {
     desponsePlan(scope) {
       this.$router.push("/decomposePlan/" + scope.row.planId);
     },
+    getPlanOrder(scope) {
+      this.$router.push("/getPlanOrder/" + scope.row.planId);
+    },
     deletePlan(scope) {
       this.$confirm("是否删除", "提示", {
         confirmButtonText: "确定",

src/views/inward/router/index.js

@@ -8,6 +8,8 @@ import main from '@/components/main.vue'
 // 系统配置管理
 //运输预约--提出需求
 import requirement from '@/views/inward/components/truckAppoint/requirement.vue'
+// 没有提出需求页面
+import requirementOther from '@/views/inward/components/truckAppoint/requirementOther.vue'
 //运输预约--提出采购内转需求
 import purInwardRequirement from '@/views/inward/components/truckAppoint/purInwardRequirement.vue'
 //运输预约--制定计划
@@ -118,6 +120,11 @@ import updatePlan from '@/views/inward/components/truckAppoint/updatePlan.vue'
 import addRailPlan from '@/views/inward/components/truckAppoint/addRailPlan.vue'
 //计划分解
 import decomposePlan from '@/views/inward/components/truckOrder/decomposePlan.vue'
+
+//查看计划运单详情
+import getPlanOrder from '@/views/inward/components/truckOrder/getPlanOrder.vue'
+//查看需求运单详情
+import getRequirementOrder from '@/views/inward/components/truckAppoint/getRequirementOrder.vue'
 //内转异地库计划分解
 import decomposeRailPlan from '@/views/inward/components/truckOrder/decomposeRailPlan.vue'
 //请车作业新增
@@ -145,7 +152,14 @@ import oldAreaRailScaleAddTruckLoad from '@/views/inward/components/inwardImport
 //内转厂内物资--新增汽车装货
 import inwardFactoryAddTruckLoad from '@/views/inward/components/inwardFactory/addTruckLoad.vue'
 
-
+//内转结算--纯内转计费详单
+import inwardDetailOrders from '../components/inwardSettlement/detailOrder.vue'
+//内转结算--采购内转计费详单
+import inwardPurDetailsOrders from '../components/inwardSettlement/purInwardDetailsOrder.vue'
+//内转结算--计时计费详单
+import inwardTimeDetailsOrders from '../components/inwardSettlement/timeDetailsWeight.vue'
+//内转结算--计数计费详单
+import inwardCountDetailsOrders from '../components/inwardSettlement/countDetailOrder.vue'
 
 
 Vue.use(Router)
@@ -162,7 +176,8 @@ const constantRouterMap = [{
     name: 'requirement'
   },
   children: [
-    {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement},
+    {path: 'requirementOther',name: 'requirementOther',meta: {code: 'xtpzgl-yhgl'},component: requirementOther}, 
     {path: 'purInwardRequirement',name: 'purInwardRequirement',meta: {code: 'xtpzgl-yhgl'},component: purInwardRequirement}, 
     {path: 'truckAppointPlan',name: 'truckAppointPlan',meta: {code: 'xtpzgl-yhgl'},component: truckAppointPlan},
     {path: 'purInwardTruckOrder',name: 'purInwardTruckOrder',meta: {code: 'xtpzgl-yhgl'},component: purInwardTruckOrder},
@@ -216,7 +231,9 @@ const constantRouterMap = [{
     {path: 'addPlan',name: 'addPlan',meta: {code: 'xtpzgl-yhgl'},component: addPlan}, 
     {path: 'updatePlan/:planId',name: 'updatePlan',meta: {code: 'xtpzgl-yhgl'},component: updatePlan}, 
     {path: 'addRailPlan',name: 'addRailPlan',meta: {code: 'xtpzgl-yhgl'},component: addRailPlan}, 
-    {path: 'decomposePlan/:planId',name: 'decomposePlan',meta: {code: 'xtpzgl-yhgl'},component: decomposePlan}, 
+    {path: 'decomposePlan/:planId',name: 'decomposePlan',meta: {code: 'xtpzgl-yhgl'},component: decomposePlan},
+    {path: 'getPlanOrder/:planId',name: 'getPlanOrder',meta: {code: 'xtpzgl-yhgl'},component: getPlanOrder},
+    {path: 'getRequirementOrder/:requirementId',name: 'getRequirementOrder',meta: {code: 'xtpzgl-yhgl'},component: getRequirementOrder},  
     {path: 'decomposeRailPlan/:dayPlanId',name: 'decomposeRailPlan',meta: {code: 'xtpzgl-yhgl'},component: decomposeRailPlan}, 
     {path: 'addWagonPlease',name: 'addWagonPlease',meta: {code: 'xtpzgl-yhgl'},component: addWagonPlease}, 
     {path: 'editWagonPlease/:resultId',name: 'editWagonPlease',meta: {code: 'xtpzgl-yhgl'},component: editWagonPlease}, 
@@ -230,6 +247,10 @@ const constantRouterMap = [{
     {path: 'updateTruckLoad/:resultId',name: 'updateTruckLoad',meta: {code: 'xtpzgl-yhgl'},component: updateTruckLoad}, 
     {path: 'oldAreaRailScaleAddTruckLoad',name: 'oldAreaRailScaleAddTruckLoad',meta: {code: 'xtpzgl-yhgl'},component: oldAreaRailScaleAddTruckLoad}, 
     {path: 'inwardFactoryAddTruckLoad',name: 'inwardFactoryAddTruckLoad',meta: {code: 'xtpzgl-yhgl'},component: inwardFactoryAddTruckLoad},
+    {path: 'inwardDetailOrders',name: 'inwardDetailOrders',meta: {code: 'xtpzgl-yhgl'},component: inwardDetailOrders},
+    {path: 'inwardCountDetailsOrders',name: 'inwardCountDetailsOrders',meta: {code: 'xtpzgl-yhgl'},component: inwardCountDetailsOrders},
+    {path: 'inwardTimeDetailsOrders',name: 'inwardTimeDetailsOrders',meta: {code: 'xtpzgl-yhgl'},component: inwardTimeDetailsOrders},
+    {path: 'inwardPurDetailsOrders',name: 'inwardPurDetailsOrders',meta: {code: 'xtpzgl-yhgl'},component: inwardPurDetailsOrders},
   ]
 }];
 

src/views/sale/app.js

@@ -18,6 +18,63 @@ 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'
+Vue.use(VXETable)
+Vue.prototype.$XModal = VXETable.modal
+
+
+import AMap from 'vue-amap';
+
+Vue.use(AMap);
+  AMap.initAMapApiLoader({
+    key: 'eed46ea40bbcadbf8a9cdd5dc1a94642',
+    plugin: [
+      "AMap.Autocomplete", // 输入提示插件
+      "AMap.PlaceSearch", // POI搜索插件
+      "AMap.Scale", // 右下角缩略图插件 比例尺
+      "AMap.OverView", // 地图鹰眼插件
+      "AMap.ToolBar", // 地图工具条
+      "AMap.MapType", // 类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
+      "AMap.PolyEditor", // 编辑 折线多，边形
+      "AMap.CircleEditor", // 圆形编辑器插件
+      "AMap.Geolocation", // 定位控件，用来获取和展示用户主机所在的经纬度位置
+      "AMap.ControlBar"   // 缩放、尺寸控制器
+    ],
+    // 默认高德 sdk 版本为 1.4.4
+    v: '1.4.15',
+    uiVersion: '1.1.1'
+});
+
+import Share from 'vue-social-share'
+Vue.use(Share);
+
+import 'view-design/dist/styles/iview.css';
+import ViewUI from 'view-design';
+Vue.use(ViewUI);
+// import VueAMap from 'vue-amap'
+ 
+// Vue.use(VueAMap)
+ 
+// VueAMap.initAMapApiLoader({
+//   key: 'eed46ea40bbcadbf8a9cdd5dc1a94642',
+//   plugin: [//高德地图扩展插件(按需添加)
+//     'AMap.Autocomplete', // 输入提示插件
+//     'AMap.PlaceSearch', // POI搜索插件
+//     'AMap.Scale', // 右下角缩略图插件 比例尺
+//     'AMap.OverView', // 地图鹰眼插件
+//     'AMap.ToolBar', // 地图工具条
+//     'AMap.MapType', // 类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
+//     'AMap.PolyEditor', // 编辑 折线多，边形
+//     'AMap.CircleEditor', // 圆形编辑器插件
+//     'AMap.Geolocation' // 定位控件，用来获取和展示用户主机所在的经纬度位置
+//   ],
+  // uiVersion: '1.1', // ui库版本，不配置不加载,
+  // v: '2.0'
+// })
+
+
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;