HUJIANGUO 3 anni fa
parent
commit
47c6437572
100 ha cambiato i file con 12082 aggiunte e 0 eliminazioni
  1. 23 0
      src/views/TMS/app.html
  2. 39 0
      src/views/TMS/app.js
  3. 90 0
      src/views/TMS/components/bmsport/addHandlingFee.vue
  4. 97 0
      src/views/TMS/components/bmsport/handlingFee.vue
  5. 95 0
      src/views/TMS/components/bmsport/updateHandlingFee.vue
  6. 84 0
      src/views/TMS/components/bmsship/bmsshipResult.vue
  7. 68 0
      src/views/TMS/components/bmsship/bmsstatementDetailsOrder.vue
  8. 46 0
      src/views/TMS/components/bmsship/detailsOrder.vue
  9. 68 0
      src/views/TMS/components/bmsship/detailsStatement.vue
  10. 84 0
      src/views/TMS/components/bmsship/lossDetailsStatement.vue
  11. 132 0
      src/views/TMS/components/bmsship/shipBillingFormula.vue
  12. 69 0
      src/views/TMS/components/bmsship/statementDetailsOrderShip.vue
  13. 98 0
      src/views/TMS/components/bmsship/toBeStatement.vue
  14. 91 0
      src/views/TMS/components/bmsship/uncomplateDetails.vue
  15. 91 0
      src/views/TMS/components/bmsship/uncomplateWater.vue
  16. 95 0
      src/views/TMS/components/bmstrain/addTrainDetails.vue
  17. 51 0
      src/views/TMS/components/bmstrain/detailsTrainOrder.vue
  18. 88 0
      src/views/TMS/components/bmstrain/detailsTrainStatement.vue
  19. 69 0
      src/views/TMS/components/bmstrain/statementDetailsOrder.vue
  20. 48 0
      src/views/TMS/components/bmstrain/trainResult.vue
  21. 91 0
      src/views/TMS/components/bmstrain/uncomplateTrainDetails.vue
  22. 60 0
      src/views/TMS/components/bmstruck/detailsTruckOrder.vue
  23. 52 0
      src/views/TMS/components/bmstruck/truckResult.vue
  24. 62 0
      src/views/TMS/components/domesticMine/approveWagonPlease.vue
  25. 117 0
      src/views/TMS/components/domesticMine/approveWagonPleaseAdd.vue
  26. 99 0
      src/views/TMS/components/domesticMine/approveWagonPleaseEdit.vue
  27. 77 0
      src/views/TMS/components/domesticMine/entrustMine.vue
  28. 500 0
      src/views/TMS/components/domesticMine/wagonLoadAdd.vue
  29. 103 0
      src/views/TMS/components/domesticMine/wagonLoadEdit.vue
  30. 100 0
      src/views/TMS/components/domesticMine/wagonLoadMine.vue
  31. 272 0
      src/views/TMS/components/domesticMine/wagonLoadbu.vue
  32. 94 0
      src/views/TMS/components/domesticMine/wagonPleaseAdd.vue
  33. 100 0
      src/views/TMS/components/domesticMine/wagonPleaseEdit.vue
  34. 151 0
      src/views/TMS/components/domesticMine/wagonPleaseMine.vue
  35. 101 0
      src/views/TMS/components/domesticMine/wagonUnLoadAdd.vue
  36. 99 0
      src/views/TMS/components/domesticMine/wagonUnLoadEdit.vue
  37. 92 0
      src/views/TMS/components/domesticMine/wagonUnLoadMine.vue
  38. 466 0
      src/views/TMS/components/importedEmergency/addWagonLoad.vue
  39. 466 0
      src/views/TMS/components/importedEmergency/addWagonLoadEmergency.vue
  40. 105 0
      src/views/TMS/components/importedEmergency/addWagonUnLoad.vue
  41. 105 0
      src/views/TMS/components/importedEmergency/addWagonUnLoadEmergency.vue
  42. 102 0
      src/views/TMS/components/importedEmergency/editWagonLoad.vue
  43. 102 0
      src/views/TMS/components/importedEmergency/editWagonLoadEmergency.vue
  44. 100 0
      src/views/TMS/components/importedEmergency/editWagonUnLoad.vue
  45. 100 0
      src/views/TMS/components/importedEmergency/editWagonUnLoadEmergency.vue
  46. 63 0
      src/views/TMS/components/importedEmergency/entrustEmergency.vue
  47. 93 0
      src/views/TMS/components/importedEmergency/trainDetails.vue
  48. 89 0
      src/views/TMS/components/importedEmergency/wagonLoadEmergency.vue
  49. 96 0
      src/views/TMS/components/importedEmergency/wagonUnLoadEmergency.vue
  50. 375 0
      src/views/TMS/components/importedFuel/transportReserveFuAdd.vue
  51. 178 0
      src/views/TMS/components/importedFuel/transportReserveRan.vue
  52. 581 0
      src/views/TMS/components/importedFuel/transportReserveRanAdd.vue
  53. 83 0
      src/views/TMS/components/importedFuel/transportReserveRanEdit.vue
  54. 60 0
      src/views/TMS/components/importedFuel/truckDriverReceiveRan.vue
  55. 78 0
      src/views/TMS/components/importedFuel/truckEnfactoryRanLaoResult.vue
  56. 78 0
      src/views/TMS/components/importedFuel/truckEnfactoryRanXingResult.vue
  57. 43 0
      src/views/TMS/components/importedFuel/truckJiMaoRanLaoResult.vue
  58. 43 0
      src/views/TMS/components/importedFuel/truckJiMaoRanXingResult.vue
  59. 44 0
      src/views/TMS/components/importedFuel/truckJiPiRanLaoResult.vue
  60. 44 0
      src/views/TMS/components/importedFuel/truckJiPiRanXingResult.vue
  61. 44 0
      src/views/TMS/components/importedFuel/truckLeaveFactoryRanLaoResult.vue
  62. 43 0
      src/views/TMS/components/importedFuel/truckLeaveFactoryRanXingResult.vue
  63. 56 0
      src/views/TMS/components/importedFuel/truckQualityRanLaoResult.vue
  64. 96 0
      src/views/TMS/components/importedFuel/truckQualityRanLaoResultEdit.vue
  65. 54 0
      src/views/TMS/components/importedFuel/truckQualityRanXingResult.vue
  66. 96 0
      src/views/TMS/components/importedFuel/truckQualityRanXingResultEdit.vue
  67. 42 0
      src/views/TMS/components/importedFuel/truckReceiptRanLaoResult.vue
  68. 43 0
      src/views/TMS/components/importedFuel/truckReceiptRanXingResult.vue
  69. 41 0
      src/views/TMS/components/importedFuel/truckUnloadRanLaoResult.vue
  70. 43 0
      src/views/TMS/components/importedFuel/truckUnloadRanXingResult.vue
  71. 217 0
      src/views/TMS/components/importedIngredients/transportReserveFu.vue
  72. 551 0
      src/views/TMS/components/importedIngredients/transportReserveFuAdd.vue
  73. 551 0
      src/views/TMS/components/importedIngredients/transportReserveFuAddIngredients.vue
  74. 100 0
      src/views/TMS/components/importedIngredients/transportReserveFuEdit.vue
  75. 113 0
      src/views/TMS/components/importedIngredients/truckDriverReceiveFu.vue
  76. 104 0
      src/views/TMS/components/importedIngredients/truckEnfactoryFuResult.vue
  77. 187 0
      src/views/TMS/components/importedIngredients/truckJiMaoFuResult.vue
  78. 45 0
      src/views/TMS/components/importedIngredients/truckJiPiFuResult.vue
  79. 58 0
      src/views/TMS/components/importedIngredients/truckLeaveFactoryFuResult.vue
  80. 72 0
      src/views/TMS/components/importedIngredients/truckQualityFuResult.vue
  81. 96 0
      src/views/TMS/components/importedIngredients/truckQualityFuResultEdit.vue
  82. 58 0
      src/views/TMS/components/importedIngredients/truckReceiptFuResult.vue
  83. 58 0
      src/views/TMS/components/importedIngredients/truckReturnResult.vue
  84. 57 0
      src/views/TMS/components/importedIngredients/truckUnloadFuResult.vue
  85. 120 0
      src/views/TMS/components/importedMine/addApproveWagonPlease.vue
  86. 475 0
      src/views/TMS/components/importedMine/addWagonLoad.vue
  87. 96 0
      src/views/TMS/components/importedMine/addWagonPlease.vue
  88. 101 0
      src/views/TMS/components/importedMine/addWagonUnLoad.vue
  89. 100 0
      src/views/TMS/components/importedMine/editApproveWagonPlease.vue
  90. 105 0
      src/views/TMS/components/importedMine/editWagonLoad.vue
  91. 100 0
      src/views/TMS/components/importedMine/editWagonPlease.vue
  92. 100 0
      src/views/TMS/components/importedMine/editWagonUnLoad.vue
  93. 63 0
      src/views/TMS/components/importedMine/entrust.vue
  94. 63 0
      src/views/TMS/components/importedMine/wagonApprove.vue
  95. 93 0
      src/views/TMS/components/importedMine/wagonLoad.vue
  96. 155 0
      src/views/TMS/components/importedMine/wagonPlease.vue
  97. 96 0
      src/views/TMS/components/importedMine/wagonUnLoad.vue
  98. 136 0
      src/views/TMS/components/importedShip/addBargeShip.vue
  99. 139 0
      src/views/TMS/components/importedShip/addLoadShip.vue
  100. 125 0
      src/views/TMS/components/importedShip/addShipLocation.vue

+ 23 - 0
src/views/TMS/app.html

@@ -0,0 +1,23 @@
+<!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>

+ 39 - 0
src/views/TMS/app.js

@@ -0,0 +1,39 @@
+// 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'
+
+
+// 关闭生产模式下给出的提示
+Vue.config.productionTip = false;
+
+// 注册表格的全局组件
+import DilCommonUI from "@/components/DilCommonUI";
+Vue.use(DilCommonUI);
+
+Vue.use(VueApollo)
+
+const apolloProvider = new VueApollo({
+    defaultClient: apollo
+})
+/* eslint-disable no-new */
+new Vue({
+  el: '#app',
+  router,
+  store,
+  components: { App },
+  provide: apolloProvider.provide(),
+  template: '<App/>'
+});

+ 90 - 0
src/views/TMS/components/bmsport/addHandlingFee.vue

