修改i

build/utils.js

@@ -17,9 +17,12 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 // let devModules = ["index", "appoint", "statisticalReport"];
 // let devModules = ["index", "statisticalReport", "appoint", "TMS"];
-let devModules = ["index", "statisticalReport", "TMS", "appoint"];
+// let devModules = ["index", "statisticalReport", "TMS", "appoint"];
+
+// let devModules = ["index", "appoint", "statisticalReport"];
+let devModules = ["index", "appoint", "statisticalReport", "WMS","TMS"];
 // let devModules = ["all"];
-// let devModules = ["index","appoint","TMS","WMS","statisticalReport"];
+
 // let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
 // let devModules = ["index", "ADMINISTRATORS", "RMS"];
 // let devModules = ["index", "inward", "statisticalReport"];

build/webpack.base.conf.js

@@ -1,74 +1,78 @@
-'use strict'
-const path = require('path')
-const utils = require('./utils')
-const config = require('../config')
-const vueLoaderConfig = require('./vue-loader.conf')
-const pathSrc = path.resolve(__dirname, '../src');
+"use strict";
+const path = require("path");
+const utils = require("./utils");
+const config = require("../config");
+const vueLoaderConfig = require("./vue-loader.conf");
+const pathSrc = path.resolve(__dirname, "../src");
 function resolve(dir) {
-  return path.join(__dirname, '..', dir)
+  return path.join(__dirname, "..", dir);
 }
 
 const createLintingRule = () => ({
   test: /\.(js|vue)$/,
-  loader: 'eslint-loader',
-  enforce: 'pre',
-  include: [resolve('src'), resolve('test')],
+  loader: "eslint-loader",
+  enforce: "pre",
+  include: [resolve("src"), resolve("test")],
   options: {
-    formatter: require('eslint-friendly-formatter'),
+    formatter: require("eslint-friendly-formatter"),
     emitWarning: !config.dev.showEslintErrorsInOverlay
   }
-})
+});
 
 let babelLoader = {
+  include: [
+    resolve("src"),
+    resolve("test"),
+    resolve("node_modules/webpack-dev-server/client"),
+    resolve("node_modules/vue-element-bigdata-table"),
+    resolve("node_modules/element-ui/src"),
+    resolve("node_modules/icore-sdk")
+  ],
+  exclude: [
+    resolve("node_modules/element-ui/src/utils/date.js"),
+    resolve("node_modules/element-ui/src/utils/popper.js")
+  ] // sb element-ui竟然在源码里面单独把这两个js转译成了es5 气死哥了！！
+};
+
+if (pathSrc.indexOf("node_modules") > -1) {
+  babelLoader = {
     include: [
-                resolve('src'), resolve('test'), 
-                resolve('node_modules/webpack-dev-server/client'),
-                resolve('node_modules/vue-element-bigdata-table'),
-                resolve('node_modules/element-ui/src'),
-                resolve('node_modules/icore-sdk')
-            ],
+      resolve("src"),
+      resolve("test"),
+      resolve("../../src"),
+      resolve("../../test"),
+      resolve("../webpack-dev-server/client"),
+      resolve("../vue-element-bigdata-table"),
+      resolve("../element-ui/src"),
+      resolve("../icore-sdk")
+    ],
     exclude: [
-                resolve('node_modules/element-ui/src/utils/date.js'), 
-                resolve('node_modules/element-ui/src/utils/popper.js')
-            ]// sb element-ui竟然在源码里面单独把这两个js转译成了es5 气死哥了！！
-}
-
-if (pathSrc.indexOf('node_modules') > -1) {
-    babelLoader = {
-        include: [
-                    resolve('src'), resolve('test'),
-                    resolve('../../src'), resolve('../../test'), 
-                    resolve('../webpack-dev-server/client'),
-                    resolve('../vue-element-bigdata-table'),
-                    resolve('../element-ui/src'),
-                    resolve('../icore-sdk')
-                ],
-        exclude: [
-                    resolve('../element-ui/src/utils/date.js'), 
-                    resolve('../element-ui/src/utils/popper.js')
-                ]// sb element-ui竟然在源码里面单独把这两个js转译成了es5 气死哥了！！
-    }
+      resolve("../element-ui/src/utils/date.js"),
+      resolve("../element-ui/src/utils/popper.js")
+    ] // sb element-ui竟然在源码里面单独把这两个js转译成了es5 气死哥了！！
+  };
 }
 
 module.exports = {
-  context: path.resolve(__dirname, '../'),
+  context: path.resolve(__dirname, "../"),
   // entry: {
   //   app: './src/main.js'
   // },
   entry: utils.entries(),
   output: {
     path: config.build.assetsRoot,
-    filename: '[name].js',
-    publicPath: process.env.NODE_ENV === 'production' ?
-      config.build.assetsPublicPath :
-      config.dev.assetsPublicPath
+    filename: "[name].js",
+    publicPath:
+      process.env.NODE_ENV === "production"
+        ? config.build.assetsPublicPath
+        : config.dev.assetsPublicPath
   },
   resolve: {
-    extensions: ['.js', '.vue', '.json'],
+    extensions: [".js", ".vue", ".json"],
     alias: {
-      'vue$': 'vue/dist/vue.esm.js',
-      '@': resolve('src'),
-      '~': resolve('../../src'),
+      vue$: "vue/dist/vue.esm.js",
+      "@": resolve("src"),
+      "~": resolve("../../src")
     }
   },
   module: {
@@ -76,37 +80,37 @@ module.exports = {
       ...(config.dev.useEslint ? [createLintingRule()] : []),
       {
         test: /\.vue$/,
-        loader: 'vue-loader',
+        loader: "vue-loader",
         options: vueLoaderConfig
       },
       {
         test: /\.js$/,
-        loader: 'babel-loader',
+        loader: "babel-loader",
         exclude: babelLoader.exclude,
         include: babelLoader.include
       },
       {
         test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
-        loader: 'url-loader',
+        loader: "url-loader",
         options: {
           limit: 10000,
-          name: utils.assetsPath('img/[name].[hash].[ext]')
+          name: utils.assetsPath("img/[name].[hash].[ext]")
         }
       },
       {
         test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
-        loader: 'url-loader',
+        loader: "url-loader",
         options: {
           limit: 10000,
-          name: utils.assetsPath('media/[name].[hash].[ext]')
+          name: utils.assetsPath("media/[name].[hash].[ext]")
         }
       },
       {
         test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
-        loader: 'url-loader',
+        loader: "url-loader",
         options: {
           limit: 10000,
-          name: utils.assetsPath('fonts/[name].[hash].[ext]')
+          name: utils.assetsPath("fonts/[name].[hash].[ext]")
         }
       }
     ]
@@ -117,10 +121,10 @@ module.exports = {
     setImmediate: false,
     // prevent webpack from injecting mocks to Node native modules
     // that does not make sense for the client
-    dgram: 'empty',
-    fs: 'empty',
-    net: 'empty',
-    tls: 'empty',
-    child_process: 'empty'
+    dgram: "empty",
+    fs: "empty",
+    net: "empty",
+    tls: "empty",
+    child_process: "empty"
   }
-}
+};

