فهرست منبع

新增内转物流管理系统

huk 3 سال پیش
والد
کامیت
c54a6339e6
80فایلهای تغییر یافته به همراه7997 افزوده شده و 52 حذف شده
  1. BIN
      src/assets/img/icore-shown-all.png
  2. BIN
      src/assets/img/icore-shown-desc.png
  3. 14 0
      src/js/QueueStartList.js
  4. 31 0
      src/js/sharedJsFile.js
  5. 22 0
      src/views/inward/app.html
  6. 86 0
      src/views/inward/app.js
  7. 155 0
      src/views/inward/components/inwardFactory/addTruckLoad.vue
  8. 47 0
      src/views/inward/components/inwardFactory/countResult.vue
  9. 47 0
      src/views/inward/components/inwardFactory/enFactoryResult.vue
  10. 47 0
      src/views/inward/components/inwardFactory/monthResult.vue
  11. 47 0
      src/views/inward/components/inwardFactory/outFactory.vue
  12. 47 0
      src/views/inward/components/inwardFactory/tareWeightResult.vue
  13. 47 0
      src/views/inward/components/inwardFactory/timeTaskResult.vue
  14. 111 0
      src/views/inward/components/inwardFactory/truckLoad.vue
  15. 47 0
      src/views/inward/components/inwardFactory/unload.vue
  16. 174 0
      src/views/inward/components/inwardImport/daZhou/addTruckLoad.vue
  17. 47 0
      src/views/inward/components/inwardImport/daZhou/enFactoryResult.vue
  18. 47 0
      src/views/inward/components/inwardImport/daZhou/grossWeightResult.vue
  19. 47 0
      src/views/inward/components/inwardImport/daZhou/outFactory.vue
  20. 47 0
      src/views/inward/components/inwardImport/daZhou/qualityResult.vue
  21. 47 0
      src/views/inward/components/inwardImport/daZhou/receipt.vue
  22. 47 0
      src/views/inward/components/inwardImport/daZhou/tareWeightResult.vue
  23. 47 0
      src/views/inward/components/inwardImport/daZhou/trainUnload.vue
  24. 54 0
      src/views/inward/components/inwardImport/daZhou/truckLoad.vue
  25. 47 0
      src/views/inward/components/inwardImport/daZhou/unload.vue
  26. 167 0
      src/views/inward/components/inwardImport/daZhou/updateTrainUnload.vue
  27. 167 0
      src/views/inward/components/inwardImport/daZhou/updateTruckLoad.vue
  28. 174 0
      src/views/inward/components/inwardImport/oldAreaRailScale/addTruckLoad.vue
  29. 47 0
      src/views/inward/components/inwardImport/oldAreaRailScale/grossWeightResult.vue
  30. 47 0
      src/views/inward/components/inwardImport/oldAreaRailScale/qualityResult.vue
  31. 47 0
      src/views/inward/components/inwardImport/oldAreaRailScale/receipt.vue
  32. 47 0
      src/views/inward/components/inwardImport/oldAreaRailScale/tareWeightResult.vue
  33. 47 0
      src/views/inward/components/inwardImport/oldAreaRailScale/trainLineUnload.vue
  34. 53 0
      src/views/inward/components/inwardImport/oldAreaRailScale/truckLoad.vue
  35. 47 0
      src/views/inward/components/inwardImport/oldAreaRailScale/unload.vue
  36. 199 0
      src/views/inward/components/offsetSteel/truckTrain/addApproveWagonPlease.vue
  37. 165 0
      src/views/inward/components/offsetSteel/truckTrain/addWagonLoad.vue
  38. 173 0
      src/views/inward/components/offsetSteel/truckTrain/addWagonPlease.vue
  39. 162 0
      src/views/inward/components/offsetSteel/truckTrain/addWagonUnLoad.vue
  40. 172 0
      src/views/inward/components/offsetSteel/truckTrain/editApproveWagonPlease.vue
  41. 189 0
      src/views/inward/components/offsetSteel/truckTrain/editWagonLoad.vue
  42. 178 0
      src/views/inward/components/offsetSteel/truckTrain/editWagonPlease.vue
  43. 184 0
      src/views/inward/components/offsetSteel/truckTrain/editWagonUnLoad.vue
  44. 66 0
      src/views/inward/components/offsetSteel/truckTrain/wagonApprove.vue
  45. 134 0
      src/views/inward/components/offsetSteel/truckTrain/wagonLoad.vue
  46. 158 0
      src/views/inward/components/offsetSteel/truckTrain/wagonPlease.vue
  47. 130 0
      src/views/inward/components/offsetSteel/truckTrain/wagonUnLoad.vue
  48. 102 0
      src/views/inward/components/offsetSteel/truckTransport/enFactoryResult.vue
  49. 49 0
      src/views/inward/components/offsetSteel/truckTransport/grossWeightResult.vue
  50. 47 0
      src/views/inward/components/offsetSteel/truckTransport/loadTruckResult.vue
  51. 94 0
      src/views/inward/components/offsetSteel/truckTransport/outFactory.vue
  52. 47 0
      src/views/inward/components/offsetSteel/truckTransport/qualityResult.vue
  53. 47 0
      src/views/inward/components/offsetSteel/truckTransport/returnResult.vue
  54. 47 0
      src/views/inward/components/offsetSteel/truckTransport/tareWeightResult.vue
  55. 57 0
      src/views/inward/components/offsetSteel/truckTransport/truckQualityResult.vue
  56. 41 0
      src/views/inward/components/offsetSteel/truckTransport/truckReceiptResult.vue
  57. 4 0
      src/views/inward/components/transportFreight/bmsTruckDetailOrder.vue
  58. 4 0
      src/views/inward/components/transportFreight/bmsTruckFormula.vue
  59. 4 0
      src/views/inward/components/transportFreight/bmsTruckStatement.vue
  60. 4 0
      src/views/inward/components/transportFreight/correctResult.vue
  61. 279 0
      src/views/inward/components/truckAppoint/RailPlan.vue
  62. 163 0
      src/views/inward/components/truckAppoint/addPlan.vue
  63. 0 0
      src/views/inward/components/truckAppoint/addRailPlan.vue
  64. 344 0
      src/views/inward/components/truckAppoint/addRequirement.vue
  65. 315 0
      src/views/inward/components/truckAppoint/addRequirement2.vue
  66. 261 0
      src/views/inward/components/truckAppoint/plan.vue
  67. 184 0
      src/views/inward/components/truckAppoint/requirement.vue
  68. 173 0
      src/views/inward/components/truckAppoint/updatePlan.vue
  69. 311 0
      src/views/inward/components/truckAppoint/updateRequirement.vue
  70. 102 0
      src/views/inward/components/truckOrder/RailPlan.vue
  71. 332 0
      src/views/inward/components/truckOrder/decomposePlan.vue
  72. 337 0
      src/views/inward/components/truckOrder/decomposeRailPlan.vue
  73. 140 0
      src/views/inward/components/truckOrder/dispatchPlan.vue
  74. 203 0
      src/views/inward/components/truckOrder/plan.vue
  75. 197 0
      src/views/inward/router/index.js
  76. 0 47
      src/views/ship/app.js
  77. 1 1
      src/views/ship/components/addDeliveryAttorney.vue
  78. 1 1
      src/views/ship/components/addDeliveryNotice.vue
  79. 1 2
      src/views/ship/components/modifyDeliveryAttroney.vue
  80. 1 1
      src/views/ship/components/modifyDeliveryNotice.vue

BIN
src/assets/img/icore-shown-all.png


BIN
src/assets/img/icore-shown-desc.png


+ 14 - 0
src/js/QueueStartList.js

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

+ 31 - 0
src/js/sharedJsFile.js

@@ -0,0 +1,31 @@
+ // 把时间戳改为正常可读的时间
+ 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;
+   }
+ }

+ 22 - 0
src/views/inward/app.html

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html style="overflow: hidden;">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <meta content="工业互联网平台" name="keywords">
+    <meta content="工业互联网平台" name="description">
+    <title>首页 - 工业互联网平台 iCore-ICP</title>
+    <link href="../static/css/common.css" rel="stylesheet"/>
+    <link href="../static/img/favicon.ico" rel="shortcut icon"/>
+    <script src="../static/lib/jquery/jquery.min.js" type="text/javascript"></script>
+    <script src="../static/lib/jquery/jquery.PrintArea.js" type="text/javascript"></script>
+    <script src="../static/lib/qrcode.min.js" type="text/javascript"></script>
+    <script src='../static/lib/XLSX/xlsx.core.min.js' type='text/javascript'></script>
+    <script src="../static/js/common.js" type="text/javascript"></script>
+  </head>
+  <body>
+    <div id="app"></div>
+    <!-- test set app -->
+  </body>
+</html>

+ 86 - 0
src/views/inward/app.js

@@ -0,0 +1,86 @@
+// The Vue build version to load with the `import` command
+// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
+import Vue from 'vue';
+import App from '@/components/App.vue';
+// include
+import '@/config/include.js';
+
+// 通用store
+import store from '@/store/index.js';
+
+// router
+import router from './router/index.js';
+
+import VueApollo from 'vue-apollo'
+
+import apollo from '@/config/apolloConfig.js'
+
+// 注册表格的全局组件
+import DilCommonUI from "@/components/DilCommonUI";
+Vue.use(DilCommonUI);
+
+// 关闭生产模式下给出的提示
+Vue.config.productionTip = false;
+
+Vue.use(VueApollo)
+
+const apolloProvider = new VueApollo({
+    defaultClient: apollo
+})
+
+ //把时间戳改为正常可读的时间
+ 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 getDuration(my_time) { 
+  if(my_time !== null){
+      return Math.floor(my_time / 1000 / 60);
+  }
+  return null;
+}
+export function sjTime(orderPlanInTime) {
+  var stringTime = renderTime(orderPlanInTime);
+  var timestamp1 = stringTime.replace(/-/g, "/");
+  return new Date(timestamp1).getTime();
+}
+//验证电话号码
+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}$/;
+  if (!myreg.test(Phone)) {
+      return false;
+  } else {
+      return true;
+  }
+}
+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;
+  }
+}
+/* eslint-disable no-new */
+new Vue({
+  el: '#app',
+  router,
+  store,
+  components: { App },
+  provide: apolloProvider.provide(),
+  template: '<App/>'
+});

+ 155 - 0
src/views/inward/components/inwardFactory/addTruckLoad.vue

@@ -0,0 +1,155 @@
+// 新增汽车装货
+<template>
+  <div id="endMaintenance">
+    <page-title>新增汽车装货</page-title>
+    <div class="main">
+      <span class="text">新增</span>
+      <span class="a"></span>
+    </div>
+    <div>
+      <div class="form-box" style="margin-left: 5rem">
+        <dil-form :formId="245" v-model="form"></dil-form>
+        
+      </div>
+    </div>
+    <div class="" style="margin-left:40rem">
+      <el-button type="primary" @click="makeSure">确认新增</el-button>
+      <el-button type="primary" @click="cancel">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form: {},
+    };
+  },
+  methods: {
+    // 新增
+    makeSure() {
+      let BmsTrainFreight = {
+        settlementDate: sjTime(this.form.settlementDate),
+        settlementDayWagons: this.form.settlementDayWagons,
+        settlementDayTonnage: this.form.settlementDayTonnage,
+        settlementDayTransportCost: this.form.settlementDayTransportCost,
+        settlementDayFloatCost: this.form.settlementDayFloatCost,
+        settlementDayMargin: this.form.settlementDayMargin,
+        settlementMonthWagons:this.form.settlementMonthWagons,
+        settlementMonthTonnage:this.form.settlementMonthTonnage,
+        settlementMonthTotalMonth:this.form.settlementMonthTotalMonth
+      };
+      console.log(BmsTrainFreight)     
+      this.$axios
+        .post(
+          "/api/v1/bms/addTrainSettlement",
+          BmsTrainFreight
+        )
+        .then((res) => {
+            console.log(res)
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });            
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败!");
+          }
+        });
+    },
+    // 返回
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+#pageTitle {
+    border-bottom: 0.125rem solid $borderColorPageTitlte;
+    background-color: $backgroundColorPageTitle;
+    padding-left: 3.125rem;
+    margin-bottom: 1.875rem;
+    span {
+      font-size: 1.5rem;
+      line-height: 4.375rem;
+      color: $fontColorPageTitle;
+    }
+    i {
+      cursor: pointer;
+      border: 0.0625rem solid $fontColorPageTitle;
+      color: $fontColorPageTitle;
+      border-radius: 100%;
+      margin-right: 1.25rem;
+      // 图标放大
+      transform: scale(1.6, 1.6);
+    }
+  }
+  #query_condition{
+    margin-left: 3rem;
+  }
+  .button-box {
+    display: flex;
+    justify-content: center;
+    .el-button + .el-button {
+      margin-left: 3rem;
+    }
+  }
+  
+  .form-box {
+    display: flex;
+    margin-top: 1.25rem;
+    justify-content: center;
+    .el-form {
+      flex-direction: column;
+    }
+    
+  }
+
+  .body{
+    display: -webkit-flex;
+    display: flex;
+  }
+  .main {
+    display: flex;
+    margin-top: 1.5625rem;
+    margin-left: 1.875rem;
+    margin-bottom: 3.125rem;
+    .text {
+      margin-right: 0.625rem;
+      font-weight: 700;
+      font-size: 0.9375rem;
+    }
+    .el_text1 {
+      width: 56.875rem;
+    }
+    .a {
+      margin-top: 0.4375rem;
+      width: 80%;
+      height: 0.0625rem;
+      border-top: $gainsboro 0.0625rem solid;
+    }
+  }
+  .contractTitle{
+    margin: 0 auto;
+    text-align: center;
+  }
+  .contractId{
+    font-size: 1.25rem;
+  }
+  .form-one{
+    margin-right: 0.625rem;
+  }
+  .button-ins {
+    display: flex;
+    margin-left: 60rem;
+    margin-bottom: 1rem;
+  }
+  
+</style>

+ 47 - 0
src/views/inward/components/inwardFactory/countResult.vue

@@ -0,0 +1,47 @@
+// 计数作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/tms/selectCountList?apiId=364",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/tms/selectCountList?apiId=364&con="+this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 47 - 0
src/views/inward/components/inwardFactory/enFactoryResult.vue

@@ -0,0 +1,47 @@
+// 进厂作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=357&orderType=11",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=357&orderType=11&con="+this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 47 - 0
src/views/inward/components/inwardFactory/monthResult.vue

@@ -0,0 +1,47 @@
+// 包月作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/tms/getTmstruckMonthResult?apiId=365",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/tms/getTmstruckMonthResult?apiId=365&con="+this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 47 - 0
src/views/inward/components/inwardFactory/outFactory.vue

@@ -0,0 +1,47 @@
+// 出厂作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=361&orderType=11",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=361&orderType=11&con="+this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 47 - 0
src/views/inward/components/inwardFactory/tareWeightResult.vue

@@ -0,0 +1,47 @@
+// 计量作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=358&orderType=11",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=358&orderType=11&con="+this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 47 - 0
src/views/inward/components/inwardFactory/timeTaskResult.vue

@@ -0,0 +1,47 @@
+// 计时作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/tms/getAllTimeTaskResult?apiId=363",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=363&con="+this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 111 - 0
src/views/inward/components/inwardFactory/truckLoad.vue

@@ -0,0 +1,111 @@
+// 汽车装货
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        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="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="updateBmsTrainFreight(scope)"
+            >
+              修改
+            </el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteBmsTrainFreight(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址 
+        requestUrl: "/api/v1/tms/getAllLoadResult?apiId=359&orderType=11",
+      },
+    }
+  },
+  methods:{
+     onclick(){
+            this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=359&orderType=11&con="+this.inputText;
+        },
+     toInsert() {
+      this.$router.push("/inwardFactory/addTruckLoad");
+
+    },
+    updateBmsTrainFreight(scope){
+      console.log(scope.row.settlementId)
+      this.$router.push("/daZhou/updateTruckLoad/"+scope.row.settlementId)
+    },
+    deleteBmsTrainFreight(scope){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$axios
+            .post("/api/v1/bms/deleteTrainSettlement/" + scope.row.settlementId)
+            .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: "删除操作已取消!",
+          });
+        });
+    },
+    },
+  }
+
+</script>
+
+<style lang="scss">
+.steel_inbound{
+  .sache{
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

+ 47 - 0
src/views/inward/components/inwardFactory/unload.vue

@@ -0,0 +1,47 @@
+// 卸货作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/tms/getUnloadResult?apiId=360&orderType=11",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=360&orderType=11&con="+this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 174 - 0
src/views/inward/components/inwardImport/daZhou/addTruckLoad.vue

@@ -0,0 +1,174 @@
+// 新增汽车装货
+<template>
+  <div id="endMaintenance">
+    <page-title>新增汽车装货</page-title>
+    <div class="main">
+      <span class="text">选择运输订单</span>
+      <span class="a"></span>
+    </div>
+
+    <div class="tab">
+      <dilTable
+        v-bind.sync="option"
+        @selection-change="selectionChange"
+      ></dilTable>
+    </div>
+
+    <div>
+      <div class="form-box" style="margin-left: 5rem">
+        <dil-form :formId="343" v-model="form"></dil-form>
+      </div>
+    </div>
+
+    <div class="" style="margin-left: 40rem">
+      <el-button type="primary" @click="makeSure">确认新增</el-button>
+      <el-button type="primary" @click="cancel">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/oms/getReceiveRefuseOrder/1?apiId=117&orderType=9",
+        // 控制显示多选列
+        selectionType: "select",
+      },
+      form: {},
+      totalResultIdList: [],
+    };
+  },
+
+  created() {
+    this.form.loadTime = new Date();
+  },
+
+  methods: {
+    selectionChange(val) {
+      this.totalResultIdList = []
+      val.forEach(e => {
+        this.totalResultIdList.push(e.resultTotalId)
+      });
+    },
+
+    // 新增
+    makeSure() {
+      let obj = {
+        totalResultIdList: this.totalResultIdList,
+        loadTime: sjTime(this.form.loadTime),
+        isdeduct: this.form.isdeduct,
+        loadingId: 10003,
+      };
+      console.log(obj);
+      this.$axios
+        .post("/api/v1/tms/addDaZhouToDaGangLoadResult", obj)
+        .then((res) => {
+          console.log(res);
+          if (res.data.code == "200") {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败!");
+          }
+        });
+    },
+    // 返回
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+#pageTitle {
+    border-bottom: 0.125rem solid $borderColorPageTitlte;
+    background-color: $backgroundColorPageTitle;
+    padding-left: 3.125rem;
+    margin-bottom: 1.875rem;
+    span {
+      font-size: 1.5rem;
+      line-height: 4.375rem;
+      color: $fontColorPageTitle;
+    }
+    i {
+      cursor: pointer;
+      border: 0.0625rem solid $fontColorPageTitle;
+      color: $fontColorPageTitle;
+      border-radius: 100%;
+      margin-right: 1.25rem;
+      // 图标放大
+      transform: scale(1.6, 1.6);
+    }
+  }
+  #query_condition{
+    margin-left: 3rem;
+  }
+  .button-box {
+    display: flex;
+    justify-content: center;
+    .el-button + .el-button {
+      margin-left: 3rem;
+    }
+  }
+  
+  .form-box {
+    display: flex;
+    margin-top: 1.25rem;
+    justify-content: center;
+    .el-form {
+      flex-direction: column;
+    }
+    
+  }
+
+  .body{
+    display: -webkit-flex;
+    display: flex;
+  }
+  .main {
+    display: flex;
+    margin-top: 1.5625rem;
+    margin-left: 1.875rem;
+    margin-bottom: 3.125rem;
+    .text {
+      margin-right: 0.625rem;
+      font-weight: 700;
+      font-size: 0.9375rem;
+    }
+    .el_text1 {
+      width: 56.875rem;
+    }
+    .a {
+      margin-top: 0.4375rem;
+      width: 80%;
+      height: 0.0625rem;
+      border-top: $gainsboro 0.0625rem solid;
+    }
+  }
+  .contractTitle{
+    margin: 0 auto;
+    text-align: center;
+  }
+  .contractId{
+    font-size: 1.25rem;
+  }
+  .form-one{
+    margin-right: 0.625rem;
+  }
+  .button-ins {
+    display: flex;
+    margin-left: 60rem;
+    margin-bottom: 1rem;
+  }
+  
+</style>

+ 47 - 0
src/views/inward/components/inwardImport/daZhou/enFactoryResult.vue

@@ -0,0 +1,47 @@
+// 进厂作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=99&orderType=9",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=99&orderType=9&con=" + this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 47 - 0
src/views/inward/components/inwardImport/daZhou/grossWeightResult.vue

@@ -0,0 +1,47 @@
+// 计毛作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=354&orderType=9",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=354&orderType=9&con="+this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 47 - 0
src/views/inward/components/inwardImport/daZhou/outFactory.vue

@@ -0,0 +1,47 @@
+// 出厂作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=110&orderType=9",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=110&orderType=9&con="+this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 47 - 0
src/views/inward/components/inwardImport/daZhou/qualityResult.vue

@@ -0,0 +1,47 @@
+// 质检作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/tms/getQualityResult?apiId=111&orderType=9",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/tms/getQualityResult?apiId=111&orderType=9&con="+this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 47 - 0
src/views/inward/components/inwardImport/daZhou/receipt.vue