@@ -0,0 +1,90 @@
+<template>
+  <!-- 船只信息页面 -->
+  <div class="homeworkPath">
+    <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">
+        <el-form ><dil-form :formId="222" v-model="form"></dil-form></el-form>
+      </div>
+    </div>
+    <div class="button-ins">
+      <el-button type="primary" @click="makeSure">新增港口装卸费</el-button>
+    </div>
+    <dilTable v-bind.sync="option" @radio-change="currentRadioChange">
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      restaurants: [],
+      state: "",
+      form: {},
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/bms/getBatch?apiId=115",
+        // 控制显示当选列
+        selectionType: "radio",
+        rowMap:{},
+      },
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    currentRadioChange(row) {
+      this.rowMap=row
+      console.log(this.rowMap);
+    },
+    // 新增
+    makeSure() {
+      let mapVal = {
+        feeMaterialTonnage: this.form.feeMaterialTonnage,
+      };
+      console.log(mapVal);
+      if (
+      mapVal.feeMaterialTonnage==null
+      ) this.$message.error("存在空值!");
+      else
+      this.axios
+        .post(
+          "/api/v1/bms/addPortHandlingFee",
+          {
+           mapVal:mapVal,
+           rowMap:this.rowMap
+          }
+        )
+        .then((res) => {
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            // this.$refs.table.refreshData();
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败!");
+          }
+          this.$refs['table'].resetField();
+        });
+    },
+    handleSelect(item) {
+      console.log(item);
+    },
+    onclick() {
+      console.log(1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+</style>

+ 97 - 0
src/views/TMS/components/bmsport/handlingFee.vue

@@ -0,0 +1,97 @@
+<template>
+  <!-- 港口装卸费页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" class="btn" @click="addclick">
+        新增
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+      <el-table-column fixed="right" label="操作" align="center" width="100">
+        <template slot-scope="scope">
+          <el-button @click="click(scope.row.feeId)" type="text" size="small"
+            >编辑</el-button
+          >
+          <el-button
+            type="text"
+            size="small"
+            @click="deleteclick(scope.row.feeId)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input:"",
+      restaurants: [],
+      state: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/bms/getPortHandlingFeeList?apiId=151"
+      },
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    handleSelect(item) {
+      console.log(item);
+    },
+    onclick() {
+      this.option.requestUrl = "/api/v1/bms/getPortHandlingFeeList?apiId=151&con="+this.input;
+    },
+    click(feeId) {
+      this.$router.push("/updateHandlingFee/" + feeId);
+    },
+    addclick() {
+      this.$router.push("/addHandlingFee");
+    },
+    deleteclick(scope) {
+      let feeId = scope;
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post(
+              "/api/v1/bms/deletePortHandlingFee/" + feeId
+            )
+            .then(() => {
+                        this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+              this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 95 - 0
src/views/TMS/components/bmsport/updateHandlingFee.vue

@@ -0,0 +1,95 @@
+<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="223" 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";
+export default {
+  components: { PageTitle },
+ data(){
+     return {
+      form1: {},
+  }
+ },
+  mounted() {
+    this.information();
+  },
+  methods: {
+    information() {
+      //编辑位置作业
+      this.axios
+        .post("/api/v1/bms/getFeeToUpdate/" + this.$route.params.feeId)
+        .then((res) => {
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            // console.log(e);
+            // console.log(this.form1);
+            // console.log(this.$route.params.loadingId);
+          });
+        });
+    },
+    handleCheckedCitiesChange(value) {
+      console.log(value);
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    currentRadioChange(row) {
+      this.aaaa = row;
+    },
+    // 确认
+    onClickConfirm() {
+      let mapVal = {
+        feeId: this.$route.params.feeId,
+        materialId: this.form1.materialId,
+        feeForeignShipName: this.form1.feeForeignShipName,
+        feeMaterialTonnage: this.form1.feeMaterialTonnage,
+        priceId: this.form1.priceId,
+        feeValue: this.form1.feeValue,
+      };
+      console.log(mapVal);
+      this.axios
+        .post(
+          "/api/v1/bms/updatePortHandlingFee",
+          mapVal
+        )
+        .then((res) => {
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "修改成功!",
+            });
+            // this.$refs.table.refreshData();
+            this.$router.go(-1);
+          } else {
+            this.$message.error("修改失败!");
+          }
+          this.$refs['table'].resetField();
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+// @import "@/styles/appoint/contract/ContractInsert.scss";
+</style>

+ 84 - 0
src/views/TMS/components/bmsship/bmsshipResult.vue

@@ -0,0 +1,84 @@
+<template>
+  <!-- 船运实绩页面 -->
+  <div class="purchaseOrder">
+    <div class="top">
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search" ></i>查询
+      </el-button>
+      <!-- <el-button type="primary" @click="click">
+        生成水分检测账单
+      </el-button> -->
+    </div>
+    <dilTable v-bind.sync="option">
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "purchaseOrder",
+  data() {
+    return {
+      input:"",
+      restaurants: [],
+      state: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/bms/getShipResult?apiId=112&batchId="
+        + this.$route.params.batchId,
+        //         // 控制显示多选列
+        // selectionType: "select",
+        // mapList:[],
+      },
+    };
+  },
+  mounted() {
+  },
+  methods: {
+  //  selectionChange(selection) { 
+  //     this.mapList=selection
+  //   }, 
+    onclick() {
+      console.log(1);
+    },
+    // click() {
+    //   console.log(this.mapList);
+    //   this.$confirm("是否生成", "提示", {
+    //     confirmButtonText: "确定",
+    //     cancelButtonText: "取消",
+    //     type: "warning",
+    //     center: true,
+    //   })
+    //     .then(() => {
+    //       this.$message({
+    //         type: "success",
+    //         message: "生成水分检测账单成功!",
+    //       });
+    //   this.axios.post("/api/v1/bmsship/bmsshipstatement/addWaterStatement",this.mapList)
+    //               .then(() => {
+    //           console.log(this.mapList);
+    //           this.$router.go(0);
+    //         });
+    //     })
+    //     .catch(() => {
+    //       this.$message({
+    //         type: "info",
+    //         message: "取消生成!",
+    //       });
+    //     });
+    // }
+  },
+};
+</script>
+<style lang='scss' scoped>
+.purchaseOrder {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 68 - 0
src/views/TMS/components/bmsship/bmsstatementDetailsOrder.vue

@@ -0,0 +1,68 @@
+<template>
+  <!-- 船运计费详单页面 -->
+  <div class="purchaseOrder">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="shipclick">
+        生成水运费账单
+      </el-button>
+      <el-button type="primary" @click="waterclick">
+        生成水分检测费账单
+      </el-button>
+      <el-button type="primary" @click="click()">
+        生成途损费账单
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option" >
+      <el-table-column fixed="right" label="操作" width="100">
+        <template slot-scope="scope">
+          <el-button @click="btnclick(scope.row)" type="text" size="small"
+            >详情</el-button
+          >
+        </template>
+      </el-table-column>
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "purchaseOrder",
+  data() {
+    return {
+      input:"",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/bms/getStatementList?apiId=113",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/bms/getStatementList?apiId=113&con="+this.input;
+    },
+    btnclick(row) {
+      this.$router.push("/statementDetailsOrder/" + row.batchId + "?statementId=" + row.statementId);
+    },
+    shipclick() {
+      this.$router.push("/uncomplateDetails");
+    },
+    waterclick() {
+      this.$router.push("/uncomplateWater");
+    },
+    click() {
+      this.$router.push("/toBeStatement");
+    }
+  },
+};
+</script>
+<style lang='scss' scoped>
+.purchaseOrder {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 46 - 0
src/views/TMS/components/bmsship/detailsOrder.vue

@@ -0,0 +1,46 @@
+<template>
+  <!-- 船运计费账单页面 -->
+  <div class="purchaseOrder">
+    <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" class="table">
+      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "purchaseOrder",
+  data() {
+    return {
+      input:"",
+      restaurants: [],
+      state: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/bms/getDetailsOrderList?apiId=93",
+      },
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/bms/getDetailsOrderList?apiId=93&con="+this.input;
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.purchaseOrder {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 68 - 0
src/views/TMS/components/bmsship/detailsStatement.vue

@@ -0,0 +1,68 @@
+<template>
+  <!-- 船运计费详单页面 -->
+  <div class="purchaseOrder">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="shipclick">
+        生成水运费账单
+      </el-button>
+      <el-button type="primary" @click="waterclick">
+        生成水分检测费账单
+      </el-button>
+      <el-button type="primary" @click="click()">
+        生成途损费账单
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option" >
+      <el-table-column fixed="right" label="操作" width="100">
+        <template slot-scope="scope">
+          <el-button @click="btnclick(scope.row)" type="text" size="small"
+            >详情</el-button
+          >
+        </template>
+      </el-table-column>
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "purchaseOrder",
+  data() {
+    return {
+      input:"",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/bms/getStatementList?apiId=113",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/bms/getStatementList?apiId=113&con="+this.input;
+    },
+    btnclick(row) {
+      this.$router.push("/statementDetailsOrder/" + row.batchId + "?statementId=" + row.statementId);
+    },
+    shipclick() {
+      this.$router.push("/uncomplateDetails");
+    },
+    waterclick() {
+      this.$router.push("/uncomplateWater");
+    },
+    click() {
+      this.$router.push("/toBeStatement");
+    }
+  },
+};
+</script>
+<style lang='scss' scoped>
+.purchaseOrder {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 84 - 0
src/views/TMS/components/bmsship/lossDetailsStatement.vue

@@ -0,0 +1,84 @@
+<template>
+  <!-- 船运计费详单页面 -->
+  <div class="purchaseOrder">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <!-- <el-button type="primary" @click="click()">
+        生成途损费账单
+      </el-button> -->
+    </div>
+    <dilTable v-bind.sync="option">
+      <!-- <el-table-column fixed="right" label="操作" width="100">
+        <template slot-scope="scope">
+          <el-button @click="btnclick(scope.row)" type="text" size="small"
+            >详情</el-button
+          >
+        </template>
+      </el-table-column> -->
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "purchaseOrder",
+  data() {
+    return {
+      input:"",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/bms/getLossStatementList?apiId=113",
+        // // 控制显示多选列
+        // selectionType: "select",
+        // mapList:[],
+      },
+    };
+  },
+  methods: {
+    // selectionChange(selection) { 
+    //   this.mapList=selection
+    // },
+    onclick() {
+      this.option.requestUrl = "/api/v1/bms/getLossStatementList?apiId=113&con="+this.input;
+    },
+    // btnclick(row) {
+    //   this.$router.push("/bmsship/statementDetailsOrder/" + row.batchId + "?statementId=" + row.statementId);
+    // },
+    // click() {
+    //   this.$confirm("是否生成", "提示", {
+    //     confirmButtonText: "确定",
+    //     cancelButtonText: "取消",
+    //     type: "warning",
+    //     center: true,
+    //   })
+    //     .then(() => {
+    //       this.$message({
+    //         type: "success",
+    //         message: "生成途损账单成功!",
+    //       });
+    //   this.axios.post("/api/v1/bmsship/bmsshipstatement/addLossStatement",this.mapList)
+    //               .then(() => {
+    //           this.$router.go(0);
+    //         });
+    //     })
+    //     .catch(() => {
+    //       this.$message({
+    //         type: "info",
+    //         message: "取消生成!",
+    //       });
+    //     });
+      // this.$router.push("/path/addHomeworkPath/");
+    // },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.purchaseOrder {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 132 - 0
src/views/TMS/components/bmsship/shipBillingFormula.vue

@@ -0,0 +1,132 @@
+<template>
+  <!-- 计费公式页面 -->
+  <div id="expression">
+    <!-- 计算公式 -->
+    <div>
+      <img src="@/assets/img/min.png" alt="" />
+      <span>水运费计算公式</span>
+    </div>
+    <hr />
+    <table>
+      <!-- <tr v-for="(item, i) in shipFeesFormula" :key="i"> -->
+        <td class="left">{{ shipFeesFormula.formula_name }} :</td>
+        <td>
+          <span>{{ shipFeesFormula.formula_string }}</span>
+        </td>
+      <!-- </tr> -->
+    </table>
+        <!-- 计算公式 -->
+    <div>
+      <img src="@/assets/img/min.png" alt="" />
+      <span>水分检测费计算公式</span>
+    </div>
+    <hr />
+    <table>
+      <!-- <tr v-for="(item, i) in waterFeesFormula" :key="i"> -->
+        <td class="left">{{ waterFeesFormula.formula_name }} :</td>
+        <td>
+          <span>{{ waterFeesFormula.formula_string }}</span>
+        </td>
+      <!-- </tr> -->
+    </table>
+        <!-- 计算公式 -->
+    <div>
+      <img src="@/assets/img/min.png" alt="" />
+      <span>途损费计算公式</span>
+    </div>
+    <hr />
+    <table>
+      <!-- <tr v-for="(item, i) in lossFeesFormula" :key="i"> -->
+        <td class="left">{{ lossFeesFormula.formula_name }} :</td>
+        <td>
+          <span>{{ lossFeesFormula.formula_string }}</span>
+        </td>
+      <!-- </tr> -->
+    </table>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      shipFeesFormula: {},
+      lossFeesFormula: {},
+      waterFeesFormula: {},
+    };
+  },
+  created() {
+    // 获取水运费计算公式
+    this.axios
+      .post("/api/v1/bms/getShipFeesFormula")
+      .then((res) => {
+        this.shipFeesFormula = res.data.data;
+        console.log(this.shipFeesFormula);
+      });
+    // 获取油价
+    this.axios
+      .post("/api/v1/bms/getLossFeesFormula")
+      .then((res) => {
+        this.lossFeesFormula = res.data.data;
+        console.log(this.lossFeesFormula);
+      });
+      // 获取油价
+    this.axios
+      .post("/api/v1/bms/getWaterFeesFormula")
+      .then((res) => {
+        this.waterFeesFormula = res.data.data;
+        console.log(this.waterFeesFormula);
+      });
+  },
+};
+</script>
+
+<style scoped>
+#expression {
+  margin-top: 4.375rem;
+  margin-left: 1.875rem;
+}
+#oilPrice {
+  margin-top: 4.375rem;
+}
+img {
+  width: 1rem;
+}
+span {
+  margin-left: 0.625rem;
+}
+hr {
+  margin: -0.5rem 1.875rem 0 7.5rem;
+  background-color: rgb(220, 223, 231);
+  height: 0.0625rem;
+  border: none;
+}
+table {
+  margin-top: 3.125rem;
+  margin-left: 3.125rem;
+  width: 93.75rem;
+  border: 0.0625rem solid rgb(220, 223, 231);
+  border-collapse: collapse;
+}
+.left {
+  width: 10.25rem;
+  background: #f0f7ff;
+  text-align: center;
+}
+.right {
+  text-align: left;
+}
+tr {
+  height: 2.875rem;
+}
+td {
+  height: 6.25rem ; text-align:initial; border: 0.0625rem solid rgb(220, 223, 231);
+}
+.el-input {
+  width: 6.25rem;
+  text-align: center;
+}
+.oil {
+  margin-left: 0.625rem;
+}
+</style>

+ 69 - 0
src/views/TMS/components/bmsship/statementDetailsOrderShip.vue

@@ -0,0 +1,69 @@
+<template>
+  <!-- 船运计费账单所属详单页面 -->
+  <div class="purchaseOrder">
+    <div class="top">
+    </div>
+     <el-divider content-position="left">计费详单</el-divider>
+    <dilTable v-bind.sync="option">
+      <el-table-column fixed="right" label="操作" align="center" width="100">
+        <template slot-scope="scope">
+          <el-button @click="btnclick(scope.row.batchId)" type="text" size="small"
+            >船运实绩</el-button
+          >
+          <!-- <el-button @click="onclick(scope.row.batchId)" type="text" size="small"
+            >汽运实绩</el-button
+          > -->
+        </template>
+      </el-table-column>
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "purchaseOrder",
+  data() {
+    return {
+      input:"",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/bms/getStatementDetailsOrderList?apiId=93&batchId="
+          + this.$route.params.batchId + "&statementId=" + this.$route.query.statementId,
+      },
+      tableData: [{
+            shipperName: '',
+            shipCost: '',
+            lossCost: '',
+            waterFees: '',
+            statementTotalAmount: ''
+          }]
+    };
+  },
+  mounted(){
+    // this.initialization();
+  },
+  methods: {
+    // initialization(){
+    //   this.axios.post('/api/v1/bmsship/bmsshipstatement/getAllCost?batchId='+this.$route.params.batchId).then((res)=>{
+    //     this.tableData = res.data.data
+    //   })
+    // },
+    // onclick(batchId) {
+    //   this.$route.push("/bmsship/shipResult/" + batchId)
+    // },
+    btnclick(batchId) {
+      this.$router.push("/shipResult/" + batchId);
+    },
+    // click(batchId) {
+    //   this.$route.push("/bmsship/shipResult/" + batchId)
+    // },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.purchaseOrder {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 98 - 0
src/views/TMS/components/bmsship/toBeStatement.vue

@@ -0,0 +1,98 @@
+<template>
+  <!-- 船运计费详单页面 -->
+  <div class="purchaseOrder">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="btnclick">
+        生成途损费账单
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option"  @radio-change="currentRadioChange">
+      <!-- <el-table-column fixed="right" label="操作" width="100"> -->
+        <!-- <template slot-scope="scope">
+          <el-button @click="click(scope.row.pathId)" type="text" size="small"
+            >编辑</el-button
+          >
+          <el-button
+            type="text"
+            size="small"
+            @click="deleteclick(scope.row.pathId)"
+            >删除</el-button
+          >
+        </template> -->
+      <!-- </el-table-column> -->
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "purchaseOrder",
+  data() {
+    return {
+      input:"",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/bms/getBatch?apiId=115",
+        // 控制显示当选列
+        selectionType: "radio",
+        map:{},
+      },
+    };
+  },
+  methods: {
+    currentRadioChange(row) {
+      this.map=row
+      console.log(row);
+    },
+    onclick() {
+      this.option.requestUrl = "/api/v1/bms/getBatch?apiId=115&con="+this.input;
+    },
+    btnclick() {
+      this.$confirm("是否生成", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+         
+      this.axios.post("/api/v1/bms/addLossStatement",this.map)
+                  .then((res) => {
+                    var  num = res.data.data;
+                    console.log(num,"num");
+                    if( num > 0){
+                       this.$message({
+                          type: "success",
+                          message: "生成账单成功!",
+                        });
+                    }else{
+                       this.$message({
+                          type: "warning",
+                          message: "未产生途损费用!",
+                        });
+                    }
+              this.$router.go(-1);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消生成!",
+          });
+        });
+      // this.$router.push("/path/addHomeworkPath/");
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.purchaseOrder {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 91 - 0
src/views/TMS/components/bmsship/uncomplateDetails.vue

@@ -0,0 +1,91 @@
+<template>
+  <!-- 船运计费详单页面 -->
+  <div class="purchaseOrder">
+    <div class="top">
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="btnclick">
+        生成水运费账单
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option" @selection-change="selectionChange">
+      <!-- <el-table-column fixed="right" label="操作" width="100"> -->
+        <!-- <template slot-scope="scope">
+          <el-button @click="click(scope.row.pathId)" type="text" size="small"
+            >编辑</el-button
+          >
+          <el-button
+            type="text"
+            size="small"
+            @click="deleteclick(scope.row.pathId)"
+            >删除</el-button
+          >
+        </template> -->
+      <!-- </el-table-column> -->
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "purchaseOrder",
+  data() {
+    return {
+      input:"",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/bms/getUncomplateDetailsOrderList?apiId=93",
+        // 控制显示多选列
+        selectionType: "select",
+        mapList:[],
+      },
+    };
+  },
+  methods: {
+    selectionChange(selection) { 
+      this.mapList=selection
+    },
+    onclick() {
+      console.log(1);
+    },
+    btnclick() {
+      this.$confirm("是否生成", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "生成账单成功!",
+          });
+      this.axios.post("/api/v1/bms/addStatement",this.mapList)
+                  .then(() => {
+              this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消生成!",
+          });
+        });
+      // this.$router.push("/path/addHomeworkPath/");
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.purchaseOrder {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 91 - 0
src/views/TMS/components/bmsship/uncomplateWater.vue

@@ -0,0 +1,91 @@
+<template>
+  <!-- 船运计费详单页面 -->
+  <div class="purchaseOrder">
+    <div class="top">
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="btnclick">
+        生成水分检测费账单
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option" @selection-change="selectionChange">
+      <!-- <el-table-column fixed="right" label="操作" width="100"> -->
+        <!-- <template slot-scope="scope">
+          <el-button @click="click(scope.row.pathId)" type="text" size="small"
+            >编辑</el-button
+          >
+          <el-button
+            type="text"
+            size="small"
+            @click="deleteclick(scope.row.pathId)"
+            >删除</el-button
+          >
+        </template> -->
+      <!-- </el-table-column> -->
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "purchaseOrder",
+  data() {
+    return {
+      input:"",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/bms/getWaterResult?apiId=114",
+        // 控制显示多选列
+        selectionType: "select",
+        mapList:[],
+      },
+    };
+  },
+  methods: {
+    selectionChange(selection) { 
+      this.mapList=selection
+    },
+    onclick() {
+      console.log(1);
+    },
+    btnclick() {
+      this.$confirm("是否生成", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "生成账单成功!",
+          });
+      this.axios.post("/api/v1/bms/addWaterStatement",this.mapList)
+                  .then(() => {
+              this.$router.go(-1);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消生成!",
+          });
+        });
+      // this.$router.push("/path/addHomeworkPath/");
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.purchaseOrder {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 95 - 0
src/views/TMS/components/bmstrain/addTrainDetails.vue

@@ -0,0 +1,95 @@
+<template>
+  <!-- 火运计费详单页面 -->
+  <div class="purchaseOrder">
+    <div class="top">
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="btnclick">
+        生成火运详单
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option" @radio-change="currentRadioChange">
+      <!-- <el-table-column fixed="right" label="操作" width="100"> -->
+        <!-- <template slot-scope="scope">
+          <el-button @click="click(scope.row.pathId)" type="text" size="small"
+            >编辑</el-button
+          >
+          <el-button
+            type="text"
+            size="small"
+            @click="deleteclick(scope.row.pathId)"
+            >删除</el-button
+          >
+        </template> -->
+      <!-- </el-table-column> -->
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "purchaseOrder",
+  data() {
+    return {
+      input:"",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/bms/getTrainResultList?apiId=122",
+        // 控制显示当选列
+        selectionType: "radio",
+        map:{},
+      },
+    };
+  },
+  methods: {
+    // selectionChange(selection) { 
+    //   this.mapList=selection
+    // },
+    currentRadioChange(row) {
+      this.map=row
+      console.log(row);
+    },
+    onclick() {
+      console.log(1);
+    },
+    btnclick() {
+      this.$confirm("是否生成", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "生成详单成功!",
+          });
+      this.axios.post("/api/v1/bms/addTrainDetails",this.map)
+                  .then(() => {
+              this.$router.go(-1);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消生成!",
+          });
+        });
+      // this.$router.push("/path/addHomeworkPath/");
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.purchaseOrder {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 51 - 0
src/views/TMS/components/bmstrain/detailsTrainOrder.vue

@@ -0,0 +1,51 @@
+<template>
+  <!-- 火运计费详单页面 -->
+  <div class="purchaseOrder">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="detailsclick">
+        生成详单
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "purchaseOrder",
+  data() {
+    return {
+      input:"",
+      restaurants: [],
+      state: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/bms/getTrainDetailsOrderList?apiId=118",
+      },
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/bms/getTrainDetailsOrderList?apiId=118&con="+this.input;
+    },
+    detailsclick() {
+        this.$router.push("/addTrainDetails");
+    }
+  },
+};
+</script>
+<style lang='scss' scoped>
+.purchaseOrder {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 88 - 0
src/views/TMS/components/bmstrain/detailsTrainStatement.vue

@@ -0,0 +1,88 @@
+<template>
+  <!-- 火运费账单页面 -->
+  <div class="purchaseOrder">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="trainclick">
+        生成火运费账单
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+      <el-table-column fixed="right" label="操作" width="100">
+        <template slot-scope="scope">
+          <el-button @click="btnclick(scope.row)" type="text" size="small"
+            >详情</el-button
+          >
+        </template>
+      </el-table-column>
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "purchaseOrder",
+  data() {
+    return {
+      input:"",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/bms/getTrainStatementList?apiId=121",
+
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/bms/getTrainStatementList?apiId=121&con="+this.input;
+    },
+    btnclick(row) {
+      this.$router.push("/statementDetailsOrder/" + row.batchId + "?statementId=" + row.statementId);
+    },
+    trainclick() {
+      this.$router.push("/uncomplateTrainDetails");
+    },
+    // waterclick() {
+    //   this.$router.push("/bmsship/uncomplateWater");
+    // },
+    // click() {
+    //   this.$confirm("是否生成", "提示", {
+    //     confirmButtonText: "确定",
+    //     cancelButtonText: "取消",
+    //     type: "warning",
+    //     center: true,
+    //   })
+    //     .then(() => {
+    //       this.$message({
+    //         type: "success",
+    //         message: "生成途损账单成功!",
+    //       });
+    //   this.axios.post("/api/v1/bmsship/bmsshipstatement/addLossStatement",this.mapList)
+    //               .then(() => {
+    //           this.$router.go(-1);
+    //         });
+    //     })
+    //     .catch(() => {
+    //       this.$message({
+    //         type: "info",
+    //         message: "取消生成!",
+    //       });
+    //     });
+    //   // this.$router.push("/path/addHomeworkPath/");
+    // },
+    // click() {
+    //   this.$router.push("/bmsship/toBeStatement");
+    // }
+  },
+};
+</script>
+<style lang='scss' scoped>
+.purchaseOrder {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 69 - 0
src/views/TMS/components/bmstrain/statementDetailsOrder.vue

@@ -0,0 +1,69 @@
+<template>
+  <!-- 火运计费账单所属详单页面 -->
+  <div class="purchaseOrder">
+    <div class="top">
+    </div>
+     <el-divider content-position="left">计费详单</el-divider>
+    <dilTable v-bind.sync="option">
+      <el-table-column fixed="right" label="操作" align="center" width="100">
+        <template slot-scope="scope">
+          <el-button @click="btnclick(scope.row.detailsId)" type="text" size="small"
+            >火运实绩</el-button
+          >
+          <!-- <el-button @click="onclick(scope.row.batchId)" type="text" size="small"
+            >汽运实绩</el-button
+          > -->
+        </template>
+      </el-table-column>
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "purchaseOrder",
+  data() {
+    return {
+      input:"",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/bms/getComplateTrainDetailsList?apiId=118&batchId="
+          + this.$route.params.batchId + "&statementId=" + this.$route.query.statementId,
+      },
+      tableData: [{
+            shipperName: '',
+            shipCost: '',
+            lossCost: '',
+            waterFees: '',
+            statementTotalAmount: ''
+          }]
+    };
+  },
+  mounted(){
+    // this.initialization();
+  },
+  methods: {
+    // initialization(){
+    //   this.axios.post('/api/v1/bmsship/bmsshipstatement/getAllCost?batchId='+this.$route.params.batchId).then((res)=>{
+    //     this.tableData = res.data.data
+    //   })
+    // },
+    // onclick(batchId) {
+    //   this.$route.push("/bmsship/shipResult/" + batchId)
+    // },
+    btnclick(detailsId) {
+      this.$router.push("/trainResult/" + detailsId);
+    },
+    // click(batchId) {
+    //   this.$route.push("/bmsship/shipResult/" + batchId)
+    // },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.purchaseOrder {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 48 - 0
src/views/TMS/components/bmstrain/trainResult.vue

@@ -0,0 +1,48 @@
+<template>
+  <!-- 火运实绩页面 -->
+  <div class="purchaseOrder">
+    <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: "purchaseOrder",
+  data() {
+    return {
+      restaurants: [],
+      state: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/bms/getStatementTrainResultList?apiId=122&detailsId="
+        + this.$route.params.detailsId
+      },
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    onclick() {
+      console.log(1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.purchaseOrder {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 91 - 0
src/views/TMS/components/bmstrain/uncomplateTrainDetails.vue

@@ -0,0 +1,91 @@
+<template>
+  <!-- 火运计费详单页面 -->
+  <div class="purchaseOrder">
+    <div class="top">
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="btnclick">
+        生成火运费账单
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option" @selection-change="selectionChange">
+      <!-- <el-table-column fixed="right" label="操作" width="100"> -->
+        <!-- <template slot-scope="scope">
+          <el-button @click="click(scope.row.pathId)" type="text" size="small"
+            >编辑</el-button
+          >
+          <el-button
+            type="text"
+            size="small"
+            @click="deleteclick(scope.row.pathId)"
+            >删除</el-button
+          >
+        </template> -->
+      <!-- </el-table-column> -->
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "purchaseOrder",
+  data() {
+    return {
+      input:"",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/bms/getUncomplateTrainDetailsList?apiId=118",
+        // 控制显示多选列
+        selectionType: "select",
+        mapList:[],
+      },
+    };
+  },
+  methods: {
+    selectionChange(selection) { 
+      this.mapList=selection
+    },
+    onclick() {
+      console.log(1);
+    },
+    btnclick() {
+      this.$confirm("是否生成", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "生成账单成功!",
+          });
+      this.axios.post("/api/v1/bms/addTrainStatement",this.mapList)
+                  .then(() => {
+              this.$router.go(-1);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消生成!",
+          });
+        });
+      // this.$router.push("/path/addHomeworkPath/");
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.purchaseOrder {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 60 - 0
src/views/TMS/components/bmstruck/detailsTruckOrder.vue

@@ -0,0 +1,60 @@
+<template>
+  <!-- 汽运计费详单页面 -->
+  <div class="purchaseOrder">
+    <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="options">
+      <el-table-column fixed="right" label="操作" align="center" width="100">
+        <template slot-scope="scope">
+          <el-button @click="btnclick(scope.row.orderId)" type="text" size="small"
+            >汽运实绩</el-button
+          >
+        </template>
+      </el-table-column>
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "purchaseOrder",
+  data() {
+    return {
+      input:"",
+      restaurants: [],
+      state: "",
+      options: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/bms/getTruckDetailsOrderList?apiId=140&orderType=3",
+      },
+    };
+  },
+  mounted() {
+  },
+  watch:{
+        // value1(){
+        //   this.option.requestUrl="/api/v1/bmsship/bmsshipdetailsorder/getDetailsOrderList/93?con="+this.value1
+        // }
+      },
+  methods: {
+    onclick() {
+        this.options.requestUrl = "/api/v1/bms/getTruckDetailsOrderList?apiId=140&orderType=3&con="+this.input;
+    },
+    btnclick(orderId) {
+      this.$router.push("/truckResult/" + orderId);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.purchaseOrder {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 52 - 0
src/views/TMS/components/bmstruck/truckResult.vue

@@ -0,0 +1,52 @@
+<template>
+  <!-- 汽运实绩页面 -->
+  <div class="purchaseOrder">
+    <div class="top">
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search" ></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option" v-model="other">
+
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "purchaseOrder",
+  data() {
+    return {
+      restaurants: [],
+      state: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/bms/getTruckResultList?apiId=142&orderId="
+        + this.$route.params.orderId
+      },
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    onclick() {
+      console.log(1);
+    },
+    other(){
+      // console.log(this.$route.params.orderId)
+    }
+  },
+};
+</script>
+<style lang='scss' scoped>
+.purchaseOrder {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 62 - 0
src/views/TMS/components/domesticMine/approveWagonPlease.vue

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

+ 117 - 0
src/views/TMS/components/domesticMine/approveWagonPleaseAdd.vue

@@ -0,0 +1,117 @@
+<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";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      option: {
+        // 表格请求数据的地址
+        requestUrl:
+          "/api/v1/tms/getAllWagonPlease?apiId=57&status=1&resultType=3",
+        // 控制显示当选列
+        selectionType: "radio",
+      },
+      // 表单
+      form1: {},
+      // 表格
+      table1: {},
+      contractId: "",
+      inf: {},
+    };
+  },
+  mounted() {
+    // this.unit();
+  },
+  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" scoped>
+// @import "@/styles/appoint/contract/ContractInsert.scss";
+</style>

+ 99 - 0
src/views/TMS/components/domesticMine/approveWagonPleaseEdit.vue

@@ -0,0 +1,99 @@
+<template>
+  <!-- 修改批车作业页面 -->
+  <div id="contractDetails">
+    <page-title>批车作业</page-title>
+    <div class="main">
+      <span class="text">修改批车车作业</span>
+      <span class="a"></span>
+    </div>
+    <div class="contractTitle">
+      <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="140" v-model="form1"></dil-form>
+        </div>
+      </div>
+    </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/getApproveWagonPleaseById/" + 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,
+        shipperId: this.form1.shipperId,
+        resultCategory: this.form1.resultCategory,
+        sendStationId: this.form1.sendStationId,
+        toTheStationId: this.form1.toTheStationId
+      };
+      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.resultApproveDate==null||
+        approveWagonPlease.resultApproveNumber==null||
+        approveWagonPlease.shipperId==null||
+        approveWagonPlease.resultCategory==null||
+        approveWagonPlease.sendStationId==null||
+        approveWagonPlease.toTheStationId==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" scoped>
+// @import "@/styles/appoint/contract/ContractInsert.scss";
+</style>

+ 77 - 0
src/views/TMS/components/domesticMine/entrustMine.vue

@@ -0,0 +1,77 @@
+<template>
+  <!-- 计量委托 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="btnclick(0)">
+        <i class="el-icon-s-promotion"></i>发送
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option" @selection-change="selectionChange">
+    </dilTable>
+  </div>
+</template>
+
+
+<script>
+export default {
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=3",
+        // 控制显示多选列
+        selectionType: "select",
+      },
+      selectionListMap: [],
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl =
+        "/api/v1/tms/getLoadResultToSendMC?apiId=209&resultType=1&con=" +
+        this.input;
+    },
+    btnclick() {
+      if (this.selectionListMap.length == 0) {
+        this.$message({
+          message: "请勾选要发送计量委托的实绩!",
+          type: "warning",
+        });
+      } else {
+        this.axios
+          .post("/api/v1/tms/batchSendMeasureCommission", {
+            resultIdList: this.selectionListMap,
+          })
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$message({
+                type: "success",
+                message: "发送成功",
+              });
+              this.option.requestUrl =
+                "/api/v1/tms/getLoadResultToSendMC?apiId=209&resultType=3";
+            }
+          });
+      }
+    },
+    selectionChange(selection) {
+      this.selectionListMap = [];
+      selection.forEach((element) => {
+        this.selectionListMap.push(element.resultId);
+      });
+    },
+  },
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 500 - 0
src/views/TMS/components/domesticMine/wagonLoadAdd.vue

@@ -0,0 +1,500 @@
+<template>
+  <!-- 添加车皮装车实绩 -->
+  <div class="addWagonLoad">
+    <page-title>新增</page-title>
+    <el-divider content-position="left">车皮装车实绩</el-divider>
+    <div class="cp">
+      <span>车皮号:</span>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        @change="onchang"
+        clearable
+      >
+      </el-input>
+    </div>
+    <div class="cpList">
+      <div class="list">
+        <span class="cpList1" v-for="(item, i) in list" :key="i">
+          {{ item }}
+          <i class="el-icon-close itu" @click="onclick(i)"></i>
+        </span>
+      </div>
+    </div>
+    <div class="matching">
+      <span class="text">是否知道采购订单号:</span>
+      <el-switch
+        v-model="matching"
+        active-color="#27d452"
+        inactive-color="#e1e3e6">
+      </el-switch>
+      <span class="span"></span>
+    </div>
+    <div class="material from">
+      <span class="text">物资:</span>
+      <el-input v-model="materialName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
+    </div>
+
+    <div class="forwardingUnit from">
+      <span class="text">发货单位:</span>
+      <el-input v-model="supplierName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
+    </div>
+    <div class="remark from" v-if="matching">
+      <span class="text">船名/备注:</span>
+      <el-input v-model="remark" @blur="onBlur" placeholder="可输入船名\备注重新匹配采购订单"> </el-input>
+      <span class="span"></span>
+    </div>
+    <div class="purchaseOrder from" v-if="matching">
+      <span class="text">采购订单号:</span>
+      <el-input v-model="purchaseOrderNo" placeholder="请选择物资和发货单位" disabled> </el-input>
+      <span class="span"></span>
+    </div>
+
+    <div class="form">
+      <div class="form-box" style="margin-right: 10rem">
+        <dil-form :formId="364" v-model="form1" ref="from1"></dil-form>
+      </div>
+    </div>
+    <div class="button-box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        style="margin-top: 0.625rem; margin-left: 1.25rem"
+        clearable
+      ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="onClick(a)"
+        style="margin-bottom: 0.9375rem"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <div v-show="a == 1">
+        <dilTable
+          v-bind.sync="frist"
+          @radio-change="currentRadioChange1"
+        ></dilTable>
+      </div>
+      <div v-show="a == 2">
+        <dilTable
+          v-bind.sync="secend"
+          @radio-change="currentRadioChange2"
+        ></dilTable>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      list: [],
+      form1: {},
+      input: "",
+      //是否匹配采购订单号
+      matching: false,
+      value: undefined,
+      //船名
+      remark: null,
+      //采购订单id
+      purchaseOrderId: null,
+      //采购订单号
+      purchaseOrderNo: null,
+      //物资名称
+      materialName: null,
+      //发货单位名称
+      supplierName: null,
+      //发货单位id
+      supplierId: null,
+      //物资id
+      materialId: null,
+      //是否需要打开模态窗口
+      drawer: false,
+      a: 1,
+      direction: "rtl",
+      inputText: "",
+      frist: {
+        requestUrl: "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050",
+        selectionType: "radio",
+        mapList1: [],
+      },
+      secend: {
+        requestUrl:
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=",
+        selectionType: "radio",
+        mapList2: [],
+      },
+      unloadPoint: {
+        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        selectionType: "radio",
+      },
+    };
+  },
+  watch:{
+    matching(val){
+      if(val){
+        this.getPurchaseOrderNo();
+      }
+    }
+  },
+  created() {
+    this.form1 = {
+      arrivalStationId: 2,
+    };
+  },
+  methods: {
+    currentRadioChange1(selection) {
+      this.input = null;
+      this.materialName = selection.materialName;
+      this.materialId = selection.materialId;
+      if(this.matching){
+        this.getPurchaseOrderNo();
+      }
+    },
+    currentRadioChange2(selection) {
+      this.supplierName = selection.supplierName;
+      this.supplierId = selection.supplierId;
+      if(this.matching){
+        this.getPurchaseOrderNo();
+      }
+    },
+    ondrawer(num) {
+      this.drawer = true;
+      this.a = num;
+      if (num == 2) {
+        this.secend.requestUrl =
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+          this.materialId;
+      }
+    },
+    onBlur() {
+      if(this.matching){
+        this.getPurchaseOrderNo();
+      }
+    },
+    getPurchaseOrderNo() {
+      console.log(this.matching)
+      let map = {
+        materialId: this.materialId,
+        supplierId: this.supplierId,
+      };
+      if (this.remark) {
+        map.remark = this.remark;
+      }
+      console.log(this.map);
+      if (this.materialId && this.supplierId) {
+        this.axios.post("/api/v1/oms/selectNewOrderId", map).then((res) => {
+          console.log(res);
+          if (res.data.code == "200") {
+            if (res.data.data == null) {
+              this.$message({
+                message: "没有匹配的采购订单号!",
+                type: "warning",
+              });
+              this.form1 = [];
+            } else {
+              this.remark = res.data.data.remark;
+              this.purchaseOrderId = res.data.data.purchaseOrderId;
+              this.purchaseOrderNo = res.data.data.purchaseOrderNo;
+            }
+          } else {
+            this.$message.error("请求失败");
+          }
+        });
+      }
+    },
+    onClick(a) {
+      if (a == 1) {
+        this.frist.requestUrl =
+          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+          this.inputText;
+      } else if (a == 2) {
+        this.secend.requestUrl =
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+          this.materialId +
+          "&index=" +
+          this.inputText;
+      } else if (a == 4) {
+        this.unloadPoint.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.inputText;
+      }
+    },
+    onchang() {
+      var state = false;
+      var cptop = this.input.substring(0, 2);
+      var cptop1 = this.input.substring(0, 3);
+      if (
+        cptop == "45" ||
+        cptop == "46" ||
+        cptop == "42" ||
+        cptop == "47" ||
+        cptop == "15" ||
+        cptop == "16" ||
+        cptop == "17" ||
+        cptop == "18"
+      ) {
+        state = true;
+      } else if (
+        cptop1 == "140" ||
+        cptop1 == "141" ||
+        cptop1 == "142" ||
+        cptop1 == "143" ||
+        cptop1 == "145"
+      ) {
+        state = true;
+      } else {
+        this.$message({
+          type: "warning",
+          message: "车皮号格式不对,请重新输入!",
+        });
+      }
+      if (state) {
+        if (this.input.length == 7) {
+          this.list.push(this.input);
+          this.input = "";
+        } else if (this.input.length < 7){
+          this.$message({
+            type: "warning",
+            message: "车皮号长度不足7位数,请重新输入!",
+          });
+        } else if (this.input.length > 7){
+          this.$message({
+            type: "warning",
+            message: "车皮号长度超过7位数,请重新输入!",
+          });
+        }
+      }
+    },
+    onclick(index) {
+      this.list.splice(index, 1);
+    },
+    // 确定
+    makeSure() {
+      let state = 0;
+      if (
+        this.list.length > 0 &&
+        this.form1.sendStationId &&
+        this.form1.arrivalStationId &&
+        this.form1.resultLoadingDate
+      ) {
+        state = 1;
+      } else {
+        if (this.list.length == 0) {
+          this.$message({
+            type: "warning",
+            message: "请输入车皮号!",
+          });
+        } else {
+            if (this.form1.sendStationId) {
+              if (this.form1.arrivalStationId) {
+                if (this.form1.resultLoadingDate) {
+                  if(this.supplierId){
+                    if(this.materialId){
+                    }else{
+                      this.$message({
+                        type: "warning",
+                        message: "请选择物资",
+                      });
+                    }
+                  }else{
+                    this.$message({
+                      type: "warning",
+                      message: "请选择发货单位",
+                    });
+                  }
+                } else {
+                  this.$message({
+                    type: "warning",
+                    message: "请选择装车时间!",
+                  });
+                }
+              } else {
+                this.$message({
+                  type: "warning",
+                  message: "请选择到站!",
+                });
+              }
+            } else {
+              this.$message({
+                type: "warning",
+                message: "请选择发站!",
+              });
+            }
+        }
+      }
+      if (state == 1) {
+        let map = {
+          wagonNoList: this.list,
+          sendStationId: this.form1.sendStationId,
+          arrivalStationId: this.form1.arrivalStationId,
+          resultLoadingDate: sjTime(this.form1.resultLoadingDate),
+          resultRemarks: this.form1.resultRemarks,
+          resultType: 3,
+          sendUnitId:this.supplierId,
+          materialId:this.materialId,
+        };
+        if(this.matching){
+          map = { 
+            wagonNoList: this.list,
+            sendStationId: this.form1.sendStationId,
+            arrivalStationId: this.form1.arrivalStationId,
+            resultLoadingDate: sjTime(this.form1.resultLoadingDate),
+            resultRemarks: this.form1.resultRemarks,
+            resultType: 3,
+            sendUnitId:this.supplierId,
+            materialId:this.materialId,
+            purchaseOrderRailPlanId: this.purchaseOrderId,
+          }
+        }
+        this.axios
+          .post("/api/v1/tms/addDomesticLoadResult", map)
+          .then((res) => {
+            console.log(res);
+            if (res.data.code == "200") {
+              this.$message({
+                type: "success",
+                message: "新增成功",
+              });
+              this.$router.push("/wagonLoad");
+            }
+          });
+      }
+    },
+    cancel() {
+      this.$router.push("/wagonLoad");
+    },
+  },
+};
+</script>
+<style lang='scss'>
+.addWagonLoad {
+  color: #606266;
+  font-size: 0.875rem;
+  font-weight: 600;
+  .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;
+        }
+      }
+    }
+  }
+  .matching{
+    width: 100%;
+    height: 3.125rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .text{
+      width: 8.75rem;
+    }
+    .span{
+      display: inline-block;
+      width: 310px;
+      height: 0.0625rem;
+    }
+  }
+  .material {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 3.75rem;
+    .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: 5.625rem;
+    }
+    .span{
+      display: inline-block;
+      width: 1.875rem;height: 1.25rem;
+    }
+  }
+  .purchaseOrder{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .span{
+      display: inline-block;
+      width: 1.875rem;height: 0.0625rem;
+    }
+  }
+  .form {
+    margin-top: 1.25rem;
+    display: flex;
+    justify-content: center;
+    padding-left: 9.375rem;
+  }
+  .button-box {
+    display: flex;
+    justify-content: center;
+  }
+}
+</style>
+