config/index.js

@@ -65,9 +65,7 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    // target: "http://localhost:8080",
-    target: "http://localhost:8080",
-    // target: "http://192.168.1.105:8080",
+    target: "http://172.16.33.166:80",
     // target: "http://192.168.1.106:8080",
     ws: true,
     pathRewrite: {
@@ -75,8 +73,9 @@ let proxyTable = {
     }
   },
   "/views/api/v1": {
-    target: "http://172.16.33.166:8080",
+    // target: "http://localhost:8080",
     // target: "http://192.168.1.109:8080",
+    target: "http://172.16.33.166:80",
     ws: true,
     pathRewrite: {
       "^/views/api/v1": "/api/v1"

src/utils/QueueStartList.js

@@ -1,14 +1,14 @@
-import axios from 'axios'
+import axios from "axios";
 //返回月台
-export function loadingPoint(URL){
-  let loadingpoint = []
-  axios.get(URL).then((res)=>{
+export function loadingPoint(URL) {
+  let loadingpoint = [];
+  axios.get(URL).then(res => {
     res.data.data.forEach(e => {
       let arr = {
-          value:e.GRID_NAME
+        value: e.GRID_NAME
       };
-    loadingpoint.push(arr)
+      loadingpoint.push(arr);
     });
-  })
+  });
   return loadingpoint;
-}
+}

src/utils/sharedJsFile.js

@@ -1,35 +1,49 @@
- // 把时间戳改为正常可读的时间
- export function renderTime(date) {
-   if (date !== null) {
-     let dateee = new Date(date).toJSON();
-     return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '');
-   }
-   return null;
- }
- export function sjTime(orderPlanInTime) {
-   var stringTime = renderTime(orderPlanInTime);
-   var timestamp1 = stringTime.replace(/-/g, '/');
-   return new Date(timestamp1).getTime();
- }
- export function isNumber(value) {
-   // 验证是否为数字
-   var patrn = /^(-?\d+)(\.\d+)?$/;
-   if (patrn.exec(value) == null || value === '') {
-     return false;
-   } else {
-     return true;
-   }
- }
- export function isIntegerNumber(value) {
-   // 验证是否为整数
-   var patrn = /^\+?[1-9][0-9]*$/g;
-   if (patrn.exec(value) == null || value === '') {
-     return false;
-   } else {
-     return true;
-   }
- }
- export function stringToDate(dateStr, separator) {
+// 把时间戳改为正常可读的时间
+export function renderTime(date) {
+  if (date !== null) {
+    let dateee = new Date(date).toJSON();
+    return new Date(+new Date(dateee) + 8 * 3600 * 1000)
+      .toISOString()
+      .replace(/T/g, ' ')
+      .replace(/\.[\d]{3}Z/, '');
+  }
+  return null;
+}
+export function sjTime(orderPlanInTime) {
+  var stringTime = renderTime(orderPlanInTime);
+  var timestamp1 = stringTime.replace(/-/g, '/');
+  return new Date(timestamp1).getTime();
+}
+export function isVehicleNumber(vehicleNumber) {
+  var result = false;
+  if (vehicleNumber != null) {
+    if (vehicleNumber.length === 7) {
+      var express = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/;
+      result = express.test(vehicleNumber);
+    }
+  }
+  return result;
+}
+
+export function isNumber(value) {
+  // 验证是否为数字
+  var patrn = /^(-?\d+)(\.\d+)?$/;
+  if (patrn.exec(value) == null || value === '') {
+    return false;
+  } else {
+    return true;
+  }
+}
+export function isIntegerNumber(value) {
+  // 验证是否为整数
+  var patrn = /^\+?[1-9][0-9]*$/g;
+  if (patrn.exec(value) == null || value === '') {
+    return false;
+  } else {
+    return true;
+  }
+}
+export function stringToDate(dateStr, separator) {
   if (!separator) {
     separator = '-';
   }

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

@@ -30,12 +30,6 @@
         >
           <i class="el-icon-search"></i>查询
         </el-button>
-        <!-- <el-button 
-      type="primary"
-      class="btn" 
-      @click="makeSure" 
-      style="margin: 10px;">确认配单
-      </el-button> -->
       </div>
       <!-- 采购订单号 -->
       <dilTable
@@ -107,7 +101,7 @@
           width="120px"
         >
         </el-table-column>
-        <el-table-column align="center" width="80px" prop="weight" label="标重">
+        <el-table-column align="center" width="80px" prop="wagonWeight" label="标重">
         </el-table-column>
         <!-- <el-table-column
         align="center"
@@ -198,6 +192,11 @@
                   </template>
                 </el-autocomplete>
               </el-form-item>
+              <el-form-item label="有拼装:">
+                <el-switch
+                  v-model="isAssembly">
+                </el-switch>
+              </el-form-item>
             </div>
           </el-form>
           <dil-form :formId="102" v-model="form1" ref="from1"></dil-form>
@@ -262,6 +261,7 @@ export default {
       form1: {},
       tableData: [],
       input: "",
+      isAssembly:false,
       value: undefined,
       //船名
       remark: null,
@@ -309,7 +309,7 @@ export default {
         requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
         selectionType: "radio"
       },
-      sendStationId: 2,
+      sendStationId: 4,//发站id和到站id都写死了，并且赋了港口名，如果数据库id变化，要注意
       toTheStationId: 1,
       sendStation: "万州港",
       toTheStation: "老区轨道衡"
@@ -600,7 +600,7 @@ export default {
       if (state == 1) {
         let map = {
           portName: this.sendStation,
-          wagonList: this.list,
+          wagonList: this.tableData,
           // unloadingPointId:this.unloadPointId,
           purchaseOrderRailPlanId: this.purchaseOrderId,
           materialId: this.materialId,
@@ -613,8 +613,24 @@ export default {
           resultRemarks: this.form1.resultRemarks,
           userId: getCookie("userId"),
           resultType: 1,
-          purchaseNo: this.form1.purchaseOrderNo
+          purchaseNo: this.form1.purchaseOrderNo,
+          isAssembly:this.isAssembly
         };
+        console.log(map);
+        //校验拼装车的标重
+        if(this.isAssembly){
+          let flag=false;
+          map.wagonList.forEach((item)=>{
+            if(typeof item.wagonWeight !='undefined'){
+              flag=true;
+            }
+          });
+          if(!flag){
+            this.$message.warning("拼装车的标重不存在！");
+            this.disable = false;
+            return ;
+          }
+        }
         this.axios
           .post("/api/v1/tms/addWarehouseOutResult", map)
           .then(res => {
@@ -698,7 +714,7 @@ export default {
               materialName: row["品名"],
               wagonNo: row["车皮号"],
               mineral: row["矿种"],
-              weight: row["计费&#10;吨位"]
+              wagonWeight: row["标重"]
             };
             that.tableData.push(temp);
           } else {

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

@@ -0,0 +1,272 @@
+<template>
+  <!-- 修改车皮出库实绩 -->
+  <div class="editOutBoundWagon">
+    <page-title>返回</page-title>
+
+    <div class="form">
+      <div class="form_box">
+        <el-form :inline="true" class="demo-form-inline">
+          <div class="preview-group">
+            <el-form-item label="车皮">
+              <el-input v-model="form.wagonNo"></el-input>
+            </el-form-item>
+            <el-form-item label="采购订单号">
+              <el-input v-model="form.purchaseOrderNo" disabled></el-input>
+            </el-form-item>
+            <el-form-item label="是否拼装">
+              <el-switch v-model="isAssembly"> </el-switch>
+            </el-form-item>
+            <el-form-item v-show="isAssembly" label="标重">
+              <el-input type="number" v-model="form.tonnage"></el-input>
+            </el-form-item>
+            <el-form-item label="发站">
+              <el-autocomplete
+                class="inline-input"
+                v-model="sendStation"
+                :fetch-suggestions="querySearchSendStation"
+                placeholder="请输入发站名称"
+                disabled
+                :trigger-on-focus="false"
+                @select="handleSelectSendStation"
+              >
+                <template slot-scope="{ item }">
+                  <div class="name">{{ item.arrivalName }}</div>
+                </template>
+              </el-autocomplete>
+            </el-form-item>
+            <el-form-item label="到站">
+              <el-autocomplete
+                class="inline-input"
+                v-model="toTheStation"
+                disabled
+                :fetch-suggestions="querySearchToTheStation"
+                placeholder="请输入到站名称"
+                :trigger-on-focus="false"
+                @select="handleSelectToTheStation"
+              >
+                <template slot-scope="{ item }">
+                  <div class="name">{{ item.arrivalName }}</div>
+                </template>
+              </el-autocomplete>
+            </el-form-item>
+            <el-form-item label="备注">
+              <el-input type="textarea" v-model="form.resultMarks"></el-input>
+            </el-form-item>
+          </div>
+        </el-form>
+      </div>
+    </div>
+    <!-- 确定和取消 -->
+    <div class="button_box">
+      <el-button @click="cancel">返回</el-button>
+      <el-button type="primary" @click="makeSure">确认</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime, isNumber } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form: {},
+      wagonNo: null,
+      tonnage: null,
+      isAssembly: false,
+      sendStationId: 4, //发站id和到站id都写死了，并且赋了港口名，如果数据库id变化，要注意
+      toTheStationId: 1,
+      sendStation: "万州港",
+      toTheStation: "老区轨道衡",
+    };
+  },
+  mounted() {
+    this.information();
+  },
+  methods: {
+    information() {
+      console.log("resultId" + this.$route.params.resultId);
+      //编辑车皮装车作业
+      this.axios
+        .post(
+          "/api/v1/tms/getWareHouseOutresult/" + this.$route.params.resultId
+        )
+        .then((res) => {
+          res.data.data.forEach((e) => {
+            this.form = e;
+            this.wagonNo = e.wagonNo;
+            this.tonnage = e.tonnage;
+            console.log(e);
+          });
+        });
+    },
+    handleCheckedCitiesChange(value) {
+      console.log(value);
+    },
+    // 返回
+    cancel() {
+      this.$router.go(-1);
+    },
+    currentRadioChange(row) {
+      this.aaaa = row;
+    },
+    //发站弹出层
+    handleSelectSendStation(item) {
+      this.sendStationId = item.arrivalId;
+      this.sendStation = item.arrivalName;
+    },
+    //以下是发站边输边查搜索
+    querySearchSendStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.sendStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier);
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterSendStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //发站
+    createFilterSendStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
+    //到站弹出层
+    handleSelectToTheStation(item) {
+      this.toTheStationId = item.arrivalId;
+      this.toTheStation = item.arrivalName;
+    },
+    //以下是到站边输边查搜索
+    querySearchToTheStation(queryString, cb) {
+      this.axios
+        .get("/api/v1/uc/getArrivalByLike?index=" + this.toTheStation)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            console.log(restaurantsSupplier);
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterToTheStation(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    //到站
+    createFilterToTheStation(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.arrivalName
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
+    // 确认
+    makeSure() {
+     
+      let map = {
+        loadingTempId: this.$route.params.resultId,
+        OutResultId: this.form.OutResultId,
+        isAssembly: this.isAssembly,
+        wagonNo: this.wagonNo,
+        wagonNew: this.form.wagonNo,
+        batchId: this.form.batchId,
+        portId: this.form.portId,
+        wagonWeight: this.tonnage,
+        wagonWeightNew: this.form.tonnage,
+        resultRemarks: this.form.resultRemarks,
+        purchaseOrderNo: this.form.purchaseOrderNo,
+        userId: getCookie("userId"),
+        resultType: 1,
+      };
+      console.log(map);
+      if (
+        map.loadingTempId == null ||
+        map.wagonNew == null ||
+        map.purchaseOrderNo == null ||
+        (map.isAssembly && map.wagonWeightNew == null)
+      )
+        this.$message.error("必填项存在空值！");
+      else
+        this.axios
+          .post("/api/v1/tms/updateWarehouseResult", map)
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$message({
+                type: "success",
+                message: "修改成功!",
+              });
+              this.$router.go(-1);
+            } else {
+              this.$message({
+                type: "error",
+                message: res.data.data,
+              });
+            }
+          });
+    },
+  },
+};
+</script>
+<style lang="scss">
+.editOutBoundWagon {
+  .form {
+    display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+              .el-input {
+                width: 250px;
+              }
+              .el-textarea {
+                .el-textarea__inner {
+                  width: 220px;
+                  margin-left: 65px;
+                  margin-top: 0.03rem;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .button_box {
+    margin-left: 42%;
+    margin-top: 55px;
+  }
+  .fromOther .el-input__inner {
+    width: 250px;
+  }
+}
+</style>

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

@@ -7,17 +7,32 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" class="btn" @click="insert">
-        出库
-      </el-button>
+      <el-button type="primary" class="btn" @click="insert"> 出库 </el-button>
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
-      <dilTable v-bind.sync="option1" ref="table"> </dilTable>
+      <mergeRowTable v-bind.sync="option1" ref="table">
+        <el-table-column fixed="right" label="操作" width="50">
+          <template slot-scope="scope">
+            <el-button
+              @click="click(scope.row.resultId)"
+              type="text"
+              size="small"
+              >修改</el-button
+            >
+            <!-- <el-button
+            type="text"
+            size="small"
+            @click="deleteclick(scope.row.resultId)"
+            >删除</el-button > -->
+          </template>
+        </el-table-column>
+      </mergeRowTable>
     </el-tabs>
   </div>
 </template>
 
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   name: "inplantTMS",
   data() {
@@ -27,8 +42,10 @@ export default {
       activeName: "first",
       option1: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/wmsh/getOutBoundResult?apiId=159"
-      }
+        requestUrl: "/api/v1/wmsh/getUnLockPortStock?apiId=494",
+        comparison: "resultNumber",
+        columnIndexs: [0, 1, 2, 3, 4, 5],
+      },
     };
   },
   filters: {},
@@ -36,7 +53,7 @@ export default {
     onclick() {
       if (this.activeName == "first") {
         this.option1.requestUrl =
-          "/api/v1/wmsh/getOutBoundResult?apiId=159&con=" + this.input;
+          "/api/v1/wmsh/getUnLockPortStock?apiId=494&con=" + this.input;
       }
     },
     insert() {
@@ -44,8 +61,20 @@ export default {
     },
     handleClick(tab, event) {
       console.log(tab, event);
-    }
-  }
+    },
+    click(resultId) {
+      console.log("res",getCookie("orgCode"));
+      if (
+        getCookie("orgCode") == "yuanliaogongsi" ||
+        getCookie("orgCode") == "dagangadmin"
+      ) {
+       this.$router.push("/editOutBoundWagon/" + resultId);
+      
+      } else {
+          this.$message.warning("权限不足,请联系部门管理员!");
+        }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

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

@@ -10,12 +10,25 @@
       >
       </el-input>
       <el-button type="primary" class="btn" @click="onclick">
+        <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>
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" class="btn" @click="addclick">
         <i class="el-icon-circle-plus-outline"></i>新增
       </el-button>
-       <el-button type="primary" @click="refresh()">
+      <el-button type="primary" @click="refresh()">
         <i class="el-icon-refresh"></i>刷新
       </el-button>
     </div>
@@ -42,18 +55,39 @@ export default {
   name: "homeworkPath",
   data() {
     return {
-      restaurants: [],
+      startTime: null,
+      endTime: null,
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getLoadShipList?apiId=63"
-      }
+        requestUrl: "/api/v1/tms/getLoadShipList?apiId=63",
+      },
     };
   },
   mounted() {},
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getLoadShipList?apiId=63&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) {
+          this.option.requestUrl =
+            "/api/v1/tms/getLoadShipList?apiId=63&con=" +
+            this.input +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&i=" +
+            new Date();
+        }
+      }
     },
     click(resultId) {
       console.log("aaa" + resultId);
@@ -68,13 +102,13 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true
+        center: true,
       })
         .then(() => {
           this.axios.post("/api/v1/tms/deleteLoadShip/" + resultId).then(() => {
             this.$message({
               type: "success",
-              message: "删除成功!"
+              message: "删除成功!",
             });
             this.option.requestUrl =
               "/api/v1/tms/getLoadShipList?apiId=63&i=" + new Date();
@@ -83,14 +117,14 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消删除!"
+            message: "取消删除!",
           });
         });
     },