@@ -0,0 +1,47 @@
+// 收货作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/tms/getReceiveResult?apiId=107&orderType=9",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/tms/getReceiveResult?apiId=107&orderType=9&con="+this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 47 - 0
src/views/inward/components/inwardImport/daZhou/tareWeightResult.vue

@@ -0,0 +1,47 @@
+// 计皮作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=104&orderType=9",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=104&orderType=9&con="+this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 47 - 0
src/views/inward/components/inwardImport/daZhou/trainUnload.vue

@@ -0,0 +1,47 @@
+// 火车卸货
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options"> </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      inputText: "",
+      options: {
+        // first请求数据的地址
+        requestUrl: "/api/v1/tms/getTmstrainWagonUnLoad?apiId=367&resultType=5",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl =
+        "/api/v1/tms/getTmstrainWagonUnLoad?apiId=367&resultType=5&con=" +
+        this.inputText;
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.steel_inbound {
+  .sache {
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

+ 54 - 0
src/views/inward/components/inwardImport/daZhou/truckLoad.vue

@@ -0,0 +1,54 @@
+// 汽车装货
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input placeholder="请输入内容" v-model="inputText" 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="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options"> </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      inputText: "",
+      options: {
+        // first请求数据的地址
+        requestUrl: "/api/v1/tms/getAllLoadResult?apiId=353&orderType=9",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl =
+        "/api/v1/tms/getAllLoadResult?apiId=353&orderType=9&con=" +
+        this.inputText;
+    },
+    toInsert() {
+      this.$router.push("/daZhou/addTruckLoad");
+    },
+    
+  },
+};
+</script>
+
+<style lang="scss">
+.steel_inbound {
+  .sache {
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

+ 47 - 0
src/views/inward/components/inwardImport/daZhou/unload.vue

@@ -0,0 +1,47 @@
+// 卸货作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/tms/getUnloadResult?apiId=355&orderType=9",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=355&orderType=9&con=" + this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 167 - 0
src/views/inward/components/inwardImport/daZhou/updateTrainUnload.vue

@@ -0,0 +1,167 @@
+// 修改火车卸货
+<template>
+  <div id="endMaintenance">
+    <page-title>修改铁路运费结算</page-title>
+    <div class="main">
+      <span class="text">修改</span>
+      <span class="a"></span>
+    </div>
+    <div>
+      <div class="form-box" style="margin-left: 5rem">
+        <dil-form :formId="245" v-model="form"></dil-form>
+        
+      </div>
+    </div>
+    <div class="" style="margin-left:40rem">
+      <el-button type="primary" @click="makeSure">确认修改</el-button>
+      <el-button type="primary" @click="cancel">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form: {},
+    };
+  },
+  mounted() {
+    this.information();
+  },
+  methods: {
+    information() {
+      //查看运输合同详情
+      this.$axios
+        .post("/api/v1/bms/selectTrainSettlement/" + this.$route.params.settlementId)
+        .then((res) => {
+          res.data.data.forEach((e) => {             
+            this.form = e;
+          });
+        });
+    },
+    // 修改
+    makeSure() {
+      let BmsTrainFreight = {
+        settlementId: this.$route.params.settlementId,
+        settlementDate: sjTime(this.form.settlementDate),
+        settlementDayWagons: this.form.settlementDayWagons,
+        settlementDayTonnage: this.form.settlementDayTonnage,
+        settlementDayTransportCost: this.form.settlementDayTransportCost,
+        settlementDayFloatCost: this.form.settlementDayFloatCost,
+        settlementDayMargin: this.form.settlementDayMargin,
+        settlementMonthWagons:this.form.settlementMonthWagons,
+        settlementMonthTonnage:this.form.settlementMonthTonnage,
+        settlementMonthTotalMonth:this.form.settlementMonthTotalMonth
+      };     
+      this.$axios
+        .post(
+          "/api/v1/bms/updateTrainSettlement",
+          BmsTrainFreight
+        )
+        .then((res) => {
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "修改成功!",
+            });            
+            this.$router.go(-1);
+          } else {
+            this.$message.error("修改失败!");
+          }
+        });
+    },
+    // 返回
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+#pageTitle {
+    border-bottom: 0.125rem solid $borderColorPageTitlte;
+    background-color: $backgroundColorPageTitle;
+    padding-left: 3.125rem;
+    margin-bottom: 1.875rem;
+    span {
+      font-size: 1.5rem;
+      line-height: 4.375rem;
+      color: $fontColorPageTitle;
+    }
+    i {
+      cursor: pointer;
+      border: 0.0625rem solid $fontColorPageTitle;
+      color: $fontColorPageTitle;
+      border-radius: 100%;
+      margin-right: 1.25rem;
+      // 图标放大
+      transform: scale(1.6, 1.6);
+    }
+  }
+  #query_condition{
+    margin-left: 3rem;
+  }
+  .button-box {
+    display: flex;
+    justify-content: center;
+    .el-button + .el-button {
+      margin-left: 3rem;
+    }
+  }
+  
+  .form-box {
+    display: flex;
+    margin-top: 1.25rem;
+    justify-content: center;
+    .el-form {
+      flex-direction: column;
+    }
+    
+  }
+
+  .body{
+    display: -webkit-flex;
+    display: flex;
+  }
+  .main {
+    display: flex;
+    margin-top: 1.5625rem;
+    margin-left: 1.875rem;
+    margin-bottom: 3.125rem;
+    .text {
+      margin-right: 0.625rem;
+      font-weight: 700;
+      font-size: 0.9375rem;
+    }
+    .el_text1 {
+      width: 56.875rem;
+    }
+    .a {
+      margin-top: 0.4375rem;
+      width: 80%;
+      height: 0.0625rem;
+      border-top: $gainsboro 0.0625rem solid;
+    }
+  }
+  .contractTitle{
+    margin: 0 auto;
+    text-align: center;
+  }
+  .contractId{
+    font-size: 1.25rem;
+  }
+  .form-one{
+    margin-right: 0.625rem;
+  }
+  .button-ins {
+    display: flex;
+    margin-left: 60rem;
+    margin-bottom: 1rem;
+  }
+  
+</style>

+ 167 - 0
src/views/inward/components/inwardImport/daZhou/updateTruckLoad.vue

@@ -0,0 +1,167 @@
+// 修改汽车装货
+<template>
+  <div id="endMaintenance">
+    <page-title>修改铁路运费结算</page-title>
+    <div class="main">
+      <span class="text">修改</span>
+      <span class="a"></span>
+    </div>
+    <div>
+      <div class="form-box" style="margin-left: 5rem">
+        <dil-form :formId="245" v-model="form"></dil-form>
+        
+      </div>
+    </div>
+    <div class="" style="margin-left:40rem">
+      <el-button type="primary" @click="makeSure">确认修改</el-button>
+      <el-button type="primary" @click="cancel">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form: {},
+    };
+  },
+  mounted() {
+    this.information();
+  },
+  methods: {
+    information() {
+      //查看运输合同详情
+      this.$axios
+        .post("/api/v1/bms/selectTrainSettlement/" + this.$route.params.settlementId)
+        .then((res) => {
+          res.data.data.forEach((e) => {             
+            this.form = e;
+          });
+        });
+    },
+    // 修改
+    makeSure() {
+      let BmsTrainFreight = {
+        settlementId: this.$route.params.settlementId,
+        settlementDate: sjTime(this.form.settlementDate),
+        settlementDayWagons: this.form.settlementDayWagons,
+        settlementDayTonnage: this.form.settlementDayTonnage,
+        settlementDayTransportCost: this.form.settlementDayTransportCost,
+        settlementDayFloatCost: this.form.settlementDayFloatCost,
+        settlementDayMargin: this.form.settlementDayMargin,
+        settlementMonthWagons:this.form.settlementMonthWagons,
+        settlementMonthTonnage:this.form.settlementMonthTonnage,
+        settlementMonthTotalMonth:this.form.settlementMonthTotalMonth
+      };     
+      this.$axios
+        .post(
+          "/api/v1/bms/updateTrainSettlement",
+          BmsTrainFreight
+        )
+        .then((res) => {
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "修改成功!",
+            });            
+            this.$router.go(-1);
+          } else {
+            this.$message.error("修改失败!");
+          }
+        });
+    },
+    // 返回
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+#pageTitle {
+    border-bottom: 0.125rem solid $borderColorPageTitlte;
+    background-color: $backgroundColorPageTitle;
+    padding-left: 3.125rem;
+    margin-bottom: 1.875rem;
+    span {
+      font-size: 1.5rem;
+      line-height: 4.375rem;
+      color: $fontColorPageTitle;
+    }
+    i {
+      cursor: pointer;
+      border: 0.0625rem solid $fontColorPageTitle;
+      color: $fontColorPageTitle;
+      border-radius: 100%;
+      margin-right: 1.25rem;
+      // 图标放大
+      transform: scale(1.6, 1.6);
+    }
+  }
+  #query_condition{
+    margin-left: 3rem;
+  }
+  .button-box {
+    display: flex;
+    justify-content: center;
+    .el-button + .el-button {
+      margin-left: 3rem;
+    }
+  }
+  
+  .form-box {
+    display: flex;
+    margin-top: 1.25rem;
+    justify-content: center;
+    .el-form {
+      flex-direction: column;
+    }
+    
+  }
+
+  .body{
+    display: -webkit-flex;
+    display: flex;
+  }
+  .main {
+    display: flex;
+    margin-top: 1.5625rem;
+    margin-left: 1.875rem;
+    margin-bottom: 3.125rem;
+    .text {
+      margin-right: 0.625rem;
+      font-weight: 700;
+      font-size: 0.9375rem;
+    }
+    .el_text1 {
+      width: 56.875rem;
+    }
+    .a {
+      margin-top: 0.4375rem;
+      width: 80%;
+      height: 0.0625rem;
+      border-top: $gainsboro 0.0625rem solid;
+    }
+  }
+  .contractTitle{
+    margin: 0 auto;
+    text-align: center;
+  }
+  .contractId{
+    font-size: 1.25rem;
+  }
+  .form-one{
+    margin-right: 0.625rem;
+  }
+  .button-ins {
+    display: flex;
+    margin-left: 60rem;
+    margin-bottom: 1rem;
+  }
+  
+</style>

+ 174 - 0
src/views/inward/components/inwardImport/oldAreaRailScale/addTruckLoad.vue

@@ -0,0 +1,174 @@
+// 新增汽车装货
+<template>
+  <div id="endMaintenance">
+    <page-title>新增汽车装货</page-title>
+    <div class="main">
+      <span class="text">选择运输订单</span>
+      <span class="a"></span>
+    </div>
+
+    <div class="tab">
+      <dilTable
+        v-bind.sync="option"
+        @selection-change="selectionChange"
+      ></dilTable>
+    </div>
+
+    <div>
+      <div class="form-box" style="margin-left: 5rem">
+        <dil-form :formId="343" v-model="form"></dil-form>
+      </div>
+    </div>
+
+    <div class="" style="margin-left: 40rem">
+      <el-button type="primary" @click="makeSure">确认新增</el-button>
+      <el-button type="primary" @click="cancel">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/oms/getReceiveRefuseOrder/1?apiId=117&orderType=10",
+        // 控制显示多选列
+        selectionType: "select",
+      },
+      form: {},
+      totalResultIdList: [],
+    };
+  },
+
+  created() {
+    this.form.loadTime = new Date();
+    this.form.loadingId = '老区轨道衡'
+  },
+
+  methods: {
+    selectionChange(val) {
+      this.totalResultIdList = []
+      val.forEach(e => {
+        this.totalResultIdList.push(e.resultTotalId)
+      });
+    },
+
+    // 新增
+    makeSure() {
+      let obj = {
+        totalResultIdList: this.totalResultIdList,
+        loadTime: sjTime(this.form.loadTime),
+        loadingId: 10002,
+      };
+      console.log(obj);
+      this.$axios
+        .post("/api/v1/tms/addDaZhouToDaGangLoadResult", obj)
+        .then((res) => {
+          console.log(res);
+          if (res.data.code == "200") {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败!");
+          }
+        });
+    },
+    // 返回
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+#pageTitle {
+    border-bottom: 0.125rem solid $borderColorPageTitlte;
+    background-color: $backgroundColorPageTitle;
+    padding-left: 3.125rem;
+    margin-bottom: 1.875rem;
+    span {
+      font-size: 1.5rem;
+      line-height: 4.375rem;
+      color: $fontColorPageTitle;
+    }
+    i {
+      cursor: pointer;
+      border: 0.0625rem solid $fontColorPageTitle;
+      color: $fontColorPageTitle;
+      border-radius: 100%;
+      margin-right: 1.25rem;
+      // 图标放大
+      transform: scale(1.6, 1.6);
+    }
+  }
+  #query_condition{
+    margin-left: 3rem;
+  }
+  .button-box {
+    display: flex;
+    justify-content: center;
+    .el-button + .el-button {
+      margin-left: 3rem;
+    }
+  }
+  
+  .form-box {
+    display: flex;
+    margin-top: 1.25rem;
+    justify-content: center;
+    .el-form {
+      flex-direction: column;
+    }
+    
+  }
+
+  .body{
+    display: -webkit-flex;
+    display: flex;
+  }
+  .main {
+    display: flex;
+    margin-top: 1.5625rem;
+    margin-left: 1.875rem;
+    margin-bottom: 3.125rem;
+    .text {
+      margin-right: 0.625rem;
+      font-weight: 700;
+      font-size: 0.9375rem;
+    }
+    .el_text1 {
+      width: 56.875rem;
+    }
+    .a {
+      margin-top: 0.4375rem;
+      width: 80%;
+      height: 0.0625rem;
+      border-top: $gainsboro 0.0625rem solid;
+    }
+  }
+  .contractTitle{
+    margin: 0 auto;
+    text-align: center;
+  }
+  .contractId{
+    font-size: 1.25rem;
+  }
+  .form-one{
+    margin-right: 0.625rem;
+  }
+  .button-ins {
+    display: flex;
+    margin-left: 60rem;
+    margin-bottom: 1rem;
+  }
+  
+</style>

+ 47 - 0
src/views/inward/components/inwardImport/oldAreaRailScale/grossWeightResult.vue

@@ -0,0 +1,47 @@
+// 计毛作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=354&orderType=10",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=354&orderType=10&con="+this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 47 - 0
src/views/inward/components/inwardImport/oldAreaRailScale/qualityResult.vue

@@ -0,0 +1,47 @@
+// 质检作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/tms/getQualityResult?apiId=111&orderType=10",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/tms/getQualityResult?apiId=111&orderType=10&con="+this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 47 - 0
src/views/inward/components/inwardImport/oldAreaRailScale/receipt.vue

@@ -0,0 +1,47 @@
+// 收货作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/tms/getReceiveResult?apiId=107&orderType=10",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/tms/getReceiveResult?apiId=107&orderType=10&con="+this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 47 - 0
src/views/inward/components/inwardImport/oldAreaRailScale/tareWeightResult.vue

@@ -0,0 +1,47 @@
+// 计皮作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=104&orderType=10",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=104&orderType=10&con="+this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 47 - 0
src/views/inward/components/inwardImport/oldAreaRailScale/trainLineUnload.vue

@@ -0,0 +1,47 @@
+// 铁路专线卸货
+<template>
+  <div class="sale">
+    <div class="top">
+      <!-- 框计算 -->
+      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      </el-input>
+      <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>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      inputText: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getTmstrainWagonUnLoad?apiId=367&resultType=6",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl =
+        "/api/v1/tms/getTmstrainWagonUnLoad?apiId=367&resultType=6&con=" +
+        this.inputText;
+    },
+  },
+};
+</script>
+<style lang="scss">
+.sale {
+  .top {
+    width: 100%;
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 2.5rem;
+  }
+}
+</style>

+ 53 - 0
src/views/inward/components/inwardImport/oldAreaRailScale/truckLoad.vue

@@ -0,0 +1,53 @@
+// 装车作业
+<template>
+  <div class="sale">
+    <div class="top">
+      <!-- 框计算 -->
+      <el-input placeholder="请输入内容" v-model="inputText" 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="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="tab">
+      <dilTable v-bind.sync="option"></dilTable>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      inputText: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllLoadResult?apiId=353&orderType=10",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl =
+        "/api/v1/tms/getAllLoadResult?apiId=353&orderType=10&con=" +
+        this.inputText;
+    },
+    toInsert() {
+      this.$router.push("/oldAreaRailScale/addTruckLoad");
+    },
+  },
+};
+</script>
+<style lang="scss">
+.sale {
+  .top {
+    width: 100%;
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 2.5rem;
+  }
+}
+</style>

+ 47 - 0
src/views/inward/components/inwardImport/oldAreaRailScale/unload.vue

@@ -0,0 +1,47 @@
+// 卸货作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/tms/getUnloadResult?apiId=356&orderType=10",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=356&orderType=10&con="+this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 199 - 0
src/views/inward/components/offsetSteel/truckTrain/addApproveWagonPlease.vue

@@ -0,0 +1,199 @@
+<template>
+  <!-- 新增批车作业页面 -->
+  <div id="contractDetails">
+    <page-title>批车作业</page-title>
+
+    <div class="main">
+      <span class="text">选择已下发请车作业</span>
+      <span class="a"></span>
+    </div>
+    <div>
+      <dilTable
+        v-bind.sync="option"
+        v-model="table1"
+        @change="handleCheckedCitiesChange"
+        ref="table"
+        @radio-change="currentRadioChange"
+      >
+      </dilTable>
+    </div>
+    <div class="main">
+      <span class="text">新增批车作业</span>
+      <span class="a"></span>
+    </div>
+
+    <div class="contractTitle">
+      <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="105" v-model="form1"></dil-form>
+        </div>
+      </div>
+    </div>
+    <div class="button-box">
+      <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      option: {
+        // 表格请求数据的地址
+        requestUrl:
+          "/api/v1/tms/getAllWagonPlease?apiId=253&status=1&resultType=4",
+        // 控制显示当选列
+        selectionType: "radio",
+      },
+      // 表单
+      form1: {},
+      // 表格
+      table1: {},
+      contractId: "",
+      inf: {},
+    };
+  },
+  mounted() {
+    // this.unit();
+  },
+  created(){
+      this.form1.resultApproveDate = new Date();
+  },
+  methods: {
+    handleCheckedCitiesChange(value) {
+      console.log(value);
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    currentRadioChange(row) {
+      this.inf = row;
+    },
+    // 确认
+    onClickConfirm() {
+      let approveWagonPlease = {
+        resultId: this.inf.resultId,
+        resultApproveDate: sjTime(this.form1.resultApproveDate),
+        resultApproveNumber: this.form1.resultApproveNumber,
+      };
+      function isNumber() {
+        var value = approveWagonPlease.resultApproveNumber;
+        //验证是否为数字
+        var patrn = /^(-)?\d+(\.\d+)?$/;
+        if (patrn.exec(value) == null || value == "") {
+          return false;
+        } else {
+          return true;
+        }
+      }
+      var val = this.value;
+      if (
+        approveWagonPlease.resultId == null ||
+        approveWagonPlease.resultApproveDate == null ||
+        approveWagonPlease.resultApproveNumber == null
+      )
+        this.$message.error("存在空值!");
+      else if (!isNumber(val)) this.$message.error("请车数量必须是数字!");
+      else
+        this.$axios
+          .post("/api/v1/tms/addApproveWagonPlease", approveWagonPlease)
+          .then(() => {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            this.$router.go(-1);
+          });
+    },
+  },
+};
+</script>
+<style lang="scss">
+#pageTitle {
+    border-bottom: 0.125rem solid $borderColorPageTitlte;
+    background-color: $backgroundColorPageTitle;
+    padding-left: 3.125rem;
+    margin-bottom: 1.875rem;
+    span {
+      font-size: 1.5rem;
+      line-height: 4.375rem;
+      color: $fontColorPageTitle;
+    }
+    i {
+      cursor: pointer;
+      border: 0.0625rem solid $fontColorPageTitle;
+      color: $fontColorPageTitle;
+      border-radius: 100%;
+      margin-right: 1.25rem;
+      // 图标放大
+      transform: scale(1.6, 1.6);
+    }
+  }
+  #query_condition{
+    margin-left: 3rem;
+  }
+  .button-box {
+    display: flex;
+    justify-content: center;
+    .el-button + .el-button {
+      margin-left: 3rem;
+    }
+  }
+  
+  .form-box {
+    display: flex;
+    margin-top: 1.25rem;
+    justify-content: center;
+    .el-form {
+      flex-direction: column;
+    }
+    
+  }
+
+  .body{
+    display: -webkit-flex;
+    display: flex;
+  }
+  .main {
+    display: flex;
+    margin-top: 1.5625rem;
+    margin-left: 1.875rem;
+    margin-bottom: 3.125rem;
+    .text {
+      margin-right: 0.625rem;
+      font-weight: 700;
+      font-size: 0.9375rem;
+    }
+    .el_text1 {
+      width: 56.875rem;
+    }
+    .a {
+      margin-top: 0.4375rem;
+      width: 80%;
+      height: 0.0625rem;
+      border-top: $gainsboro 0.0625rem solid;
+    }
+  }
+  .contractTitle{
+    margin: 0 auto;
+    text-align: center;
+  }
+  .contractId{
+    font-size: 1.25rem;
+  }
+  .form-one{
+    margin-right: 0.625rem;
+  }
+  .button-ins {
+    display: flex;
+    margin-left: 60rem;
+    margin-bottom: 1rem;
+  }
+  
+</style>

