Bläddra i källkod

合并除采购和结算以外的页面

HUJIANGUO 3 år sedan
förälder
incheckning
b4f28c35e3
100 ändrade filer med 7870 tillägg och 68 borttagningar
  1. 5 5
      config/index.js
  2. BIN
      src/assets/img/icore-shown-all.png
  3. BIN
      src/assets/img/icore-shown-desc.png
  4. 14 0
      src/js/QueueStartList.js
  5. 31 0
      src/js/sharedJsFile.js
  6. 22 0
      src/views/RMS/app.html
  7. 39 0
      src/views/RMS/app.js
  8. 59 0
      src/views/RMS/components/addCapacity.vue
  9. 88 0
      src/views/RMS/components/addCarDriver.vue
  10. 75 0
      src/views/RMS/components/addCarrier.vue
  11. 132 0
      src/views/RMS/components/addGatepost.vue
  12. 162 0
      src/views/RMS/components/addMaterial.vue
  13. 54 0
      src/views/RMS/components/addOilPrice.vue
  14. 59 0
      src/views/RMS/components/addPersonnel.vue
  15. 60 0
      src/views/RMS/components/addPier.vue
  16. 61 0
      src/views/RMS/components/addPort.vue
  17. 5 0
      src/views/RMS/components/addPortStorageYard.vue
  18. 0 0
      src/views/RMS/components/addRawMaterialManufacturer.vue
  19. 54 0
      src/views/RMS/components/addRawWarehouse.vue
  20. 59 0
      src/views/RMS/components/addRmsShipper.vue
  21. 56 0
      src/views/RMS/components/addSupplier.vue
  22. 159 0
      src/views/RMS/components/addTruckCalculate.vue
  23. 111 0
      src/views/RMS/components/capacity.vue
  24. 114 0
      src/views/RMS/components/carDriver.vue
  25. 112 0
      src/views/RMS/components/carrier.vue
  26. 0 0
      src/views/RMS/components/detailsTruckCalculate.vue
  27. 93 0
      src/views/RMS/components/editCapacity.vue
  28. 92 0
      src/views/RMS/components/editCarDriver.vue
  29. 103 0
      src/views/RMS/components/editCarrier.vue
  30. 321 0
      src/views/RMS/components/editGatepost.vue
  31. 93 0
      src/views/RMS/components/editMaterial.vue
  32. 86 0
      src/views/RMS/components/editOilPrice.vue
  33. 86 0
      src/views/RMS/components/editPersonnel.vue
  34. 0 0
      src/views/RMS/components/editPier.vue
  35. 0 0
      src/views/RMS/components/editPortStorageYard.vue
  36. 0 0
      src/views/RMS/components/editRawMaterialManufacturer.vue
  37. 79 0
      src/views/RMS/components/editRawWarehouse.vue
  38. 84 0
      src/views/RMS/components/editRmsShipper.vue
  39. 88 0
      src/views/RMS/components/editSupplier.vue
  40. 271 0
      src/views/RMS/components/editTruckCalculate.vue
  41. 112 0
      src/views/RMS/components/gatepost.vue
  42. 112 0
      src/views/RMS/components/material.vue
  43. 115 0
      src/views/RMS/components/oilPrice.vue
  44. 113 0
      src/views/RMS/components/personnel.vue
  45. 96 0
      src/views/RMS/components/pier.vue
  46. 98 0
      src/views/RMS/components/port.vue
  47. 98 0
      src/views/RMS/components/portStorageYard.vue
  48. 108 0
      src/views/RMS/components/rawMaterialManufacturer.vue
  49. 111 0
      src/views/RMS/components/rawWarehouse.vue
  50. 112 0
      src/views/RMS/components/rmsShipper.vue
  51. 112 0
      src/views/RMS/components/supplier.vue
  52. 131 0
      src/views/RMS/components/transitRoute.vue
  53. 343 0
      src/views/RMS/components/transitRouteAdd.vue
  54. 109 0
      src/views/RMS/components/truckCalculate.vue
  55. 124 0
      src/views/RMS/router/index.js
  56. 22 0
      src/views/WMS/app.html
  57. 86 0
      src/views/WMS/app.js
  58. 45 0
      src/views/WMS/components/intrainst/intrainst_real.vue
  59. 56 0
      src/views/WMS/components/offsite/offsite_check.vue
  60. 49 0
      src/views/WMS/components/offsite/offsite_close.vue
  61. 35 0
      src/views/WMS/components/offsite/offsite_inbound.vue
  62. 42 0
      src/views/WMS/components/offsite/offsite_outbound.vue
  63. 49 0
      src/views/WMS/components/offsite/offsite_sendreceive.vue
  64. 54 0
      src/views/WMS/components/port_deposit/loadPortStock.vue
  65. 108 0
      src/views/WMS/components/port_deposit/port_deposit_inbound.vue
  66. 86 0
      src/views/WMS/components/port_deposit/port_deposit_inbound_add.vue
  67. 93 0
      src/views/WMS/components/port_deposit/port_deposit_inbound_edit.vue
  68. 56 0
      src/views/WMS/components/port_deposit/port_deposit_outbound.vue
  69. 56 0
      src/views/WMS/components/port_deposit/unloadPortStock.vue
  70. 212 0
      src/views/WMS/components/steel/addTransfer.vue
  71. 136 0
      src/views/WMS/components/steel/billOfLading.vue
  72. 352 0
      src/views/WMS/components/steel/billOfLadingAdd.vue
  73. 260 0
      src/views/WMS/components/steel/editSteel_restack.vue
  74. 41 0
      src/views/WMS/components/steel/inboundDetails.vue
  75. 62 0
      src/views/WMS/components/steel/insertCheckInventory.vue
  76. 0 0
      src/views/WMS/components/steel/insertTransfer.vue
  77. 56 0
      src/views/WMS/components/steel/steel_check.vue
  78. 49 0
      src/views/WMS/components/steel/steel_close.vue
  79. 60 0
      src/views/WMS/components/steel/steel_inbound.vue
  80. 42 0
      src/views/WMS/components/steel/steel_outbound.vue
  81. 50 0
      src/views/WMS/components/steel/steel_real.vue
  82. 80 0
      src/views/WMS/components/steel/steel_realDown.vue
  83. 49 0
      src/views/WMS/components/steel/steel_rebound.vue
  84. 156 0
      src/views/WMS/components/steel/steel_restack.vue
  85. 302 0
      src/views/WMS/components/steel/steel_restackAdd.vue
  86. 49 0
      src/views/WMS/components/steel/steel_sendreceive.vue
  87. 101 0
      src/views/WMS/components/steel/steel_transfer.vue
  88. 90 0
      src/views/WMS/router/index.js
  89. 3 3
      src/views/appoint/app.html
  90. 4 4
      src/views/appoint/app.js
  91. 1 1
      src/views/appoint/components/purchase/addBreach.vue
  92. 1 1
      src/views/appoint/components/purchase/addOtherPrice.vue
  93. 1 1
      src/views/appoint/components/purchase/addShipPrice.vue
  94. 1 1
      src/views/appoint/components/purchase/addTrainPrice.vue
  95. 2 2
      src/views/appoint/components/purchase/addTruckPrice.vue
  96. 14 7
      src/views/appoint/components/purchase/purchaseOrder.vue
  97. 26 27
      src/views/appoint/components/purchase/updateBreach.vue
  98. 11 15
      src/views/appoint/components/purchase/updateShipPrice.vue
  99. 1 0
      src/views/appoint/components/saleContract/addSalePlanDetail.vue
  100. 0 1
      src/views/appoint/components/ship/addDeliveryAttorney.vue

+ 5 - 5
config/index.js

