zhouzh 3 년 전
부모
커밋
2f7ee7ef34
35개의 변경된 파일73개의 추가작업 그리고 1415개의 파일을 삭제
  1. 3 2
      build/utils.js
  2. 0 7
      config/index.js
  3. BIN
      dist.7z
  4. 0 0
      public/favicon2.ico
  5. BIN
      src/assets/img/favicon.ico
  6. 0 0
      src/assets/img/favicon2.ico
  7. BIN
      src/assets/img/favicon3.ico
  8. 5 5
      src/components/main.vue
  9. 2 2
      src/config/routerBefore.js
  10. 3 4
      src/views/RMS/app.html
  11. 3 3
      src/views/SporadicManage/app.html
  12. 4 6
      src/views/TMS/app.html
  13. 0 466
      src/views/TMS/components/importedEmergency/addWagonLoad.vue
  14. 0 107
      src/views/TMS/components/importedEmergency/addWagonUnLoad.vue
  15. 0 102
      src/views/TMS/components/importedEmergency/editWagonLoad.vue
  16. 0 100
      src/views/TMS/components/importedEmergency/editWagonUnLoad.vue
  17. 2 2
      src/views/TMS/components/importedEmergency/wagonLoadEmergency.vue
  18. 2 2
      src/views/TMS/components/importedEmergency/wagonUnLoadEmergency.vue
  19. 1 1
      src/views/TMS/components/importedIngredients/transportReserveFu.vue
  20. 0 551
      src/views/TMS/components/importedIngredients/transportReserveFuAdd.vue
  21. 2 2
      src/views/TMS/router/index.js
  22. 3 4
      src/views/WMS/app.html
  23. 3 4
      src/views/appoint/app.html
  24. 7 4
      src/views/appoint/components/saleContract/addSaleOrderArrange.vue
  25. 3 4
      src/views/configManager/app.html
  26. 3 4
      src/views/homepage/app.html
  27. 5 7
      src/views/index/app.html
  28. 4 5
      src/views/inward/app.html
  29. 3 4
      src/views/queue/app.html
  30. 3 4
      src/views/sale/app.html
  31. 3 3
      src/views/serviceManager/app.html
  32. 3 4
      src/views/statisticalReport/app.html
  33. 3 3
      src/views/systemConfig/app.html
  34. 3 3
      src/views/workFlow/app.html
  35. BIN
      static/img/favicon2.ico

+ 3 - 2
build/utils.js

@@ -18,14 +18,15 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //  'logistics', 'process', '   ', 'reportform', 'basicconfig', 'system']
 // let devModules = ['index', 'qualityControl', 'standard', 'basicconfig'];
 // let devModules = ['index','devops','workFlow','systemConfig', 'microService'];
-
  //let devModules = ['all'];
- let devModules = ['index','RMS']
+// let devModules = ['index','RMS']
 //let devModules = ['index','SporadicManage','TMS']
 // let devModules = ['index','SporadicManage'];
 // let devModules = ['index','systemConfig', 'formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'custom'];
 // let devModules = ['index', 'systemConfig','formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'btnControll'];
 // let devModules = ['index','inward','SporadicManage']
+let devModules = ['all'];
+// let devModules = ['index','inward','appoint','sale']
 
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;

+ 0 - 7
config/index.js

@@ -62,13 +62,6 @@ let proxyTable = {
       "^/api/v1": "/api/v1"
     }
   },
-  // "/views/api/v1": {
-  //   target: "http://192.168.1.115:8080",
-  //   ws: true,
-  //   pathRewrite: {
-  //     "^/api/v1": "/api/v1"
-  //   }
-  // },
   "/views/api/v1": {
     target: "http://localhost:8080",
     ws: true,

BIN
dist.7z


+ 0 - 0
public/favicon.ico → public/favicon2.ico


BIN
src/assets/img/favicon.ico


+ 0 - 0
static/img/favicon.ico → src/assets/img/favicon2.ico


BIN
src/assets/img/favicon3.ico


+ 5 - 5
src/components/main.vue

@@ -293,12 +293,12 @@
               @command="selectOrg"
               v-if="orgDutyLinks.length > 0"
               :style="{
-                marginLeft: !styleControll ? '100px' : '20px',
+                marginLeft: !styleControll ? '50px' : '20px',
                 fontSize: '12px',
               }"
             >