+ 165 - 0
src/views/inward/components/offsetSteel/truckTrain/addWagonLoad.vue

@@ -0,0 +1,165 @@
+<template>
+  <!-- 添加车皮装车实绩 -->
+  <div class="addWagonLoad">
+    <page-title>新增</page-title>
+    <el-divider content-position="left">车皮装车实绩</el-divider>
+     <div class="form-box" style="margin-right: 10rem">
+        <dil-form :formId="102" v-model="form1" ref="from1"></dil-form>
+      </div>
+    <div class="button-box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+    <!-- <div class="primarybtn">
+      <el-button class="btn" @click="goback">取消</el-button>
+      <el-button type="primary" class="btn" @click="submitclick"
+        >确定</el-button
+      >
+    </div> -->
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+      value: undefined,
+    };
+  },
+  mounted() {},
+  methods: {
+    // 确定
+    makeSure() {
+      let tmstrainLoadingResult = {
+        resultWagonNo: this.form1.resultWagonNo,
+        resultBillableTonnage: this.form1.resultBillableTonnage,
+        resultIsclear: this.form1.resultIsclear,
+        resultClass: this.form1.resultClass,
+        sendStationId: this.form1.sendStationId,
+        arrivalStationId: this.form1.arrivalStationId,
+        resultLoadingDate: sjTime(this.form1.resultLoadingDate),
+        batchId: this.form1.batchId,
+        capacityId: this.form1.capacityId,
+        resultMaterialNumber: this.form1.resultMaterialNumber,
+        resultMaterialTheoryweight: this.form1.resultMaterialTheoryweight,
+        resultRemarks: this.form1.resultRemarks
+      };
+      console.log(tmstrainLoadingResult);
+      if (tmstrainLoadingResult.resultWagonNo==null||
+      tmstrainLoadingResult.resultBillableTonnage==null||
+      tmstrainLoadingResult.resultIsclear==null||
+      tmstrainLoadingResult.resultClass==null||
+      tmstrainLoadingResult.sendStationId==null||
+      tmstrainLoadingResult.arrivalStationId==null||
+      tmstrainLoadingResult.resultLoadingDate==null||
+      tmstrainLoadingResult.batchId==null
+      
+      ) this.$message.error("必填项存在空值!");
+      else
+      this.$axios
+        .post(
+          "/api/v1/tms/insertTmstrainLoadingResult",
+          tmstrainLoadingResult
+        )
+         .then(() => {
+          this.$message({
+            type: "success",  
+            message: "新增成功!",
+          });
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss'>
+#pageTitle {
+    border-bottom: 0.125rem solid $borderColorPageTitlte;
+    background-color: $backgroundColorPageTitle;
+    padding-left: 3.125rem;
+    margin-bottom: 1.875rem;
+    span {
+      font-size: 1.5rem;
+      line-height: 4.375rem;
+      color: $fontColorPageTitle;
+    }
+    i {
+      cursor: pointer;
+      border: 0.0625rem solid $fontColorPageTitle;
+      color: $fontColorPageTitle;
+      border-radius: 100%;
+      margin-right: 1.25rem;
+      // 图标放大
+      transform: scale(1.6, 1.6);
+    }
+  }
+  #query_condition{
+    margin-left: 3rem;
+  }
+  .button-box {
+    display: flex;
+    justify-content: center;
+    .el-button + .el-button {
+      margin-left: 3rem;
+    }
+  }
+  
+  .form-box {
+    display: flex;
+    margin-top: 1.25rem;
+    justify-content: center;
+    .el-form {
+      flex-direction: column;
+    }
+    
+  }
+
+  .body{
+    display: -webkit-flex;
+    display: flex;
+  }
+  .main {
+    display: flex;
+    margin-top: 1.5625rem;
+    margin-left: 1.875rem;
+    margin-bottom: 3.125rem;
+    .text {
+      margin-right: 0.625rem;
+      font-weight: 700;
+      font-size: 0.9375rem;
+    }
+    .el_text1 {
+      width: 56.875rem;
+    }
+    .a {
+      margin-top: 0.4375rem;
+      width: 80%;
+      height: 0.0625rem;
+      border-top: $gainsboro 0.0625rem solid;
+    }
+  }
+  .contractTitle{
+    margin: 0 auto;
+    text-align: center;
+  }
+  .contractId{
+    font-size: 1.25rem;
+  }
+  .form-one{
+    margin-right: 0.625rem;
+  }
+  .button-ins {
+    display: flex;
+    margin-left: 60rem;
+    margin-bottom: 1rem;
+  }
+  
+</style>

+ 173 - 0
src/views/inward/components/offsetSteel/truckTrain/addWagonPlease.vue

@@ -0,0 +1,173 @@
+<template>
+  <!-- 新增请作业页面 -->
+  <div id="contractDetails">
+    <page-title>请车作业</page-title>
+    <div class="main">
+      <span class="text">新增请车作业</span>
+      <span class="a"></span>
+    </div>
+    <div class="contractTitle">
+      <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="302" v-model="form1"></dil-form>
+        </div>
+      </div>
+    </div>
+    <div class="button-box">
+      <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      // 表单
+      form1: {},
+    };
+  },
+  mounted() {
+    // this.unit();
+  },
+  created(){
+      this.form1.resultPleaseDate = new Date();
+  },
+  methods: {
+    handleCheckedCitiesChange(value) {
+      console.log(value);
+    },
+
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      let tmstrainPleaseApproveResult = {
+        resultPleaseDate: sjTime(this.form1.resultPleaseDate),
+        resultPleaseNumber: this.form1.resultPleaseNumber,
+        railPlanId: this.form1.railPlanId,
+      };
+      console.log(tmstrainPleaseApproveResult);
+      function isNumber() {
+        var value = tmstrainPleaseApproveResult.resultPleaseNumber;
+        //验证是否为数字
+        var patrn = /^(-)?\d+(\.\d+)?$/;
+        if (patrn.exec(value) == null || value == "") {
+          return false;
+        } else {
+          return true;
+        }
+      }
+      var val = this.value;
+      if (
+        tmstrainPleaseApproveResult.resultPleaseDate == null ||
+        tmstrainPleaseApproveResult.resultPleaseNumber == null ||
+        tmstrainPleaseApproveResult.railPlanId == null
+      )
+        this.$message.error("存在空值!");
+      else if (!isNumber(val)) this.$message.error("请车数量必须是数字!");
+      else
+        this.$axios
+          .post("/api/v1/tms/addWagonPleaseForNZ", tmstrainPleaseApproveResult)
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$message({
+                type: "success",
+                message: "新增成功!",
+              });
+              this.$router.go(-1);
+            }
+          });
+    },
+  },
+};
+</script>
+<style lang="scss">
+#pageTitle {
+    border-bottom: 0.125rem solid $borderColorPageTitlte;
+    background-color: $backgroundColorPageTitle;
+    padding-left: 3.125rem;
+    margin-bottom: 1.875rem;
+    span {
+      font-size: 1.5rem;
+      line-height: 4.375rem;
+      color: $fontColorPageTitle;
+    }
+    i {
+      cursor: pointer;
+      border: 0.0625rem solid $fontColorPageTitle;
+      color: $fontColorPageTitle;
+      border-radius: 100%;
+      margin-right: 1.25rem;
+      // 图标放大
+      transform: scale(1.6, 1.6);
+    }
+  }
+  #query_condition{
+    margin-left: 3rem;
+  }
+  .button-box {
+    display: flex;
+    justify-content: center;
+    .el-button + .el-button {
+      margin-left: 3rem;
+    }
+  }
+  
+  .form-box {
+    display: flex;
+    margin-top: 1.25rem;
+    justify-content: center;
+    .el-form {
+      flex-direction: column;
+    }
+    
+  }
+
+  .body{
+    display: -webkit-flex;
+    display: flex;
+  }
+  .main {
+    display: flex;
+    margin-top: 1.5625rem;
+    margin-left: 1.875rem;
+    margin-bottom: 3.125rem;
+    .text {
+      margin-right: 0.625rem;
+      font-weight: 700;
+      font-size: 0.9375rem;
+    }
+    .el_text1 {
+      width: 56.875rem;
+    }
+    .a {
+      margin-top: 0.4375rem;
+      width: 80%;
+      height: 0.0625rem;
+      border-top: $gainsboro 0.0625rem solid;
+    }
+  }
+  .contractTitle{
+    margin: 0 auto;
+    text-align: center;
+  }
+  .contractId{
+    font-size: 1.25rem;
+  }
+  .form-one{
+    margin-right: 0.625rem;
+  }
+  .button-ins {
+    display: flex;
+    margin-left: 60rem;
+    margin-bottom: 1rem;
+  }
+  
+</style>

+ 162 - 0
src/views/inward/components/offsetSteel/truckTrain/addWagonUnLoad.vue

@@ -0,0 +1,162 @@
+<template>
+  <!-- 添加车皮卸车实绩 -->
+  <div class="addWagonLoad">
+    <page-title>新增</page-title>
+    <el-divider content-position="left">车皮卸车实绩</el-divider>
+     <div class="form-box" style="margin-right: 10rem">
+        <dil-form :formId="116" v-model="form1" ref="from1"></dil-form>
+      </div>
+    <div class="button-box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+    <!-- <div class="primarybtn">
+      <el-button class="btn" @click="goback">取消</el-button>
+      <el-button type="primary" class="btn" @click="submitclick"
+        >确定</el-button
+      >
+    </div> -->
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+      value: undefined,
+    };
+  },
+  mounted() {},
+  methods: {
+    // 确定
+    makeSure() {
+      let tmstrainWagonUnloadResult = {
+        resultWagonNo: this.form1.resultWagonNo,
+        resultArrivalDate: sjTime(this.form1.resultArrivalDate),
+        resultUnloadTime: sjTime(this.form1.resultUnloadTime),
+        unloadingPointId: this.form1.unloadingPointId,
+        resultBigTicketWeight: this.form1.resultBigTicketWeight,
+        resultRailHorizontalWeight: this.form1.resultRailHorizontalWeight,
+        resultRemark: this.form1.resultRemark
+      };
+      console.log(tmstrainWagonUnloadResult);
+      if (tmstrainWagonUnloadResult.resultWagonNo==null
+      ||tmstrainWagonUnloadResult.resultArrivalDate==null||
+      tmstrainWagonUnloadResult.resultUnloadTime==null||
+      tmstrainWagonUnloadResult.unloadingPointId==null||
+      tmstrainWagonUnloadResult.resultBigTicketWeight==null||
+      tmstrainWagonUnloadResult.resultRailHorizontalWeight==null||
+      tmstrainWagonUnloadResult.resultRemark==null
+      ) this.$message.error("存在空值!");
+      else
+      this.$axios
+        .post(
+          "/api/v1/tms/insertTmstrainWagonUnLoadResult",
+          tmstrainWagonUnloadResult
+        )
+        .then(() => {
+          this.$message({
+            type: "success",  
+            message: "新增成功!",
+          });
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss'>
+
+.addWagonLoad{
+    .cp{
+      width: 100%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      padding-top: 0.625rem;
+      padding-bottom: 0.625rem;
+      .cp_title{
+        .cp_top{
+          width: 3.125rem;
+          padding-right: 1.25rem;
+        }
+      }
+    }
+    .cpList{
+      display: flex;
+      justify-content: center;
+      width: 100%;height: 10rem;
+      .list{
+        width: 45%;
+        border: #000 0.0625rem solid;
+        padding: 0.625rem;
+        display: flex;
+        flex-wrap: wrap;
+        .cpList1{
+          background-color: #c9c7c7;
+          height: 1.875rem;
+          margin-right: 0.5rem;
+          padding: 0.625rem;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          position: relative;
+          .itu{
+            position: absolute;
+            top:-0.125rem;
+            right: 0.0625rem;
+            width: 0.625rem;height: 0.625rem;
+          }
+        }
+      }
+    }
+    .material{
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 3.75rem;
+      .text{
+        text-align: right;
+        width: 8.125rem;
+      }
+    }
+    .forwardingUnit{
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 3.75rem;
+      .text{
+        text-align: right;
+        width: 8.125rem;
+      }
+    }
+    .remark{
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 3.75rem;
+      .text{
+        text-align: right;
+        width: 60px;
+      }
+    }
+    .form{
+      margin-top: 1.25rem;
+      display: flex;
+      justify-content: center;
+      padding-left: 9.375rem;
+    }
+    .button-box{
+      display: flex;
+      justify-content: center;
+    }
+  }
+</style>

+ 172 - 0
src/views/inward/components/offsetSteel/truckTrain/editApproveWagonPlease.vue

@@ -0,0 +1,172 @@
+<template>
+  <!-- 修改批车作业页面 -->
+  <div id="contractDetails">
+    <page-title>批车作业</page-title>
+    <div class="main">
+      <span class="text">修改批车作业</span>
+      <span class="a"></span>
+    </div>
+    <div class="contractTitle">
+      <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="304" v-model="form1"></dil-form>
+        </div>
+      </div>
+    </div>  
+ 
+    <div class="button-box">
+      <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+export default {
+  components: { PageTitle },
+    data(){
+          return {
+          form1: {},
+        }
+    },
+  mounted() {
+    this.information();
+  },
+  methods: {
+    information() {
+      //编辑批车作业 渲染数据
+      this.$axios
+        .post("/api/v1/tms/getWagonPleaseById/" + this.$route.params.resultId)
+        .then((res) => {
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+          });
+        });
+    },
+     // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      let approveWagonPlease = {
+        resultId: this.$route.params.resultId,
+        resultApproveDate: this.form1.resultApproveDate,
+        resultApproveNumber: this.form1.resultApproveNumber
+      };
+      function isNumber() {
+        var value = approveWagonPlease.resultApproveNumber;
+        //验证是否为数字
+        var patrn = /^(-)?\d+(\.\d+)?$/;
+        if (patrn.exec(value) == null || value == "") {
+          return false;
+        } else {
+          return true;
+        }
+      }
+      var val = this.value;
+      if (
+        approveWagonPlease.resultId == null ||        
+        approveWagonPlease.resultApproveDate==null||
+        approveWagonPlease.resultApproveNumber==null
+      ) this.$message.error("存在空值!");
+      else
+      if (!isNumber(val)) this.$message.error("请车数必须是数字!");
+      else
+      this.$axios
+        .post("/api/v1/tms/updateApproveWagonPlease", approveWagonPlease)
+        .then(() => {
+          this.$message({
+            type: "success",  
+            message: "修改成功!",
+          });
+          this.$router.go(-1);
+        });
+    },
+  },
+};
+</script>
+<style lang="scss">
+#pageTitle {
+    border-bottom: 0.125rem solid $borderColorPageTitlte;
+    background-color: $backgroundColorPageTitle;
+    padding-left: 3.125rem;
+    margin-bottom: 1.875rem;
+    span {
+      font-size: 1.5rem;
+      line-height: 4.375rem;
+      color: $fontColorPageTitle;
+    }
+    i {
+      cursor: pointer;
+      border: 0.0625rem solid $fontColorPageTitle;
+      color: $fontColorPageTitle;
+      border-radius: 100%;
+      margin-right: 1.25rem;
+      // 图标放大
+      transform: scale(1.6, 1.6);
+    }
+  }
+  #query_condition{
+    margin-left: 3rem;
+  }
+  .button-box {
+    display: flex;
+    justify-content: center;
+    .el-button + .el-button {
+      margin-left: 3rem;
+    }
+  }
+  
+  .form-box {
+    display: flex;
+    margin-top: 1.25rem;
+    justify-content: center;
+    .el-form {
+      flex-direction: column;
+    }
+    
+  }
+
+  .body{
+    display: -webkit-flex;
+    display: flex;
+  }
+  .main {
+    display: flex;
+    margin-top: 1.5625rem;
+    margin-left: 1.875rem;
+    margin-bottom: 3.125rem;
+    .text {
+      margin-right: 0.625rem;
+      font-weight: 700;
+      font-size: 0.9375rem;
+    }
+    .el_text1 {
+      width: 56.875rem;
+    }
+    .a {
+      margin-top: 0.4375rem;
+      width: 80%;
+      height: 0.0625rem;
+      border-top: $gainsboro 0.0625rem solid;
+    }
+  }
+  .contractTitle{
+    margin: 0 auto;
+    text-align: center;
+  }
+  .contractId{
+    font-size: 1.25rem;
+  }
+  .form-one{
+    margin-right: 0.625rem;
+  }
+  .button-ins {
+    display: flex;
+    margin-left: 60rem;
+    margin-bottom: 1rem;
+  }
+  
+</style>

+ 189 - 0
src/views/inward/components/offsetSteel/truckTrain/editWagonLoad.vue

@@ -0,0 +1,189 @@
+<template>
+  <!-- 修改车皮装车实绩 -->
+  <div id="contractDetails">
+    <page-title>编辑</page-title>
+    <div class="main">
+      <span class="text">车皮装车实绩</span>
+      <span class="a"></span>
+    </div>
+    <div class="contractTitle">
+      <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="103" v-model="form1"></dil-form>
+        </div>
+      </div>
+    </div>
+
+    <div class="button-box">
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+      <el-button @click="onClickCancel">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: { PageTitle },
+ data(){
+     return {
+      form1: {},
+  }
+ },
+  mounted() {
+    this.information();
+  },
+  methods: {
+    information() {
+      //编辑车皮装车作业
+      this.$axios
+        .post("/api/v1/tms/getTmstrainLoadingResultByResultId/" + this.$route.params.resultId)
+        .then((res) => {
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            console.log(e);
+            console.log(this.form1);
+            console.log(this.$route.params.resultId);
+          });
+        });
+    },
+    handleCheckedCitiesChange(value) {
+      console.log(value);
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    currentRadioChange(row) {
+      this.aaaa = row;
+    },
+    // 确认
+    onClickConfirm() {
+      let tmstrainLoadingResult = {
+        resultId: this.$route.params.resultId,
+        resultWagonNo: this.form1.resultWagonNo,
+        resultBillableTonnage: this.form1.resultBillableTonnage,
+        resultIsclear: this.form1.resultIsclear,
+        resultClass: this.form1.resultClass,
+        sendStationId: this.form1.sendStationId,
+        arrivalStationId: this.form1.arrivalStationId,
+        resultLoadingDate: sjTime(this.form1.resultLoadingDate),
+        batchId: this.form1.batchId,
+        capacityId: this.form1.capacityId,
+        resultMaterialNumber: this.form1.resultMaterialNumber,
+        resultMaterialTheoryweight: this.form1.resultMaterialTheoryweight,
+        resultRemarks: this.form1.resultRemarks
+      };
+      if (
+      tmstrainLoadingResult.resultWagonNo==null||
+      tmstrainLoadingResult.resultBillableTonnage==null||
+      tmstrainLoadingResult.resultIsclear==null||
+      tmstrainLoadingResult.resultClass==null||
+      tmstrainLoadingResult.sendStationId==null||
+      tmstrainLoadingResult.arrivalStationId==null||
+      tmstrainLoadingResult.resultLoadingDate==null||
+      tmstrainLoadingResult.batchId==null||
+      tmstrainLoadingResult.resultRemarks==null
+      ) this.$message.error("必填项存在空值!");
+      else
+      this.$axios
+        .post("/api/v1/tms/upadteTmstrainLoadingResultByResultId",tmstrainLoadingResult)
+        .then(() => {
+          this.$message({
+            type: "success",  
+            message: "修改成功!",
+          });
+          this.$router.go(-1);
+        });
+    },
+  },
+};
+</script>
+<style lang="scss">
+
+.addWagonLoad{
+    .cp{
+      width: 100%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      padding-top: 0.625rem;
+      padding-bottom: 0.625rem;
+      .cp_title{
+        .cp_top{
+          width: 3.125rem;
+          padding-right: 1.25rem;
+        }
+      }
+    }
+    .cpList{
+      display: flex;
+      justify-content: center;
+      width: 100%;height: 10rem;
+      .list{
+        width: 45%;
+        border: #000 0.0625rem solid;
+        padding: 0.625rem;
+        display: flex;
+        flex-wrap: wrap;
+        .cpList1{
+          background-color: #c9c7c7;
+          height: 1.875rem;
+          margin-right: 0.5rem;
+          padding: 0.625rem;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          position: relative;
+          .itu{
+            position: absolute;
+            top:-0.125rem;
+            right: 0.0625rem;
+            width: 0.625rem;height: 0.625rem;
+          }
+        }
+      }
+    }
+    .material{
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 3.75rem;
+      .text{
+        text-align: right;
+        width: 8.125rem;
+      }
+    }
+    .forwardingUnit{
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 3.75rem;
+      .text{
+        text-align: right;
+        width: 8.125rem;
+      }
+    }
+    .remark{
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 3.75rem;
+      .text{
+        text-align: right;
+        width: 60px;
+      }
+    }
+    .form{
+      margin-top: 1.25rem;
+      display: flex;
+      justify-content: center;
+      padding-left: 9.375rem;
+    }
+    .button-box{
+      display: flex;
+      justify-content: center;
+    }
+  }
+</style>

+ 178 - 0
src/views/inward/components/offsetSteel/truckTrain/editWagonPlease.vue