@@ -9,7 +9,7 @@ const pathSrc = path.resolve(__dirname, '../src');
 let proxyTable = {
   '/icore.icp.web/pass/v1/sysusers/user/token': {  //https://portal.steerinfo.com/icore.icp.web/pass/sso/v1/sysusers/user/token
     //target: 'https://portal-dev.steerinfo.com/icore.icp.web/pass/sso/v1/sysusers/user/token',
-    target:'http://172.16.33.161:9001/v1/sysusers/user/token',
+    target:'http://172.16.33.166:9001/v1/sysusers/user/token',
     changeOrigin: true,
     pathRewrite: {
       '^/icore.icp.web/pass/v1/sysusers/user/token': '/'
@@ -17,7 +17,7 @@ let proxyTable = {
   },
   '/icore.icp.web/pass/v1': {
     //target: 'http://172.16.33.161:80/v1', //加http
-    target: 'http://172.16.33.161:9001/v1',
+    target: 'http://172.16.33.166:9001/v1',
     changeOrigin: true,
     pathRewrite: {
       '^/icore.icp.web/pass/v1': '/' //这里理解成用‘/api’代替target里面的地址,组件中我们调接口时直接用/api代替
@@ -26,21 +26,21 @@ let proxyTable = {
   },
    '/icore.icp.web/pass/auth/login': {
      //target: 'http://sso-dev.steerinfo.com/icore.icp.web/pass/auth/login',
-     target: 'http://172.16.33.161:9001/auth/login',
+     target: 'http://172.16.33.166:9001/auth/login',
      changeOrigin: true,
      pathRewrite: {
        '^/icore.icp.web/pass/auth/login': ''
      }
    },
    '/icore-api': {
-    target: 'http://172.16.33.161:9001',
+    target: 'http://172.16.33.166:9001',
     changeOrigin: true,
     pathRewrite: {
       '^/icore-api': '/'
     }
   },
   '/icore.icp.web/pass/act': {
-    target: 'http://172.16.33.161:8095',
+    target: 'http://172.16.33.166:8095',
     changeOrigin: true,
     pathRewrite: {
       '^/icore.icp.web/pass/act': '/'

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


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


+ 14 - 0
src/js/QueueStartList.js

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

+ 31 - 0
src/js/sharedJsFile.js

@@ -0,0 +1,31 @@
+ // 把时间戳改为正常可读的时间
+ export function renderTime(date) {
+   if (date !== null) {
+     let dateee = new Date(date).toJSON();
+     return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '');
+   }
+   return null;
+ }
+ export function sjTime(orderPlanInTime) {
+   var stringTime = renderTime(orderPlanInTime);
+   var timestamp1 = stringTime.replace(/-/g, '/');
+   return new Date(timestamp1).getTime();
+ }
+ export function isNumber(value) {
+   // 验证是否为数字
+   var patrn = /^(-)?\d+(\.\d+)?$/;
+   if (patrn.exec(value) == null || value === '') {
+     return false;
+   } else {
+     return true;
+   }
+ }
+ export function isIntegerNumber(value) {
+   // 验证是否为整数
+   var patrn = /^\+?[1-9][0-9]*$/g;
+   if (patrn.exec(value) == null || value === '') {
+     return false;
+   } else {
+     return true;
+   }
+ }

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

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+  <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>工业互联网平台</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>
+  </body>
+</html>

+ 39 - 0
src/views/RMS/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;
+
+Vue.use(VueApollo)
+
+// 注册表格的全局组件
+import DilCommonUI from "@/components/DilCommonUI";
+Vue.use(DilCommonUI);
+
+const apolloProvider = new VueApollo({
+    defaultClient: apollo
+})
+
+/* eslint-disable no-new */
+new Vue({
+  el: '#app',
+  router,
+  store,
+  components: { App },
+  provide: apolloProvider.provide(),
+  template: '<App/>'
+});

+ 59 - 0
src/views/RMS/components/addCapacity.vue

@@ -0,0 +1,59 @@
+<template>
+  <!-- 添加运力信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+    <el-divider content-position="left">运力信息</el-divider>
+     <div class="form-box" style="margin-right: 10rem">
+        <dil-form :formId="309" 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: {},
+      // value: undefined,
+     
+    };
+  },
+  mounted() {},
+  methods: {
+     makeSure() {
+       console.log(this.from1)
+       let RmsCapacity={
+         capacityTypeId:this.form1.capacityTypeId,
+         capacityNumber:this.form1.capacityNumber.toUpperCase(),
+         capacityCorlor:this.form1.capacityCorlor,
+         capacityOwneris:this.form1.capacityOwneris,
+         capacityVip:this.form1.capacityVip,
+         capacityBlacklist:this.form1.capacityBlacklist,
+         carrierId:this.form1.carrierId,
+       } 
+      this.axios
+        .post(
+          "/api/v1/rms/insertCapacity", RmsCapacity
+        )
+        .then((res) => {
+        
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+
+</style>

+ 88 - 0
src/views/RMS/components/addCarDriver.vue

@@ -0,0 +1,88 @@
+<template>
+  <!-- 添加司机信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+    <el-divider content-position="left">司机信息</el-divider>
+     <div class="form-box" style="margin-right: 10rem">
+        <dil-form :formId="311" v-model="form1" ref="from1"></dil-form>
+      </div>
+ <el-upload
+  class="upload-demo"
+  action="https://jsonplaceholder.typicode.com/posts/"
+  :on-preview="handlePreview"
+  :on-remove="handleRemove"
+  :before-remove="beforeRemove"
+  multiple
+  :limit="1"
+  :on-exceed="handleExceed"
+  :file-list="fileList">
+  <el-button size="small" type="primary">点击上传</el-button>
+  <div slot="tip" class="el-upload__tip">只能上传jpg/png文件,且不超过500kb</div>
+</el-upload>     
+    <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: {},
+      value: undefined,
+      fileList: []
+    };
+  },
+  mounted() {},
+  methods: {
+    handleRemove(file, fileList) {
+        console.log(file, fileList);
+      },
+      handlePreview(file) {
+        console.log(file);
+      },
+      handleExceed(files, fileList) {
+        this.$message.warning(`当前限制选择 3 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`);
+      },
+      beforeRemove(file, fileList) {
+        return this.$confirm(`确定移除 ${ file.name }?`);
+      },
+     makeSure() {
+       console.log(this.form1);
+      let RmsCarDriver = {
+       driverName:this.form1.driverName,
+       driverSex:this.form1.driverSex,
+       driverAge:this.form1.driverAge,
+       driverIdentityCard:this.form1.driverIdentityCard,
+       driverPhone:this.form1.driverPhone,
+       transportTypeId:this.form1.transportTypeId,
+       carrierId:this.form1.carrierId,
+       driverPermitNo:this.form1.driverPermitNo,
+       driverLicence:this.form1.driverLicence,
+       driverLicence:this.form1.driverLicence,
+       driverLicence:this.form1.driverLicence,
+      }
+      
+      this.axios
+        .post(
+          "/api/v1/rms/insertCarDriver" , RmsCarDriver
+        )
+        .then((res) => { 
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },  
+  },
+};
+</script>
+<style lang='scss' scoped>
+
+</style>

+ 75 - 0
src/views/RMS/components/addCarrier.vue

@@ -0,0 +1,75 @@
+<template>
+  <!-- 添加承运商信息 -->
+  <div class="addWagonLoad">
+    <PageTitle @click="onClick">返回</PageTitle>
+    <el-divider content-position="left">承运商信息</el-divider>
+     <div class="form-box" style="margin-right: 10rem">
+        <dil-form :formId="330" v-model="form1"></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: {},
+      value: undefined,
+      carrierType:{},
+      carrierTransportType:{}
+    };
+  },
+  methods: {
+    onClick(){},
+     makeSure() {
+      console.log(this.form1)
+      let RmsCarrier={
+        carrierName:this.form1.carrierName,
+        carrierTransportCertificate:this.form1.carrierTransportCertificate,
+        carrierBusinessLicense:this.form1.carrierBusinessLicense,
+        carrierBusinessAblelicense:this.form1.carrierBusinessAblelicense,
+        carrierAbbreviation:this.form1.carrierAbbreviation,
+        carrierAddress:this.form1.carrierAddress,
+        registerNo:this.form1.registerNo,
+        carrierBidAreaId:this.form1.carrierBidAreaId,
+        carrierLegalRepresentative:this.form1.carrierLegalRepresentative,
+        registerCapital:this.form1.registerCapital,
+        businessScope:this.form1.businessScope,
+        annualDate:this.form1.annualDate,
+        companyStatusDesc:this.form1.companyStatusDesc,
+        companyTypeDesc:this.form1.companyTypeDesc,
+        operationPeriod:this.form1.operationPeriod,
+        registerDate: sjTime(this.form1.registerDate),
+        registerOrganization:this.form1.registerOrganization,
+        registerAptitudes:this.form1.registerAptitudes,
+        contactsName:this.form1.contactsName,
+        carrierContactNumber:this.form1.carrierContactNumber,
+        carrierType:this.form1.carrierType,
+        carrierTransportType:this.form1.carrierTransportType
+      }
+      this.axios
+        .post(
+          "/api/v1/rms/insertCarrier",
+           RmsCarrier
+        )
+        .then((res) => {
+          this.$router.go(-1);
+        });
+    },
+    // // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+
+</style>

+ 132 - 0
src/views/RMS/components/addGatepost.vue

@@ -0,0 +1,132 @@
+<template>
+  <!-- 添加门岗信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+    <el-divider content-position="left">门岗信息</el-divider>
+     <div class="form-box" style="margin-right: 10rem">
+       <!-- 287 -->
+        <dil-form :formId="328" 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: {},
+      startTime:'',
+      endTime:'',
+      value: undefined,
+      drawer: false,
+      direction: 'btt',
+      materialName:"",
+      gatepostRules:"",
+      inputText:"",
+      entityOutTypeList:{},
+    };
+  },
+  mounted() {},
+  methods: {
+     makeSure() {
+      console.log(this.form1)
+      let RmsGatepost={
+          gatepostName:this.form1.gatepostName,
+          gatepostLongitude:this.form1.gatepostLongitude,
+          gatepostLatitude:this.form1.gatepostLatitude,
+          gatepostPriority:this.form1.gatepostPriority
+      }
+      console.log(mapValue);
+      this.axios
+        .post(
+          "/api/v1/rms/insertGatepost",
+           RmsGatepost
+        )
+        .then((res) => {
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+
+    handleClose(done) {
+        done();
+      }
+    }
+};
+</script>
+<style lang='scss' scoped>
+
+</style>
+<style lang='scss' scoped>
+.form-box {
+  padding: 20px 30px;
+  margin-left: 330px;
+}
+.button-box {
+  padding: 20px 30px;
+  margin-left: 460px;
+}
+.btn-left {
+  margin-left: 470px;
+}
+.input {
+  margin-left: 90px;
+}
+.label{
+  margin-left: 445px;
+  margin-bottom: -30px;
+  font: bold;
+  font-size: 1rem;
+  padding-left: -30px;
+  font-family:Arial, Helvetica, sans-serif;
+  margin-bottom:20px;
+} 
+.label2{
+  margin-left: 425px;
+  margin-bottom: -30px;
+  font: bold;
+  font-size: 1rem;
+  font-family:Arial, Helvetica, sans-serif
+}
+.label1{
+  margin-left: 345px;
+  margin-bottom: -30px;
+  font: bold;
+}
+.common{
+  font-weight: 700;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
+    Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+  font-size: 1rem;
+  cursor: default;
+  color: #2c3e50;
+}
+.f1{
+  margin-top: -2.5rem;
+  margin-left: 17.5rem;
+}
+.f11{
+  margin-top: -3rem;
+  
+  // margin-left: 29rem;
+}
+.f2{
+  margin-top: -2.5rem;
+  margin-left: 10.5rem;
+}
+.f3{
+  margin-top: -2.5rem;
+  margin-left: 10.5rem;
+}
+</style>

+ 162 - 0
src/views/RMS/components/addMaterial.vue

@@ -0,0 +1,162 @@
+<template>
+  <!-- 添加物资信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+    <el-divider content-position="left">物资信息</el-divider>
+     <div class="form-box" style="margin-right: 10rem">
+        <dil-form :formId="326" v-model="form1" ref="from1"></dil-form>
+      </div>
+        <div class="form-box f1">
+          <el-form :inline="true" :model="formInline" class="demo-form-inline">
+  <el-form-item label="物资种类">
+    <el-input v-model="materialTypeName" disabled>  
+    </el-input>
+  </el-form-item>
+  <el-form-item>
+    <el-button type="primary" @click="drawer = true">浏览</el-button>
+  </el-form-item>
+    </el-form>
+    </div>
+    <el-drawer
+      :visible.sync="drawer"
+      :direction="direction"
+      :before-close="handleClose">
+        <el-input
+            placeholder="请输入内容"
+            v-model="inputText"
+            clearable>
+          </el-input>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>查询
+          </el-button>
+            <div><dilTable v-bind.sync="options" @radio-change="currentRadioChange" ></dilTable></div>
+</el-drawer>
+    <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: {},
+      drawer: false,
+      direction: 'rtl',
+      inputText:"",
+      options:{
+        requestUrl:"/api/v1/rms/getMaterialTypeList?apiId=376",
+        selectionType:"radio",
+        mapList:[]
+      }
+    };
+  },
+  mounted() {},
+  methods: {
+      currentRadioChange(selection){
+      this.mapList=selection,
+      this.materialTypeName=this.mapList.materialTypeName
+    },
+    onclick(){
+      this.options.requestUrl="/api/v1/rms/getMaterialTypeList?apiId=376&con=" +this.inputText;
+    },
+     makeSure() {
+      let RmsMaterial = {
+        materialCode:this.form1.materialCode,
+        materialName:this.form1.materialName,
+        materialSpecification:this.form1.materialSpecification,
+        materialModel:this.form1.materialModel,
+        materialTypeId:this.mapList.materialTypeId,
+        unitOfMeasureId:this.form1.unitOfMeasureId,
+        materialTheoreticalWeight:this.form1.materialTheoreticalWeight,
+      }
+      console.log(RmsMaterial)
+      this.axios
+        .post(
+          "/api/v1/rms/insertMaterial",
+           RmsMaterial
+        )
+        .then((res) => {
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+   handleClose(done) {
+        this.$confirm('确认关闭?')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {});
+      }
+};
+</script>
+<style lang='scss' scoped>
+.form-box {
+  padding: 20px 30px;
+  margin-left: 330px;
+}
+.button-box {
+  padding: 20px 30px;
+  margin-left: 460px;
+}
+.btn-left {
+  margin-left: 470px;
+}
+.input {
+  margin-left: 90px;
+}
+.label{
+  margin-left: 445px;
+  margin-bottom: -30px;
+  font: bold;
+  font-size: 1rem;
+  padding-left: -30px;
+  font-family:Arial, Helvetica, sans-serif;
+  margin-bottom:20px;
+} 
+.label2{
+  margin-left: 425px;
+  margin-bottom: -30px;
+  font: bold;
+  font-size: 1rem;
+  font-family:Arial, Helvetica, sans-serif
+}
+.label1{
+  margin-left: 345px;
+  margin-bottom: -30px;
+  font: bold;
+}
+.common{
+  font-weight: 700;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
+    Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+  font-size: 1rem;
+  cursor: default;
+  color: #2c3e50;
+}
+.f1{
+  margin-top: -2.5rem;
+  margin-left: 22.3rem;
+}
+.f11{
+  margin-top: -3rem;
+  // margin-left: 29rem;
+}
+.f2{
+  margin-top: -2.5rem;
+  margin-left: 20.7rem;
+}
+.f3{
+  margin-top: -2.5rem;
+  margin-left: 25rem;
+}
+</style>

+ 54 - 0
src/views/RMS/components/addOilPrice.vue

@@ -0,0 +1,54 @@
+<template>
+  <!-- 添加油价信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+    <el-divider content-position="left">油价信息</el-divider>
+    <div class="form-box" style="margin-right: 10rem">
+      <dil-form :formId="357" 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: {},
+      value: undefined,
+    };
+  },
+  mounted() {},
+  methods: {
+    makeSure() {
+      console.log(this.form1);
+      let RmsOilPrice = {
+        priceOilName:this.form1.priceOilName,
+        priceId:this.form1.priceId,
+        priceDate:this.form1.priceDate,
+        priceValue:this.form1.priceValue,
+      }
+      this.axios
+        .post(
+          "/api/v1/rms/insertOilPrice" , RmsOilPrice
+        )
+        .then((res) => {
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+
+</style>

+ 59 - 0
src/views/RMS/components/addPersonnel.vue

@@ -0,0 +1,59 @@
+<template>
+  <!-- 添加人员信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+    <el-divider content-position="left">人员信息</el-divider>
+     <div class="form-box" style="margin-right: 10rem">
+        <dil-form :formId="325" 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: {},
+      value: undefined,
+    };
+  },
+  mounted() {},
+  methods: {
+     makeSure() {
+      console.log(this.form1)
+      let RmsPersonnel={
+        personnelId:this.form1.personnelId,
+        personnelJobNumber: this.form1.personnelJobNumber,
+        personnelName: this.form1.personnelName,
+        personnelPost: this.form1.personnelPost,
+        personnelWorkshopid: this.form1.personnelWorkshopid,
+        personnelShifts: this.form1.personnelShifts,
+        departmentId: this.form1.shipperId
+      };
+      console.log(RmsPersonnel)
+      this.axios
+        .post(
+          "/api/v1/rms/insertPersonnel",
+           RmsPersonnel
+        )
+        .then((res) => {
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+
+</style>

+ 60 - 0
src/views/RMS/components/addPier.vue

@@ -0,0 +1,60 @@
+<template>
+  <!-- 添加码头信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+    <el-divider content-position="left">码头</el-divider>
+     <div class="form-box" style="margin-right: 10rem">
+        <dil-form :formId="272" 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: {},
+      value: undefined,
+    };
+  },
+  mounted() {},
+  methods: {
+     makeSure() {
+        console.log(this.form1)
+    //   let RmsCapacity = {
+          
+    //   };
+       let RmsCapacity=this.form1;
+      console.log(RmsCapacity)
+      if (
+        RmsCapacity.pierName==null||
+        RmsCapacity.portId==null
+        
+      ) this.$message.error("存在空值!");
+      else 
+      this.axios
+        .post(
+          "/api/v1/rms/insertPier",
+           RmsCapacity
+        )
+        .then((res) => {
+        
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+
+</style>

+ 61 - 0
src/views/RMS/components/addPort.vue

@@ -0,0 +1,61 @@
+<template>
+  <!-- 添加港口信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+    <el-divider content-position="left">港口</el-divider>
+     <div class="form-box" style="margin-right: 10rem">
+        <dil-form :formId="271" v-model="form1" @change="onchange" 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 {
+        portName:'',
+      form1: {},
+      value: undefined,
+    };
+  },
+  mounted() {},
+  methods: {                
+     makeSure() {
+        console.log(this.form1)
+    //   let RmsCapacity = {
+          
+    //   };
+       let RmsCapacity=this.form1;
+      console.log(RmsCapacity)
+      if (
+        RmsCapacity.portName==null||
+        RmsCapacity.portTypeId==null
+        
+      ) this.$message.error("存在空值!");
+      else 
+      this.axios
+        .post(
+          "/api/v1/rms/insertPort",
+           RmsCapacity
+        )
+        .then((res) => {
+        
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+
+</style>

+ 5 - 0
src/views/RMS/components/addPortStorageYard.vue

@@ -0,0 +1,5 @@
+<template>
+    <div>
+        
+    </div>
+</template>

+ 0 - 0
src/views/RMS/components/addRawMaterialManufacturer.vue


+ 54 - 0
src/views/RMS/components/addRawWarehouse.vue

@@ -0,0 +1,54 @@
+<template>
+  <!-- 添加原料仓库信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+    <el-divider content-position="left">原料仓库信息</el-divider>
+     <div class="form-box" style="margin-right: 10rem">
+        <dil-form :formId="315" 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: {},
+      // value: undefined,
+     
+    };
+  },
+  mounted() {},
+  methods: {
+     makeSure() {
+       console.log(this.from1)
+       let RmsWarehouse = {
+         warehouseName:this.form1.warehouseName, 
+       }
+    //  console.log(this.RmsWarehouse)
+      this.axios
+        .post(
+          "/api/v1/rms/insertWarehouse", RmsWarehouse
+        )
+        .then((res) => {
+        
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+
+</style>

+ 59 - 0
src/views/RMS/components/addRmsShipper.vue

@@ -0,0 +1,59 @@
+<template>
+  <!-- 添加托运人信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+    <el-divider content-position="left">托运人信息</el-divider>
+     <div class="form-box" style="margin-right: 10rem">
+        <dil-form :formId="323" 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: {},
+      value: undefined,
+    };
+  },
+  mounted() {},
+  methods: {
+     makeSure() {
+       console.log(this.form1)
+       let RmsShipper={
+        shipperName: this.form1.shipperName,
+        shipperAbbreviation: this.form1.shipperAbbreviation,
+        shipperId:this.form1.shipperId
+      };
+      // let RmsShipper = {
+      //   shipperName: this.from1.shipperName,
+      //   shipperAbbreviation: this.from1.shipperAbbreviation,
+      // };
+      this.axios
+        .post(
+          "/api/v1/rms/insertShipper",
+           RmsShipper
+
+        )
+        .then((res) => {
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+
+</style>

+ 56 - 0
src/views/RMS/components/addSupplier.vue

@@ -0,0 +1,56 @@
+<template>
+  <!-- 添加供应商信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+    <el-divider content-position="left">原料供应商信息</el-divider>
+     <div class="form-box" style="margin-right: 10rem">
+        <dil-form :formId="320" 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: {},
+      value: undefined,
+    };
+  },
+  mounted() {},
+  methods: {
+     makeSure() {
+       console.log(this.form1)
+      let RmsSupplier = {
+        supplierName: this.form1.supplierName,
+        supplierAddress: this.form1.supplierAddress,
+        supplierRegisterDate: sjTime(this.form1.supplierRegisterDate),
+        supplierContactsName: this.form1.supplierContactsName,
+        supplierContactNumber: this.form1.supplierContactNumber
+      };
+      this.axios
+        .post(
+          "/api/v1/rms/insertSupplier",
+           RmsSupplier
+        )
+        .then((res) => {
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+
+</style>

+ 159 - 0
src/views/RMS/components/addTruckCalculate.vue

@@ -0,0 +1,159 @@
+<template>
+  <!-- 添加汽车衡信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+    <el-divider content-position="left">汽车衡信息</el-divider>
+     <div class="form-box" style="margin-right: 10rem">
+        <dil-form :formId="317" v-model="form1" ref="from1">
+        </dil-form>
+    </div>
+  <div class="form-box f1">
+    <el-form :inline="true" :model="formInline" class="demo-form-inline">     
+    </el-form>
+  </div>
+    <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+    </el-input>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>物资列表查询
+          </el-button> 
+          <div> <dilTable v-bind.sync="options" @selection-change="selectionChange"></dilTable></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 {
+      materialName:"",
+      form1: {},
+      checkList:[],
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getMaterialList?apiId=351",
+        selectionType: "select",
+         mapList:[]
+        
+      },
+    };
+  },
+  mounted() {},
+  methods: {
+      selectionChange(selection){
+      this.mapList=selection, 
+      console.log(this.mapList) 
+      this.materialName=this.mapList.materialName
+     
+    },
+    onclick(){
+      this.options.requestUrl="/api/v1/rms/getMaterialList?apiId=351&con=" +this.inputText;
+    },
+    
+     makeSure() {
+ 
+       console.log(this.form1) 
+       
+       let rmsTruckCalculate={
+         truckCalculateNumber:this.form1.truckCalculateNumber,   
+         truckCalculateId:this.form1.truckCalculateId,
+         truckCalculateLongitude:this.form1.truckCalculateLongitude,
+         truckCalculateLatitude:this.form1.truckCalculateLatitude,
+         calculateType:this.form1.calculateType,
+         }
+      let map = {
+        mapList:this.mapList,
+        rmsTruckCalculate:rmsTruckCalculate
+      }
+      console.log(map)
+      // console.log(RmsTruckCalculate)
+      this.axios
+        .post(
+          "/api/v1/rms/insertTruckCalculate",map
+        )
+        .then((res) => {
+        
+          this.$router.go(-1);
+        });
+    },
+   
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+    
+  },
+};
+</script>
+<style lang='scss' scoped>
+.form-box {
+  padding: 20px 30px;
+  margin-left: 330px;
+}
+.button-box {
+  padding: 20px 30px;
+  margin-left: 460px;
+}
+.btn-left {
+  margin-left: 470px;
+}
+.input {
+  margin-left: 90px;
+}
+.label{
+  margin-left: 445px;
+  margin-bottom: -30px;
+  font: bold;
+  font-size: 1rem;
+  padding-left: -30px;
+  font-family:Arial, Helvetica, sans-serif;
+  margin-bottom:20px;
+} 
+.label2{
+  margin-left: 425px;
+  margin-bottom: -30px;
+  font: bold;
+  font-size: 1rem;
+  font-family:Arial, Helvetica, sans-serif
+}
+.label1{
+  margin-left: 345px;
+  margin-bottom: -30px;
+  font: bold;
+}
+.common{
+  font-weight: 700;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
+    Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+  font-size: 1rem;
+  cursor: default;
+  color: #2c3e50;
+}
+.f1{
+  margin-top: -2.5rem;
+  margin-left: 25rem;
+}
+.f11{
+  margin-top: -3rem;
+  // margin-left: 29rem;
+}
+.f2{
+  margin-top: -2.5rem;
+  margin-left: 20.7rem;
+}
+.f3{
+  margin-top: -2.5rem;
+  margin-left: 25rem;
+}
+</style>

+ 111 - 0
src/views/RMS/components/capacity.vue

@@ -0,0 +1,111 @@
+//资源管理运力
+<template>
+  <div class="capacity">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="textInput"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+       <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="updateCapacity(scope.row.capacityId)"
+            >
+              修改
+            </el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteCapacity(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data(){
+    return{
+     name:"homeworkPath",
+     textInput:"",
+     restaurants: [],
+     options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getCapacityList?apiId=336",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=336&con=" +this.textInput;
+    },
+     toInsert() {
+      this.$router.push("/addCapacity");
+
+    },
+    updateCapacity(capacityId){
+      this.$router.push("/editCapacity/" + capacityId)
+    },
+    deleteCapacity(scope){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/rms/deleteCapacity/" + scope.row.capacityId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    },
+  }
+
+</script>
+
+<style lang="scss" scode>
+.capacity{
+  .sache{
+    height: 80px;
+    display: flex;
+    align-items: center;
+    padding-left: 30px;
+  }
+}
+</style>

+ 114 - 0
src/views/RMS/components/carDriver.vue

@@ -0,0 +1,114 @@
+//资源管理司机
+<template>
+  <div class="carDriver">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="textInput"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn"  @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+       <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="updateCarDriver(scope)"
+            >
+              修改
+            </el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteCarDriver(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name:"homeworkPath",
+  data(){
+    return{
+      textInput: "" ,
+      restaurants: [],
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getCarDriverList?apiId=339",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+        this.options.requestUrl = "/api/v1/rms/getCarDriverList?apiId=339&con=" +this.textInput;
+      },
+
+     toInsert() {
+      this.$router.push("/addCarDriver");
+
+    },
+    updateCarDriver(scope){
+      console.log(scope.row.driverId)
+      this.$router.push("/editCarDriver/"+scope.row.driverId)
+    },
+    deleteCarDriver(scope){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/rms/deleteCarDriver/" + scope.row.driverId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    },
+  
+}
+
+</script>
+
+<style lang="scss" scode>
+.carDriver{
+  .sache{
+    height: 80px;
+    display: flex;
+    align-items: center;
+    padding-left: 30px;
+  }
+}
+</style>

+ 112 - 0
src/views/RMS/components/carrier.vue

@@ -0,0 +1,112 @@
+//资源管理港口
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+       <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="updateCarrier(scope)"
+            >
+              修改
+            </el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteCarrier(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getCarrierList?apiId=342",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      this.options.requestUrl="/api/v1/rms/getCarrierList?apiId=342&con=" + this.inputText;
+      console.log(this.textInput)
+    },
+     toInsert() {
+      this.$router.push("/addCarrier");
+
+    },
+    updateCarrier(scope){
+      console.log(scope.row.settlementId)
+      this.$router.push("/editCarrier/"+scope.row.carrierId)
+    },
+    deleteCarrier(scope){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/rms/deleteCarrier/" + scope.row.carrierId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    },
+  }
+
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 80px;
+    display: flex;
+    align-items: center;
+    padding-left: 30px;
+  }
+}
+</style>

+ 0 - 0
src/views/RMS/components/detailsTruckCalculate.vue


+ 93 - 0
src/views/RMS/components/editCapacity.vue

@@ -0,0 +1,93 @@
+<template>
+  <!-- 修改运力信息 -->
+  <div id="contractDetails">
+    <page-title>编辑</page-title>
+    <div class="main">
+      <span class="text">运力信息</span>
+    </div>
+    <div class="contractTitle">
+      <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="310" 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() {
+      console.log(this.$route)
+    this.information();
+  },
+  methods: {
+    information() {
+      //编辑 
+console.log(this.$route.params)            
+
+      this.axios
+        .post(
+          "/api/v1/rms/getCapacityById/" +
+            this.$route.params.capacityId
+        )
+
+        .then((res) => {
+            console.log(res.data.data)
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            console.log(e);
+            console.log(this.form1);
+            console.log( this.$route.params.capacityId);
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      console.log(this.form1)
+       let RmsCapacity={
+         capacityId:this.form1.capacityId,
+         capacityTypeId:this.form1.capacityTypeId,
+         capacityNumber:this.form1.capacityNumber.toUpperCase(),
+         capacityCorlor:this.form1.capacityCorlor,
+         capacityOwneris:this.form1.capacityOwneris,
+         capacityVip:this.form1.capacityVip,
+         capacityBlacklist:this.form1.capacityBlacklist,
+         carrierId:this.form1.carrierId,
+       }  
+        console.log( this.$route.params.capacityId);
+        this.axios
+          .post(
+            "/api/v1/rms/updateCapacity",
+           RmsCapacity
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$router.go(-1);
+            
+            }
+          });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+
+</style>

+ 92 - 0
src/views/RMS/components/editCarDriver.vue

@@ -0,0 +1,92 @@
+<template>
+  <!-- 修改司机信息 -->
+  <div id="contractDetails">
+    <page-title>编辑</page-title>
+    <div class="main">
+      <span class="text">司机信息</span>
+    </div>
+    <div class="contractTitle">
+      <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="340" 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() {
+      console.log(this.$route)
+    this.information();
+  },
+  methods: {
+    information() {
+      //编辑
+      this.axios
+        .post(
+          "/api/v1/rms/getCarDriverById/" +
+            this.$route.params.driverId
+        )
+        .then((res) => {
+            console.log(res)
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            console.log(e);
+            console.log(this.form1);
+            console.log(this.$route.params.driverId);
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      console.log(this.form1)
+        let RmsCarDriver = {
+       driverId:this.form1.driverId,
+       driverName:this.form1.driverName,
+       driverSex:this.form1.driverSex,
+       driverAge:this.form1.driverAge,
+       driverIdentityCard:this.form1.driverIdentityCard,
+       driverPhone:this.form1.driverPhone,
+       transportTypeId:this.form1.transportTypeId,
+       carrierId:this.form1.carrierId,
+       driverPermitNo:this.form1.driverPermitNo,
+       driverLicence:this.form1.driverLicence,
+       driverLicence:this.form1.driverLicence,
+       driverLicence:this.form1.driverLicence,
+      }
+        this.axios
+          .post(
+            "/api/v1/rms/updateCarDriver",
+            RmsCarDriver
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$router.go(-1);
+            }
+          });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+
+</style>

+ 103 - 0
src/views/RMS/components/editCarrier.vue

@@ -0,0 +1,103 @@
+<template>
+  <!-- 修改承运商信息 -->
+  <div id="contractDetails">
+    <page-title>编辑</page-title>
+    <div class="main">
+      <span class="text">承运商信息</span>
+    </div>
+    <div class="contractTitle">
+      <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="330" 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() {
+      console.log(this.$route)
+    this.information();
+  },
+  methods: {
+    information() {
+      //编辑
+      this.axios
+        .post(
+          "/api/v1/rms/getCarrierById/" +
+            this.$route.params.carrierId
+        )
+        .then((res) => {
+            console.log(res)
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            console.log(e);
+            console.log(this.form1);
+            console.log(this.$route.params.carrierId);
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      console.log(this.form1)
+       let RmsCarrier={
+        carrierName:this.form1.carrierName,
+        carrierTransportCertificate:this.form1.carrierTransportCertificate,
+        carrierBusinessLicense:this.form1.carrierBusinessLicense,
+        carrierBusinessAblelicense:this.form1.carrierBusinessAblelicense,
+        carrierAbbreviation:this.form1.carrierAbbreviation,
+        carrierAddress:this.form1.carrierAddress,
+        registerNo:this.form1.registerNo,
+        carrierBidAreaId:this.form1.carrierBidArea,
+        carrierLegalRepresentative:this.form1.carrierLegalRepresentative,
+        registerCapital:this.form1.registerCapital,
+        businessScope:this.form1.businessScope,
+        annualDate:this.form1.annualDate,
+        companyStatusDesc:this.form1.companyStatusDesc,
+        companyTypeDesc:this.form1.companyTypeDesc,
+        operationPeriod:this.form1.operationPeriod,
+        registerDate: sjTime(this.form1.registerDate),
+        registerOrganization:this.form1.registerOrganization,
+        registerAptitudes:this.form1.registerAptitudes,
+        contactsName:this.form1.contactsName,
+        carrierContactNumber:this.form1.carrierContactNumber,
+        carrierType:this.form1.carrierType,
+        carrierTransportType:this.form1.carrierTransportType
+      };
+        this.axios
+          .post(
+            "/api/v1/rms/updateCarrier",
+            RmsCarrier
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$router.go(-1);
+            }
+          });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+
+</style>

+ 321 - 0
src/views/RMS/components/editGatepost.vue

@@ -0,0 +1,321 @@
+<template>
+  <!-- 修改门岗信息 -->
+  <div id="contractDetails">
+    <page-title>编辑</page-title>
+    <div class="main">
+      <span class="text">门岗信息</span>
+    </div>
+    <div class="contractTitle">  -->
+      <div class="form-box">
+         <div class="form-one">
+          <dil-form :formId="358" v-model="form1"></dil-form>
+        </div> 
+      </div>
+     </div>
+     <!-- 时间点 -->
+    <div class="form-box f2" >
+        门岗开门时间
+        <el-time-select
+          v-model="rulesGatepostStartTime"
+          :picker-options="{
+            start: '06:00',
+            step: '01:00',
+            end: '20:00'
+          }"
+          placeholder="选择时间"
+          >
+        </el-time-select>
+    </div>
+    <div class="form-box f3">
+      门岗关门时间
+      <el-time-select
+      v-model="rulesGatepostEndTime"
+      :picker-options="{
+        start: '06:00',
+        step: '01:00',
+        end: '20:00'
+      }"
+      placeholder="选择门岗关门时间">
+    </el-time-select>
+    </div>
+    <!-- 原料模态窗口显示 -->
+    <div class="form-box f1">
+      <el-form :inline="true" :model="formInline" class="demo-form-inline">
+        <el-form-item label="物资名称">
+          <el-input v-model="materialTypeName" disabled>  
+          </el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="drawer = true">增加物资种类</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div>
+      <div class="form-box" style="margin-left: 5rem">
+        <el-button type="primary" @click="makeSure">新增规则</el-button>
+      </div>
+    </div>
+    <el-drawer
+      :visible.sync="drawer"
+      :direction="direction"
+      :before-close="handleClose">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <div><dilTable v-bind.sync="options2" @radio-change="currentRadioChange" ></dilTable></div>
+      <div class="button-box">
+        <el-button type="primary" @click="makeSure">确定</el-button>
+      </div>
+    </el-drawer>
+    <!-- 规则展示窗口 -->
+    <dilTable v-bind.sync="options1">
+      <el-table-column fixed="right" label="操作" align="center" width="200">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="mini"
+            @click="deleteclick(scope)">删除</el-button>
+        </template>
+      </el-table-column>
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+//import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+      value: undefined,
+      drawer: false,
+      direction: 'rtl',
+      materialName:"",
+      gatepostRules:"", 
+      rulesGatepostStartTime:"",
+      rulesGatepostEndTime:"",
+      inputText:"",
+      options1:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getGatepostRulesById/"+this.$route.params.gatepostId+"?apiId=349",
+        selectionType: "radiio",
+        materialList:[]
+      },
+      options2:{
+        requestUrl: "/api/v1/rms/getMaterialList?apiId=351",
+        selectionType:"select",
+        mapList:[]
+      },
+      form1: {},
+    };
+  },
+ 
+  mounted() {
+      console.log(this.$route)
+    this.information();
+  },
+  methods: {
+    deleteclick(scope){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/rms/deleteGatepostRules/" + scope.row.rulesId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    addRules(){
+      
+    },
+    currentRadioChange(selection){
+      this.mapList=selection,
+      console.log(this.mapList)
+      this.materialName=this.mapList.materialName
+    },
+    makeSure() {
+      console.log(this.form1)
+      let gatepost={
+          rulesId:this.form1.rulesId,
+          gatepostName:this.form1.gatepostName,
+          gatepostLongitude:this.form1.gatepostLongitude,
+          gatepostLatitude:this.form1.gatepostLatitude,
+          gatepostPriority:this.form1.gatepostPriority,
+          rulesGatepostStartTime:this.rulesGatepostStartTime,
+          rulesGatepostEndTime:this.rulesGatepostEndTime,
+          vehicleTypeId:this.form1.vehicleTypeId
+        }
+      let entityOutTypeLists={
+          rulesGatepostEntityOutType:this.form1.rulesGatepostEntityOutTypeStr
+        }
+      let material={
+          materialId:this.materialList.materialId,
+          materialName:this.materialList.materialName
+        }
+      let mapValue={
+        gatepost:gatepost,
+        entityOutTypeLists:entityOutTypeLists,
+        material:this.materialList
+      }
+    },
+    onclick(){
+        this.options2.requestUrl =
+        "/api/v1/rms/getMaterialList?apiId=349&con=" +this.inputText;
+    },
+    information() {
+      //编辑
+      this.axios
+        .post(
+          "/api/v1/rms/getGatepostById/" +
+            this.$route.params.rulesId
+        )
+        .then((res) => {
+            console.log("res111111111111",res)
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      console.log(this.form1)
+       let gatepost={
+          gatepostName:this.form1.gatepostName,
+          gatepostLongitude:this.form1.gatepostLongitude,
+          gatepostLatitude:this.form1.gatepostLatitude,
+          gatepostPriority:this.form1.gatepostPriority,
+          rulesGatepostStartTime:this.rulesGatepostStartTime,
+          rulesGatepostEndTime:this.rulesGatepostEndTime,
+          vehicleTypeId:this.form1.vehicleTypeId,
+          rulesId:this.form1.rulesId
+        }
+      let entityOutTypeLists={
+          rulesGatepostEntityOutType:this.form1.rulesGatepostEntityOutType
+        }
+      let material={
+          materialId:this.materialList.materialId
+        }
+      let mapValue={
+        gatepost:gatepost,
+        entityOutTypeLists:entityOutTypeLists,
+        material:this.materialList
+      }
+      this.axios
+          .post(
+            "/api/v1/rms/updateGatepost",
+            mapValue
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$router.go(-1);
+          }
+        });
+      },
+      // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+    handleClose(done) {
+      done();
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+
+</style>
+<style lang='scss' scoped>
+.form-box {
+  padding: 20px 30px;
+  margin-left: 330px;
+}
+.button-box {
+  padding: 20px 30px;
+  margin-left: 460px;
+}
+.btn-left {
+  margin-left: 470px;
+}
+.input {
+  margin-left: 90px;
+}
+.label{
+  margin-left: 445px;
+  margin-bottom: -30px;
+  font: bold;
+  font-size: 1rem;
+  padding-left: -30px;
+  font-family:Arial, Helvetica, sans-serif;
+  margin-bottom:20px;
+} 
+.label2{
+  margin-left: 425px;
+  margin-bottom: -30px;
+  font: bold;
+  font-size: 1rem;
+  font-family:Arial, Helvetica, sans-serif
+}
+.label1{
+  margin-left: 345px;
+  margin-bottom: -30px;
+  font: bold;
+}
+.common{
+  font-weight: 700;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
+    Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+  font-size: 1rem;
+  cursor: default;
+  color: #2c3e50;
+}
+.f1{
+  margin-top: -2.5rem;
+  margin-left: 17.5rem;
+}
+.f11{
+  margin-top: -3rem;
+  
+  // margin-left: 29rem;
+}
+.f2{
+  margin-top: -2.5rem;
+  margin-left: 20.0rem;
+}
+.f3{
+  margin-top: -2.5rem;
+  margin-left: 20.0rem;
+}
+</style>

+ 93 - 0
src/views/RMS/components/editMaterial.vue

@@ -0,0 +1,93 @@
+<template>
+  <!-- 修改物资信息 -->
+  <div id="contractDetails">
+    <page-title>编辑</page-title>
+    <div class="main">
+      <span class="text">物资信息</span>
+    </div>
+    <div class="contractTitle">
+      <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="314" 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() {
+      console.log(this.$route)
+    this.information();
+  },
+  methods: {  
+    information() {
+      //编辑
+      this.axios
+        .post(
+          "/api/v1/rms/getMaterialById/" +
+            this.$route.params.materialId
+        )
+        .then((res) => {
+            console.log(res)
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            console.log(e);
+            console.log(this.form1);
+            console.log(this.$route.params.materialId);
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      console.log(this.form1)
+      let RmsMaterial = {
+        materialId:this.form1.materialId,
+        materialCode:this.form1.materialCode,
+        materialName:this.form1.materialName,
+        materialSpecification:this.form1.materialSpecification,
+        materialModel:this.form1.materialModel,
+        materialTypeId:this.form1.materialTypeId,
+        unitOfMeasureId:this.form1.unitOfMeasureId,
+        materialTheoreticalWeight:this.form1.materialTheoreticalWeight,
+      };
+        this.axios
+          .post(
+            "/api/v1/rms/updateMaterial",
+            RmsMaterial
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$router.go(-1);
+            }
+          });
+    },
+  },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+};
+</script>
+<style lang='scss' scoped>
+
+</style>

+ 86 - 0
src/views/RMS/components/editOilPrice.vue

@@ -0,0 +1,86 @@
+<template>
+  <!-- 修改油价信息 -->
+  <div id="contractDetails">
+    <page-title>编辑</page-title>
+    <div class="main">
+      <span class="text">油价信息</span>
+    </div>
+    <div class="contractTitle">
+      <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="356" 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() {
+    console.log(this.$route)
+    this.information();
+  },
+  methods: {
+    information() {
+      //编辑
+      this.axios
+        .post(
+          "/api/v1/rms/getOilPriceById/" +
+          this.$route.params.priceId
+        )
+        .then((res) => {
+          console.log(res)
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            console.log(e);
+            console.log(this.form1);
+            console.log(this.$route.params.priceId);
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      console.log(this.form1)
+      let RmsOilPrice = {
+        priceId:this.form1.priceId,
+        priceDate:this.form1.priceDate,
+        priceValue:this.form1.priceValue,
+        priceOilName:this.form1.priceOilName,
+
+      };
+      this.axios
+        .post(
+          "/api/v1/rms/updateOilPrice",
+          RmsOilPrice
+        )
+        .then((res) => {
+          if (res.data.code == "200") {
+            this.$router.go(-1);
+          }
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+
+</style>

+ 86 - 0
src/views/RMS/components/editPersonnel.vue

@@ -0,0 +1,86 @@
+<template>
+  <!-- 修改人员信息 -->
+  <div id="contractDetails">
+    <page-title>编辑</page-title>
+    <div class="main">
+      <span class="text">人员信息</span>
+    </div>
+    <div class="contractTitle">
+      <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="324" 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() {
+      //编辑 
+   console.log(this.$route.params)
+      this.axios
+        .post(
+            "/api/v1/rms/getPersonnelById/" +
+               this.$route.params.personnelId
+        )
+         
+        .then((res) => {
+         console.log(res.data.data)
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      console.log(this.form1)
+       let RmsPersonnel={
+         personnelId:this.form1.personnelId,
+         personnelJobNumber: this.form1.personnelJobNumber,
+         personnelName: this.form1.personnelName,
+         personnelPost: this.form1.personnelPost,
+         personnelWorkshopid: this.form1.personnelWorkshopid,
+         personnelShifts: this.form1.personnelShifts,
+         shipperId: this.form1.shipperId,
+       }  
+        this.axios
+          .post(
+            "/api/v1/rms/updatePersonnel",
+            RmsPersonnel
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$router.go(-1);
+            
+            }
+          });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+
+</style>

+ 0 - 0
src/views/RMS/components/editPier.vue


+ 0 - 0
src/views/RMS/components/editPortStorageYard.vue


+ 0 - 0
src/views/RMS/components/editRawMaterialManufacturer.vue


+ 79 - 0
src/views/RMS/components/editRawWarehouse.vue

@@ -0,0 +1,79 @@
+<template>
+  <!-- 修改原料仓库信息 -->
+  <div id="contractDetails">
+    <page-title>编辑</page-title>
+    <div class="main">
+      <span class="text">原料仓库信息</span>
+    </div>
+    <div class="contractTitle">
+      <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="355" 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() {
+      console.log(this.$route)
+    this.information();
+  },
+  methods: {
+    information() {
+      //编辑
+      this.axios
+        .post(
+          "/api/v1/rms/getWarehouseById/" +
+            this.$route.params.warehouseId
+        )
+        .then((res) => {
+            console.log(res.data.data)
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            console.log(e);
+            console.log(this.form1);
+            console.log(this.$route.params.warehouseId);
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      console.log(this.form1)
+       let RmsWarehouse=this.form1;
+        this.axios
+          .post(
+            "/api/v1/rms/updateWarehouse",
+           RmsWarehouse 
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$router.go(-1);
+            }
+          });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+
+</style>

+ 84 - 0
src/views/RMS/components/editRmsShipper.vue

@@ -0,0 +1,84 @@
+<template>
+  <!-- 修改托运人信息 -->
+  <div id="contractDetails">
+    <page-title>编辑</page-title>
+    <div class="main">
+      <span class="text">托运人信息</span>
+    </div>
+    <div class="contractTitle">
+      <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="322" 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() {
+      console.log(this.$route)
+    this.information();
+  },
+  methods: {
+    information() {
+      //编辑
+      this.axios
+        .post(
+          "/api/v1/rms/getShipperById/" +
+            this.$route.params.shipperId
+        )
+        .then((res) => {
+            console.log(res)
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            console.log(e);
+            console.log(this.form1);
+            console.log(this.$route.params.resultId);
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      console.log(this.form1)
+       let RmsShipper={
+        shipperId:this.form1.shipperId,
+        shipperName: this.form1.shipperName,
+        shipperAbbreviation: this.form1.shipperAbbreviation
+      };
+        this.axios
+          .post(
+            "/api/v1/rms/updateShipper",
+            RmsShipper
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$router.go(-1);
+            }
+          });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+
+</style>

+ 88 - 0
src/views/RMS/components/editSupplier.vue

@@ -0,0 +1,88 @@
+<template>
+  <!-- 修改供应商信息 -->
+  <div id="contractDetails">
+    <page-title>编辑</page-title>
+    <div class="main">
+      <span class="text">供应商信息</span>
+    </div>
+    <div class="contractTitle">
+      <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="321" 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() {
+      console.log(this.$route)
+    this.information();
+  },
+  methods: {
+    information() {
+      console.log("supplierId",this.$router.params);
+      //编辑
+      this.axios
+        .post(
+          "/api/v1/rms/getSupplierById/" +
+            this.$route.params.supplierId
+        )
+        .then((res) => {
+            console.log(res)
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            console.log(e);
+            console.log(this.form1);
+            console.log(this.$route.params.supplierId);
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      console.log(this.form1)
+       let RmsSupplier={
+        supplierId: this.form1.supplierId,
+        supplierName: this.form1.supplierName,
+        supplierAddress: this.form1.supplierAddress,
+        supplierRegisterDate: sjTime(this.form1.supplierRegisterDate),
+        supplierContactsName: this.form1.supplierContactsName,
+        supplierContactNumber: this.form1.supplierContactNumber
+      };
+        this.axios
+          .post(
+            "/api/v1/rms/updateSupplier",
+            RmsSupplier
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$router.go(-1);
+            }
+          });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+
+</style>

+ 271 - 0
src/views/RMS/components/editTruckCalculate.vue

@@ -0,0 +1,271 @@
+<template>
+  <!-- 修改汽车衡信息 -->
+  <div id="contractDetails">
+    <page-title>编辑</page-title>
+    <div class="main">
+      <span class="text">汽车衡信息</span>
+    </div>
+    <div class="contractTitle">
+      <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="354" v-model="form1"></dil-form>
+        </div>
+      </div>
+        <div class="form-box f1">
+          <el-form :inline="true" :model="formInline" class="demo-form-inline">
+  <el-form-item label="物资名称">
+    <el-input v-model="materialTypeName" disabled>  
+    </el-input>
+  </el-form-item>
+  <el-form-item>
+    <el-button type="primary" @click="drawer = true">增加物资种类</el-button>
+  </el-form-item>
+    </el-form>
+    </div>
+    <el-drawer
+      :visible.sync="drawer"
+      :direction="direction"
+      :before-close="handleClose">
+        <el-input
+            placeholder="请输入内容"
+            v-model="inputText"
+            clearable>
+          </el-input>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>查询
+          </el-button>
+            <div><dilTable v-bind.sync="option2" @radio-change="currentRadioChange" ></dilTable></div>
+              <div class="button-box">
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+</el-drawer>
+      <dilTable v-bind.sync="option1">
+      <el-table-column fixed="right" label="操作" align="center" width="200">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="mini"
+            @click="deleteclick(scope)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </dilTable>
+       <div class="button-box">
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+      <el-button @click="onClickCancel">返回</el-button>
+    </div>  
+  </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+//import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      materialName: {},
+      form1: {},
+      drawer: false,
+      direction: 'rtl',
+      inputText:"",
+      option1:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getCalculateOfMaterialList?apiId=379&truckCalculateId="+this.$route.params.truckCalulateId,
+        
+      },
+      option2:{
+        requestUrl:"/api/v1/rms/getMaterialList?apiId=351",
+        selectionType:"radio",
+        mapList:[]
+      }
+    };
+  },
+  mounted() {
+      console.log(this.$route)
+    this.information();
+  },
+  methods: {
+   currentRadioChange(selection){
+      this.mapList=selection,
+      console.log(this.mapList)
+      this.materialName=this.mapList.materialName
+    },
+    // onclick(){
+    //   this.options.requestUrl="/api/v1/rms/getMaterialList?apiId=351&con=" +this.inputText;
+    // },
+    information() {
+      //编辑 
+   console.log(this.$route.params)            
+   console.log("truckCalculateId",this.$route.params.truckCalulateId);  
+      this.axios
+        .post(
+          "/api/v1/rms/getTruckCalculateById/" +
+            this.$route.params.truckCalulateId
+        )
+
+        .then((res) => {
+            console.log(res.data.data)
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            console.log(e);
+            console.log(this.form1);
+            console.log( this.$route.params.truckCalculateId);
+          });
+        });
+    },
+    onclick(){
+      this.option2.requestUrl="/api/v1/rms/getMaterialList?apiId=351&con=" +this.inputText;
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 修改汽车衡
+    onClickConfirm() {
+      console.log(this.form1)
+          let map={
+         truckCalculateNumber:this.form1.truckCalculateNumber,
+         truckCalculateId:this.form1.truckCalculateId,
+         truckCalculateStatus:this.form1.truckCalculateStatus,
+         truckCalculateLongitude:this.form1.truckCalculateLongitude,
+         truckCalculateLatitude:this.form1.truckCalculateLatitude,
+         calculateType:this.form1.calculateType,
+       }
+    
+        this.axios
+          .post(
+            "/api/v1/rms/updateTruckCalculate",
+          map
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$router.go(-1);
+            }
+          });
+    },
+//增加汽车衡的物资
+makeSure() {
+      let rmsTruckCalculateMaterial = {
+        truckCalculateId:this.form1.truckCalculateId,
+        materialId:this.mapList.materialId,
+      }
+
+      this.axios
+        .post(
+          "/api/v1/rms/insertTruckCalculateOfMaterial",
+           rmsTruckCalculateMaterial
+        )
+        .then((res) => {
+          if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "添加成功!",
+                });     
+                this.$router.go(0);
+              }
+        });
+    },
+
+     deleteclick(scope){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/rms/deleteTruckCalculateMaterial/" + scope.row.truckCalculateMaterialId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+ // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.form-box {
+  padding: 20px 30px;
+  margin-left: 330px;
+}
+.button-box {
+  padding: 20px 30px;
+  margin-left: 460px;
+}
+.btn-left {
+  margin-left: 470px;
+}
+.input {
+  margin-left: 90px;
+}
+.label{
+  margin-left: 445px;
+  margin-bottom: -30px;
+  font: bold;
+  font-size: 1rem;
+  padding-left: -30px;
+  font-family:Arial, Helvetica, sans-serif;
+  margin-bottom:20px;
+} 
+.label2{
+  margin-left: 425px;
+  margin-bottom: -30px;
+  font: bold;
+  font-size: 1rem;
+  font-family:Arial, Helvetica, sans-serif
+}
+.label1{
+  margin-left: 345px;
+  margin-bottom: -30px;
+  font: bold;
+}
+.common{
+  font-weight: 700;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
+    Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+  font-size: 1rem;
+  cursor: default;
+  color: #2c3e50;
+}
+.f1{
+  margin-top: -2.5rem;
+  margin-left: 22.3rem;
+}
+.f11{
+  margin-top: -3rem;
+  // margin-left: 29rem;
+}
+.f2{
+  margin-top: -2.5rem;
+  margin-left: 20.7rem;
+}
+.f3{
+  margin-top: -2.5rem;
+  margin-left: 25rem;
+}
+</style>

+ 112 - 0
src/views/RMS/components/gatepost.vue

@@ -0,0 +1,112 @@
+<!--管理门岗信息-->
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+       <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="mini"
+              @click="updateGatepostRules(scope)"
+            >
+              详细
+            </el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="deleteGatepost(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getGatepostList?apiId=347",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      this.options.requestUrl="/api/v1/rms/getGatepostList?apiId=347&con=" + this.inputText;
+      console.log(this.textInput)
+    },
+     toInsert() {
+      this.$router.push("/addGatepost");
+
+    },
+    updateGatepostRules(scope){
+      console.log(scope.row.gatepostId)
+      this.$router.push("/editGatepost/"+ scope.row.gatepostId)
+    },
+    deleteGatepost(scope){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/rms/deleteGatepost/" + scope.row.gatepostId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    }
+  }
+}
+
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 80px;
+    display: flex;
+    align-items: center;
+    padding-left: 30px;
+  }
+}
+</style>

+ 112 - 0
src/views/RMS/components/material.vue

@@ -0,0 +1,112 @@
+<!--管理原料-->
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+       <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="updateMaterial(scope)"
+            >
+              修改
+            </el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteMaterial(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getMaterialList?apiId=350",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      this.options.requestUrl="/api/v1/rms/getMaterialList?apiId=350&con=" + this.inputText;
+      console.log(this.inputText)
+    },
+    toInsert() {
+      this.$router.push("/addMaterial");
+
+    },
+    updateMaterial(scope){
+      console.log(scope.row.materialId)
+      this.$router.push("/editMaterial/"+scope.row.materialId)
+    },
+    deleteMaterial(scope){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/rms/deleteMaterial/" + scope.row.materialId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    },
+  }
+
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 80px;
+    display: flex;
+    align-items: center;
+    padding-left: 30px;
+  }
+}
+</style>

+ 115 - 0
src/views/RMS/components/oilPrice.vue

@@ -0,0 +1,115 @@
+//资源管理油价管理
+<template>
+  <div class="oilPrice">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="textInput"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn"  @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="updateOilPrice(scope)"
+            >
+              修改
+            </el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteOilPrice(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name:"homeworkPath",
+  data(){
+    return{
+      textInput: "" ,
+      restaurants: [],
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getOilPriceList?apiId=380",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      this.options.requestUrl = "/api/v1/rms/getOilPriceList?apiId=380&con=" +this.textInput;
+    },
+
+    toInsert() {
+      this.$router.push("/addOilPrice");
+
+    },
+    /*这里要改一改*/
+    updateOilPrice(scope){
+      console.log(scope.row.priceId)
+      this.$router.push("/editOilPrice/"+scope.row.priceId)
+    },
+    deleteOilPrice(scope){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/rms/deleteOilPrice/" + scope.row.priceId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+  },
+
+}
+
+</script>
+
+<style lang="scss" scode>
+.oilPrice{
+  .sache{
+    height: 80px;
+    display: flex;
+    align-items: center;
+    padding-left: 30px;
+  }
+}
+</style>

+ 113 - 0
src/views/RMS/components/personnel.vue

@@ -0,0 +1,113 @@
+// 人员管理
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="textInput"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+       <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="updatePersonnel(scope)"
+            >
+              修改
+            </el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deletePersonnel(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      textInput:"",
+      restaurants:[],
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getPersonnelList?apiId=341",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      this.options.requestUrl="/api/v1/rms/getPersonnelList?apiId=341&con=" + this.textInput;
+      console.log(this.textInput)
+    },
+    toInsert() {
+      this.$router.push("/addPersonnel");
+
+    },
+    updatePersonnel(scope){
+      console.log(scope.row.personnelId)
+      this.$router.push("/editPersonnel/"+scope.row.personnelId)
+    },
+    deletePersonnel(scope){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/rms/deletePersonnel/" + scope.row.personnelId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    },
+  }
+
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 80px;
+    display: flex;
+    align-items: center;
+    padding-left: 30px;
+  }
+}
+</style>

+ 96 - 0
src/views/RMS/components/pier.vue

@@ -0,0 +1,96 @@
+//资源管理港口
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+       <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteBmsTrainFreight(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getPier?apiId=223",
+      },
+    }
+  },
+  methods:{
+     toInsert() {
+      this.$router.push("/addPier");
+    },
+    deleteBmsTrainFreight(scope){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/rms/deletePier/" + scope.row.pierId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    },
+  }
+
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 80px;
+    display: flex;
+    align-items: center;
+    padding-left: 30px;
+  }
+}
+</style>

+ 98 - 0
src/views/RMS/components/port.vue

@@ -0,0 +1,98 @@
+//资源管理港口
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+       <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteBmsTrainFreight(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getPort?apiId=222",
+      },
+    }
+  },
+  methods:{
+     toInsert() {
+      this.$router.push("/addPort");
+
+    },
+
+    deleteBmsTrainFreight(scope){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/rms/deletePort/" + scope.row.portId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    },
+  }
+
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 80px;
+    display: flex;
+    align-items: center;
+    padding-left: 30px;
+  }
+}
+</style>

+ 98 - 0
src/views/RMS/components/portStorageYard.vue

@@ -0,0 +1,98 @@
+//资源管理港存堆场
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+       <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteBmsTrainFreight(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getYardList?apiId=224",
+      },
+    }
+  },
+  methods:{
+     toInsert() {
+      this.$router.push("/addPort");
+
+    },
+
+    deleteBmsTrainFreight(scope){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/rms/deletePort/" + scope.row.portId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    },
+  }
+
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 80px;
+    display: flex;
+    align-items: center;
+    padding-left: 30px;
+  }
+}
+</style>

+ 108 - 0
src/views/RMS/components/rawMaterialManufacturer.vue

@@ -0,0 +1,108 @@
+//资源管理港口
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+       <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="updateBmsTrainFreight(scope)"
+            >
+              修改
+            </el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteBmsTrainFreight(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/bms/getSettlementList?apiId=180",
+      },
+    }
+  },
+  methods:{
+     toInsert() {
+      this.$router.push("/addRawMaterialManufacturer");
+
+    },
+    updateBmsTrainFreight(scope){
+      console.log(scope.row.settlementId)
+      this.$router.push("/addPort/"+scope.row.settlementId)
+    },
+    deleteBmsTrainFreight(scope){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/bms/deleteTrainSettlement/" + scope.row.settlementId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    },
+  }
+
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 80px;
+    display: flex;
+    align-items: center;
+    padding-left: 30px;
+  }
+}
+</style>

+ 111 - 0
src/views/RMS/components/rawWarehouse.vue

@@ -0,0 +1,111 @@
+//资源管理原料仓库
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+       <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="updateWarehouse(scope.row.warehouseId)"
+            >
+              修改
+            </el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteWarehouse(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getWarehouseList?apiId=345",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      this.options.requestUrl="/api/v1/rms/getWarehouseList?apiId=345&con="+this.inputText;
+    },
+     toInsert() {
+      this.$router.push("/addRawWarehouse");
+
+    },
+    updateWarehouse(warehouseId){
+      // console.log(scope.row.warehouseId)
+      this.$router.push("/editRawWarehouse/" +warehouseId)
+    },
+    deleteWarehouse(scope){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/rms/deleteWarehouse/" + scope.row.warehouseId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    },
+  }
+
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 80px;
+    display: flex;
+    align-items: center;
+    padding-left: 30px;
+  }
+}
+</style>

+ 112 - 0
src/views/RMS/components/rmsShipper.vue

@@ -0,0 +1,112 @@
+<!--资源管理托运人-->
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+       <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="updateShipper(scope)"
+            >
+              修改
+            </el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteShipper(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getShipperList?apiId=344",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      this.options.requestUrl="/api/v1/rms/getShipperList?apiId=344&con=" + this.inputText;
+      console.log(this.textInput)
+    },
+    toInsert() {
+      this.$router.push("/addRmsShipper");
+
+    },
+    updateShipper(scope){
+      console.log(scope.row.shipperId)
+      this.$router.push("/editRmsShipper/"+scope.row.shipperId)
+    },
+    deleteShipper(scope){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/rms/deleteShipper/" + scope.row.shipperId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    },
+  }
+
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 80px;
+    display: flex;
+    align-items: center;
+    padding-left: 30px;
+  }
+}
+</style>

+ 112 - 0
src/views/RMS/components/supplier.vue

@@ -0,0 +1,112 @@
+<!--资源供应商-->
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+       <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="updateSupplier(scope)"
+            >
+              修改
+            </el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteSupplier(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getSupplierList?apiId=343",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      this.options.requestUrl="/api/v1/rms/getSupplierList?apiId=343&con=" + this.inputText;
+      console.log(this.textInput)
+    },
+     toInsert() {
+      this.$router.push("/addSupplier");
+
+    },
+    updateSupplier(scope){
+      console.log(scope.row.supplierId)
+      this.$router.push("/editSupplier/"+scope.row.supplierId)
+    },
+    deleteSupplier(scope){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/rms/deleteSupplier/" + scope.row.supplierId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    },
+  }
+
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 80px;
+    display: flex;
+    align-items: center;
+    padding-left: 30px;
+  }
+}
+</style>

+ 131 - 0
src/views/RMS/components/transitRoute.vue

@@ -0,0 +1,131 @@
+// 运输路线
+<template>
+  <div class="transitRoute">
+    <div class="top">
+      <!-- 框计算 -->
+      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" class="btn" @click="AddClick">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="tab">
+      <dilTable v-bind.sync="option">
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="mini"
+              @click="transitRouteUpdata(scope.row.lineId)"
+              >修改</el-button
+            >
+            <el-button
+              size="mini"
+              type="text"
+              @click="transitRouteDelete(scope.row.lineId)"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      // 框计算的输入框的值
+      inputText: "",
+      // 表格渲染的表头及数据
+      option: {
+        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249",
+      },
+      countNumber: 0,
+    };
+  },
+  methods: {
+    initialization(lineId, num) {
+      this.axios
+        .post("/api/v1/rms/getCountNumber?lineId=" + lineId)
+        .then((res) => {
+          if (res.data.code == "200") {
+            if (res.data.data > 0) {
+              this.$message({
+                showClose: true,
+                message: "此路线已经和运输订单关联,不能进行修改!",
+                type: "warning",
+              });
+            } else {
+              if (num == 2) {
+                this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+                  confirmButtonText: "确定",
+                  cancelButtonText: "取消",
+                  type: "warning",
+                })
+                  .then(() => {
+                    this.axios
+                      .post("/api/v1/rms/updateRmsLine", { lineId: lineId })
+                      .then((res) => {
+                        if ((res.data.code = "200")) {
+                          this.$message({
+                            type: "success",
+                            message: "删除成功!",
+                          });
+                          this.$router.go(0);
+                        }
+                      });
+                  })
+                  .catch(() => {
+                    this.$message({
+                      type: "info",
+                      message: "已取消删除",
+                    });
+                  });
+              } else if (num == 1) {
+                this.$router.push({
+                  path: "/transitRouteAdd/" + lineId,
+                });
+              }
+            }
+          }
+        });
+    },
+    // 框计算查询按钮
+    onclick() {
+      this.option.requestUrl =
+        "/api/v1/rms/getAllLineDesk?apiId=249&con=" + this.inputText;
+    },
+    // 跳转新增运输路线页面
+    AddClick() {
+      this.$router.push({
+        path: "/transitRouteAdd/0",
+      });
+    },
+    //跳转修改界面
+    transitRouteUpdata(lineId) {
+      this.initialization(lineId, 1);
+    },
+    //删除本条运输路线
+    transitRouteDelete(lineId) {
+      this.initialization(lineId, 2);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.transitRoute {
+  .top {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 60px;
+  }
+}
+</style>

+ 343 - 0
src/views/RMS/components/transitRouteAdd.vue

@@ -0,0 +1,343 @@
+// 新增运输路线
+<template>
+  <div class="transitRouteAdd">
+    <page-title>新增</page-title>
+    <div class="form_top">
+      <div class="link_name" v-if="state > 0">
+        <span>线路编号:</span>
+        <el-input placeholder="请输入内容" v-model="lineNo" disabled>
+        </el-input>
+      </div>
+      <div class="link_name">
+        <span>线路名称:</span>
+        <el-input placeholder="请输入内容" v-model="line_name" clearable>
+        </el-input>
+      </div>
+      <div class="link_type">
+        <span>线路类型:</span>
+        <el-select v-model="value" placeholder="请选择">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+      <div class="spellNumber">
+        <span class="text">拼数:</span>
+        <el-input placeholder="请输入内容" v-model="spellNumber" clearable>
+        </el-input>
+      </div>
+      <div class="link_zi_list">
+        <span>环节:</span>
+          <el-tag
+            :key="index"
+            v-for="(item,index) in btnList"
+            :disable-transitions="false"
+            @click="addClick(item)"
+            class="link_zi_list_btn"
+          >
+            {{item.linkName}}
+          </el-tag>
+          <el-input
+            class="input-new-tag"
+            v-if="inputVisible"
+            v-model="inputValue"
+            ref="saveTagInput"
+            size="small"
+            @blur="onBlur"
+          >
+          </el-input>
+          <el-button v-else class="button-new-tag" size="small" @click="showInput"> + 新增</el-button>
+      </div>
+      
+    </div>
+    <div class="linkList">
+      <div class="link_list" id="tag">
+        <el-tag
+          class="tag"
+          size="small"
+          v-for="(item, i) in linkList"
+          :key="i"
+          @close="deleteClick(i)"
+          closable
+        >
+          {{ item.linkName }}
+        </el-tag>
+      </div>
+    </div>
+    <div class="btn">
+      <el-button class="cancel" @click="cancelClick">取消</el-button>
+      <el-button class="confirm" type="primary" @click="confirmClick"
+        >确认</el-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import Sortable from "sortablejs";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      inputVisible:false,
+      inputValue: '',
+      lineNo: "",
+      line_name: "",
+      spellNumber: 1,
+      options: [
+        {
+          value: "1",
+          label: "内转",
+        },
+        {
+          value: "2",
+          label: "销售",
+        },
+        {
+          value: "3",
+          label: "采购",
+        },
+        {
+          value: "4",
+          label: "退货",
+        },
+      ],
+      value: "",
+      btnList: [],
+      linkList: [],
+      state: 0,
+    };
+  },
+  created() {
+    this.initialization();
+  },
+  mounted() {
+    this.drag();
+  },
+  methods: {
+    A(){
+ // 获取所有的作业环节
+            this.axios.post("/api/v1/rms/getLink").then((res) => {
+              if (res.data.code == "200") {
+                this.btnList = res.data.data;
+              }
+            });
+    },
+    //将新增变为输入框
+    showInput() {
+      this.inputVisible = true;
+    },
+    //当输入框失去焦点之后触发,新增作业环节
+    onBlur() {
+      console.log(this.inputValue);
+      if (this.inputValue) {
+        this.axios.post('/api/v1/rms/LinkInsertSelective',
+        {
+          linkName:this.inputValue,
+          userName:""
+        }).then((res)=>{
+          if(res.data.code == "200"){
+            this.A();
+          }
+        })
+      }
+      this.inputVisible = false;
+      this.inputValue = '';
+    },
+    // 初始化页面的数据
+    initialization() {
+      this.state = this.$route.params.addup;
+      // 获取所有的作业环节
+      this.A();
+      if (this.state == 0) {
+        console.log("新增");
+      } else {
+        this.axios
+          .post("/api/v1/rms/getLinkToUpdate?lineId=" + this.state)
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.lineNo = res.data.data.lineNo;
+              this.line_name = res.data.data.lineName;
+              this.options.forEach((e) => {
+                if (e.value == res.data.data.lineType) {
+                  this.value = e.value;
+                }
+              });
+              this.linkList = res.data.data.mapList;
+            }
+          });
+        console.log("修改");
+      }
+    },
+    // 将点击的对象添加到linkList的数组中
+    addClick(item) {
+      this.linkList.push(item);
+    },
+    // 删除被点击的对象
+    deleteClick(index) {
+      this.linkList.splice(index, 1);
+    },
+    // 点击取消按钮
+    cancelClick() {
+      // 若linkList数组有数据,则提示用户数据将会清空,若没有,则直接退出
+      if (this.linkList.length > 0) {
+        this.$confirm("离开此页面,修改的数据不会保存, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$router.go(-1);
+          })
+          .catch(() => {});
+      } else {
+        this.$router.go(-1);
+      }
+    },
+    // 点击确定按钮
+    confirmClick() {
+      // 判断是否存在空值
+      if (this.line_name && this.value && this.linkList.length > 0) {
+        var map = {
+          spellNumber: parseInt(this.spellNumber),
+          lineId: parseInt(this.state),
+          line_name: this.line_name,
+          line_type: parseInt(this.value),
+          linkList: this.linkList,
+        };
+        var URL = "";
+        var messageText = "";
+        // 若上一个页面传递的值为0则新增
+        if (this.state == 0) {
+          URL = "/api/v1/rms/insertSelective";
+          messageText = "新增成功!";
+        } else if (this.state > 0) {
+          // 若上一个页面传递的值大于0,则更新
+          URL = "/api/v1/rms/updateByPrimaryKeySelective";
+          messageText = "修改成功!";
+        }
+        this.axios.post(URL, map).then((res) => {
+          if ((res.data.code = "200")) {
+            this.$message({
+              showClose: true,
+              message: messageText,
+              type: "success",
+            });
+            this.$router.go(-1);
+          }
+        });
+      } else {
+        this.$message({
+          showClose: true,
+          message: "不能存在空值",
+          type: "warning",
+        });
+      }
+    },
+    //拖动事件
+    drag() {
+      var _this = this;
+      var $ul = document.getElementById("tag");
+      new Sortable($ul, {
+        onUpdate: function (event) {
+          //修改items数据顺序
+          var newIndex = event.newIndex,
+            oldIndex = event.oldIndex,
+            $li = $ul.children[newIndex],
+            $oldLi = $ul.children[oldIndex];
+          // 先删除移动的节点
+          $ul.removeChild($li);
+          // 再插入移动的节点到原有节点,还原了移动的操作
+          if (newIndex > oldIndex) {
+            $ul.insertBefore($li, $oldLi);
+          } else {
+            $ul.insertBefore($li, $oldLi.nextSibling);
+          }
+          // 更新items数组
+          var item = _this.linkList.splice(oldIndex, 1);
+          _this.linkList.splice(newIndex, 0, item[0]);
+        },
+        animation: 150,
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.transitRouteAdd {
+  .form_top {
+    width: 100%;
+    height: 10.625rem;
+    .link_name {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-top: 1.25rem;
+    }
+    .link_type {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-top: 1.25rem;
+    }
+    .spellNumber {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-top: 1.25rem;
+      .text {
+        width: 80px;
+        text-align: right;
+      }
+    }
+    .link_zi_list {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-top: 1.25rem;
+      .link_zi_list_btn{
+        width: 3.125rem; height: 2rem;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-right: 0.625rem;
+      }
+      .input-new-tag {
+        width: 4.375rem;
+        margin-left: 0.625rem;
+        vertical-align: bottom;
+      }
+    }
+  }
+  .linkList {
+    margin-top: 5.625rem;
+    display: flex;
+    justify-content: center;
+    .link_list {
+      border: #8d8c8c 0.0625rem solid;
+      width: 80%;
+      height: 12.5rem;
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: flex-start;
+      overflow: hidden;
+      padding: 0.625rem;
+      .tag {
+        margin: 0.3125rem;
+      }
+    }
+  }
+  .btn {
+    display: flex;
+    width: 100%;
+    justify-content: center;
+    margin-top: 20px;
+  }
+}
+</style>

+ 109 - 0
src/views/RMS/components/truckCalculate.vue

@@ -0,0 +1,109 @@
+//资源管理汽车衡
+<template>
+  <div class="truckCalculate">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+       <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="100"> 
+          <template slot-scope="scope"> 
+               <el-button
+               type="text"
+               size="small"
+               @click="updateTruckCalculate(scope.row.truckCalculateId)"
+             >
+               详细
+             </el-button> 
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteTruckCalculate(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getTruckCalculateList?apiId=346",
+      },
+    }
+  },
+  methods:{
+      onclick(){
+        this.options.requestUrl="/api/v1/rms/getTruckCalculateList?apiId=346&con="+this.inputText;
+      },
+     toInsert() {
+      this.$router.push("/addTruckCalculate");
+
+    },
+   updateTruckCalculate(truckCalculateId){
+      this.$router.push("/editTruckCalculate/" + truckCalculateId)
+    },
+   deleteTruckCalculate(scope){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/rms/deleteTruckCalculate/" + scope.row.truckCalculateId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    },
+  }
+
+</script>
+
+<style lang="scss" scode>
+.truckCalculate{
+  .sache{
+    height: 80px;
+    display: flex;
+    align-items: center;
+    padding-left: 30px;
+  }
+}
+</style>

+ 124 - 0
src/views/RMS/router/index.js

@@ -0,0 +1,124 @@
+import Vue from 'vue'
+import Router from 'vue-router'
+
+import routerBefore from '@/config/routerBefore.js'
+// 主要
+import main from '@/components/main.vue'
+// 系统配置管理
+import addCapacity from '../components/addCapacity.vue'
+import addCarDriver from '../components/addCarDriver.vue'
+import addCarrier from '../components/addCarrier.vue'
+import addGatepost from '../components/addGatepost.vue'
+import addMaterial from '../components/addMaterial.vue'
+import addOilPrice from '../components/addOilPrice.vue'
+import addPersonnel from '../components/addPersonnel.vue'
+import addPier from '../components/addPier.vue'
+import addPort from '../components/addPort.vue'
+import addPortStorageYard from '../components/addPortStorageYard.vue'
+import addRawMaterialManufacturer from '../components/addRawMaterialManufacturer.vue'
+import addRawWarehouse from '../components/addRawWarehouse.vue'
+import addRmsShipper from '../components/addRmsShipper.vue'
+import addSupplier from '../components/addSupplier.vue'
+import addTruckCalculate from '../components/addTruckCalculate.vue'
+import capacity from '../components/capacity.vue'
+import carDriver from '../components/carDriver.vue'
+import carrier from '../components/carrier.vue'
+import addPidetailsTruckCalculateer from '../components/detailsTruckCalculate.vue'
+import editCapacity from '../components/editCapacity.vue'
+import editCarDriver from '../components/editCarDriver.vue'
+import editCarrier from '../components/editCarrier.vue'
+import editGatepost from '../components/editGatepost.vue'
+import editMaterial from '../components/editMaterial.vue'
+import editOilPrice from '../components/editOilPrice.vue'
+import editPersonnel from '../components/editPersonnel.vue'
+import editPier from '../components/editPier.vue'
+import editPortStorageYard from '../components/editPortStorageYard.vue'
+import editRawMaterialManufacturer from '../components/editRawMaterialManufacturer.vue'
+import editRawWarehouse from '../components/editRawWarehouse.vue'
+import editRmsShipper from '../components/editRmsShipper.vue'
+import editSupplier from '../components/editSupplier.vue'
+import editTruckCalculate from '../components/editTruckCalculate.vue'
+import gatepost from '../components/gatepost.vue'
+import material from '../components/material.vue'
+import oilPrice from '../components/oilPrice.vue'
+import personnel from '../components/personnel.vue'
+import pier from '../components/pier.vue'
+import port from '../components/port.vue'
+import portStorageYard from '../components/portStorageYard.vue'
+import rawMaterialManufacturer from '../components/rawMaterialManufacturer.vue'
+import rawWarehouse from '../components/rawWarehouse.vue'
+import rmsShipper from '../components/rmsShipper.vue'
+import supplier from '../components/supplier.vue'
+import transitRoute from '../components/transitRoute.vue'
+import transitRouteAdd from '../components/transitRouteAdd.vue'
+import truckCalculate from '../components/truckCalculate.vue'
+Vue.use(Router)
+const constantRouterMap = [
+	{
+	  path: '/',
+	  name: 'main',
+	  meta: {title: '首页', code: 'xtpzgl'},
+	  component: main,
+	  redirect: {name: 'addCapacity'},
+	  children: [
+		{path: 'addCapacity', name: 'addCapacity', meta: {code: 'xtpzgl-jggl'}, component: addCapacity},
+		{path: 'addCarDriver', name: 'addCarDriver', meta: {code: 'xtpzgl-yhgl'}, component: addCarDriver},
+		{path: 'addCarrier', name: 'addCarrier', meta: {code: 'xtpzgl-yhgl'}, component: addCarrier},
+		{path: 'addGatepost', name: 'addGatepost', meta: {code: 'xtpzgl-yhgl'}, component: addGatepost},
+		{path: 'addMaterial', name: 'addMaterial', meta: {code: 'xtpzgl-yhgl'}, component: addMaterial},
+		{path: 'addOilPrice', name: 'addOilPrice', meta: {code: 'xtpzgl-yhgl'}, component: addOilPrice},
+		{path: 'addPersonnel', name: 'addPersonnel', meta: {code: 'xtpzgl-yhgl'}, component: addPersonnel},
+		{path: 'addPier', name: 'addPier', meta: {code: 'xtpzgl-yhgl'}, component: addPier},
+		{path: 'addPort', name: 'addPort', meta: {code: 'xtpzgl-yhgl'}, component: addPort},
+		{path: 'addPortStorageYard', name: 'addPortStorageYard', meta: {code: 'xtpzgl-yhgl'}, component: addPortStorageYard},
+		{path: 'addRawMaterialManufacturer', name: 'addRawMaterialManufacturer', meta: {code: 'xtpzgl-yhgl'}, component: addRawMaterialManufacturer},
+		{path: 'addRawWarehouse', name: 'addRawWarehouse', meta: {code: 'xtpzgl-yhgl'}, component: addRawWarehouse},
+		{path: 'addRmsShipper', name: 'addRmsShipper', meta: {code: 'xtpzgl-yhgl'}, component: addRmsShipper},
+		{path: 'addSupplier', name: 'addSupplier', meta: {code: 'xtpzgl-yhgl'}, component: addSupplier},
+		{path: 'addTruckCalculate', name: 'addTruckCalculate', meta: {code: 'xtpzgl-yhgl'}, component: addTruckCalculate},
+		{path: 'capacity', name: 'capacity', meta: {code: 'xtpzgl-yhgl'}, component: capacity},
+		{path: 'carDriver', name: 'carDriver', meta: {code: 'xtpzgl-yhgl'}, component: carDriver},
+		{path: 'carrier', name: 'carrier', meta: {code: 'xtpzgl-yhgl'}, component: carrier},
+		{path: 'addPidetailsTruckCalculateer', name: 'addPidetailsTruckCalculateer', meta: {code: 'xtpzgl-yhgl'}, component: addPidetailsTruckCalculateer},
+		{path: 'editCapacity/:capacityId', name: 'editCapacity', meta: {code: 'xtpzgl-yhgl'}, component: editCapacity},
+		{path: 'editCarDriver/:driverId', name: 'editCarDriver', meta: {code: 'xtpzgl-yhgl'}, component: editCarDriver},
+		{path: 'editCarrier/:carrierId', name: 'editCarrier', meta: {code: 'xtpzgl-yhgl'}, component: editCarrier},
+		{path: 'editGatepost/:gatepostId', name: 'editGatepost', meta: {code: 'xtpzgl-yhgl'}, component: editGatepost},
+		{path: 'editMaterial/:materialId', name: 'editMaterial', meta: {code: 'xtpzgl-yhgl'}, component: editMaterial},
+		{path: 'editOilPrice/:priceId', name: 'editOilPrice', meta: {code: 'xtpzgl-yhgl'}, component: editOilPrice},
+		{path: 'editPersonnel/:personnelId', name: 'editPersonnel', meta: {code: 'xtpzgl-yhgl'}, component: editPersonnel},
+		{path: 'editPier', name: 'editPier', meta: {code: 'xtpzgl-yhgl'}, component: editPier},
+		{path: 'editPortStorageYard', name: 'editPortStorageYard', meta: {code: 'xtpzgl-yhgl'}, component: editPortStorageYard},
+		{path: 'editRawMaterialManufacturer', name: 'editRawMaterialManufacturer', meta: {code: 'xtpzgl-yhgl'}, component: editRawMaterialManufacturer},
+		{path: 'editRawWarehouse/:warehouseId', name: 'editRawWarehouse', meta: {code: 'xtpzgl-yhgl'}, component: editRawWarehouse},
+		{path: 'editRmsShipper/:shipperId', name: 'editRmsShipper', meta: {code: 'xtpzgl-yhgl'}, component: editRmsShipper},
+		{path: 'editSupplier/:supplierId', name: 'editSupplier', meta: {code: 'xtpzgl-yhgl'}, component: editSupplier},
+		{path: 'editTruckCalculate', name: 'editTruckCalculate', meta: {code: 'xtpzgl-yhgl'}, component: editTruckCalculate},
+		{path: 'gatepost', name: 'gatepost', meta: {code: 'xtpzgl-yhgl'}, component: gatepost},
+		{path: 'material', name: 'material', meta: {code: 'xtpzgl-yhgl'}, component: material},
+		{path: 'oilPrice', name: 'oilPrice', meta: {code: 'xtpzgl-yhgl'}, component: oilPrice},
+		{path: 'personnel', name: 'personnel', meta: {code: 'xtpzgl-yhgl'}, component: personnel},
+		{path: 'pier', name: 'pier', meta: {code: 'xtpzgl-yhgl'}, component: pier},
+		{path: 'port', name: 'port', meta: {code: 'xtpzgl-yhgl'}, component: port},
+		{path: 'portStorageYard', name: 'portStorageYard', meta: {code: 'xtpzgl-yhgl'}, component: portStorageYard},
+		{path: 'rawMaterialManufacturer', name: 'rawMaterialManufacturer', meta: {code: 'xtpzgl-yhgl'}, component: rawMaterialManufacturer},
+		{path: 'rawWarehouse', name: 'rawWarehouse', meta: {code: 'xtpzgl-yhgl'}, component: rawWarehouse},
+		{path: 'rmsShipper', name: 'rmsShipper', meta: {code: 'xtpzgl-yhgl'}, component: rmsShipper},
+		{path: 'supplier', name: 'supplier', meta: {code: 'xtpzgl-yhgl'}, component: supplier},
+		{path: 'transitRoute', name: 'transitRoute', meta: {code: 'xtpzgl-yhgl'}, component: transitRoute},
+		{path: 'transitRouteAdd/:addup', name: 'transitRouteAdd', meta: {code: 'xtpzgl-yhgl'}, component: transitRouteAdd},
+		{path: 'truckCalculate', name: 'truckCalculate', meta: {code: 'xtpzgl-yhgl'}, component: truckCalculate},
+	  ]
+	}
+  ];
+  
+  const router = new Router({
+	routes: constantRouterMap
+  })
+  //  before
+  routerBefore(router, constantRouterMap);
+  
+  export default router;
+  //  constantRouterMap
+  export const routes = constantRouterMap;
+  

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

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+  <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>工业互联网平台</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>
+  </body>
+</html>

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

@@ -0,0 +1,86 @@
+// The Vue build version to load with the `import` command
+// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
+import Vue from 'vue';
+import App from '@/components/App.vue';
+// include
+import '@/config/include.js';
+
+// 通用store
+import store from '@/store/index.js';
+
+// router
+import router from './router/index.js';
+
+import VueApollo from 'vue-apollo'
+
+import apollo from '@/config/apolloConfig.js'
+
+// 关闭生产模式下给出的提示
+Vue.config.productionTip = false;
+
+Vue.use(VueApollo)
+
+// 注册表格的全局组件
+import DilCommonUI from "@/components/DilCommonUI";
+Vue.use(DilCommonUI);
+
+const apolloProvider = new VueApollo({
+    defaultClient: apollo
+})
+
+ //把时间戳改为正常可读的时间
+ export function renderTime(date) {
+  if(date !== null){
+      let dateee = new Date(date).toJSON();
+      return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, " ").replace(/\.[\d]{3}Z/, "");
+  }
+  return null;
+}
+//把毫秒数转换分
+export function getDuration(my_time) {
+  if(my_time !== null){
+      return Math.floor(my_time / 1000 / 60);
+  }
+  return null;
+}
+export function sjTime(orderPlanInTime) {
+  var stringTime = renderTime(orderPlanInTime);
+  var timestamp1 = stringTime.replace(/-/g, "/");
+  return new Date(timestamp1).getTime();
+}
+//验证电话号码
+export function VerifyPhoneNumber(Phone) {
+  var myreg=/^(13[0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\d{8}$/;
+  if (!myreg.test(Phone)) {
+      return false;
+  } else {
+      return true;
+  }
+}
+export function isNumber(value) {
+  //验证是否为数字
+  var patrn = /^(-)?\d+(\.\d+)?$/;
+  if (patrn.exec(value) == null || value == "") {
+    return false;
+  } else {
+    return true;
+  }
+}
+export function isIntegerNumber(value) {
+  //验证是否为整数
+  var patrn = /^\+?[1-9][0-9]*$/g;
+  if (patrn.exec(value) == null || value == "") {
+    return false;
+  } else {
+    return true;
+  }
+}
+/* eslint-disable no-new */
+new Vue({
+  el: '#app',
+  router,
+  store,
+  components: { App },
+  provide: apolloProvider.provide(),
+  template: '<App/>'
+});

+ 45 - 0
src/views/WMS/components/intrainst/intrainst_real.vue

@@ -0,0 +1,45 @@
+<template>
+  <!-- 在途实时库存 -->
+  <div class="homeworkPath">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+     <dilTable v-bind.sync="option">
+        <el-table-column>
+       </el-table-column>
+    </dilTable>
+  </div>
+</template>
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      option: {
+        // 表格请求数据的地址
+        // 查询钢材异地库出库展示列表数据
+        requestUrl: "/api/v1/wms/getWmspIntransitInventory?apiId=166",
+      },
+    };
+  },
+  mounted() {
+    
+  },
+  methods: {
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 56 - 0
src/views/WMS/components/offsite/offsite_check.vue

@@ -0,0 +1,56 @@
+//盘点
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+       <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-search"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getInventoryCheck?apiId=94",
+      },
+    }
+  },
+  methods:{
+     toInsert() {
+      this.$router.push("/insertCheckInventory");
+
+    },
+    onclick(){
+      console.log("点击事件");
+    }
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

+ 49 - 0
src/views/WMS/components/offsite/offsite_close.vue

@@ -0,0 +1,49 @@
+//结转
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getInventoryClose?apiId=95",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      console.log("点击事件");
+    }
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

