合并冲突

build/utils.js

@@ -15,10 +15,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // ['index', 'sales', '  ', 'standard', 'qualityControl', 'produce', 'workshop',
 //    物流         进程     成本   报表          基础配置        系统配置
 //  'logistics', 'process', '   ', 'reportform', 'basicconfig', 'system']
-// let devModules = ['index','RMS','systemConfig','TMS']
 let devModules = ['all'];
-// let devModules = ['index','inward','appoint','sale','TMS']
-// let devModules = ['index','SporadicManage','RMS']
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

src/views/RMS/components/addCapacity.vue

@@ -1,23 +1,33 @@
 <template>
   <!-- 添加运力信息 -->
-  <div class="addWagonLoad">
+  <div class="addCapacity">
     <PageTitle>返回</PageTitle>
-
      <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
-        class="input"
-        v-model="state"
-        @input="onInput"
-        :fetch-suggestions="querySearch"
-        placeholder="边输入边查询"
-        :trigger-on-focus="false"
-        @select="handleSelect"
-      ></el-autocomplete>
-    </div>
+      <div class="elForm">
+             <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+      >
+        <el-form-item label="选择承运商">
+         <el-autocomplete
+          class="inline-input"
+          v-model="state"
+          :fetch-suggestions="querySearch"
+          placeholder="请输入承运商名称"
+          :trigger-on-focus="false"
+          @select="handleSelect"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.carrierName }}</div>
+        </template>
+        </el-autocomplete>
+        </el-form-item>
+    </el-form>
+      </div>
+ 
     <div class="button_box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
@@ -34,8 +44,8 @@ export default {
     return {
       form1: {},
       value: undefined,
-      carrierIds: "",
-      state: "",
+      carrierIds: null,
+      state:null,
       userId:null,
       restaurants: [],
       accessToken:null,
@@ -61,42 +71,30 @@ export default {
         }      
   })},
   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
-            })
-          });
-        }
-        
-      });
+    //承运商弹出层
+    handleSelect(item){    
+      this.carrierIds = item.carrierId
+      item.carrierName = this.state
     },