@@ -0,0 +1,178 @@
+<template>
+  <!-- 修改请车作业页面 -->
+  <div id="contractDetails">
+    <page-title>请车作业</page-title>
+    <div class="main">
+      <span class="text">修改请车作业</span>
+      <span class="a"></span>
+    </div>
+    <div class="contractTitle">
+      <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="303" v-model="form1"></dil-form>
+        </div>
+      </div>
+    </div>
+
+    <div class="button-box">
+      <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+    };
+  },
+  mounted() {
+    this.information();
+  },
+  methods: {
+    information() {
+      //编辑请车作业
+      this.$axios
+        .post("/api/v1/tms/getWagonPleaseById/" + this.$route.params.resultId)
+        .then((res) => {
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      let tmstrainPleaseApproveResult = {
+        resultId: this.$route.params.resultId,
+        resultPleaseNumber: this.form1.resultPleaseNumber,
+        resultPleaseDate: sjTime(this.form1.resultPleaseDate),
+      };
+      function isNumber() {
+        var value = tmstrainPleaseApproveResult.resultPleaseNumber;
+        //验证是否为数字
+        var patrn = /^(-)?\d+(\.\d+)?$/;
+        if (patrn.exec(value) == null || value == "") {
+          return false;
+        } else {
+          return true;
+        }
+      }
+      var val = this.value;
+      if (
+        tmstrainPleaseApproveResult.resultId == null ||
+        tmstrainPleaseApproveResult.resultPleaseNumber == null ||
+        tmstrainPleaseApproveResult.resultPleaseDate == null
+      )
+        this.$message.error("存在空值!");
+      else if (!isNumber(val)) this.$message.error("请车数必须是数字!");
+      else
+        this.$axios
+          .post(
+            "/api/v1/tms/updateApproveWagonPlease",
+            tmstrainPleaseApproveResult
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$message({
+                type: "success",
+                message: "修改成功!",
+              });
+            }
+            this.$router.go(-1);
+          });
+    },
+  },
+};
+</script>
+<style lang="scss">
+#pageTitle {
+    border-bottom: 0.125rem solid $borderColorPageTitlte;
+    background-color: $backgroundColorPageTitle;
+    padding-left: 3.125rem;
+    margin-bottom: 1.875rem;
+    span {
+      font-size: 1.5rem;
+      line-height: 4.375rem;
+      color: $fontColorPageTitle;
+    }
+    i {
+      cursor: pointer;
+      border: 0.0625rem solid $fontColorPageTitle;
+      color: $fontColorPageTitle;
+      border-radius: 100%;
+      margin-right: 1.25rem;
+      // 图标放大
+      transform: scale(1.6, 1.6);
+    }
+  }
+  #query_condition{
+    margin-left: 3rem;
+  }
+  .button-box {
+    display: flex;
+    justify-content: center;
+    .el-button + .el-button {
+      margin-left: 3rem;
+    }
+  }
+  
+  .form-box {
+    display: flex;
+    margin-top: 1.25rem;
+    justify-content: center;
+    .el-form {
+      flex-direction: column;
+    }
+    
+  }
+
+  .body{
+    display: -webkit-flex;
+    display: flex;
+  }
+  .main {
+    display: flex;
+    margin-top: 1.5625rem;
+    margin-left: 1.875rem;
+    margin-bottom: 3.125rem;
+    .text {
+      margin-right: 0.625rem;
+      font-weight: 700;
+      font-size: 0.9375rem;
+    }
+    .el_text1 {
+      width: 56.875rem;
+    }
+    .a {
+      margin-top: 0.4375rem;
+      width: 80%;
+      height: 0.0625rem;
+      border-top: $gainsboro 0.0625rem solid;
+    }
+  }
+  .contractTitle{
+    margin: 0 auto;
+    text-align: center;
+  }
+  .contractId{
+    font-size: 1.25rem;
+  }
+  .form-one{
+    margin-right: 0.625rem;
+  }
+  .button-ins {
+    display: flex;
+    margin-left: 60rem;
+    margin-bottom: 1rem;
+  }
+  
+</style>

+ 184 - 0
src/views/inward/components/offsetSteel/truckTrain/editWagonUnLoad.vue

@@ -0,0 +1,184 @@
+<template>
+  <!-- 修改车皮装车实绩 -->
+  <div id="contractDetails">
+    <page-title>编辑</page-title>
+    <div class="main">
+      <span class="text">车皮卸车实绩</span>
+      <span class="a"></span>
+    </div>
+    <div class="contractTitle">
+      <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="118" v-model="form1"></dil-form>
+        </div>
+      </div>
+    </div>
+      
+    <div class="button-box">
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+      <el-button @click="onClickCancel">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: { PageTitle },
+ data(){
+     return {
+      form1: {},
+  }
+ },
+  mounted() {
+    this.information();
+  },
+  methods: {
+    information() {
+      //编辑车皮装车作业
+      this.$axios
+        .post("/api/v1/tms/getTmstrainWagonUnLoadResultByUnLoadingId/" + this.$route.params.unloadingId)
+        .then((res) => {
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            console.log(e);
+            console.log(this.form1);
+            console.log(this.$route.params.unloadingId);
+          });
+        });
+    },
+    handleCheckedCitiesChange(value) {
+      console.log(value);
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    currentRadioChange(row) {
+      this.aaaa = row;
+    },
+    //确定
+    onClickConfirm() {
+      let tmstrainWagonUnloadResult = {
+        unloadingId: this.$route.params.unloadingId,
+        resultWagonNo: this.form1.resultWagonNo,
+        resultArrivalDate: sjTime(this.form1.resultArrivalDate),
+        resultUnloadTime: sjTime(this.form1.resultUnloadTime),
+        unloadingPointId: this.form1.unloadingPointId,
+        resultBigTicketWeight: this.form1.resultBigTicketWeight,
+        resultRailHorizontalWeight: this.form1.resultRailHorizontalWeight,
+        resultRemark: this.form1.resultRemark
+      };
+      console.log(tmstrainWagonUnloadResult);
+      if (tmstrainWagonUnloadResult.resultWagonNo==null
+      ||tmstrainWagonUnloadResult.resultArrivalDate==null||
+      tmstrainWagonUnloadResult.resultUnloadTime==null||
+      tmstrainWagonUnloadResult.unloadingPointId==null||
+      tmstrainWagonUnloadResult.resultBigTicketWeight==null||
+      tmstrainWagonUnloadResult.resultRailHorizontalWeight==null
+      ) this.$message.error("存在空值!");
+      else
+      this.$axios
+        .post(
+          "/api/v1/tms/upadteTmstrainWagonUnLoadResultByUnLoadingId",
+          tmstrainWagonUnloadResult
+        )
+       .then(() => {
+          this.$message({
+            type: "success",  
+            message: "修改成功!",
+          });
+          this.$router.go(-1);
+        });
+    },
+  },
+};
+</script>
+<style lang="scss">
+
+.addWagonLoad{
+    .cp{
+      width: 100%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      padding-top: 0.625rem;
+      padding-bottom: 0.625rem;
+      .cp_title{
+        .cp_top{
+          width: 3.125rem;
+          padding-right: 1.25rem;
+        }
+      }
+    }
+    .cpList{
+      display: flex;
+      justify-content: center;
+      width: 100%;height: 10rem;
+      .list{
+        width: 45%;
+        border: #000 0.0625rem solid;
+        padding: 0.625rem;
+        display: flex;
+        flex-wrap: wrap;
+        .cpList1{
+          background-color: #c9c7c7;
+          height: 1.875rem;
+          margin-right: 0.5rem;
+          padding: 0.625rem;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          position: relative;
+          .itu{
+            position: absolute;
+            top:-0.125rem;
+            right: 0.0625rem;
+            width: 0.625rem;height: 0.625rem;
+          }
+        }
+      }
+    }
+    .material{
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 3.75rem;
+      .text{
+        text-align: right;
+        width: 8.125rem;
+      }
+    }
+    .forwardingUnit{
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 3.75rem;
+      .text{
+        text-align: right;
+        width: 8.125rem;
+      }
+    }
+    .remark{
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 3.75rem;
+      .text{
+        text-align: right;
+        width: 60px;
+      }
+    }
+    .form{
+      margin-top: 1.25rem;
+      display: flex;
+      justify-content: center;
+      padding-left: 9.375rem;
+    }
+    .button-box{
+      display: flex;
+      justify-content: center;
+    }
+  }
+</style>

+ 66 - 0
src/views/inward/components/offsetSteel/truckTrain/wagonApprove.vue

@@ -0,0 +1,66 @@
+<template>
+  <!-- 批车作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="btnclick">
+        <i class="el-icon-plus"></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 {
+      inputText: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl:
+          "/api/v1/tms/getApproveAllWagonPlease?apiId=254&status=2&resultType=4",
+      },
+    };
+  },
+
+  methods: {
+    onclick() {
+      this.option.requestUrl =
+        "/api/v1/tms/getApproveAllWagonPlease?apiId=254&status=2&resultType=4&con=" + this.inputText;
+    },
+
+    btnclick() {
+      this.$router.push("/truckTrain/addApproveWagonPlease");
+    },
+    updateClick(resultId) {
+      this.$router.push("/truckTrain/editApproveWagonPlease/" + resultId);
+    },
+  },
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 134 - 0
src/views/inward/components/offsetSteel/truckTrain/wagonLoad.vue

@@ -0,0 +1,134 @@
+<template>
+  <!-- 装车作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="inputText" 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" ref="table">
+      <el-table-column fixed="right" label="操作" align="center" width="100">
+        <template slot-scope="scope">
+          <el-button @click="detailclick(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>
+              <dilTable v-bind.sync="option1"></dilTable>
+            </div>
+          </el-form>
+        </template>
+      </el-table-column>
+    </dilTable>
+  </div>
+</template>
+
+
+<script>
+export default {
+  name: "wagonload",
+  data() {
+    return {
+      inputText: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getTmstrainWagonLoad?apiId=203&resultType=4",
+      },
+      //记录旧的row对象
+      oldRow: "",
+      //记录上一个展开的点击次数,单数为展开状态,复数为闭合状态
+      oldRowCount: 1,
+      option1: {
+        requestUrl: "",
+      },
+    };
+  },
+
+  methods: {
+    // 查看物资详情
+    detailclick(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.resultId);
+    },
+    getMaterial(resultId) {
+      this.option1.requestUrl =
+        "/api/v1/tms/getMaterialAndCarByLoadingId?apiId=259&loadingId=" + resultId;
+    },
+    onclick() {
+      this.option.requestUrl =
+        "/api/v1/tms/getTmstrainWagonLoad?apiId=203&resultType=4&con=" +
+        this.inputText;
+    },
+    btnclick() {
+      this.$router.push("/truckTrain/addWagonLoad");
+    },
+    click(resultId) {
+      this.$router.push("/truckTrain/editWagonLoad/" + resultId);
+    },
+    deleteclick(scope) {
+      let resultId = scope;
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+          this.$axios
+            .post(
+              "/api/v1/tms/deleteTmstrainLoadingResultByResultId?resultId=" +
+                resultId
+            )
+            .then(() => {
+              this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+  },
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 158 - 0
src/views/inward/components/offsetSteel/truckTrain/wagonPlease.vue

@@ -0,0 +1,158 @@
+<template>
+  <!-- 请车作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="inputText" 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>
+    </div>
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <!-- 未下发 -->
+      <el-tab-pane label="未下发" name="first">
+        <dilTable v-bind.sync="option1" ref="table">
+          <el-table-column fixed="right" label="操作" width="120">
+            <template slot-scope="scope">
+              <el-button
+                @click="updateClick(scope.row.resultId)"
+                type="text"
+                size="small"
+              >
+                修改
+              </el-button>
+              <el-button
+                @click="deleteClick(scope.row.resultId)"
+                type="text"
+                size="small"
+              >
+                删除
+              </el-button>
+              <el-button
+                @click="sendClick(scope.row.resultId)"
+                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>
+export default {
+  name: "inplantTMS",
+  data() {
+    return {
+      inputText: "",
+      activeName: "first",
+      option1: {
+        // 表格请求数据的地址
+        requestUrl:
+          "/api/v1/tms/getAllWagonPlease?apiId=253&status=0&resultType=4",
+      },
+      option2: {
+        // 表格请求数据的地址
+        requestUrl:
+          "/api/v1/tms/getAllWagonPlease?apiId=253&status=1&resultType=4",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      if(this.activeName == 'first'){
+        this.option1.requestUrl = "/api/v1/tms/getAllWagonPlease?apiId=253&status=0&resultType=4&con=" + this.inputText;
+      }else{
+        this.option1.requestUrl = "/api/v1/tms/getAllWagonPlease?apiId=253&status=1&resultType=4&con=" + this.inputText;  
+      }
+    },
+    handleClick(tab, event) {
+      console.log(tab, event);
+    },
+    // 删除
+    deleteClick(resultId) {
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$axios
+            .post("/api/v1/tms/deleteApproveWagonPlease/" + resultId)
+            .then((res) => {
+              if (res.data.code == "200") {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });
+                this.$router.go(0);
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+    // 下发
+    sendClick(resultId) {
+      this.$confirm("是否下发", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          // console.log(this.arr[0].text_prop);
+          this.$axios
+            .post("/api/v1/tms/sendWagonPlease/" + resultId)
+            .then((res) => {
+              if (res.data.code == "200") {
+                this.$message({
+                  type: "success",
+                  message: "下发成功!",
+                });
+                this.$router.go(0);
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消下发!",
+          });
+        });
+    },
+    //新增
+    insertClick() {
+      console.log("11");
+      this.$router.push("/truckTrain/addWagonPlease");
+    },
+    //修改
+    updateClick(resultId) {
+      this.$router.push("/truckTrain/editWagonPlease/" + resultId);
+    },
+  },
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 130 - 0
src/views/inward/components/offsetSteel/truckTrain/wagonUnLoad.vue

@@ -0,0 +1,130 @@
+<template>
+  <!-- 卸车作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="inputText" 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" ref="table">
+      <el-table-column fixed="right" label="操作" align="center" width="100">
+        <template slot-scope="scope">
+          <el-button @click="detailclick(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>
+              <dilTable v-bind.sync="option1"></dilTable>
+            </div>
+          </el-form>
+        </template>
+      </el-table-column>
+    </dilTable>
+  </div>
+</template>
+<script>
+export default {
+  name: "wagonUnload",
+  
+  data() {
+    return {
+	inputText:"",
+      option: {       
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getTmstrainWagonUnLoad?apiId=256&resultType=4",
+      },
+       //记录旧的row对象
+      oldRow: "",
+      //记录上一个展开的点击次数,单数为展开状态,复数为闭合状态
+      oldRowCount: 1,
+      option1: {
+        requestUrl: "",
+      },
+    };
+  },
+  methods: {
+     // 查看物资详情
+    detailclick(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.resultId);
+    },
+    getMaterial(resultId) {
+      this.option1.requestUrl =
+        "/api/v1/tms/getMaterialAndCarByLoadingId?apiId=259&unloadingId" + resultId;
+    },
+    onclick() {
+      this.option.requestUrl =
+        "/api/v1/tms/getTmstrainWagonUnLoad?apiId=256&resultType=4&con=" + this.inputText;
+    },
+    btnclick() {
+      this.$router.push("/truckTrain/addWagonUnLoad");
+    },
+    click(unloadingId) {
+      this.$router.push("/truckTrain/editWagonUnLoad/" + unloadingId);
+    },
+    deleteclick(scope) {
+      let unloadingId = scope;
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+          this.$axios
+            .post(
+              "/api/v1/tms/deleteTmstrainWagonUnLoadResultByUnLoadingId?unloadingId=" + unloadingId
+            )
+            .then(() => {
+               this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+  },
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 102 - 0
src/views/inward/components/offsetSteel/truckTransport/enFactoryResult.vue

@@ -0,0 +1,102 @@
+// 进厂作业
+<template>
+  <div class="sale">
+    <div class="top">
+      <!-- 框计算 -->
+      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      </el-input>
+      <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" ref="table">
+        <el-table-column fixed="right" label="操作" align="center" width="100">
+          <template slot-scope="scope">
+            <el-button @click="detailclick(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>
+                <dilTable v-bind.sync="option1"></dilTable>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      inputText: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=261&orderType=4",
+      },
+      //记录旧的row对象
+      oldRow: "",
+      //记录上一个展开的点击次数,单数为展开状态,复数为闭合状态
+      oldRowCount: 1,
+      option1: {
+        requestUrl: "",
+      },
+    };
+  },
+  methods: {
+    // 查看物资详情
+    detailclick(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.orderId);
+    },
+    getMaterial(orderId) {
+      this.option1.requestUrl =
+        "/api/v1/uc/getMaterialMesByOrderId?apiId=352&orderId=" + orderId;
+    },
+    onclick() {
+      this.option.requestUrl =
+        "/api/v1/tms/getAllEnFactoryResult?apiId=261&orderType=4&con=" +
+        this.inputText;
+    },
+  },
+};
+</script>
+<style lang="scss">
+.sale {
+  .top {
+    width: 100%;
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 2.5rem;
+  }
+}
+</style>

+ 49 - 0
src/views/inward/components/offsetSteel/truckTransport/grossWeightResult.vue

@@ -0,0 +1,49 @@
+// 计毛作业
+<template>
+  <div class="sale">
+    <div class="top">
+      <!-- 框计算 -->
+      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      </el-input>
+      <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" ref="table">
+      
+      </dilTable>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      inputText: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=264&orderType=4",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl =
+        "/api/v1/tms/getAllJiMaoResult?apiId=264&orderType=4&con=" +
+        this.inputText;
+    },
+  },
+};
+</script>
+<style lang="scss">
+.sale {
+  .top {
+    width: 100%;
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 2.5rem;
+  }
+}
+</style>

+ 47 - 0
src/views/inward/components/offsetSteel/truckTransport/loadTruckResult.vue

@@ -0,0 +1,47 @@
+// 装车作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/tms/getAllLoadResult?apiId=263&orderType=4",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=263&orderType=4&con="+this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 94 - 0
src/views/inward/components/offsetSteel/truckTransport/outFactory.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>
+    </div>
+    <dilTable v-bind.sync="option" ref="table">
+      <el-table-column fixed="right" label="操作" align="center" width="100">
+        <template slot-scope="scope">
+          <el-button @click="detailclick(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>
+              <dilTable v-bind.sync="option1"></dilTable>
+            </div>
+          </el-form>
+        </template>
+      </el-table-column>
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=265&orderType=4",
+      },
+       //记录旧的row对象
+      oldRow: "",
+      //记录上一个展开的点击次数,单数为展开状态,复数为闭合状态
+      oldRowCount: 1,
+      option1: {
+        requestUrl: "",
+      },
+    };
+  },
+  methods: {
+       // 查看物资详情
+    detailclick(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.orderId);
+    },
+    getMaterial(orderId) {
+      this.option1.requestUrl =
+        "/api/v1/uc/getMaterialMesByOrderId?apiId=352&orderId=" + orderId;
+    },
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=265&orderType=4&con="+this.input;
+    },
+   }
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 47 - 0
src/views/inward/components/offsetSteel/truckTransport/qualityResult.vue

@@ -0,0 +1,47 @@
+// 质检作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/qms/getQueueApply?apiId=125&orderType=1",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/qms/getQueueApply?apiId=125&orderType=1&con="+this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 47 - 0
src/views/inward/components/offsetSteel/truckTransport/returnResult.vue

@@ -0,0 +1,47 @@
+// 退货作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/qms/getQueueApply?apiId=125&orderType=1",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/qms/getQueueApply?apiId=125&orderType=1&con="+this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 47 - 0
src/views/inward/components/offsetSteel/truckTransport/tareWeightResult.vue

@@ -0,0 +1,47 @@
+// 计皮作业
+<template>
+    <div class="sale">
+        <div class="top">
+            <!-- 框计算 -->
+            <el-input
+                placeholder="请输入内容"
+                v-model="inputText"
+                clearable>
+            </el-input>
+            <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>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            inputText:'',
+            option: {       
+                // 表格请求数据的地址
+                requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=262&orderType=4",
+            },
+        }
+    },
+    methods:{
+        onclick(){
+            this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=262&orderType=4&con="+this.inputText;
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .sale{
+        .top{
+            width: 100%;height: 5rem;
+            display: flex;
+            align-items: center;
+            padding-left: 2.5rem;
+        }
+    }
+</style>

+ 57 - 0
src/views/inward/components/offsetSteel/truckTransport/truckQualityResult.vue

@@ -0,0 +1,57 @@
+<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>
+    </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 {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getQualityResult?apiId=111",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getQualityResult?apiId=111&con=" + this.input;
+    },
+    btnclick() {},
+    updateClick(resultId) {
+      this.$router.push("/importedTruckDo/truckQualityResultEdit/" + resultId);
+    },
+  },
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 41 - 0
src/views/inward/components/offsetSteel/truckTransport/truckReceiptResult.vue

@@ -0,0 +1,41 @@
+<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>
+    </div>
+    <dilTable v-bind.sync="option">
+      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input:'',
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getReceiveResult?apiId=266&orderType=4",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = '/api/v1/tms/getReceiveResult?apiId=266&orderType=4&con='+this.input;
+    },
+   }
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 4 - 0
src/views/inward/components/transportFreight/bmsTruckDetailOrder.vue

@@ -0,0 +1,4 @@
+// 计费详单
+<template>
+    <div>计费详单</div>
+</template>

+ 4 - 0
src/views/inward/components/transportFreight/bmsTruckFormula.vue

@@ -0,0 +1,4 @@
+// 计费公式
+<template>
+    <div>计费公式</div>
+</template>

+ 4 - 0
src/views/inward/components/transportFreight/bmsTruckStatement.vue