+ 103 - 0
src/views/TMS/components/domesticMine/wagonLoadEdit.vue

@@ -0,0 +1,103 @@
+<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="254" 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";
+
+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,
+        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.resultClass==null||
+      tmstrainLoadingResult.sendStationId==null||
+      tmstrainLoadingResult.arrivalStationId==null||
+      tmstrainLoadingResult.resultLoadingDate==null||
+      tmstrainLoadingResult.batchId==null
+      ) this.$message.error("必填项存在空值!");
+      else
+      this.axios
+        .post("/api/v1/tms/upadteTmstrainLoadingResultByResultId",
+          tmstrainLoadingResult)
+         .then(() => {
+          this.$message({
+            type: "success",  
+            message: "修改成功!",
+          });
+          this.$router.go(-1);
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+// @import "@/styles/TMS/addwagonload.scss";
+</style>

+ 100 - 0
src/views/TMS/components/domesticMine/wagonLoadMine.vue

@@ -0,0 +1,100 @@
+<template>
+  <!-- 装车作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="btnclick(0)">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+      <el-button type="primary" @click="btnclick(1)">
+        <i class="el-icon-edit-outline"></i>补录
+      </el-button>
+    </div>
+
+    <dilTable v-bind.sync="option">
+      <el-table-column fixed="right" label="操作" width="100">
+        <template slot-scope="scope">
+          <el-button @click="click(scope.row.resultId)" type="text" size="small"
+            >修改</el-button
+          >
+          <el-button
+            type="text"
+            size="small"
+            @click="deleteclick(scope.row.resultId)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </dilTable>
+  </div>
+</template>
+<script>
+export default {
+  name: "wagonload",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getTmstrainWagonLoad?apiId=209&resultType=3",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl =
+        "/api/v1/tms/getTmstrainWagonLoad?apiId=209&resultType=3&con=" +
+        this.input;
+    },
+    btnclick(index) {
+      if(index == 0){
+        this.$router.push("/wagonLoadAdd");
+      }else if(index == 1){
+        this.$router.push("/wagonLoadbu");
+      }
+    },
+    click(resultId) {
+      this.$router.push("/wagonLoadEdit/" + 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' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 272 - 0
src/views/TMS/components/domesticMine/wagonLoadbu.vue

@@ -0,0 +1,272 @@
+<template>
+  <div class="wagonLoadbu">
+    <el-divider content-position="left">选择需要补录的装车信息</el-divider>
+    <div class="wagonLoadbu_table">
+      <dilTable
+        v-bind.sync="option"
+        @selection-change="selectionChange"
+      ></dilTable>
+    </div>
+
+    <div class="material from">
+      <span class="text">物资:</span>
+      <el-input v-model="materialName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
+    </div>
+
+    <div class="forwardingUnit from">
+      <span class="text">发货单位:</span>
+      <el-input v-model="supplierName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
+    </div>
+    <div class="remark from">
+      <span class="text">船名(备注):</span>
+      <el-input v-model="remark" @blur="onBlur"> </el-input>
+      <span class="span"></span>
+    </div>
+
+    <div class="form">
+      <dil-form :formId="361" 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>
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" 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="onClick(a)"
+        style="margin-bottom: 15px"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <div v-show="a == 1">
+        <dilTable
+          v-bind.sync="frist"
+          @radio-change="currentRadioChange1"
+        ></dilTable>
+      </div>
+      <div v-show="a == 2">
+        <dilTable
+          v-bind.sync="secend"
+          @radio-change="currentRadioChange2"
+        ></dilTable>
+      </div>
+
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      form1: {},
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getTmstrainWagonLoad?apiId=209&resultType=10",
+        // 控制显示多选列
+        selectionType: "select",
+      },
+      //多选选中的数据
+      selecTionListMap: [],
+      //船名
+      remark: null,
+      //采购订单id
+      purchaseOrderId: null,
+      //物资名称
+      materialName: null,
+      //发货单位名称
+      supplierName: null,
+      //发货单位id
+      supplierId: null,
+      //物资id
+      materialId: null,
+      //是否需要打开模态窗口
+      drawer: false,
+      a: 1,
+      direction: "rtl",
+      inputText: "",
+      frist: {
+        requestUrl: "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050",
+        selectionType: "radio",
+        mapList1: [],
+      },
+      secend: {
+        requestUrl:
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=",
+        selectionType: "radio",
+        mapList2: [],
+      },
+      unloadPoint: {
+        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        selectionType: "radio",
+      },
+    };
+  },
+  methods: {
+    //确定
+    makeSure() {
+      if(this.selecTionListMap.length <= 0){
+        this.$message({
+          message: "请选择需要补录的装车信息!",
+          type: "warning",
+        });
+      }else{
+        let map = {
+          resultIdList:this.selecTionListMap,
+          purchaseOrderId:this.purchaseOrderId,
+          insertUpdateRemark: this.form1.insertUpdateRemark
+        }
+        this.axios.post('/api/v1/tms/updateDomesticLoadResult',map).then((res)=>{
+          console.log(res.data.data)
+          if(res.data.code == "200"){
+            this.$message({
+              message: "补录成功!",
+              type: "success",
+            });
+            this.cancel();
+          }
+        })
+      }
+      
+    },
+    //取消
+    cancel() {
+      this.$router.push("/wagonLoad");
+    },
+    //表格选中
+    selectionChange(selection) {
+      this.selecTionListMap = [];
+      selection.forEach(element => {
+          this.selecTionListMap.push(element.resultId)
+      });
+      console.log( this.selecTionListMap)
+    },
+    currentRadioChange1(selection) {
+      this.input = null;
+      this.materialName = selection.materialName;
+      this.materialId = selection.materialId;
+      this.getPurchaseOrderNo();
+    },
+    currentRadioChange2(selection) {
+      this.supplierName = selection.supplierName;
+      this.supplierId = selection.supplierId;
+      this.getPurchaseOrderNo();
+    },
+    ondrawer(num) {
+      this.drawer = true;
+      this.a = num;
+      if (num == 2) {
+        this.secend.requestUrl =
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+          this.materialId;
+      }
+    },
+    onBlur() {
+      this.getPurchaseOrderNo();
+    },
+    getPurchaseOrderNo() {
+      let map = {
+        materialId: this.materialId,
+        supplierId: this.supplierId,
+      };
+      if (this.remark) {
+        map.remark = this.remark;
+      }
+      console.log(this.map);
+      if (this.materialId && this.supplierId) {
+        this.axios.post("/api/v1/oms/selectNewOrderId", map).then((res) => {
+          console.log(res);
+          if (res.data.code == "200") {
+            if (res.data.data == null) {
+              this.$message({
+                message: "没有匹配的采购订单号!",
+                type: "warning",
+              });
+              this.form1 = [];
+            } else {
+              this.remark = res.data.data.remark;
+              this.purchaseOrderId = res.data.data.purchaseOrderId;
+              this.form1 = { purchaseOrderNo: res.data.data.purchaseOrderNo };
+            }
+          } else {
+            this.$message.error("请求失败");
+          }
+        });
+      }
+    },
+    onClick(a) {
+      if (a == 1) {
+        this.frist.requestUrl =
+          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+          this.inputText;
+      } else if (a == 2) {
+        this.secend.requestUrl =
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+          this.materialId +
+          "&index=" +
+          this.inputText;
+      } else if (a == 4) {
+        this.third.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=347&index=" + this.inputText;
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.wagonLoadbu {
+  .material {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 3.75rem;
+    .text {
+      text-align: right;
+      width: 150px;
+    }
+  }
+  .forwardingUnit {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 3.75rem;
+    .text {
+      text-align: right;
+      width: 9.375rem;
+    }
+  }
+  .remark {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 3.75rem;
+    .text {
+      text-align: right;
+      width: 80px;
+    }
+  }
+  .form {
+    margin-top: 1.25rem;
+    display: flex;
+    justify-content: center;
+  }
+  .button_box {
+    width: 100%;
+    height: 6.25rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
+</style>

+ 94 - 0
src/views/TMS/components/domesticMine/wagonPleaseAdd.vue

@@ -0,0 +1,94 @@
+<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="122" 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.unit();
+  },
+  methods: {
+    handleCheckedCitiesChange(value) {
+      console.log(value);
+    },
+    
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+     // 确认
+    onClickConfirm() {
+      let tmstrainPleaseApproveResult = {
+        resultPlanDate: sjTime(this.form1.resultPlanDate),
+        resultCategory: this.form1.resultCategory,
+        shipperId: this.form1.shipperId,
+        sendStationId: this.form1.sendStationId,
+        toTheStationId: this.form1.toTheStationId,
+        resultPleaseNumber: this.form1.resultPleaseNumber,
+        resultType: 3
+      };
+      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.resultPlanDate==null||
+        tmstrainPleaseApproveResult.resultCategory==null||
+        tmstrainPleaseApproveResult.shipperId==null||
+        tmstrainPleaseApproveResult.sendStationId==null||
+        tmstrainPleaseApproveResult.toTheStationId==null||
+        tmstrainPleaseApproveResult.resultPleaseNumber==null
+      ) this.$message.error("存在空值!");
+      else
+      if (!isNumber(val)) this.$message.error("请车数量必须是数字!");
+      else
+      this.axios
+        .post("/api/v1/tms/addWagonPlease", tmstrainPleaseApproveResult)
+        .then(() => {
+          this.$message({
+            type: "success",  
+            message: "新增成功!",
+          });
+          this.$router.go(-1);
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+// @import "@/styles/appoint/contract/ContractInsert.scss";
+</style>

+ 100 - 0
src/views/TMS/components/domesticMine/wagonPleaseEdit.vue

@@ -0,0 +1,100 @@
+<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="117" 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 tmstrainPleaseApproveResult = {
+        resultId: this.$route.params.resultId,
+        resultPlanDate: sjTime(this.form1.resultPlanDate),
+        resultCategory: this.form1.resultCategory,
+        shipperId: this.form1.shipperId,
+        sendStationId: this.form1.sendStationId,
+        toTheStationId: this.form1.toTheStationId,
+        resultPleaseNumber: this.form1.resultPleaseNumber
+      };
+      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.resultPlanDate==null||
+        tmstrainPleaseApproveResult.resultCategory==null||
+        tmstrainPleaseApproveResult.shipperId==null||
+        tmstrainPleaseApproveResult.sendStationId==null||
+        tmstrainPleaseApproveResult.toTheStationId==null||
+        tmstrainPleaseApproveResult.resultPleaseNumber==null
+      ) this.$message.error("存在空值!");
+      else
+      if (!isNumber(val)) this.$message.error("请车数必须是数字!");
+      else
+      this.axios
+        .post("/api/v1/tms/updateApproveWagonPlease", tmstrainPleaseApproveResult)
+        .then(() => {
+          this.$message({
+            type: "success",  
+            message: "修改成功!",
+          });
+          this.$router.go(-1);
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+// @import "@/styles/appoint/contract/ContractInsert.scss";
+</style>

+ 151 - 0
src/views/TMS/components/domesticMine/wagonPleaseMine.vue

@@ -0,0 +1,151 @@
+<template>
+  <!-- 请车作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="insertClick">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <el-tabs v-model="activeName">
+      <!-- 未下发 -->
+      <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 {
+      input: "",
+      activeName: "first",
+      option1: {
+        // 表格请求数据的地址
+        requestUrl:
+          "/api/v1/tms/getAllWagonPlease?apiId=57&status=0&resultType=3",
+      },
+      option2: {
+        // 表格请求数据的地址
+        requestUrl:
+          "/api/v1/tms/getAllWagonPlease?apiId=57&status=1&resultType=3",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      if(this.activeName == "first"){
+        this.option1.requestUrl = "/api/v1/tms/getAllWagonPlease?apiId=57&status=0&resultType=3&con=" +this.input;
+      }else{
+        this.option2.requestUrl = "/api/v1/tms/getAllWagonPlease?apiId=57&status=1&resultType=3&con=" +this.input;
+      }
+    },
+    // 删除
+    deleteClick(resultId) {
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+          // console.log(this.arr[0].text_prop);
+          this.axios
+            .post("/api/v1/tms/deleteApproveWagonPlease/" + resultId)
+            .then(() => {
+              this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+    // 下发
+    sendClick(resultId) {
+      this.$confirm("是否下发", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "下发成功!",
+          });
+          // console.log(this.arr[0].text_prop);
+          this.axios
+            .post("/api/v1/tms/sendWagonPlease/" + resultId)
+            .then(() => {
+              this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消下发!",
+          });
+        });
+    },
+
+    //新增
+    insertClick() {
+      this.$router.push("/wagonPleaseAdd");
+    },
+    //修改
+    updateClick(resultId) {
+      this.$router.push("/wagonPleaseEdit/" + resultId);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 101 - 0
src/views/TMS/components/domesticMine/wagonUnLoadAdd.vue

@@ -0,0 +1,101 @@
+<template>
+  <!-- 添加车皮卸车实绩 -->
+  <div class="addWagonLoad">
+    <page-title>新增</page-title>
+    <div class="main">
+      <el-divider content-position="left">选择已装车实绩</el-divider>
+    </div>
+    <div>
+      <dilTable
+        v-bind.sync="option"
+        ref="table"
+        @selection-change="selectionChange"
+      >
+      </dilTable>
+    </div>
+    <el-divider content-position="left">车皮卸车实绩</el-divider>
+    <div class="form-box" style="margin-right: 10rem">
+      <dil-form :formId="255" 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>
+</template>
+<script>
+import PageTitle from "@/components/Page/Title";
+
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getWagonNo/3?apiId=213",
+        // 控制显示当选列
+        selectionType: "select",
+      },
+      value: undefined,
+      list: [],
+    };
+  },
+  mounted() {},
+  methods: {
+    selectionChange(selection) {
+      this.list = [];
+      selection.forEach((e) => {
+        this.list.push({
+          resultWagonNo: e.resultWagonNo,
+          resultId: e.resultId,
+          purchaseOrderId: e.purchaseOrderId,
+          unloadingPointId: e.unloadingPointId,
+        });
+      });
+    },
+    // 确定
+    makeSure() {
+      console.log(this.list)
+      let tmstrainWagonUnloadResult = {
+        wagonNoList: this.list,
+        resultArrivalDate: sjTime(this.form1.resultArrivalDate),
+        resultUnloadTime: sjTime(this.form1.resultUnloadTime),
+        resultBigTicketWeight: this.form1.resultBigTicketWeight,
+        resultRailHorizontalWeight: this.form1.resultRailHorizontalWeight,
+        resultRemark: this.form1.resultRemark,
+        resultType: 3,
+      };
+      console.log(tmstrainWagonUnloadResult);
+      if (
+        tmstrainWagonUnloadResult.wagonNoList == null ||
+        tmstrainWagonUnloadResult.resultArrivalDate == null ||
+        tmstrainWagonUnloadResult.resultUnloadTime == null ||
+        tmstrainWagonUnloadResult.resultBigTicketWeight == null ||
+        tmstrainWagonUnloadResult.resultRailHorizontalWeight == 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' scoped>
+
+</style>

+ 99 - 0
src/views/TMS/components/domesticMine/wagonUnLoadEdit.vue

@@ -0,0 +1,99 @@
+<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";
+
+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,
+        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.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" scoped>
+// @import "@/styles/TMS/addwagonload.scss";
+</style>

+ 92 - 0
src/views/TMS/components/domesticMine/wagonUnLoadMine.vue

@@ -0,0 +1,92 @@
+<template>
+  <!-- 卸车作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="btnclick(0)">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    
+    <dilTable v-bind.sync="option">
+      <el-table-column fixed="right" label="操作" width="100">
+        <template slot-scope="scope">
+          <el-button @click="click(scope.row.unloadingId)" type="text" size="small"
+            >修改</el-button
+          >
+          <el-button
+            type="text"
+            size="small"
+            @click="deleteclick(scope.row.unloadingId)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </dilTable>
+  </div>
+</template>
+
+
+<script>
+export default {
+  name: "wagonUnload",
+  data() {
+    return {
+      input: "",
+      option: {       
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getTmstrainWagonUnLoad?apiId=214&resultType=3",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getTmstrainWagonUnLoad?apiId=60&resultType=3&con="+this.input;
+    },
+    btnclick() {
+      this.$router.push("/wagonUnLoadAdd");
+    },
+    click(unloadingId) {
+      this.$router.push("/wagonUnLoadEdit/" + unloadingId);
+    },
+    deleteclick(scope) {
+      let unloadingId = scope;
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+          this.axios
+            .post(
+             "/api/v1/tms/deleteTmstrainWagonUnLoadResultByUnLoadingId?unloadingId=" + unloadingId
+            )
+            .then(() => {
+               this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 466 - 0
src/views/TMS/components/importedEmergency/addWagonLoad.vue

@@ -0,0 +1,466 @@
+<template>
+  <!-- 添加车皮装车实绩 -->
+  <div class="addWagonLoad">
+    <page-title>新增</page-title>
+    <el-divider content-position="left">车皮装车实绩</el-divider>
+    <div class="cp">
+      <span>车皮号:</span>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        @change="onchang"
+        clearable
+      >
+      </el-input>
+    </div>
+    <div class="cpList">
+      <div class="list">
+        <span class="cpList1" v-for="(item, i) in list" :key="i">
+          {{ item }}
+          <i class="el-icon-close itu" @click="onclick(i)"></i>
+        </span>
+      </div>
+    </div>
+
+    <div class="material from">
+      <span class="text">物资:</span>
+      <el-input v-model="materialName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
+    </div>
+
+    <div class="forwardingUnit from">
+      <span class="text">发货单位:</span>
+      <el-input v-model="supplierName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
+    </div>
+    <div class="remark from">
+      <span class="text">船名:</span>
+      <el-input v-model="remark" @blur="onBlur"> </el-input>
+      <span class="span"></span>
+    </div>
+    <div class="forwardingUnit from">
+      <span class="text">卸货点:</span>
+      <el-input v-model="unloadPointName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
+    </div>
+    <div class="form">
+      <div class="form-box" style="margin-right: 10rem">
+        <dil-form :formId="254" v-model="form1" ref="from1"></dil-form>
+      </div>
+    </div>
+    <div class="button-box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        style="margin-top: 0.625rem; margin-left: 1.25rem"
+        clearable
+      ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="onClick(a)"
+        style="margin-bottom: 0.9375rem"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <div v-show="a == 1">
+        <dilTable
+          v-bind.sync="frist"
+          @radio-change="currentRadioChange1"
+        ></dilTable>
+      </div>
+      <div v-show="a == 2">
+        <dilTable
+          v-bind.sync="secend"
+          @radio-change="currentRadioChange2"
+        ></dilTable>
+      </div>
+      <div v-show="a == 4">
+        <dilTable
+          v-bind.sync="unloadPoint"
+          @radio-change="currentRadioChange4"
+        ></dilTable>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+// import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      list: [],
+      form1: {},
+      input: "",
+      value: undefined,
+      //船名
+      remark: null,
+      //采购订单id
+      purchaseOrderId: null,
+      //物资名称
+      materialName: null,
+      //发货单位名称
+      supplierName: null,
+      //发货单位id
+      supplierId: null,
+      //物资id
+      materialId: null,
+      //是否需要打开模态窗口
+      drawer: false,
+      //卸货点id
+      unloadPointId: null,
+      //卸货点名称
+      unloadPointName: null,
+      a: 1,
+      direction: "rtl",
+      inputText: "",
+      frist: {
+        requestUrl: "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050",
+        selectionType: "radio",
+        mapList1: [],
+      },
+      secend: {
+        requestUrl:
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=",
+        selectionType: "radio",
+        mapList2: [],
+      },
+      unloadPoint: {
+        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        selectionType: "radio",
+      },
+    };
+  },
+  created(){
+    this.form1 = {
+      sendStationId:1,
+      arrivalStationId:2,
+    }
+  },
+  methods: {
+    currentRadioChange1(selection) {
+      this.input = null;
+      this.materialName = selection.materialName;
+      this.materialId = selection.materialId;
+      this.getPurchaseOrderNo();
+    },
+    currentRadioChange2(selection) {
+      this.supplierName = selection.supplierName;
+      this.supplierId = selection.supplierId;
+      this.getPurchaseOrderNo();
+    },
+    currentRadioChange4(selection) {
+      this.unloadPointId = selection.warehouseId;
+      this.unloadPointName = selection.warehouseName;
+    },
+    ondrawer(num) {
+      this.drawer = true;
+      this.a = num;
+      if (num == 2) {
+        this.secend.requestUrl =
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+          this.materialId;
+      }
+    },
+    onBlur() {
+      this.getPurchaseOrderNo();
+    },
+    getPurchaseOrderNo() {
+      let map = {
+        materialId: this.materialId,
+        supplierId: this.supplierId,
+      };
+      if (this.remark) {
+        map.remark = this.remark;
+      }
+      console.log(this.map);
+      if (this.materialId && this.supplierId) {
+        this.axios.post("/api/v1/oms/selectNewOrderId", map).then((res) => {
+          console.log(res);
+          if (res.data.code == "200") {
+            if (res.data.data == null) {
+              this.$message({
+                message: "没有匹配的采购订单号!",
+                type: "warning",
+              });
+              this.form1 = [];
+            } else {
+              this.remark = res.data.data.remark;
+              this.purchaseOrderId = res.data.data.purchaseOrderId;
+              this.form1 = { purchaseOrderNo: res.data.data.purchaseOrderNo };
+            }
+          } else {
+            this.$message.error("请求失败");
+          }
+        });
+      }
+    },
+    onClick(a) {
+      if (a == 1) {
+        this.frist.requestUrl =
+          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+          this.inputText;
+      } else if (a == 2) {
+        this.secend.requestUrl =
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+          this.materialId +
+          "&index=" +
+          this.inputText;
+      } else if (a == 4) {
+        this.unloadPoint.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.inputText;
+      }
+    },
+    onchang() {
+      var state = false;
+      var cptop = this.input.substring(0, 2);
+      var cptop1 = this.input.substring(0, 3);
+      if (
+        cptop == "45" ||
+        cptop == "46" ||
+        cptop == "42" ||
+        cptop == "47" ||
+        cptop == "15" ||
+        cptop == "16" ||
+        cptop == "17" ||
+        cptop == "18"
+      ) {
+        state = true;
+      } else if (
+        cptop1 == "140" ||
+        cptop1 == "141" ||
+        cptop1 == "142" ||
+        cptop1 == "143" ||
+        cptop1 == "145"
+      ) {
+        state = true;
+      } else {
+        this.$message({
+          type: "warning",
+          message: "车皮号格式不对,请重新输入!",
+        });
+      }
+      if (state) {
+        if (this.input.length == 7) {
+          this.list.push(this.input);
+          this.input = "";
+        } else {
+          this.$message({
+            type: "warning",
+            message: "车皮号长度不足7位数,请重新输入!",
+          });
+        }
+      }
+    },
+    onclick(index) {
+      this.list.splice(index, 1);
+    },
+    // 确定
+    makeSure() {
+      let state = 0;
+      if (
+        this.list.length > 0 &&
+        this.materialId &&
+        this.supplierId &&
+        this.unloadPointId &&
+        this.purchaseOrderId &&
+        this.form1.resultClass &&
+        this.form1.sendStationId &&
+        this.form1.arrivalStationId &&
+        this.form1.resultLoadingDate
+      ) {
+        state = 1;
+      } else {
+        console.log(this.list.length);
+        if (this.list.length == 0) {
+          this.$message({
+            type: "warning",
+            message: "请输入车皮号!",
+          });
+        } else {
+          if (this.materialId) {
+            if (this.supplierId) {
+              if (this.unloadPointId) {
+                if (this.purchaseOrderId) {
+                    if (this.form1.resultClass) {
+                      if (this.form1.sendStationId) {
+                        if (this.form1.arrivalStationId) {
+                          if (this.form1.resultLoadingDate) {
+                          } else {
+                            this.$message({
+                              type: "warning",
+                              message: "请选择装车时间!",
+                            });
+                          }
+                        } else {
+                          this.$message({
+                            type: "warning",
+                            message: "请选择到站!",
+                          });
+                        }
+                      } else {
+                        this.$message({
+                          type: "warning",
+                          message: "请选择发站!",
+                        });
+                      }
+                    } else {
+                      this.$message({
+                        type: "warning",
+                        message: "请选择班别!",
+                      });
+                    }
+                  } else {
+                  this.$message({
+                    type: "warning",
+                    message: "该物资没有采购订单号!",
+                  });
+                }
+              } else {
+                this.$message({
+                  type: "warning",
+                  message: "请选择卸货地点!",
+                });
+              }
+            } else {
+              this.$message({
+                type: "warning",
+                message: "请选择发货单位!",
+              });
+            }
+          } else {
+            this.$message({
+              type: "warning",
+              message: "请选择物资!",
+            });
+          }
+        }
+      }
+      if(state == 1){
+        let map = {
+          wagonNoList:this.list,
+          unloadPointId:this.unloadPointId,
+          purchaseOrderRailPlanId:this.purchaseOrderId,
+          resultClass: this.form1.resultClass,
+          sendStationId: this.form1.sendStationId,
+          arrivalStationId: this.form1.arrivalStationId,
+          resultLoadingDate: sjTime(this.form1.resultLoadingDate),
+          resultRemarks: this.form1.resultRemarks,
+          resultType:2,
+        }
+        this.axios.post('/api/v1/tms/insertTmstrainLoadingResult',map).then((res)=>{
+          console.log(res);
+          if(res.data.code == "200"){
+            this.$message({
+              type: "success",
+              message: "新增成功",
+            });
+            this.$router.push("/wagonLoad");
+          }
+        })
+      }
+    },
+    // 取消
+    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>
+

+ 466 - 0
src/views/TMS/components/importedEmergency/addWagonLoadEmergency.vue

@@ -0,0 +1,466 @@
+<template>
+  <!-- 添加车皮装车实绩 -->
+  <div class="addWagonLoad">
+    <page-title>新增</page-title>
+    <el-divider content-position="left">车皮装车实绩</el-divider>
+    <div class="cp">
+      <span>车皮号:</span>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        @change="onchang"
+        clearable
+      >
+      </el-input>
+    </div>
+    <div class="cpList">
+      <div class="list">
+        <span class="cpList1" v-for="(item, i) in list" :key="i">
+          {{ item }}
+          <i class="el-icon-close itu" @click="onclick(i)"></i>
+        </span>
+      </div>
+    </div>
+
+    <div class="material from">
+      <span class="text">物资:</span>
+      <el-input v-model="materialName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
+    </div>
+
+    <div class="forwardingUnit from">
+      <span class="text">发货单位:</span>
+      <el-input v-model="supplierName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
+    </div>
+    <div class="remark from">
+      <span class="text">船名:</span>
+      <el-input v-model="remark" @blur="onBlur"> </el-input>
+      <span class="span"></span>
+    </div>
+    <div class="forwardingUnit from">
+      <span class="text">卸货点:</span>
+      <el-input v-model="unloadPointName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
+    </div>
+    <div class="form">
+      <div class="form-box" style="margin-right: 10rem">
+        <dil-form :formId="254" v-model="form1" ref="from1"></dil-form>
+      </div>
+    </div>
+    <div class="button-box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        style="margin-top: 0.625rem; margin-left: 1.25rem"
+        clearable
+      ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="onClick(a)"
+        style="margin-bottom: 0.9375rem"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <div v-show="a == 1">
+        <dilTable
+          v-bind.sync="frist"
+          @radio-change="currentRadioChange1"
+        ></dilTable>
+      </div>
+      <div v-show="a == 2">
+        <dilTable
+          v-bind.sync="secend"
+          @radio-change="currentRadioChange2"
+        ></dilTable>
+      </div>
+      <div v-show="a == 4">
+        <dilTable
+          v-bind.sync="unloadPoint"
+          @radio-change="currentRadioChange4"
+        ></dilTable>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      list: [],
+      form1: {},
+      input: "",
+      value: undefined,
+      //船名
+      remark: null,
+      //采购订单id
+      purchaseOrderId: null,
+      //物资名称
+      materialName: null,
+      //发货单位名称
+      supplierName: null,
+      //发货单位id
+      supplierId: null,
+      //物资id
+      materialId: null,
+      //是否需要打开模态窗口
+      drawer: false,
+      //卸货点id
+      unloadPointId: null,
+      //卸货点名称
+      unloadPointName: null,
+      a: 1,
+      direction: "rtl",
+      inputText: "",
+      frist: {
+        requestUrl: "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050",
+        selectionType: "radio",
+        mapList1: [],
+      },
+      secend: {
+        requestUrl:
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=",
+        selectionType: "radio",
+        mapList2: [],
+      },
+      unloadPoint: {
+        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        selectionType: "radio",
+      },
+    };
+  },
+  created(){
+    this.form1 = {
+      sendStationId:1,
+      arrivalStationId:2,
+    }
+  },
+  methods: {
+    currentRadioChange1(selection) {
+      this.input = null;
+      this.materialName = selection.materialName;
+      this.materialId = selection.materialId;
+      this.getPurchaseOrderNo();
+    },
+    currentRadioChange2(selection) {
+      this.supplierName = selection.supplierName;
+      this.supplierId = selection.supplierId;
+      this.getPurchaseOrderNo();
+    },
+    currentRadioChange4(selection) {
+      this.unloadPointId = selection.warehouseId;
+      this.unloadPointName = selection.warehouseName;
+    },
+    ondrawer(num) {
+      this.drawer = true;
+      this.a = num;
+      if (num == 2) {
+        this.secend.requestUrl =
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+          this.materialId;
+      }
+    },
+    onBlur() {
+      this.getPurchaseOrderNo();
+    },
+    getPurchaseOrderNo() {
+      let map = {
+        materialId: this.materialId,
+        supplierId: this.supplierId,
+      };
+      if (this.remark) {
+        map.remark = this.remark;
+      }
+      console.log(this.map);
+      if (this.materialId && this.supplierId) {
+        this.axios.post("/api/v1/oms/selectNewOrderId", map).then((res) => {
+          console.log(res);
+          if (res.data.code == "200") {
+            if (res.data.data == null) {
+              this.$message({
+                message: "没有匹配的采购订单号!",
+                type: "warning",
+              });
+              this.form1 = [];
+            } else {
+              this.remark = res.data.data.remark;
+              this.purchaseOrderId = res.data.data.purchaseOrderId;
+              this.form1 = { purchaseOrderNo: res.data.data.purchaseOrderNo };
+            }
+          } else {
+            this.$message.error("请求失败");
+          }
+        });
+      }
+    },
+    onClick(a) {
+      if (a == 1) {
+        this.frist.requestUrl =
+          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+          this.inputText;
+      } else if (a == 2) {
+        this.secend.requestUrl =
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+          this.materialId +
+          "&index=" +
+          this.inputText;
+      } else if (a == 4) {
+        this.unloadPoint.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.inputText;
+      }
+    },
+    onchang() {
+      var state = false;
+      var cptop = this.input.substring(0, 2);
+      var cptop1 = this.input.substring(0, 3);
+      if (
+        cptop == "45" ||
+        cptop == "46" ||
+        cptop == "42" ||
+        cptop == "47" ||
+        cptop == "15" ||
+        cptop == "16" ||
+        cptop == "17" ||
+        cptop == "18"
+      ) {
+        state = true;
+      } else if (
+        cptop1 == "140" ||
+        cptop1 == "141" ||
+        cptop1 == "142" ||
+        cptop1 == "143" ||
+        cptop1 == "145"
+      ) {
+        state = true;
+      } else {
+        this.$message({
+          type: "warning",
+          message: "车皮号格式不对,请重新输入!",
+        });
+      }
+      if (state) {
+        if (this.input.length == 7) {
+          this.list.push(this.input);
+          this.input = "";
+        } else {
+          this.$message({
+            type: "warning",
+            message: "车皮号长度不足7位数,请重新输入!",
+          });
+        }
+      }
+    },
+    onclick(index) {
+      this.list.splice(index, 1);
+    },
+    // 确定
+    makeSure() {
+      let state = 0;
+      if (
+        this.list.length > 0 &&
+        this.materialId &&
+        this.supplierId &&
+        this.unloadPointId &&
+        this.purchaseOrderId &&
+        this.form1.resultClass &&
+        this.form1.sendStationId &&
+        this.form1.arrivalStationId &&
+        this.form1.resultLoadingDate
+      ) {
+        state = 1;
+      } else {
+        console.log(this.list.length);
+        if (this.list.length == 0) {
+          this.$message({
+            type: "warning",
+            message: "请输入车皮号!",
+          });
+        } else {
+          if (this.materialId) {
+            if (this.supplierId) {
+              if (this.unloadPointId) {
+                if (this.purchaseOrderId) {
+                    if (this.form1.resultClass) {
+                      if (this.form1.sendStationId) {
+                        if (this.form1.arrivalStationId) {
+                          if (this.form1.resultLoadingDate) {
+                          } else {
+                            this.$message({
+                              type: "warning",
+                              message: "请选择装车时间!",
+                            });
+                          }
+                        } else {
+                          this.$message({
+                            type: "warning",
+                            message: "请选择到站!",
+                          });
+                        }
+                      } else {
+                        this.$message({
+                          type: "warning",
+                          message: "请选择发站!",
+                        });
+                      }
+                    } else {
+                      this.$message({
+                        type: "warning",
+                        message: "请选择班别!",
+                      });
+                    }
+                  } else {
+                  this.$message({
+                    type: "warning",
+                    message: "该物资没有采购订单号!",
+                  });
+                }
+              } else {
+                this.$message({
+                  type: "warning",
+                  message: "请选择卸货地点!",
+                });
+              }
+            } else {
+              this.$message({
+                type: "warning",
+                message: "请选择发货单位!",
+              });
+            }
+          } else {
+            this.$message({
+              type: "warning",
+              message: "请选择物资!",
+            });
+          }
+        }
+      }
+      if(state == 1){
+        let map = {
+          wagonNoList:this.list,
+          unloadPointId:this.unloadPointId,
+          purchaseOrderRailPlanId:this.purchaseOrderId,
+          resultClass: this.form1.resultClass,
+          sendStationId: this.form1.sendStationId,
+          arrivalStationId: this.form1.arrivalStationId,
+          resultLoadingDate: sjTime(this.form1.resultLoadingDate),
+          resultRemarks: this.form1.resultRemarks,
+          resultType:2,
+        }
+        this.axios.post('/api/v1/tms/insertTmstrainLoadingResult',map).then((res)=>{
+          console.log(res);
+          if(res.data.code == "200"){
+            this.$message({
+              type: "success",
+              message: "新增成功",
+            });
+            this.$router.push("/wagonLoad");
+          }
+        })
+      }
+    },
+    // 取消
+    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>
+

+ 105 - 0
src/views/TMS/components/importedEmergency/addWagonUnLoad.vue

@@ -0,0 +1,105 @@
+<template>
+  <!-- 添加车皮卸车实绩 -->
+  <div class="addWagonLoad">
+    <page-title>新增</page-title>
+
+    <div class="main">
+      <el-divider content-position="left">选择已装车实绩</el-divider>
+    </div>
+
+    <div>
+      <dilTable
+        v-bind.sync="option"
+        ref="table"
+        @selection-change="selectionChange"
+      >
+      </dilTable>
+    </div>
+
+    <el-divider content-position="left">车皮卸车实绩</el-divider>
+     <div class="form-box" style="margin-right: 10rem">
+        <dil-form :formId="255" 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>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+// import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+       option: {
+        // 表格请求数据的地址
+        requestUrl:
+          "/api/v1/tms/getWagonNo/2?apiId=213",
+        // 控制显示当选列
+        selectionType: "select",
+      },
+      value: undefined,
+      list: [],
+    };
+  },
+  mounted() {},
+  methods: {
+    selectionChange(selection){
+      this.list = [];
+      selection.forEach(e => {
+        this.list.push(
+          {
+            resultWagonNo:e.resultWagonNo,
+            resultId:e.resultId
+          })
+      });
+    },
+    // 确定
+    makeSure() {
+      let tmstrainWagonUnloadResult = {
+        wagonNoList: this.list,
+        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,
+        resultType: 2
+      };
+      console.log(tmstrainWagonUnloadResult);
+      if (tmstrainWagonUnloadResult.wagonNoList==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/insertTmstrainWagonUnLoadResult",
+          tmstrainWagonUnloadResult
+        )
+        .then(() => {
+          this.$message({
+            type: "success",  
+            message: "新增成功!",
+          });
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+// @import "@/styles/TMS/addWagonUnLoed.scss";
+</style>

+ 105 - 0
src/views/TMS/components/importedEmergency/addWagonUnLoadEmergency.vue

@@ -0,0 +1,105 @@
+<template>
+  <!-- 添加车皮卸车实绩 -->
+  <div class="addWagonLoad">
+    <page-title>新增</page-title>
+
+    <div class="main">
+      <el-divider content-position="left">选择已装车实绩</el-divider>
+    </div>
+
+    <div>
+      <dilTable
+        v-bind.sync="option"
+        ref="table"
+        @selection-change="selectionChange"
+      >
+      </dilTable>
+    </div>
+
+    <el-divider content-position="left">车皮卸车实绩</el-divider>
+     <div class="form-box" style="margin-right: 10rem">
+        <dil-form :formId="255" 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>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+       option: {
+        // 表格请求数据的地址
+        requestUrl:
+          "/api/v1/tms/getWagonNo/2?apiId=213",
+        // 控制显示当选列
+        selectionType: "select",
+      },
+      value: undefined,
+      list: [],
+    };
+  },
+  mounted() {},
+  methods: {
+    selectionChange(selection){
+      this.list = [];
+      selection.forEach(e => {
+        this.list.push(
+          {
+            resultWagonNo:e.resultWagonNo,
+            resultId:e.resultId
+          })
+      });
+    },
+    // 确定
+    makeSure() {
+      let tmstrainWagonUnloadResult = {
+        wagonNoList: this.list,
+        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,
+        resultType: 2
+      };
+      console.log(tmstrainWagonUnloadResult);
+      if (tmstrainWagonUnloadResult.wagonNoList==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/insertTmstrainWagonUnLoadResult",
+          tmstrainWagonUnloadResult
+        )
+        .then(() => {
+          this.$message({
+            type: "success",  
+            message: "新增成功!",
+          });
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+
+</style>

+ 102 - 0
src/views/TMS/components/importedEmergency/editWagonLoad.vue

@@ -0,0 +1,102 @@
+<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="254" 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,
+        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.resultClass==null||
+      tmstrainLoadingResult.sendStationId==null||
+      tmstrainLoadingResult.arrivalStationId==null||
+      tmstrainLoadingResult.resultLoadingDate==null||
+      tmstrainLoadingResult.batchId==null
+      ) this.$message.error("必填项存在空值!");
+      else
+      this.axios
+        .post("/api/v1/tms/upadteTmstrainLoadingResultByResultId",tmstrainLoadingResult)
+        .then(() => {
+          this.$message({
+            type: "success",  
+            message: "修改成功!",
+          });
+          this.$router.go(-1);
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+// @import "@/styles/TMS/addwagonload.scss";
+</style>

+ 102 - 0
src/views/TMS/components/importedEmergency/editWagonLoadEmergency.vue

@@ -0,0 +1,102 @@
+<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="254" 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";
+
+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,
+        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.resultClass==null||
+      tmstrainLoadingResult.sendStationId==null||
+      tmstrainLoadingResult.arrivalStationId==null||
+      tmstrainLoadingResult.resultLoadingDate==null||
+      tmstrainLoadingResult.batchId==null
+      ) this.$message.error("必填项存在空值!");
+      else
+      this.axios
+        .post("/api/v1/tms/upadteTmstrainLoadingResultByResultId",tmstrainLoadingResult)
+        .then(() => {
+          this.$message({
+            type: "success",  
+            message: "修改成功!",
+          });
+          this.$router.go(-1);
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+// @import "@/styles/TMS/addwagonload.scss";
+</style>

+ 100 - 0
src/views/TMS/components/importedEmergency/editWagonUnLoad.vue

@@ -0,0 +1,100 @@
+<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" scoped>
+// @import "@/styles/TMS/addwagonload.scss";
+</style>

+ 100 - 0
src/views/TMS/components/importedEmergency/editWagonUnLoadEmergency.vue

@@ -0,0 +1,100 @@
+<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";
+
+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" scoped>
+// @import "@/styles/TMS/addwagonload.scss";
+</style>

+ 63 - 0
src/views/TMS/components/importedEmergency/entrustEmergency.vue

@@ -0,0 +1,63 @@
+<template>
+  <!-- 计量委托 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="btnclick(0)">
+        <i class="el-icon-s-promotion"></i>发送
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option" @selection-change="selectionChange">
+    </dilTable>
+  </div>
+</template>
+
+
+<script>
+export default {
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=2",
+        // 控制显示多选列
+        selectionType: "select",
+      },
+      selectionListMap:[],
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getTmstrainWagonLoad?apiId=58&resultType=1&con="+this.input;
+    },
+    btnclick() {
+      this.axios.post('/api/v1/tms/batchSendMeasureCommission',{resultIdList:this.selectionListMap}).then((res)=>{
+        if(res.data.code == "200"){
+          this.$message({
+            type: "success",
+            message: "发送成功",
+          });
+          this.option.requestUrl = "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=2";
+        }
+      })
+    },
+    selectionChange(selection) {
+      this.selectionListMap = [] 
+      selection.forEach(element => {
+        this.selectionListMap.push(element.resultId);
+      });
+    },
+  },
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 93 - 0
src/views/TMS/components/importedEmergency/trainDetails.vue

@@ -0,0 +1,93 @@
+<template>
+  <!-- 火运实绩页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <span class="top_title">车皮号 : </span>
+      <el-autocomplete
+        popper-class="my-autocomplete"
+        v-model="state"
+        :fetch-suggestions="querySearch"
+        placeholder="请输入内容"
+        @select="handleSelect"
+      >
+        <i class="el-icon-edit el-input__icon" slot="suffix"> </i>
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.value }}</div>
+          <span class="addr">{{ item.address }}</span>
+        </template> 
+      </el-autocomplete>
+
+      <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: "wagonUnload",
+  data() {
+    return {
+      status: "",
+      state: "",
+      option: {       
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getTmstrainresult?apiId=65",
+      },
+    };
+  },
+  mounted() {
+      debugger
+    this.restaurants = this.loadAll();
+  },
+  methods: {
+    querySearch(queryString, cb) {
+      var restaurants = this.restaurants;
+      var results = queryString
+        ? restaurants.filter(this.createFilter(queryString))
+        : restaurants;
+      cb(results);
+    },
+    createFilter(queryString) {
+      return (restaurant) => {
+        return (
+          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
+          0
+        );
+      };
+    },
+    loadAll() {
+      return [
+        { value: "三全鲜食(北新泾店)", address: "长宁区新渔路144号" },
+        {
+          value: "Hot honey 首尔炸鸡(仙霞路)",
+          address: "上海市长宁区淞虹路661号",
+        },
+        {
+          value: "新旺角茶餐厅",
+          address: "上海市普陀区真北路988号创邑金沙谷6号楼113",
+        },
+      ];
+    },
+    handleSelect(item) {
+      console.log(item);
+    },
+    onclick() {
+      console.log(1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 89 - 0
src/views/TMS/components/importedEmergency/wagonLoadEmergency.vue

@@ -0,0 +1,89 @@
+<template>
+  <!-- 装车作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick(0)">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="onclick(1)">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+      <el-table-column fixed="right" label="操作" width="100">
+        <template slot-scope="scope">
+          <el-button @click="onclick(2,scope.row.resultId)" type="text" size="small"
+            >修改</el-button
+          >
+          <el-button
+            type="text"
+            size="small"
+            @click="deleteclick(scope.row.resultId)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </dilTable>
+  </div>
+</template>
+<script>
+export default {
+  name: "wagonload",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getTmstrainWagonLoad?apiId=209&resultType=2",
+      },
+    };
+  },
+  methods: {
+    onclick(num,resultId) {
+      if (num == 0) {
+        this.option.requestUrl = "/api/v1/tms/getTmstrainWagonLoad?apiId=209&resultType=2&con="+this.input
+      } else if (num == 1) {
+        this.$router.push("/addWagonLoad")
+      } else if (num == 2) {
+         this.$router.push("/editWagonLoad/" + resultId)
+      }
+    },
+    deleteclick(resultId) {
+      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' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 96 - 0
src/views/TMS/components/importedEmergency/wagonUnLoadEmergency.vue

@@ -0,0 +1,96 @@
+<template>
+  <!-- 卸车作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="btnclick(0)">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="btnclick(1)">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+
+    <dilTable v-bind.sync="option">
+      <el-table-column fixed="right" label="操作" width="100">
+        <template slot-scope="scope">
+          <el-button
+            @click="btnclick(2,scope.row.unloadingId)"
+            type="text"
+            size="small"
+            >修改</el-button
+          >
+          <el-button
+            type="text"
+            size="small"
+            @click="deleteclick(scope.row.unloadingId)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </dilTable>
+  </div>
+</template>
+
+
+<script>
+export default {
+  name: "wagonUnload",
+  data() {
+    return {
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getTmstrainWagonUnLoad?apiId=214&resultType=2",
+      },
+      input:''
+    };
+  },
+  methods: {
+    btnclick(num,unloadingId) {
+      if ( num == 0 ) {
+        this.option.requestUrl = '/api/v1/tms/getTmstrainWagonUnLoad?apiId=60&resultType=2&con='+this.input;
+      } else if (num == 1 ) {
+        this.$router.push("/addWagonUnLoad")
+      }else if (num == 2) {
+        this.$router.push("/editWagonUnLoad/" + unloadingId);
+      }
+    },
+    deleteclick(scope) {
+      let unloadingId = scope;
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+          this.axios
+            .post(
+              "/api/v1/tms/deleteTmstrainWagonUnLoadResultByUnLoadingId?unloadingId=" +
+                unloadingId
+            )
+            .then(() => {
+              this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 375 - 0
src/views/TMS/components/importedFuel/transportReserveFuAdd.vue

@@ -0,0 +1,375 @@
+<template>
+  <!-- 新增运输作业页面 -->
+  <div id="contractDetails">
+    <page-title>运输预约</page-title>
+
+    <div class="main">
+      <el-divider content-position="left">新增运输预约</el-divider>
+    </div>
+
+    <div class="material from">
+      <span class="text">物资:</span>
+      <el-input v-model="materialName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
+    </div>
+
+    <div class="forwardingUnit from">
+      <span class="text">发货单位:</span>
+      <el-input v-model="supplierName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
+    </div>
+
+    <div class="contractTitle from">
+      <dil-form :formId="219" v-model="form1"></dil-form>
+    </div>
+    <div class="truckList1">
+      <div class="truckList from">
+        <span class="text">选择车辆:</span>
+        <el-button type="primary" @click="ondrawer(3)" class="truckBtn"
+          >浏览</el-button
+        >
+      </div>
+    </div>
+    <!-- 车辆表格 -->
+    <div class="truckListTable">
+      <el-table
+        :data="selectionList"
+        border
+        style="width: 100%"
+        highlight-current-row
+      >
+        <el-table-column type="index" width="50" label="序号" align="center">
+        </el-table-column>
+        <el-table-column
+          v-for="(item, i) in tableTop"
+          :key="i"
+          :prop="item.prop"
+          :label="item.label"
+          align="center"
+          show-overflow-tooltip
+        >
+          <template slot="scope" v-if="item.th_name !== '件数'">
+            <span>{{ item.label }}</span>
+          </template>
+          <!-- 插入输入框 -->
+          <template slot-scope="scope">
+            <template v-if="item.slot">
+              <template v-if="item.prop == 'orderMaterialNumber'">
+                <el-input v-model.number="scope.row.orderMaterialNumber"></el-input>
+              </template>
+            </template>
+            <template v-else>
+              <span>{{ scope.row[item.prop] }}</span>
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        style="margin-top: 0.625rem; margin-left: 1.25rem"
+        clearable
+      ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="onclick(a)"
+        style="margin-bottom: 0.9375rem"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <div v-show="a == 1">
+        <dilTable
+          v-bind.sync="frist"
+          @radio-change="currentRadioChange1"
+        ></dilTable>
+      </div>
+      <div v-show="a == 2">
+        <dilTable
+          v-bind.sync="secend"
+          @radio-change="currentRadioChange2"
+        ></dilTable>
+      </div>
+      <div v-show="a == 3">
+        <dilTable
+          v-bind.sync="third"
+          @selection-change="currentRadioChange3"
+        ></dilTable>
+      </div>
+    </el-drawer>
+    <div class="button_box">
+      <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import PageTitle from "@/components/Page/Title";
+
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      // 车辆表格表头
+      tableTop: [
+        {
+          prop: "capacityNumber",
+          label: "车牌号",
+          width: "140",
+        },
+        {
+          prop: "carrierName",
+          label: "承运商",
+          width: "140",
+        },
+        {
+          prop: "driverName",
+          label: "司机",
+          width: "140",
+        },
+        {
+          prop: "orderMaterialNumber",
+          label: "件数",
+          slot: true,
+        },
+      ],
+      //车辆表格数据
+      selectionList: [],
+      // 表单
+      form1: {},
+      purchaseOrderId: "",
+      materialName: "",
+      supplierName: "",
+      supplierId: null,
+      materialId: null,
+      drawer: false,
+      a: 1,
+      direction: "rtl",
+      input: "",
+      frist: {
+        requestUrl: "/api/v1/uc/queryMaterialByLike?apiId=244&startNum=010",
+        selectionType: "radio",
+        mapList1: [],
+      },
+      secend: {
+        requestUrl: "/api/v1/uc/querySupplierByLike?apiId=247",
+        selectionType: "radio",
+        mapList2: [],
+      },
+      third: {
+        requestUrl: "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248",
+        selectionType: "select",
+        mapList3: [],
+      },
+    };
+  },
+  methods: {
+    getPurchaseOrderNo() {
+      console.log(this.materialId, "materialId");
+      console.log(this.supplierId, "supplierId");
+      if (this.materialId && this.supplierId) {
+        this.axios
+          .post("/api/v1/oms/selectNewOrderId", {
+            materialId: this.materialId,
+            supplierId: this.supplierId,
+          })
+          .then((res) => {
+            console.log(res);
+            if (res.data.code == "200") {
+              if (res.data.data == null) {
+                this.$message({
+                  message: "没有匹配的采购订单号!",
+                  type: "warning",
+                });
+              } else {
+                this.purchaseOrderId = res.data.data.purchaseOrderId;
+                this.form1 = { purchaseOrderNo: res.data.data.purchaseOrderNo };
+              }
+            } else {
+              this.$message.error("请求失败");
+            }
+          });
+      }
+    },
+    onclick(a) {
+      if (a == 1) {
+        this.frist.requestUrl =
+          "/api/v1/uc/queryMaterialByLike?apiId=244&startNum=010&index=" + this.input;
+      } else if (a == 2) {
+        this.secend.requestUrl =
+          "/api/v1/uc/querySupplierByLike?apiId=247&index=" + this.input;
+      } else {
+        this.third.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&index=" +
+          this.input;
+      }
+    },
+    ondrawer(num) {
+      this.drawer = true;
+      this.a = num;
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    currentRadioChange1(selection) {
+      this.materialName = selection.materialName;
+      this.materialId = selection.materialId;
+      this.getPurchaseOrderNo();
+    },
+    currentRadioChange2(selection) {
+      this.supplierName = selection.supplierName;
+      this.supplierId = selection.supplierId;
+      this.getPurchaseOrderNo();
+    },
+    currentRadioChange3(selection) {
+      console.log(selection,"selection");
+      this.selectionList = [];
+      this.selectionList = selection;
+    },
+    // 确认
+    onClickConfirm() {
+      var state = 0;
+      if (
+        this.materialId &&
+        this.supplierId &&
+        this.form1.purchaseOrderId &&
+        this.form1.unloadPointId &&
+        sjTime(this.form1.orderEntryTime)
+      ) {
+        state = 1;
+      } else {
+        if (!this.materialId) {
+          this.$message({
+            message: "请选择物资!",
+            type: "warning",
+          });
+          if (!this.supplierId) {
+            this.$message({
+              message: "请选择发货单位!",
+              type: "warning",
+            });
+            if (!this.form1.purchaseOrderId) {
+              this.$message({
+                message: "没有匹配的采购订单号!",
+                type: "warning",
+              });
+              if (!this.form1.unloadPointId) {
+                this.$message({
+                  message: "请选择卸货地点!",
+                  type: "warning",
+                });
+                if (!sjTime(this.form1.orderEntryTime)) {
+                  this.$message({
+                    message: "请选择预估进厂时间!",
+                    type: "warning",
+                  });
+                }
+              }
+            }
+          }
+        }
+      }
+      this.selectionList.forEach((e) => {
+        if (e.orderMaterialNumber) {
+          if (isNumber(e.orderMaterialNumber)) {
+            if (isIntegerNumber(e.orderMaterialNumber)) {
+              state = 1;
+            } else {
+              this.$message({
+                message: "件数只能是整数!",
+                type: "warning",
+              });
+              state = 0;
+            }
+          } else {
+            this.$message({
+              message: "件数只能是数字!",
+              type: "warning",
+            });
+            state = 0;
+          }
+        } else {
+          this.$message({
+            message: "件数不能为空!",
+            type: "warning",
+          });
+          state = 0;
+        }
+      });
+      if (state == 1) {
+        let map = {
+          materialId: this.materialId,
+          supplierId: this.supplierId,
+          purchaseOrderId: this.purchaseOrderId,
+          unloadPointId: this.form1.unloadPointId,
+          orderEntryTime: sjTime(this.form1.orderEntryTime),
+          driverCapacityIdList: this.selectionList,
+          orderType: 5
+        };
+        console.log(map);
+        this.axios.post("/api/v1/oms/addPurOrder", map).then((res) => {
+          if (res.data.code == "200") {
+            this.$message({
+              message: "添加成功!",
+              type: "success",
+            });
+            this.$store.go(-1);
+          }
+        });
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" >
+.contractDetails {
+  width: 100%;
+}
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+.material {
+  .text {
+    display: inline-block;
+    width: 10rem;
+    text-align: right;
+  }
+}
+.forwardingUnit {
+  .text {
+    display: inline-block;
+    width: 10rem;
+    text-align: right;
+  }
+}
+.truckList1 {
+  width: 100%;
+  .truckList {
+    width: 96%;
+    .text {
+      display: inline-block;
+      width: 9.375rem;
+      text-align: right;
+    }
+    .truckBtn {
+      width: 17.5rem;
+    }
+  }
+}
+.button_box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 6.25rem;
+}
+</style>

+ 178 - 0
src/views/TMS/components/importedFuel/transportReserveRan.vue

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

+ 581 - 0
src/views/TMS/components/importedFuel/transportReserveRanAdd.vue

@@ -0,0 +1,581 @@
+<template>
+  <!-- 新增运输作业页面 -->
+  <div id="contractDetails">
+    <page-title>运输预约</page-title>
+
+    <div class="main">
+      <el-divider content-position="left">新增运输预约</el-divider>
+    </div>
+
+    <div class="material from">
+      <span class="text">物资:</span>
+      <el-input v-model="materialName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
+    </div>
+
+    <div class="forwardingUnit from">
+      <span class="text">发货单位:</span>
+      <el-input v-model="supplierName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
+    </div>
+    <div class="remark from">
+      <span class="text">船名:</span>
+      <el-input v-model="remark" @blur="onBlur"> </el-input>
+      <span class="span"></span>
+    </div>
+    <div class="forwardingUnit from">
+      <span class="text">卸货点:</span>
+      <el-input v-model="unloadPointName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
+    </div>
+    <div class="lineId from">
+      <span class="text">选择路线:</span>
+      <el-input v-model="lineName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(5)">浏览</el-button>
+    </div>
+    <div class="orderType from">
+      <span class="text">订单类别:</span>
+      <el-select v-model="orderType" placeholder="请选择">
+        <el-option
+          v-for="item in orderTypeList"
+          :key="item.value"
+          :label="item.label" 
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <div class="contractTitle from">
+      <dil-form :formId="219" v-model="form1"></dil-form>
+    </div>
+    <div class="truckList1">
+      <div class="truckList from">
+        <span class="text">选择车辆:</span>
+        <el-button type="primary" @click="ondrawer(3)" class="truckBtn"
+          >浏览</el-button
+        >
+      </div>
+    </div>
+    <!-- 车辆表格 -->
+    <div class="switch" v-if="selectionList.length > 0">
+      <el-tooltip placement="top">
+        <div slot="content">下面表格已有数据,不能进行更改!!!</div>
+        <el-switch
+          v-model="value"
+          active-text="重量"
+          inactive-text="件数"
+          disabled
+        >
+        </el-switch>
+      </el-tooltip>
+    </div>
+    <div class="switch" v-else>
+      <el-tooltip placement="top">
+        <div slot="content">当下面表格有数据之后,将不能进行更改!!!</div>
+        <el-switch v-model="value" active-text="重量" inactive-text="件数">
+        </el-switch>
+      </el-tooltip>
+    </div>
+    <div class="truckListTable">
+      <el-table
+        :data="selectionList"
+        border
+        style="width: 100%"
+        highlight-current-row
+      >
+        <el-table-column type="index" width="50" label="序号" align="center">
+        </el-table-column>
+        <el-table-column
+          v-for="(item, i) in tableTop"
+          :key="i"
+          :prop="item.prop"
+          :label="item.label"
+          align="center"
+          show-overflow-tooltip
+        >
+          <template slot="scope" v-if="item.th_name !== '件数'">
+            <span>{{ item.label }}</span>
+          </template>
+          <template slot="scope" v-if="item.th_name !== '重量'">
+            <span>{{ item.label }}</span>
+          </template>
+          <!-- 插入输入框 -->
+          <template slot-scope="scope">
+            <template v-if="item.slot">
+              <template v-if="item.prop == 'orderMaterialNumber'">
+                <el-input
+                  v-model.number="scope.row.orderMaterialNumber"
+                ></el-input>
+              </template>
+              <template v-if="item.prop == 'orderMaterialWeight'">
+                <el-input
+                  v-model.number="scope.row.orderMaterialWeight"
+                ></el-input>
+              </template>
+            </template>
+            <template v-else>
+              <span>{{ scope.row[item.prop] }}</span>
+            </template>
+          </template>
+        </el-table-column>
+
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="onClick(scope.$index)"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        style="margin-top: 0.625rem; margin-left: 1.25rem"
+        clearable
+      ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="onclick(a)"
+        style="margin-bottom: 0.9375rem"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <div v-show="a == 1">
+        <dilTable
+          v-bind.sync="frist"
+          @radio-change="currentRadioChange1"
+        ></dilTable>
+      </div>
+      <div v-show="a == 2">
+        <dilTable
+          v-bind.sync="secend"
+          @radio-change="currentRadioChange2"
+        ></dilTable>
+      </div>
+      <div v-show="a == 3">
+        <dilTable
+          v-bind.sync="third"
+          @selection-change="currentRadioChange3"
+        ></dilTable>
+      </div>
+      <div v-show="a == 4">
+        <dilTable
+          v-bind.sync="unloadPoint"
+          @radio-change="currentRadioChange4"
+        ></dilTable>
+      </div>
+      <div v-show="a == 5">
+        <dilTable
+          v-bind.sync="line"
+          @radio-change="currentRadioChange5"
+        ></dilTable>
+      </div>
+    </el-drawer>
+    <div class="button_box">
+      <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import PageTitle from "@/components/Page/Title";
+
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      //订单类别
+      orderTypeList:[
+        {
+          value:6,
+          label:'老厂区'
+        },{
+          value:7,
+          label:'新厂区'
+        }
+      ],
+      // 线路名称
+      lineName: "",
+      //线路id
+      lineId: null,
+      // 件数与重量的开关
+      value: false,
+      //船名
+      remark: null,
+      // 车辆表格表头
+      tableTop: [
+        {
+          prop: "capacityNumber",
+          label: "车牌号",
+          width: "140",
+        },
+        {
+          prop: "carrierName",
+          label: "承运商",
+          width: "140",
+        },
+        {
+          prop: "orderMaterialNumber",
+          label: "件数",
+          slot: true,
+        },
+      ],
+      //车辆表格数据
+      selectionList: [],
+      // 表单
+      form1: {},
+      //采购订单id
+      purchaseOrderId: "",
+      //物资名称
+      materialName: "",
+      //发货单位名称
+      supplierName: "",
+      //发货单位id
+      supplierId: null,
+      //物资id
+      materialId: null,
+      //是否需要打开模态窗口
+      drawer: false,
+      //卸货点id
+      unloadPointId: "",
+      //卸货点名称
+      unloadPointName: "",
+      //订单类别
+      orderType:6,
+      a: 1,
+      direction: "rtl",
+      input: "",
+      frist: {
+        requestUrl: "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050",
+        selectionType: "radio",
+        mapList1: [],
+      },
+      secend: {
+        requestUrl:
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=",
+        selectionType: "radio",
+        mapList2: [],
+      },
+      third: {
+        requestUrl: "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248",
+        selectionType: "select",
+        mapList3: [],
+      },
+      unloadPoint: {
+        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        selectionType: "radio",
+      },
+      line: {
+        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
+        selectionType: "radio",
+      },
+    };
+  },
+  watch: {
+    value() {
+      if (this.value) {
+        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.push({
+          prop: "orderMaterialWeight",
+          label: "重量",
+          slot: true,
+        });
+      } else {
+        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.push({
+          prop: "orderMaterialNumber",
+          label: "件数",
+          slot: true,
+        });
+      }
+    },
+  },
+  methods: {
+    onClick(index) {
+      this.selectionList.splice(index, 1);
+    },
+    onBlur() {
+      this.getPurchaseOrderNo();
+    },
+    getPurchaseOrderNo() {
+      let map = {
+        materialId: this.materialId,
+        supplierId: this.supplierId,
+      };
+      if (this.remark) {
+        map.remark = this.remark;
+      }
+      console.log(this.map);
+      if (this.materialId && this.supplierId) {
+        this.axios.post("/api/v1/oms/selectNewOrderId", map).then((res) => {
+          console.log(res);
+          if (res.data.code == "200") {
+            if (res.data.data == null) {
+              this.$message({
+                message: "没有匹配的采购订单号!",
+                type: "warning",
+              });
+              this.form1 = [];
+            } else {
+              this.remark = res.data.data.remark;
+              this.purchaseOrderId = res.data.data.purchaseOrderId;
+              this.form1 = { purchaseOrderNo: res.data.data.purchaseOrderNo };
+            }
+          } else {
+            this.$message.error("请求失败");
+          }
+        });
+      }
+    },
+    onclick(a) {
+      if (a == 1) {
+        this.frist.requestUrl =
+          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+          this.input;
+      } else if (a == 2) {
+        this.secend.requestUrl =
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+          this.materialId +
+          "&index=" +
+          this.input;
+      } else if (a == 3) {
+        this.third.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&index=" +
+          this.input;
+      } else if (a == 4) {
+        this.third.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=347&index=" + this.input;
+      } else if (a == 5) {
+        this.option.requestUrl =
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
+      }
+    },
+    ondrawer(num) {
+      this.drawer = true;
+      this.a = num;
+      if (num == 2) {
+        this.secend.requestUrl =
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+          this.materialId;
+      }
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.push("/transportReserveRan");
+    },
+    currentRadioChange1(selection) {
+      this.materialName = selection.materialName;
+      this.materialId = selection.materialId;
+      this.getPurchaseOrderNo();
+    },
+    currentRadioChange2(selection) {
+      this.supplierName = selection.supplierName;
+      this.supplierId = selection.supplierId;
+      this.getPurchaseOrderNo();
+    },
+    currentRadioChange4(selection) {
+      this.unloadPointId = selection.warehouseId;
+      this.unloadPointName = selection.warehouseName;
+    },
+    currentRadioChange5(selection) {
+      this.lineName = selection.lineName;
+      this.lineId = selection.lineId;
+    },
+    currentRadioChange3(selection) {
+      this.selectionList = [];
+      this.selectionList = selection;
+    },
+    // 确认
+    onClickConfirm() {
+      var state = 0;
+      if (
+        this.materialId &&
+        this.supplierId &&
+        this.form1.purchaseOrderId &&
+        this.unloadPointId &&
+        sjTime(this.form1.orderEntryTime) &&
+        this.lineId
+      ) {
+        state = 1;
+      } else {
+        if (!this.materialId) {
+          this.$message({
+            message: "请选择物资!",
+            type: "warning",
+          });
+        } else if (!this.supplierId) {
+          this.$message({
+            message: "请选择发货单位!",
+            type: "warning",
+          });
+        } else if (!this.purchaseOrderId) {
+          this.$message({
+            message: "没有匹配的采购订单号!",
+            type: "warning",
+          });
+        } else if (!this.unloadPointId) {
+          this.$message({
+            message: "请选择卸货地点!",
+            type: "warning",
+          });
+        } else if (!this.lineId) {
+          this.$message({
+            message: "请选择运输路线!",
+            type: "warning",
+          });
+        } else if (!sjTime(this.form1.orderEntryTime)) {
+          this.$message({
+            message: "请选择预估进厂时间!",
+            type: "warning",
+          });
+        }
+      }
+      if (this.selectionList.length == 0) {
+        this.$message({
+          message: "请选择车辆!",
+          type: "warning",
+        });
+        state = 0;
+      } else {
+        this.selectionList.forEach((e) => {
+          if (e.orderMaterialNumber || e.orderMaterialWeight) {
+            if (
+              isNumber(e.orderMaterialNumber) ||
+              isNumber(e.orderMaterialWeight)
+            ) {
+              if (
+                isIntegerNumber(e.orderMaterialNumber) ||
+                isIntegerNumber(e.orderMaterialWeight)
+              ) {
+                state = 1;
+              } else {
+                this.$message({
+                  message: "件数(重量)只能是整数!",
+                  type: "warning",
+                });
+                state = 0;
+              }
+            } else {
+              this.$message({
+                message: "件数(重量)只能是数字!",
+                type: "warning",
+              });
+              state = 0;
+            }
+          } else {
+            this.$message({
+              message: "件数(重量)不能为空!",
+              type: "warning",
+            });
+            state = 0;
+          }
+        });
+      }
+
+      if (state == 1) {
+        let map = {
+          materialId: this.materialId,
+          supplierId: this.supplierId,
+          purchaseOrderId: this.purchaseOrderId,
+          unloadPointId: this.unloadPointId,
+          orderEntryTime: sjTime(this.form1.orderEntryTime),
+          driverCapacityIdList: this.selectionList,
+          orderType: this.orderType,
+          lineId: this.lineId,
+        };
+        console.log(map, map);
+        this.axios.post("/api/v1/oms/addPurOrder", map).then((res) => {
+          if (res.data.code == "200") {
+            this.$message({
+              message: "添加成功!",
+              type: "success",
+            });
+            this.$router.push("/transportReserveRan");
+          }
+        });
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" >
+.contractDetails {
+  width: 100%;
+}
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+.remark {
+  .text {
+    display: inline-block;
+    width: 5.625rem;
+    text-align: right;
+  }
+}
+.lineId {
+  .text {
+    display: inline-block;
+    width: 10rem;
+    text-align: right;
+  }
+}
+.material {
+  .text {
+    display: inline-block;
+    width: 10rem;
+    text-align: right;
+  }
+}
+.orderType{
+  .text{
+    display: inline-block;
+    width: 5.625rem;
+    text-align: right;
+  }
+}
+.switch {
+  width: 100%;
+  height: 2.5rem;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  padding-right: 6.875rem;
+}
+.forwardingUnit {
+  .text {
+    display: inline-block;
+    width: 10rem;
+    text-align: right;
+  }
+}
+.truckList1 {
+  width: 100%;
+  .truckList {
+    width: 96%;
+    .text {
+      display: inline-block;
+      width: 9.375rem;
+      text-align: right;
+    }
+    .truckBtn {
+      width: 17.5rem;
+    }
+  }
+}
+.button_box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 6.25rem;
+}
+</style>

+ 83 - 0
src/views/TMS/components/importedFuel/transportReserveRanEdit.vue

@@ -0,0 +1,83 @@
+<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="220" 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/oms/selectOrderByOrderId/" + this.$route.params.orderId)
+        .then((res) => {
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+          });
+        });
+    },
+     // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+     // 确认
+    onClickConfirm() {
+      let obj = {
+        orderId: this.$route.params.orderId,
+        materialId: this.form1.materialId,
+        orderEntryTime: sjTime(this.form1.orderEntryTime),
+        unloadPointId: this.form1.unloadPointId,
+        orderType: this.form1.orderType
+      };
+
+      if (
+        obj.orderId==null||
+        obj.materialId==null||
+        obj.unloadPointId==null||
+        obj.orderEntryTime==null
+      ) this.$message.error("存在空值!");
+      else
+      this.axios
+        .post("/api/v1/oms/updateOrder", obj)
+        .then(() => {
+          this.$message({
+            type: "success",  
+            message: "修改成功!",
+          });
+          this.$router.go(-1);
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+// @import "@/styles/appoint/contract/ContractInsert.scss";
+</style>

+ 60 - 0
src/views/TMS/components/importedFuel/truckDriverReceiveRan.vue

@@ -0,0 +1,60 @@
+<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>
+    <el-tabs v-model="activeName">
+      <!-- 未下发 -->
+      <el-tab-pane label="已接收" name="first">
+        <dilTable v-bind.sync="option1" ref="table">
+        </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 {
+      input: "",
+      Time: "",
+      activeName: "first",
+      option1: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5"
+      },
+      option2: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6"
+      }
+    };
+  },
+  methods: {
+    onclick() {
+      if(this.activeName == "first"){
+        this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=5&con=" + this.input;
+      }else{
+        this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&con=" + this.input;
+      }
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+   .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 78 - 0
src/views/TMS/components/importedFuel/truckEnfactoryRanLaoResult.vue

@@ -0,0 +1,78 @@
+<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 {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=6",
+      },
+    };
+  },
+
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=6&con=" + this.input;
+    },
+    updateClick(resultId) {
+      this.$router.push("/truckLoadResultEdit/" + resultId);
+    },
+    //新增
+    insertClick() {
+      this.$router.push("/truckLoadResultAdd/");
+    },
+    deleteClick(resultId) {
+      
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+          this.axios
+            .post(
+              "/api/v1/tms/deleteLoadResult/" + resultId
+            )
+            .then(() => {
+              this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 78 - 0
src/views/TMS/components/importedFuel/truckEnfactoryRanXingResult.vue

@@ -0,0 +1,78 @@
+<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 {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=7",
+      },
+    };
+  },
+ 
+  methods: {
+    onclick() {
+            this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=7&con=" + this.input;
+    },
+    updateClick(resultId) {
+      this.$router.push("/truckLoadResultEdit/" + resultId);
+    },
+    //新增
+    insertClick() {
+      this.$router.push("/truckLoadResultAdd/");
+    },
+    deleteClick(resultId) {
+      
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+          this.axios
+            .post(
+              "/api/v1/tms/deleteLoadResult/" + resultId
+            )
+            .then(() => {
+              this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 43 - 0
src/views/TMS/components/importedFuel/truckJiMaoRanLaoResult.vue

@@ -0,0 +1,43 @@
+<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 {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=6",
+      },
+    };
+  },
+
+  methods: {
+    onclick() {
+     this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=6&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 43 - 0
src/views/TMS/components/importedFuel/truckJiMaoRanXingResult.vue

@@ -0,0 +1,43 @@
+<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 {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=7",
+      },
+    };
+  },
+
+  methods: {
+    onclick() {
+     this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=7&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 44 - 0
src/views/TMS/components/importedFuel/truckJiPiRanLaoResult.vue

@@ -0,0 +1,44 @@
+<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 {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=6",
+      },
+    };
+  },
+
+  methods: {
+
+    onclick() {
+     this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=6&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 44 - 0
src/views/TMS/components/importedFuel/truckJiPiRanXingResult.vue

@@ -0,0 +1,44 @@
+<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 {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=7",
+      },
+    };
+  },
+
+  methods: {
+    
+    onclick() {
+     this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=7&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 44 - 0
src/views/TMS/components/importedFuel/truckLeaveFactoryRanLaoResult.vue

@@ -0,0 +1,44 @@
+<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 {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=6",
+      },
+    };
+  },
+
+  methods: {
+    
+    onclick() {
+     this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=6&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 43 - 0
src/views/TMS/components/importedFuel/truckLeaveFactoryRanXingResult.vue

@@ -0,0 +1,43 @@
+<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 {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=7",
+      },
+    };
+  },
+
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=7&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 56 - 0
src/views/TMS/components/importedFuel/truckQualityRanLaoResult.vue

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

+ 96 - 0
src/views/TMS/components/importedFuel/truckQualityRanLaoResultEdit.vue

@@ -0,0 +1,96 @@
+<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="187" 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: {},
+      // 表格
+      table1: {},
+      contractId: "",
+    };
+  },
+  mounted() {
+    this.information();
+  },
+  methods: {
+  information() {
+      //编辑运输计划
+      this.axios
+        .post("/api/v1/tms/getQualityResultById/" + this.$route.params.resultId)
+        .then((res) => {
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+          });
+        });
+    },
+
+    handleCheckedCitiesChange(value) {
+      console.log(value);
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      let QR = {
+        resultId: this.$route.params.resultId,
+        resultIssampling: this.form1.resultIssampling,
+        resultDeduction: this.form1.resultDeduction,
+        resultSamplingPointId: this.form1.resultSamplingPointId,
+        resultDeductionDescription: this.form1.resultDeductionDescription
+      };
+    
+      var val = this.value;
+      if (
+        QR.resultIssampling==null||
+        QR.resultDeduction==null||
+        QR.resultSamplingPointId==null||
+        QR.resultDeductionDescription==null
+      ) this.$message.error("存在空值!");
+      else
+      this.axios
+        .post("/api/v1/tms/updateQualityResult", QR)
+        .then(() => {
+          this.$message({
+            type: "success",  
+            message: "修改成功!",
+          });
+          this.$router.go(-1);
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+// @import "@/styles/appoint/contract/ContractInsert.scss";
+</style>

+ 54 - 0
src/views/TMS/components/importedFuel/truckQualityRanXingResult.vue

@@ -0,0 +1,54 @@
+<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=150&orderType=7",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getQualityResult?apiId=150&orderType=7&con=" + this.input;
+    },
+
+    updateClick(resultId) {
+      this.$router.push("/truckQualityRanXingResultEdit/" + resultId);
+    },
+    
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 96 - 0
src/views/TMS/components/importedFuel/truckQualityRanXingResultEdit.vue

@@ -0,0 +1,96 @@
+<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="187" 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: {},
+      // 表格
+      table1: {},
+      contractId: "",
+    };
+  },
+  mounted() {
+    this.information();
+  },
+  methods: {
+  information() {
+      //编辑运输计划
+      this.$axios
+        .post("/api/v1/tms/getQualityResultById/" + this.$route.params.resultId)
+        .then((res) => {
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+          });
+        });
+    },
+
+    handleCheckedCitiesChange(value) {
+      console.log(value);
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      let QR = {
+        resultId: this.$route.params.resultId,
+        resultIssampling: this.form1.resultIssampling,
+        resultDeduction: this.form1.resultDeduction,
+        resultSamplingPointId: this.form1.resultSamplingPointId,
+        resultDeductionDescription: this.form1.resultDeductionDescription
+      };
+    
+      var val = this.value;
+      if (
+        QR.resultIssampling==null||
+        QR.resultDeduction==null||
+        QR.resultSamplingPointId==null||
+        QR.resultDeductionDescription==null
+      ) this.$message.error("存在空值!");
+      else
+      this.$axios
+        .post("/api/v1/tms/updateQualityResult", QR)
+        .then(() => {
+          this.$message({
+            type: "success",  
+            message: "修改成功!",
+          });
+          this.$router.go(-1);
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+// @import "@/styles/appoint/contract/ContractInsert.scss";
+</style>

+ 42 - 0
src/views/TMS/components/importedFuel/truckReceiptRanLaoResult.vue

@@ -0,0 +1,42 @@
+<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 {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getReceiveResult?apiId=149&orderType=6",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getReceiveResult?apiId=149&orderType=6&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 43 - 0
src/views/TMS/components/importedFuel/truckReceiptRanXingResult.vue

@@ -0,0 +1,43 @@
+<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 {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getReceiveResult?apiId=149&orderType=7",
+      },
+    };
+  },
+
+  methods: {
+    onclick() {
+     this.option.requestUrl = "/api/v1/tms/getReceiveResult?apiId=149&orderType=7&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 41 - 0
src/views/TMS/components/importedFuel/truckUnloadRanLaoResult.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 {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getUnloadResult?apiId=145&orderType=6",
+      },
+    };
+  },
+ 
+  methods: {
+    onclick() {
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=145&orderType=6&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 43 - 0
src/views/TMS/components/importedFuel/truckUnloadRanXingResult.vue

@@ -0,0 +1,43 @@
+<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 {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getUnloadResult?apiId=145&orderType=7",
+      },
+    };
+  },
+
+  methods: {
+    onclick() {
+     this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=145&orderType=7&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 217 - 0
src/views/TMS/components/importedIngredients/transportReserveFu.vue

@@ -0,0 +1,217 @@
+<template>
+  <!-- 采购辅料运输预约 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="insertClick" >
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+       <el-button type="primary" @click="sendClick(0)" >
+        <i class="el-icon-bottom"></i>下发
+      </el-button>
+    </div>
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+         <!-- 未下发 -->
+      <el-tab-pane label="未下发" name="first">
+        <dilTable v-bind.sync="option1" ref="table" @selection-change="selectionChange">
+          <el-table-column fixed="right" align="center" label="操作" width="120">
+            <template slot-scope="scope">
+              <el-button @click="sendClick(1,scope.row.orderId)"  type="text" size="small">
+                下发
+              </el-button>
+              <el-button @click="updateClick(scope.row.orderId)" type="text" size="small">
+                修改
+              </el-button>
+              <el-button @click="deleteClick(scope.row.orderId, scope.row.capacityNumber)" type="text" size="small">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </dilTable>
+      </el-tab-pane>
+      <!-- 已下发 -->
+      <el-tab-pane label="已下发" name="second">
+        <dilTable v-bind.sync="option2">
+           <el-table-column fixed="right" align="center" label="操作" width="120">
+            <template slot-scope="scope">
+              <el-button @click="CloseClick(scope.row.orderId)"  type="text" size="small">
+               关闭
+              </el-button>
+            </template>
+          </el-table-column>
+        </dilTable>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "inplantTMS",
+  data() {
+    return {
+      input: "",
+      Time: "",
+      activeName: "first",
+      option1: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5",
+        // 控制显示多选列
+        selectionType: "select",
+      },
+       option2: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=4&orderType=5",
+      },
+      selection:[],
+    };
+  },
+  methods: {
+    //获取选中的订单
+    selectionChange(selection){
+      this.selection = [];
+      selection.forEach(e => {
+       this.selection.push({orderId:e.orderId});
+      });
+    },
+    onclick() {
+      if(this.activeName == "first"){
+        this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&con=" + this.input;
+      }else{
+        this.option2.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=4&orderType=5&con=" + this.input;
+      }
+    },
+    handleClick(tab, event) {
+      console.log(tab, event);
+    },
+     // 下发
+    CloseClick(orderId) {
+      this.$confirm("是否关闭", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+         this.axios
+            .post(
+              "/api/v1/oms/CloseOrder",{
+                orderId: orderId
+              }
+            )
+            .then(() => {
+              this.$router.go(0);
+            })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "关闭成功!",
+          });
+          // console.log(this.arr[0].text_prop);
+   
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消关闭!",
+          });
+        });
+    },
+
+
+    //关闭
+
+    sendClick(index,orderId) {
+      this.$confirm("是否下发", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          let orderList = [];
+          if(index == 0){
+            if(this.selection.length > 0){
+              orderList=this.selection;
+            }else{
+            this.$message({
+              type: "warning",
+              message: "请选择要下发的订单!",
+            });
+            }
+          }else if(index == 1){
+            orderList.push({orderId:orderId})
+          }
+          this.axios
+            .post(
+              "/api/v1/oms/dispatchOrder",{
+                mapList:orderList
+              }
+            )
+            .then(() => {
+              this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&i=0"
+            });
+            this.$message({
+              type: "success",
+              message: "下发成功!",
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消下发!",
+          });
+        });
+    },
+    // 删除
+    deleteClick(orderId, capacityNumber) {
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+          this.axios
+            .post(
+               "/api/v1/oms/deleteOrder",{
+                 orderId: orderId,
+                 capacityNumber: capacityNumber
+              }
+            )
+            .then(() => {
+              this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+    //新增
+    insertClick() {
+      this.$router.push("/transportReserveFuAdd/");
+    },
+    //修改
+    updateClick(orderId) {
+      this.$router.push("/transportReserveFuEdit/" + orderId);
+    },
+
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+   .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 551 - 0
src/views/TMS/components/importedIngredients/transportReserveFuAdd.vue

@@ -0,0 +1,551 @@
+<template>
+  <!-- 新增运输作业页面 -->
+  <div id="contractDetails">
+    <page-title>运输预约</page-title>
+
+    <div class="main">
+      <el-divider content-position="left">新增运输预约</el-divider>
+    </div>
+
+    <div class="material from">
+      <span class="text">物资:</span>
+      <el-input v-model="materialName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
+    </div>
+
+    <div class="forwardingUnit from">
+      <span class="text">发货单位:</span>
+      <el-input v-model="supplierName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
+    </div>
+    <div class="remark from">
+      <span class="text">船名:</span>
+      <el-input v-model="remark" @blur="onBlur"> </el-input>
+      <span class="span"></span>
+    </div>
+    <div class="forwardingUnit from">
+      <span class="text">卸货点:</span>
+      <el-input v-model="unloadPointName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
+    </div>
+    <div class="lineId from">
+      <span class="text">选择路线:</span>
+      <el-input v-model="lineName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(5)">浏览</el-button>
+    </div>
+    <div class="contractTitle from">
+      <dil-form :formId="219" v-model="form1"></dil-form>
+    </div>
+    <div class="truckList1">
+      <div class="truckList from">
+        <span class="text">选择车辆:</span>
+        <el-button type="primary" @click="ondrawer(3)" class="truckBtn"
+          >浏览</el-button
+        >
+      </div>
+    </div>
+    <!-- 车辆表格 -->
+    <div class="switch" v-if="selectionList.length > 0">
+      <el-tooltip placement="top">
+        <div slot="content">下面表格已有数据,不能进行更改!!!</div>
+        <el-switch
+          v-model="value"
+          active-text="重量"
+          inactive-text="件数"
+          disabled
+        >
+        </el-switch>
+      </el-tooltip>
+    </div>
+    <div class="switch" v-else>
+      <el-tooltip placement="top">
+        <div slot="content">当下面表格有数据之后,将不能进行更改!!!</div>
+        <el-switch v-model="value" active-text="重量" inactive-text="件数">
+        </el-switch>
+      </el-tooltip>
+    </div>
+    <div class="truckListTable">
+      <el-table
+        :data="selectionList"
+        border
+        style="width: 100%"
+        highlight-current-row
+      >
+        <el-table-column type="index" width="50" label="序号" align="center">
+        </el-table-column>
+        <el-table-column
+          v-for="(item, i) in tableTop"
+          :key="i"
+          :prop="item.prop"
+          :label="item.label"
+          align="center"
+          show-overflow-tooltip
+        >
+          <template slot="scope" v-if="item.th_name !== '件数'">
+            <span>{{ item.label }}</span>
+          </template>
+          <template slot="scope" v-if="item.th_name !== '重量'">
+            <span>{{ item.label }}</span>
+          </template>
+          <!-- 插入输入框 -->
+          <template slot-scope="scope">
+            <template v-if="item.slot">
+              <template v-if="item.prop == 'orderMaterialNumber'">
+                <el-input
+                  v-model.number="scope.row.orderMaterialNumber"
+                ></el-input>
+              </template>
+              <template v-if="item.prop == 'orderMaterialWeight'">
+                <el-input
+                  v-model.number="scope.row.orderMaterialWeight"
+                ></el-input>
+              </template>
+            </template>
+            <template v-else>
+              <span>{{ scope.row[item.prop] }}</span>
+            </template>
+          </template>
+        </el-table-column>
+
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="onClick(scope.$index)"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        style="margin-top: 0.625rem; margin-left: 1.25rem"
+        clearable
+      ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="onclick(a)"
+        style="margin-bottom: 0.9375rem"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <div v-show="a == 1">
+        <dilTable
+          v-bind.sync="frist"
+          @radio-change="currentRadioChange1"
+        ></dilTable>
+      </div>
+      <div v-show="a == 2">
+        <dilTable
+          v-bind.sync="secend"
+          @radio-change="currentRadioChange2"
+        ></dilTable>
+      </div>
+      <div v-show="a == 3">
+        <dilTable
+          v-bind.sync="third"
+          @selection-change="currentRadioChange3"
+        ></dilTable>
+      </div>
+      <div v-show="a == 4">
+        <dilTable
+          v-bind.sync="unloadPoint"
+          @radio-change="currentRadioChange4"
+        ></dilTable>
+      </div>
+      <div v-show="a == 5">
+        <dilTable
+          v-bind.sync="line"
+          @radio-change="currentRadioChange5"
+        ></dilTable>
+      </div>
+    </el-drawer>
+    <div class="button_box">
+      <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import PageTitle from "@/components/Page/Title";
+// import { sjTime, isNumber, isIntegerNumber } from "@/js/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      // 线路名称
+      lineName: "",
+      //线路id
+      lineId: null,
+      // 件数与重量的开关
+      value: false,
+      //船名
+      remark: null,
+      // 车辆表格表头
+      tableTop: [
+        {
+          prop: "capacityNumber",
+          label: "车牌号",
+          width: "140",
+        },
+        {
+          prop: "carrierName",
+          label: "承运商",
+          width: "140",
+        },
+        {
+          prop: "orderMaterialNumber",
+          label: "件数",
+          slot: true,
+        },
+      ],
+      //车辆表格数据
+      selectionList: [],
+      // 表单
+      form1: {},
+      //采购订单id
+      purchaseOrderId: "",
+      //物资名称
+      materialName: "",
+      //发货单位名称
+      supplierName: "",
+      //发货单位id
+      supplierId: null,
+      //物资id
+      materialId: null,
+      //是否需要打开模态窗口
+      drawer: false,
+      //卸货点id
+      unloadPointId: "",
+      //卸货点名称
+      unloadPointName: "",
+      a: 1,
+      direction: "rtl",
+      input: "",
+      frist: {
+        requestUrl: "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050",
+        selectionType: "radio",
+        mapList1: [],
+      },
+      secend: {
+        requestUrl:
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=",
+        selectionType: "radio",
+        mapList2: [],
+      },
+      third: {
+        requestUrl: "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248",
+        selectionType: "select",
+        mapList3: [],
+      },
+      unloadPoint: {
+        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        selectionType: "radio",
+      },
+      line: {
+        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
+        selectionType: "radio",
+      },
+    };
+  },
+  watch: {
+    value() {
+      if (this.value) {
+        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.push({
+          prop: "orderMaterialWeight",
+          label: "重量",
+          slot: true,
+        });
+      } else {
+        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.push({
+          prop: "orderMaterialNumber",
+          label: "件数",
+          slot: true,
+        });
+      }
+    },
+  },
+  methods: {
+    onClick(index) {
+      this.selectionList.splice(index, 1);
+    },
+    onBlur() {
+      this.getPurchaseOrderNo();
+    },
+    getPurchaseOrderNo() {
+      let map = {
+        materialId: this.materialId,
+        supplierId: this.supplierId,
+      };
+      if (this.remark) {
+        map.remark = this.remark;
+      }
+      console.log(this.map);
+      if (this.materialId && this.supplierId) {
+        this.axios.post("/api/v1/oms/selectNewOrderId", map).then((res) => {
+          console.log(res);
+          if (res.data.code == "200") {
+            if (res.data.data == null) {
+              this.$message({
+                message: "没有匹配的采购订单号!",
+                type: "warning",
+              });
+              this.form1 = [];
+            } else {
+              this.remark = res.data.data.remark;
+              this.purchaseOrderId = res.data.data.purchaseOrderId;
+              this.form1 = { purchaseOrderNo: res.data.data.purchaseOrderNo };
+            }
+          } else {
+            this.$message.error("请求失败");
+          }
+        });
+      }
+    },
+    onclick(a) {
+      if (a == 1) {
+        this.frist.requestUrl =
+          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+          this.input;
+      } else if (a == 2) {
+        this.secend.requestUrl =
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+          this.materialId +
+          "&index=" +
+          this.input;
+      } else if (a == 3) {
+        this.third.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&index=" +
+          this.input;
+      } else if (a == 4) {
+        this.third.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=347&index=" + this.input;
+      } else if (a == 5) {
+        this.option.requestUrl =
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
+      }
+    },
+    ondrawer(num) {
+      this.drawer = true;
+      this.a = num;
+      if (num == 2) {
+        this.secend.requestUrl =
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+          this.materialId;
+      }
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.push("/transportReserveFu");
+    },
+    currentRadioChange1(selection) {
+      this.input = null;
+      this.materialName = selection.materialName;
+      this.materialId = selection.materialId;
+      this.getPurchaseOrderNo();
+    },
+    currentRadioChange2(selection) {
+      this.supplierName = selection.supplierName;
+      this.supplierId = selection.supplierId;
+      this.getPurchaseOrderNo();
+    },
+    currentRadioChange4(selection) {
+      this.unloadPointId = selection.warehouseId;
+      this.unloadPointName = selection.warehouseName;
+    },
+    currentRadioChange5(selection) {
+      this.lineName = selection.lineName;
+      this.lineId = selection.lineId;
+    },
+    currentRadioChange3(selection) {
+      this.selectionList = [];
+      this.selectionList = selection;
+    },
+    // 确认
+    onClickConfirm() {
+      var state = 0;
+      if (
+        this.materialId &&
+        this.supplierId &&
+        this.form1.purchaseOrderId &&
+        this.unloadPointId &&
+        sjTime(this.form1.orderEntryTime) &&
+        this.lineId
+      ) {
+        state = 1;
+      } else {
+        if (!this.materialId) {
+          this.$message({
+            message: "请选择物资!",
+            type: "warning",
+          });
+        } else if (!this.supplierId) {
+          this.$message({
+            message: "请选择发货单位!",
+            type: "warning",
+          });
+        } else if (!this.purchaseOrderId) {
+          this.$message({
+            message: "没有匹配的采购订单号!",
+            type: "warning",
+          });
+        } else if (!this.unloadPointId) {
+          this.$message({
+            message: "请选择卸货地点!",
+            type: "warning",
+          });
+        } else if (!this.lineId) {
+          this.$message({
+            message: "请选择运输路线!",
+            type: "warning",
+          });
+        } else if (!sjTime(this.form1.orderEntryTime)) {
+          this.$message({
+            message: "请选择预估进厂时间!",
+            type: "warning",
+          });
+        }
+      }
+      if (this.selectionList.length == 0) {
+        this.$message({
+          message: "请选择车辆!",
+          type: "warning",
+        });
+        state = 0;
+      } else {
+        this.selectionList.forEach((e) => {
+          if (e.orderMaterialNumber || e.orderMaterialWeight) {
+            if (
+              isNumber(e.orderMaterialNumber) ||
+              isNumber(e.orderMaterialWeight)
+            ) {
+              if (
+                isIntegerNumber(e.orderMaterialNumber) ||
+                isIntegerNumber(e.orderMaterialWeight)
+              ) {
+                state = 1;
+              } else {
+                this.$message({
+                  message: "件数(重量)只能是整数!",
+                  type: "warning",
+                });
+                state = 0;
+              }
+            } else {
+              this.$message({
+                message: "件数(重量)只能是数字!",
+                type: "warning",
+              });
+              state = 0;
+            }
+          } else {
+            this.$message({
+              message: "件数(重量)不能为空!",
+              type: "warning",
+            });
+            state = 0;
+          }
+        });
+      }
+
+      if (state == 1) {
+        let map = {
+          materialId: this.materialId,
+          supplierId: this.supplierId,
+          purchaseOrderId: this.purchaseOrderId,
+          unloadPointId: this.unloadPointId,
+          orderEntryTime: sjTime(this.form1.orderEntryTime),
+          driverCapacityIdList: this.selectionList,
+          orderType: 5,
+          lineId: this.lineId,
+        };
+        console.log(map, map);
+        this.axios.post("/api/v1/oms/addPurOrder", map).then((res) => {
+          if (res.data.code == "200") {
+            this.$message({
+              message: "添加成功!",
+              type: "success",
+            });
+            this.$router.push("/transportReserveFu");
+          }
+        });
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" >
+.contractDetails {
+  width: 100%;
+}
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+.remark {
+  .text {
+    display: inline-block;
+    width: 5.625rem;
+    text-align: right;
+  }
+}
+.lineId {
+  .text {
+    display: inline-block;
+    width: 10rem;
+    text-align: right;
+  }
+}
+.material {
+  .text {
+    display: inline-block;
+    width: 10rem;
+    text-align: right;
+  }
+}
+.switch {
+  width: 100%;
+  height: 2.5rem;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  padding-right: 6.875rem;
+}
+.forwardingUnit {
+  .text {
+    display: inline-block;
+    width: 10rem;
+    text-align: right;
+  }
+}
+.truckList1 {
+  width: 100%;
+  .truckList {
+    width: 96%;
+    .text {
+      display: inline-block;
+      width: 9.375rem;
+      text-align: right;
+    }
+    .truckBtn {
+      width: 17.5rem;
+    }
+  }
+}
+.button_box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 6.25rem;
+}
+</style>

+ 551 - 0
src/views/TMS/components/importedIngredients/transportReserveFuAddIngredients.vue

@@ -0,0 +1,551 @@
+<template>
+  <!-- 新增运输作业页面 -->
+  <div id="contractDetails">
+    <page-title>运输预约</page-title>
+
+    <div class="main">
+      <el-divider content-position="left">新增运输预约</el-divider>
+    </div>
+
+    <div class="material from">
+      <span class="text">物资:</span>
+      <el-input v-model="materialName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
+    </div>
+
+    <div class="forwardingUnit from">
+      <span class="text">发货单位:</span>
+      <el-input v-model="supplierName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
+    </div>
+    <div class="remark from">
+      <span class="text">船名:</span>
+      <el-input v-model="remark" @blur="onBlur"> </el-input>
+      <span class="span"></span>
+    </div>
+    <div class="forwardingUnit from">
+      <span class="text">卸货点:</span>
+      <el-input v-model="unloadPointName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
+    </div>
+    <div class="lineId from">
+      <span class="text">选择路线:</span>
+      <el-input v-model="lineName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(5)">浏览</el-button>
+    </div>
+    <div class="contractTitle from">
+      <dil-form :formId="219" v-model="form1"></dil-form>
+    </div>
+    <div class="truckList1">
+      <div class="truckList from">
+        <span class="text">选择车辆:</span>
+        <el-button type="primary" @click="ondrawer(3)" class="truckBtn"
+          >浏览</el-button
+        >
+      </div>
+    </div>
+    <!-- 车辆表格 -->
+    <div class="switch" v-if="selectionList.length > 0">
+      <el-tooltip placement="top">
+        <div slot="content">下面表格已有数据,不能进行更改!!!</div>
+        <el-switch
+          v-model="value"
+          active-text="重量"
+          inactive-text="件数"
+          disabled
+        >
+        </el-switch>
+      </el-tooltip>
+    </div>
+    <div class="switch" v-else>
+      <el-tooltip placement="top">
+        <div slot="content">当下面表格有数据之后,将不能进行更改!!!</div>
+        <el-switch v-model="value" active-text="重量" inactive-text="件数">
+        </el-switch>
+      </el-tooltip>
+    </div>
+    <div class="truckListTable">
+      <el-table
+        :data="selectionList"
+        border
+        style="width: 100%"
+        highlight-current-row
+      >
+        <el-table-column type="index" width="50" label="序号" align="center">
+        </el-table-column>
+        <el-table-column
+          v-for="(item, i) in tableTop"
+          :key="i"
+          :prop="item.prop"
+          :label="item.label"
+          align="center"
+          show-overflow-tooltip
+        >
+          <template slot="scope" v-if="item.th_name !== '件数'">
+            <span>{{ item.label }}</span>
+          </template>
+          <template slot="scope" v-if="item.th_name !== '重量'">
+            <span>{{ item.label }}</span>
+          </template>
+          <!-- 插入输入框 -->
+          <template slot-scope="scope">
+            <template v-if="item.slot">
+              <template v-if="item.prop == 'orderMaterialNumber'">
+                <el-input
+                  v-model.number="scope.row.orderMaterialNumber"
+                ></el-input>
+              </template>
+              <template v-if="item.prop == 'orderMaterialWeight'">
+                <el-input
+                  v-model.number="scope.row.orderMaterialWeight"
+                ></el-input>
+              </template>
+            </template>
+            <template v-else>
+              <span>{{ scope.row[item.prop] }}</span>
+            </template>
+          </template>
+        </el-table-column>
+
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="onClick(scope.$index)"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        style="margin-top: 0.625rem; margin-left: 1.25rem"
+        clearable
+      ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="onclick(a)"
+        style="margin-bottom: 0.9375rem"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <div v-show="a == 1">
+        <dilTable
+          v-bind.sync="frist"
+          @radio-change="currentRadioChange1"
+        ></dilTable>
+      </div>
+      <div v-show="a == 2">
+        <dilTable
+          v-bind.sync="secend"
+          @radio-change="currentRadioChange2"
+        ></dilTable>
+      </div>
+      <div v-show="a == 3">
+        <dilTable
+          v-bind.sync="third"
+          @selection-change="currentRadioChange3"
+        ></dilTable>
+      </div>
+      <div v-show="a == 4">
+        <dilTable
+          v-bind.sync="unloadPoint"
+          @radio-change="currentRadioChange4"
+        ></dilTable>
+      </div>
+      <div v-show="a == 5">
+        <dilTable
+          v-bind.sync="line"
+          @radio-change="currentRadioChange5"
+        ></dilTable>
+      </div>
+    </el-drawer>
+    <div class="button_box">
+      <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import PageTitle from "@/components/Page/Title";
+
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      // 线路名称
+      lineName: "",
+      //线路id
+      lineId: null,
+      // 件数与重量的开关
+      value: false,
+      //船名
+      remark: null,
+      // 车辆表格表头
+      tableTop: [
+        {
+          prop: "capacityNumber",
+          label: "车牌号",
+          width: "140",
+        },
+        {
+          prop: "carrierName",
+          label: "承运商",
+          width: "140",
+        },
+        {
+          prop: "orderMaterialNumber",
+          label: "件数",
+          slot: true,
+        },
+      ],
+      //车辆表格数据
+      selectionList: [],
+      // 表单
+      form1: {},
+      //采购订单id
+      purchaseOrderId: "",
+      //物资名称
+      materialName: "",
+      //发货单位名称
+      supplierName: "",
+      //发货单位id
+      supplierId: null,
+      //物资id
+      materialId: null,
+      //是否需要打开模态窗口
+      drawer: false,
+      //卸货点id
+      unloadPointId: "",
+      //卸货点名称
+      unloadPointName: "",
+      a: 1,
+      direction: "rtl",
+      input: "",
+      frist: {
+        requestUrl: "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050",
+        selectionType: "radio",
+        mapList1: [],
+      },
+      secend: {
+        requestUrl:
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=",
+        selectionType: "radio",
+        mapList2: [],
+      },
+      third: {
+        requestUrl: "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248",
+        selectionType: "select",
+        mapList3: [],
+      },
+      unloadPoint: {
+        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        selectionType: "radio",
+      },
+      line: {
+        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
+        selectionType: "radio",
+      },
+    };
+  },
+  watch: {
+    value() {
+      if (this.value) {
+        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.push({
+          prop: "orderMaterialWeight",
+          label: "重量",
+          slot: true,
+        });
+      } else {
+        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.push({
+          prop: "orderMaterialNumber",
+          label: "件数",
+          slot: true,
+        });
+      }
+    },
+  },
+  methods: {
+    onClick(index) {
+      this.selectionList.splice(index, 1);
+    },
+    onBlur() {
+      this.getPurchaseOrderNo();
+    },
+    getPurchaseOrderNo() {
+      let map = {
+        materialId: this.materialId,
+        supplierId: this.supplierId,
+      };
+      if (this.remark) {
+        map.remark = this.remark;
+      }
+      console.log(this.map);
+      if (this.materialId && this.supplierId) {
+        this.axios.post("/api/v1/oms/selectNewOrderId", map).then((res) => {
+          console.log(res);
+          if (res.data.code == "200") {
+            if (res.data.data == null) {
+              this.$message({
+                message: "没有匹配的采购订单号!",
+                type: "warning",
+              });
+              this.form1 = [];
+            } else {
+              this.remark = res.data.data.remark;
+              this.purchaseOrderId = res.data.data.purchaseOrderId;
+              this.form1 = { purchaseOrderNo: res.data.data.purchaseOrderNo };
+            }
+          } else {
+            this.$message.error("请求失败");
+          }
+        });
+      }
+    },
+    onclick(a) {
+      if (a == 1) {
+        this.frist.requestUrl =
+          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+          this.input;
+      } else if (a == 2) {
+        this.secend.requestUrl =
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+          this.materialId +
+          "&index=" +
+          this.input;
+      } else if (a == 3) {
+        this.third.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&index=" +
+          this.input;
+      } else if (a == 4) {
+        this.third.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=347&index=" + this.input;
+      } else if (a == 5) {
+        this.option.requestUrl =
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
+      }
+    },
+    ondrawer(num) {
+      this.drawer = true;
+      this.a = num;
+      if (num == 2) {
+        this.secend.requestUrl =
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+          this.materialId;
+      }
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.push("/transportReserveFu");
+    },
+    currentRadioChange1(selection) {
+      this.input = null;
+      this.materialName = selection.materialName;
+      this.materialId = selection.materialId;
+      this.getPurchaseOrderNo();
+    },
+    currentRadioChange2(selection) {
+      this.supplierName = selection.supplierName;
+      this.supplierId = selection.supplierId;
+      this.getPurchaseOrderNo();
+    },
+    currentRadioChange4(selection) {
+      this.unloadPointId = selection.warehouseId;
+      this.unloadPointName = selection.warehouseName;
+    },
+    currentRadioChange5(selection) {
+      this.lineName = selection.lineName;
+      this.lineId = selection.lineId;
+    },
+    currentRadioChange3(selection) {
+      this.selectionList = [];
+      this.selectionList = selection;
+    },
+    // 确认
+    onClickConfirm() {
+      var state = 0;
+      if (
+        this.materialId &&
+        this.supplierId &&
+        this.form1.purchaseOrderId &&
+        this.unloadPointId &&
+        sjTime(this.form1.orderEntryTime) &&
+        this.lineId
+      ) {
+        state = 1;
+      } else {
+        if (!this.materialId) {
+          this.$message({
+            message: "请选择物资!",
+            type: "warning",
+          });
+        } else if (!this.supplierId) {
+          this.$message({
+            message: "请选择发货单位!",
+            type: "warning",
+          });
+        } else if (!this.purchaseOrderId) {
+          this.$message({
+            message: "没有匹配的采购订单号!",
+            type: "warning",
+          });
+        } else if (!this.unloadPointId) {
+          this.$message({
+            message: "请选择卸货地点!",
+            type: "warning",
+          });
+        } else if (!this.lineId) {
+          this.$message({
+            message: "请选择运输路线!",
+            type: "warning",
+          });
+        } else if (!sjTime(this.form1.orderEntryTime)) {
+          this.$message({
+            message: "请选择预估进厂时间!",
+            type: "warning",
+          });
+        }
+      }
+      if (this.selectionList.length == 0) {
+        this.$message({
+          message: "请选择车辆!",
+          type: "warning",
+        });
+        state = 0;
+      } else {
+        this.selectionList.forEach((e) => {
+          if (e.orderMaterialNumber || e.orderMaterialWeight) {
+            if (
+              isNumber(e.orderMaterialNumber) ||
+              isNumber(e.orderMaterialWeight)
+            ) {
+              if (
+                isIntegerNumber(e.orderMaterialNumber) ||
+                isIntegerNumber(e.orderMaterialWeight)
+              ) {
+                state = 1;
+              } else {
+                this.$message({
+                  message: "件数(重量)只能是整数!",
+                  type: "warning",
+                });
+                state = 0;
+              }
+            } else {
+              this.$message({
+                message: "件数(重量)只能是数字!",
+                type: "warning",
+              });
+              state = 0;
+            }
+          } else {
+            this.$message({
+              message: "件数(重量)不能为空!",
+              type: "warning",
+            });
+            state = 0;
+          }
+        });
+      }
+
+      if (state == 1) {
+        let map = {
+          materialId: this.materialId,
+          supplierId: this.supplierId,
+          purchaseOrderId: this.purchaseOrderId,
+          unloadPointId: this.unloadPointId,
+          orderEntryTime: sjTime(this.form1.orderEntryTime),
+          driverCapacityIdList: this.selectionList,
+          orderType: 5,
+          lineId: this.lineId,
+        };
+        console.log(map, map);
+        this.axios.post("/api/v1/oms/addPurOrder", map).then((res) => {
+          if (res.data.code == "200") {
+            this.$message({
+              message: "添加成功!",
+              type: "success",
+            });
+            this.$router.push("/transportReserveFu");
+          }
+        });
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" >
+.contractDetails {
+  width: 100%;
+}
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+.remark {
+  .text {
+    display: inline-block;
+    width: 5.625rem;
+    text-align: right;
+  }
+}
+.lineId {
+  .text {
+    display: inline-block;
+    width: 10rem;
+    text-align: right;
+  }
+}
+.material {
+  .text {
+    display: inline-block;
+    width: 10rem;
+    text-align: right;
+  }
+}
+.switch {
+  width: 100%;
+  height: 2.5rem;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  padding-right: 6.875rem;
+}
+.forwardingUnit {
+  .text {
+    display: inline-block;
+    width: 10rem;
+    text-align: right;
+  }
+}
+.truckList1 {
+  width: 100%;
+  .truckList {
+    width: 96%;
+    .text {
+      display: inline-block;
+      width: 9.375rem;
+      text-align: right;
+    }
+    .truckBtn {
+      width: 17.5rem;
+    }
+  }
+}
+.button_box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 6.25rem;
+}
+</style>

+ 100 - 0
src/views/TMS/components/importedIngredients/transportReserveFuEdit.vue

@@ -0,0 +1,100 @@
+<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="258" v-model="form1"></dil-form>
+          <div>
+            <div v-if="form1.orderMaterialNumber">
+              <span>物资件数:</span>
+              <el-input placeholder="请输入内容" v-model="orderMaterialNumber" clearable>
+              </el-input>
+            </div>
+             <div v-if="form1.orderMaterialWeight">
+              <span>物资重量:</span>
+              <el-input placeholder="请输入内容" v-model="orderMaterialWeight" clearable>
+              </el-input>
+            </div>
+          </div>
+        </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: {},
+      orderMaterialNumber:'',
+      orderMaterialWeight:'',
+    };
+  },
+  mounted() {
+    this.information();
+  },
+  methods: {
+    information() {
+      this.axios
+        .post("/api/v1/oms/selectOrderByOrderId/" + this.$route.params.orderId)
+        .then((res) => {
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            if(e.orderMaterialNumber){
+              this.orderMaterialNumber = e.orderMaterialNumber;
+            }else if(e.orderMaterialWeight){
+              this.orderMaterialWeight = e.orderMaterialWeight;
+            }
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      let obj = {
+        orderId: this.$route.params.orderId,
+        orderMaterialNumber: this.form1.orderMaterialNumber,
+        orderEntryTime: sjTime(this.form1.orderEntryTime),
+        unloadPointId: this.form1.unloadPointId,
+        orderType: 5,
+      };
+
+      if (
+        obj.orderId == null ||
+        obj.orderMaterialNumber == null ||
+        obj.orderEntryTime == null ||
+        obj.unloadPointId == null
+      )
+        this.$message.error("存在空值!");
+      else
+        this.axios.post("/api/v1/oms/updateOrder", obj).then(() => {
+          this.$message({
+            type: "success",
+            message: "修改成功!",
+          });
+          this.$router.go(-1);
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+// @import "@/styles/appoint/contract/ContractInsert.scss";
+</style>  

+ 113 - 0
src/views/TMS/components/importedIngredients/truckDriverReceiveFu.vue

@@ -0,0 +1,113 @@
+<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>
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <!-- 未接收 -->
+      	<el-tab-pane label="未接收" name="third">
+						<dilTable v-bind.sync="option0">
+              <el-table-column fixed="right" label="操作" width="50">
+        <template slot-scope="scope">
+          <el-button @click="closeOrder(scope.row.orderId)" type="text" size="small">
+            关闭
+          </el-button>
+        </template>
+      </el-table-column>
+						</dilTable>
+					</el-tab-pane>
+      <!-- 未下发 -->
+      <el-tab-pane label="已接收" name="first">
+        <dilTable v-bind.sync="option1" ref="table">
+        </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 {
+      input: "",
+      Time: "",
+      activeName: "first",
+       option0: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4"
+      },
+      option1: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5"
+      },
+      option2: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=6"
+      }
+    };
+  },
+  methods: {
+    closeOrder(orderId) {
+      this.$confirm("是否关闭", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+           this.axios
+            .post(
+              "/api/v1/oms/closeOmstruckOrde?orderId="+orderId
+            )
+            .then((res) => {
+           if(res.data.code == '200')
+              // if(res.data.code)
+              this.$router.go(0);
+            });
+          this.$message({
+            type: "success",
+            message: "下发成功!",
+          });
+          // console.log(this.arr[0].text_prop);
+         
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消关闭!",
+          });
+        });
+    },
+    onclick() {
+       if(this.activeName == "first"){
+        this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&con=" + this.input;
+      }else if(this.activeName == "second"){
+        this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=6&con=" + this.input;
+      }else
+      {
+        this.option0.requestUrl="/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&con="+this.input;
+      }
+    },
+    handleClick(tab, event) {
+      console.log(tab, event);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+   .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 104 - 0
src/views/TMS/components/importedIngredients/truckEnfactoryFuResult.vue

@@ -0,0 +1,104 @@
+<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 {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=5",
+      },
+    };
+  },
+  methods: {
+    querySearch(queryString, cb) {
+      var restaurants = this.restaurants;
+      var results = queryString
+        ? restaurants.filter(this.createFilter(queryString))
+        : restaurants;
+      cb(results);
+    },
+    createFilter(queryString) {
+      return (restaurant) => {
+        return (
+          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
+          0
+        );
+      };
+    },
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=5&con=" + this.input;
+    },
+    updateClick(resultId) {
+      this.$router.push("/truckLoadResultEdit/" + resultId);
+    },
+    //新增
+    insertClick() {
+      this.$router.push("/truckLoadResultAdd/");
+    },
+    // deleteclick(scope) {
+    //   let pathId = scope;
+    //   this.axios
+    //     .post("/api/v1/tms/operationPath/operationPathDelete?pathId=" + pathId)
+    //     .then((res) => {
+    //       this.$message({
+    //         message: "删除成功",
+    //         type: "success",
+    //       });
+    //       this.$router.go(0);
+    //     });
+    // },
+    deleteClick(resultId) {
+      
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+          this.axios
+            .post(
+              "/api/v1/tms/deleteLoadResult/" + resultId
+            )
+            .then(() => {
+              this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 187 - 0
src/views/TMS/components/importedIngredients/truckJiMaoFuResult.vue

@@ -0,0 +1,187 @@
+<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" align="center" label="操作" width="120">
+        <template slot-scope="scope">
+          <el-button
+            @click="sendClick(scope.row.orderId)"
+            type="text"
+            size="small"
+            v-if="scope.row.orderStatus == 5"
+          >
+            退货
+          </el-button>
+          <el-button  
+            type="text"
+            size="small"
+            disabled
+            v-else
+          >
+            退货
+          </el-button>
+        </template>
+      </el-table-column>
+    </dilTable>
+
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClose"
+      :modal="true"
+      :close-on-click-modal="false"
+    >
+      <div class="text">
+        <span>请选择退货路线</span>
+      </div>
+      <el-input placeholder="请输入内容" v-model="lineName" disabled>
+      </el-input>
+      <el-button type="primary" @click="onLine">浏览</el-button>
+      <div class="returnResult">
+        <span>退货原因:</span>
+      </div>
+      <el-input placeholder="请输入内容" v-model="returnResult">
+      </el-input>
+      
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="handleClose">取 消</el-button>
+        <el-button type="primary" @click="outOrder">确 定</el-button>
+      </span>
+    </el-dialog>
+
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" size="50%">
+      <el-input
+        placeholder="请输入内容"
+        v-model="calculationText"
+        style="margin-top: 0.625rem; margin-left: 1.25rem"
+        clearable
+      ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="calculation"
+        style="margin-bottom: 0.9375rem"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <div>
+        <!-- 模态框——表格 -->
+        <dilTable
+          v-bind.sync="line"
+          @radio-change="currentRadioChange"
+        ></dilTable>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      returnResult:'',
+      //路线名称
+      lineName: "",
+      //路线id
+      lineId: null,
+      //模态框框计算文本
+      calculationText: "",
+      //是否需要打开模态窗口
+      drawer: false,
+      //是否打开弹窗
+      dialogVisible: false,
+      //订单id
+      orderId: null,
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=5",
+      },
+      //模态框表格数据
+      line: {
+        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=4",
+        selectionType: "radio",
+      },
+    };
+  },
+  methods: {
+    //模态框单选触发事件
+    currentRadioChange(selection) {
+      this.lineName = selection.lineName;
+      this.lineId = selection.lineId;
+    },
+    //模态框框计算
+    calculation() {
+      this.option.requestUrl =
+        "/api/v1/rms/getAllLineDesk?apiId=249&lineType=4&con=" +
+        this.calculationText;
+    },
+    //弹窗浏览按钮
+    onLine() {
+      this.drawer = true;
+    },
+    //弹窗的确定按钮
+    outOrder() {
+      if(this.lineId && this.returnResult){
+        let map = {
+        returnResult:this.returnResult,
+        orderId: this.orderId,
+        lineId: this.lineId,
+      };
+      this.axios.post("/api/v1/oms/returnOrderCloseOrder", map).then((res) => {
+        console.log(res);
+        this.dialogVisible = false;
+          this.option.requestUrl ="/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=5&i=0";
+      });
+      }else{
+          this.$message({
+          message: '请选择运输路线和退货原因,在确定!',
+          type: 'warning'
+        });
+      }
+    },
+    //弹窗关闭事件
+    handleClose() {
+      this.lineName = null;
+      this.lineId = null;
+      this.orderId = null;
+      this.dialogVisible = false;
+    },
+    //操作列退货按钮
+    sendClick(orderId) {
+      console.log(orderId);
+      this.orderId = orderId;
+      this.dialogVisible = true;
+    },
+    onclick() {
+      this.option.requestUrl =
+        "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=5&con=" + this.input;
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+  .text {
+    margin-bottom: 0.625rem;
+  }
+  .returnResult {
+    margin-top: 0.625rem;
+    margin-bottom: 0.625rem;
+  }
+}
+</style>

+ 45 - 0
src/views/TMS/components/importedIngredients/truckJiPiFuResult.vue

@@ -0,0 +1,45 @@
+<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/getAllJiPiResult?apiId=146&orderType=5",
+      },
+    };
+  },
+  methods: {
+    //一览表格框计算
+    onclick() {
+      this.option.requestUrl =
+        "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=5&con=" + this.input;
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 58 - 0
src/views/TMS/components/importedIngredients/truckLeaveFactoryFuResult.vue

@@ -0,0 +1,58 @@
+<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 {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=5",
+      },
+    };
+  },
+  methods: {
+    querySearch(queryString, cb) {
+      var restaurants = this.restaurants;
+      var results = queryString
+        ? restaurants.filter(this.createFilter(queryString))
+        : restaurants;
+      cb(results);
+    },
+    createFilter(queryString) {
+      return (restaurant) => {
+        return (
+          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
+          0
+        );
+      };
+    },
+    
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=5&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 72 - 0
src/views/TMS/components/importedIngredients/truckQualityFuResult.vue

@@ -0,0 +1,72 @@
+<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 {
+      status: "",
+      input: "",
+      option: {       
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getQualityResult?apiId=150&orderType=5",
+      },
+    };
+  },
+  methods: {
+    querySearch(queryString, cb) {
+      var restaurants = this.restaurants;
+      var results = queryString
+        ? restaurants.filter(this.createFilter(queryString))
+        : restaurants;
+      cb(results);
+    },
+    createFilter(queryString) {
+      return (restaurant) => {
+        return (
+          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
+          0
+        );
+      };
+    },
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getQualityResult?apiId=150&orderType=5&con=" + this.input;
+    },
+    btnclick() {
+      this.$router.push("/approveWagonPleaseAdd/");
+    },
+    updateClick(resultId) {
+      this.$router.push("/truckQualityFuResultEdit/" + resultId);
+    },
+    
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 96 - 0
src/views/TMS/components/importedIngredients/truckQualityFuResultEdit.vue

@@ -0,0 +1,96 @@
+<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="187" 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: {},
+      // 表格
+      table1: {},
+      contractId: "",
+    };
+  },
+  mounted() {
+    this.information();
+  },
+  methods: {
+  information() {
+      //编辑运输计划
+      this.axios
+        .post("/api/v1/tms/getQualityResultById/" + this.$route.params.resultId)
+        .then((res) => {
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+          });
+        });
+    },
+
+    handleCheckedCitiesChange(value) {
+      console.log(value);
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      let QR = {
+        resultId: this.$route.params.resultId,
+        resultIssampling: this.form1.resultIssampling,
+        resultDeduction: this.form1.resultDeduction,
+        resultSamplingPointId: this.form1.resultSamplingPointId,
+        resultDeductionDescription: this.form1.resultDeductionDescription
+      };
+    
+      var val = this.value;
+      if (
+        QR.resultIssampling==null||
+        QR.resultDeduction==null||
+        QR.resultSamplingPointId==null||
+        QR.resultDeductionDescription==null
+      ) this.$message.error("存在空值!");
+      else
+      this.axios
+        .post("/api/v1/tms/updateQualityResult", QR)
+        .then(() => {
+          this.$message({
+            type: "success",  
+            message: "修改成功!",
+          });
+          this.$router.go(-1);
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+// @import "@/styles/appoint/contract/ContractInsert.scss";
+</style>

+ 58 - 0
src/views/TMS/components/importedIngredients/truckReceiptFuResult.vue

@@ -0,0 +1,58 @@
+<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 {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getReceiveResult?apiId=149&orderType=5",
+      },
+    };
+  },
+  methods: {
+    querySearch(queryString, cb) {
+      var restaurants = this.restaurants;
+      var results = queryString
+        ? restaurants.filter(this.createFilter(queryString))
+        : restaurants;
+      cb(results);
+    },
+    createFilter(queryString) {
+      return (restaurant) => {
+        return (
+          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
+          0
+        );
+      };
+    },
+    
+    onclick() {
+     this.option.requestUrl = "/api/v1/tms/getReceiveResult?apiId=149&orderType=5&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 58 - 0
src/views/TMS/components/importedIngredients/truckReturnResult.vue

@@ -0,0 +1,58 @@
+<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 {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllReturnResult?apiId=377&orderType=5",
+      },
+    };
+  },
+  methods: {
+    querySearch(queryString, cb) {
+      var restaurants = this.restaurants;
+      var results = queryString
+        ? restaurants.filter(this.createFilter(queryString))
+        : restaurants;
+      cb(results);
+    },
+    createFilter(queryString) {
+      return (restaurant) => {
+        return (
+          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
+          0
+        );
+      };
+    },
+    
+    onclick() {
+     this.option.requestUrl = "/api/v1/tms/getReceiveResult?apiId=149&orderType=5&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 57 - 0
src/views/TMS/components/importedIngredients/truckUnloadFuResult.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">
+      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getUnloadResult?apiId=145&orderType=5",
+      },
+    };
+  },
+  methods: {
+    querySearch(queryString, cb) {
+      var restaurants = this.restaurants;
+      var results = queryString
+        ? restaurants.filter(this.createFilter(queryString))
+        : restaurants;
+      cb(results);
+    },
+    createFilter(queryString) {
+      return (restaurant) => {
+        return (
+          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
+          0
+        );
+      };
+    },
+    onclick() {
+     this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=145&orderType=5&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 120 - 0
src/views/TMS/components/importedMine/addApproveWagonPlease.vue

@@ -0,0 +1,120 @@
+<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";
+
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      option: {
+        // 表格请求数据的地址
+        requestUrl:
+          "/api/v1/tms/getAllWagonPlease?apiId=57&status=1&resultType=1",
+        // 控制显示当选列
+        selectionType: "radio",
+      },
+      // 表单
+      form1: {},
+      // 表格
+      table1: {},
+      contractId: "",
+      inf: {},
+    };
+  },
+  mounted() {
+    // this.unit();
+  },
+  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" scoped>
+//@import "@/styles/appoint/contract/ContractInsert.scss";
+</style>

+ 475 - 0
src/views/TMS/components/importedMine/addWagonLoad.vue

@@ -0,0 +1,475 @@
+<template>
+  <!-- 添加车皮装车实绩 -->
+  <div class="addWagonLoad">
+    <page-title>新增</page-title>
+    <el-divider content-position="left">车皮装车实绩</el-divider>
+    <div class="cp">
+      <span>车皮号:</span>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        @change="onchang"
+        clearable
+      >
+      </el-input>
+    </div>
+    <div class="cpList">
+      <div class="list">
+        <span class="cpList1" v-for="(item, i) in list" :key="i">
+          {{ item }}
+          <i class="el-icon-close itu" @click="onclick(i)"></i>
+        </span>
+      </div>
+    </div>
+
+    <div class="material from">
+      <span class="text">物资:</span>
+      <el-input v-model="materialName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
+    </div>
+
+    <div class="forwardingUnit from">
+      <span class="text">发货单位:</span>
+      <el-input v-model="supplierName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
+    </div>
+    <div class="remark from">
+      <span class="text">船名:</span>
+      <el-input v-model="remark" @blur="onBlur"> </el-input>
+      <span class="span"></span>
+    </div>
+    <div class="forwardingUnit from">
+      <span class="text">卸货点:</span>
+      <el-input v-model="unloadPointName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
+    </div>
+    <div class="form">
+      <div class="form-box" style="margin-right: 10rem">
+        <dil-form :formId="102" v-model="form1" ref="from1"></dil-form>
+      </div>
+    </div>
+    <div class="button-box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        style="margin-top: 0.625rem; margin-left: 1.25rem"
+        clearable
+      ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="onClick(a)"
+        style="margin-bottom: 0.9375rem"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <div v-show="a == 1">
+        <dilTable
+          v-bind.sync="frist"
+          @radio-change="currentRadioChange1"
+        ></dilTable>
+      </div>
+      <div v-show="a == 2">
+        <dilTable
+          v-bind.sync="secend"
+          @radio-change="currentRadioChange2"
+        ></dilTable>
+      </div>
+      <div v-show="a == 4">
+        <dilTable
+          v-bind.sync="unloadPoint"
+          @radio-change="currentRadioChange4"
+        ></dilTable>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      list: [],
+      form1: {},
+      input: "",
+      value: undefined,
+      //船名
+      remark: null,
+      //采购订单id
+      purchaseOrderId: null,
+      //物资名称
+      materialName: null,
+      //发货单位名称
+      supplierName: null,
+      //发货单位id
+      supplierId: null,
+      //物资id
+      materialId: null,
+      //是否需要打开模态窗口
+      drawer: false,
+      //卸货点id
+      unloadPointId: null,
+      //卸货点名称
+      unloadPointName: null,
+      a: 1,
+      direction: "rtl",
+      inputText: "",
+      frist: {
+        requestUrl: "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050",
+        selectionType: "radio",
+        mapList1: [],
+      },
+      secend: {
+        requestUrl:
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=",
+        selectionType: "radio",
+        mapList2: [],
+      },
+      unloadPoint: {
+        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        selectionType: "radio",
+      },
+    };
+  },
+  created(){
+    this.form1 = {
+      sendStationId:1,
+      arrivalStationId:2,
+    }
+  },
+  methods: {
+    currentRadioChange1(selection) {
+      this.input = null;
+      this.materialName = selection.materialName;
+      this.materialId = selection.materialId;
+      this.getPurchaseOrderNo();
+    },
+    currentRadioChange2(selection) {
+      this.supplierName = selection.supplierName;
+      this.supplierId = selection.supplierId;
+      this.getPurchaseOrderNo();
+    },
+    currentRadioChange4(selection) {
+      this.unloadPointId = selection.warehouseId;
+      this.unloadPointName = selection.warehouseName;
+    },
+    ondrawer(num) {
+      this.drawer = true;
+      this.a = num;
+      if (num == 2) {
+        this.secend.requestUrl =
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+          this.materialId;
+      }
+    },
+    onBlur() {
+      this.getPurchaseOrderNo();
+    },
+    getPurchaseOrderNo() {
+      let map = {
+        materialId: this.materialId,
+        supplierId: this.supplierId,
+      };
+      if (this.remark) {
+        map.remark = this.remark;
+      }
+      console.log(this.map);
+      if (this.materialId && this.supplierId) {
+        this.axios.post("/api/v1/oms/selectNewOrderId", map).then((res) => {
+          console.log(res);
+          if (res.data.code == "200") {
+            if (res.data.data == null) {
+              this.$message({
+                message: "没有匹配的采购订单号!",
+                type: "warning",
+              });
+              this.form1 = [];
+            } else {
+              this.remark = res.data.data.remark;
+              this.purchaseOrderId = res.data.data.purchaseOrderId;
+              this.form1 = { purchaseOrderNo: res.data.data.purchaseOrderNo };
+            }
+          } else {
+            this.$message.error("请求失败");
+          }
+        });
+      }
+    },
+    onClick(a) {
+      if (a == 1) {
+        this.frist.requestUrl =
+          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+          this.inputText;
+      } else if (a == 2) {
+        this.secend.requestUrl =
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+          this.materialId +
+          "&index=" +
+          this.inputText;
+      } else if (a == 4) {
+        this.unloadPoint.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.inputText;
+      }
+    },
+    onchang() {
+      var state = false;
+      var cptop = this.input.substring(0, 2);
+      var cptop1 = this.input.substring(0, 3);
+      if (
+        cptop == "45" ||
+        cptop == "46" ||
+        cptop == "42" ||
+        cptop == "47" ||
+        cptop == "15" ||
+        cptop == "16" ||
+        cptop == "17" ||
+        cptop == "18"
+      ) {
+        state = true;
+      } else if (
+        cptop1 == "140" ||
+        cptop1 == "141" ||
+        cptop1 == "142" ||
+        cptop1 == "143" ||
+        cptop1 == "145"
+      ) {
+        state = true;
+      } else {
+        this.$message({
+          type: "warning",
+          message: "车皮号格式不对,请重新输入!",
+        });
+      }
+      if (state) {
+        if (this.input.length == 7) {
+          this.list.push(this.input);
+          this.input = "";
+        } else {
+          this.$message({
+            type: "warning",
+            message: "车皮号长度不足7位数,请重新输入!",
+          });
+        }
+      }
+    },
+    onclick(index) {
+      this.list.splice(index, 1);
+    },
+    // 确定
+    makeSure() {
+      let state = 0;
+      if (
+        this.list.length > 0 &&
+        this.materialId &&
+        this.supplierId &&
+        this.unloadPointId &&
+        this.purchaseOrderId &&
+        this.form1.resultIsclear &&
+        this.form1.resultClass &&
+        this.form1.sendStationId &&
+        this.form1.arrivalStationId &&
+        this.form1.resultLoadingDate
+      ) {
+        state = 1;
+      } else {
+        console.log(this.list.length);
+        if (this.list.length == 0) {
+          this.$message({
+            type: "warning",
+            message: "请输入车皮号!",
+          });
+        } else {
+          if (this.materialId) {
+            if (this.supplierId) {
+              if (this.unloadPointId) {
+                if (this.purchaseOrderId) {
+                  if (this.form1.resultIsclear) {
+                    if (this.form1.resultIsclear) {
+                      if (this.form1.sendStationId) {
+                        if (this.form1.arrivalStationId) {
+                          if (this.form1.resultLoadingDate) {
+                          } else {
+                            this.$message({
+                              type: "warning",
+                              message: "请选择装车时间!",
+                            });
+                          }
+                        } else {
+                          this.$message({
+                            type: "warning",
+                            message: "请选择到站!",
+                          });
+                        }
+                      } else {
+                        this.$message({
+                          type: "warning",
+                          message: "请选择发站!",
+                        });
+                      }
+                    } else {
+                      this.$message({
+                        type: "warning",
+                        message: "请选择班别!",
+                      });
+                    }
+                  } else {
+                    this.$message({
+                      type: "warning",
+                      message: "请选择是否清场!",
+                    });
+                  }
+                } else {
+                  this.$message({
+                    type: "warning",
+                    message: "该物资没有采购订单号!",
+                  });
+                }
+              } else {
+                this.$message({
+                  type: "warning",
+                  message: "请选择卸货地点!",
+                });
+              }
+            } else {
+              this.$message({
+                type: "warning",
+                message: "请选择发货单位!",
+              });
+            }
+          } else {
+            this.$message({
+              type: "warning",
+              message: "请选择物资!",
+            });
+          }
+        }
+      }
+      if(state == 1){
+        let map = {
+          wagonNoList:this.list,
+          unloadingPointId:this.unloadPointId,
+          purchaseOrderRailPlanId:this.purchaseOrderId,
+          resultIsclear:this.form1.resultIsclear,
+          resultClass: this.form1.resultClass,
+          sendStationId: this.form1.sendStationId,
+          arrivalStationId: this.form1.arrivalStationId,
+          resultLoadingDate: sjTime(this.form1.resultLoadingDate),
+          resultRemarks: this.form1.resultRemarks,
+          resultType:1,
+        }
+        this.axios.post('/api/v1/tms/insertTmstrainLoadingResult',map).then((res)=>{
+          console.log(res);
+          if(res.data.code == "200"){
+            this.$message({
+              type: "success",
+              message: "新增成功",
+            });
+            this.$router.push("/wagonLoad");
+          }
+        })
+      }
+    },
+    // 取消
+    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>
+

+ 96 - 0
src/views/TMS/components/importedMine/addWagonPlease.vue

@@ -0,0 +1,96 @@
+<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="122" 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.unit();
+  },
+  methods: {
+    handleCheckedCitiesChange(value) {
+      console.log(value);
+    },
+    
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+     // 确认
+    onClickConfirm() {
+      let tmstrainPleaseApproveResult = {
+        resultPlanDate: sjTime(this.form1.resultPlanDate),
+        resultCategory: this.form1.resultCategory,
+        shipperId: this.form1.shipperId,
+        sendStationId: this.form1.sendStationId,
+        toTheStationId: this.form1.toTheStationId,
+        resultPleaseNumber: this.form1.resultPleaseNumber,
+        insertUsername: "admin",
+        resultType: 1
+      };
+      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.resultPlanDate==null||
+        tmstrainPleaseApproveResult.resultCategory==null||
+        tmstrainPleaseApproveResult.shipperId==null||
+        tmstrainPleaseApproveResult.sendStationId==null||
+        tmstrainPleaseApproveResult.toTheStationId==null||
+        tmstrainPleaseApproveResult.resultPleaseNumber==null
+
+      ) this.$message.error("存在空值!");
+      else
+      if (!isNumber(val)) this.$message.error("请车数量必须是数字!");
+      else
+      this.axios
+        .post("/api/v1/tms/addWagonPlease", tmstrainPleaseApproveResult)
+        .then(() => {
+          this.$message({
+            type: "success",  
+            message: "新增成功!",
+          });
+          this.$router.go(-1);
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+//@import "@/styles/appoint/contract/ContractInsert.scss";
+</style>

+ 101 - 0
src/views/TMS/components/importedMine/addWagonUnLoad.vue

@@ -0,0 +1,101 @@
+<template>
+  <!-- 添加车皮卸车实绩 -->
+  <div class="addWagonLoad">
+    <page-title>新增</page-title>
+    <div class="main">
+      <el-divider content-position="left">选择已装车实绩</el-divider>
+    </div>
+    <div>
+      <dilTable
+        v-bind.sync="option"
+        ref="table"
+        @selection-change="selectionChange"
+      >
+      </dilTable>
+    </div>
+    <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" class="btn">取消</el-button>
+      <el-button type="primary" @click="makeSure" class="btn">确定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getWagonNo/1?apiId=213",
+        // 控制显示当选列
+        selectionType: "select",
+      },
+      value: undefined,
+      list: [],
+    };
+  },
+  mounted() {},
+  methods: {
+    selectionChange(selection) {
+      this.list = [];
+      selection.forEach((e) => {
+        this.list.push({
+          resultWagonNo: e.resultWagonNo,
+          resultId: e.resultId,
+        });
+      });
+    },
+    // 确定
+    makeSure() {
+      let tmstrainWagonUnloadResult = {
+        wagonNoList: this.list,
+        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,
+        resultType: 1,
+      };
+      console.log(tmstrainWagonUnloadResult);
+      if (
+        tmstrainWagonUnloadResult.wagonNoList == 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' scoped>
+</style>

+ 100 - 0
src/views/TMS/components/importedMine/editApproveWagonPlease.vue

@@ -0,0 +1,100 @@
+<template>
+  <!-- 修改批车作业页面 -->
+  <div id="contractDetails">
+    <page-title>批车作业</page-title>
+    <div class="main">
+      <span class="text">修改批车作业</span>
+      <span class="a"></span>
+    </div>
+    <div class="contractTitle">
+      <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="140" v-model="form1"></dil-form>
+        </div>
+      </div>
+    </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/getApproveWagonPleaseById/" + 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,
+        shipperId: this.form1.shipperId,
+        resultCategory: this.form1.resultCategory,
+        sendStationId: this.form1.sendStationId,
+        toTheStationId: this.form1.toTheStationId,
+        updateUsername: "admin"
+      };
+      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.resultApproveDate==null||
+        approveWagonPlease.resultApproveNumber==null||
+        approveWagonPlease.shipperId==null||
+        approveWagonPlease.resultCategory==null||
+        approveWagonPlease.sendStationId==null||
+        approveWagonPlease.toTheStationId==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" scoped>
+//@import "@/styles/appoint/contract/ContractInsert.scss";
+</style>

+ 105 - 0
src/views/TMS/components/importedMine/editWagonLoad.vue

@@ -0,0 +1,105 @@
+<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";
+
+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" scoped>
+//@import "@/styles/TMS/addwagonload.scss";
+</style>

+ 100 - 0
src/views/TMS/components/importedMine/editWagonPlease.vue

@@ -0,0 +1,100 @@
+<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="117" 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 tmstrainPleaseApproveResult = {
+        resultId: this.$route.params.resultId,
+        resultPlanDate: sjTime(this.form1.resultPlanDate),
+        resultCategory: this.form1.resultCategory,
+        shipperId: this.form1.shipperId,
+        sendStationId: this.form1.sendStationId,
+        toTheStationId: this.form1.toTheStationId,
+        resultPleaseNumber: this.form1.resultPleaseNumber
+      };
+      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.resultPlanDate==null||
+        tmstrainPleaseApproveResult.resultCategory==null||
+        tmstrainPleaseApproveResult.shipperId==null||
+        tmstrainPleaseApproveResult.sendStationId==null||
+        tmstrainPleaseApproveResult.toTheStationId==null||
+        tmstrainPleaseApproveResult.resultPleaseNumber==null
+      ) this.$message.error("存在空值!");
+      else
+      if (!isNumber(val)) this.$message.error("请车数必须是数字!");
+      else
+      this.axios
+        .post("/api/v1/tms/updateApproveWagonPlease", tmstrainPleaseApproveResult)
+        .then(() => {
+          this.$message({
+            type: "success",  
+            message: "修改成功!",
+          });
+          this.$router.go(-1);
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+//@import "@/styles/appoint/contract/ContractInsert.scss";
+</style>

+ 100 - 0
src/views/TMS/components/importedMine/editWagonUnLoad.vue

@@ -0,0 +1,100 @@
+<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";
+
+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" scoped>
+//@import "@/styles/TMS/addwagonload.scss";
+</style>

+ 63 - 0
src/views/TMS/components/importedMine/entrust.vue

@@ -0,0 +1,63 @@
+<template>
+  <!-- 发送计量委托界面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="btnclick(0)">
+        <i class="el-icon-s-promotion"></i>发送
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option" @selection-change="selectionChange">
+    </dilTable>
+  </div>
+</template>
+
+
+<script>
+export default {
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=1",
+        // 控制显示多选列
+        selectionType: "select",
+      },
+      selectionListMap:[],
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=1&con="+this.input;
+    },
+    btnclick() {
+      this.axios.post('/api/v1/tms/batchSendMeasureCommission',{resultIdList:this.selectionListMap}).then((res)=>{
+        if(res.data.code == "200"){
+          this.$message({
+            type: "success",
+            message: "发送成功",
+          });
+          this.option.requestUrl = "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=1";
+        }
+      })
+    },
+    selectionChange(selection) {
+      this.selectionListMap = [] 
+      selection.forEach(element => {
+        this.selectionListMap.push(element.resultId);
+      });
+    },
+  },
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 63 - 0
src/views/TMS/components/importedMine/wagonApprove.vue

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

+ 93 - 0
src/views/TMS/components/importedMine/wagonLoad.vue

@@ -0,0 +1,93 @@
+<template>
+  <!-- 装车作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="btnclick(0)">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+
+    <dilTable v-bind.sync="option">
+      <el-table-column fixed="right" label="操作" width="100">
+        <template slot-scope="scope">
+          <el-button @click="click(scope.row.resultId)" type="text" size="small"
+            >修改</el-button
+          >
+          <el-button
+            type="text"
+            size="small"
+            @click="deleteclick(scope.row.resultId)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </dilTable>
+  </div>
+</template>
+
+
+<script>
+export default {
+  name: "wagonload",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getTmstrainWagonLoad?apiId=58&resultType=1",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getTmstrainWagonLoad?apiId=58&resultType=1&con="+this.input;
+    },
+    btnclick() {
+      this.$router.push("/addWagonLoad");
+    },
+    click(resultId) {
+      this.$router.push("/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' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 155 - 0
src/views/TMS/components/importedMine/wagonPlease.vue

@@ -0,0 +1,155 @@
+<template>
+  <!-- 请车作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="insertClick">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <el-tabs v-model="activeName">
+      <!-- 未下发 -->
+      <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 {
+      input: "",
+      activeName: "first",
+      option1: {
+        // 表格请求数据的地址
+        requestUrl:
+          "/api/v1/tms/getAllWagonPlease?apiId=57&status=0&resultType=1",
+      },
+      option2: {
+        // 表格请求数据的地址
+        requestUrl:
+          "/api/v1/tms/getAllWagonPlease?apiId=57&status=1&resultType=1",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      if (this.activeName == "first") {
+        this.option1.requestUrl =
+          "/api/v1/tms/getAllWagonPlease?apiId=57&status=0&resultType=1&con=" +
+          this.input;
+      } else {
+        this.option2.requestUrl =
+          "/api/v1/tms/getAllWagonPlease?apiId=57&status=1&resultType=1&con=" +
+          this.input;
+      }
+    },
+    // 删除
+    deleteClick(resultId) {
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+          // console.log(this.arr[0].text_prop);
+          this.$axios
+            .post("/api/v1/tms/deleteApproveWagonPlease/" + resultId)
+            .then(() => {
+              this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+    // 下发
+    sendClick(resultId) {
+      this.$confirm("是否下发", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "下发成功!",
+          });
+          // console.log(this.arr[0].text_prop);
+          this.$axios
+            .post("/api/v1/tms/sendWagonPlease/" + resultId)
+            .then(() => {
+              this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消下发!",
+          });
+        });
+    },
+
+    //新增
+    insertClick() {
+      this.$router.push("/addWagonPlease/");
+    },
+    //修改
+    updateClick(resultId) {
+      this.$router.push("/editWagonPlease/" + resultId);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 96 - 0
src/views/TMS/components/importedMine/wagonUnLoad.vue

@@ -0,0 +1,96 @@
+<template>
+  <!-- 卸车作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="btnclick(0)">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+
+    <dilTable v-bind.sync="option">
+      <el-table-column fixed="right" label="操作" width="100">
+        <template slot-scope="scope">
+          <el-button
+            @click="click(scope.row.unloadingId)"
+            type="text"
+            size="small"
+            >修改</el-button
+          >
+          <el-button
+            type="text"
+            size="small"
+            @click="deleteclick(scope.row.unloadingId)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </dilTable>
+  </div>
+</template>
+
+
+<script>
+export default {
+  name: "wagonUnload",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getTmstrainWagonUnLoad?apiId=60&resultType=1",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getTmstrainWagonUnLoad?apiId=60&resultType=1&con="+this.input;
+    },
+    btnclick() {
+      this.$router.push("/addWagonUnLoad");
+    },
+    click(unloadingId) {
+      this.$router.push("/editWagonUnLoad/" + unloadingId);
+    },
+    deleteclick(scope) {
+      let unloadingId = scope;
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+          this.axios
+            .post(
+              "/api/v1/tms/deleteTmstrainWagonUnLoadResultByUnLoadingId?unloadingId=" +
+                unloadingId
+            )
+            .then(() => {
+              this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 136 - 0
src/views/TMS/components/importedShip/addBargeShip.vue

@@ -0,0 +1,136 @@
+<template>
+  <!-- 船只信息页面 -->
+  <div class="homeworkPath">
+    <page-title>驳船作业信息</page-title>
+    <div class="main">
+      <span class="text">驳船作业新增</span>
+      <span class="a"></span>
+    </div>
+    <div>
+      <div class="form-box" style="margin:0 50rem">
+        <el-form ><dil-form :formId="125" v-model="form"></dil-form>
+        <el-button type="primary" @click="makeSure">新增驳船作业</el-button>
+        </el-form>
+        
+      </div>
+    </div>
+    <div class="button-ins">   
+    </div>
+    <div class="main">
+      <span class="text">驳船作业新增</span>
+      <span class="a"></span>
+    </div>
+     <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" @radio-change="currentRadioChange">
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      input:'',
+      restaurants: [],
+      state: "",
+      form: {},
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getCapacityList?apiId=138",
+        // 控制显示当选列
+        selectionType: "radio",
+        bagerShipMap:{},
+      },
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    currentRadioChange(row) {
+      this.bagerShipMap=row
+      console.log(row);
+    },
+    // 新增
+    makeSure() {
+      let mapVal = {
+        orderId: this.$route.params.orderId,
+        smallCapacityId: this.form.smallCapacityId,
+        bargeSmallshipLoadWeight: this.form.bargeSmallshipLoadWeight,
+        bargeRefuteDate: sjTime(
+          this.form.bargeRefuteDate
+        ),
+        bargeRefuteLocation: this.form.bargeRefuteLocation,
+        bargeBackDate: sjTime(
+          this.form.bargeBackDate
+        ),
+        bargeBackLocation: this.form.bargeBackLocation,
+      };
+      console.log(mapVal);
+       if (
+      mapVal.smallCapacityId==null||
+      mapVal.bargeSmallshipLoadWeight==null||
+      mapVal.bargeRefuteDate==null||
+      mapVal.bargeRefuteLocation==null||
+      mapVal.bargeBackDate==null||
+      mapVal.bargeBackLocation==null
+      ) this.$message.error("存在空值!");
+      else
+      this.axios
+        .post(
+          "/api/v1/tms/addBargeOperation",
+          {
+            mapVal:mapVal,
+            bagerShipMap:this.bagerShipMap
+          }
+        )
+        .then((res) => {
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            // this.$refs.table.refreshData();
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败!");
+          }
+          this.$refs['table'].resetField();
+        });
+    },
+    loadAll() {
+      return [
+
+      ];
+    },
+    handleSelect(item) {
+      console.log(item);
+    },
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getCapacityList?apiId=138&con=" + this.input
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath{
+  .main{
+    margin-bottom: 0.125rem;
+  }
+  .button-ins{
+    margin: 0 50rem; 
+    text-align: center
+  }
+  .top {
+    margin: 0 auto;
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 139 - 0
src/views/TMS/components/importedShip/addLoadShip.vue

@@ -0,0 +1,139 @@
+<template>
+  <!-- 船只信息页面 -->
+  <div class="homeworkPath">
+    <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">
+        <el-form ><dil-form :formId="120" v-model="form"></dil-form>
+        <el-button type="primary" @click="makeSure">新增装船作业</el-button></el-form>
+      </div>
+    </div>
+     <div class="main">
+      <span class="text">选择船只</span>
+      <span class="a"></span>
+    </div>
+     <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" @radio-change="currentRadioChange">
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      input:'',
+      restaurants: [],
+      state: "",
+      form: {},
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getCapacityList?apiId=138",
+        // 控制显示当选列
+        selectionType: "radio",
+        rowMap:{},
+      },
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    currentRadioChange(row) {
+      this.rowMap=row
+      
+      console.log(this.rowMap);
+    },
+    // 新增
+    makeSure() {
+      let mapVal = {
+        resultActualInstallations: this.form.resultActualInstallations,
+      //  portId: this.form.portId,
+        resultLoadShipDate: sjTime(
+          this.form.resultLoadShipDate
+        ),
+        resultIsClear: this.form.resultIsClear,
+        resultPortDeclarationTime: sjTime(
+          this.form.resultPortDeclarationTime
+        ),
+        resultPortDeclarationName: this.form.resultPortDeclarationName,
+        resultArrivalTime: sjTime(
+          this.form.resultArrivalTime
+        ),
+        resultOutWharyName: this.form.resultOutWharyName,
+        resultOutWharyTime: sjTime(
+          this.form.resultOutWharyTime
+        ),
+        resultMemo: this.form.resultMemo,
+      };
+      console.log(mapVal);
+      if (
+      mapVal.resultActualInstallations==null||
+     // mapVal.portId==null||
+      mapVal.resultLoadShipDate==null||
+      mapVal.resultIsClear==null||
+      mapVal.resultPortDeclarationTime==null||
+      mapVal.resultPortDeclarationName==null||
+      mapVal.resultArrivalTime==null||
+      mapVal.resultOutWharyName==null||
+      mapVal.resultOutWharyTime==null||
+      mapVal.resultMemo==null
+      ) this.$message.error("存在空值!");
+      else
+      this.axios
+        .post(
+          "/api/v1/tms/addLoadShip",
+          {
+           mapVal:mapVal,
+           rowMap:this.rowMap
+          }
+        )
+        .then((res) => {
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            // this.$refs.table.refreshData();
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败!");
+          }
+          this.$refs['table'].resetField();
+        });
+    },
+    handleSelect(item) {
+      console.log(item);
+    },
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getCapacityList?apiId=138&con=" + this.input
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath{
+    .main{
+    margin-bottom: 0.125rem;
+  }
+  .button-ins{
+    margin: 0 50rem; 
+    text-align: center
+  }
+  .top {
+    margin: 0 auto;
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 125 - 0
src/views/TMS/components/importedShip/addShipLocation.vue

@@ -0,0 +1,125 @@
+<template>
+  <!-- 船只信息页面 -->
+  <div class="homeworkPath">
+    <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">
+        <el-form ><dil-form :formId="127" v-model="form"></dil-form>
+        <el-button type="primary" @click="makeSure">新增位置作业</el-button>
+        </el-form>
+      </div>
+    </div>
+     <div class="main">
+      <span class="text">位置作业新增</span>
+      <span class="a"></span>
+    </div>
+     <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" @radio-change="currentRadioChange">
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      input:'',
+      restaurants: [],
+      state: "",
+      form: {},
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getCapacityList?apiId=138",
+        // 控制显示当选列
+        selectionType: "radio",
+        shipLocationMap:{},
+      },
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    currentRadioChange(row) {
+      this.shipLocationMap=row
+      console.log(row);
+    },
+    // 新增
+    makeSure() {
+      let mapVal = {
+        locationValue: this.form.locationValue,
+        locationRouteTime: sjTime(
+          this.form.locationRouteTime
+        ),
+        locationStatus: this.form.locationStatus,
+        locationMemo: this.form.locationMemo,
+      };
+      console.log(mapVal);
+      if (mapVal.locationValue==null||
+      mapVal.locationRouteTime==null||
+      mapVal.locationStatus==null||
+      mapVal.locationMemo==null
+      ) this.$message.error("存在空值!");
+      else
+      this.axios
+        .post(
+          "/api/v1/tms/addShipLocation",
+          {
+            mapVal: mapVal,
+            shipLocationMap: this.shipLocationMap
+          }
+        )
+        .then((res) => {
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            // this.$refs.table.refreshData();
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败!");
+          }
+          this.$refs['table'].resetField();
+        });
+    },
+    loadAll() {
+      return [
+
+      ];
+    },
+    handleSelect(item) {
+      console.log(item);
+    },
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getCapacityList?apiId=138&con=" + this.input
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath{
+  .main{
+    margin-bottom: 0.125rem;
+  }
+  .button-ins{
+    margin: 0 50rem; 
+    text-align: center
+  }
+  .top {
+    margin: 0 auto;
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

Some files were not shown because too many files changed in this diff