+ 35 - 0
src/views/WMS/components/offsite/offsite_inbound.vue

@@ -0,0 +1,35 @@
+<template>
+  <!-- 异地库入库页面 -->
+  <div class="homeworkPath">
+     <dilTable v-bind.sync="option">
+        <el-table-column>
+       </el-table-column>
+    </dilTable>
+  </div>
+</template>
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      option: {
+        // 表格请求数据的地址
+        // 查询钢材异地库出库展示列表数据
+        requestUrl: "/api/v1/wms/getWmsOffsiteLibaryInboundList?apiId=165",
+      },
+    };
+  },
+  mounted() {
+    
+  },
+  methods: {
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 42 - 0
src/views/WMS/components/offsite/offsite_outbound.vue

@@ -0,0 +1,42 @@
+//出库
+<template>
+  <div class="steel_outbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getWmsOffsiteLibaryOutboundList?apiId=153",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      this.option.requestUrl="";
+    }
+  }
+}
+</script>
+
+<style lang="scss" scode>
+// @import '../../../styles/WMS/steel/steel_outbound.scss';
+</style>

+ 49 - 0
src/views/WMS/components/offsite/offsite_sendreceive.vue

@@ -0,0 +1,49 @@
+//收发存报表
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getSendReceive?apiId=97",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      console.log("点击事件");
+    }
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