@@ -0,0 +1,4 @@
+// 计费账单
+<template>
+    <div>计费账单</div>
+</template>

+ 4 - 0
src/views/inward/components/transportFreight/correctResult.vue

@@ -0,0 +1,4 @@
+//采集实绩
+<template>
+    <div>采集实绩</div>
+</template>

+ 279 - 0
src/views/inward/components/truckAppoint/RailPlan.vue

@@ -0,0 +1,279 @@
+// 制定发运计划
+<template>
+	<div class="steel_inbound">
+		<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="Issue" v-if="activeName == 'second'">
+				<i class="el-icon-download"></i>下发
+			</el-button>
+		</div>
+		<template>
+			<div>
+				<el-tabs v-model="activeName" @tab-click="handleClick">
+					<el-tab-pane label="未下发" name="second">
+						<dilTable v-bind.sync="second" @selection-change="selectionChange">
+						</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>
+	export default {
+		data() {
+			return {
+				inputText: "",
+				second: {
+					// second请求数据的地址
+					requestUrl: "/api/v1/ams/getRailOffsetDayplan?apiId=183&dayplanReceiveStatus=0",
+					selectionType: "select",
+					mapList: [],
+				},
+				third: {
+					// second请求数据的地址
+					requestUrl: "/api/v1/ams/getRailOffsetDayplan?apiId=183&dayplanReceiveStatus=1",
+				},
+				activeName: "second",
+			}
+		},
+		methods: {
+			receiver(scope){
+				this.$confirm("是否接收", "提示", {
+						confirmButtonText: "确定",
+						cancelButtonText: "取消",
+						type: "warning",
+						center: true,
+					})
+					.then(() => {
+						this.$axios
+							.post("/api/v1/ams/receiveRequirement/" + scope.row.requirementId)
+							.then((res) => {
+								this.$router.go(0);
+								if (res.data.code == 200) {
+									this.$message({
+										type: "success",
+										message: "接收成功!",
+									});
+									
+									
+								} else {
+									this.$message({
+										message: "接收失败",
+										type: "warning",
+									});
+								}
+							});
+					})
+					.catch(() => {
+						this.$message({
+							type: "info",
+							message: "接收操作已取消!",
+						});
+					});
+			},
+			selectionChange(selection) {
+				this.second.mapList = selection
+			},
+			toInsert() {
+				console.log('---')
+				this.$router.push("/appointment/addPlan");
+			},
+			updatePlan(scope) {
+				this.$router.push("/appointment/updatePlan/" + scope.row.planId)
+			},
+			deletePlan(scope) {
+				this.$confirm("是否删除", "提示", {
+						confirmButtonText: "确定",
+						cancelButtonText: "取消",
+						type: "warning",
+						center: true,
+					})
+					.then(() => {
+						this.$axios
+							.post("/api/v1/ams//deleteTruckPlan/" + scope.row.planId)
+							.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: "删除操作已取消!",
+						});
+					});
+			},
+			Issue() {
+				console.log(this.second.mapList)
+				this.$confirm("是否下发", "提示", {
+						confirmButtonText: "确定",
+						cancelButtonText: "取消",
+						type: "warning",
+						center: true,
+					})
+					.then(() => {
+						this.$axios
+							.post("/api/v1/ams/issueRailOffsetDayplan", this.second.mapList)
+							.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: "取消下发!",
+						});
+					});
+			},
+
+    // },
+    receiver(scope) {
+      this.$confirm("是否接收", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$axios
+            .post("/api/v1/ams/receiveRequirement/" + scope.row.requirementId)
+            .then((res) => {
+              this.$router.go(0);
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "接收成功!",
+                });
+              } else {
+                this.$message({
+                  message: "接收失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "接收操作已取消!",
+          });
+        });
+    },
+    selectionChange(selection) {
+      this.second.mapList = selection;
+    },
+    toInsert() {
+      console.log("---");
+      this.$router.push("/appointment/addPlan");
+    },
+    updatePlan(scope) {
+      this.$router.push("/appointment/updatePlan/" + scope.row.planId);
+    },
+    deletePlan(scope) {
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$axios
+            .post("/api/v1/ams//deleteTruckPlan/" + scope.row.planId)
+            .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: "删除操作已取消!",
+          });
+        });
+    },
+    Issue() {
+      console.log(this.second.mapList);
+      this.$confirm("是否下发", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$axios
+            .post("/api/v1/ams/issueRailOffsetDayplan", this.second.mapList)
+            .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: "取消下发!",
+          });
+        });
+    },
+  },
+};
+</script>
+<style lang="scss">
+.steel_inbound {
+  .sache {
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

+ 163 - 0
src/views/inward/components/truckAppoint/addPlan.vue

@@ -0,0 +1,163 @@
+// 新增计划
+<template>
+  <div id="endMaintenance">
+    <page-title>新增计划</page-title>
+    <div class="main">
+      <span class="text">新增</span>
+      <span class="a"></span>
+    </div>
+    <div>
+      <div class="form-box" style="margin-left: 5rem">
+        <dil-form :formId="305" v-model="form"></dil-form>       
+      </div>
+    </div>
+    <template>
+			<div>		
+						<dilTable v-bind.sync="first" @radio-change="currentRadioChange">
+						</dilTable>
+            </div>
+		</template>
+    <div class="" style="margin-left:40rem">
+      <el-button type="primary" @click="makeSure">确认新增</el-button>
+      <el-button type="primary" @click="cancel">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form: {},
+      first:{
+        requestUrl:"/api/v1/ams/getTruckRequirementList?apiId=250&requirementStatus=2",
+        selectionType: "radio",
+				mapList: [],
+      }
+    };
+  },
+  methods: {
+    currentRadioChange(selection){
+        this.mapList = selection
+    },
+    // 新增
+    makeSure() {
+      console.log(this.form)
+      let plan = {
+        requirementId : this.mapList.requirementId,
+        planTruckNumber: this.form.planTruckNumber,
+        carrierId: this.form.carrierId
+      };
+          
+      this.$axios
+        .post(
+          "/api/v1/ams/addTruckPlan",
+          plan
+        )
+        .then((res) => {
+            console.log(res)
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });            
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败!");
+          }
+        });
+    },
+    // 返回
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+#pageTitle {
+    border-bottom: 0.125rem solid $borderColorPageTitlte;
+    background-color: $backgroundColorPageTitle;
+    padding-left: 3.125rem;
+    margin-bottom: 1.875rem;
+    span {
+      font-size: 1.5rem;
+      line-height: 4.375rem;
+      color: $fontColorPageTitle;
+    }
+    i {
+      cursor: pointer;
+      border: 0.0625rem solid $fontColorPageTitle;
+      color: $fontColorPageTitle;
+      border-radius: 100%;
+      margin-right: 1.25rem;
+      // 图标放大
+      transform: scale(1.6, 1.6);
+    }
+  }
+  #query_condition{
+    margin-left: 3rem;
+  }
+  .button-box {
+    display: flex;
+    justify-content: center;
+    .el-button + .el-button {
+      margin-left: 3rem;
+    }
+  }
+  
+  .form-box {
+    display: flex;
+    margin-top: 1.25rem;
+    justify-content: center;
+    .el-form {
+      flex-direction: column;
+    }
+    
+  }
+
+  .body{
+    display: -webkit-flex;
+    display: flex;
+  }
+  .main {
+    display: flex;
+    margin-top: 1.5625rem;
+    margin-left: 1.875rem;
+    margin-bottom: 3.125rem;
+    .text {
+      margin-right: 0.625rem;
+      font-weight: 700;
+      font-size: 0.9375rem;
+    }
+    .el_text1 {
+      width: 56.875rem;
+    }
+    .a {
+      margin-top: 0.4375rem;
+      width: 80%;
+      height: 0.0625rem;
+      border-top: $gainsboro 0.0625rem solid;
+    }
+  }
+  .contractTitle{
+    margin: 0 auto;
+    text-align: center;
+  }
+  .contractId{
+    font-size: 1.25rem;
+  }
+  .form-one{
+    margin-right: 0.625rem;
+  }
+  .button-ins {
+    display: flex;
+    margin-left: 60rem;
+    margin-bottom: 1rem;
+  }
+  
+</style>

+ 0 - 0
src/views/inward/components/truckAppoint/addRailPlan.vue


+ 344 - 0
src/views/inward/components/truckAppoint/addRequirement.vue

@@ -0,0 +1,344 @@
+// 新增采购内转需求
+<template>
+  <div id="endMaintenance">
+    <page-title>新增需求</page-title>
+    <div class="main">
+      <span class="text">新增</span>
+      <span class="a"></span>
+    </div>
+    <div>
+      <div class="form-box f2">
+        <el-form :inline="true" class="demo-form-inline">
+          <el-form-item label="采购订单号">
+            <el-input v-model="purchaseOrder" disabled> </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="form-box f3">
+        <el-form :inline="true" class="demo-form-inline">
+          <el-form-item label="外轮船名">
+            <el-input v-model="foreignShipName" disabled> </el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="form-box f4">
+        <el-form :inline="true" class="demo-form-inline">
+          <el-form-item label="物资名称">
+            <el-input v-model="materialName" disabled> </el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="form-box f5">
+        <el-form :inline="true" class="demo-form-inline">
+          <el-form-item label="用车地点">
+            <el-input v-model="truckPoint" disabled> </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="form-box f5">
+        <el-form :inline="true" class="demo-form-inline">
+          <el-form-item label="卸货地点">
+            <el-input v-model="truckPoint1" disabled> </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="ondrawer(3)">浏览</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="form-box f5">
+        <el-form :inline="true" class="demo-form-inline">
+          <el-form-item label="装货月台">
+            <el-input v-model="requirementPlatformName" disabled> </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="form-box" style="margin-left: 16rem">
+        <dil-form :formId="300" v-model="form"></dil-form>
+      </div>
+      <el-drawer
+        :visible.sync="drawer"
+        :direction="direction"
+        :before-close="handleClose"
+        size="30%"
+      >
+        <el-input
+          placeholder="请输入内容"
+          v-model="input"
+          style="margin-top: 10px; margin-left: 20px"
+          clearable
+        >
+        </el-input>
+        <el-button
+          type="primary"
+          class="btn"
+          @click="onclick(a)"
+          style="margin-bottom: 15px"
+        >
+          <i class="el-icon-search"></i>查询
+        </el-button>
+        <div v-show="a == 1">
+          <dilTable
+            v-bind.sync="second"
+            @radio-change="currentRadioChange1"
+          ></dilTable>
+        </div>
+        <div v-show="a == 2">
+          <dilTable
+            v-bind.sync="second1"
+            @radio-change="currentRadioChange2"
+          ></dilTable>
+        </div>
+        <div v-show="a == 3">
+          <dilTable
+            v-bind.sync="second2"
+            @radio-change="currentRadioChange3"
+          ></dilTable>
+        </div>
+         <div v-show="a == 4">
+          <dilTable
+            v-bind.sync="second3"
+            @radio-change="currentRadioChange4"
+          ></dilTable>
+        </div>
+      </el-drawer>
+    </div>
+    <div class="" style="margin-left: 40rem">
+      <el-button type="primary" @click="makeSure">确认新增</el-button>
+      <el-button type="primary" @click="cancel">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      purchaseOrder: "",
+      foreignShipName: "",
+      materialName: "",
+      a: 1,
+      direction: "rtl",
+      input: "",
+      truckPoint: "",
+      truckPoint1:'',
+      requirementPlatformName: "",
+      drawer: false,
+      form: {},
+      second: {
+        requestUrl: "/api/v1/ams/getPurchaseIdByBatch?apiId=252",
+        selectionType: "radio",
+        mapList1: [],
+      },
+      second1: {
+        requestUrl: "/api/v1/ams/getWareHouse?apiId=251",
+        selectionType: "radio",
+        mapList2: [],
+      },
+      second2 :{
+        requestUrl: "/api/v1/ams/getWareHouse?apiId=251",
+        selectionType: "radio",
+        mapList3: [],
+      },
+      second3 :{
+        requestUrl: "/api/v1/ams/getWareHouse?apiId=251",
+        selectionType: "radio",
+        mapList4: [],
+      },
+    };
+  },
+  methods: {
+    ondrawer(num) {
+      this.drawer = true;
+      this.a = num;
+    },
+    handleClose(done) {
+      done();
+    },
+    onclick(a) {
+      if (a == 1) {
+        this.second.requestUrl =
+          "/api/v1/ams/getPurchaseIdByBatch?apiId=252&con=" + this.input;
+      } else {
+        this.second1.requestUrl =
+          "/api/v1/ams/getWareHouse?apiId=251&con=" + this.input;
+      }
+    },
+    currentRadioChange1(selection) {
+      this.mapList1 = selection
+      this.purchaseOrder = this.mapList1.purchaseOrderNo
+      this.foreignShipName = this.mapList1.resultForeignShipName
+      this.materialName = this.mapList1.materialName;
+    },
+    currentRadioChange2(selection) {
+      this.mapList2 = selection
+      this.truckPoint = this.mapList2.wareHouseName;
+    },
+    currentRadioChange3(selection) {
+      this.mapList3 = selection
+      this.truckPoint1 = this.mapList3.wareHouseName;
+    },
+    currentRadioChange4(selection) {
+      this.mapList4 = selection
+      this.requirementPlatformName = this.mapList4.wareHouseName;
+    },
+    // 新增
+    makeSure() {
+      let requiremnet = {
+        purchaseOrderId: this.mapList1.purchaseOrderId,
+        requiremntUnitId: this.mapList2.wareHouseId,
+        capacityTypeId: this.form.capacityTypeId,
+        materialWeight: this.form.materialWeight,
+        materialNumber: this.form.materialNumber,
+        requirementEstimatedDuration: this.form.requirementEstimatedDuration,
+        requirementOverlimit: this.form.requirementOverlimit,
+        requirementShipperId: this.form.requirementShipperId,
+        requirementTruckTime: sjTime(this.form.requirementTruckTime),
+        requirementType: this.form.requirementType,
+        requirementWorkContent: this.form.requirementWorkContent,
+        requirementWorkEnvironment: this.form.requirementWorkEnvironment,
+        requirementWorkType: this.form.requirementWorkType,
+        requirementUnloadUnitId:this.mapList3.wareHouseId,
+        requirementPlatformId: this.mapList4.wareHouseId
+      };
+      console.log(requiremnet);
+      this.$axios
+        .post("/api/v1/ams/addTruckRequirement", requiremnet)
+        .then((res) => {
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败!");
+          }
+        });
+    },
+    // 返回
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+#pageTitle {
+    border-bottom: 0.125rem solid $borderColorPageTitlte;
+    background-color: $backgroundColorPageTitle;
+    padding-left: 3.125rem;
+    margin-bottom: 1.875rem;
+    span {
+      font-size: 1.5rem;
+      line-height: 4.375rem;
+      color: $fontColorPageTitle;
+    }
+    i {
+      cursor: pointer;
+      border: 0.0625rem solid $fontColorPageTitle;
+      color: $fontColorPageTitle;
+      border-radius: 100%;
+      margin-right: 1.25rem;
+      // 图标放大
+      transform: scale(1.6, 1.6);
+    }
+  }
+  #query_condition{
+    margin-left: 3rem;
+  }
+  .button-box {
+    display: flex;
+    justify-content: center;
+    .el-button + .el-button {
+      margin-left: 3rem;
+    }
+  }
+  
+  .form-box {
+    display: flex;
+    margin-top: 1.25rem;
+    justify-content: center;
+    .el-form {
+      flex-direction: column;
+    }
+    
+  }
+
+  .body{
+    display: -webkit-flex;
+    display: flex;
+  }
+  .main {
+    display: flex;
+    margin-top: 1.5625rem;
+    margin-left: 1.875rem;
+    margin-bottom: 3.125rem;
+    .text {
+      margin-right: 0.625rem;
+      font-weight: 700;
+      font-size: 0.9375rem;
+    }
+    .el_text1 {
+      width: 56.875rem;
+    }
+    .a {
+      margin-top: 0.4375rem;
+      width: 80%;
+      height: 0.0625rem;
+      border-top: $gainsboro 0.0625rem solid;
+    }
+  }
+  .contractTitle{
+    margin: 0 auto;
+    text-align: center;
+  }
+  .contractId{
+    font-size: 1.25rem;
+  }
+  .form-one{
+    margin-right: 0.625rem;
+  }
+  .button-ins {
+    display: flex;
+    margin-left: 60rem;
+    margin-bottom: 1rem;
+  }
+  
+.f1 {
+  margin-top: -2.5rem;
+  margin-left: 26rem;
+}
+.f11 {
+  margin-top: -3rem;
+  // margin-left: 29rem;
+}
+.f2 {
+  margin-top: -2.5rem;
+  margin-left: 20.7rem;
+}
+.f3 {
+  margin-top: 0rem;
+  margin-left: 16rem;
+}
+.f4 {
+  margin-top: 0rem;
+  margin-left: 16rem;
+}
+.f5 {
+  margin-top: 0rem;
+  margin-left: 21rem;
+}
+</style>

+ 315 - 0
src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -0,0 +1,315 @@
+// 新增厂内内转需求
+<template>
+  <div id="endMaintenance">
+    <page-title>新增需求</page-title>
+    <div class="main">
+      <span class="text">新增</span>
+      <span class="a"></span>
+    </div>
+    <div>
+      <div class="form-box f2">
+        <el-form :inline="true" class="demo-form-inline">
+          <el-form-item label="物资">
+            <el-input v-model="materialName" disabled> </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="form-box f5">
+        <el-form :inline="true" class="demo-form-inline">
+          <el-form-item label="用车地点">
+            <el-input v-model="truckPoint" disabled> </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="form-box f5">
+        <el-form :inline="true" class="demo-form-inline">
+          <el-form-item label="卸货地点">
+            <el-input v-model="truckPoint1" disabled> </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="ondrawer(3)">浏览</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+       <div class="form-box f5">
+        <el-form :inline="true" class="demo-form-inline">
+          <el-form-item label="装货月台">
+            <el-input v-model="requirementPlatformName" disabled> </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="form-box" style="margin-left: 16rem">
+        <dil-form :formId="300" v-model="form"></dil-form>
+      </div>
+      <el-drawer
+        :visible.sync="drawer"
+        :direction="direction"
+        :before-close="handleClose"
+        size="30%"
+      >
+        <el-input
+          placeholder="请输入内容"
+          v-model="input"
+          style="margin-top: 10px; margin-left: 20px"
+          clearable
+        >
+        </el-input>
+        <el-button
+          type="primary"
+          class="btn"
+          @click="onclick(a)"
+          style="margin-bottom: 15px"
+        >
+          <i class="el-icon-search"></i>查询
+        </el-button>
+        <div v-show="a == 1">
+          <dilTable
+            v-bind.sync="second"
+            @radio-change="currentRadioChange1"
+          ></dilTable>
+        </div>
+        <div v-show="a !== 1">
+          <dilTable
+            v-bind.sync="second1"
+            @radio-change="currentRadioChange2"
+          ></dilTable>
+        </div>
+      </el-drawer>
+    </div>
+    <div class="" style="margin-left: 40rem">
+      <el-button type="primary" @click="makeSure">确认新增</el-button>
+      <el-button type="primary" @click="cancel">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      purchaseOrder: "",
+      foreignShipName: "",
+      materialName: "",
+      requirementPlatformName: "",
+      a: 1,
+      direction: "rtl",
+      input: "",
+      requiremntUnitId: null,
+      requirementUnloadUnitId: null,
+      requirementPlatformId:  null,
+      truckPoint: "",
+      materialId: null,
+      truckPoint1:'',
+      drawer: false,
+      form: {},
+      second: {
+        requestUrl: "/api/v1/uc/queryMaterialByLike?apiId=244",
+        selectionType: "radio",
+        mapList1: [],
+      },
+      second1: {
+        requestUrl: "/api/v1/ams/getWareHouse?apiId=251",
+        selectionType: "radio",
+        mapList2: [],
+      },
+    };
+  },
+  methods: {
+    ondrawer(num) {
+      this.drawer = true;
+      this.a = num;
+    },
+    handleClose(done) {
+      done();
+    },
+    onclick(a) {
+      if (a == 1) {
+        this.second.requestUrl =
+          "/api/v1/uc/queryMaterialByLike?apiId=244&index=" + this.input;
+      } else {
+        console.log(a)
+        this.second1.requestUrl =
+          "/api/v1/ams/getWareHouse?apiId=251&con=" + this.input;
+      }
+    },
+    currentRadioChange1(selection) {
+      this.mapList1 = selection
+      this.purchaseOrder = this.mapList1.purchaseOrderNo
+      this.foreignShipName = this.mapList1.resultForeignShipName
+      this.materialName = this.mapList1.materialName;
+      this.materialId = selection.materialId;
+    },
+    currentRadioChange2(selection) {
+      this.mapList2 = selection
+      if(this.a == 2){
+        this.truckPoint = selection.wareHouseName;
+        this.requiremntUnitId = selection.wareHouseId;
+      }else if(this.a == 3){
+        this.requirementUnloadUnitId = selection.wareHouseId;
+        this.truckPoint1 = selection.wareHouseName;
+      }else if(this.a == 4){
+        this.requirementPlatformId = selection.wareHouseId;
+        this.requirementPlatformName = selection.wareHouseName;
+      }
+    },
+    // 新增
+    makeSure() {
+      let requiremnet = {
+        materialId: this.materialId,
+        requiremntUnitId: this.requiremntUnitId,
+        capacityTypeId: this.form.capacityTypeId,
+        materialWeight: this.form.materialWeight,
+        materialNumber: this.form.materialNumber,
+        requirementEstimatedDuration: this.form.requirementEstimatedDuration,
+        requirementOverlimit: this.form.requirementOverlimit,
+        requirementShipperId: this.form.requirementShipperId,
+        requirementTruckTime: sjTime(this.form.requirementTruckTime),
+        requirementType: this.form.requirementType,
+        requirementWorkContent: this.form.requirementWorkContent,
+        requirementWorkEnvironment: this.form.requirementWorkEnvironment,
+        requirementWorkType: this.form.requirementWorkType,
+        requirementUnloadUnitId:this.requirementUnloadUnitId,
+        requirementPlatformId: this.requirementPlatformId
+      };
+      console.log(requiremnet);
+      this.$axios
+        .post("/api/v1/ams/addTruckRequirement", requiremnet)
+        .then((res) => {
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败!");
+          }
+        });
+    },
+    // 返回
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+#pageTitle {
+    border-bottom: 0.125rem solid $borderColorPageTitlte;
+    background-color: $backgroundColorPageTitle;
+    padding-left: 3.125rem;
+    margin-bottom: 1.875rem;
+    span {
+      font-size: 1.5rem;
+      line-height: 4.375rem;
+      color: $fontColorPageTitle;
+    }
+    i {
+      cursor: pointer;
+      border: 0.0625rem solid $fontColorPageTitle;
+      color: $fontColorPageTitle;
+      border-radius: 100%;
+      margin-right: 1.25rem;
+      // 图标放大
+      transform: scale(1.6, 1.6);
+    }
+  }
+  #query_condition{
+    margin-left: 3rem;
+  }
+  .button-box {
+    display: flex;
+    justify-content: center;
+    .el-button + .el-button {
+      margin-left: 3rem;
+    }
+  }
+  
+  .form-box {
+    display: flex;
+    margin-top: 1.25rem;
+    justify-content: center;
+    .el-form {
+      flex-direction: column;
+    }
+    
+  }
+
+  .body{
+    display: -webkit-flex;
+    display: flex;
+  }
+  .main {
+    display: flex;
+    margin-top: 1.5625rem;
+    margin-left: 1.875rem;
+    margin-bottom: 3.125rem;
+    .text {
+      margin-right: 0.625rem;
+      font-weight: 700;
+      font-size: 0.9375rem;
+    }
+    .el_text1 {
+      width: 56.875rem;
+    }
+    .a {
+      margin-top: 0.4375rem;
+      width: 80%;
+      height: 0.0625rem;
+      border-top: $gainsboro 0.0625rem solid;
+    }
+  }
+  .contractTitle{
+    margin: 0 auto;
+    text-align: center;
+  }
+  .contractId{
+    font-size: 1.25rem;
+  }
+  .form-one{
+    margin-right: 0.625rem;
+  }
+  .button-ins {
+    display: flex;
+    margin-left: 60rem;
+    margin-bottom: 1rem;
+  }
+  
+.f1 {
+  margin-top: -2.5rem;
+  margin-left: 26rem;
+}
+.f11 {
+  margin-top: -3rem;
+  // margin-left: 29rem;
+}
+.f2 {
+  margin-top: -2.5rem;
+  margin-left: 20.7rem;
+}
+.f3 {
+  margin-top: 0rem;
+  margin-left: 16rem;
+}
+.f4 {
+  margin-top: 0rem;
+  margin-left: 16rem;
+}
+.f5 {
+  margin-top: 0rem;
+  margin-left: 21rem;
+}
+</style>