+    //以下是承运商边输边查搜索
     querySearch(queryString, cb) {
-      var restaurants = this.restaurants;
-      var results = queryString
-        ? restaurants.filter(this.createFilter(queryString))
-        : restaurants;
-      // 调用 callback 返回建议列表的数据
-      cb(results);
-    },
+        this.axios.post('/api/v1/uc/getCarrierMesByLike?index='+queryString).then((res)=>{
+        if(res.data.code == "200"){
+          console.log(res.data.data)
+          var restaurants = res.data.data
+          console.log(restaurants,"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);
-    },
+        return (restaurants)  =>  {
+          return (restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+    //以上是承运商边输边查搜索
     deleteUser(userId){
         this.axios.delete("pass/v1/sysusers/" + userId) .then((res) => {
            this.$message.error("添加失败,车牌可能重复");
@@ -187,7 +185,10 @@ export default {
 };
 </script>
 <style lang='scss' >
-.addWagonLoad {
+.addCapacity {
+  .elForm {
+    margin-left: 40%;
+  }
   .form_box {
     width: 100%;
     margin-top: 30px;

src/views/RMS/components/capacity.vue

@@ -66,7 +66,6 @@ export default {
     },
      toInsert() {
       this.$router.push("/addCapacity");
-
     },
     updateCapacity(capacityId){
       this.$router.push("/editCapacity/" + capacityId)

src/views/RMS/components/editCapacity.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 修改运力信息 -->
-<div class="addWagonLoad">
+<div class="editCapacity">
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
@@ -10,50 +10,30 @@
           <dil-form :formId="310" v-model="form1"></dil-form>
       </div>
     </div>
-    <div class="inputBox">
-    <span class="text">所属承运商</span>
-      <el-autocomplete
-        class="input"
-        v-model="state"
-        @input="onInput"
-        :fetch-suggestions="querySearch"
-        placeholder="边输入边查询"
-        :trigger-on-focus="false"
-        @select="handleSelect"
-      ></el-autocomplete>
-    </div>
+<div class="elForm">
+  <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+      >
+        <el-form-item label="选择承运商">
+         <el-autocomplete
+          class="inline-input"
+          v-model="state"
+          :fetch-suggestions="querySearch"
+          placeholder="请输入承运商名称"
+          :trigger-on-focus="false"
+          @select="handleSelect"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.carrierName }}</div>
+        </template>
+        </el-autocomplete>
+        </el-form-item>
+    </el-form>
+</div>
+    
 </div>
-
-        <!-- <div class="form-box f1">
-          <el-form :inline="true" :model="formInline" class="demo-form-inline">
-<div class="disableBox">
-  <el-form-item>
-     <el-input
-        placeholder=""
-        v-model="carrierName"
-        :disabled="true">
-    </el-input>
-  </el-form-item>
-  <el-form-item>
-    <el-button type="primary" @click="drawer = true">所属承运商</el-button>
-  </el-form-item>
-  </div>
-   </el-form>
-    </div>
-  <el-drawer
-      :visible.sync="drawer"
-      :direction="direction"
-      :before-close="handleClose">
-        <el-input
-            placeholder="请输入内容"
-            v-model="inputText"
-            clearable>
-          </el-input>
-          <el-button type="primary" class="btn" @click="onclick">
-            <i class="el-icon-search"></i>查询
-          </el-button>
-            <div><dilTable v-bind.sync="options" @radio-change="currentRadioChange" ></dilTable></div>
-</el-drawer> -->
     <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
@@ -90,8 +70,7 @@ export default {
   },
   created(){
       this.carrierUserId = getCookie("userId");
-      console.log(this.carrierUserId ,'carrierUserId')
-      
+      console.log(this.carrierUserId ,'carrierUserId')     
   },
   mounted() {
    this.information();
@@ -106,42 +85,30 @@ export default {
         }      
   })},
   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
-            })
-          });
-        }
-        
-      });
+    //承运商弹出层
+    handleSelect(item){    
+      this.carrierIds = item.carrierId
+      item.carrierName = this.state
     },
+    //以下是承运商边输边查搜索
     querySearch(queryString, cb) {
-      var restaurants = this.restaurants;
-      var results = queryString
-        ? restaurants.filter(this.createFilter(queryString))
-        : restaurants;
-      // 调用 callback 返回建议列表的数据
-      cb(results);
-    },
+        this.axios.post('/api/v1/uc/getCarrierMesByLike?index='+queryString).then((res)=>{
+        if(res.data.code == "200"){
+          console.log(res.data.data)
+          var restaurants = res.data.data
+          console.log(restaurants,"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);
-    },
+        return (restaurants)  =>  {
+          return (restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+    //以上是承运商边输边查搜索
     currentRadioChange(selection){
       this.mapList=selection,
       console.log(this.mapList)
@@ -159,11 +126,9 @@ export default {
           "/api/v1/rms/getCapacityById/" +
             this.$route.params.capacityId
         )
-
         .then((res) => {
             console.log(res.data.data)
-          res.data.data.forEach((e) => {
-           
+          res.data.data.forEach((e) => {          
             this.form1 = e;
             console.log(e);
             console.log(this.form1);
@@ -212,8 +177,8 @@ export default {
           )
           .then((res) => {
             if (res.data.code == "200") {
-              this.$router.go(-1);
-            
+              this.$message.success("修改成功")
+              this.$router.go(-1);           
             }
           });
     },
@@ -221,7 +186,11 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
- .form_box {
+.editCapacity{
+    .elForm{
+      margin-left: 40%;
+    }
+    .form_box {
     width: 100%;
     margin-top: 30px;
     display: flex;
@@ -259,4 +228,6 @@ export default {
   margin-top: 1.5rem;
   margin-bottom: 1.25rem;
 }
+}
+ 
 </style>

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicEnfactory/enFactory.vue

@@ -0,0 +1,44 @@
+//进厂
+<template>
+  <!-- 零星物资进厂作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=12",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=394&orderType=12&con=" + this.input;
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicEnfactory/grossWeight.vue

@@ -0,0 +1,44 @@
+//计毛
+<template>
+  <!-- 零星物资计毛作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=12",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=12&con=" + this.input;
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicEnfactory/outFactory.vue

@@ -0,0 +1,44 @@
+//出厂
+<template>
+  <!-- 零星物资出厂作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=12",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=12&con=" + this.input;
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicEnfactory/tareWeight.vue

@@ -0,0 +1,44 @@
+//计皮
+<template>
+  <!-- 零星物资计皮作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=12",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=12&con=" + this.input;
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicEnfactory/unload.vue

@@ -0,0 +1,43 @@
+//卸货
+<template>
+  <!-- 零星物资卸货卸货实绩页面 -->
+  <div class="homeworkPath">
+   <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option"></dilTable>
+  </div>
+</template>
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getUnloadResult?apiId=389&orderType=12",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=12&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicOutfactory/enFactory.vue

@@ -0,0 +1,44 @@
+//进厂
+<template>
+  <!-- 零星物资进厂作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=13",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=13&con=" + this.input;
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicOutfactory/grossWeight.vue

@@ -0,0 +1,44 @@
+//计毛
+<template>
+  <!-- 零星物资计毛作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=398&orderType=13",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=422&orderType=13&con=" + this.input;
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicOutfactory/load.vue

@@ -0,0 +1,44 @@
+//卸货
+<template>
+  <!-- 零星物资卸货卸货实绩页面 -->
+  <div class="homeworkPath">
+   <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option"></dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getUnloadResult?apiId=404&orderType=13",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=404&orderType=13&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicOutfactory/outFactory.vue

@@ -0,0 +1,44 @@
+//出厂
+<template>
+  <!-- 零星物资出厂作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=13",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=13&con=" + this.input;
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicOutfactory/tareWeight.vue

@@ -0,0 +1,44 @@
+//计皮
+<template>
+  <!-- 零星物资计皮作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=401&orderType=13",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=401&orderType=13&con=" + this.input;
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/moreThanMaterialTruck/transportAppoint/addSporadicTransportAppoint.vue

@@ -0,0 +1,669 @@
+//新增运输预约
+<template>
+  <!-- 新增运输作业页面 -->
+  <div class="addSporadic">
+    <page-title>运输预约</page-title>
+    <div class="form-box">
+        <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+        >
+        <el-form-item label="发货单位">
+         <el-autocomplete
+          class="inline-input"
+          v-model="stateSupplier"
+          :fetch-suggestions="querySearchSupplier"
+          placeholder="请输入发货单位名称"
+          :trigger-on-focus="false"
+          @select="handleSelectSupplier"
+          @input="oninputSupplier"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.supplierName }}</div>
+        </template>
+        </el-autocomplete>
+        </el-form-item>
+        </el-form>
+        <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+        >
+        <el-form-item label="收货单位">
+         <el-autocomplete
+          class="inline-input"
+          v-model="stateConsignee"
+          :fetch-suggestions="querySearchConsignee"
+          placeholder="请输入收货单位名称"
+          :trigger-on-focus="false"
+          @select="handleSelectConsignee"
+          @input="oninputConsignee"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.consigneeCompanyName }}</div>
+        </template>
+        </el-autocomplete>
+        </el-form-item>
+        </el-form>
+        <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+      >
+        <el-form-item label="流向">
+        <el-select v-model="orderType" placeholder="请选择">
+        <el-option
+          v-for="item in orderTypeList"
+          :key="item.value"
+          :label="item.label" 
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+    </el-form-item>
+        </el-form>
+        <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+      >
+        <el-form-item label="选择路线">
+          <el-input v-model="lineName" placeholder="必填" disabled>
+          </el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="ondrawer(5)">浏览</el-button>
+        </el-form-item>
+        </el-form>
+        <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+      >
+        <el-form-item label="选择承运商">
+         <el-autocomplete
+          class="inline-input"
+          v-model="stateCarrier"
+          :fetch-suggestions="querySearchCarrier"
+          placeholder="请输入承运商名称"
+          :trigger-on-focus="false"
+          @select="handleSelectCarrier"
+          @input="oninputCarrier"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.carrierName }}</div>
+        </template>
+        </el-autocomplete>
+        </el-form-item>
+        </el-form>
+           <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+      >
+        <el-form-item label="趟次">
+         <el-input
+          class="inline-input"
+          v-model="materialTimes"
+          placeholder="趟次"
+          :trigger-on-focus="false"
+        >
+        </el-input>
+        </el-form-item>
+        </el-form>
+        <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+      >
+        <el-form-item label="选择物资">      
+        </el-form-item>
+        <el-form-item > 
+          <el-button type="primary" @click="drawTable" class="truckBtn"
+          >浏览</el-button>
+        </el-form-item>
+        </el-form>
+    </div>
+    <div class="swtichTop">
+    <span class="titile">点击浏览选择物资之前请选择物资单位！</span>
+    <div class="switch" v-if="tableData.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>
+    <!-- 物资表格 -->
+    <div class="truckListTable">
+    <div class="selectionTable">
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+        highlight-current-row
+      >
+        <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.label !== '件数'">
+            <span>{{ item.label }}</span>
+          </template>
+          <!-- 插入输入框 -->
+          <template slot-scope="scope">
+            <template v-if="item.slot">
+                <!-- 装卸货优先级 -->
+               <template v-if="item.prop == 'materialPriority'">
+                <el-input
+                  class="textinput"
+                  v-model.number="scope.row.materialPriority"
+                ></el-input>
+              </template>
+              <!-- 物资件数 -->
+              <template v-if="item.prop == 'orderMaterialNumber'">
+                <el-input
+                  class="textinput"
+                  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
+              @click.native.prevent="deleteRow(scope.$index, tableData)"
+              type="text"
+              icon="el-icon-close"
+              size="big"
+            ></el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    </div>
+    <!-- 物资模态框 -->
+    <div class="drawSty">
+      <el-drawer
+      title="选择物资信息"
+      :visible.sync="table"
+      direction="rtl"
+      size="35%"
+      :show-close="false"
+    >
+      <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 @click="open">取消</el-button>
+      <el-button type="primary" @click="makeSure1">确定</el-button>
+      <div class="tablecls">
+        <!-- 查询所有的物资 -->
+        <dilTable v-bind.sync="materialOptions" @selection-change="selectionChange">
+        </dilTable>
+      </div>
+    </el-drawer>
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        style="margin-top: 20px"
+        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="receiveOptions"
+          @radio-change="currentRadioChange1"
+        ></dilTable>
+      </div>
+      <div v-show="a == 2">
+        <dilTable
+          v-bind.sync="secend"
+          @radio-change="currentRadioChange2"
+        ></dilTable>
+      </div>
+      <div v-show="a == 5">
+        <dilTable
+          v-bind.sync="line"
+          @radio-change="currentRadioChange5"
+        ></dilTable>
+      </div>
+    </el-drawer>
+    </div>  
+    <div class="button-box">
+      <el-button @click="onClickCancel">返回</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 {
+      materialTimes:null,
+      options: [],
+      value: '',
+      receiveName:'',
+      stateCarrier:null,
+      stateSupplier:null,
+      stateConsignee:null,
+      restaurantsConsignee:null,
+      restaurantsSupplier:null,
+      restaurantsCarrier: [],
+      orderTypeList:[
+        {
+          value:15,
+          label:'进厂'
+        },{
+          value:16,
+          label:'出厂'
+        }
+      ],
+      likeCarrierLike:'',
+      orderType:15,
+      // 线路名称
+      lineName: "",
+      //线路id
+      lineId: null,
+      // 件数与重量的开关
+      value: false,
+      //物资模态框开关
+      table: false,
+      //物资表格表头
+      tableTop: [
+        {
+          prop: "materialCode",
+          label: "物资编码",
+          width: "160",
+        },
+        {
+          prop: "materialName",
+          label: "物资名称",
+          width: "140",
+        },
+        {
+          prop: "Specification",
+          label: "规格型号",
+          width: "140",
+        },
+        {
+          prop: "materialPriority",
+          label: "装卸货优先级",
+          slot: true,
+        },
+        {
+          prop: "orderMaterialWeight",
+          label: "重量",
+          slot: true,
+        },
+      ],
+      // 收货单位ID
+      receiveId:null,
+      //承运商ID
+      carrierId:null,
+      //物资表格数据
+      tableData: [],
+      selectionList1: [],
+      //物资名称
+      materialName: "",
+      //发货单位名称
+      supplierName: "",
+      //发货单位id
+      supplierId: null,
+      //物资id
+      materialId: null,
+      //是否需要打开模态窗口
+      drawer: false,
+      //卸货点id
+      unloadPointId: "",
+      //卸货点名称
+      unloadPointName: "",
+      a: 1,
+      direction: "rtl",
+      input: "",
+      //物资模态框
+      materialOptions:{
+          requestUrl:
+            "/api/v1/uc/selectAllMaterialName?apiId=395",
+           selectionType: "select",
+      },
+      line: {
+        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
+        selectionType: "radio",
+      },
+      row: {},
+    };
+  },
+  watch: {
+    value() {
+      if (this.value) {
+        console.log(this.value)
+        console.log(this.tableTop.length)
+        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.push({
+          prop: "orderMaterialNumber",
+          label: "件数",
+          slot: true,
+        });
+      } else {
+        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.push({
+          prop: "orderMaterialWeight",
+          label: "重量",
+          slot: true,
+        });
+      }
+    },
+  },
+  methods: {
+    drawTable(){
+      console.log('jll')
+      this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395&test=1"
+      this.selectionList1 = []
+      this.table = true
+    },
+    //收货单位弹出层
+    handleSelectConsignee(item){
+      console.log(this.consigneeId)
+      this.consigneeId = item.consigneeId
+      item.consigneeCompanyName = this.consigneeCompanyName
+      console.log(this.consigneeId)
+      console.log('这是选中的收货单位')
+    },
+    //以下是发货单位边输边查搜索
+    querySearchConsignee(queryString, cb) {
+      this.axios.post('/api/v1/uc/getConsigneeByLike?index='+queryString).then((res)=>{
+        if(res.data.code == "200"){
+          console.log(res)
+          var restaurantsConsignee = res.data.data
+          var results = queryString ? restaurantsConsignee.filter(this.createFilterConsignee(queryString)) :restaurantsConsignee;
+            // 调用 callback 返回建议列表的数据
+          console.log(results,"results");
+          cb(results);
+        }
+      })    
+      },
+    createFilterConsignee(queryString) {
+        return (restaurantsConsignee) => {
+          return (restaurantsConsignee.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+      //以上是返回单位边输边查搜索
+     //发货单位弹出层
+    handleSelectSupplier(item){
+      this.supplierId = item.supplierId
+      item.supplierName = this.supplierName
+    },
+    //以下是发货单位边输边查搜索
+    querySearchSupplier(queryString, cb) {
+        this.axios.post('/api/v1/uc/getSupplierMesByLike?index='+this.stateSupplier).then((res)=>{
+        if(res.data.code == "200"){    
+          var restaurantsSupplier = res.data.data
+          var results = queryString ? restaurantsSupplier.filter(this.createFilterSupplier(queryString)) :restaurantsSupplier;
+          // 调用 callback 返回建议列表的数据
+          cb(results);
+        }
+      })  
+      },
+    createFilterSupplier(queryString) {
+        return (restaurantsSupplier) => {
+          return (restaurantsSupplier.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+      //以上是返回单位边输边查搜索
+    //承运商弹出层
+    handleSelectCarrier(item){    
+      this.carrierId = item.carrierId
+      item.carrierName = this.stateCarrier
+    },
+    //以下是承运商边输边查搜索
+    querySearchCarrier(queryString, cb) {
+        this.axios.post('/api/v1/uc/getCarrierMesByLike?index='+queryString).then((res)=>{
+        if(res.data.code == "200"){
+          var restaurantsCarrier = res.data.data
+          console.log(restaurantsCarrier,"restaurantsCarrier");
+          var results = queryString ? restaurantsCarrier.filter(this.createFilterCarrier(queryString)) :restaurantsCarrier;
+           // 调用 callback 返回建议列表的数据
+          cb(results);
+        }
+        })     
+      },
+    createFilterCarrier(queryString) {
+        return (restaurantsCarrier)  =>  {
+          return (restaurantsCarrier.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+    //以上是承运商边输边查搜索
+    //删除行
+    deleteRow(index, rows) {
+      rows.splice(index, 1);
+    },
+    // 返回主界面
+    makeSure1() {
+      console.log(this.selectionList1) 
+      this.selectionList1.forEach((e) => {
+        var addmap = {
+          materialCode: e.materialCode,
+          materialName: e.materialName,
+          Specification: e.materialSpecification+e.materialModel,
+          orderMaterialWeight: null,        
+          materialId: e.materialId,
+          materialPriority:1,
+        };
+          this.tableData.push(addmap);
+      });     
+        this.selectionList1 = [];
+        this.table = false;
+        console.log(this.selectionList1)
+    },
+    //取消模态框多选
+    open() {
+      if (this.selectionList1.length != 0) {
+        this.$confirm("取消会将已选择的数据清空, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.selectionList1 = [];
+            this.table = false;
+          })
+          .catch(() => {});
+      } else {
+        this.table = false;
+      }
+    },
+      // 返回选中的物资信息
+    selectionChange(selection) {
+      this.selectionList1 = [];
+      this.selectionList1 = selection;
+    },
+    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" +
+          "&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;
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.push("/importedFuel/transportReserveRan");
+    },
+    currentRadioChange1(selection) {
+      console.log(selection);
+      this.receiveName = selection.consigneeCompanyName;
+      this.receiveId = selection.consigneeId;
+    },
+    currentRadioChange2(selection) {
+      this.supplierName = selection.supplierName;
+      this.supplierId = selection.supplierId;
+    },
+    currentRadioChange4(selection) {
+      this.unloadPointId = selection.warehouseId;
+      this.unloadPointName = selection.warehouseName;
+    },
+    currentRadioChange5(selection) {
+      console.log(selection)
+      if(selection.lineName == null &&selection.lineDesk == null){
+          this.lineName = ''
+      }else{
+          this.lineName = selection.lineName+'  '+selection.lineDesk 
+          this.lineId = selection.lineId;
+      }
+      
+    },
+    currentRadioChange3(selection) {
+      this.carriermapList = [];
+      this.carriermapList = selection;
+    },
+    jgao(){
+      this.$alert('有数据未填写')
+      return
+    },
+    // 确认
+    makeSure() {
+        console.log(this.supplierId,"this.supplierId")
+        console.log(this.consigneeId,"this.consigneeId")
+        console.log(this.carrierId,"this.carrierId")
+        console.log(this.lineId,"this.lineId")
+        console.log(this.tableData)
+        if(this.supplierId==null||this.lineId==null||this.carrierId==null||this.consigneeId==null){
+          this.$alert('存在空值')
+          return
+        }else if(this.tableData.length == 0){
+          this.$alert('请点击浏览勾选物资')
+          return
+        }
+        var i = 0;
+        var j = 0;
+        this.tableData.forEach((e) => {
+          if(e.materialPriority == null){
+            i++
+          }else if(e.orderMaterialWeight == null){            
+            j++
+          }            
+        })
+        if(i != 0){
+           this.$alert('装卸货优先级未填写')
+           return
+        }else if(j != 0){
+           this.$alert('物资重量未填写')
+           return
+        }
+        let amsOrder = {
+          supplierId:this.supplierId,
+          lineId:this.lineId,
+          orderType:this.orderType,
+          carrierId: this.carrierId,
+          receiveId: this.consigneeId,
+          orderTime:this.materialTimes,
+          mapList: this.tableData,
+        };   
+        this.axios.post("/api/v1/ams/addSporadicOrders", amsOrder).then((res) => {
+          if (res.data.code == "200") {
+            this.$router.go(-1)
+          }
+        });
+      }
+    },
+};
+</script>
+<style lang="scss" scoped>
+.addSporadic{
+  .contractDetails {
+  width: 100%;
+}
+.drawSty{
+  .el-input{
+    width: 240px;
+  }
+}
+.swtichTop{
+  display: flex;
+  height: 40px;
+  align-content: center;
+  justify-content: center;
+  padding-right:20px ;
+  .titile{
+    color: red;
+    font-size: 14px;
+  }
+  .switch{
+    margin-right: -60px
+  }
+}
+.form-box {
+  display: inline-block !important;
+  margin-left: 488px;
+  .el-input {
+    width: 320px;
+  }
+  .el-select{
+    width: 320px;
+  }
+  .el-autocomplete{
+    width: 320px;
+  }
+  .el-form {
+    padding: 10px;
+  }
+  .truckBtn{
+    width: 320px;
+  }
+}
+.button-box {
+  margin-left: 45% ;
+}
+}
+</style>

src/views/SporadicManage/components/moreThanMaterialTruck/transportAppoint/editTransportAppoint.vue

@@ -0,0 +1 @@
+//编辑运输预约

src/views/SporadicManage/components/moreThanMaterialTruck/transportAppoint/transportAppoint.vue

@@ -0,0 +1,151 @@
+//运输预约展现
+<template>
+  <!-- 零星物资运输预约 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="insertClick">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+      <el-button
+        type="primary"
+        @click="sendClick()"
+        v-if="this.activeName == 'first'"
+      >
+        <i class="el-icon-bottom"></i>下发
+      </el-button>
+    </div>
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <!-- 未下发 -->
+      <el-tab-pane label="未下发" name="first">
+        <dilTable
+          v-bind.sync="option1"
+          ref="table"
+          @selection-change="selectionChange"
+        >
+          <el-table-column
+            fixed="right"
+            align="center"
+            label="操作"
+            width="120"
+          >
+            <template slot-scope="scope">
+              <!-- <el-button @click="updateClick(scope.row.orderId)" type="text" size="small">
+                修改
+              </el-button> -->
+              <el-button @click="deleteClick(scope)" type="text" size="small">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </dilTable>
+      </el-tab-pane>
+      <!-- 已下发 -->
+      <el-tab-pane label="已下发" name="second">
+        <dilTable v-bind.sync="option2"> </dilTable>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "inplantTMS",
+  data() {
+    return {
+      input: "",
+      Time: "",
+      activeName: "first",
+      option1: {
+        // 表格请求数据的地址
+        requestUrl:
+          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=15",
+        // 控制显示多选列
+        selectionType: "select",
+      },
+      option2: {
+        // 表格请求数据的地址
+        requestUrl:
+          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15",
+      },
+      selection: [],
+    };
+  },
+  methods: {
+    //获取选中的订单
+    selectionChange(selection) {
+      this.maplist = selection;
+    },
+    onclick() {
+      if (this.activeName == "first") {
+        this.option1.requestUrl =
+          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=15&con=" +
+          this.input;
+      } else {
+        this.option2.requestUrl =
+          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15&con=" +
+          this.input;
+      }
+    },
+    handleClick(tab, event) {
+      console.log(tab, event);
+    }, // 下发
+    // 下发
+    sendClick() {
+      console.log(this.maplist);
+      this.axios
+        .post("/api/v1/ams/issueSporadicOrders", this.maplist)
+        .then((res) => {
+          if (res.data.code == "200") {
+            this.option1.requestUrl =
+              "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=15&test=1"
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15&test=1"
+            this.$message({
+              type: "success",
+              message: "下发成功!",
+            });
+          }
+        });
+    },
+    // 删除
+    deleteClick(scope) {
+      console.log(scope.row.sporadicOrderId);
+      this.axios
+        .post(
+          "/api/v1/ams/deleteSporadicOrders?sporadicOrderId=" +
+            scope.row.sporadicOrderId
+        )
+        .then((res) => {
+          if (res.data.code == "200") {
+            this.option1.requestUrl =
+              "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=15&test=1";
+            this.option2.requestUrl =
+            "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15&test=1"
+            this.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+    },
+    //新增
+    insertClick() {
+      this.$router.push("addMornThanTransportAppoint");
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 40px;
+    .el-input {
+      width: 250px;
+      margin-right: 20px;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/moreThanMaterialTruck/transportOrder/addTransportOrder.vue

@@ -0,0 +1,374 @@
+//新增运输订单
+<template>
+  <div class="addSaleOrderSend">
+    <page-title>新增运输订单派车</page-title>
+    <!-- 零星订单表的数据 -->
+    <div class="saleOrder">
+      <dilTable
+        v-bind.sync="option"
+        @radio-change="currentRadioChange"
+      ></dilTable>
+    </div>
+    <!-- 表单选择车辆-->
+    <div class="from">
+      <div class="vehicle">
+        <span class="text">车辆</span>
+        <el-button type="primary" @click="onClick(2)">浏览</el-button>
+        <span class="span"></span>
+      </div>
+    </div>
+    <!-- 派车表格 -->
+    <div class="selectionTable from">
+      <el-table
+        :data="selectionList"
+        border
+        style="width: 100%"
+        highlight-current-row
+      >
+        <el-table-column type="index" label="序号" width="50">
+        </el-table-column>
+        <el-table-column
+          v-for="(item, i) in tableTop"
+          :key="i"
+          :prop="item.prop"
+          :label="item.label"
+          :width="item.width"
+          align="center"
+          show-overflow-tooltip
+        >
+          <template slot="scope" v-if="item.label !== '重量'">
+            <span>{{ item.label }}</span>
+          </template>
+          <!-- 插入输入框 -->
+          <template slot-scope="scope">
+            <template v-if="item.slot">
+              <!-- 物资重量 -->
+              <template v-if="item.prop == 'orderPlanWeight'">
+                <el-input
+                  class="textinput"
+                  @input="onInput"
+                  placeholder="请输入内容(必填)"
+                  v-model.number="scope.row.orderPlanWeight"
+                ></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
+              @click="deleteRow(scope.$index)"
+              type="text"
+              icon="el-icon-close"
+              size="big"
+            ></el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!-- 车辆模态框 -->
+    <el-drawer 
+      :visible.sync="truckDrawer" 
+      :with-header="false"
+      :destroy-on-close="false"
+      direction="rtl"
+      size="40%"
+      :show-close="false"
+      :wrapperClosable="false"
+      modal
+      close-on-press-escape
+    
+    >
+      <el-input
+        placeholder="请输入内容"
+        v-model="truckText"
+        style="margin-top: 10px; margin-left: 20px; width: 250px"
+        clearable
+      >
+      </el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="selectTruckClick"
+        style="margin-left: 5px"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="AddTruckClick"
+        style="margin-left: 5px"
+      >
+        <i class="el-icon-check"></i>确定
+      </el-button>
+      <div class="tablecls">
+        <!-- 查询所有的车辆 -->
+        <dilTable
+          v-bind.sync="truck"
+          @selection-change="currentRadioChange1"
+        ></dilTable>
+      </div>
+    </el-drawer>
+    <div class="button_box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { getCookie } from "@/utils/util.js";
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      //线路名称
+      lineName:null,
+      lineId:null,
+      //线路表格单选缓存数据的
+      cacheLine:[],
+      //已经选择车辆物资信息
+      selectionList:[],
+      //销售订单物资信息
+      option: {
+        // 表格请求数据的地址
+        requestUrl:"",
+        // 控制显示当选列
+        selectionType: "radio",
+        isPagination: false,
+      },
+      //当前选中的物资id
+      materialId: null,
+      //当前选中的物资名称
+      materialName: null,
+      //选中的线路名称
+      lineName: null,
+      //选中的线路id
+      lineId: null,
+      //是否打开选择线路的模态框
+      drawer:false,
+      //是否打开选择车辆的模态框
+      truckDrawer:false,
+      //是否打开收货地址的模态框
+      addressDrawer:false,
+      //线路的表格
+      line: {
+        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
+        selectionType: "radio",
+      },
+      //车辆的表格
+      truck: {
+        requestUrl: "",
+        selectionType: "select",
+      },
+      //收货地址的表格
+      Address: {
+        requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=255",
+        selectionType: "radio",
+      },
+      addressText:null,
+      //线路表格的框计算输入的值
+      lineText:null,
+      tableTop: [
+        {
+          prop: "capacityNumber",
+          label: "车牌号",
+        },
+        {
+          prop: "materialName",
+          label: "物资名称",
+        },
+        {
+          prop: "orderPlanWeight",
+          label: "重量",
+          slot: true,
+        },
+      ],
+      truckText:null,
+      //当前多选选中的车辆
+      selectTruck:[],
+    };
+  },
+  created() {
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+        getCookie("userId");
+    } else {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null;
+    }
+    this.option.requestUrl = "/api/v1/ams/getSaleOrderAndMaterialById?apiId=410&saleOrderId=" + this.$route.params.saleOrderId;
+  },
+  methods: {
+    onInput(val){
+      if(!isNumber(val)){
+        this.$message.warning('重量请输入数字')
+      }
+    },
+    //点击确定按钮的事件
+    makeSure(){
+      let state = false;
+      console.log(this.selectionList)
+      if(state){
+        this.axios.post('/api/v1/ams/dispatchTruckOrderBySale',{
+          saleOrderId:this.$route.params.saleOrderId,
+          mapList:this.selectionList,
+        }).then((res)=>{
+          if(res.data.code == '200'){
+            this.$message.success('派车成功')
+            this.cancel();
+          }
+        })
+      }else{
+        this.$message.warning('重量请输入数字')
+      }
+    },
+    //点击取消按钮的事件
+    cancel(){
+      this.$router.push('/saleOrder')
+    },
+    //点击删除按钮删除当前点击的对象
+    deleteRow(index){
+      this.selectionList.splice(index,1)
+    },
+    //复制的方法
+    copyRow(index,row){
+      let arr = [];
+      for(var i = 0 ;i<this.selectionList.length; i++){
+        if(i == index){
+          arr.push(this.selectionList[i]);
+          arr.push({
+            capacityId:row.capacityId,
+            capacityNumber:row.capacityNumber,
+            carrierName:row.carrierName,
+            lineId:row.lineId,
+            lineName:row.lineName,
+            materialId:row.materialId,
+            materialName:row.materialName,
+            orderPlanWeight:row.orderPlanWeight,
+            saleDateOfReceipt:row.saleDateOfReceipt,
+            saleMaterialId:row.saleMaterialId,
+            saleOrderConsignee:row.saleOrderConsignee,
+            saleOrderConsigneeTel:row.saleOrderConsigneeTel,
+            saleShipperAddressName:row.saleShipperAddressName,
+            saleShippingAddressId:row.saleShippingAddressId,
+          }
+          )
+        }else{
+          arr.push(this.selectionList[i]);
+        }
+      }
+      this.selectionList = [];
+      this.selectionList = arr;
+    },
+    //车辆模态框的确定事件
+    AddTruckClick(){
+      console.log(this.selectTruck)
+      this.selectTruck.forEach(e => {
+        // console.log(e)
+        this.selectionList.push({
+          //销售订单与物资表主键
+          saleMaterialId:this.saleMaterialId,
+          capacityId:e.capacityId,
+          capacityNumber:e.capacityNumber,
+          carrierName:e.carrierName,
+          materialName:this.materialName,
+          materialId:this.materialId,
+          lineName:this.lineName,
+          lineId:this.lineId,
+        })
+      });
+      this.truckDrawer = false;
+    },
+    //车辆模态框框计算
+    selectTruckClick(){
+      if (getCookie("orgCode") == "chengyunshang") {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+          getCookie("userId") + "&index="+this.truckText;
+      } else {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null + "&index="+this.truckText;
+      }
+    },
+    //车辆表格
+    currentRadioChange1(select){
+      this.selectTruck = [];
+      this.selectTruck = select;
+    },
+    //主界面表格单选
+    currentRadioChange(row) {
+      this.materialId = row.materialId;
+      this.materialName = row.materialName;
+      this.saleMaterialId = row.saleMaterialId;
+    },
+    //线路表格的单选事件
+    currentRadioChange5(row){
+      this.cacheLine = row;
+    },
+    onClick(num) {
+      if (num == 1) {
+        this.drawer = true;
+      }else if(num == 2){
+        if(!this.materialId){
+          this.$message.warning('请选择物资后，在点击')
+        }else{
+          this.truckDrawer = true;
+        }
+      }
+    },
+  },
+};
+</script>
+
+<style lang='scss'>
+.addSaleOrderSend {
+  .from {
+    margin-top: 20px;
+    .line {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .el-input {
+        width: 250px;
+        margin-left: 10px;
+        margin-right: 10px;
+      }
+    }
+    .vehicle {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin-top: 20px;
+      .el-button {
+        width: 250px;
+        margin-left: 10px;
+        margin-right: 10px;
+      }
+      .span {
+        width: 70px;
+      }
+    }
+  }
+  .tablecls{
+    margin-top: 20px;
+  }
+  .button_box{
+    display: flex;
+    justify-content: center;
+    margin: 20px;
+    .el-button{
+      width: 100px;
+      margin-left: 20px;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/moreThanMaterialTruck/transportOrder/transportOrder.vue

@@ -0,0 +1,392 @@
+//运输派单
+<template>
+  <div class="transportOrder">
+    <div class="transportOrder_top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="Insert" v-if="activeName == 'option'">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+      <el-button type="primary" @click="Issue" v-if="activeName == 'option'">
+        <i class="el-icon-download"></i>下发
+      </el-button>
+    </div>
+    <div class="transportOrder_bottom">
+      <el-tabs v-model="activeName">
+        <!-- 未下发 -->
+        <el-tab-pane label="未下发" name="option">
+          <dilTable
+            v-bind.sync="option"
+            ref="table"
+            @selection-change="selectionChange"
+          >
+            <el-table-column fixed="right" label="操作" width="150">
+              <template slot-scope="scope">
+                <el-button @click="detailclick(scope.row)" type="text">
+                  物资详情
+                </el-button>
+                <el-button
+                  type="text"
+                  @click="addTruck(scope.row, 1)"
+                  v-if="!scope.row.capacityNumber"
+                >
+                  添加运力
+                </el-button>
+                <el-button type="text" @click="addTruck(scope.row, 2)" v-else>
+                  修改
+                </el-button>
+              </template>
+            </el-table-column>
+            <!-- 物资详情 -->
+            <el-table-column type="expand" width="1">
+              <template slot-scope="props">
+                <el-form
+                  label-position="center"
+                  inline
+                  class="demo-table-expand"
+                >
+                  <div v-if="false">{{ props }}</div>
+                  <div>
+                    <el-table :data="tableData">
+                      <el-table-column
+                        v-for="(item, i) in tableHead"
+                        :key="i"
+                        :prop="item.prop"
+                        :label="item.label"
+                        :width="item.width"
+                      ></el-table-column>
+                    </el-table>
+                  </div>
+                </el-form>
+              </template>
+            </el-table-column>
+          </dilTable>
+        </el-tab-pane>
+        <!-- 已下发 -->
+        <el-tab-pane label="已下发" name="first">
+          <dilTable v-bind.sync="first"></dilTable>
+        </el-tab-pane>
+        <!-- 已接收 -->
+        <el-tab-pane label="已接收" name="Received">
+          <dilTable v-bind.sync="Received"></dilTable>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+
+    <!-- <el-dialog
+      title="请选择车辆"
+      :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :destroy-on-close="true"
+      width="30%"
+      show-close
+      modal
+      lock-scroll
+    >
+     <el-drawer
+      title="请选择车辆信息"
+      :visible.sync="drawer"
+      :direction="direction"
+      :close-on-press-escape="false"
+      :destroy-on-close="true"
+      :wrapperClosable="false"
+      modal
+      show-close
+    >
+      <div class="drawer_top">
+        <el-input placeholder="请输入内容" v-model="inputText" clearable>
+        </el-input>
+        <el-button type="primary" class="btn" @click="inputClick">
+          <i class="el-icon-search"></i>查询
+        </el-button>
+      </div>
+      <div class="drawer_bottom">
+        <dilTable
+          v-bind.sync="truck"
+          @radio-change="currentRadioChange"
+        ></dilTable>
+      </div>
+    </el-drawer>
+    </el-dialog> -->
+    <el-drawer
+      title="请选择车辆信息"
+      :visible.sync="drawer"
+      :direction="direction"
+      :destroy-on-close="true"
+      :before-close="handleClose"
+    >
+      <div class="drawer_top">
+        <el-input placeholder="请输入内容" v-model="inputText" clearable>
+        </el-input>
+        <el-button type="primary" class="btn" @click="inputClick">
+          <i class="el-icon-search"></i>查询
+        </el-button>
+      </div>
+      <div class="drawer_bottom">
+        <dilTable
+          v-bind.sync="truck"
+          @radio-change="currentRadioChange"
+        ></dilTable>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  data() {
+    return {
+      carrierUserId:'',
+      //模态窗的框计算
+      inputText: null,
+      //是否弹出对话框
+      dialogVisible: false,
+      //输入框的值
+      input: "",
+      //选项卡的当前选中的值
+      activeName: "option",
+      //未下发的表格
+      option: {
+        requestUrl:
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + '',
+        selectionType: "select",
+      },
+      //已下发的表格
+      first: {
+        requestUrl:
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" +'',
+      },
+      //车辆信息的表格
+      truck: {
+        requestUrl: "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + '',
+        // 控制显示当选列
+        selectionType: "radio",
+      },
+      Received:{
+        requestUrl: "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" +'',
+      },
+      //物资信息的数据
+      tableData: [],
+      //物资信息的表头
+      tableHead: [
+        {
+          prop: "materialName",
+          label: "物资名称",
+          width: 200,
+        },
+        {
+          prop: "materialModel",
+          label: "规格型号",
+          width: 200,
+        },
+        {
+          prop: "weightNum",
+          label: "物资数量",
+          width: 200,
+        },
+      ],
+      //当前选中的订单id
+      selectOrderId: null,
+      //选中的车辆号
+      capacityNumber: "",
+      //选中的运力id
+      capacityId: null,
+      //是否关闭模态框
+      drawer: false,
+      //模态框从左往右打开
+      direction: "rtl",
+      //多选的选中的订单id
+      selectionList: [],
+      //区别点击的是添加运力，还是修改
+      index: null,
+    };
+  },
+  created(){
+      this.carrierUserId = getCookie('userId')
+      console.log(this.carrierUserId)
+      this.option.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + this.carrierUserId ,
+      this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + this.carrierUserId ,
+      this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + this.carrierUserId ,
+      this.truck.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.carrierUserId 
+  },
+  methods: {
+    handleClose(done){
+        this.determine();
+        done();
+    },
+    onclick(){
+      if(this.input != ''){
+        this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&con="+this.input +"&carrierId=" + getCookie('userId');
+      }else{
+        this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.userCarrierId
+      }     
+    },
+    //下发
+    Issue() {
+      if (this.selectionList.length == 0) {
+        this.$message({
+          message: "请选择订单！",
+          type: "warning",
+        });
+      } else {
+        this.selectionList.forEach((e) => {
+          if (!e.capacityNumber) {
+            this.$message({
+              message: "订单号为: " + e.orderNumber + "没有车牌号！",
+              type: "warning",
+            });
+          } else {
+            this.axios.post("/api/v1/oms/dispatchOrder",{mapList:this.selectionList}).then((res) => {
+              if (res.data.code == "200") {
+                this.$message({
+                  message: "下发成功",
+                  type: "success",
+                });
+                this.option.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + this.carrierUserId +"&test=1",
+                this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + this.carrierUserId +"&test=1",
+                this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + this.carrierUserId +"&test=1" ,
+                this.truck.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.carrierUserId +"&test=1"
+              }
+            });
+          }
+        });
+      }
+    },
+    //对话框点击确定，执行增加车牌号
+    determine() {
+      this.axios
+        .post("/api/v1/oms/updateOmstruckOrder", {
+          orderId: this.selectOrderId,
+          capacityId: this.capacityId,
+        })
+        .then((res) => {
+          if (res.data.code == "200") {
+            if (this.index == 1) {
+              this.$message({
+                message: "添加成功！",
+                type: "success",
+              });
+            } else if (this.index == 2) {
+              this.$message({
+                message: "修改成功！",
+                type: "success",
+              });
+            }
+            this.dialogVisible = false;
+            this.option.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + this.carrierUserId +"&test=1",
+            this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + this.carrierUserId +"&test=1",
+            this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + this.carrierUserId +"&test=1" ,
+            this.truck.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.carrierUserId +"&test=1"
+          }
+        });
+    },
+    //多选的选中的数据
+    selectionChange(selection) {
+      this.selectionList = [];
+      selection.forEach((element) => {
+        this.selectionList.push({
+          orderId: element.orderId,
+          capacityNumber: element.capacityNumber,
+          orderNumber: element.orderNumber,
+        });
+      });
+    },
+    //单选按钮选中的值
+    currentRadioChange(row) {
+      this.capacityId = row.carrierId;
+      this.capacityNumber = row.capacityNumber;
+    },
+    //打开模态窗口
+    // onDrawer() {
+    //   this.drawer = true;
+    // },
+    //弹出消息窗口
+    addTruck(row, index) {
+      this.index = index;
+      if (index == 1) {
+        this.selectOrderId = row.orderId;
+        this.drawer = true;
+      } else if (index == 2) {
+        this.selectOrderId = row.orderId;
+        this.capacityNumber = row.capacityNumber;
+        this.drawer = true;
+      }
+    },
+    // 查看物资详情
+    detailclick(row) {
+      // 记录重复点击次数
+      if (this.oldRow === row) {
+        this.oldRowCount += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow != "") {
+        if (this.oldRow != row) {
+          if (this.oldRowCount % 2 === 1) {
+            this.$refs.table.toggleRowExpansion(this.oldRow);
+          } else {
+            this.oldRowCount = 1;
+          }
+        } else {
+          this.oldRow = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow = row;
+      this.materialDetails(row.orderId);
+    },
+    //框计算
+    onclick() {
+      if (this.activeName == "option") {
+        this.option.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId= &type=2&con=" +
+          this.input;
+      } else {
+        this.first.requestUrl = "con=" + this.input;
+      }
+    },
+    //查看当前订单的物资信息
+    materialDetails(orderId) {
+      this.axios
+        .post("/api/v1/uc/getOrderMaterialMesByOrderId/" + orderId)
+        .then((res) => {
+          if (res.data.code == "200") {
+            this.tableData = res.data.data;
+          }
+        });
+    },
+    Insert(){
+      this.$router.push("addMornThanTransportOrder")
+    }
+  },
+};
+</script>
+
+<style lang="scss">
+
+.transportOrder {
+  .transportOrder_top {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+    .el-input{
+  width: 20%;
+}
+  }
+  .drawer_top {
+    width: 100%;
+    height: 50px;
+    padding-left: 20px;
+    display: flex;
+    align-items: center;
+  }
+}
+</style>

src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue

@@ -174,8 +174,7 @@
                 <el-input
                   v-model.number="scope.row.orderMaterialWeight"
                 ></el-input>
-              </template>
-            
+              </template>           
             </template>
             <template v-else>
               <span>{{ scope.row[item.prop] }}</span>
@@ -310,7 +309,7 @@ export default {
           label: "规格型号",
           width: "140",
         },
-         {
+        {
           prop: "materialPriority",
           label: "装卸货优先级",
           slot: true,
@@ -320,7 +319,6 @@ export default {
           label: "重量",
           slot: true,
         },
-       
       ],
       // 收货单位ID
       receiveId:null,
@@ -354,11 +352,6 @@ export default {
             "/api/v1/uc/selectAllMaterialName?apiId=395",
            selectionType: "select",
       },
-      receiveOptions:{
-        requestUrl:
-          "/api/v1/uc/queryConsigneeByLike?apiId=396",
-          selectionType:"radio",
-      },
       line: {
         requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
         selectionType: "radio",
@@ -480,7 +473,7 @@ export default {
           Specification: e.materialSpecification+e.materialModel,
           orderMaterialWeight: null,        
           materialId: e.materialId,
-          materialPriority:null,
+          materialPriority:1
         };
           this.tableData.push(addmap);
       });     

src/views/SporadicManage/components/sporadicMaterial/transportOrder/transportOrder.vue

@@ -212,8 +212,13 @@ export default {
   },
   methods: {
     handleClose(done){
+      if(this.capacityId == null){
+        done();
+      }
+      else{
         this.determine();
         done();
+      }      
     },
     onclick(){
       if(this.input != ''){

src/views/SporadicManage/router/index.js

@@ -43,6 +43,27 @@ import steelReturnOutFactory from '../components/steelReturn/transportExcute/out
 import steelReturnTareWeight from '../components/steelReturn/transportExcute/tareWeight.vue'
 import steelReturnUnload from '../components/steelReturn/transportExcute/unload.vue'
 
+//一车多趟运输预约
+import mornThanTransportAppoint from '../components/moreThanMaterialTruck/transportAppoint/transportAppoint.vue'
+import addMornThanTransportAppoint from '../components/moreThanMaterialTruck/transportAppoint/addSporadicTransportAppoint.vue'
+//一车多趟运输派单
+import mornThanTransportOrder from '../components/moreThanMaterialTruck/transportOrder/transportOrder.vue'
+import addMornThanTransportOrder from '../components/moreThanMaterialTruck/transportOrder/addTransportOrder.vue'
+//一车多趟运输执行进厂
+import mornThanENenfactory from '../components/moreThanMaterialTruck/sporadicEnfactory/enFactory.vue'
+import mornThanENgrossWeight from '../components/moreThanMaterialTruck/sporadicEnfactory/grossWeight.vue'
+import mornThanENoutFactory from '../components/moreThanMaterialTruck/sporadicEnfactory/outFactory.vue'
+import mornThanENtareWeight from '../components/moreThanMaterialTruck/sporadicEnfactory/tareWeight.vue'
+import mornThanENunload from '../components/moreThanMaterialTruck/sporadicEnfactory/unload.vue'
+//一车多趟运输执行出厂
+import mornThanOUTenfactory from '../components/moreThanMaterialTruck/sporadicOutfactory/enFactory.vue'
+import mornThanOUTgrossWeight from '../components/moreThanMaterialTruck/sporadicOutfactory/grossWeight.vue'
+import mornThanOUToutFactory from '../components/moreThanMaterialTruck/sporadicOutfactory/outFactory.vue'
+import mornThanOUTtareWeight from '../components/moreThanMaterialTruck/sporadicOutfactory/tareWeight.vue'
+import mornThanOUTload from '../components/moreThanMaterialTruck/sporadicOutfactory/load.vue'
+
+
+
 
 Vue.use(Router)
 const constantRouterMap = [
@@ -87,7 +108,26 @@ const constantRouterMap = [
       {path:'steelReturnGrossWeight',name:'steelReturnGrossWeight',meta:{code:'xtpzgl-yhgl'},component:steelReturnGrossWeight},
       {path:'steelReturnOutFactory',name:'steelReturnOutFactory',meta:{code:'xtpzgl-yhgl'},component:steelReturnOutFactory},
       {path:'steelReturnTareWeight',name:'steelReturnTareWeight',meta:{code:'xtpzgl-yhgl'},component:steelReturnTareWeight},
-      {path:'steelReturnUnload',name:'steelReturnUnload',meta:{code:'xtpzgl-yhgl'},component:steelReturnUnload}
+      {path:'steelReturnUnload',name:'steelReturnUnload',meta:{code:'xtpzgl-yhgl'},component:steelReturnUnload},
+
+       //一车多趟运输预约
+       {path:'addMornThanTransportAppoint',name:'addMornThanTransportAppoint',meta:{code:'xtpzgl-jggl'},component:addMornThanTransportAppoint},
+       {path:'mornThanTransportAppoint',name:'mornThanTransportAppoint',meta:{code:'xtpzgl-yhgl'},component:mornThanTransportAppoint},
+       //一车多趟运输订单
+       {path:'addMornThanTransportOrder',name:'addMornThanTransportOrder',meta:{code:'xtpzgl-jggl'},component:addMornThanTransportOrder},
+       {path:'mornThanTransportOrder',name:'mornThanTransportOrder',meta:{code:'xtpzgl-yhgl'},component:mornThanTransportOrder},
+       //一车多趟进厂
+       {path:'mornThanENenfactory',name:'mornThanENenfactory',meta:{code:'xtpzgl-yhgl'},component:mornThanENenfactory},
+       {path:'mornThanENgrossWeight',name:'mornThanENgrossWeight',meta:{code:'xtpzgl-yhgl'},component:mornThanENgrossWeight},
+       {path:'mornThanENoutFactory',name:'mornThanENoutFactory',meta:{code:'xtpzgl-yhgl'},component:mornThanENoutFactory},
+       {path:'mornThanENtareWeight',name:'mornThanENtareWeight',meta:{code:'xtpzgl-yhgl'},component:mornThanENtareWeight},
+       {path:'mornThanENunload',name:'mornThanENunload',meta:{code:'xtpzgl-yhgl'},component:mornThanENunload},
+       //一车多趟出厂
+       {path:'mornThanOUTenfactory',name:'mornThanOUTenfactory',meta:{code:'xtpzgl-yhgl'},component:mornThanOUTenfactory},
+       {path:'mornThanOUTgrossWeight',name:'mornThanOUTgrossWeight',meta:{code:'xtpzgl-yhgl'},component:mornThanOUTgrossWeight},
+       {path:'mornThanOUToutFactory',name:'sporadicOUToutFactory',meta:{code:'xtpzgl-yhgl'},component:mornThanOUToutFactory},
+       {path:'mornThanOUTtareWeight',name:'sporadicOUTtareWeight',meta:{code:'xtpzgl-yhgl'},component:mornThanOUTtareWeight},
+       {path:'mornThanOUTload',name:'mornThanOUTload',meta:{code:'xtpzgl-yhgl'},component:mornThanOUTload},
     ]    
   }
 ];