tijiao

build/utils.js

@@ -19,7 +19,22 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // let devModules = ['index', 'qualityControl', 'standard', 'basicconfig'];
 // let devModules = ['index','devops','workFlow','systemConfig', 'microService'];
 // let devModules = ['all'];
-let devModules = ['index','inward','SporadicManage']
+// let devModules = ['index','TMS','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 = ['all'];
+// 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']
+
+
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

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://172.16.33.166:8080",
     ws: true,

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>

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, '', '/');

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>

src/views/RMS/components/addCapacity.vue

@@ -6,6 +6,17 @@
      <div class="form-box" style="margin-right: 10rem">
         <dil-form :formId="309" v-model="form1" ref="from1"></dil-form>
       </div>
+      <div class="inputBox">
+    <span class="text">所属单位类型</span>
+      <el-autocomplete
+        v-model="state"
+        @input="onInput"
+        :fetch-suggestions="querySearch"
+        placeholder="请输入内容"
+        :trigger-on-focus="false"
+        @select="handleSelect"
+      ></el-autocomplete>
+      </div>
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
@@ -22,11 +33,45 @@ export default {
     return {
       form1: {},
       // value: undefined,
-     
+     carrierIds:"",
+      state: "",
+      restaurants: [],
     };
   },
   mounted() {},
   methods: {
+     onInput() {
+      this.axios.post(
+        "/api/v1/rms/getCarrierName?state="+this.state,
+      )
+      .then((res) => {
+        if(res.data.code == "200"){
+          res.data.data.forEach(element => {
+            this.restaurants.push({
+              value:element.carrierName,
+              carrierIds:element.carrierId
+            })
+          });
+        }
+        
+      });
+    },
+    querySearch(queryString, cb) {
+        var restaurants = this.restaurants;
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+        // 调用 callback 返回建议列表的数据
+        cb(results);
+      },
+      createFilter(queryString) {
+        return (restaurant) => {
+          return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+        };
+      },
+    handleSelect(item){
+      this.carrierIds=item.carrierIds;
+      console.log(item)
+    },
+   
      makeSure() {
        console.log(this.from1)
        let RmsCapacity={
@@ -36,7 +81,10 @@ export default {
          capacityOwneris:this.form1.capacityOwneris,
          capacityVip:this.form1.capacityVip,
          capacityBlacklist:this.form1.capacityBlacklist,
-         carrierId:this.form1.carrierId,
+        // carrierId:this.form1.carrierId,
+        state:this.state,
+        carrierName:this.state,
+        carrierIds: this.carrierIds,
        };
        if(
          RmsCapacity.capacityNumber==null ||
@@ -44,7 +92,7 @@ export default {
          RmsCapacity.capacityOwneris==null ||
          RmsCapacity.capacityVip==null ||
          RmsCapacity.capacityBlacklist==null ||
-         RmsCapacity.carrierId==null
+         RmsCapacity.carrierIds==null
        )this.$message.error("存在空值！");
        else
       this.axios
@@ -52,6 +100,7 @@ export default {
           "/api/v1/rms/insertCapacity", RmsCapacity
         )
         .then((res) => {
+          console.log("res.data.code",res.data.code);
           if (res.data.code == 200) {
             this.$message({
               type: "success",
@@ -62,7 +111,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复！");
           }
-          this.$refs['table'].resetField();
+          // this.$refs['table'].resetField();
         });
     },
     // 取消
@@ -81,6 +130,15 @@ export default {
   margin-top: 0.3125rem;
   margin-bottom: 1.25rem;
 }
+.inputBox{
+     display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.1000rem;
+  margin-bottom: 0.25rem;
+  margin-left: -12rem;
+}
 .form-box{
   display: flex;
   justify-content: center;

src/views/RMS/components/addCarDriver.vue

@@ -19,23 +19,65 @@
       </div>
     <div class="photoBox">
    <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"
-    >
-      <div>驾驶证
-      <el-button size="small" type="primary">点击上传</el-button>
-      <div slot="tip" class="el-upload__tip">
-      </div>
-      </div>
-    </el-upload> 
+  class="upload-demo"
+  action="http://localhost:8080/api/v1/rms/upload"
+  :on-preview="handlePreview"
+  :on-remove="handleRemove"
+  :on-success="handleAvatarSuccess"
+  :file-list="fileList"
+  list-type="picture">
+  <div>行驶证照片
+  <el-button size="small" type="primary">点击上传</el-button>
+  </div>
+</el-upload> 
+    </div>
+
+     <div class="photoBox">
+   <el-upload
+  class="upload-demo"
+  action="http://localhost:8080/api/v1/rms/upload"
+  :on-preview="handlePreview"
+  :on-remove="handleRemove"
+  :on-success="handleAvatarSuccess"
+  :file-list="fileList"
+  list-type="picture">
+  <div>驾驶证照片
+  <el-button size="small" type="primary">点击上传</el-button>
+  </div>
+</el-upload> 
+    </div>
+
+      <div class="photoBox">
+   <el-upload
+  class="upload-demo"
+  action="http://localhost:8080/api/v1/rms/upload"
+  :on-preview="handlePreview"
+  :on-remove="handleRemove"
+  :on-success="handleAvatarSuccess"
+  :file-list="fileList"
+  list-type="picture">
+  <div>运输证照片
+  <el-button size="small" type="primary">点击上传</el-button>
+  </div>
+</el-upload> 
+    </div>
+
+
+ <div class="photoBox">
+   <el-upload
+  class="upload-demo"
+  action="http://localhost:8080/api/v1/rms/upload"
+  :on-preview="handlePreview"
+  :on-remove="handleRemove"
+  :on-success="handleAvatarSuccess"
+  :file-list="fileList"
+  list-type="picture">
+  <div>从业资格证照片
+  <el-button size="small" type="primary">点击上传</el-button>
+  </div>
+</el-upload> 
     </div>
+
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
@@ -58,12 +100,10 @@ export default {
       fileList: [],
       carrierIds:"",
       state: "",
-      sex: "男",
+      imageUrl:"",
     };
   },
-  mounted() {
-     this.form1.driverSex = this.sex;	
-},
+  mounted() {},
   methods: {
     onInput() {
       this.axios.post(
@@ -96,24 +136,16 @@ export default {
       this.carrierIds=item.carrierIds;
       console.log(item)
     },
-   
-
-    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}？`);
+    handleAvatarSuccess(res,file){
+      this.imageUrl=URL.createObjectURL(file.raw);
     },
+    handleRemove(file, fileList) {
+        console.log(file, fileList);
+      },
+      handlePreview(file) {
+        console.log(file);
+      },
+  
     makeSure() {
       console.log(this.form1);
       let reg = new RegExp(/^[0-9]*$/);
@@ -124,11 +156,7 @@ export default {
         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,
         state:this.state,
         carrierName:this.state,
         carrierIds: this.carrierIds,
@@ -147,7 +175,7 @@ export default {
         RmsCarDriver.driverPhone==null ||
         RmsCarDriver.transportTypeId==null ||
         RmsCarDriver.carrierIds==null 
-     //   RmsCarDriver.carrierId==null 
+    
     )this.$message.error("存在空值！");
      else
       this.axios
@@ -163,7 +191,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复！");
           }
-          this.$refs['table'].resetField();
+          //this.$refs['table'].resetField();
         });
     },
     // 取消
@@ -196,7 +224,7 @@ export default {
   text-align: center;
   align-items: center;
   justify-content: center;
-  margin-top: 0.1000rem;
+  margin-top: 1rem;
   margin-bottom: 0.25rem;
   margin-left: -18rem;
 }

src/views/RMS/components/addCarrier.vue

@@ -8,16 +8,42 @@
       </div>
     <el-upload
       class="upload-demo"
-      action="http://localhost:8060/api/v1/rms/rmscarrier/uploadCarrier"
+      action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier1"
       :on-preview="handlePreview"
       :on-remove="handleRemove"
-      :on-success="handleAvatarSuccess"
+      :on-success="handleAvatarSuccess1"
       :file-list="fileList"
+      :before-upload="beforeUpload2"
       list-type="picture">
-      <el-button size="small" type="primary">点击上传照片</el-button>
+      <el-button size="small" type="primary">点击上传运输证</el-button>
+      <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+    </el-upload>
+    <el-upload
+      class="upload-demo"
+      action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier2"
+      :on-preview="handlePreview"
+      :on-remove="handleRemove"
+      :on-success="handleAvatarSuccess2"
+      :file-list="fileList"
+      :before-upload="beforeUpload2"
+      list-type="picture">
+      <el-button size="small" type="primary">点击上传经营许可证</el-button>
+      <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+    </el-upload>
+    <el-upload
+      class="upload-demo"
+      action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier3"
+      :on-preview="handlePreview"
+      :on-remove="handleRemove"
+      :on-success="handleAvatarSuccess3"
+      :file-list="fileList"
+      :before-upload="beforeUpload2"
+      list-type="picture">
+      <el-button size="small" type="primary">点击上传营业执照</el-button>
       <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
     </el-upload>
 
+
     <div class="form-box f1">
       <el-form :inline="true" :model="formInline" class="demo-form-inline">
     <el-form-item>
@@ -79,12 +105,52 @@ export default {
          registerDate:"",
          mapValue:""
       },
-      imageUrl:""
+      imageUrl1:"",
+      imageUrl2:"",
+      imageUrl3:"",
+      imageUrls:[],
     };
   },
   methods: {
-    handleAvatarSuccess(res,file){
-      this.imageUrl=URL.createObjectURL(file.raw);
+    beforeUpload2 (file) {
+        const isLt2M = file.size < 1024 * 1024 * 0.5
+        console.log('大小' + isLt2M)
+        if (!isLt2M) {
+          this.$message.error('上传文件大小不能超过500kb!')
+        }
+        let size = file.size / 1024
+        console.log('大小' + size)
+        let _URL = window.URL || window.webkitURL
+        let img = new Image()
+        img.onload = function () {
+          let width = img.width
+          let height = img.height
+          console.log('width--->' + width)
+          console.log('height--->' + height)
+        }
+        img.src = _URL.createObjectURL(file)
+        return isLt2M
+    },
+    handleAvatarSuccess1(res,file){
+      this.imageUrl1=URL.createObjectURL(file.raw);
+      // this.axios
+      // .then((res) => {
+      //   if (res.data.code == 200) {
+      //     this.$message({
+      //     type: "success",
+      //     message: "新增成功!",
+      //     });
+      //   } 
+      //   else {
+      //     this.$message.error("图片上传失败，图片格式不得超过500kb且只能是jpg/png文件！");
+      //   }
+      // });
+    },
+    handleAvatarSuccess2(res,file){
+      this.imageUrl2=URL.createObjectURL(file.raw);
+    },
+    handleAvatarSuccess3(res,file){
+      this.imageUrl3=URL.createObjectURL(file.raw);
     },
     handleRemove(file,fileList){
       console.log(file,fileList)
@@ -98,7 +164,6 @@ export default {
     },
     currentRadioChange(selection){
       this.mapList=selection, 
-      console.log(this.mapList) 
       this.bidArea=this.mapList.bidArea
      
     },
@@ -130,18 +195,27 @@ export default {
       let registerDate={
         registerDate: this.form1.registerDate,
       };
+      let imageUrls={
+        imageUrl1:this.imageUrl1,
+        imageUrl1:this.imageUrl2,
+        imageUrl1:this.imageUrl3
+      };
+      console.log(imageUrls)
       let mapValue={
         RmsCarrier:RmsCarrier,
-        registerDate:registerDate
+        registerDate:registerDate,
+        imageUrls:imageUrls
       };
       if(
         reg.test(RmsCarrier.carrierContactNumber)==false
       )this.$message.error("输入的格式不正确");
        else if(
           RmsCarrier.carrierName ==null ||
-        // RmsCarrier.carrierTransportCertificate ==null ||
-        // RmsCarrier.carrierBusinessLicense ==null ||
-        // RmsCarrier.carrierBusinessAblelicense ==null ||
+
+          // imageUrls.imageUrl1 ==null ||
+          // imageUrls.imageUrl2 ==null ||
+          // imageUrls.imageUrl3 ==null ||
+
           RmsCarrier.carrierAbbreviation ==null ||
           RmsCarrier.carrierAddress ==null ||
           RmsCarrier.registerNo ==null ||

src/views/RMS/components/addConsignee.vue

@@ -0,0 +1,106 @@
+<template>
+  <!-- 添加收货客户信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+    <el-divider content-position="left">收货客户信息</el-divider>
+     <div class="form-box" style="margin-right: 10rem">
+        <dil-form :formId="367" 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: {},
+    };
+  },
+  mounted() {},
+  methods: {
+     makeSure() {
+       console.log(this.form1)
+       let RmsConsignee={
+         companyName:this.form1.companyName,
+         consigneeAbbreviation:this.form1.consigneeAbbreviation,
+         consigneeRegisteredAddress:this.form1.consigneeRegisteredAddress,
+         consigneeReceiveAddress:this.form1.consigneeReceiveAddress,
+         consigneeRegistrationTime:this.form1.consigneeRegistrationTime,
+         consigneeContactName:this.form1.consigneeContactName,
+         consigneeContactTel:this.form1.consigneeContactTel,
+       };
+              console.log("RmsConsignee",RmsConsignee)
+       if(
+        RmsConsignee.companyName == null ||
+        RmsConsignee.consigneeAbbreviation==null ||
+        RmsConsignee. consigneeRegisteredAddress ==null ||
+        RmsConsignee.consigneeReceiveAddress == null ||
+        RmsConsignee.consigneeRegistrationTime == null ||
+        RmsConsignee.consigneeContactName == null ||
+        RmsConsignee.consigneeContactTel == null
+       )this.$message.error("存在空值！");
+       else
+         this.axios
+          .post(
+            "/api/v1/rms/insertConsignee",
+            RmsConsignee
+          )
+    
+          .then((res) => {
+               console.log("res.data.code",res.data.code);
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "新增成功!",
+              });
+              // this.$refs.table.refreshData();
+              this.$router.go(-1);
+            } else {
+              this.$message.error("新增失败,可能有重复");
+            }
+          // this.$refs['table'].resetField();
+          });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' >
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+.form-box{
+  display: flex;
+  justify-content: center;
+  .el-form-item{
+    display: flex;
+    justify-content: center;
+    .el-form-item__label{
+      display: flex;
+      align-items: center;
+    }
+    .el-form-item__content{
+      .el-input{
+        .el-input__inner{
+          width: 250px;
+        }
+      }
+    }
+  }
+}
+</style>

src/views/RMS/components/addPersonnel.vue

@@ -36,8 +36,7 @@ export default {
         personnelWorkshopid: this.form1.personnelWorkshopid,
         personnelShifts: this.form1.personnelShifts,
         personnelTeam:this.form1.personnelTeam,
-        departmentId: this.form1.shipperId,
-        username:this.form1.username
+        departmentId: this.form1.shipperId
       };
       if(
         RmsPersonnel.personnelJobNumber ==null ||
@@ -46,11 +45,9 @@ export default {
         RmsPersonnel.personnelWorkshopid==null ||
         RmsPersonnel.personnelShifts==null ||
         RmsPersonnel.departmentId==null ||
-        RmsPersonnel.personnelTeam==null||
-        RmsPersonnel.username==null
+        RmsPersonnel.personnelTeam==null
       )this.$message.error("存在空值！");
       else
-      
       this.axios
         .post(
           "/api/v1/rms/insertPersonnel",

src/views/RMS/components/addRawWarehouse.vue

@@ -31,7 +31,7 @@ export default {
        console.log(this.from1)
        let RmsWarehouse = {
          warehouseName:this.form1.warehouseName,
-         shipperId:this.form1.shipperId 
+         shipperId:this.form1.shipperId,
        };
        if(
          RmsWarehouse.warehouseName==null ||

src/views/RMS/components/consignee.vue

@@ -1,14 +1,41 @@
 <template>
   <!-- 客户收货信息页面 -->
-  <div class="steel_inbound">
+   <div class="steel_inbound">
     <div class="sache">
-      <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-input
+        placeholder="请输入内容"
+        v-model="input"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+       <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="option">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="updateConsignee(scope.row.consigneeId)"
+            >
+              修改
+            </el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteConsignee(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
     </div>
-    <dilTable v-bind.sync="option">
-    </dilTable>
   </div>
 </template>
 
@@ -31,6 +58,45 @@ export default {
     onclick() {
       this.option.requestUrl = "/api/v1/rms/getConsigneeList?apiId=407&con=" + this.input;
     },
+    toInsert() {
+      this.$router.push("/addConsignee");
+
+    },
+    updateConsignee(consigneeId){
+      this.$router.push("/editConsignee/" + consigneeId)
+    },
+    deleteConsignee(scope){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/rms/deleteConsignee/" + scope.row.consigneeId)
+            .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>

src/views/RMS/components/editConsignee.vue

@@ -0,0 +1,112 @@
+<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="368" v-model="form1"></dil-form>
+        </div>
+      </div>
+    </div>
+
+    <div class="button-box">
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+      <el-button @click="onClickCancel">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+    };
+  },
+  mounted() {
+      console.log(this.$route)
+    this.information();
+  },
+  methods: {
+    information() {
+      //编辑 
+console.log(this.$route.params)            
+
+      this.axios
+        .post(
+          "/api/v1/rms/getConsigneeById/" +
+            this.$route.params.consigneeId
+        )
+
+        .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.consigneeId);
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      console.log(this.form1)
+       let RmsConsignee={
+         consigneeId:this.form1.consigneeId,
+         companyName:this.form1.companyName,
+         consigneeAbbreviation:this.form1.consigneeAbbreviation,
+         consigneeRegisteredAddress:this.form1.consigneeRegisteredAddress,
+         consigneeReceiveAddress:this.form1.consigneeReceiveAddress,
+         consigneeRegistrationTime:this.form1. consigneeRegistrationTime,
+         consigneeContactName:this.form1.consigneeContactName,
+         consigneeContactTel:this.form1.consigneeContactTel,
+       };
+       if(
+        RmsConsignee.consigneeId == null ||
+        RmsConsignee.companyName == null ||
+        RmsConsignee.consigneeAbbreviation==null ||
+        RmsConsignee. consigneeRegisteredAddress ==null ||
+        RmsConsignee.consigneeReceiveAddress == null ||
+        RmsConsignee.consigneeRegistrationTime == null ||
+        RmsConsignee.consigneeContactName == null ||
+        RmsConsignee.consigneeContactTel == null
+       )this.$message.error("存在空值！");
+        console.log( this.$route.params.consigneeId);
+        this.axios
+          .post(
+            "/api/v1/rms/updateConsignee",
+           RmsConsignee
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$router.go(-1);
+            
+            }
+          });
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.form-box,
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+</style>

src/views/RMS/components/editRawWarehouse.vue

@@ -58,7 +58,8 @@ export default {
       console.log(this.form1)
        let RmsWarehouse={
       warehouseId:this.$route.params.warehouseId,
-      warehouseName:this.form1.warehouseName
+      warehouseName:this.form1.warehouseName,
+      shipperId:this.form1.shipperId,
     };
     if(
          warehouseName==null

src/views/RMS/router/index.js

@@ -8,6 +8,7 @@ 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 addConsignee from '../components/addConsignee.vue'
 import addGatepost from '../components/addGatepost.vue'
 import addMaterial from '../components/addMaterial.vue'
 import addOilPrice from '../components/addOilPrice.vue'
@@ -27,6 +28,7 @@ import carrier from '../components/carrier.vue'
 import editCapacity from '../components/editCapacity.vue'
 import editCarDriver from '../components/editCarDriver.vue'
 import editCarrier from '../components/editCarrier.vue'
+import editConsignee from '../components/editConsignee.vue'
 import editGatepost from '../components/editGatepost.vue'
 import editMaterial from '../components/editMaterial.vue'
 import editOilPrice from '../components/editOilPrice.vue'
@@ -65,6 +67,7 @@ const constantRouterMap = [
 		{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: 'addConsignee',name: 'addConsignee',meta: {code:'xtpzgl-yhgl'},component: addConsignee},
 		{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},
@@ -83,6 +86,7 @@ const constantRouterMap = [
 		{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: 'editConsignee/:consigneeId',name: 'editConsignee',meta:{code: 'xtpzgl-yhgl'},component: editConsignee},
 		{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},

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>

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>

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>
-

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>

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>

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>

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) {

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) {

src/views/TMS/components/importedIngredients/transportReserveFu.vue

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

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>

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},

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>

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>

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() {

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>

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>

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>

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>

src/views/inward/components/truckAppoint/addPlan.vue

@@ -2,11 +2,9 @@
 <template>
   <div id="endMaintenance">
     <page-title>新增计划</page-title>
-    <div>
-      <div class="truckList1">
-      <div class="truckList from">
-        <span class="text">选择承运商：</span>
-       <el-autocomplete
+  <el-form  label-width="80px">
+  <el-form-item label="承运商">
+    <el-autocomplete
       class="inline-input"
       v-model="state2"
       :fetch-suggestions="querySearch"
@@ -19,12 +17,11 @@
     <div class="name">{{ item.value }}</div>
   </template>
     </el-autocomplete>
-      </div>
-    </div>
-      <div class="form-box">
-        <dil-form :formId="305" v-model="form"></dil-form>       
-      </div>
-    </div>
+  </el-form-item>
+  <el-form-item label="车数" >
+    <el-input   v-model="planTruckNumber" placeholder="必填" ></el-input>
+  </el-form-item>
+</el-form>
     <template>
 			<div>		
 						<dilTable v-bind.sync="first" @radio-change="currentRadioChange">
@@ -46,13 +43,17 @@ export default {
     return {
       restaurants: [],
       state2:null,
+      planTruckNumber:null,
       carrierId:null,
       form: {},
       first:{
         requestUrl:"/api/v1/ams/getTruckRequirementList?apiId=250&requirementStatus=2",
         selectionType: "radio",
 				mapList: [],
-      }
+      },
+      numberValidateForm: {
+          planTruckNumber: ''
+        }
     };
   },
   methods: {
@@ -87,13 +88,24 @@ export default {
     },
     // 新增
     makeSure() {
-      console.log(this.form)
+      console.log(this.planTruckNumber)
+      console.log(typeof(this.planTruckNumber))  
+      if(this.carrierId == null){
+        this.$alert('请输入承运商！')
+        return
+      }else if(this.planTruckNumber == null){
+        this.$alert('请输入车数！')
+        return
+      }else if(typeof(this.mapList.requirementId) == 'undefined'){
+        this.$alert('请选择需要制定计划的需求！')
+        return
+      }
       let plan = {
         requirementId : this.mapList.requirementId,
-        planTruckNumber: this.form.planTruckNumber,
+        planTruckNumber: this.planTruckNumber,
         carrierId: this.carrierId
       };
-          
+      console.log(plan)  
       this.axios
         .post(
           "/api/v1/ams/addTruckPlan",
@@ -121,6 +133,9 @@ export default {
 </script>
 
 <style lang="scss">
+.el-form{
+  margin-left: 30%;
+}
 .el-form-item{
   display: flex;
 }
@@ -140,7 +155,7 @@ export default {
   .truckList {
     width: 96%;
     .el-input{
-      
+     width:128%
     }
     .text {
       display: inline-block;

src/views/inward/components/truckAppoint/addRequirement.vue

@@ -6,7 +6,7 @@
       <div class="form-box f2">
         <el-form :inline="true" class="demo-form-inline">
           <el-form-item label="采购订单号">
-            <el-input v-model="purchaseOrder" disabled> </el-input>
+            <el-input v-model="purchaseOrder" placeholder="必填" disabled> </el-input>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
@@ -56,7 +56,7 @@
       <div class="form-box f5">
         <el-form :inline="true" class="demo-form-inline">
           <el-form-item label="装车点">
-            <el-input v-model="truckPoint" disabled> </el-input>
+            <el-input v-model="truckPoint" placeholder="必填" disabled> </el-input>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
@@ -66,7 +66,7 @@
       <div class="form-box f5">
         <el-form :inline="true" class="demo-form-inline">
           <el-form-item label="卸车点">
-            <el-input v-model="truckPoint1" disabled> </el-input>
+            <el-input v-model="truckPoint1" placeholder="必填" disabled> </el-input>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="ondrawer(3)">浏览</el-button>
@@ -186,8 +186,13 @@ export default {
         this.second.requestUrl =
           "/api/v1/ams/getPurchaseIdByBatch?apiId=252&con=" + this.input;
       } else {
-        this.second1.requestUrl =
-          "/api/v1/ams/getWareHouse?apiId=251&con=" + this.input;
+        if(this.input == ""){
+          this.second1.requestUrl =
+          "/api/v1/ams/getWareHouse?apiId=251"
+        }else{
+            this.second1.requestUrl =
+          "/api/v1/ams/getWareHouse?apiId=251&con=" + this.input
+        }     
       }
     },
     currentRadioChange1(selection) {
@@ -200,22 +205,61 @@ export default {
     },
     currentRadioChange2(selection) {
       this.mapList2 = selection
-      console.log(this.mapList2)
-      
-      this.truckPoint= this.mapList2.companyBranchName+this.mapList2.companyBranchName+this.mapList2.wareHouseName
+      console.log(this.mapList2)     
+      if(this.mapList2.companyBranchName == null){
+          this.mapList2.companyBranchName = ''
+      }
+      if(this.mapList2.branchFactory == null){
+          this.mapList2.branchFactory = ''
+      }
+      if(this.mapList2.wareHouseName ==null){
+          this.mapList2.wareHouseName = ''
+      }
+      this.truckPoint= this.mapList2.companyBranchName+this.mapList2.branchFactory+this.mapList2.wareHouseName
     },
     currentRadioChange3(selection) {
       this.mapList3 = selection
-      this.truckPoint1 = this.mapList3.companyBranchName+this.mapList3.companyBranchName+this.mapList3.wareHouseName
+      console.log(selection)
+        if(this.mapList3.companyBranchName == null){
+          this.mapList3.companyBranchName = ''
+      }
+      if(this.mapList3.branchFactory == null){
+          this.mapList3.branchFactory = ''
+      }
+      if(this.mapList3.wareHouseName ==null){
+          this.mapList3.wareHouseName = ''
+      }
+      this.truckPoint1 = this.mapList3.companyBranchName+this.mapList3.branchFactory+this.mapList3.wareHouseName
     },
     // 新增
     makeSure() {
       if(this.purchaseOrder == null){
-          this.$alert('没有选择采购订单，请点击浏览选择采购订单')         
+          this.$alert('没有选择采购订单，请点击浏览选择采购订单！')
+          return         
       }else if(this.truckPoint == null){
-          this.$alert('没有选择用车地点，请点击浏览选择用车地点')
+          this.$alert('没有选择装车点，请点击浏览选择装车点！')
+          return
       }else if(this.truckPoint1 == null){
-          this.$alert('没有选择卸货点，请点击浏览选择卸货点')
+          this.$alert('没有选择卸货点，请点击浏览选择卸货点！')
+          return
+      }else if(typeof(this.form.materialWeight)=='undefined'){
+          this.$alert('没有输入物资重量，请输入！')
+          return
+      }else if(typeof(this.form.requirementType)=='undefined'){
+          this.$alert('没有选择需求类型，请选择！')
+          return
+      }else if(typeof(this.form.requirementTruckTime)=='undefined'){
+          this.$alert('没有选择用车时间，请选择！')
+          return
+      }else if(typeof(this.form.requirementShipperId)=='undefined'){
+          this.$alert('没有选择用车单位，请选择！')
+          return
+      }else if(typeof(this.form.requirementWorkType)=='undefined'){
+          this.$alert('没有选择费用类别，请选择！')
+          return
+      }else if(typeof(this.form.requirementEstimatedDuration)=='undefined'){
+          this.$alert('没有输入预计作业时长，请输入！')
+          return
       }
       let requiremnet = {
         purchaseOrderId: this.mapList1.purchaseOrderId,
@@ -256,6 +300,12 @@ export default {
 <style lang="scss">
 .el-form-item{
   display: flex;
+}
+.el-input{
+  width: 250px;
+}
+.form-box{
+  
 }
 .form-box,
 .button-box

src/views/inward/components/truckAppoint/updateRequirement.vue

@@ -2,10 +2,6 @@
 <template>
   <div id="endMaintenance">
     <page-title>修改需求</page-title>
-    <div class="main">
-      <span class="text">修改</span>
-      <span class="a"></span>
-    </div>
     <div>
 <div class="form-box f2">
 <el-form :inline="true"  class="demo-form-inline">
@@ -109,7 +105,6 @@ export default {
         .then((res) => {
           console.log(res.data.data)
           const list = res.data.data;
-
           this.foreignShipName = list[0].resultForeignShipName,
           this.purchaseOrder = list[0].purchaseOrderNo,
           this.truckPoint = list[0].wareHouseName,
@@ -121,8 +116,8 @@ export default {
           res.data.data.forEach((e) => {
             this.form= e;
             console.log(e);
+            console.log(e);
             console.log(this.form1);
-            console.log(this.$route.params.resultId);
           });
         });
     },

src/views/inward/components/truckOrder/decomposePlan.vue

@@ -213,8 +213,20 @@ export default {
             },
     // 修改
     makeSure() {
-      console.log(this.$refs.xTable.getInsertRecords())
-      console.log(this.form)
+      if(this.mapList0.lineId == null){
+        this.$alert('没有选择运输路线，请选择！')
+        console.log(this.lineId)
+        return
+      }else if(typeof(this.form.orderType) == 'undefined'){
+        this.$alert('没有选择订单类型，请选择')
+        return
+      }
+      for(var i=0;i<this.$refs.xTable.getInsertRecords().length;i++){
+        if(this.$refs.xTable.getInsertRecords()[i].capacityNumber == null){
+          this.$alert('未选择车牌，请选择车牌')
+          return
+        }     
+      }
       let BmsTrainFreight = {
           planId:this.$route.params.planId,
           lineId:this.mapList0.lineId,

src/views/inward/components/truckOrder/dispatchPlan.vue

@@ -52,14 +52,14 @@ export default {
     };
   },
   methods: {
-    selectionChange(selection) {
-      console.log("-----");
-      this.first.mapList = selection;
-      console.log(this.first.mapList);
-      console.log("------");
+    selectionChange(selection) { 
+      this.first.mapList = selection
     },
     dispatch() {
-      console.log(this.first.mapList);
+      if(this.first.mapList.length == 0){
+          this.$alert('请选择订单')
+          return
+      }
       this.$confirm("是否分派", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -78,6 +78,7 @@ export default {
                 this.first.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=3&carrierId=40&test=1"
                 this.second.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=40&test=1"
                 this.activeName = 'second'
+                this.first.mapList = []
               } else {
                 this.$message({
                   message: "分派失败",

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>

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>

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>

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>

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>

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>