+ 261 - 0
src/views/inward/components/truckAppoint/plan.vue

@@ -0,0 +1,261 @@
+// 制定计划
+<template>
+  <div class="steel_inbound">
+    <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="toInsert"
+        v-if="activeName == 'second'"
+      >
+        <i class="el-icon-plus"></i>制定计划
+      </el-button>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="Issue"
+        v-if="activeName == 'second'"
+      >
+        <i class="el-icon-download"></i>下发
+      </el-button>
+    </div>
+    <template>
+      <div>
+        <el-tabs v-model="activeName">
+          <el-tab-pane label="未接收" name="first">
+            <dilTable v-bind.sync="first">
+              <el-table-column fixed="right" label="操作" width="120">
+                <template slot-scope="scope">
+                  <el-button type="text" size="mini" @click="receiver(scope)">
+                    接收
+                  </el-button>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+          <el-tab-pane label="未下发" name="second">
+            <dilTable v-bind.sync="second" @selection-change="selectionChange">
+              <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="deletePlan(scope)">
+                    删除
+                  </el-button>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+          <el-tab-pane label="已下发" name="third">
+            <dilTable v-bind.sync="third">
+              <el-table-column
+                fixed="right"
+                align="center"
+                label="操作"
+                width="80"
+              >
+                <template slot-scope="scope">
+                  <el-button type="text" size="mini" @click="finishPlan(scope)">
+                    确认完成
+                  </el-button>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+          <el-tab-pane label="已完成" name="fourth">
+            <dilTable v-bind.sync="fourth" @selection-change="selectionChange">
+            </dilTable>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </template>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      inputText: "",
+      first: {
+        // first请求数据的地址
+        requestUrl:
+          "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1",
+      },
+      second: {
+        // second请求数据的地址
+        requestUrl: "/api/v1/ams/getTruckPlanList?apiId=257&planStatus=0",
+        selectionType: "select",
+        mapList: [],
+      },
+      third: {
+        // second请求数据的地址
+        requestUrl: "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1",
+      },
+      fourth: {
+        requestUrl: "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4",
+      },
+      activeName: "first",
+    };
+  },
+  methods: {
+    // allReceive(){
+
+    // },
+    receiver(scope) {
+      this.$confirm("是否接收", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$axios
+            .post("/api/v1/ams/receiveRequirement/" + scope.row.requirementId)
+            .then((res) => {
+              this.$router.go(0);
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "接收成功!",
+                });
+              } else {
+                this.$message({
+                  message: "接收失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "接收操作已取消!",
+          });
+        });
+    },
+    selectionChange(selection) {
+      this.second.mapList = selection;
+    },
+    toInsert() {
+      console.log("---");
+      this.$router.push("/appointment/addPlan");
+    },
+    updatePlan(scope) {
+      this.$router.push("/appointment/updatePlan/" + scope.row.planId);
+    },
+    finishPlan(scope) {
+      this.$confirm("是否完成该计划", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$axios
+            .post("/api/v1/ams/finishTruckPlan/" + scope.row.planId)
+            .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: "操作已取消!",
+          });
+        });
+    },
+    deletePlan(scope) {
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$axios
+            .post("/api/v1/ams/deleteTruckPlan/" + scope.row.planId)
+            .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: "删除操作已取消!",
+          });
+        });
+    },
+    Issue() {
+      console.log(this.second.mapList);
+      this.$confirm("是否下发", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$axios
+            .post("/api/v1/ams/downTruckPlan", this.second.mapList)
+            .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: "取消下发!",
+          });
+        });
+    },
+  },
+};
+</script>
+<style lang="scss">
+.steel_inbound {
+  .sache {
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

+ 184 - 0
src/views/inward/components/truckAppoint/requirement.vue

@@ -0,0 +1,184 @@
+// 提出需求
+<template>
+  <div class="steel_inbound">
+    <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="toInsert"
+        v-if="activeName == 'first'"
+      >
+        <i class="el-icon-plus"></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">
+          <el-tab-pane label="未下发" name="first">
+            <dilTable v-bind.sync="first" @selection-change="selectionChange">
+              <el-table-column fixed="right" label="操作" width="100">
+                <template slot-scope="scope">
+                  <el-button
+                    type="text"
+                    size="mini"
+                    @click="updateRequirement(scope)"
+                  >
+                    修改
+                  </el-button>
+                  <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"> </dilTable>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </template>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      inputText: "",
+      first: {
+        // first请求数据的地址
+        requestUrl:
+          "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0",
+        selectionType: "select",
+        mapList: [],
+      },
+      second: {
+        // second请求数据的地址
+        requestUrl:
+          "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1",
+      },
+      activeName: "first",
+    };
+  },
+  methods: {
+    selectionChange(selection) {
+      this.first.mapList = selection;
+    },
+    toInsert() {
+  
+      this.$router.push("/appointment/addRequirement");
+    },
+    toInsert2() {
+   
+      this.$router.push("/appointment/addRequirement2");
+    },
+    updateRequirement(scope) {
+      this.$router.push(
+        "/appointment/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.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    Issue() {
+      console.log(this.first.mapList);
+      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.$router.go(0);
+              } else {
+                this.$message({
+                  message: "下发失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消下发!",
+          });
+        });
+    },
+  },
+};
+</script>
+<style lang="scss">
+.steel_inbound {
+  .sache {
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

+ 173 - 0
src/views/inward/components/truckAppoint/updatePlan.vue

@@ -0,0 +1,173 @@
+//修改计划
+<template>
+  <div id="endMaintenance">
+    <page-title>修改计划</page-title>
+    <div class="main">
+      <span class="text">修改</span>
+      <span class="a"></span>
+    </div>
+    <div>
+      <div class="form-box" style="margin-left: 5rem">
+        <dil-form :formId="307" v-model="form"></dil-form>       
+      </div>
+    </div>
+    <template>
+			<div>		
+						<dilTable v-bind.sync="first" >
+						</dilTable>
+            </div>
+		</template>
+    <div class="" style="margin-left:40rem">
+      <el-button type="primary" @click="makeSure">确认修改</el-button>
+      <el-button type="primary" @click="cancel">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form: {},
+      first:{
+        requestUrl:"/api/v1/ams/getTruckRequirementList?apiId=250&requirementStatus=2",
+      }
+    };
+  },
+  mounted(){
+      this.information();
+  },
+  methods: {
+    information(){
+         this.$axios
+        .post("api/v1/ams/selectInwardPlanToUpdate/" + this.$route.params.planId)
+        .then((res) => {
+          res.data.data.forEach((e) => {
+            this.form= e;
+            console.log(e);
+            console.log(this.form1);
+            console.log(this.$route.params.resultId);
+          });
+        });
+    },
+    // 修改
+    makeSure() {
+      console.log(this.form)
+      let plan = {
+        requirementId : this.mapList.requirementId,
+        planTruckNumber: this.form.planTruckNumber,
+        carrierId: this.form.carrierId
+      };
+          
+      this.$axios
+        .post(
+          "/api/v1/ams/addTruckPlan",
+          plan
+        )
+        .then((res) => {
+            console.log(res)
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });            
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败!");
+          }
+        });
+    },
+    // 返回
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+#pageTitle {
+    border-bottom: 0.125rem solid $borderColorPageTitlte;
+    background-color: $backgroundColorPageTitle;
+    padding-left: 3.125rem;
+    margin-bottom: 1.875rem;
+    span {
+      font-size: 1.5rem;
+      line-height: 4.375rem;
+      color: $fontColorPageTitle;
+    }
+    i {
+      cursor: pointer;
+      border: 0.0625rem solid $fontColorPageTitle;
+      color: $fontColorPageTitle;
+      border-radius: 100%;
+      margin-right: 1.25rem;
+      // 图标放大
+      transform: scale(1.6, 1.6);
+    }
+  }
+  #query_condition{
+    margin-left: 3rem;
+  }
+  .button-box {
+    display: flex;
+    justify-content: center;
+    .el-button + .el-button {
+      margin-left: 3rem;
+    }
+  }
+  
+  .form-box {
+    display: flex;
+    margin-top: 1.25rem;
+    justify-content: center;
+    .el-form {
+      flex-direction: column;
+    }
+    
+  }
+
+  .body{
+    display: -webkit-flex;
+    display: flex;
+  }
+  .main {
+    display: flex;
+    margin-top: 1.5625rem;
+    margin-left: 1.875rem;
+    margin-bottom: 3.125rem;
+    .text {
+      margin-right: 0.625rem;
+      font-weight: 700;
+      font-size: 0.9375rem;
+    }
+    .el_text1 {
+      width: 56.875rem;
+    }
+    .a {
+      margin-top: 0.4375rem;
+      width: 80%;
+      height: 0.0625rem;
+      border-top: $gainsboro 0.0625rem solid;
+    }
+  }
+  .contractTitle{
+    margin: 0 auto;
+    text-align: center;
+  }
+  .contractId{
+    font-size: 1.25rem;
+  }
+  .form-one{
+    margin-right: 0.625rem;
+  }
+  .button-ins {
+    display: flex;
+    margin-left: 60rem;
+    margin-bottom: 1rem;
+  }
+  
+</style>

+ 311 - 0
src/views/inward/components/truckAppoint/updateRequirement.vue

@@ -0,0 +1,311 @@
+//修改需求
+<template>
+  <div id="endMaintenance">
+    <page-title>修改需求</page-title>
+    <div class="main">
+      <span class="text">修改</span>
+      <span class="a"></span>
+    </div>
+    <div>
+<div class="form-box f2">
+<el-form :inline="true"  class="demo-form-inline">
+  <el-form-item label="采购订单号">
+    <el-input v-model="purchaseOrder" disabled>  
+    </el-input>
+  </el-form-item>
+  <el-form-item>
+    <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
+  </el-form-item>
+</el-form>
+</div>
+<div class="form-box f3">
+<el-form :inline="true"  class="demo-form-inline">
+  <el-form-item label="外轮船名">
+    <el-input v-model="foreignShipName" disabled>  
+    </el-input>
+  </el-form-item>
+</el-form>
+</div>
+<div class="form-box f4">
+<el-form :inline="true"  class="demo-form-inline">
+  <el-form-item label="物资名称">
+    <el-input v-model="materialName" disabled>  
+    </el-input>
+  </el-form-item>
+</el-form>
+</div>
+<div class="form-box f5">
+<el-form :inline="true"  class="demo-form-inline">
+  <el-form-item label="用车地点">
+    <el-input v-model="truckPoint" disabled>  
+    </el-input>
+  </el-form-item>
+  <el-form-item>
+    <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
+  </el-form-item>
+</el-form>
+</div>
+      <div class="form-box" style="margin-left: 16rem">
+        <dil-form :formId="300" v-model="form"></dil-form>
+      </div>
+<el-drawer
+      :visible.sync="drawer"
+      :direction="direction"
+      :before-close="handleClose"
+      size="30%"
+    >
+      <el-input placeholder="请输入内容" v-model="input"  style="margin-top:10px;margin-left:20px" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick(a)"  style="margin-bottom:15px">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+     <div v-show="a==1"><dilTable v-bind.sync="second" @radio-change="currentRadioChange1" ></dilTable></div>
+      <div v-show="a==2"><dilTable v-bind.sync="second1" @radio-change="currentRadioChange2" ></dilTable></div>
+    </el-drawer>
+    </div>
+    <div class="" style="margin-left:40rem">
+      <el-button type="primary" @click="makeSure">确认修改</el-button>
+      <el-button type="primary" @click="cancel">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      requiremntUnitId:0,
+      purchaseOrderId:0,
+      purchaseOrder:'',
+      foreignShipName:'',
+      materialName:'',
+      a:1,
+       direction: "rtl",
+      input:'',
+      truckPoint:'',
+      drawer:false,
+      form: {},
+      second:{
+        requestUrl:"/api/v1/ams/getPurchaseIdByBatch?apiId=252",
+        selectionType: "radio",
+        mapList1:[]
+      },
+      second1:{
+          requestUrl:"/api/v1/ams/getWareHouse?apiId=251",
+          selectionType: "radio",
+          mapList2:[]
+      },
+    };
+  },
+  mounted(){
+      this.information();
+  },
+  methods: {
+       information() {
+      //编辑
+      this.$axios
+        .post("/api/v1/ams/selectRequirement/" + this.$route.params.requirementId)
+        .then((res) => {
+          console.log(res.data.data)
+          const list = res.data.data;
+
+          this.foreignShipName = list[0].resultForeignShipName,
+          this.purchaseOrder = list[0].purchaseOrderNo,
+          this.truckPoint = list[0].wareHouseName,
+          this.materialName = list[0].materialName,
+          this.purchaseOrderId = list[0].purchaseOrderId,
+          this.requiremntUnitId = list[0].requiremntUnitId,
+          console.log('--------')
+          console.log(this.foreignShipName,this.materialName,this.purchaseOrderId,this.requiremntUnitId)
+          res.data.data.forEach((e) => {
+            this.form= e;
+            console.log(e);
+            console.log(this.form1);
+            console.log(this.$route.params.resultId);
+          });
+        });
+    },
+     ondrawer(num){
+      this.drawer = true;
+      this.a = num;
+    },
+    handleClose(done){
+      done();
+    },
+      onclick(a) {
+      console.log(a)
+      if(a==1){
+        this.second.requestUrl =
+        "/api/v1/ams/getPurchaseIdByBatch?apiId=252&con=" + this.input;
+      }
+      else{
+        this.second1.requestUrl=
+        "/api/v1/ams/getWareHouse?apiId=251&con=" + this.input;
+      }
+    },
+     currentRadioChange1(selection){    
+      this.mapList1=selection,
+      console.log(this.mapList1);
+      this.purchaseOrder=this.mapList1.purchaseOrderNo,
+      this.purchaseOrderId = this.mapList1.purchaseOrderId,
+      this.foreignShipName = this.mapList1.resultForeignShipName,
+      this.materialName = this.mapList1.materialName
+    },
+    currentRadioChange2(selection){
+      this.mapList2=selection,
+      console.log(this.mapList2);
+      this.truckPoint=this.mapList2.wareHouseName
+    },
+    // 修改
+    makeSure() {
+      console.log(this.form)
+      let requiremnet = {
+        requirementId:this.$route.params.requirementId,
+        purchaseOrderId:this.purchaseOrderId,
+        requiremntUnitId:this.requiremntUnitId,
+        capacityTypeId: this.form.capacityTypeId,
+        requirementEstimatedDuration: this.form.requirementEstimatedDuration,
+        requirementOverlimit: this.form.requirementOverlimit,
+        requirementShipperId: this.form.requirementShipperId,
+        requirementTruckTime: sjTime(this.form.requirementTruckTime),
+        requirementType:this.form.requirementType,
+        requirementWorkContent:this.form.requirementWorkContent,
+        requirementWorkEnvironment:this.form.requirementWorkEnvironment,
+        requirementWorkType:this.form.requirementWorkType,
+      };
+      console.log(requiremnet)
+      this.$axios
+        .post(
+          "/api/v1/ams/updateTruckRequirement",
+          requiremnet
+        )
+        .then((res) => {
+            console.log(res)
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "修改成功!",
+            });            
+            this.$router.go(-1)
+          } else {
+            this.$message.error("修改失败!");
+          }
+        });
+    },
+    // 返回
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+#pageTitle {
+    border-bottom: 0.125rem solid $borderColorPageTitlte;
+    background-color: $backgroundColorPageTitle;
+    padding-left: 3.125rem;
+    margin-bottom: 1.875rem;
+    span {
+      font-size: 1.5rem;
+      line-height: 4.375rem;
+      color: $fontColorPageTitle;
+    }
+    i {
+      cursor: pointer;
+      border: 0.0625rem solid $fontColorPageTitle;
+      color: $fontColorPageTitle;
+      border-radius: 100%;
+      margin-right: 1.25rem;
+      // 图标放大
+      transform: scale(1.6, 1.6);
+    }
+  }
+  #query_condition{
+    margin-left: 3rem;
+  }
+  .button-box {
+    display: flex;
+    justify-content: center;
+    .el-button + .el-button {
+      margin-left: 3rem;
+    }
+  }
+  
+  .form-box {
+    display: flex;
+    margin-top: 1.25rem;
+    justify-content: center;
+    .el-form {
+      flex-direction: column;
+    }
+    
+  }
+
+  .body{
+    display: -webkit-flex;
+    display: flex;
+  }
+  .main {
+    display: flex;
+    margin-top: 1.5625rem;
+    margin-left: 1.875rem;
+    margin-bottom: 3.125rem;
+    .text {
+      margin-right: 0.625rem;
+      font-weight: 700;
+      font-size: 0.9375rem;
+    }
+    .el_text1 {
+      width: 56.875rem;
+    }
+    .a {
+      margin-top: 0.4375rem;
+      width: 80%;
+      height: 0.0625rem;
+      border-top: $gainsboro 0.0625rem solid;
+    }
+  }
+  .contractTitle{
+    margin: 0 auto;
+    text-align: center;
+  }
+  .contractId{
+    font-size: 1.25rem;
+  }
+  .form-one{
+    margin-right: 0.625rem;
+  }
+  .button-ins {
+    display: flex;
+    margin-left: 60rem;
+    margin-bottom: 1rem;
+  }
+  
+.f1{
+  margin-top: -2.5rem;
+  margin-left: 26rem;
+}
+.f11{
+  margin-top: -3rem;
+  // margin-left: 29rem;
+}
+.f2{
+  margin-top: -2.5rem;
+  margin-left: 20.7rem;
+}
+.f3{
+  margin-top: 0rem;
+  margin-left: 16rem;
+}
+.f4{
+  margin-top: 0rem;
+  margin-left: 16rem;
+}
+.f5{
+  margin-top: 0rem;
+  margin-left: 21rem;
+}
+</style>

+ 102 - 0
src/views/inward/components/truckOrder/RailPlan.vue