-              <span class="el-dropdown-link">
-                {{ orgName }}<i class="el-icon-arrow-down el-icon--right"></i>
+              <span class="el-dropdown-link"><!--<i class="el-icon-arrow-down el-icon--right"></i>-->
+                {{ orgName }}
               </span>
               <el-dropdown-menu slot="dropdown">
                 <div v-for="item in orgDutyLinks" :key="item.orgId">
@@ -308,9 +308,9 @@
                 </div>
               </el-dropdown-menu>
             </el-dropdown>
-            <span style="margin-left: 20px; font-size: 12px">{{
+            <!-- <span style="margin-left: 20px; font-size: 12px">{{
               dutyName
-            }}</span>
+            }}</span> -->
           </div>
           <div class="sl-header-li-lgbc">
             <span class="icore-icons icore-icons-right-arrow am-xz"></span>

+ 2 - 2
src/config/routerBefore.js

@@ -105,9 +105,9 @@ const routerBefore = function (router, constantRouterMap) {
     store.commit('breadcrumb', breadcrumbFn(to, store.state.routes));
     //  标题
     if (to.meta && !to.meta.title) {
-      document.title = titleFn(to, store.state.routes) + ' ' + document.title.substr(document.title.indexOf('-'));
+      // document.title = titleFn(to, store.state.routes) + ' ' + document.title.substr(document.title.indexOf('-'));
     } else {
-      document.title = to.meta.title + ' ' + document.title.substr(document.title.indexOf('-'));
+      // document.title = to.meta.title + ' ' + document.title.substr(document.title.indexOf('-'));
     }
     if (to.query.ticket) {
       setCookie('ticket', to.query.ticket, '', '/');

+ 3 - 4
src/views/RMS/app.html

@@ -4,9 +4,9 @@
     <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>
+    <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>
@@ -14,7 +14,6 @@
     <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>

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

@@ -4,9 +4,9 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
-    <meta content="工业互联网平台 iCore-ICP" name="keywords">
-    <meta content="工业互联网平台 iCore-ICP" name="description">
-    <title>加载中... - 工业互联网平台 iCore-ICP</title>
+    <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>

+ 4 - 6
src/views/TMS/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>
+    <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>
@@ -14,10 +14,8 @@
     <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>

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

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

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

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

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

@@ -1,102 +0,0 @@
-<template>
-  <!-- 修改车皮装车实绩 -->
-  <div id="contractDetails">
-    <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">车皮装车实绩</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="254" v-model="form1"></dil-form>
-        </div>
-      </div>
-    </div>
-
-    <div class="button-box">
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
-      <el-button @click="onClickCancel">返回</el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-import PageTitle from "@/components/Page/Title";
-// import { sjTime } from "@/utils/sharedJsFile";
-export default {
-  components: { PageTitle },
- data(){
-     return {
-      form1: {},
-  }
- },
-  mounted() {
-    this.information();
-  },
-  methods: {
-    information() {
-      //编辑车皮装车作业
-      this.axios
-        .post("/api/v1/tms/getTmstrainLoadingResultByResultId/" + this.$route.params.resultId)
-        .then((res) => {
-          res.data.data.forEach((e) => {
-            this.form1 = e;
-            console.log(e);
-            console.log(this.form1);
-            console.log(this.$route.params.resultId);
-          });
-        });
-    },
-    handleCheckedCitiesChange(value) {
-      console.log(value);
-    },
-    // 返回
-    onClickCancel() {
-      this.$router.go(-1);
-    },
-    currentRadioChange(row) {
-      this.aaaa = row;
-    },
-    // 确认
-    onClickConfirm() {
-      let tmstrainLoadingResult = {
-        resultId: this.$route.params.resultId,
-        resultWagonNo: this.form1.resultWagonNo,
-        resultBillableTonnage: this.form1.resultBillableTonnage,
-        resultClass: this.form1.resultClass,
-        sendStationId: this.form1.sendStationId,
-        arrivalStationId: this.form1.arrivalStationId,
-        resultLoadingDate: sjTime(this.form1.resultLoadingDate),
-        batchId: this.form1.batchId,
-        capacityId: this.form1.capacityId,
-        resultMaterialNumber: this.form1.resultMaterialNumber,
-        resultMaterialTheoryweight: this.form1.resultMaterialTheoryweight,
-        resultRemarks: this.form1.resultRemarks
-      };
-      if (
-      tmstrainLoadingResult.resultWagonNo==null||
-      tmstrainLoadingResult.resultBillableTonnage==null||
-      tmstrainLoadingResult.resultClass==null||
-      tmstrainLoadingResult.sendStationId==null||
-      tmstrainLoadingResult.arrivalStationId==null||
-      tmstrainLoadingResult.resultLoadingDate==null||
-      tmstrainLoadingResult.batchId==null
-      ) this.$message.error("必填项存在空值!");
-      else
-      this.axios
-        .post("/api/v1/tms/upadteTmstrainLoadingResultByResultId",tmstrainLoadingResult)
-        .then(() => {
-          this.$message({
-            type: "success",  
-            message: "修改成功!",
-          });
-          this.$router.go(-1);
-        });
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-// @import "@/styles/TMS/addwagonload.scss";
-</style>

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

@@ -1,100 +0,0 @@
-<template>
-  <!-- 修改车皮装车实绩 -->
-  <div id="contractDetails">
-    <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">车皮卸车实绩</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="118" v-model="form1"></dil-form>
-        </div>
-      </div>
-    </div>
-      
-    <div class="button-box">
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
-      <el-button @click="onClickCancel">返回</el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-import PageTitle from "@/components/Page/Title";
-// import { sjTime } from "@/utils/sharedJsFile";
-export default {
-  components: { PageTitle },
- data(){
-     return {
-      form1: {},
-  }
- },
-  mounted() {
-    this.information();
-  },
-  methods: {
-    information() {
-      //编辑车皮装车作业
-      this.axios
-        .post("/api/v1/tms/getTmstrainWagonUnLoadResultByUnLoadingId/" + this.$route.params.unloadingId)
-        .then((res) => {
-          res.data.data.forEach((e) => {
-            this.form1 = e;
-            console.log(e);
-            console.log(this.form1);
-            console.log(this.$route.params.unloadingId);
-          });
-        });
-    },
-    handleCheckedCitiesChange(value) {
-      console.log(value);
-    },
-    // 返回
-    onClickCancel() {
-      this.$router.go(-1);
-    },
-    currentRadioChange(row) {
-      this.aaaa = row;
-    },
-    //确定
-    onClickConfirm() {
-      let tmstrainWagonUnloadResult = {
-        unloadingId: this.$route.params.unloadingId,
-        resultWagonNo: this.form1.resultWagonNo,
-        resultArrivalDate: sjTime(this.form1.resultArrivalDate),
-        resultUnloadTime: sjTime(this.form1.resultUnloadTime),
-        unloadingPointId: this.form1.unloadingPointId,
-        resultBigTicketWeight: this.form1.resultBigTicketWeight,
-        resultRailHorizontalWeight: this.form1.resultRailHorizontalWeight,
-        resultRemark: this.form1.resultRemark
-      };
-      console.log(tmstrainWagonUnloadResult);
-      if (tmstrainWagonUnloadResult.resultWagonNo==null
-      ||tmstrainWagonUnloadResult.resultArrivalDate==null||
-      tmstrainWagonUnloadResult.resultUnloadTime==null||
-      tmstrainWagonUnloadResult.unloadingPointId==null||
-      tmstrainWagonUnloadResult.resultBigTicketWeight==null||
-      tmstrainWagonUnloadResult.resultRailHorizontalWeight==null
-      ) this.$message.error("存在空值!");
-      else
-      this.axios
-        .post(
-          "/api/v1/tms/upadteTmstrainWagonUnLoadResultByUnLoadingId",
-          tmstrainWagonUnloadResult
-        )
-       .then(() => {
-          this.$message({
-            type: "success",  
-            message: "修改成功!",
-          });
-          this.$router.go(-1);
-        });
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-// @import "@/styles/TMS/addwagonload.scss";
-</style>

+ 2 - 2
src/views/TMS/components/importedEmergency/wagonLoadEmergency.vue

@@ -44,9 +44,9 @@ export default {
       if (num == 0) {
         this.option.requestUrl = "/api/v1/tms/getTmstrainWagonLoad?apiId=209&resultType=2&con="+this.input
       } else if (num == 1) {
-        this.$router.push("/addWagonLoad")
+        this.$router.push("/addWagonLoadEmergency")
       } else if (num == 2) {
-         this.$router.push("/editWagonLoad/" + resultId)
+         this.$router.push("/editWagonLoadEmergency/" + resultId)
       }
     },
     deleteclick(resultId) {

+ 2 - 2
src/views/TMS/components/importedEmergency/wagonUnLoadEmergency.vue

@@ -50,9 +50,9 @@ export default {
       if ( num == 0 ) {
         this.option.requestUrl = '/api/v1/tms/getTmstrainWagonUnLoad?apiId=60&resultType=2&con='+this.input;
       } else if (num == 1 ) {
-        this.$router.push("/addWagonUnLoad")
+        this.$router.push("/addWagonLoadEmergency")
       }else if (num == 2) {
-        this.$router.push("/editWagonUnLoad/" + unloadingId);
+        this.$router.push("/editWagonLoadEmergency/" + unloadingId);
       }
     },
     deleteclick(scope) {

+ 1 - 1
src/views/TMS/components/importedIngredients/transportReserveFu.vue

@@ -198,7 +198,7 @@ export default {
     },
     //新增
     insertClick() {
-      this.$router.push("/transportReserveFuAdd/");
+      this.$router.push("/transportReserveFuAddIngredients/");
     },
     //修改
     updateClick(orderId) {

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

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

+ 2 - 2
src/views/TMS/router/index.js

@@ -236,10 +236,10 @@ const constantRouterMap = [
       {path: 'addWagonLoadEmergency', name: 'addWagonLoadEmergency', meta: {code: 'xtpzgl-yhgl'}, component: addWagonLoadEmergency},
       {path: 'addWagonUnLoadEmergency', name: 'addWagonUnLoadEmergency', meta: {code: 'xtpzgl-yhgl'}, component: addWagonUnLoadEmergency},
       {path: 'editWagonUnLoadEmergency', name: 'editWagonUnLoadEmergency', meta: {code: 'xtpzgl-yhgl'}, component: editWagonUnLoadEmergency},
-      {path: 'editWagonLoadEmergency', name: 'editWagonLoadEmergency', meta: {code: 'xtpzgl-yhgl'}, component: editWagonLoadEmergency},
+      {path: 'editWagonLoadEmergency/:unloadingId', name: 'editWagonLoadEmergency', meta: {code: 'xtpzgl-yhgl'}, component: editWagonLoadEmergency},
       {path: 'entrustEmergency', name: 'entrustEmergency', meta: {code: 'xtpzgl-yhgl'}, component: entrustEmergency},
       {path: 'trainDetails', name: 'trainDetails', meta: {code: 'xtpzgl-yhgl'}, component: trainDetails},
-      {path: 'wagonLoadEmergency/:resultId', name: 'wagonLoadEmergency', meta: {code: 'xtpzgl-yhgl'}, component: wagonLoadEmergency},
+      {path: 'wagonLoadEmergency', name: 'wagonLoadEmergency', meta: {code: 'xtpzgl-yhgl'}, component: wagonLoadEmergency},
       {path: 'wagonUnLoadEmergency', name: 'wagonUnLoadEmergency', meta: {code: 'xtpzgl-yhgl'}, component: wagonUnLoadEmergency},
 
       {path: 'transportReserveFuAdd', name: 'transportReserveFuAdd', meta: {code: 'xtpzgl-yhgl'}, component: transportReserveFuAdd},

+ 3 - 4
src/views/WMS/app.html

@@ -4,9 +4,9 @@
     <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>
+    <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>
@@ -14,7 +14,6 @@
     <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>

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

@@ -4,9 +4,9 @@
     <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>
+    <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>
@@ -14,7 +14,6 @@
     <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>

+ 7 - 4
src/views/appoint/components/saleContract/addSaleOrderArrange.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 添加销售订单 -->
+  <!-- 添加销售订单排车 -->
   <div class="addSalePlan">
     <page-title>新增销售订单排车</page-title>
 
@@ -411,13 +411,16 @@ export default {
         mapItem.materialNumber=item.orderPlanWeight;
         mapList.push(mapItem);
       });
-      console.log("mapList",mapList);
+      // console.log("mapList",mapList);
         this.axios.post("/api/v1/ams/addTruckNo", mapList).then((res) => {
           if (res.data.code == "200") {
             this.$router.go(-1);
           }
-        });
-        
+          this.$message({
+            type: "success",
+            message: "新增车序号成功!",
+          });
+        });    
     },
     // 取消
     cancel() {

+ 3 - 4
src/views/configManager/app.html

@@ -4,9 +4,9 @@
     <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>
+    <meta content="智慧物流平台" name="keywords">
+    <meta content="智慧物流平台" name="description">
+    <title>首页1 - 智慧物流平台</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,7 +14,6 @@
     <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>

+ 3 - 4
src/views/homepage/app.html

@@ -4,9 +4,9 @@
     <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>
+    <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>
@@ -14,7 +14,6 @@
     <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>

+ 5 - 7
src/views/index/app.html

@@ -1,23 +1,21 @@
 <!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>
+    <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"/>
+    <!-- <link href="../static/img/favicon.ico" rel="shortcut icon"/> -->
     <script src="../static/lib/jquery/jquery.min.js" type="text/javascript"></script>
     <script src="../static/lib/jquery/jquery.PrintArea.js" type="text/javascript"></script>
     <script src="../static/lib/qrcode.min.js" type="text/javascript"></script>
     <script src='../static/lib/XLSX/xlsx.core.min.js' type='text/javascript'></script>
     <script src="../static/js/common.js" type="text/javascript"></script>
-     
   </head>
   <body>
     <div id="app"></div>
-    <!-- test set app -->
   </body>
 </html>

+ 4 - 5
src/views/inward/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>
+    <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>
@@ -17,6 +17,5 @@
   </head>
   <body>
     <div id="app"></div>
-    <!-- test set app -->
   </body>
 </html>

+ 3 - 4
src/views/queue/app.html

@@ -4,9 +4,9 @@
     <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>
+    <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>
@@ -14,7 +14,6 @@
     <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>

+ 3 - 4
src/views/sale/app.html

@@ -4,9 +4,9 @@
     <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>
+    <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>
@@ -14,7 +14,6 @@
     <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>

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

@@ -4,9 +4,9 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
-    <meta content="工业互联网平台 iCore-ICP" name="keywords">
-    <meta content="工业互联网平台 iCore-ICP" name="description">
-    <title>加载中... - 工业互联网平台 iCore-ICP</title>
+    <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>

+ 3 - 4
src/views/statisticalReport/app.html

@@ -4,9 +4,9 @@
     <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>
+    <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>
@@ -14,7 +14,6 @@
     <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>

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

@@ -4,9 +4,9 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
-    <meta content="工业互联网平台 iCore-ICP" name="keywords">
-    <meta content="工业互联网平台 iCore-ICP" name="description">
-    <title>加载中... - 工业互联网平台 iCore-ICP</title>
+    <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>

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

@@ -4,9 +4,9 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
-    <meta content="工业互联网平台 iCore-ICP" name="keywords">
-    <meta content="工业互联网平台 iCore-ICP" name="description">
-    <title>加载中... - 工业互联网平台 iCore-ICP</title>
+    <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>

BIN
static/img/favicon2.ico