+ 54 - 0
src/views/WMS/components/port_deposit/loadPortStock.vue

@@ -0,0 +1,54 @@
+<template>
+  <!-- 展示万州港港存库库存列表 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-autocomplete
+        popper-class="my-autocomplete"
+        v-model="state"
+        :fetch-suggestions="querySearch"
+        placeholder="请输入内容"
+        @select="handleSelect"
+      >
+      </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: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      state: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/wmsh/getLoadPortStockList?apiId=158",
+      },
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    handleSelect(item) {
+      console.log(item);
+    },
+    onclick() {
+      console.log(1);
+    },
+  },
+};
+
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 108 - 0
src/views/WMS/components/port_deposit/port_deposit_inbound.vue

@@ -0,0 +1,108 @@
+<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" @tab-click="handleClick">
+      <dilTable v-bind.sync="option1" ref="table">
+          <el-table-column fixed="right" align="center" label="操作" width="100">
+            <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>
+            </template>
+          </el-table-column>
+        </dilTable>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "inplantTMS",
+  data() {
+    return {
+      input: "",
+      Time: "",
+      activeName: "first",
+      option1: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/wmsh/getInBoundResult?apiId=157"
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      if(this.activeName == "first"){
+        // this.option1.requestUrl="/api/v1/truckTms/amstruckpurplans/getAllPurPlan/79?status=0&con=" + this.input;
+      }else{
+        // this.option2.requestUrl="/api/v1/truckTms/amstruckpurplans/getAllPurPlan/79?status=1&con=" + this.input;
+      }
+    },
+    handleClick(tab, event) {
+      console.log(tab, event);
+    },
+    // 删除
+    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/wmsh/deleteWareHosingResult/" + resultId
+            )
+            .then(() => {
+              this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+    //新增
+    insertClick() {
+      this.$router.push("/port_deposit_inbound_add/");
+    },
+    //修改
+    updateClick(resultId) {
+      console.log(resultId)
+      this.$router.push("/port_deposit_inbound_edit/" + resultId);
+    },
+
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+   .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 86 - 0
src/views/WMS/components/port_deposit/port_deposit_inbound_add.vue

@@ -0,0 +1,86 @@
+<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="228" 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 mes = {
+        batchId: this.form1.batchId,
+        portId: this.form1.portId,
+        resultMaterialNumber: this.form1.resultMaterialNumber
+      };
+      function isNumber() {
+        var value = mes.resultMaterialNumber;
+        //验证是否为数字
+        var patrn = /^(-)?\d+(\.\d+)?$/;
+        if (patrn.exec(value) == null || value == "") {
+          return false;
+        } else {
+          return true;
+        }
+      }
+      var val = this.value;
+      if (
+        mes.batchId==null||
+        mes.portId==null||
+        mes.resultMaterialNumber==null
+      ) this.$message.error("存在空值!");
+      else
+      if (!isNumber(val)) this.$message.error("物资吨位必须是数字!");
+      else
+      this.axios
+        .post("/api/v1/wmsh/addWarehousingResult", mes)
+        .then(() => {
+          this.$message({
+            type: "success",  
+            message: "新增成功!",
+          });
+          this.$router.go(-1);
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+
+</style>

+ 93 - 0
src/views/WMS/components/port_deposit/port_deposit_inbound_edit.vue

@@ -0,0 +1,93 @@
+<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="228" 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/wmsh/getResultById/" + this.$route.params.resultId)
+        .then((res) => {
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+          });
+        });
+    },
+     // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+     // 确认
+    onClickConfirm() {
+      let mes = {
+        resultId: this.$route.params.resultId,
+        batchId: this.form1.batchId,
+        portId: this.form1.portId,
+        resultMaterialNumber: this.form1.resultMaterialNumber
+      };
+      function isNumber() {
+        var value = mes.resultMaterialNumber;
+        //验证是否为数字
+        var patrn = /^(-)?\d+(\.\d+)?$/;
+        if (patrn.exec(value) == null || value == "") {
+          return false;
+        } else {
+          return true;
+        }
+      }
+      var val = this.value;
+      if (
+        mes.batchId==null||
+        mes.portId==null||
+        mes.resultMaterialNumber==null
+      ) this.$message.error("存在空值!");
+      else
+      if (!isNumber(val)) this.$message.error("物资件数必须是数字");
+      else
+      this.axios
+        .post("/api/v1/wms/wmshinboundresults/updateWareHosingResult", mes)
+        .then(() => {
+          this.$message({
+            type: "success",  
+            message: "修改成功!",
+          });
+          this.$router.go(-1);
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+
+</style>

+ 56 - 0
src/views/WMS/components/port_deposit/port_deposit_outbound.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>
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <dilTable v-bind.sync="option1" ref="table">
+        </dilTable>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "inplantTMS",
+  data() {
+    return {
+      input: "",
+      Time: "",
+      activeName: "first",
+      option1: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/wmsh/getOutBoundResult?apiId=159"
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      if(this.activeName == "first"){
+        // this.option1.requestUrl="/api/v1/truckTms/amstruckpurplans/getAllPurPlan/79?status=0&con=" + this.input;
+      }else{
+        // this.option2.requestUrl="/api/v1/truckTms/amstruckpurplans/getAllPurPlan/79?status=1&con=" + this.input;
+      }
+    },
+    handleClick(tab, event) {
+      console.log(tab, event);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+   .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 56 - 0
src/views/WMS/components/port_deposit/unloadPortStock.vue

@@ -0,0 +1,56 @@
+<template>
+  <!-- 下游港口港存库实时库存页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-autocomplete
+        popper-class="my-autocomplete"
+        v-model="state"
+        :fetch-suggestions="querySearch"
+        placeholder="请输入内容"
+        @select="handleSelect"
+      >
+      </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: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      state: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/wmsh/getUnloadPortStockList?apiId=158",
+      },
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    handleSelect(item) {
+      console.log(item);
+    },
+    onclick() {
+      console.log(1);
+    },
+    btnclick(pathId) {
+      this.$router.push("/path/addHomeworkPath/" + pathId);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

+ 212 - 0
src/views/WMS/components/steel/addTransfer.vue

@@ -0,0 +1,212 @@
+// 新增倒库单
+<template>
+    <div class="steel_restackAdd">
+        <div class="search">
+            <div class="warehouse">
+                <span>仓库名称:</span>
+                <el-select v-model="value1" placeholder="请选择" @change="onchange1()">
+                    <el-option
+                    v-for="(item,i) in options1"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="stack">
+                <span>垛位:</span>
+                <el-select v-model="value2" placeholder="请选择" @change ="onchange2()">
+                    <el-option
+                        v-for="(item,i) in options2"
+                        :key="i"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="gradationnumber">
+                <span>层次:</span>
+                <el-select v-model="value3" placeholder="请选择" @change="onchange3()">
+                    <el-option
+                    v-for="(item,i) in options3"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="newWarehouse">
+                <span>新仓库:</span>
+                <el-select v-model="value4" placeholder="请选择" @change="onchange4()">
+                    <el-option
+                    v-for="(item,i) in options1"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+            </div>
+        </div>
+        <div class="table" >
+            <dilTable v-bind.sync="options11"  @selection-change="selectionChange"></diltable>
+        </div>
+        <div class="button_box">
+            <el-button @click="cancel">取消</el-button>
+            <el-button type="primary" @click="onClickConfirm()">确定</el-button>
+        </div>
+    </div>  
+</template>
+
+<script>
+// import PageTitle from "@/components/Page/Title";
+export default {
+  data(){
+    return{
+      form1:{},
+      inputText:"",
+        options11:{
+        // first请求数据的地址
+      requestUrl: "/api/v1/wms/getWmspRestackMakeResultList?apiId=106",
+      selectionType: "select",
+      mapList:[]
+      },
+
+        //仓库
+        options1:[],
+        // 选中的仓库
+        value1:'',
+        // 垛位
+        options2:[],
+        // 选中垛位
+        value2:'',
+        // 层次
+        options3:[],
+        // 选中的层次
+        value3:'',
+        //新仓库
+        value4:'',
+        // 新增下拉框
+        // 垛位
+        options5:[],
+        // 选中垛位
+        value5:'',
+        inf: {}
+    }
+  },
+    mounted(){
+        this.initialization();
+        //新增下拉框方法
+        this.initialization1();
+    },
+     methods: {
+         //初始化选择仓库垛位
+     initialization(){
+         this.axios.get('/api/v1/wms/selectWarehouse').then((res)=>{
+             this.options1 = res.data.data
+             this.axios.post('/api/v1/wms/getWmspRestackMakeResultList?apiId=106',{
+                 warehouseid:this.value1
+             }) 
+         })
+     },
+     onchange1(){
+            console.log(1);
+            //  查询选中的仓库垛位
+             this.axios.get('/api/v1/wms/selectStackingId?warehouseid='+this.value1).then((res)=>{
+             this.options2 = res.data.data;
+             this.options5=res.data.data;
+             this.options11.requestUrl="/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid="+this.value1;
+             this.options.requestUrl = "/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid=" + this.value1;       
+         })
+     },
+     onchange2(){
+        if(this.value1 == ''){
+            this.$message({
+                message: '请选择仓库之后!再选择',
+                type: 'warning'
+            });
+            this.value2 = ''
+        }else{
+            this.options11.requestUrl="/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid="+this.value1+"&stackingId="+this.value2;        
+            //选择仓库层次号
+            this.axios.get('/api/v1/wms/selectGardationNumber?warehouseid='+this.value1+'&stackingId='+this.value2).then((res)=>{
+            this.options3 = res.data.data;          
+         })
+    }},
+    onchange3(){
+        if(this.value2 == ''||this.value1==''){
+            this.$message({
+                message: '请选择仓库和垛位之后!再选择',
+                type: 'warning'
+            });
+            this.value3 = ''
+        }else{
+            console.log(this.value1,this.value2)
+            this.options11.requestUrl="/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid="+this.value1 + 
+            "&stackingId="+this.value2+"&gradtionNumber="  + this.value3 
+        }
+    },
+     onclick(){
+      console.log("点击事件");
+     },
+       // 确认
+      onClickConfirm() {
+        let ivBoundResult = {
+            resultBeforeWarehouseId:this.value1,
+            resultAfterWarehouseId:this.value4,
+            mapList:this.mapList
+        };
+        console.log(ivBoundResult)
+       this.axios
+        .post("/api/v1/wms/addIvboundMakeResult", ivBoundResult)
+         .then((res) => {
+         if(res.data.code == 200){
+            this.$router.go(-1); 
+            this.$message({
+            type: "success",  
+            message: "新增成功!",
+           });
+         }
+         
+          
+        });
+    },
+    selectionChange(selection) {
+        this.mapList = selection
+        console.log(this.mapList)
+    },
+    
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang="scss" scode>
+.steel_restackAdd{
+    .search{
+        height: 5rem;
+        display: flex;
+        align-items:center;
+        padding-left:0.625rem;
+        .warehouse,.stack,.gradationnumber,newWarehouse{
+            margin-left: 1.25rem;
+        }
+    }
+    .form{
+        display: inline;
+        justify-content: center;
+        margin-left: 1.25rem;
+        
+    }
+    .button_box{
+        width: 90%;
+        position: fixed;
+        bottom: 1.25rem;
+        display: flex;
+        justify-content: center;
+    }
+}
+</style>

+ 136 - 0
src/views/WMS/components/steel/billOfLading.vue

@@ -0,0 +1,136 @@
+// 提货单
+<template>
+  <div class="billOfLading">
+    <div class="top">
+      <!-- 框计算 -->
+      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="tab">
+      <dilTable v-bind.sync="option" ref="table">
+        <el-table-column label="操作" fixed="right" width="200">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="detailclick(scope.row)">
+              物资详情
+            </el-button>
+            <el-button type="text" size="mini" @click="configure(scope.row.orderId)">
+              配置物资优先级
+            </el-button>
+          </template>
+        </el-table-column>
+        
+        <!-- 排队详情下拉框 -->
+        <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData" border >
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      inputText: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getSaleOrderOnQueue?apiId=227",
+      },
+      //记录旧的row对象
+      oldRow: "",
+      //记录上一个展开的点击次数,单数为展开状态,复数为闭合状态
+      oldRowCount: 1,
+      tableHead: [
+        {
+          prop: "materialName",
+          label: "物资名称",
+          width: 150,
+        },
+        {
+          prop: "specificationModel",
+          label: "规格型号",
+          width: 150,
+        },
+        {
+          prop: "orderMaterialNumber",
+          label: "物资件数",
+          width: 100,
+        },
+      ],
+      tableData: [],
+    };
+  },
+  methods: {
+    //   框计算
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getSaleOrderOnQueue?apiId=227&con=" + this.inputText;
+    },
+    // 查看物资详情
+    detailclick(row) {
+      // 记录重复点击次数
+      if (this.oldRow === row) {
+        this.oldRowCount += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow != "") {
+        if (this.oldRow != row) {
+          if (this.oldRowCount % 2 === 1) {
+            this.$refs.table.toggleRowExpansion(this.oldRow);
+          } else {
+            this.oldRowCount = 1;
+          }
+        } else {
+          this.oldRow = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow = row;
+      this.getMaterial(row.orderId);
+    },
+    // 根据运输订单id查询物资信息
+    getMaterial(orderId) {
+      this.axios
+        .get("api/v1/tms/getMaterial?orderId=" + orderId)
+        .then((res) => {
+          this.tableData = res.data.data;
+        });
+    },
+    // 跳转到配置物资优先顺序
+    configure(orderId){
+        this.$router.push("/billOfLadingAdd/"+orderId);
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+.billOfLading {
+  .top {
+    width: 100%;
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 2.5rem;
+  }
+}
+</style>

+ 352 - 0
src/views/WMS/components/steel/billOfLadingAdd.vue

@@ -0,0 +1,352 @@
+<template>
+  <div class="billOfLadingAdd">
+    <div class="top">
+      <div class="material">
+        <span> 物资名称: </span>
+        <el-select v-model="materialId" placeholder="请选择">
+          <el-option
+            v-for="item in materialOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+      <div class="Warehouse">
+        <span> 仓库: </span>
+        <el-select
+          v-model="WarehouseId"
+          placeholder="请选择"
+          @change="onChange"
+        >
+          <el-option
+            v-for="item in WarehouseOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+      <div class="platform">
+        <span> 月台: </span>
+        <!-- 可以选择 -->
+        <el-select v-if="disabled" v-model="platformId" placeholder="请选择">
+          <el-option
+            v-for="item in platformOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <!-- 不可选择 -->
+        <el-select v-else v-model="platformId" disabled placeholder="请选择">
+        </el-select>
+      </div>
+      <div class="btn">
+        <el-button type="primary" @click="ONclick">确认</el-button>
+      </div>
+    </div>
+    <div class="bottom">
+      <div class="table">
+        <el-table :data="tableData" border style="width: 100%">
+          <el-table-column
+            v-for="(item, i) in tableTop"
+            :key="i"
+            stripe="true"
+            :prop="item.prop"
+            :label="item.label"
+            :width="item.width"
+          >
+          </el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleDelete(scope.row.serialNumber)"
+                >删除</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                @click="topClick(scope.row.serialNumber)"
+                v-if="scope.row.serialNumber == 1"
+                disabled
+                >上移</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                @click="topClick(scope.row.serialNumber)"
+                v-else
+                >上移</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                @click="bottomClick(scope.row.serialNumber)"
+                v-if="scope.row.serialNumber == tableNun"
+                disabled
+                >下移</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                @click="bottomClick(scope.row.serialNumber)"
+                v-else
+                >下移</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div class="btn_bottom">
+      <el-button @click="open">返回</el-button>
+      <el-button type="primary" @click="addclick">提交</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      materialId: "",
+      WarehouseId: "",
+      platformId: "",
+      materialOptions: [],
+      WarehouseOptions: [],
+      platformOptions: [],
+      tableNun: 0,
+      materialOptionsnumber: 0,
+      disabled: false,
+      tableTop: [
+        {
+          prop: "serialNumber",
+          label: "序号",
+          width: "50",
+        },
+        {
+          prop: "material",
+          label: "物资名称",
+          width: "140",
+        },
+        {
+          prop: "ck",
+          label: "仓库",
+          width: "140",
+        },
+        {
+          prop: "yt",
+          label: "月台",
+          width: "140",
+        },
+      ],
+      tableData: [],
+    };
+  },
+  created() {
+    this.initialization();
+    this.getWarehouse();
+  },
+  methods: {
+    // 第一次进页面,根据运输订单号查询出所有的物资名称
+    initialization() {
+      this.axios
+        .get("/api/v1/tms/getOrderMaterial/" + this.$route.params.orderId)
+        .then((res) => {
+          if (res.data.code == "200") {
+            this.materialOptions = res.data.data;
+            this.materialOptionsnumber = this.materialOptions.length;
+          }
+        });
+      
+    },
+    // 查询所有仓库
+    getWarehouse() {
+      this.axios.get("/api/v1/tms/getUnloadPoint/1").then((res) => {
+        if (res.data.code == "200") {
+          this.WarehouseOptions = res.data.data;
+        }
+      });
+    }, // 返回
+    open() {
+      // debugger
+      if (this.materialOptionsnumber == 1) {
+        if (this.materialOptions.length == 0) {
+          this.prompt();
+        } else {
+          this.$router.push("/billOfLading");
+        }
+      } else if (this.materialOptionsnumber !== this.materialOptions.length) {
+        this.prompt();
+      } else {
+        this.$router.push("/billOfLading");
+      }
+    },
+    // 提示
+    prompt() {
+      this.$confirm("退出页面,数据将会清空!", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$router.push("/billOfLading");
+        })
+        .catch(() => {});
+    },
+    // 提交物资次序给后端
+    addclick() {
+      if (this.materialOptions.length == 0) {
+        this.axios
+          .post("/api/v1/tms/updateLoadingIdAndLoadSq", {
+            orderId: this.$route.params.orderId,
+            list: this.tableData,
+          })
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$message({
+                message: "提交成功!",
+                type: "success",
+              });
+              this.$router.push("/billOfLading");
+            }
+          });
+      } else {
+        this.$message({
+          message: "请选择完物资在提交!",
+          type: "warning",
+        });
+      }
+    },
+    // 点击确认后把选择框的数据添加到tableData
+    ONclick() {
+      if (this.materialId && this.WarehouseId && this.platformId) {
+        var materialName = null;
+        var WarehouseName = null;
+        var platformName = null;
+        this.materialOptions.forEach((e) => {
+          if (e.value == this.materialId) {
+            materialName = e.label;
+          }
+        });
+        this.WarehouseOptions.forEach((e) => {
+          if (e.value == this.WarehouseId) {
+            WarehouseName = e.label;
+          }
+        });
+        this.platformOptions.forEach((e) => {
+          if (e.value == this.platformId) {
+            platformName = e.label;
+          }
+        });
+        this.tableData.push({
+          serialNumber: this.tableData.length + 1,
+          materialId: this.materialId,
+          material: materialName,
+          WarehouseId: this.WarehouseId,
+          ck: WarehouseName,
+          platformId: this.platformId,
+          yt: platformName,
+        });
+        this.fornumber();
+        this.deletematerial();
+        this.materialId = "";
+        this.WarehouseId = "";
+        this.platformId = "";
+        this.disabled = false;
+      } else {
+        this.$message({
+          message: "请全部选择之后在确认!",
+          type: "warning",
+        });
+      }
+    },
+    // 选择仓库后,查询月台,
+    onChange() {
+      this.platformOptions = [];
+      this.axios
+        .get("/api/v1/tms/getPlatformIdByWarehouse/" + this.WarehouseId)
+        .then((res) => {
+          if (res.data.code == "200") {
+            this.platformOptions = res.data.data;
+            console.log(this.platformOptions.length);
+            if (this.platformOptions.length !== 0) {
+              this.disabled = true;
+            }
+          }
+        });
+    },
+    //   上移
+    topClick(index) {
+      var kong = {};
+      kong = this.tableData[index - 2];
+      this.tableData[index - 2] = this.tableData[index - 1];
+      this.tableData[index - 1] = kong;
+      this.fornumber();
+    },
+    //   下移
+    bottomClick(index) {
+      var kong = {};
+      kong = this.tableData[index];
+      this.tableData[index] = this.tableData[index - 1];
+      this.tableData[index - 1] = kong;
+      this.fornumber();
+    },
+    //   删除当前
+    handleDelete(index) {
+      this.materialOptions.push({
+        value:this.tableData[index-1].materialId,
+        label:this.tableData[index-1].material
+      })
+      this.tableData.splice(index - 1, 1);
+      this.fornumber();
+    },
+    //使serialNumber 的值永远比下标多一
+    fornumber() {
+      this.tableNun = this.tableData.length;
+      for (var i = 0; i < this.tableData.length; i++) {
+        this.tableData[i].serialNumber = i + 1;
+      }
+    },
+    // 移除选过的物资
+    deletematerial() {
+      for (var i = 0; i < this.materialOptions.length; i++) {
+        if (this.materialOptions[i].value == this.materialId) {
+          this.materialOptions.splice(i, 1);
+        }
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.billOfLadingAdd {
+  .top {
+    width: 100%;
+    height: 6.25rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .bottom {
+    width: 37.5rem;
+    margin: auto;
+    padding-top: 3.125rem;
+  }
+  .btn_bottom {
+    width: 100%;
+    position: absolute;
+    bottom: 0px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
+</style>

+ 260 - 0
src/views/WMS/components/steel/editSteel_restack.vue

@@ -0,0 +1,260 @@
+//修改倒垛作业
+<template>
+    <div class="steel_restackEdit">
+        <div class="search">
+            <div class="warehouse">
+                <span>仓库名称:</span>
+                <el-select v-model="value1" placeholder="请选择" @change="onchange1()">
+                    <el-option
+                    v-for="(item,i) in options1"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="stack">
+                <span>垛位:</span>
+                <el-select v-model="value2" placeholder="请选择" @change ="onchange2()">
+                    <el-option
+                        v-for="(item,i) in options2"
+                        :key="i"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="gradationnumber">
+                <span>层次:</span>
+                <el-select v-model="value3" placeholder="请选择" @change="onchange3()">
+                    <el-option
+                    v-for="(item,i) in options3"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+            </div>
+        </div>
+        <div class="table" >
+            <dilTable v-bind.sync="options11"  @selection-change="selectionChange"></diltable>
+        </div>
+            <div class="search">
+            <div class="warehouse">
+                <span>仓库名称:</span>
+                <el-select v-model="value4" disabled  placeholder="请选择" @change="onchange4()">
+                    <el-option
+                    v-for="(item,i) in options4"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="stack">
+                <span>垛位:</span>
+                <el-select v-model="value5" placeholder="请选择" @change ="onchange5()">
+                    <el-option
+                        v-for="(item,i) in options5"
+                        :key="i"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+     
+        </div>
+         <div class="table">
+            <dilTable v-bind.sync="options" ></diltable>
+        </div>
+        <div class="button_box">
+            <el-button @click="cancel">取消</el-button>
+            <el-button type="primary" @click="onClickConfirm">确定</el-button>
+        </div>
+    </div>  
+</template>
+
+<script>
+// import PageTitle from "@/components/Page/Title";
+export default {
+  data(){
+    return{
+      form1:{},
+      inputText:"",
+        options11:{
+        // first请求数据的地址
+      requestUrl: "/api/v1/wms/getWmspRestackMakeResultList?apiId=106",
+      selectionType: "select",
+      },
+      options:{
+        // first请求数据的地址
+      requestUrl: "/api/v1/wms/getWmspRestackMakeResultList?apiId=106",
+      },
+        //仓库
+        options1:[],
+        // 选中的仓库
+        value1:'',
+        // 垛位
+        options2:[],
+        // 选中垛位
+        value2:'',
+        // 层次
+        options3:[],
+        // 选中的层次
+        value3:'',
+        // 新增下拉框
+        //仓库
+        options4:[],
+        // // 选中的仓库
+        value4:'',
+        // 垛位
+        options5:[],
+        // 选中垛位
+        value5:'',
+        inf: {}
+    }
+  },
+    mounted(){
+        this.initialization();
+        this.information();
+    },
+     methods: {
+
+   information() {
+      this.axios
+        .post("/api/v1/wms/selectAfterstackingByResultId/" + this.$route.params.resultId)
+        .then((res) => {
+          console.log(res.data.data);
+
+        });
+    },
+     initialization(){
+         this.axios.get('/api/v1/wms/selectWarehouse').then((res)=>{
+             this.options1 = res.data.data
+         })
+     },
+     onchange1(){
+            console.log(1);
+            //  查询选中的仓库垛位
+             this.axios.get('/api/v1/wms/selectStackingId?warehouseid='+this.value1).then((res)=>{
+             this.options2 = res.data.data;
+             this.options5=res.data.data;
+             this.axios.post('/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid='+this.value1)
+             
+         })
+     },
+     onchange2(){
+        if(this.value1 == ''){
+            this.$message({
+                message: '请选择仓库之后!再选择',
+                type: 'warning'
+            });
+            this.value2 = ''
+        }else{
+            this.axios.post('/api/v1/wms/getWmspRestackMakeResultList?apiId=106'+this.value1)
+        }   
+            //选择仓库层次号
+            this.axios.get('/api/v1/wms/selectGardationNumber?warehouseid='+this.value1+'&stackingId='+this.value2).then((res)=>{
+             this.options3 = res.data.data;
+            this.axios.post('/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid='+this.value1+'&stackingId=')
+         })
+    },
+    onchange3(){
+        if(this.value2 == ''||this.value1==''){
+            this.$message({
+                message: '请选择仓库和垛位之后!再选择',
+                type: 'warning'
+            });
+            this.value3 = ''
+
+        }else{
+            this.axios.post('/api/v1/wms/getWmspRestackMakeResultList?apiId=106'+this.value1 +this.value2 )
+        }
+    },
+  
+         onchange4(){
+         console.log(1);
+        //  查询选中的仓库垛位
+             this.axios.get('/api/v1/wms/selectStackingId?warehouseid='+this.value1).then((res)=>{
+              console.log( this.options5 = res.data.data)
+             this.axios.post('/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid='+this.value1)
+         })
+     },
+     onchange5(){     
+             this.axios.post('/api/v1/wms/getWmspRestackMakeResultList?apiId=106'+this.value1)
+            //选择仓库层次号
+             this.axios.get('/api/v1/wms/selectGardationNumber?warehouseid='+this.value1+'&stackingId='+this.value5).then((res)=>{
+             this.options6 = res.data.data;
+             this.axios.post('/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid='+this.value1 +'&stackingId=')
+         })
+    },
+
+     onclick(){
+      console.log("点击事件");
+     },
+       // 确认
+      onClickConfirm() { 
+        console.log(this.inf,"inf");
+       let wmspRestackMakeResult = {
+       //倒垛后的垛位id    
+       afterStackingId:this.value5,
+       //倒垛后的层次id
+       afterWarehouseId:this.value1, 
+       //实绩id
+       resultId:this.inf[0].resultId,
+      };
+       console.log(wmspRestackMakeResult,"aaaa");
+       this.axios
+        .post("/api/v1/wms/editRestackMakeResult/", wmspRestackMakeResult)
+         .then(() => {
+         this.$message({
+            type: "success",  
+         message: "修改成功!",
+           });
+          this.$router.go(-1);
+        });
+    },
+    selectionChange(row) {
+      console.log("当前选中行的数据:");
+      console.log(row);
+      this.inf = row;
+      console.log(this.inf);
+    },
+    
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang="scss" scode>
+.steel_restackEdit{
+    .search{
+        height: 5rem;
+        display: flex;
+        align-items:center;
+        padding-left:0.625rem;
+        .warehouse,.stack,.gradationnumber{
+            margin-left: 1.25rem;
+        }
+    }
+    .form{
+        display: inline;
+        justify-content: center;
+        margin-left: 1.25rem;
+        
+    }
+    .button_box{
+        width: 90%;
+        position: fixed;
+        bottom: 1.25rem;
+        display: flex;
+        justify-content: center;
+    }
+}
+</style>

+ 41 - 0
src/views/WMS/components/steel/inboundDetails.vue

@@ -0,0 +1,41 @@
+//查看入库详情
+<template>
+	<div id="endMaintenance">
+		<page-title>入库详情</page-title>
+    <div class="main">
+			<span class="text">扫描实绩详情</span>
+			<span class="a"></span>
+		</div>
+    <dilTable v-bind.sync="first" >
+		</dilTable>
+	</div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+// import { sjTime } from "@/js/sharedJsFile";
+export default {
+  components: {
+    PageTitle,
+  },
+  data() {
+    return {
+      form: {},
+      first:{
+       requestUrl: "/api/v1/wms/selectScanResultByIboundResultId?apiId=373&inboundId="+this.$route.params.inboundId,
+      },
+    };
+  },
+  mounted() {
+    // this.information();
+  },
+
+  methods: {
+    
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+
+</style>

+ 62 - 0
src/views/WMS/components/steel/insertCheckInventory.vue

@@ -0,0 +1,62 @@
+<template>
+  <div id="endMaintenance">
+    <page-title>库存盘点录入</page-title>
+    <div class="main">
+      <span class="text">新增信息</span>
+      <span class="a"></span>
+    </div>
+    <div class="body">
+      <div class="form-box">
+        <dil-form :formId="232" v-model="form1" ></dil-form>
+      </div>
+    </div>
+    <div class="button-box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确认</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+      value: undefined,
+    };
+  },
+  mounted() {},
+  methods: {
+    // 确定
+    makeSure() {
+      let inventoryCheck = {
+        warehouseId: this.form1.warehouseId,
+        materialId: this.form1.materialId,
+        totalBookNumber: this.form1.bookTotalNumber,
+        
+      };
+      console.log(inventoryCheck)
+      this.axios
+        .post(
+          "/api/v1/wms/inventoryCheck/inventoryCheck",
+          inventoryCheck
+        )
+        .then((res) => {
+          console.log(res);
+          console.log(this.form1);
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+
+</style>

+ 0 - 0
src/views/WMS/components/steel/insertTransfer.vue


+ 56 - 0
src/views/WMS/components/steel/steel_check.vue

@@ -0,0 +1,56 @@
+//盘点
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+       <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-search"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getInventoryCheck?apiId=94",
+      },
+    }
+  },
+  methods:{
+     toInsert() {
+      this.$router.push("/insertCheckInventory");
+
+    },
+    onclick(){
+      console.log("点击事件");
+    }
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

+ 49 - 0
src/views/WMS/components/steel/steel_close.vue

@@ -0,0 +1,49 @@
+//结转
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getInventoryClose?apiId=95",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      console.log("点击事件");
+    }
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

+ 60 - 0
src/views/WMS/components/steel/steel_inbound.vue

@@ -0,0 +1,60 @@
+//入库
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="150">
+								<template slot-scope="scope">
+									<el-button type="text" size="mini" @click="inboundDetails(scope)">
+										详情
+									</el-button>
+								</template>
+							</el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getWmsInboundResult?apiId=371",
+      },
+    }
+  },
+  methods:{
+    inboundDetails(scope){
+      	this.$router.push("/inboundDetails/" + scope.row.inboundId)
+      	
+    },
+    onclick(){
+      console.log("点击事件");
+    }
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

+ 42 - 0
src/views/WMS/components/steel/steel_outbound.vue

@@ -0,0 +1,42 @@
+//出库
+<template>
+  <div class="steel_outbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getWmspOutboundResult?apiId=152",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      this.option.requestUrl="/api/v1/wms/getWmspOutboundResult/152?con="+this.inputText;
+    },
+  }
+}
+</script>
+
+<style lang="scss" scode>
+// @import '../../../styles/WMS/steel/steel_outbound.scss';
+</style>

+ 50 - 0
src/views/WMS/components/steel/steel_real.vue

@@ -0,0 +1,50 @@
+<template>
+<!-- 实时库存 -->
+  <div class="steel_real">
+    		<div class="sache">
+			<el-input placeholder="请输入内容" v-model="inputText" clearable>
+			</el-input>
+			<el-button type="primary" class="btn" @click="onClick">
+				<i class="el-icon-search"></i>查询
+			</el-button>
+		</div>
+  <dilTable v-bind.sync="option">
+      <el-table-column fixed="right" label="操作" width="110">
+        <template slot-scope="scope">
+          <el-button @click="demotionClick(scope.row.gridId)" type="text" size="small"
+            >物资不合格</el-button
+          >
+        </template>
+      </el-table-column>
+    </dilTable>
+    </div>
+</template>
+
+
+
+<script>
+export default {
+ name:"steel_real",
+data(){
+   return {
+     inputText:"",
+     option: {
+      requestUrl: "/api/v1/wms/selectGridMaterialList?apiId=167",
+      },
+    };
+  },
+  mounted(){
+
+  },
+  methods:{
+    demotionClick(gridId){
+      this.$router.push("/steel_realDown/" + gridId);
+    }
+  },
+};
+</script>
+<style lang="scss" scode>
+.steel_real {
+    padding: 1.25rem 1.875rem;
+}
+</style>

+ 80 - 0
src/views/WMS/components/steel/steel_realDown.vue

@@ -0,0 +1,80 @@
+<template>
+<!-- 实时库存 -->
+  <div class="steel_real">
+    <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="308" v-model="form1"></dil-form>
+        </div>
+      </div>
+    
+    <div class="button-box">
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+      <el-button @click="onClickCancel">返回</el-button>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+ name:"steel_real",
+data(){
+   return {
+     form1:{},
+     option: {
+      requestUrl: "/api/v1/wms/selectGridMaterialListByGridId?apiId=155&gridId="+this.$route.params.gridId,
+      },
+    };
+  },
+  mounted(){
+    this.information();
+  },
+  methods:{
+    information() {
+      //渲染数据
+      this.axios
+        .post(
+          "api/v1/wms/selectGridMaterialListByGridId?gridId=" +
+            this.$route.params.gridId
+        )
+        .then((res) => {
+            console.log(res.data.data)
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      let map = {
+        gridId: this.$route.params.gridId,
+        materialQualified: this.form1.materialQualified,
+      };
+      if (
+        map.materialQualified == null
+      )
+        this.$message.error("必填项存在空值!");
+      else
+        this.axios
+          .post(
+            "/api/v1/wms/updateRmsMaterialSteelDemotion",
+            map
+          )
+          .then((res) => {
+              console.log("res.data",res.data)
+            if (res.data.code == "200") {
+              this.$router.go(-1);
+            }
+          });
+    },
+  },
+};
+</script>
+<style lang="scss" scode>
+
+.steel_real {
+    padding: 1.25rem 1.875rem;
+}
+</style>

+ 49 - 0
src/views/WMS/components/steel/steel_rebound.vue

@@ -0,0 +1,49 @@
+//退库
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getWmsReboundResult?apiId=161",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      console.log("点击事件");
+    }
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

+ 156 - 0
src/views/WMS/components/steel/steel_restack.vue

@@ -0,0 +1,156 @@
+// 倒垛
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+       <el-button type="primary" class="btn" @click="Addclick">
+         <i class="el-icon-circle-plus-outline"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options"> 
+      </dilTable>
+    </div>
+      <template>
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="待下发" name="first">
+            <dilTable v-bind.sync="first">
+              <el-table-column label="操作" fixed="right" width="120">
+                <template slot-scope="scope">
+                  <el-button type="text" size="mini" @click="Issued(scope.row.resultId)">
+                    下发
+                  </el-button>
+                    <el-button type="text" size="mini" @click="deleteclick(scope.row.resultId)">
+                     删除
+                   </el-button>
+                   <el-button type="text" size="mini"   @click="editclick(scope.row.resultId)">
+                     修改
+                   </el-button>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+          <el-tab-pane label="已下发" name="second">
+            <dilTable v-bind.sync="second">    
+            </dilTable>
+          </el-tab-pane>     
+        </el-tabs>
+      </template>
+    </div>
+  </div>
+</template>
+<script>
+// import { first, values } from "xe-utils";
+export default {
+  data() {
+    return {
+      state: "",
+      inputText:"",
+      first: {
+        // 未分配地址
+        requestUrl:
+          "/api/v1/wms/selectRestackList?apiId=370&DistrubtionStatus=0",
+      },
+      second: {
+        // second请求数据的地址
+        requestUrl:
+          "/api/v1/wms/selectRestackList?apiId=370&DistrubtionStatus=1",
+      },
+      //默认显示待下发的标签页
+      activeName: "first",
+    };
+  },
+  methods: {
+    onclick() {
+       if(this.activeName == "first"){
+        this.option1.requestUrl = "/api/v1/wms/selectRestackList?apiId=119&DistrubtionStatus=0&con=" + this.inputText;
+      }else{
+        this.option2.requestUrl = "/api/v1/wms/selectRestackList?apiId=119&DistrubtionStatus=0&con=" + this.inputText;
+      }
+     
+    },
+    Addclick() {
+      this.$router.push("/steel_restackAdd");
+    },
+    //删除方法
+    deleteclick(scope) {
+      let resultId = scope;
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+          this.axios
+            .post(
+              "/api/v1/wms/deleteByResultId/" + resultId
+            )
+            .then(() => {
+              this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+    //  handleClick(tab, event) {
+    //     console.log(tab, event);
+
+    //   },
+    //根据id进行修改
+    editclick(resultId) {
+      this.$router.push("/editSteel_restack/" + resultId);
+    },
+    handleClick(tab, event) {
+      console.log(tab, event);
+    },
+    Issued(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/wms/dispatchDistrubtionStatus/" +
+                resultId
+            )
+            .then(() => {
+              this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消下发!",
+          });
+        });
+    },
+  },
+};
+</script>
+<style lang="scss"scode>
+
+</style>

+ 302 - 0
src/views/WMS/components/steel/steel_restackAdd.vue

@@ -0,0 +1,302 @@
+// 新增倒垛作业
+<template>
+    <div class="steel_restackAdd">
+        <div class="search">
+            <div class="warehouse">
+                <span>仓库名称:</span>
+                <el-select v-model="value1" placeholder="请选择" @change="onchange1()">
+                    <el-option
+                    v-for="(item,i) in options1"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="stack">
+                <span>垛位:</span>
+                <el-select v-model="value2" placeholder="请选择" @change ="onchange2()">
+                    <el-option
+                        v-for="(item,i) in options2"
+                        :key="i"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="gradationnumber">
+                <span>层次:</span>
+                <el-select v-model="value3" placeholder="请选择" @change="onchange3()">
+                    <el-option
+                    v-for="(item,i) in options3"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+            </div>
+        </div>
+        <div class="table" >
+            <dilTable v-bind.sync="options11"  @selection-change="selectionChange"></diltable>
+        </div>
+            <div class="search">
+            <div class="warehouse">
+                <span>仓库名称:</span>
+                <el-select v-model="value1" disabled  placeholder="请选择" @change="onchange4()">
+                    <el-option
+                    v-for="(item,i) in options1"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="stack">
+                <span>垛位:</span>
+                <el-select v-model="value5" placeholder="请选择" @change ="onchange5()">
+                    <el-option
+                        v-for="(item,i) in options5"
+                        :key="i"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+     
+        </div>
+         <div class="table">
+            <dilTable v-bind.sync="options" ></diltable>
+        </div>
+        <div class="button_box">
+            <el-button @click="cancel">取消</el-button>
+            <el-button type="primary" @click="onClickConfirm()">确定</el-button>
+        </div>
+    </div>  
+</template>
+
+<script>
+// import PageTitle from "@/components/Page/Title";
+export default {
+  data(){
+    return{
+      form1:{},
+      inputText:"",
+        options11:{
+        // first请求数据的地址
+      requestUrl: "/api/v1/wms/getWmspRestackMakeResultList?apiId=106",
+      selectionType: "select",
+      },
+      options:{
+        // first请求数据的地址
+      requestUrl: "/api/v1/wms/getWmspRestackMakeResultList?apiId=106",
+      },
+        //仓库
+        options1:[],
+        // 选中的仓库
+        value1:'',
+        // 垛位
+        options2:[],
+        // 选中垛位
+        value2:'',
+        // 层次
+        options3:[],
+        // 选中的层次
+        value3:'',
+        // 新增下拉框
+        // 垛位
+        options5:[],
+        // 选中垛位
+        value5:'',
+        inf: {}
+    }
+  },
+    mounted(){
+        this.initialization();
+        //新增下拉框方法
+        this.initialization1();
+    },
+     methods: {
+         //初始化选择仓库垛位
+     initialization(){
+         this.axios.get('/api/v1/wms/selectWarehouse').then((res)=>{
+             this.options1 = res.data.data
+             this.axios.post('/api/v1/wms/getWmspRestackMakeResultList?apiId=106',{
+                 warehouseid:this.value1
+             }) 
+         })
+     },
+     onchange1(){
+            console.log(1);
+            //  查询选中的仓库垛位
+             this.axios.get('/api/v1/wms/selectStackingId?warehouseid='+this.value1).then((res)=>{
+             this.options2 = res.data.data;
+             this.options5=res.data.data;
+             this.options11.requestUrl="/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid="+this.value1;
+             this.options.requestUrl = "/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid=" + this.value1;       
+         })
+     },
+     onchange2(){
+        if(this.value1 == ''){
+            this.$message({
+                message: '请选择仓库之后!再选择',
+                type: 'warning'
+            });
+            this.value2 = ''
+        }else{
+            console.log('-----')
+            console.log(this.value2)
+            this.options11.requestUrl="/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid="+this.value1+"&stackingId="+this.value2;        
+            //选择仓库层次号
+            this.axios.get('/api/v1/wms/selectGardationNumber?warehouseid='+this.value1+'&stackingId='+this.value2).then((res)=>{
+            this.options3 = res.data.data;
+            
+            
+         })
+    }},
+    onchange3(){
+        if(this.value2 == ''||this.value1==''){
+            this.$message({
+                message: '请选择仓库和垛位之后!再选择',
+                type: 'warning'
+            });
+            this.value3 = ''
+
+        }else{
+            console.log(this.value1,this.value2)
+            this.options11.requestUrl="/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid="+this.value1 + 
+            "&stackingId="+this.value2+"&gradtionNumber="  + this.value3 
+        }
+    },
+  
+       onchange4(){
+        //  console.log(1);
+        //  查询选中的仓库垛位
+             this.axios.get('/api/v1/wms/selectStackingId?warehouseid='+this.value1).then((res)=>{
+              console.log( this.options5 = res.data.data)
+            //  this.options5 = res.data.data;
+            
+             this.axios.post('/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid='+this.value1)
+         })
+     },
+     onchange5(){
+             this.options.requestUrl = "/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid="+this.value1+"&stackingId="+this.value5;    
+       
+            
+    },
+
+     onclick(){
+      console.log("点击事件");
+     },
+
+       // 确认
+      onClickConfirm() {
+         //console.log("inf",this.inf);
+        let wmspRestackMakeResult={
+            //垛位id    
+            stackingId:this.inf[0].stackingId,
+            //层次    
+            // gridGradationNumber:that.value3,
+            //倒垛前网格id    
+            GridId:this.inf[0].GridId,
+            //仓库id    
+            warehouseid:this.value1,
+            //倒垛后的垛位id    
+            stackingId1:this.value5,
+            //倒垛后的层次id
+            // gridGradationNumber1:that.value6, 
+        };
+        //初始化maplist
+        var maplist=[];
+        this.inf.forEach((item,i)=>{
+            //初始化mapItem
+            var mapItem={
+                //物资编码
+                materialCode:"",
+                //物资炉号    
+                materialFurnaceNumber:"",
+                // 物资理重
+                materialTheoreticalWeight:0,
+                //物资名称    
+                materialName:"",
+                //物资件数   
+                makeMaterialNumber:0,
+                //物资id    
+                materialId:0,
+            };
+            mapItem.materialCode=item.materialCode;
+            mapItem.materialFurnaceNumber=item.materialFurnaceNumber;
+            mapItem.materialTheoreticalWeight=item.materialTheoreticalWeight;
+            mapItem.materialName=item.materialName;
+            mapItem.makeMaterialNumber=item.makeMaterialNumber;
+            mapItem.materialId=item.materialId;
+            maplist.push(mapItem);
+        });
+      
+       let map = {
+       wmspRestackMakeResult : wmspRestackMakeResult,
+       maplist: maplist
+      };
+        console.log(map)
+        // console.log("map",map);
+
+       this.axios
+        .post("/api/v1/wms/addRestackMakeResult/", map)
+         .then((res) => {
+         if(res.data.code == 200){
+                this.$router.push("/steel_restack")
+               this.$message({
+            type: "success",  
+            message: "新增成功!",
+           });
+         }
+         
+       
+          
+        });
+    },
+    selectionChange(row) {
+      console.log("当前选中行的数据:");
+      console.log(row);
+      this.inf = row;
+      console.log(this.inf);
+    },
+    
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang="scss" scode>
+.steel_restackAdd{
+    .search{
+        height: 5rem;
+        display: flex;
+        align-items:center;
+        padding-left:0.625rem;
+        .warehouse,.stack,.gradationnumber{
+            margin-left: 1.25rem;
+        }
+    }
+
+
+    .form{
+        display: inline;
+        justify-content: center;
+        margin-left: 1.25rem;
+        
+    }
+    .button_box{
+        width: 90%;
+        position: fixed;
+        bottom: 1.25rem;
+        display: flex;
+        justify-content: center;
+    }
+}
+</style>

+ 49 - 0
src/views/WMS/components/steel/steel_sendreceive.vue

@@ -0,0 +1,49 @@
+//收发存报表
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getSendReceive?apiId=97",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      console.log("点击事件");
+    }
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

+ 101 - 0
src/views/WMS/components/steel/steel_transfer.vue

@@ -0,0 +1,101 @@
+//倒库
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+       <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="240">
+          <template slot-scope="scope">
+             <el-button type="text" size="mini" @click="selectContract(scope)">
+              查看
+            </el-button>
+            <el-button type="text" size="mini" @click="deleted(scope)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getIvboundMakeResultList?apiId=372",
+      },
+    }
+  },
+  methods:{
+     toInsert() {
+      this.$router.push("/addTransfer");
+    },
+    onclick(){
+      console.log("点击事件");
+    },
+    deleted(scope){   
+      console.log(scope.row)
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+      .then(() => {
+      this.axios
+            .post(
+              "/api/v1/wms/deleteIvboundMakeResult/" + scope.row.resultId
+            )
+            .then((res) => {
+              if(res.data.code == 200){   
+            this.$message({
+            type: "success",
+            message: "删除成功!",
+                          });
+          this.$router.go(0);
+            }else {
+									this.$message({
+										message: "删除失败",
+										type: "warning",
+									});
+								}
+              
+            })
+     })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    }
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

+ 90 - 0
src/views/WMS/router/index.js

@@ -0,0 +1,90 @@
+import Vue from 'vue'
+import Router from 'vue-router'
+
+import routerBefore from '@/config/routerBefore.js'
+// 主要
+import main from '@/components/main.vue'
+// 系统配置管理
+import intrainst_real from '../components/intrainst/intrainst_real.vue'
+import offsite_check from '../components/offsite/offsite_check.vue'
+import offsite_close from '../components/offsite/offsite_close.vue'
+import offsite_inbound from '../components/offsite/offsite_inbound.vue'
+import offsite_outbound from '../components/offsite/offsite_outbound.vue'
+import offsite_sendreceive from '../components/offsite/offsite_sendreceive.vue'
+import loadPortStock from '../components/port_deposit/loadPortStock.vue'
+import port_deposit_inbound_add from '../components/port_deposit/port_deposit_inbound_add.vue'
+import port_deposit_inbound_edit from '../components/port_deposit/port_deposit_inbound_edit.vue'
+import port_deposit_inbound from '../components/port_deposit/port_deposit_inbound.vue'
+import port_deposit_outbound from '../components/port_deposit/port_deposit_outbound.vue'
+import unloadPortStock from '../components/port_deposit/unloadPortStock.vue'
+import addTransfer from '../components/steel/addTransfer.vue'
+import billOfLading from '../components/steel/billOfLading.vue'
+import billOfLadingAdd from '../components/steel/billOfLadingAdd.vue'
+import editSteel_restack from '../components/steel/editSteel_restack.vue'
+import inboundDetails from '../components/steel/inboundDetails.vue'
+import insertCheckInventory from '../components/steel/insertCheckInventory.vue'
+import insertTransfer from '../components/steel/insertTransfer.vue'
+import steel_check from '../components/steel/steel_check.vue'
+import steel_close from '../components/steel/steel_close.vue'
+import steel_inbound from '../components/steel/steel_inbound.vue'
+import steel_outbound from '../components/steel/steel_outbound.vue'
+import steel_real from '../components/steel/steel_real.vue'
+import steel_realDown from '../components/steel/steel_realDown.vue'
+import steel_rebound from '../components/steel/steel_rebound.vue'
+import steel_restack from '../components/steel/steel_restack.vue'
+import steel_restackAdd from '../components/steel/steel_restackAdd.vue'
+import steel_sendreceive from '../components/steel/steel_sendreceive.vue'
+import steel_transfer from '../components/steel/steel_transfer.vue'
+Vue.use(Router)
+const constantRouterMap = [
+	{
+	  path: '/',
+	  name: 'main',
+	  meta: {title: '首页', code: 'xtpzgl'},
+	  component: main,
+	  redirect: {name: 'intrainst_real'},
+	  children: [
+		{path: 'intrainst_real', name: 'intrainst_real', meta: {code: 'xtpzgl-jggl'}, component: intrainst_real},
+		{path: 'offsite_check', name: 'offsite_check', meta: {code: 'xtpzgl-yhgl'}, component: offsite_check},
+		{path: 'offsite_close', name: 'offsite_close', meta: {code: 'xtpzgl-yhgl'}, component: offsite_close},
+		{path: 'offsite_inbound', name: 'offsite_inbound', meta: {code: 'xtpzgl-yhgl'}, component: offsite_inbound},
+		{path: 'offsite_outbound', name: 'offsite_outbound', meta: {code: 'xtpzgl-yhgl'}, component: offsite_outbound},
+		{path: 'offsite_sendreceive', name: 'offsite_sendreceive', meta: {code: 'xtpzgl-yhgl'}, component: offsite_sendreceive},
+		{path: 'loadPortStock', name: 'loadPortStock', meta: {code: 'xtpzgl-yhgl'}, component: loadPortStock},
+		{path: 'port_deposit_inbound_add', name: 'port_deposit_inbound_add', meta: {code: 'xtpzgl-yhgl'}, component: port_deposit_inbound_add},
+		{path: 'port_deposit_inbound_edit/:resultId', name: 'port_deposit_inbound_edit', meta: {code: 'xtpzgl-yhgl'}, component: port_deposit_inbound_edit},
+		{path: 'port_deposit_inbound', name: 'port_deposit_inbound', meta: {code: 'xtpzgl-yhgl'}, component: port_deposit_inbound},
+		{path: 'port_deposit_outbound', name: 'port_deposit_outbound', meta: {code: 'xtpzgl-yhgl'}, component: port_deposit_outbound},
+		{path: 'unloadPortStock', name: 'unloadPortStock', meta: {code: 'xtpzgl-yhgl'}, component: unloadPortStock},
+		{path: 'addTransfer', name: 'addTransfer', meta: {code: 'xtpzgl-yhgl'}, component: addTransfer},
+		{path: 'billOfLading', name: 'billOfLading', meta: {code: 'xtpzgl-yhgl'}, component: billOfLading},
+		{path: 'billOfLadingAdd/:orderId', name: 'billOfLadingAdd', meta: {code: 'xtpzgl-yhgl'}, component: billOfLadingAdd},
+		{path: 'editSteel_restack/:resultId', name: 'editSteel_restack', meta: {code: 'xtpzgl-yhgl'}, component: editSteel_restack},
+		{path: 'inboundDetails/:inboundId', name: 'inboundDetails', meta: {code: 'xtpzgl-yhgl'}, component: inboundDetails},
+		{path: 'insertCheckInventory', name: 'insertCheckInventory', meta: {code: 'xtpzgl-yhgl'}, component: insertCheckInventory},
+		{path: 'insertTransfer', name: 'insertTransfer', meta: {code: 'xtpzgl-yhgl'}, component: insertTransfer},
+		{path: 'steel_check', name: 'steel_check', meta: {code: 'xtpzgl-yhgl'}, component: steel_check},
+		{path: 'steel_close', name: 'steel_close', meta: {code: 'xtpzgl-yhgl'}, component: steel_close},
+		{path: 'steel_inbound', name: 'steel_inbound', meta: {code: 'xtpzgl-yhgl'}, component: steel_inbound},
+		{path: 'steel_outbound', name: 'steel_outbound', meta: {code: 'xtpzgl-yhgl'}, component: steel_outbound},
+		{path: 'steel_real', name: 'steel_real', meta: {code: 'xtpzgl-yhgl'}, component: steel_real},
+		{path: 'steel_realDown/gridId', name: 'steel_realDown', meta: {code: 'xtpzgl-yhgl'}, component: steel_realDown},
+		{path: 'steel_rebound', name: 'steel_rebound', meta: {code: 'xtpzgl-yhgl'}, component: steel_rebound},
+		{path: 'steel_restack', name: 'steel_restack', meta: {code: 'xtpzgl-yhgl'}, component: steel_restack},
+		{path: 'steel_restackAdd', name: 'steel_restackAdd', meta: {code: 'xtpzgl-yhgl'}, component: steel_restackAdd},
+		{path: 'steel_sendreceive', name: 'steel_sendreceive', meta: {code: 'xtpzgl-yhgl'}, component: steel_sendreceive},
+		{path: 'steel_transfer', name: 'steel_transfer', meta: {code: 'xtpzgl-yhgl'}, component: steel_transfer},
+	  ]
+	}
+  ];
+  
+  const router = new Router({
+	routes: constantRouterMap
+  })
+  //  before
+  routerBefore(router, constantRouterMap);
+  
+  export default router;
+  //  constantRouterMap
+  export const routes = constantRouterMap;
+  

+ 3 - 3
src/views/appoint/app.html

@@ -1,12 +1,12 @@
 <!DOCTYPE html>
-<html style="overflow: hidden;">
+<html>
   <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>
+    <title>工业互联网平台</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>
@@ -14,9 +14,9 @@
     <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>

+ 4 - 4
src/views/appoint/app.js

@@ -15,15 +15,15 @@ import VueApollo from 'vue-apollo'
 
 import apollo from '@/config/apolloConfig.js'
 
-// 注册表格的全局组件
-import DilCommonUI from "@/components/DilCommonUI";
-Vue.use(DilCommonUI);
-
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 
 Vue.use(VueApollo)
 
+// 注册表格的全局组件
+import DilCommonUI from "@/components/DilCommonUI";
+Vue.use(DilCommonUI);
+
 const apolloProvider = new VueApollo({
     defaultClient: apollo
 })

+ 1 - 1
src/views/appoint/components/purchase/addBreach.vue

@@ -40,7 +40,7 @@ export default {
       console.log(amsContractBreach);
       if (amsContractBreach.breachName==null||
       amsContractBreach.breachValue==null
-      ) this.$message.error("必填项存在空值");
+      ) this.$message.error("必填项存在空值!");
       else
       this.axios
         .post(

+ 1 - 1
src/views/appoint/components/purchase/addOtherPrice.vue

@@ -41,7 +41,7 @@ export default {
       if (
       amsContractOtherPrice.priceType==null||
       amsContractOtherPrice.priceValue==null
-      ) this.$message.error("必填项存在空值");
+      ) this.$message.error("必填项存在空值!");
       else
       this.axios
         .post(

+ 1 - 1
src/views/appoint/components/purchase/addShipPrice.vue

@@ -42,7 +42,7 @@ export default {
       if (
       amsContractTransportPrice.priceValue==null||
       amsContractTransportPrice.priceDate==null
-      ) this.$message.error("必填项存在空值");
+      ) this.$message.error("必填项存在空值!");
       else
       this.axios
         .post(

+ 1 - 1
src/views/appoint/components/purchase/addTrainPrice.vue

@@ -44,7 +44,7 @@ export default {
       amsContractTrainPrice.trainPrice==null||
       amsContractTrainPrice.trainPriceDate==null||
       amsContractTrainPrice.trainType==null
-      ) this.$message.error("必填项存在空值");
+      ) this.$message.error("必填项存在空值!");
       else
       this.axios
         .post(

+ 2 - 2
src/views/appoint/components/purchase/addTruckPrice.vue

@@ -42,7 +42,7 @@ export default {
       if (
       amsContractTransportPrice.priceValue==null||
       amsContractTransportPrice.priceDate==null
-      ) this.$message.error("必填项存在空值");
+      ) this.$message.error("必填项存在空值!");
       else
       this.axios
         .post(
@@ -58,7 +58,7 @@ export default {
             // this.$refs.table.refreshData();
             this.$router.go(-1);
           } else {
-            this.$message.error("新增失败");
+            this.$message.error("新增失败!");
           }
           this.$refs['table'].resetField();
         });

+ 14 - 7
src/views/appoint/components/purchase/purchaseOrder.vue

@@ -1,28 +1,34 @@
 <template>
-  <!-- 采购订单页面 -->
-  <div class="purchaseOrder">
+  <!-- 展示万州港港存库库存列表 -->
+  <div class="homeworkPath">
     <div class="top">
-      <el-input v-model="input" placeholder="请输入内容"></el-input>
+      <el-autocomplete
+        popper-class="my-autocomplete"
+        v-model="state"
+        :fetch-suggestions="querySearch"
+        placeholder="请输入内容"
+        @select="handleSelect"
+      >
+      </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: "purchaseOrder",
+  name: "homeworkPath",
   data() {
     return {
       restaurants: [],
       state: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/ams/getPurchaseOrderList?apiId=81",
+        requestUrl: "/api/v1/wmsh/getLoadPortStockList?apiId=158",
       },
     };
   },
@@ -37,9 +43,10 @@ export default {
     },
   },
 };
+
 </script>
 <style lang='scss' scoped>
-.purchaseOrder {
+.homeworkPath {
   .top {
     padding: 1.25rem 1.875rem;
   }

+ 26 - 27
src/views/appoint/components/purchase/updateBreach.vue

@@ -1,15 +1,14 @@
 <template>
-  <!-- 修改违约规则信息 -->
+  <!-- 修改油价信息 -->
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">修改违约规则</span>
-      <span class="a"></span>
+      <span class="text">油价信息</span>
     </div>
     <div class="contractTitle">
       <div class="form-box">
         <div class="form-one">
-          <dil-form :formId="171" v-model="form1"></dil-form>
+          <dil-form :formId="356" v-model="form1"></dil-form>
         </div>
       </div>
     </div>
@@ -23,14 +22,17 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
+//import { sjTime } from "@/js/sharedJsFile";
 export default {
   components: { PageTitle },
- data(){
-     return {
+  data() {
+    return {
       form1: {},
-  }
- },
+    };
+  },
+
   mounted() {
+    console.log(this.$route)
     this.information();
   },
   methods: {
@@ -39,41 +41,38 @@ export default {
       this.axios
         .post("/api/v1/ams/selectBreachToUpdate/" + this.$route.params.breachId)
         .then((res) => {
+          console.log(res)
           res.data.data.forEach((e) => {
             this.form1 = e;
-            // console.log(e);
-            // console.log(this.form1);
-            // console.log(this.$route.params.loadingId);
+            console.log(e);
+            console.log(this.form1);
+            console.log(this.$route.params.priceId);
           });
         });
     },
-    handleCheckedCitiesChange(value) {
-      console.log(value);
-    },
     // 返回
     onClickCancel() {
       this.$router.go(-1);
     },
-    currentRadioChange(row) {
-      this.aaaa = row;
-    },
     // 确认
     onClickConfirm() {
-      let amsContractBreach = {
-        breachId: this.$route.params.breachId,
-        breachName: this.form1.breachName,
-        breachValue: this.form1.breachValue,
+      console.log(this.form1)
+      let RmsOilPrice = {
+        priceId:this.form1.priceId,
+        priceDate:this.form1.priceDate,
+        priceValue:this.form1.priceValue,
+        priceOilName:this.form1.priceOilName,
+
       };
-      console.log(amsContractBreach);
       this.axios
         .post(
-          "/api/v1/ams/updateContractBreach",
-          amsContractBreach
+          "/api/v1/rms/updateOilPrice",
+          RmsOilPrice
         )
         .then((res) => {
-          console.log(res);
-          console.log(this.form1);
-          this.$router.go(-1);
+          if (res.data.code == "200") {
+            this.$router.go(-1);
+          }
         });
     },
   },

+ 11 - 15
src/views/appoint/components/purchase/updateShipPrice.vue

@@ -26,11 +26,11 @@ import PageTitle from "@/components/Page/Title";
 
 export default {
   components: { PageTitle },
- data(){
-     return {
+  data() {
+    return {
       form1: {},
-  }
- },
+    };
+  },
   mounted() {
     this.information();
   },
@@ -39,11 +39,11 @@ export default {
       //编辑驳船作业
       this.axios
         .post("/api/v1/ams/selectPriceToUpdate/" + this.$route.params.priceId)
-        .then((res) => {
-          res.data.data.forEach((e) => {
-            this.form1 = e;
-          });
-        });
+        .then((res) => {
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+          });
+        });
     },
     handleCheckedCitiesChange(value) {
       console.log(value);
@@ -60,14 +60,11 @@ export default {
       let amsContractTransportPrice = {
         priceId: this.$route.params.priceId,
         priceValue: this.form1.priceValue,
-        priceDate: sjTime(this.form1.priceDate)
+        priceDate: sjTime(this.form1.priceDate),
       };
       console.log(amsContractTransportPrice);
       this.axios
-        .post(
-          "/api/v1/ams/updateShipPrice",
-          amsContractTransportPrice
-        )
+        .post("/api/v1/ams/updateShipPrice", amsContractTransportPrice)
         .then((res) => {
           console.log(res);
           console.log(this.form1);
@@ -78,5 +75,4 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-
 </style>

+ 1 - 0
src/views/appoint/components/saleContract/addSalePlanDetail.vue

@@ -40,6 +40,7 @@
 
 
 <script>
+
 export default {
   name: "salePlan",
   data() {

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

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

Vissa filer visades inte eftersom för många filer har ändrats