@@ -0,0 +1,102 @@
+// 分解计划
+<template>
+  <div class="steel_inbound">
+    <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>
+    </div>
+    <template>
+      <div>
+        <dilTable v-bind.sync="second">
+          <el-table-column fixed="right" label="操作" width="50">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="mini"
+                @click="desponseRailPlan(scope)"
+              >
+                分解
+              </el-button>
+            </template>
+          </el-table-column>
+        </dilTable>
+      </div>
+    </template>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      inputText: "",
+      first: {
+        // first请求数据的地址
+        requestUrl:
+          "/api/v1/ams/getRailOffsetDayplan?apiId=183&dayplanReceiveStatus=0&carrierId=9",
+      },
+      second: {
+        // second请求数据的地址
+        requestUrl:
+          "/api/v1/ams/getRailOffsetDayplan?apiId=183&dayplanReceiveStatus=1&carrierId=9",
+      },
+      activeName: "first",
+    };
+  },
+  methods: {
+    // allReceive(){
+
+    // },
+    receiver(scope) {
+      this.$confirm("是否接收", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$axios
+            .post("/api/v1/ams//receiveInwardPlan/" + scope.row.planId)
+            .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: "接收操作已取消!",
+          });
+        });
+    },
+    selectionChange(selection) {
+      this.second.mapList = selection;
+    },
+    desponseRailPlan(scope) {
+      this.$router.push("/truckOrder/decomposeRailPlan/" + scope.row.dayPlanId);
+    },
+  }
+};
+</script>
+<style lang="scss">
+.steel_inbound {
+  .sache {
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

+ 332 - 0
src/views/inward/components/truckOrder/decomposePlan.vue

@@ -0,0 +1,332 @@
+// 分解计划
+<template>
+	<div id="endMaintenance">
+		<page-title>分解计划</page-title>
+    <div class="main">
+			<span class="text">待分解的计划</span>
+			<span class="a"></span>
+		</div>
+    <dilTable v-bind.sync="first" >
+		</dilTable>
+    <div class="main">
+			<span class="text">选择线路</span>
+			<span class="a"></span>
+		</div>
+    <dilTable v-bind.sync="zero" @radio-change="currentRadioChange1">
+		</dilTable>
+		<div class="main">
+			<span class="text">分解</span>
+			<span class="a"></span>
+		</div>
+    <el-drawer
+      :visible.sync="drawer"
+      :direction="direction"
+      :before-close="handleClose"
+      size="30%"
+    >
+      <el-input placeholder="请输入内容" v-model="input"  style="margin-top:10px;margin-left:20px" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick()"  style="margin-bottom:15px">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+     <dilTable v-bind.sync="second" @radio-change="currentRadioChange" ></dilTable>    
+</el-drawer>
+		<div style="margin-left:0.625rem">
+			<vxe-toolbar>
+				<template #buttons>
+					<vxe-button icon="fa fa-plus" @click="insertEvent()">新增</vxe-button>
+				</template>
+			</vxe-toolbar>
+		</div>
+		<vxe-table v-model="tableData" keep-source border resizable show-overflow show-footer ref="xTable"
+			max-height="400" :footer-method="footerMethod" :data="tableData"
+			:edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
+			@edit-closed="editClosedEvent"
+      @edit-actived="editActivedEvent">
+			<vxe-table-column type="seq" width="60" title="序号"></vxe-table-column>
+			<vxe-table-column field="purchaseOrderNo" title="采购订单号" >
+        <template #edit="{ row }">
+              <vxe-input v-model="row.purchaseOrderNo" type="text" disabled></vxe-input>
+        </template>
+			</vxe-table-column>
+			<vxe-table-column field="planNo" title="运输计划号">
+          <template #edit="{ row }">
+              <vxe-input v-model="row.planNo" type="text" disabled></vxe-input>
+        </template>
+			</vxe-table-column>
+			<vxe-table-column field="requirementNo" title="运输需求号" 
+			 >
+      <template #edit="{ row }">
+      <vxe-input v-model="row.requirementNo" type="text" disabled></vxe-input>
+      </template>
+			</vxe-table-column>
+			<vxe-table-column field="materialName" title="物资名称"
+			
+			>
+      <template #edit="{ row }">
+      <vxe-input v-model="row.materialName" type="text" disabled></vxe-input>
+      </template>
+			</vxe-table-column>
+			<vxe-table-column field="materialWeight" title="物资重量"
+				:edit-render="{}"
+				>
+       <template #edit="{ row }">
+      <vxe-input v-model="row.materialWeight" type="text"></vxe-input>
+      </template>  
+			</vxe-table-column>
+      <vxe-table-column field="materialNumber" title="物资数量"
+				:edit-render="{}"
+				>
+       <template #edit="{ row }">
+      <vxe-input v-model="row.materialNumber" type="text" ></vxe-input>
+      </template>       
+			</vxe-table-column>
+       <vxe-table-column field="capacityNumber" title="车牌号"
+				:edit-render="{}"
+				>
+       <template #edit="{ row }">
+      <vxe-input v-model="row.capacityNumber" type="text" disabled></vxe-input>
+      </template>      
+			</vxe-table-column>
+		    <vxe-column title="操作" width="200">
+            <template #default="{ row }">
+              <vxe-button status="primary" @click="drawerCapacity(row)">选择车牌</vxe-button>
+              <vxe-button status="danger" @click="removeRow(row)">删除</vxe-button>
+            </template>
+          </vxe-column>
+		</vxe-table>
+    	<div class="main">
+			<span class="text">选择订单类型</span>
+			<span class="a"></span>
+		</div>
+    <div class="form-box" style="margin-left: 16rem">
+        <dil-form :formId="318" v-model="form"></dil-form>
+      </div>
+		<div class="" style="margin-left:40rem">
+			<el-button type="primary" @click="makeSure">确认分解</el-button>
+			<el-button type="primary" @click="cancel">返回</el-button>
+		</div>
+	</div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+export default {
+  components: {
+    PageTitle,
+  },
+  data() {
+    return {
+      tableData:[],
+      direction: "rtl",
+      input:'',
+      selectRow:null,
+      drawer:false,
+      purchaseOrderNo:"",
+      planNo:"",
+      requirementNo:"",
+      materialName:"",
+      materialWeight:null,
+      materialNumber:null,
+      carrierId:null,
+      form: {},
+      first:{
+       requestUrl: "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=1&planId="+this.$route.params.planId,
+      },
+      second:{
+        requestUrl:"/api/v1/oms/getCapacityAndDriverList?apiId=246",
+        selectionType: "radio",
+        mapList1:[]
+      },
+      zero:{
+        requestUrl:"/api/v1/rms/getAllLineDesk?apiId=249",
+        selectionType: "radio",
+        mapList0:[]
+      }
+    };
+  },
+  mounted() {
+    this.information();
+  },
+
+  methods: {
+    drawerCapacity(row){ 
+      this.drawer = true;
+      this.selectRow = row
+      console.log(row.purchaseOrderNo)
+    },
+    onclick(){
+        this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&con="+this.input
+    },
+    currentRadioChange(selection){
+      this.mapList1=selection,
+      this.selectRow.capacityNumber = this.mapList1.capacityNumber
+    },
+    currentRadioChange1(selection){
+      this.mapList0=selection
+      console.log(this.mapList0.lineId)
+    },
+   handleClose(done){
+      done();
+    },
+    sumNum (list, field) {
+              let count = 0
+              list.forEach(item => {
+                count += Number(item[field])
+              })
+              return count
+    },
+    information() {
+      //查看需求详情
+      this.$axios
+        .post(
+          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=1&planId=" + this.$route.params.planId
+        )
+        .then((res) => {
+          console.log(res)
+            const planRow = res.data.data.list
+            this.purchaseOrderNo = planRow[0].purchaseOrderNo,
+            this.requirementNo = planRow[0].requirementNumber,
+            this.planNo = planRow[0].planNumber,
+            this.materialName = planRow[0].materialName,
+            this.materialWeight = planRow[0].materialWeight,
+            this.materialNumber = planRow[0].materialNumber,
+            this.carrierId = planRow[0].carrierId
+        });
+    },
+    async insertEvent (row) {
+              const $table = this.$refs.xTable
+              const record = {
+                purchaseOrderNo: this.purchaseOrderNo,
+                requirementNo:this.requirementNo,
+                planNo:this.planNo,
+                materialName:this.materialName,
+                materialWeight:this.materialWeight - (this.sumNum(this.$refs.xTable.getInsertRecords(), 'materialWeight')),
+                materialNumber:this.materialNumber - (this.sumNum(this.$refs.xTable.getInsertRecords(), 'materialNumber'))          
+              }
+              const { row: newRow } = await $table.insertAt(record, row)
+              await $table.setActiveCell(newRow, 'name')
+            },
+    //删除行
+    async removeRow (row) {
+              const $table = this.$refs.xTable
+              await $table.remove(row)
+            },
+    // 修改
+    makeSure() {
+      console.log(this.$refs.xTable.getInsertRecords())
+      console.log(this.form)
+      let BmsTrainFreight = {
+          planId:this.$route.params.planId,
+          lineId:this.mapList0.lineId,
+          orderType:this.form.orderType,
+          carrierId:this.carrierId,
+          mapList:this.$refs.xTable.getInsertRecords()
+      };
+      console.log(BmsTrainFreight)
+      this.$axios
+        .post("/api/v1/oms/addInwardOrder", BmsTrainFreight)
+        .then((res) => {
+          if (res.data.code == 200) {
+            this.$router.go(-1);
+            this.$message({
+              type: "success",
+              message: "分解成功!",
+            });
+            
+          } else {
+            this.$message.error("分解失败!");
+          }
+        });
+    },
+    // 返回
+    cancel() {
+      console.log(this.sumNum(this.$refs.xTable.getInsertRecords(), 'materialWeight'))
+      // this.$router.go(-1);
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+#pageTitle {
+    border-bottom: 0.125rem solid $borderColorPageTitlte;
+    background-color: $backgroundColorPageTitle;
+    padding-left: 3.125rem;
+    margin-bottom: 1.875rem;
+    span {
+      font-size: 1.5rem;
+      line-height: 4.375rem;
+      color: $fontColorPageTitle;
+    }
+    i {
+      cursor: pointer;
+      border: 0.0625rem solid $fontColorPageTitle;
+      color: $fontColorPageTitle;
+      border-radius: 100%;
+      margin-right: 1.25rem;
+      // 图标放大
+      transform: scale(1.6, 1.6);
+    }
+  }
+  #query_condition{
+    margin-left: 3rem;
+  }
+  .button-box {
+    display: flex;
+    justify-content: center;
+    .el-button + .el-button {
+      margin-left: 3rem;
+    }
+  }
+  
+  .form-box {
+    display: flex;
+    margin-top: 1.25rem;
+    justify-content: center;
+    .el-form {
+      flex-direction: column;
+    }
+    
+  }
+
+  .body{
+    display: -webkit-flex;
+    display: flex;
+  }
+  .main {
+    display: flex;
+    margin-top: 1.5625rem;
+    margin-left: 1.875rem;
+    margin-bottom: 3.125rem;
+    .text {
+      margin-right: 0.625rem;
+      font-weight: 700;
+      font-size: 0.9375rem;
+    }
+    .el_text1 {
+      width: 56.875rem;
+    }
+    .a {
+      margin-top: 0.4375rem;
+      width: 80%;
+      height: 0.0625rem;
+      border-top: $gainsboro 0.0625rem solid;
+    }
+  }
+  .contractTitle{
+    margin: 0 auto;
+    text-align: center;
+  }
+  .contractId{
+    font-size: 1.25rem;
+  }
+  .form-one{
+    margin-right: 0.625rem;
+  }
+  .button-ins {
+    display: flex;
+    margin-left: 60rem;
+    margin-bottom: 1rem;
+  }
+  
+</style>

+ 337 - 0
src/views/inward/components/truckOrder/decomposeRailPlan.vue

@@ -0,0 +1,337 @@
+// 分解计划
+<template>
+	<div id="endMaintenance">
+		<page-title>分解计划</page-title>
+    <div class="main">
+			<span class="text">异地库计划</span>
+			<span class="a"></span>
+		</div>
+    <dilTable v-bind.sync="six" @radio-change="currentRadioChange9">
+		</dilTable>
+    <div style="margin-left:0.625rem">
+    <div class="main">
+			<span class="text">选择线路</span>
+			<span class="a"></span>
+		</div>
+    <dilTable v-bind.sync="zero" @radio-change="currentRadioChange1">
+		</dilTable>
+		<div class="main">
+			<span class="text">分解</span>
+			<span class="a"></span>
+		</div>
+    <vxe-toolbar>
+				<template #buttons>
+					<vxe-button icon="fa fa-plus" @click="insertEvent()">新增</vxe-button>
+				</template>
+			</vxe-toolbar>
+		</div>
+		<vxe-table v-model="tableData" keep-source border resizable show-overflow show-footer ref="xTable"
+			max-height="400" :footer-method="footerMethod" :data="tableData"
+			:edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
+			@edit-closed="editClosedEvent"
+      @edit-actived="editActivedEvent">
+			<vxe-table-column type="seq" width="60" title="序号"></vxe-table-column>
+			<vxe-table-column field="materialName" title="物资名称"			
+			>
+      <template #edit="{ row }">
+      <vxe-input v-model="row.materialName" type="text" disabled></vxe-input>
+      </template>
+			</vxe-table-column>
+      <vxe-table-column field="materialCode" title="物资编码"			
+			>
+      <template #edit="{ row }">
+      <vxe-input v-model="row.materialCode" type="text" disabled></vxe-input>
+      </template>
+			</vxe-table-column>
+			<vxe-table-column field="materialWeight" title="物资重量"
+				:edit-render="{}"
+				>
+       <template #edit="{ row }">
+      <vxe-input v-model="row.materialWeight" type="text"></vxe-input>
+      </template>  
+			</vxe-table-column>
+      <vxe-table-column field="materialNumber" title="物资件数"
+				:edit-render="{}"
+				>
+       <template #edit="{ row }">
+      <vxe-input v-model="row.materialNumber" type="text" ></vxe-input>
+      </template>       
+			</vxe-table-column>
+       <vxe-table-column field="capacityNumber" title="车牌号"
+				:edit-render="{}"
+				>
+       <template #edit="{ row }">
+      <vxe-input v-model="row.capacityNumber" type="text" disabled></vxe-input>
+      </template>      
+			</vxe-table-column>
+		    <vxe-column title="操作" width="300">
+            <template #default="{ row }">
+              <vxe-button status="primary" @click="drawerCapacity(row)">选择车牌</vxe-button>
+              <vxe-button status="primary" @click="drawerMaterial(row)">选择物资</vxe-button>
+              <vxe-button status="danger" @click="removeRow(row)">删除</vxe-button>
+            </template>
+          </vxe-column>
+		</vxe-table>
+    <el-drawer
+      :visible.sync="drawer"
+      :direction="direction"
+      :before-close="handleClose"
+      size="30%"
+    >
+      <el-input placeholder="请输入内容" v-model="input"  style="margin-top:10px;margin-left:20px" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclickdriver()"  style="margin-bottom:15px">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+     <dilTable v-bind.sync="second" @radio-change="currentRadioChange" ></dilTable>    
+    </el-drawer>
+      <el-drawer
+      :visible.sync="drawer1"
+      :direction="direction1"
+      :before-close="handleClose1"
+      size="30%"
+    >
+      <el-input placeholder="请输入内容" v-model="inputText"  style="margin-top:10px;margin-left:20px" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclickMaterial()"  style="margin-bottom:15px">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+     <dilTable v-bind.sync="first" @radio-change="currentRadioChange4" ></dilTable>    
+    </el-drawer>
+		
+    	<div class="main">
+			<span class="text">选择订单类型</span>
+			<span class="a"></span>
+		</div>
+    <div class="form-box" style="margin-left: 16rem">
+        <dil-form :formId="318" v-model="form"></dil-form>
+      </div>
+		<div class="" style="margin-left:40rem">
+			<el-button type="primary" @click="makeSure">确认分解</el-button>
+			<el-button type="primary" @click="cancel">返回</el-button>
+		</div>
+	</div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: {
+    PageTitle,
+  },
+  data() {
+    return {
+      tableData:[],
+      direction: "rtl",
+      direction1: "rtl",
+      input:'',
+      inputText:'',
+      selectRow:null,
+      materialRow:null,
+      drawer:false,
+      drawer1:false,
+      purchaseOrderNo:"",
+      planNo:"",
+      requirementNo:"",
+     
+      materialWeight:null,
+      materialNumber:null,
+      carrierId:null,
+      form: {},
+      first:{
+       requestUrl: "/api/v1/ams/getMaterialMesByDayPlanId?apiId=362&dayplanId="+this.$route.params.dayPlanId,
+       selectionType:"radio",
+       mapList4:[]
+      },
+      six:{
+        requestUrl:"/api/v1/ams/getRailOffsetDayplanId?apiId=183&dayPlanId="+this.$route.params.dayPlanId,
+      },
+      second:{
+        requestUrl:"/api/v1/oms/getCapacityAndDriverList?apiId=246",
+        selectionType: "radio",
+        mapList1:[]
+      },
+      zero:{
+        requestUrl:"/api/v1/rms/getAllLineDesk?apiId=249",
+        selectionType: "radio",
+        mapList0:[]
+      }
+    };
+  },
+  mounted() {
+    this.information();
+  },
+
+  methods: {
+    drawerCapacity(row){ 
+      this.drawer = true;
+      this.selectRow = row
+      console.log(row.purchaseOrderNo)
+    },
+    drawerMaterial(row){
+      this.drawer1 = true;
+      this.materialRow = row,
+      console.log(row)
+      console.log(this.drawer1)
+    },
+    onclickdriver(){
+        this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&con="+this.input
+    },
+    currentRadioChange(selection){
+      this.mapList1=selection,
+      this.selectRow.capacityNumber = this.mapList1.capacityNumber
+    },
+    currentRadioChange1(selection){
+      this.mapList0=selection
+      console.log(this.mapList0.lineId)
+    },
+    currentRadioChange4(selection){
+      this.mapList4 = selection
+      console.log(this.mapList4)
+      this.materialRow.materialName = this.mapList4.materailName,
+      this.materialRow.materialCode = this.mapList4.materialCode
+    },
+   handleClose(done){
+      done();
+    },
+    sumNum (list, field) {
+              let count = 0
+              list.forEach(item => {
+                count += Number(item[field])
+              })
+              return count
+    },
+    information() {
+      //查看需求详情
+    },
+    async insertEvent (row) {
+              const $table = this.$refs.xTable
+              const record = {
+                purchaseOrderNo: this.purchaseOrderNo,         
+              }
+              const { row: newRow } = await $table.insertAt(record, row)
+              await $table.setActiveCell(newRow, 'name')
+            },
+    //删除行
+    async removeRow (row) {
+              const $table = this.$refs.xTable
+              await $table.remove(row)
+            },
+    // 修改
+    makeSure() {
+      console.log(this.$refs.xTable.getInsertRecords())
+      console.log(this.form)
+      let BmsTrainFreight = {
+          dayPlanId:this.$route.params.dayPlanId,
+          lineId:this.mapList0.lineId,
+          orderType:this.form.orderType,
+          carrierId:this.carrierId,
+          mapList:this.$refs.xTable.getInsertRecords()
+      };
+      console.log(BmsTrainFreight)
+      this.$axios
+        .post("/api/v1/oms/apportionInwardOffsetOrder", BmsTrainFreight)
+        .then((res) => {
+          if (res.data.code == 200) {
+            this.$router.go(-1);
+            this.$message({
+              type: "success",
+              message: "分解成功!",
+            });
+            
+          } else {
+            this.$message.error("分解失败!");
+          }
+        });
+    },
+    // 返回
+    cancel() {
+      console.log(this.sumNum(this.$refs.xTable.getInsertRecords(), 'materialWeight'))
+      // this.$router.go(-1);
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+#pageTitle {
+    border-bottom: 0.125rem solid $borderColorPageTitlte;
+    background-color: $backgroundColorPageTitle;
+    padding-left: 3.125rem;
+    margin-bottom: 1.875rem;
+    span {
+      font-size: 1.5rem;
+      line-height: 4.375rem;
+      color: $fontColorPageTitle;
+    }
+    i {
+      cursor: pointer;
+      border: 0.0625rem solid $fontColorPageTitle;
+      color: $fontColorPageTitle;
+      border-radius: 100%;
+      margin-right: 1.25rem;
+      // 图标放大
+      transform: scale(1.6, 1.6);
+    }
+  }
+  #query_condition{
+    margin-left: 3rem;
+  }
+  .button-box {
+    display: flex;
+    justify-content: center;
+    .el-button + .el-button {
+      margin-left: 3rem;
+    }
+  }
+  
+  .form-box {
+    display: flex;
+    margin-top: 1.25rem;
+    justify-content: center;
+    .el-form {
+      flex-direction: column;
+    }
+    
+  }
+
+  .body{
+    display: -webkit-flex;
+    display: flex;
+  }
+  .main {
+    display: flex;
+    margin-top: 1.5625rem;
+    margin-left: 1.875rem;
+    margin-bottom: 3.125rem;
+    .text {
+      margin-right: 0.625rem;
+      font-weight: 700;
+      font-size: 0.9375rem;
+    }
+    .el_text1 {
+      width: 56.875rem;
+    }
+    .a {
+      margin-top: 0.4375rem;
+      width: 80%;
+      height: 0.0625rem;
+      border-top: $gainsboro 0.0625rem solid;
+    }
+  }
+  .contractTitle{
+    margin: 0 auto;
+    text-align: center;
+  }
+  .contractId{
+    font-size: 1.25rem;
+  }
+  .form-one{
+    margin-right: 0.625rem;
+  }
+  .button-ins {
+    display: flex;
+    margin-left: 60rem;
+    margin-bottom: 1rem;
+  }
+  
+</style>

+ 140 - 0
src/views/inward/components/truckOrder/dispatchPlan.vue

@@ -0,0 +1,140 @@
+// 分派计划
+<template>
+  <div class="steel_inbound">
+    <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="dispatch"
+        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">
+            </dilTable>
+          </el-tab-pane>
+          <el-tab-pane label="已分派" name="second">
+            <dilTable v-bind.sync="second"> </dilTable>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </template>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      inputText: "",
+      first: {
+        // first请求数据的地址
+        requestUrl:
+          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=3&carrierId=1",
+        selectionType: "select",
+        mapList: [],
+      },
+      second: {
+        // second请求数据的地址
+        requestUrl:
+          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=1",
+      },
+      activeName: "first",
+    };
+  },
+  methods: {
+    selectionChange(selection) {
+      console.log("-----");
+      this.first.mapList = selection;
+      console.log(this.first.mapList);
+      console.log("------");
+    },
+    dispatch() {
+      console.log(this.first.mapList);
+      this.$confirm("是否分派", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$axios
+            .post("/api/v1/oms/apportionInwardOrder", this.first.mapList)
+            .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: "分派操作已取消!",
+          });
+        });
+    },
+    deletePlan(scope) {
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$axios
+            .post(
+              "/api/v1/bms/deleteTrainSettlement/" + scope.row.requirementId
+            )
+            .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: "删除操作已取消!",
+          });
+        });
+    },
+  },
+};
+</script>
+<style lang="scss">
+.steel_inbound {
+  .sache {
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

+ 203 - 0
src/views/inward/components/truckOrder/plan.vue

@@ -0,0 +1,203 @@
+// 分解计划
+<template>
+  <div class="steel_inbound">
+    <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>
+    </div>
+    <template>
+      <div>
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="未接收" name="first">
+            <dilTable v-bind.sync="first">
+              <el-table-column fixed="right" label="操作" width="50">
+                <template slot-scope="scope">
+                  <el-button type="text" size="mini" @click="receiver(scope)">
+                    接收
+                  </el-button>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+          <el-tab-pane label="已接收" name="second">
+            <dilTable v-bind.sync="second">
+              <el-table-column fixed="right" label="操作" width="50">
+                <template slot-scope="scope">
+                  <el-button
+                    type="text"
+                    size="mini"
+                    @click="desponsePlan(scope)"
+                  >
+                    分解
+                  </el-button>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+          <el-tab-pane label="已分解" name="third">
+            <dilTable v-bind.sync="third">
+              <el-button
+                type="text"
+                size="mini"
+                @click="getdesponsePlan(scope)"
+              >
+                查看
+              </el-button>
+            </dilTable>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </template>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      inputText: "",
+      first: {
+        // first请求数据的地址
+        requestUrl:
+          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&carrierId=1",
+      },
+      second: {
+        // second请求数据的地址
+        requestUrl:
+          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=1",
+      },
+      third: {
+        // second请求数据的地址
+        requestUrl:
+          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&carrierId=1",
+      },
+      activeName: "first",
+    };
+  },
+  methods: {
+    // allReceive(){
+
+    // },
+    receiver(scope) {
+      this.$confirm("是否接收", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$axios
+            .post("/api/v1/ams//receiveInwardPlan/" + scope.row.planId)
+            .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: "接收操作已取消!",
+          });
+        });
+    },
+    selectionChange(selection) {
+      this.second.mapList = selection;
+    },
+    desponsePlan(scope) {
+      this.$router.push("/truckOrder/decomposePlan/" + scope.row.planId);
+    },
+    deletePlan(scope) {
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$axios
+            .post(
+              "/api/v1/bms/deleteTrainSettlement/" + scope.row.requirementId
+            )
+            .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: "删除操作已取消!",
+          });
+        });
+    },
+    Issue() {
+      console.log(this.first.mapList);
+      this.$confirm("是否下发", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$axios
+            .post(
+              "/api/v1/ams/addFixedAmsDispatchSaleOrder",
+              this.first.mapList
+            )
+            .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: "取消下发!",
+          });
+        });
+    },
+  },
+};
+</script>
+<style lang="scss">
+.steel_inbound {
+  .sache {
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

+ 197 - 0
src/views/inward/router/index.js

@@ -0,0 +1,197 @@
+import Vue from 'vue'
+import Router from 'vue-router'
+
+import routerBefore from '@/config/routerBefore.js'
+
+// 主要
+import main from '@/components/main.vue'
+// 系统配置管理
+//运输预约--提出需求
+import requirement from '@/views/inward/components/truckAppoint/requirement.vue'
+//运输预约--制定计划
+import truckAppointPlan from '@/views/inward/components/truckAppoint/plan.vue'
+//运输预约--制定内转钢材到异地库计划
+import RailPlan from '@/views/inward/components/truckAppoint/RailPlan.vue'
+//运输订单--分解计划
+import truckOrderPlan from '@/views/inward/components/truckOrder/plan.vue'
+//运输订单--分解内转异地库计划
+import truckOrderRailPlan from '@/views/inward/components/truckOrder/RailPlan.vue'
+//运输订单--分派计划
+import dispatchPlan from '@/views/inward/components/truckOrder/dispatchPlan.vue'
+//内转钢材到异地库--汽车运输--进厂作业
+import enFactoryResult from '@/views/inward/components/offsetSteel/truckTransport/enFactoryResult.vue'
+//内转钢材到异地库--汽车运输--计皮作业
+import tareWeightResult from '@/views/inward/components/offsetSteel/truckTransport/tareWeightResult.vue'
+//内转钢材到异地库--汽车运输--装车作业
+import loadTruckResult from '@/views/inward/components/offsetSteel/truckTransport/loadTruckResult.vue'
+//内转钢材到异地库--汽车运输--质检作业
+import qualityResult from '@/views/inward/components/offsetSteel/truckTransport/qualityResult.vue'
+//内转钢材到异地库--汽车运输--计毛作业
+import grossWeightResult from '@/views/inward/components/offsetSteel/truckTransport/grossWeightResult.vue'
+//内转钢材到异地库--汽车运输--出厂作业
+import outFactory from '@/views/inward/components/offsetSteel/truckTransport/outFactory.vue'
+//内转钢材到异地库--汽车运输--收货作业
+import truckReceiptResult from '@/views/inward/components/offsetSteel/truckTransport/truckReceiptResult.vue'
+//内转钢材到异地库--火车运输--请车作业
+import wagonPlease from '@/views/inward/components/offsetSteel/truckTrain/wagonPlease.vue'
+//内转钢材到异地库--火车运输--批车作业
+import wagonApprove from '@/views/inward/components/offsetSteel/truckTrain/wagonApprove.vue'
+//内转钢材到异地库--火车运输--装车作业
+import wagonLoad from '@/views/inward/components/offsetSteel/truckTrain/wagonLoad.vue'
+//内转钢材到异地库--火车运输--卸车作业
+import wagonUnLoad from '@/views/inward/components/offsetSteel/truckTrain/wagonUnLoad.vue'
+//内转进口矿/国产矿/燃料--达州站-厂内料场--火车卸车
+import trainUnload from '@/views/inward/components/inwardImport/daZhou/trainUnload.vue'
+//内转进口矿/国产矿/燃料--达州站-厂内料场--汽车装车
+import truckLoad from '@/views/inward/components/inwardImport/daZhou/truckLoad.vue'
+//内转进口矿/国产矿/燃料--达州站-厂内料场--进厂作业
+import daZhouEnFactoryResult from '@/views/inward/components/inwardImport/daZhou/enFactoryResult.vue'
+//内转进口矿/国产矿/燃料--达州站-厂内料场--计毛作业
+import daZhouGrossWeightResult from '@/views/inward/components/inwardImport/daZhou/grossWeightResult.vue'
+//内转进口矿/国产矿/燃料--达州站-厂内料场--卸货作业
+import unload from '@/views/inward/components/inwardImport/daZhou/unload.vue'
+//内转进口矿/国产矿/燃料--达州站-厂内料场--质检作业
+import daZhouQualityResult from '@/views/inward/components/inwardImport/daZhou/qualityResult.vue'
+//内转进口矿/国产矿/燃料--达州站-厂内料场--计皮作业
+import daZhouTareWeightResult from '@/views/inward/components/inwardImport/daZhou/tareWeightResult.vue'
+//内转进口矿/国产矿/燃料--达州站-厂内料场--收货作业
+import receipt from '@/views/inward/components/inwardImport/daZhou/receipt.vue'
+//内转进口矿/国产矿/燃料--达州站-厂内料场--出厂作业
+import daZhouOutFactory from '@/views/inward/components/inwardImport/daZhou/outFactory.vue'
+//内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--铁路专用线卸货
+import trainLineUnload from '@/views/inward/components/inwardImport/oldAreaRailScale/trainLineUnload.vue'
+//内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--质检作业
+import oldAreaRailScaleQualityResult from '@/views/inward/components/inwardImport/oldAreaRailScale/qualityResult.vue'
+//内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--汽车装货
+import oldAreaRailScaleTruckLoad from '@/views/inward/components/inwardImport/oldAreaRailScale/truckLoad.vue'
+//内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--计毛作业
+import oldAreaRailScaleGrossWeightResult from '@/views/inward/components/inwardImport/oldAreaRailScale/grossWeightResult.vue'
+//内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--卸货作业
+import oldAreaRailScaleUnload from '@/views/inward/components/inwardImport/oldAreaRailScale/unload.vue'
+//内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--计皮作业
+import oldAreaRailScaleTareWeightResult from '@/views/inward/components/inwardImport/oldAreaRailScale/tareWeightResult.vue'
+//内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--收货作业
+import oldAreaRailScaleReceipt from '@/views/inward/components/inwardImport/oldAreaRailScale/receipt.vue'
+//内转进口矿/国产矿/燃料--内转厂内物资--进厂作业
+import inwardFactoryEnFactoryResult from '@/views/inward/components/inwardFactory/enFactoryResult.vue'
+//内转进口矿/国产矿/燃料--内转厂内物资--装车作业
+import inwardFactoryTruckLoad from '@/views/inward/components/inwardFactory/truckLoad.vue'
+//内转进口矿/国产矿/燃料--内转厂内物资--计量作业
+import inwardFactoryTareWeightResult from '@/views/inward/components/inwardFactory/tareWeightResult.vue'
+//内转进口矿/国产矿/燃料--内转厂内物资--卸车作业
+import inwardFactoryUnload from '@/views/inward/components/inwardFactory/unload.vue'
+//内转进口矿/国产矿/燃料--内转厂内物资--出厂作业
+import inwardFactoryOutFactory from '@/views/inward/components/inwardFactory/outFactory.vue'
+//内转进口矿/国产矿/燃料--内转厂内物资--计时作业
+import timeTaskResult from '@/views/inward/components/inwardFactory/timeTaskResult.vue'
+//内转进口矿/国产矿/燃料--内转厂内物资--计数作业
+import countResult from '@/views/inward/components/inwardFactory/countResult.vue'
+//内转进口矿/国产矿/燃料--内转厂内物资--包月作业
+import monthResult from '@/views/inward/components/inwardFactory/monthResult.vue'
+
+Vue.use(Router)
+
+const constantRouterMap = [{
+  path: '/',
+  name: 'main',
+  meta: {
+    title: '首页',
+    code: 'xtpzgl'
+  },
+  component: main,
+  redirect: {
+    name: 'requirement'
+  },
+  children: [
+    {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    {path: 'truckAppointPlan',name: 'truckAppointPlan',meta: {code: 'xtpzgl-yhgl'},component: truckAppointPlan}, 
+    {path: 'RailPlan',name: 'RailPlan',meta: {code: 'xtpzgl-yhgl'},component: RailPlan}, 
+    {path: 'truckOrderPlan',name: 'truckOrderPlan',meta: {code: 'xtpzgl-yhgl'},component: truckOrderPlan}, 
+    {path: 'truckOrderRailPlan',name: 'truckOrderRailPlan',meta: {code: 'xtpzgl-yhgl'},component: truckOrderRailPlan}, 
+    {path: 'dispatchPlan',name: 'dispatchPlan',meta: {code: 'xtpzgl-yhgl'},component: dispatchPlan}, 
+    {path: 'enFactoryResult',name: 'enFactoryResult',meta: {code: 'xtpzgl-yhgl'},component: enFactoryResult}, 
+    {path: 'tareWeightResult',name: 'tareWeightResult',meta: {code: 'xtpzgl-yhgl'},component: tareWeightResult}, 
+    {path: 'loadTruckResult',name: 'loadTruckResult',meta: {code: 'xtpzgl-yhgl'},component: loadTruckResult}, 
+    {path: 'qualityResult',name: 'qualityResult',meta: {code: 'xtpzgl-yhgl'},component: qualityResult}, 
+    {path: 'grossWeightResult',name: 'grossWeightResult',meta: {code: 'xtpzgl-yhgl'},component: grossWeightResult}, 
+    {path: 'outFactory',name: 'outFactory',meta: {code: 'xtpzgl-yhgl'},component: outFactory}, 
+    {path: 'truckReceiptResult',name: 'truckReceiptResult',meta: {code: 'xtpzgl-yhgl'},component: truckReceiptResult}, 
+    {path: 'wagonPlease',name: 'wagonPlease',meta: {code: 'xtpzgl-yhgl'},component: wagonPlease}, 
+    {path: 'wagonApprove',name: 'wagonApprove',meta: {code: 'xtpzgl-yhgl'},component: wagonApprove}, 
+    {path: 'wagonLoad',name: 'wagonLoad',meta: {code: 'xtpzgl-yhgl'},component: wagonLoad}, 
+    {path: 'wagonUnLoad',name: 'wagonUnLoad',meta: {code: 'xtpzgl-yhgl'},component: wagonUnLoad}, 
+    {path: 'trainUnload',name: 'trainUnload',meta: {code: 'xtpzgl-yhgl'},component: trainUnload}, 
+    {path: 'truckLoad',name: 'truckLoad',meta: {code: 'xtpzgl-yhgl'},component: truckLoad}, 
+    {path: 'daZhouEnFactoryResult',name: 'daZhouEnFactoryResult',meta: {code: 'xtpzgl-yhgl'},component: daZhouEnFactoryResult}, 
+    {path: 'daZhouGrossWeightResult',name: 'daZhouGrossWeightResult',meta: {code: 'xtpzgl-yhgl'},component: daZhouGrossWeightResult}, 
+    {path: 'unload',name: 'unload',meta: {code: 'xtpzgl-yhgl'},component: unload}, 
+    {path: 'daZhouQualityResult',name: 'daZhouQualityResult',meta: {code: 'xtpzgl-yhgl'},component: daZhouQualityResult}, 
+    {path: 'daZhouTareWeightResult',name: 'daZhouTareWeightResult',meta: {code: 'xtpzgl-yhgl'},component: daZhouTareWeightResult}, 
+    {path: 'receipt',name: 'receipt',meta: {code: 'xtpzgl-yhgl'},component: receipt}, 
+    {path: 'daZhouOutFactory',name: 'daZhouOutFactory',meta: {code: 'xtpzgl-yhgl'},component: daZhouOutFactory}, 
+    {path: 'trainLineUnload',name: 'trainLineUnload',meta: {code: 'xtpzgl-yhgl'},component: trainLineUnload}, 
+    {path: 'oldAreaRailScaleQualityResult',name: 'oldAreaRailScaleQualityResult',meta: {code: 'xtpzgl-yhgl'},component: oldAreaRailScaleQualityResult}, 
+    {path: 'oldAreaRailScaleTruckLoad',name: 'oldAreaRailScaleTruckLoad',meta: {code: 'xtpzgl-yhgl'},component: oldAreaRailScaleTruckLoad}, 
+    {path: 'oldAreaRailScaleGrossWeightResult',name: 'oldAreaRailScaleGrossWeightResult',meta: {code: 'xtpzgl-yhgl'},component: oldAreaRailScaleGrossWeightResult}, 
+    {path: 'oldAreaRailScaleUnload',name: 'oldAreaRailScaleUnload',meta: {code: 'xtpzgl-yhgl'},component: oldAreaRailScaleUnload}, 
+    {path: 'oldAreaRailScaleTareWeightResult',name: 'oldAreaRailScaleTareWeightResult',meta: {code: 'xtpzgl-yhgl'},component: oldAreaRailScaleTareWeightResult}, 
+    {path: 'oldAreaRailScaleReceipt',name: 'oldAreaRailScaleReceipt',meta: {code: 'xtpzgl-yhgl'},component: oldAreaRailScaleReceipt}, 
+    {path: 'inwardFactoryEnFactoryResult',name: 'inwardFactoryEnFactoryResult',meta: {code: 'xtpzgl-yhgl'},component: inwardFactoryEnFactoryResult}, 
+    {path: 'inwardFactoryTruckLoad',name: 'inwardFactoryTruckLoad',meta: {code: 'xtpzgl-yhgl'},component: inwardFactoryTruckLoad}, 
+    {path: 'inwardFactoryTareWeightResult',name: 'inwardFactoryTareWeightResult',meta: {code: 'xtpzgl-yhgl'},component: inwardFactoryTareWeightResult}, 
+    {path: 'inwardFactoryUnload',name: 'inwardFactoryUnload',meta: {code: 'xtpzgl-yhgl'},component: inwardFactoryUnload}, 
+    {path: 'inwardFactoryOutFactory',name: 'inwardFactoryOutFactory',meta: {code: 'xtpzgl-yhgl'},component: inwardFactoryOutFactory}, 
+    {path: 'timeTaskResult',name: 'timeTaskResult',meta: {code: 'xtpzgl-yhgl'},component: timeTaskResult}, 
+    {path: 'countResult',name: 'countResult',meta: {code: 'xtpzgl-yhgl'},component: countResult}, 
+    {path: 'monthResult',name: 'monthResult',meta: {code: 'xtpzgl-yhgl'},component: monthResult}, 
+
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    // {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+  ]
+}];
+
+const router = new Router({
+  routes: constantRouterMap
+})
+//  before
+routerBefore(router, constantRouterMap);
+
+export default router;
+//  constantRouterMap
+export const routes = constantRouterMap;

+ 0 - 47
src/views/ship/app.js

@@ -28,53 +28,6 @@ const apolloProvider = new VueApollo({
     defaultClient: apollo
     defaultClient: apollo
 })
 })
 
 
- //把时间戳改为正常可读的时间
- 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 getDuration(my_time) { 
-  if(my_time !== null){
-      return Math.floor(my_time / 1000 / 60);
-  }
-  return null;
-}
-export function sjTime(orderPlanInTime) {
-  var stringTime = renderTime(orderPlanInTime);
-  var timestamp1 = stringTime.replace(/-/g, "/");
-  return new Date(timestamp1).getTime();
-}
-//验证电话号码
-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}$/;
-  if (!myreg.test(Phone)) {
-      return false;
-  } else {
-      return true;
-  }
-}
-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;
-  }
-}
 /* eslint-disable no-new */
 /* eslint-disable no-new */
 new Vue({
 new Vue({
   el: '#app',
   el: '#app',

+ 1 - 1
src/views/ship/components/addDeliveryAttorney.vue

@@ -45,7 +45,7 @@
 </template>
 </template>
 <script>
 <script>
 import PageTitle from "@/components/Page/Title";
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/components/app";
+import { sjTime } from "@/js/sharedJsFile";
 export default {
 export default {
   components: { PageTitle },
   components: { PageTitle },
   data() {
   data() {

+ 1 - 1
src/views/ship/components/addDeliveryNotice.vue

@@ -28,7 +28,7 @@
 
 
 <script>
 <script>
 import PageTitle from "@/components/Page/Title";
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/components/app";
+import { sjTime } from "@/js/sharedJsFile";
 export default {
 export default {
   components: { PageTitle },
   components: { PageTitle },
   data() {
   data() {

+ 1 - 2
src/views/ship/components/modifyDeliveryAttroney.vue

@@ -23,7 +23,6 @@
 
 
 <script>
 <script>
 import PageTitle from "@/components/Page/Title";
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/components/app";
 export default {
 export default {
   components: { PageTitle },
   components: { PageTitle },
     data(){
     data(){
@@ -64,7 +63,7 @@ export default {
      };
      };
       function isNumber() {
       function isNumber() {
         var value = AmsshipDeliveryAttorney.attorneyContactTelephone;
         var value = AmsshipDeliveryAttorney.attorneyContactTelephone;
-        //验证是否为数字
+        // 验证是否为数字
         var patrn = /^(-)?\d+(\.\d+)?$/;
         var patrn = /^(-)?\d+(\.\d+)?$/;
         if (patrn.exec(value) == null || value == "") {
         if (patrn.exec(value) == null || value == "") {
           return false;
           return false;

+ 1 - 1
src/views/ship/components/modifyDeliveryNotice.vue

@@ -23,7 +23,7 @@
 
 
 <script>
 <script>
 import PageTitle from "@/components/Page/Title";
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/components/app";
+import { sjTime } from "@/js/sharedJsFile";
 export default {
 export default {
   components: { PageTitle },
   components: { PageTitle },
     data(){
     data(){