-    refresh(){
+    refresh() {
       this.$router.go(0);
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/TMS/router/index.js

@@ -110,6 +110,7 @@ import addWagonUnLoad from "../components/importedMine/addWagonUnLoad.vue";
 import editApproveWagonPlease from "../components/importedMine/editApproveWagonPlease.vue";
 import editWagonLoad from "../components/importedMine/editWagonLoad.vue";
 import editWagonPlease from "../components/importedMine/editWagonPlease.vue";
+import editOutBoundWagon from "../components/importedMine/editOutBoundWagon.vue";
 import editWagonUnLoad from "../components/importedMine/editWagonUnLoad.vue";
 import entrust from "../components/importedMine/entrust.vue";
 import wagonApprove from "../components/importedMine/wagonApprove.vue";
@@ -777,6 +778,12 @@ const constantRouterMap = [
         meta: { code: "xtpzgl-yhgl" },
         component: editWagonPlease
       },
+      {
+        path: "editOutBoundWagon/:resultId",
+        name: "editOutBoundWagon",
+        meta: { code: "xtpzgl-yhgl" },
+        component: editOutBoundWagon
+      },
       {
         path: "editWagonUnLoad/:unloadingId",
         name: "editWagonUnLoad",

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

@@ -97,12 +97,17 @@
     <el-form :inline="true" style="margin-top: 1rem;">
       <el-form-item>
         <label class="el-form-item__label" style="width: auto;">收货地址</label>
-        <el-input
-          style="width: 400px"
+        <el-autocomplete
+          style="width:400px"
           v-model="saleShipperAddressName"
-          disabled
+          :fetch-suggestions="querySearchAddress"
+          placeholder="请输入内容"
+          @select="handleSelectAddress"
         >
-        </el-input>
+          <template slot-scope="{ item }">
+            <span class="addr">{{ item.addressPlace }}</span>
+          </template>
+        </el-autocomplete>
         <el-button type="primary" @click="ondrawerOut">选择</el-button>
       </el-form-item>
       <el-form-item>
@@ -394,7 +399,7 @@
           </template>
         </el-table-column>
         <!-- 操作列 -->
-        <el-table-column fixed="right" label="操作" width="100">
+        <el-table-column fixed="right" label="操作" width="200">
           <template slot-scope="scope">
             <el-button
               @click.native.prevent="deleteRow(scope.$index, selectionList)"
@@ -402,6 +407,18 @@
               icon="el-icon-close"
               size="big"
             ></el-button>
+            <el-button
+              @click.native.prevent="copyRow(scope.$index, scope.row)"
+              type="text"
+              size="big"
+              >复制为一车</el-button
+            >
+            <el-button
+              @click.native.prevent="copyRowflu(scope.$index, scope.row)"
+              type="text"
+              size="big"
+              >复制为分录</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -888,7 +905,8 @@ export default {
       //收款公司
       saleOrderReceiveCustomer: null,
       //是否忽视收货客户电话字段
-      ignoreSaleOrderConsigneeTel: 0
+      ignoreSaleOrderConsigneeTel: 0,
+      restaurants: []
     };
   },
   created() {
@@ -933,8 +951,8 @@ export default {
                   this.consigneeId
               )
               .then(res => {
+                this.restaurants = res.data.data;
                 const place = res.data.data;
-                console.log(place);
                 this.saleShipperAddressName =
                   place[0].addressProvince +
                   place[0].addressDistrict +
@@ -947,10 +965,45 @@ export default {
               });
           }
         });
-      console.log(getCookie("userId"));
     }
   },
   methods: {
+    handleSelectAddress(item) {
+      console.log(item);
+      this.saleShipperAddressName = item.addressPlace;
+      this.province = item.addressProvince;
+      this.city = item.addressDistrict;
+      this.county = item.addressTown;
+      this.saleShipperAddressId = item.shipperAddressId;
+      this.addressId = item.shipperAddressId;
+      this.place1 = item.place;
+      this.saleOrderConsigneeTel = item.saleOrderConsigneeTel;
+    },
+    querySearchAddress(queryString, cb) {
+      if (this.consigneeId != null) {
+        this.axios
+          .post(
+            "/api/v1/ams/matchingAddressRecently?receiveId=" + this.consigneeId
+          )
+          .then(res => {
+            var restaurants = res.data.data;
+            console.log(restaurants);
+            var results = queryString
+              ? restaurants.filter(this.createStateFilter(queryString))
+              : restaurants;
+            cb(results);
+          });
+      }
+    },
+    createStateFilter(queryString) {
+      return restaurants => {
+        return (
+          restaurants.addressPlace
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
     onblur() {
       this.isCellClick = 0;
       console.log("我这里值也变化了");
@@ -1076,6 +1129,7 @@ export default {
             place[0].addressTown +
             place[0].place;
           this.saleShipperAddressId = place[0].shipperAddressId;
+          this.addressId = place[0].shipperAddressId;
           this.place1 = place[0].place;
           this.saleMan = place[0].salerId;
           this.saleOrderConsigneeTel = place[0].saleOrderConsigneeTel;
@@ -1236,6 +1290,26 @@ export default {
       //调用记录每一行的合并数的方法
       this.getSpanArr(this.selectionList);
     },
+    copyRow(index, row) {
+      let copyRow = new Object();
+      Object.keys(row).forEach(key => {
+        copyRow[key] = row[key];
+      });
+      copyRow.cxh = this.maxCxh;
+      this.selectionList.push(copyRow);
+      this.getSpanArr(this.selectionList);
+      this.maxCxh++;
+    },
+    copyRowflu(index, row) {
+      console.log(index);
+      let copyRowflu = new Object();
+      Object.keys(row).forEach(key => {
+        copyRowflu[key] = row[key];
+      });
+      this.selectionList.splice(index + 1, 0, copyRowflu);
+      // this.selectionList.push(copyRowflu);
+      this.getSpanArr(this.selectionList);
+    },
     singleDistribute() {
       let ml = this.materialList.length;
       if (ml == 0) {

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

@@ -187,6 +187,12 @@
                   size="small"
                   >撤销上报</el-button
                 >
+                <el-button
+                  @click="updateReportedSaleOrder(scope)"
+                  type="text"
+                  size="small"
+                  >修改</el-button
+                >
               </template>
             </el-table-column>
           </mergeRowTable>
@@ -343,6 +349,9 @@ export default {
     }
   },
   methods: {
+    updateReportedSaleOrder(scope) {
+      this.$router.push("/editSaleOrder/" + scope.row.saleOrderId);
+    },
     updateSaleOrderStatusById(scope) {
       console.log(scope.row.saleOrderId);
       this.$confirm("是否撤销", "警告", {

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

@@ -23,6 +23,7 @@
             style="width:200px"
             v-model="input"
             placeholder="请输入查询条件"
+            clearable
           ></el-input>
         </el-form-item>
         <el-form-item>
@@ -83,7 +84,6 @@
         ref="tableRef"
         border
         stripe
-        @filter-change="filterChange"
         style="width: 100%; margin-top: 20px"
         max-height="800px"
         @cell-click="cellClik"
@@ -97,13 +97,6 @@
         >
           <template slot-scope="scope">{{ scope.row.group + 1 }}</template>
         </el-table-column>
-        <el-table-column
-          prop="saleOrderNo"
-          label="销售订单号"
-          width="200px"
-          align="center"
-        >
-        </el-table-column>
         <el-table-column
           prop="consigneeName"
           label="下单客户"
@@ -141,9 +134,6 @@
           label="车牌号"
           align="center"
           width="250px"
-          :filter-multiple="true"
-          :filters="filterData()"
-          :filter-method="filterTag"
         >
           <template slot-scope="scope">
             <el-autocomplete
@@ -155,56 +145,13 @@
               :disabled="scope.row.isCapacityShow != 1"
             ></el-autocomplete>
             <el-button
-              @click="updateCapacity(row)"
+              @click="updateCapacity(scope.row)"
               type="primary"
               v-if="scope.row.isCapacityShow == 1"
               >提交</el-button
             >
           </template>
         </el-table-column>
-        <el-table-column
-          prop="capacityTel"
-          label="司机电话"
-          width="250px"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <el-input
-              style="width:120px"
-              v-model="scope.row.capacityTel"
-              placeholder="请输入电话号码"
-              :disabled="scope.row.isTelShow != 1"
-            ></el-input>
-            <el-button
-              @click="updateDriverTel(scope.row)"
-              type="primary"
-              v-if="scope.row.isTelShow == 1"
-              >提交</el-button
-            >
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="addressPlace"
-          label="收货地址"
-          :width="flexColumnWidth('addressPlace', tableData, 'max')"
-        >
-          <template slot-scope="scope">
-            <el-input
-              style="width:300px"
-              v-model="scope.row.addressPlace"
-              placeholder="请输入收货地址"
-              :disabled="scope.row.isAddressShow != 1"
-            ></el-input>
-            <el-button
-              @click="updateAddress(scope.row)"
-              type="primary"
-              v-if="scope.row.isAddressShow == 1"
-              >选择</el-button
-            >
-          </template>
-        </el-table-column>
-        <el-table-column prop="orderStatus" label="运单状态" align="center">
-        </el-table-column>
         <el-table-column
           prop="materialName"
           label="物资名称"
@@ -242,6 +189,28 @@
             >
           </template>
         </el-table-column>
+        <el-table-column
+          prop="addressPlace"
+          label="收货地址"
+          :width="flexColumnWidth('addressPlace', tableData, 'max')"
+        >
+          <template slot-scope="scope">
+            <el-input
+              style="width:280px"
+              v-model="scope.row.addressPlace"
+              placeholder="请输入收货地址"
+              :disabled="scope.row.isAddressShow != 1"
+            ></el-input>
+            <el-button
+              @click="updateAddress(scope.row)"
+              type="primary"
+              v-if="scope.row.isAddressShow == 1"
+              >选择</el-button
+            >
+          </template>
+        </el-table-column>
+        <el-table-column prop="orderStatus" label="运单状态" align="center">
+        </el-table-column>
         <el-table-column prop="grossWeight" label="毛重"> </el-table-column>
         <el-table-column
           prop="grossWeightTime"
@@ -294,6 +263,27 @@
           align="center"
         >
         </el-table-column>
+        <el-table-column
+          prop="capacityTel"
+          label="司机电话"
+          width="250px"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <el-input
+              style="width:120px"
+              v-model="scope.row.capacityTel"
+              placeholder="请输入电话号码"
+              :disabled="scope.row.isTelShow != 1"
+            ></el-input>
+            <el-button
+              @click="updateDriverTel(scope.row)"
+              type="primary"
+              v-if="scope.row.isTelShow == 1"
+              >提交</el-button
+            >
+          </template>
+        </el-table-column>
         <el-table-column prop="saler" label="业务员" align="center">
         </el-table-column>
         <el-table-column
@@ -312,6 +302,13 @@
         </el-table-column>
         <el-table-column prop="isSelfMention" label="是否自提" align="center">
         </el-table-column>
+        <el-table-column
+          prop="saleOrderNo"
+          label="销售订单号"
+          width="200px"
+          align="center"
+        >
+        </el-table-column>
         <el-table-column
           prop="saleOrderStatus"
           label="销售订单状态"
@@ -429,7 +426,7 @@
 </template>
 
 <script>
-import { sjTime } from "@/utils/sharedJsFile";
+import { sjTime, isVehicleNumber } from "@/utils/sharedJsFile";
 import { getCookie } from "@/utils/util.js";
 
 export default {
@@ -471,10 +468,9 @@ export default {
         1,
         2,
         3,
-        4,
-        5,
-        6,
         7,
+        8,
+        14,
         16,
         17,
         18,
@@ -489,6 +485,21 @@ export default {
         27,
         29
       ],
+      //钢材多拼车辆线路ID
+      //索引从1-10为1-10拼路线ID
+      lineSpelling: [
+        0,
+        110001,
+        110002,
+        110003,
+        110004,
+        110005,
+        110006,
+        110007,
+        110008,
+        110009,
+        110010
+      ],
       tableTitle: "销售钢材统计报表",
       //所有省
       provinceList: [],
@@ -576,10 +587,6 @@ export default {
     changeScreen() {
       console.log(this.screen);
     },
-    filterChange(filters) {},
-    filterTag(value, row, column) {
-      return row.capacityNo == value;
-    },
     // 数组对象去重
     deWeight(arr) {
       for (var i = 0; i < arr.length - 1; i++) {
@@ -594,6 +601,7 @@ export default {
     },
     cellClik(row, column, cell, event) {
       if (row.group != this.clickIndex) {
+        // this.getSteelReport();
         this.tableData.forEach(item => {
           if (item.group == this.clickIndex) {
             this.$set(item, "isCapacityShow", 0);
@@ -629,6 +637,7 @@ export default {
     handleSelectCarrier(row, index, item) {
       this.carrierList.forEach(item => {
         if (item.carrierName == row.carrierName) {
+          row.newCarrierId = item.carrierId;
           row.carrierId = item.carrierId;
         }
       });
@@ -707,6 +716,10 @@ export default {
         this.$message.warning("请先注册车牌号或者选中弹出后再提交!");
         return;
       }
+      if (!isVehicleNumber(row.capacityNo)) {
+        this.$message.error("请输入正确格式的车牌号!");
+        return;
+      }
       if (row.capacityIds != 0) {
         const loading = this.$loading({
           lock: true,
@@ -733,6 +746,45 @@ export default {
             loading.close();
           });
       } else {
+        if (row.carrierIds == 0) {
+          this.$message.error("请先选择承运商！");
+          return;
+        }
+        let i = 0;
+        this.tableData.forEach(e => {
+          if (row.group == e.group) {
+            i++;
+          }
+        });
+        row.lineId = this.lineSpelling[i];
+        row.driverTel = row.capacityTel;
+        row.capacityNumber = row.capacityNo;
+        let arr = [];
+        arr.push(row);
+        const loading = this.$loading({
+          lock: true,
+          text: "正在变更车牌号",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
+        });
+        this.axios
+          .post("/api/v1/ams/dispatchSteelOrder", arr)
+          .then(res => {
+            if (res.data.code == "200") {
+              this.$message.success("派车成功!");
+              this.getSteelReport();
+              loading.close();
+            } else {
+              this.$message.error("派车失败,请联系管理员");
+              this.getSteelReport();
+              loading.close();
+            }
+          })
+          .catch(() => {
+            this.$message.error("派车失败,请联系管理员");
+            this.getSteelReport();
+            loading.close();
+          });
       }
     },
     //修改司机电话号码
@@ -769,9 +821,9 @@ export default {
           loading.close();
         });
     },
-    //关闭金蝶分录
+    //关闭车辆金蝶分录
     deleteEasEntryId(row) {
-      this.$confirm(title, {
+      this.$confirm("确定关闭该车金蝶分录吗?", "提示", {
         confirmButtonText: "是",
         cancelButtonText: "否",
         center: true,
@@ -780,58 +832,96 @@ export default {
         .then(() => {
           let map = row;
           map.isCloseEas = Number(0);
-          map.saleOrderId = this.$route.params.saleOrderId;
+          const loading = this.$loading({
+            lock: true,
+            text: "正在关闭车辆",
+            spinner: "el-icon-loading",
+            background: "rgba(0, 0, 0, 0.7)"
+          });
           this.axios
             .post("/api/v1/ams/updateCarAddress", map)
             .then(res => {
               if (res.data.code == "200") {
-                this.$message.success("关闭成功");
-                this.getOrderList();
+                this.$message.success("关闭车辆成功");
+                this.getSteelReport();
+                loading.close();
               } else {
-                this.$message.error("关闭失败");
-                this.getOrderList();
+                this.$message.error("关闭车辆失败");
+                this.getSteelReport();
+                loading.close();
               }
             })
             .catch(() => {
-              this.$message.error("关闭失败");
-              this.getOrderList();
+              this.$message.error("关闭车辆失败");
+              this.getSteelReport();
+              loading.close();
             });
         })
         .catch(() => {
-          this.$message.info("取消删除");
+          this.$message.info("取消关闭");
         });
     },
     //修改承运商授权
     updateTruckCarrier(row) {
-      if (row.carrierId == null) {
+      if (row.newCarrierId == null) {
         this.$message.warning("请注册承运商或者选中弹出层之后再提交!");
         this.getSteelReport();
         return;
       }
-      const loading = this.$loading({
-        lock: true,
-        text: "正在修改承运商授权",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)"
-      });
-      this.axios
-        .post("/api/v1/ams/updateTruckNoCarrier", row)
-        .then(res => {
-          if (res.data.code == "200") {
-            this.$message.success("修改承运商授权成功");
-            this.getSteelReport();
-            loading.close();
-          } else {
+      if (row.carrierIds != 0) {
+        const loading = this.$loading({
+          lock: true,
+          text: "正在修改承运商授权",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
+        });
+        this.axios
+          .post("/api/v1/ams/updateTruckNoCarrier", row)
+          .then(res => {
+            if (res.data.code == "200") {
+              this.$message.success("修改承运商授权成功");
+              this.getSteelReport();
+              loading.close();
+            } else {
+              this.$message.error("修改失败,请联系管理员!");
+              this.getSteelReport();
+              loading.close();
+            }
+          })
+          .catch(() => {
             this.$message.error("修改失败,请联系管理员!");
             this.getSteelReport();
             loading.close();
-          }
-        })
-        .catch(() => {
-          this.$message.error("修改失败,请联系管理员!");
-          this.getSteelReport();
-          loading.close();
+          });
+      } else {
+        //授权承运商
+        let arr = [];
+        arr.push(row);
+        const loading = this.$loading({
+          lock: true,
+          text: "正在授权承运商",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
         });
+        this.axios
+          .post("/api/v1/ams/dispatchToCarrier", arr)
+          .then(res => {
+            if (res.data.code == "200") {
+              this.$message.success("授权承运商成功");
+              this.getSteelReport();
+              loading.close();
+            } else {
+              this.$message.error("授权失败,请联系管理员");
+              this.getSteelReport();
+              loading.close();
+            }
+          })
+          .catch(() => {
+            this.$message.error("授权失败,请联系管理员");
+            this.getSteelReport();
+            loading.close();
+          });
+      }
     },
     updateAddress(row) {
       this.drawer = true;
@@ -841,6 +931,8 @@ export default {
       this.county = row.addressTown;
       this.addressId = row.shipperAddressId;
       this.getAllProvince();
+      this.onchangeProvince();
+      this.onchangeCity();
     },
     //获取所有省数据
     getAllProvince() {
@@ -919,6 +1011,7 @@ export default {
         );
       };
     },
+    //修改收货地址
     addAddressClick() {
       const loading = this.$loading({
         lock: true,
@@ -955,7 +1048,6 @@ export default {
     },
     //记录每一行的合并数
     getSpanArr(data) {
-      console.log("我执行");
       //每次调用方法初始化
       this.spanArr = [];
       for (var i = 0; i < data.length; i++) {
@@ -1007,6 +1099,7 @@ export default {
       arr.push(map);
       let updateMap = {
         orderId: row.orderId,
+        saleOrderMaterialId: row.saleOrderMaterialId,
         mapList: arr
       };
       this.axios
@@ -1028,6 +1121,7 @@ export default {
           loading.close();
         });
     },
+    //关闭单条分录
     closeEasEntryId(row) {
       console.log(row);
       this.$prompt("确定关闭该条分录吗?", "警告", {
@@ -1049,7 +1143,8 @@ export default {
               saleOrderMaterialId: row.saleOrderMaterialId,
               saleMaterialId: row.saleMaterialId,
               reason: value,
-              number: row.saleOrderNo
+              number: row.saleOrderNo,
+              closeEntryId: row.closeEntryId
             };
             this.axios
               .post("/api/v1/ams/closeSteelMaterialId", map)
@@ -1084,6 +1179,7 @@ export default {
       let consigneeName = null;
       let capacityNo = null;
       let remark = null;
+      let saler = null;
       if (this.startTime && this.endTime) {
         startTime = sjTime(this.startTime);
         endTime = sjTime(this.endTime);
@@ -1091,6 +1187,9 @@ export default {
       if (getCookie("orgCode") == "chengyunshang") {
         carrierSsoId = getCookie("userId");
       }
+      if (getCookie("orgCode") == "xiaoshouyewuyuan") {
+        saler = getCookie("loginName");
+      }
       if (this.screen == "下单客户") {
         consigneeName = this.input;
       } else if (this.screen == "承运商") {
@@ -1117,7 +1216,9 @@ export default {
             "&carrierName=" +
             carrierName +
             "&capacityNo=" +
-            capacityNo
+            capacityNo +
+            "&saler=" +
+            saler
         )
         .then(res => {
           this.tableData = res.data.data;
@@ -1131,9 +1232,13 @@ export default {
     //获取钢材统计报表
     getSteelReport() {
       let carrierSsoId = null;
+      let saler = null;
       if (getCookie("orgCode") == "chengyunshang") {
         carrierSsoId = getCookie("userId");
       }
+      if (getCookie("orgCode") == "xiaoshouyewuyuan") {
+        saler = getCookie("loginName");
+      }
       this.axios
         .post(
           "/api/v1/tms/getSaleSteelReport?startTime=" +
@@ -1142,6 +1247,8 @@ export default {
             null +
             "&carrierSsoId=" +
             carrierSsoId +
+            "&saler=" +
+            saler +
             "&i=" +
             new Date()
         )