rms1.6

build/utils.js

@@ -17,8 +17,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //  'logistics', 'process', '   ', 'reportform', 'basicconfig', 'system']
 
 // let devModules = ['index','RMS','systemConfig']
- let devModules = ['index','RMS','statisticalReport','SporadicManage'];
- //let devModules = ['all'];
+ //let devModules = ['index','RMS','statisticalReport','SporadicManage','TMS','WMS'];
+ let devModules = ['all'];
 // let devModules = ['index','RMS']
 
 

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/addCarrier.vue

@@ -235,13 +235,15 @@ export default {
         this.$message.error("承运商名称不能为空");
       } else if (!this.form1.carrierType) {
         this.$message.error("承运商类型不能为空");
-      }else if (!this.imageUrl1) {
-        this.$message.error("请上传运输证");
-      } else if (!this.imageUrl2) {
-        this.$message.error("请上传经营许可证");
-      } else if (!this.imageUrl3) {
-        this.$message.error("请上传营业执照");
-      }else {
+      }
+      // else if (!this.imageUrl1) {
+      //   this.$message.error("请上传运输证");
+      // } else if (!this.imageUrl2) {
+      //   this.$message.error("请上传经营许可证");
+      // } else if (!this.imageUrl3) {
+      //   this.$message.error("请上传营业执照");
+      // }
+      else {
         status = true;
       }
       if (this.form1.registerDate) {

src/views/RMS/components/addMaterial.vue

@@ -50,6 +50,7 @@ export default {
       drawer: false,
       direction: 'rtl',
       inputText:"",
+      materialTypeId:"",
       options:{
         requestUrl:"/api/v1/rms/getMaterialTypeList?apiId=376",
         selectionType:"radio",
@@ -61,28 +62,25 @@ export default {
   methods: {
       currentRadioChange(selection){
       this.mapList=selection,
+      this.materialTypeId = this.mapList.materialTypeId;
       console.log(this.mapList)
       this.materialTypeName=this.mapList.materialTypeName
     },
     onclick(){
       this.options.requestUrl="/api/v1/rms/getMaterialTypeList?apiId=376&con=" +this.inputText;
     },
-     makeSure() {
+     makeSure() {  
+       
       let RmsMaterial = {
         materialName:this.form1.materialName,
         materialSpecification:this.form1.materialSpecification,
         materialModel:this.form1.materialModel,
-        materialTypeId:this.mapList.materialTypeId,
+        materialTypeId:this.materialTypeId,
         unitOfMeasureId:this.form1.unitOfMeasureId,
         materialTheoreticalWeight:this.form1.materialTheoreticalWeight,
       };
-      if(
-        RmsMaterial.materialName==null ||
-        RmsMaterial.materialSpecification==null ||
-        RmsMaterial.materialModel==null ||
-        RmsMaterial.materialTypeId==null ||
-        RmsMaterial.unitOfMeasureId==null ||
-        RmsMaterial.materialTheoreticalWeight==null 
+    if(
+        RmsMaterial.materialName==null
       )this.$message.error("存在空值！");
       else
       this.axios
@@ -101,7 +99,7 @@ export default {
           } else {
             this.$message.error("新增失败");
           }
-          this.$refs['table'].resetField();
+          //this.$refs['table'].resetField();
         });
     },
     // 取消

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",
@@ -481,7 +474,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},
     ]    
   }
 ];

src/views/TMS/components/importedFuel/transportReserveRanAdd.vue

@@ -450,11 +450,7 @@ export default {
               state = 0;
             }
           } else {
-            this.$message({
-              message: "重量不能为空!",
-              type: "warning",
-            });
-            state = 0;
+            state = 1;
           }
         });
       }

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsNEW/dischargeCargoNew.vue

@@ -0,0 +1,47 @@
+//新区采购化工产品卸货作业
+<template>
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getUnloadResult?apiId=145&orderType=18",
+      },
+    };
+  },
+
+  methods: {
+    onclick() {
+     this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=145&orderType=18&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsNEW/enterFactoryNew.vue

@@ -0,0 +1,47 @@
+//新区采购化工产品进厂作业
+<template>
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=18",
+      },
+    };
+  },
+ 
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=18&con=" + this.input;
+    },
+  }
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsNEW/exFactoryNew.vue

@@ -0,0 +1,46 @@
+//新区采购化工产品出厂作业
+<template>
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=18",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=18&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsNEW/qualityTestingNew.vue

@@ -0,0 +1,53 @@
+//新区采购化工产品质检作业
+<template>
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    
+    <dilTable v-bind.sync="option">
+      <el-table-column fixed="right" label="操作" width="50">
+        <template slot-scope="scope">
+          <el-button @click="updateClick(scope.row.resultId)" type="text" size="small">
+            修改
+          </el-button>
+        </template>
+      </el-table-column>
+    </dilTable>
+  </div>
+</template>
+
+
+<script>
+export default {
+  name: "wagonPlease",
+  data() {
+    return {
+      input: "",
+      option: {       
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getQualityResult?apiId=150&orderType=18",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getQualityResult?apiId=150&orderType=18&con=" + this.input;
+    },
+  },
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsNEW/receivingNew.vue

@@ -0,0 +1,44 @@
+//新区采购化工产品收货作业
+<template>
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" class="input" 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: "wagonPlease",
+  data() {
+    return {
+      input: "",
+      option: {       
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getReceiveResult?apiId=149&orderType=18",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getReceiveResult?apiId=149&orderType=18&con=" + this.input;
+    },
+  },
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsNEW/skinCountingNew.vue

@@ -0,0 +1,46 @@
+//新区采购化工产品计皮作业
+<template>
+  <div class="homeworkPath">
+   <div class="top">
+      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=18",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+     this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=18&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsNEW/woolCountingNew.vue

@@ -0,0 +1,47 @@
+//新区采购化工产品计毛作业
+<template>
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=18",
+      },
+    };
+  },
+
+  methods: {
+    onclick() {
+     this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=18&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/dischargeCargoOld.vue

@@ -0,0 +1,45 @@
+//老区采购化工产品卸货作业
+<template>
+  <div class="homeworkPath">
+   <div class="top">
+      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option"></dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getUnloadResult?apiId=145&orderType=6",
+      },
+    };
+  },
+ 
+  methods: {
+    onclick() {
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=145&orderType=6&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/enterFactoryOld.vue

@@ -0,0 +1,82 @@
+//老区采购化工产品进厂作业
+<template>
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=6",
+      },
+    };
+  },
+
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=6&con=" + this.input;
+    },
+    updateClick(resultId) {
+      this.$router.push("/truckLoadResultEdit/" + resultId);
+    },
+    //新增
+    insertClick() {
+      this.$router.push("/truckLoadResultAdd/");
+    },
+    deleteClick(resultId) {
+      
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+          this.axios
+            .post(
+              "/api/v1/tms/deleteLoadResult/" + resultId
+            )
+            .then(() => {
+              this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+  },
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/exFactoryOld.vue

@@ -0,0 +1,48 @@
+//老区采购化工产品出厂作业
+<template>
+  <div class="homeworkPath">
+   <div class="top"> 
+      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=6",
+      },
+    };
+  },
+
+  methods: {
+    
+    onclick() {
+     this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=6&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/qualityTestingOld.vue

@@ -0,0 +1 @@
+//老区采购化工产品质检作业

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/receivingOld.vue

@@ -0,0 +1,44 @@
+//老区采购化工产品收货作业
+<template>
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" class="input" 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: "wagonPlease",
+  data() {
+    return {
+      input: "",
+      option: {       
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getReceiveResult?apiId=150&orderType=17",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getReceiveResult?apiId=150&orderType=17&con=" + this.input;
+    },
+  },
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/skinCountingOld.vue

@@ -0,0 +1 @@
+//老区采购化工产品计皮作业

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/woolCountingOld.vue

@@ -0,0 +1 @@
+//老区采购化工产品计毛作业

src/views/TMS/components/purchaseChemicalMaterials/transportationDispatch.vue

@@ -0,0 +1,91 @@
+//采购化工材料运输派单
+<template>
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input
+        placeholder="请输入内容"
+        class="input"
+        v-model="input"
+        clearable
+      >
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询1
+      </el-button>
+    </div>
+    <el-tabs v-model="activeName">
+      <!-- 未下发 -->
+      <el-tab-pane label="已接收" name="first">
+        <dilTable v-bind.sync="option1" ref="table"> </dilTable>
+      </el-tab-pane>
+      <!-- 已下发 -->
+      <el-tab-pane label="已拒绝" name="second">
+        <dilTable v-bind.sync="option2"> </dilTable>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "inplantTMS",
+  data() {
+    return {
+      input: "",
+      Time: "",
+      activeName: "first",
+      option1: {
+        // 表格请求数据的地址
+        requestUrl:"",
+      },
+      option2: {
+        // 表格请求数据的地址
+        requestUrl:"",
+      },
+    };
+  },
+  created() {
+    //判断是否是承运商
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option1.requestUrl =
+        "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=2&orderStatus=111&carrierSSOId=" +
+        getCookie("userId");
+      this.option2.requestUrl =
+        "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=5&carrierSSOId=" +
+        getCookie("userId");
+    } else {
+      this.option1.requestUrl =
+        "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=2&orderStatus=5&carrierSSOId=" +
+        null;
+      this.option2.requestUrl =
+        "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=5&carrierSSOId=" +
+        null;
+    }
+  },
+  methods: {
+    onclick() {
+      if (this.activeName == "first") {
+        this.option1.requestUrl =
+          "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=111&con=" +
+          this.input;
+      } else {
+        this.option2.requestUrl =
+          "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=2&orderStatus=5&con=" +
+          this.input;
+      }
+    },
+  },
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+  .top {
+    padding: 40px;
+    .input {
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/purchaseChemicalMaterials/transportationReservation.vue

@@ -0,0 +1,249 @@
+//采购化工材料运输预约
+<template>
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input
+        class="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="insertClick">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="issue"
+        v-if="activeName == 'first'"
+      >
+        <i class="el-icon-plus"></i>下发
+      </el-button>
+    </div>
+    <el-tabs v-model="activeName">
+      <!-- 未下发 -->
+      <el-tab-pane label="未下发" name="first">
+        <dilTable
+          v-bind.sync="option1"
+          ref="table"
+          @selection-change="selectionChange"
+        >
+          <el-table-column
+            fixed="right"
+            align="center"
+            label="操作"
+            width="120"
+          >
+            <template slot-scope="scope">
+              <el-button
+                @click="sendClick(scope.row.orderId)"
+                type="text"
+                size="small"
+              >
+                下发
+              </el-button>
+              <el-button
+                @click="updateClick(scope.row.orderId)"
+                type="text"
+                size="small"
+              >
+                修改
+              </el-button>
+              <el-button
+                @click="
+                  deleteClick(scope.row.orderId, scope.row.capacityNumber)
+                "
+                type="text"
+                size="small"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </dilTable>
+      </el-tab-pane>
+      <!-- 已下发 -->
+      <el-tab-pane label="已下发" name="second">
+        <dilTable v-bind.sync="option2"> </dilTable>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "inplantTMS",
+  data() {
+    return {
+      input: "",
+      Time: "",
+      activeName: "first",
+      option1: {
+        // 表格请求数据的地址
+        requestUrl: "",
+        selectionType: "select",
+        mapList: [],
+      },
+      option2: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+    };
+  },
+  created() {
+    //判断是否是承运商
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option1.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" +
+        getCookie("userId");
+      this.option2.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" +
+        getCookie("userId");
+    } else {
+      this.option1.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" +
+        null;
+      this.option2.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" +
+        null;
+    }
+  },
+  methods: {
+    onclick() {
+      if (this.activeName == "first") {
+        //判断是否是承运商
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input;
+        } else {
+          this.option1.requestUrl =
+            "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&carrierSSOId=" +
+            null +
+            "&con=" +
+            this.input;
+        }
+      } else {
+        //判断是否是承运商
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input;
+        } else {
+          this.option1.requestUrl =
+            "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=2&carrierSSOId=" +
+            null +
+            "&con=" +
+            this.input;
+        }
+      }
+    },
+    selectionChange(selection) {
+      this.mapList = selection;
+    },
+    issue() {
+      let mapvalue = {
+        mapList: this.mapList,
+      };
+      this.axios.post("/api/v1/oms/dispatchOrder", mapvalue).then(() => {
+        this.$message({
+          type: "success",
+          message: "下发成功!",
+        });
+        this.option1.requestUrl =
+          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&i=" +
+          new Date();
+      });
+    },
+    // 下发
+    sendClick(orderId) {
+      let mapvalue = {
+        mapList: [{ orderId: orderId }],
+      };
+      this.$confirm("是否下发", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios.post("/api/v1/oms/dispatchOrder", mapvalue).then(() => {
+            this.$message({
+              type: "success",
+              message: "下发成功!",
+            });
+            this.option1.requestUrl =
+              "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=2&i=" +
+              new Date();
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消下发!",
+          });
+        });
+    },
+    // 删除
+    deleteClick(orderId, capacityNumber) {
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+          this.axios
+            .post("/api/v1/oms/deleteOrder", {
+              orderId: orderId,
+              capacityNumber: capacityNumber,
+            })
+            .then(() => {
+              this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+    //新增
+    insertClick() {
+      this.$router.push("/transportationReservationAdd");
+    },
+    //修改
+    updateClick(orderId) {
+      this.$router.push("/transportationReservationEDIT/" + orderId);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 40px;
+    .input {
+      width: 250px;
+      margin-right: 20px;
+    }
+    .btn {
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/purchaseChemicalMaterials/transportationReservationAdd.vue

@@ -0,0 +1,601 @@
+//采购化工材料运输预约新增
+<template>
+  <div id="transportationReservationAdd">
+    <page-title>运输预约</page-title>
+
+    <div class="material from">
+      <span class="text">物资：</span>
+      <el-input class="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 class="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 class="input" v-model="remark" @blur="onBlur"> </el-input>
+      <span class="span"></span>
+    </div>
+    <div class="forwardingUnit from">
+      <span class="text">卸货点：</span>
+      <el-input class="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 class="input" v-model="lineName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(5)">浏览</el-button>
+    </div>
+    <div class="orderType from">
+      <span class="text">订单类别：</span>
+      <el-select
+        class="select"
+        v-model="orderType"
+        placeholder="请选择"
+        disabled
+      >
+        <el-option
+          v-for="item in orderTypeList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <span class="span"></span>
+    </div>
+    <div class="contractTitle from">
+      <dil-form :formId="219" v-model="form1"></dil-form>
+    </div>
+    <div class="truckList1">
+      <div class="truckList from">
+        <span class="text">选择车辆：</span>
+        <el-button type="primary" @click="ondrawer(3)" class="truckBtn"
+          >浏览</el-button
+        >
+      </div>
+    </div>
+    <div class="truckListTable">
+      <el-table
+        :data="selectionList"
+        border
+        style="width: 100%"
+        highlight-current-row
+      >
+        <el-table-column type="index" width="50" label="序号" align="center">
+        </el-table-column>
+        <el-table-column
+          v-for="(item, i) in tableTop"
+          :key="i"
+          :prop="item.prop"
+          :label="item.label"
+          align="center"
+          show-overflow-tooltip
+        >
+          <template slot="scope" v-if="item.th_name !== '重量'">
+            <span>{{ item.label }}</span>
+          </template>
+          <!-- 插入输入框 -->
+          <template slot-scope="scope">
+            <template v-if="item.slot">
+              <template v-if="item.prop == 'orderMaterialWeight'">
+                <el-input
+                  style="width: 250px"
+                  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="40%">
+      <div style="margin-bottom: 10px">
+        <el-input
+          placeholder="请输入内容"
+          v-model="input"
+          style="margin-top: 10px; margin-right: 10px; width: 250px"
+          clearable
+        ></el-input>
+        <el-button type="primary" class="btn" @click="onclick(a)">
+          <i class="el-icon-search"></i>查询
+        </el-button>
+      </div>
+      <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";
+import { getCookie } from "@/utils/util.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      //订单类别
+      orderTypeList: [
+        {
+          value: 17,
+          label: "老厂区",
+        },
+        {
+          value: 18,
+          label: "新厂区",
+        },
+      ],
+      // 线路名称
+      lineName: "",
+      //线路id
+      lineId: null,
+      // 件数与重量的开关
+      value: false,
+      //船名
+      remark: null,
+      // 车辆表格表头
+      tableTop: [
+        {
+          prop: "capacityNumber",
+          label: "车牌号",
+          width: "140",
+        },
+        {
+          prop: "carrierName",
+          label: "承运商",
+          width: "140",
+        },
+        {
+          prop: "orderMaterialWeight",
+          label: "重量",
+          slot: true,
+        },
+      ],
+      //车辆表格数据
+      selectionList: [],
+      // 表单
+      form1: {},
+      //采购订单id
+      purchaseOrderId: "",
+      //物资名称
+      materialName: "",
+      //发货单位名称
+      supplierName: "",
+      //发货单位id
+      supplierId: null,
+      //物资id
+      materialId: null,
+      //是否需要打开模态窗口
+      drawer: false,
+      //卸货点id
+      unloadPointId: "",
+      //卸货点名称
+      unloadPointName: "",
+      //订单类别
+      orderType: null,
+      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: "",
+        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: {
+    drawer(val) {
+      if (!val) {
+        this.input = null;
+      }
+    },
+  },
+  created() {
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.third.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+        getCookie("userId");
+    } else {
+      this.third.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null;
+    }
+  },
+  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 {
+              console.log();
+              this.remark = res.data.data.remark;
+              this.purchaseOrderId = res.data.data.purchaseOrderId;
+              this.form1 = { purchaseOrderNo: res.data.data.purchaseOrderNo };
+              if (res.data.data.receiveUnitId == 1) {
+                this.orderType = 17;
+              } else {
+                this.orderType = 18;
+              }
+            }
+          } 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) {
+        //判断是否是承运商查询车辆
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.third.requestUrl =
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+            getCookie("userId") +
+            "&index=" +
+            this.input;
+        } else {
+          this.third.requestUrl =
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+            null +
+            "&index=" +
+            this.input;
+        }
+      } else if (a == 4) {
+        this.unloadPoint.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=347&index=" + this.input;
+      } else if (a == 5) {
+        this.option.requestUrl =
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
+      }
+    },
+    ondrawer(num) {
+      this.drawer = true;
+      this.a = num;
+      if (num == 2) {
+        this.secend.requestUrl =
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+          this.materialId;
+      }
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.push("/transportReserveRan");
+    },
+    currentRadioChange1(selection) {
+      this.materialName = selection.materialName;
+      this.materialId = selection.materialId;
+      this.getPurchaseOrderNo();
+    },
+    currentRadioChange2(selection) {
+      this.supplierName = selection.supplierName;
+      this.supplierId = selection.supplierId;
+      this.getPurchaseOrderNo();
+    },
+    currentRadioChange4(selection) {
+      this.unloadPointId = selection.warehouseId;
+      this.unloadPointName = selection.warehouseName;
+    },
+    currentRadioChange5(selection) {
+      this.lineName = selection.lineName;
+      this.lineId = selection.lineId;
+    },
+    currentRadioChange3(selection) {
+      this.selectionList = [];
+      this.selectionList = selection;
+    },
+    // 确认
+    onClickConfirm() {
+      var state = 0;
+      if (
+        this.materialId &&
+        this.supplierId &&
+        this.form1.purchaseOrderId &&
+        this.unloadPointId &&
+        sjTime(this.form1.orderEntryTime) &&
+        this.lineId
+      ) {
+        state = 1;
+      } else {
+        if (!this.materialId) {
+          this.$message({
+            message: "请选择物资!",
+            type: "warning",
+          });
+        } else if (!this.supplierId) {
+          this.$message({
+            message: "请选择发货单位!",
+            type: "warning",
+          });
+        } else if (!this.purchaseOrderId) {
+          this.$message({
+            message: "没有匹配的采购订单号!",
+            type: "warning",
+          });
+        } else if (!this.unloadPointId) {
+          this.$message({
+            message: "请选择卸货地点!",
+            type: "warning",
+          });
+        } else if (!this.lineId) {
+          this.$message({
+            message: "请选择运输路线!",
+            type: "warning",
+          });
+        } else if (!sjTime(this.form1.orderEntryTime)) {
+          this.$message({
+            message: "请选择预估进厂时间!",
+            type: "warning",
+          });
+        }
+      }
+      if (this.selectionList.length == 0) {
+        this.$message({
+          message: "请选择车辆!",
+          type: "warning",
+        });
+        state = 0;
+      } else {
+        this.selectionList.forEach((e) => {
+          if (e.orderMaterialWeight) {
+            if (isNumber(e.orderMaterialWeight)) {
+              if (isIntegerNumber(e.orderMaterialWeight)) {
+                state = 1;
+              } else {
+                this.$message({
+                  message: "重量只能是整数!",
+                  type: "warning",
+                });
+                state = 0;
+              }
+            } else {
+              this.$message({
+                message: "重量只能是数字!",
+                type: "warning",
+              });
+              state = 0;
+            }
+          } else {
+            state = 1;
+          }
+        });
+      }
+
+      if (state == 1) {
+        let map = {
+          materialId: this.materialId,
+          supplierId: this.supplierId,
+          purchaseOrderId: this.purchaseOrderId,
+          unloadPointId: this.unloadPointId,
+          orderEntryTime: sjTime(this.form1.orderEntryTime),
+          driverCapacityIdList: this.selectionList,
+          orderType: this.orderType,
+          lineId: this.lineId,
+        };
+        console.log(map, map);
+        this.axios.post("/api/v1/oms/addPurOrder", map).then((res) => {
+          if (res.data.code == "200") {
+            this.$message({
+              message: "添加成功!",
+              type: "success",
+            });
+            this.$router.push("/transportationReservation");
+          }
+        }); 
+      }
+    },
+  },
+};
+</script>
+<style lang="scss">
+.transportationReservationAdd {
+  width: 100%;
+}
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.remark {
+  display: flex;
+  justify-content: center;
+  .text {
+    display: inline-block;
+    width: 100px;
+    text-align: right;
+  }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+}
+.lineId {
+  display: flex;
+  justify-content: center;
+  .text {
+    display: inline-block;
+    width: 170px;
+    text-align: right;
+  }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+}
+.material {
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
+  .text {
+    display: inline-block;
+    width: 170px;
+    text-align: right;
+  }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+}
+.orderType {
+  display: flex;
+  justify-content: center;
+  .text {
+    display: inline-block;
+    width: 110px;
+    text-align: right;
+  }
+  .select {
+    width: 250px;
+  }
+  .span {
+    display: inline-block;
+    width: 30px;
+    height: 10px;
+  }
+}
+.contractTitle {
+  display: flex;
+  justify-content: center;
+  .el-form-item {
+    display: flex;
+    justify-content: center;
+    .el-form-item__label {
+      display: flex;
+      align-items: center;
+    }
+    .el-input {
+      width: 250px;
+    }
+  }
+}
+.forwardingUnit {
+  display: flex;
+  justify-content: center;
+  .text {
+    display: inline-block;
+    width: 170px;
+    text-align: right;
+  }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+}
+.truckList1 {
+  width: 100%;
+  .truckList {
+    width: 96%;
+    .text {
+      display: inline-block;
+      width: 120px;
+      text-align: right;
+    }
+    .truckBtn {
+      width: 250px;
+    }
+  }
+}
+.button_box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100px;
+}
+</style>

src/views/TMS/components/purchaseChemicalMaterials/transportationReservationEDIT.vue

@@ -0,0 +1,214 @@
+//修改采购运输预约订单
+<template>
+  <div id="contractDetails">
+    <page-title>运输预约</page-title>
+    <div class="contractTitle">
+      <div class="form-one">
+        <dil-form :formId="220" v-model="form1"> </dil-form>
+      </div>
+      <div class="btn">
+        <div class="btn1">
+          <el-button type="primary" @click="selectTruck">浏览</el-button>
+        </div>
+        <div class="btn1">
+          <el-button type="primary" @click="selectUnloadingPoint"
+            >浏览</el-button
+          >
+        </div>
+      </div>
+    </div>
+
+    <div class="button_box">
+      <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+    </div>
+
+    <el-drawer
+      :visible.sync="drawer"
+      :direction="direction"
+      size="40%"
+      :wrapperClosable="true"
+      :close-on-press-escape="false"
+      :destroy-on-close="false"
+      :show-close="false"
+      :withHeader="true"
+      modal
+    >
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        style="margin-top: 0.625rem; margin-left: 1.25rem; width: 200px"
+        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="third"
+          @radio-change="currentRadioChange"
+        ></dilTable>
+      </div>
+      <div v-show="a == 2">
+        <dilTable
+          v-bind.sync="unloadPoint"
+          @radio-change="currentRadioChange2"
+        ></dilTable>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+      drawer: false,
+      direction: "rtl",
+      a: null,
+      third: {
+        requestUrl: "",
+        selectionType: "radio",
+      },
+      unloadPoint: {
+        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        selectionType: "radio",
+      },
+      capacityId: null,
+      warehouseId: null,
+      input: null,
+      orderType: null,
+    };
+  },
+  created() {
+    //判断是否是承运商
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.third.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+        getCookie("userId");
+    } else {
+      this.third.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null;
+    }
+  },
+  mounted() {
+    this.information();
+  },
+  methods: {
+    onclick(a) {
+      if (a == 1) {
+        //判断是否是承运商
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.third.requestUrl =
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input;
+        } else {
+          this.third.requestUrl =
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+            null +
+            "&con=" +
+            this.input;
+        }
+      } else if (a == 2) {
+        this.unloadPoint.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374&con=" + this.input;
+      }
+    },
+    selectTruck() {
+      this.a = 1;
+      this.drawer = true;
+    },
+    selectUnloadingPoint() {
+      this.a = 2;
+      this.drawer = true;
+    },
+    currentRadioChange(row) {
+      this.form1.capacityNumber = row.capacityNumber;
+      this.capacityId = row.capacityId;
+    },
+    currentRadioChange2(row) {
+      this.form1.warehouseName = row.warehouseName;
+      this.warehouseId = row.warehouseId;
+    },
+    information() {
+      this.axios
+        .post("/api/v1/oms/selectOrderByOrderId/" + this.$route.params.orderId)
+        .then((res) => {
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      let obj = {
+        orderId: this.$route.params.orderId,
+        capacityId: parseInt(this.capacityId),
+        unloadPointId: this.warehouseId,
+        orderEntryTime: sjTime(this.form1.orderEntryTime),
+        orderType: parseInt(this.form1.orderType),
+      };
+      this.axios.post("/api/v1/oms/updateOrder", obj).then((res) => {
+        if (res.data.code == "200") {
+          this.$message({
+            type: "success",
+            message: "修改成功!",
+          });
+          this.$router.push("/transportReserveRan");
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss">
+.contractTitle {
+  display: flex;
+  justify-content: center;
+  margin: 20px;
+  .el-form-item {
+    display: flex;
+    justify-content: center;
+    .el-form-item__label {
+      display: flex;
+      align-items: center;
+      font-size: 14px;
+    }
+    .el-input {
+      width: 250px;
+    }
+  }
+  .btn {
+    margin-left: 20px;
+    padding-top: 105px;
+    .btn1 {
+      margin-bottom: 15px;
+    }
+  }
+}
+.button_box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  .el-button {
+    width: 80px;
+    margin: 10px;
+  }
+}
+</style>

src/views/TMS/router/index.js

@@ -180,6 +180,18 @@ import updateShipPrice from '../components/purchase/updateShipPrice.vue'
 import updateTrainPrice from '../components/purchase/updateTrainPrice.vue'
 import updateTruckPrice from '../components/purchase/updateTruckPrice.vue'
 
+import transportationReservation from '../components/purchaseChemicalMaterials/transportationReservation.vue'
+import transportationReservationAdd from '../components/purchaseChemicalMaterials/transportationReservationAdd.vue'
+import transportationReservationEDIT from '../components/purchaseChemicalMaterials/transportationReservationEDIT.vue'
+import transportationDispatch from '../components/purchaseChemicalMaterials/transportationDispatch.vue'
+import dischargeCargoNew from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsNEW/dischargeCargoNew.vue'
+import enterFactoryNew from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsNEW/enterFactoryNew.vue'
+import exFactoryNew from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsNEW/exFactoryNew.vue'
+import qualityTestingNew from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsNEW/qualityTestingNew.vue'
+import receivingNew from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsNEW/receivingNew.vue'
+import skinCountingNew from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsNEW/skinCountingNew.vue'
+import woolCountingNew from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsNEW/woolCountingNew.vue'
+
 
 
 Vue.use(Router)
@@ -192,6 +204,13 @@ const constantRouterMap = [
     component: main,
     redirect: {name: 'addApproveWagonPlease'},
     children: [
+      {path: 'dischargeCargoNew', name: 'dischargeCargoNew', meta: {code: 'xtpzgl-jggl'}, component: dischargeCargoNew},
+      {path: 'enterFactoryNew', name: 'enterFactoryNew', meta: {code: 'xtpzgl-jggl'}, component: enterFactoryNew},
+      {path: 'exFactoryNew', name: 'exFactoryNew', meta: {code: 'xtpzgl-jggl'}, component: exFactoryNew},
+      {path: 'qualityTestingNew', name: 'qualityTestingNew', meta: {code: 'xtpzgl-jggl'}, component: qualityTestingNew},
+      {path: 'receivingNew', name: 'receivingNew', meta: {code: 'xtpzgl-jggl'}, component: receivingNew},
+      {path: 'skinCountingNew', name: 'skinCountingNew', meta: {code: 'xtpzgl-jggl'}, component: skinCountingNew},
+      {path: 'woolCountingNew', name: 'woolCountingNew', meta: {code: 'xtpzgl-jggl'}, component: woolCountingNew},
       {path: 'addHandlingFee', name: 'addHandlingFee', meta: {code: 'xtpzgl-jggl'}, component: addHandlingFee},
       {path: 'handlingFee', name: 'handlingFee', meta: {code: 'xtpzgl-yhgl'}, component: handlingFee},
       {path: 'updateHandlingFee/:feeId', name: 'updateHandlingFee', meta: {code: 'xtpzgl-yhgl'}, component: updateHandlingFee},
@@ -351,7 +370,11 @@ const constantRouterMap = [
       {path: 'updateTrainPrice/:priceId', name: 'updateTrainPrice', meta: {code: 'xtpzgl-yhgl'}, component: updateTrainPrice},
       {path: 'updateTruckPrice/:priceId', name: 'updateTruckPrice', meta: {code: 'xtpzgl-yhgl'}, component: updateTruckPrice},
       {path: 'truckPrice', name: 'truckPrice', meta: {code: 'xtpzgl-yhgl'}, component: truckPrice},
-     
+      
+      {path: 'transportationReservation', name: 'transportationReservation', meta: {code: 'xtpzgl-yhgl'}, component: transportationReservation},
+      {path: 'transportationDispatch', name: 'transportationDispatch', meta: {code: 'xtpzgl-yhgl'}, component: transportationDispatch},
+      {path: 'transportationReservationAdd', name: 'transportationReservationAdd', meta: {code: 'xtpzgl-yhgl'}, component: transportationReservationAdd},
+      {path: 'transportationReservationEDIT/:orderId', name: 'transportationReservationEDIT', meta: {code: 'xtpzgl-yhgl'}, component: transportationReservationEDIT},
      
     ]
   }

src/views/appoint/components/saleContract/addSaleOrderSend copy.vue

@@ -1,597 +0,0 @@
-<template>
-  <!-- 添加销售订单排车 -->
-  <div class="addSalePlan">
-    <page-title>新增销售订单派车</page-title>
-    <div>
-      <el-tabs v-model="activeName">
-        <dilTable ref="tab" v-bind.sync="option"> </dilTable>
-      </el-tabs>
-    </div>
-
-    <el-form :inline="true" style="margin-top: 2rem">
-      <el-form-item>
-        <label
-          class="el-form-item__label"
-          style="width: auto; margin-left: 2rem"
-          >物资名称:</label
-        >
-        <el-select v-model="materials" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <div class="lineId">
-          <div class="materialId">
-            <label
-              class="el-form-item__label"
-              style="width: auto; margin-left: 2rem"
-              >承运商:</label
-            >
-            <el-input class="input" v-model="carrierName" disabled> </el-input>
-            <el-button type="primary" class="btn" @click="table2 = true"
-              >浏览</el-button
-            >
-          </div>
-        </div>
-      </el-form-item>
-      <el-form-item>
-        <div class="lineId">
-          <div class="materialId">
-            <label
-              class="el-form-item__label"
-              style="width: auto; margin-left: 2rem"
-              >选择路线:</label
-            >
-            <el-input class="input" v-model="lineName" disabled> </el-input>
-            <el-button type="primary" class="btn" @click="table1 = true"
-              >浏览</el-button
-            >
-          </div>
-        </div>
-      </el-form-item>
-    </el-form>
-
-    <!-- 承运商模态框 -->
-    <el-drawer
-      title="选择承运商"
-      :visible.sync="table2"
-      direction="rtl"
-      size="35%"
-      :show-close="false"
-    >
-      <el-input
-        placeholder="请输入内容"
-        v-model="index"
-        style="margin-top: 10px; margin-left: 20px; width: 160px"
-        clearable
-      >
-      </el-input
-      ><el-button
-        type="primary"
-        class="btn"
-        @click="onclick(1)"
-        style="margin-left: 4px"
-      >
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <div class="tablecls">
-        <!-- 查询所有的承运商 -->
-        <dilTable v-bind.sync="carrier" @radio-change="currentRadioChange2">
-        </dilTable>
-      </div>
-    </el-drawer>
-
-    <!-- 选择路线模态窗口 -->
-    <el-drawer
-      title="选择路线"
-      :visible.sync="table1"
-      direction="rtl"
-      size="50%"
-      :show-close="false"
-    >
-      <el-input
-        placeholder="请输入内容"
-        v-model="input"
-        style="margin-top: 10px; margin-left: 20px; width: 160px"
-        clearable
-      >
-      </el-input
-      ><el-button
-        type="primary"
-        class="btn"
-        @click="onclick1"
-        style="margin-left: 4px"
-      >
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <div class="tablecls">
-        <!-- 查询所有的路线 -->
-        <dilTable
-          v-bind.sync="line"
-          @radio-change="currentRadioChange5"
-        ></dilTable>
-      </div>
-    </el-drawer>
-
-    <!-- 选择新增条数及确认按钮 -->
-    <div class="lineId">
-      <div class="materialId">
-        <label
-          class="el-form-item__label"
-          style="width: auto; margin-left: 2rem; margin-top: 0.3rem"
-          >派车数:</label
-        >
-        <el-input class="input1" v-model="carCount"> </el-input>
-        <el-button type="primary" class="btn" @click="makeSure1"
-          >确认分派</el-button
-        >
-      </div>
-    </div>
-
-    <!-- 派车表格 -->
-    <div class="selectionTable from">
-      <el-table
-        :data="selectionList"
-        border
-        style="width: 100%"
-        highlight-current-row
-      >
-        <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" v-if="item.label !== '车牌号'">
-            <span>{{ item.label }}</span>
-          </template>
-          <template slot="scope" v-if="item.label !== '收货地址'">
-            <span>{{ item.label }}</span>
-          </template>
-          <template slot="scope" v-if="item.label !== '收货日期'">
-            <span>{{ item.label }}</span>
-          </template>
-          <template slot="scope" v-if="item.label !== '收货姓名'">
-            <span>{{ item.label }}</span>
-          </template>
-          <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 == 'capacityNumber'">
-                <el-input
-                  class="textinput1"
-                  v-model.number="scope.row.capacityNumber"
-                ></el-input>
-              </template>
-              <!-- 物资重量 -->
-              <template v-if="item.prop == 'orderPlanWeight'">
-                <el-input
-                  class="textinput"
-                  v-model.number="scope.row.orderPlanWeight"
-                ></el-input>
-              </template>
-
-              <!-- 收货地址id -->
-              <template
-                style="width: 400px"
-                v-if="item.prop == 'saleShipperAddressName'"
-              >
-                <el-input
-                  style="width: 200px"
-                  v-model="scope.row.saleShipperAddressName"
-                  disabled
-                >
-                </el-input>
-                <el-button
-                  type="primary"
-                  @click="ondrawer(scope.row, scope.$index)"
-                  >浏览</el-button
-                >
-              </template>
-              <!-- 收货日期 -->
-              <template v-if="item.prop == 'saleDateOfReceipt'">
-                <el-date-picker
-                  class="textinput3"
-                  type="date"
-                  v-model.number="scope.row.saleDateOfReceipt"
-                ></el-date-picker>
-              </template>
-              <!-- 收货客户 -->
-              <template v-if="item.prop == 'saleOrderConsignee'">
-                <el-input
-                  class="textinput4"
-                  v-model.number="scope.row.saleOrderConsignee"
-                ></el-input>
-              </template>
-              <!-- 收货客户电话号码 -->
-              <template v-if="item.prop == 'saleOrderConsigneeTel'">
-                <el-input
-                  class="textinput5"
-                  v-model.number="scope.row.saleOrderConsigneeTel"
-                ></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, selectionList)"
-              type="text"
-              icon="el-icon-close"
-              size="big"
-            ></el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-
-    <el-drawer
-      :visible.sync="drawer"
-      :direction="direction"
-      :close-on-press-escape="true"
-      :show-close="true"
-      :wrapperClosable="true"
-      modal
-      size="30%"
-    >
-      <el-input
-        placeholder="请输入内容"
-        v-model="textInput"
-        style="margin-top: 10px; margin-left: 20px; width: 200px"
-        clearable
-      >
-      </el-input>
-      <el-button
-        type="primary"
-        class="btn"
-        @click="onclick(2)"
-        style="margin-bottom: 15px"
-      >
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <dilTable
-        v-bind.sync="frist"
-        @radio-change="currentRadioChange1"
-      ></dilTable>
-    </el-drawer>
-
-    <div class="button-box">
-      <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="makeSure">确定</el-button>
-    </div>
-  </div>
-</template>
-<script>
-import PageTitle from "@/components/Page/Title";
-import { sjTime, isNumber} from "@/utils/sharedJsFile";
-export default {
-  components: { PageTitle },
-  data() {
-    return {
-      materials: "",
-      //线路
-      table1: false,
-      lineName: "",
-      line: {
-        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
-        selectionType: "radio",
-      },
-      //承运商
-      table2: false,
-      carrierName: "",
-      carrier: {
-        requestUrl: "/api/v1/uc/getCarrierListByLike?apiId=412",
-        selectionType: "radio",
-      },
-      //新增车数
-      carCount: 1,
-
-      textInput: "",
-      input: "",
-      //销售订单物资信息
-      option: {
-        // 表格请求数据的地址
-        requestUrl:
-          "/api/v1/ams/getSaleOrderAndMaterialById?apiId=410&saleOrderId=" +
-          this.$route.params.saleOrderId,
-      },
-      table: false,
-      //表格数据lists
-      selectionList: [],
-      //表格新增lists
-      selectionList1: [],
-      drawer: false,
-      direction: "rtl",
-      form1: {},
-      value: false,
-      frist: {
-        requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=255",
-        selectionType: "radio",
-        mapList: [],
-      },
-      options: [
-        {
-          values: "yes",
-          label: "是",
-        },
-        {
-          values: "no",
-          label: "否",
-        },
-      ],
-      values: "yes",
-      tableTop: [
-        {
-          prop: "capacityNumber",
-          label: "车牌号",
-          slot: true,
-        },
-        {
-          prop: "materialName",
-          label: "物资名称",
-          width: "140",
-        },
-        {
-          prop: "carrierName",
-          label: "承运商",
-          width: "120",
-        },
-        {
-          prop: "lineName",
-          label: "运输线路",
-          width: "140",
-        },
-        {
-          prop: "orderPlanWeight",
-          label: "重量",
-          slot: true,
-        },
-        {
-          prop: "saleShipperAddressName",
-          label: "收货地址",
-          width: "300",
-          slot: true,
-        },
-        {
-          prop: "saleDateOfReceipt",
-          label: "收货日期",
-          width: "110",
-          slot: true,
-        },
-        {
-          prop: "saleOrderConsignee",
-          label: "收货客户",
-          slot: true,
-        },
-        {
-          prop: "saleOrderConsigneeTel",
-          label: "收货客户电话号码",
-          slot: true,
-        },
-      ],
-      row: {},
-    };
-  },
-  watch: {},
-  methods: {
-    currentRadioChange2(selectoin) {
-      console.log("selectoin", selectoin);
-      this.carrierName = selectoin.carrierName;
-    },
-    currentRadioChange5(selection) {
-      this.lineName = selection.lineName;
-    },
-    //删除派车列
-    deleteRow(index, rows) {
-      rows.splice(index, 1);
-    },
-    //点击浏览事件
-    ondrawer(row, index) {
-      this.row = row;
-      this.row.index = index;
-      this.drawer = true;
-    },
-    //监听模态框点击事件
-    currentRadioChange1(radioList) {
-      this.selectionList[this.row.index].saleShipperAddressId =
-        radioList.addressId;
-      this.selectionList[this.row.index].saleShipperAddressName =
-        radioList.address;
-    },
-    //收货地址模态框查询
-    onclick1() {
-      this.option.requestUrl =
-        "/api/v1/ams/getAddressDeliveryAddress?apiId=255&con=" + this.textInput;
-    },
-    //物资模态框查询
-    // 框计算
-    onclick(num) {
-      //主界面的框计算
-      if(num == 1){
-        this.option.requestUrl =
-        "/api/v1/ams/getSaleOrderAndMaterialById?apiId=410&saleOrderId=" +
-        this.$route.params.saleOrderId;
-      }else if(num == 2){
-        //
-      }
-    },
-    open() {
-      if (this.selectionList1.length != 0) {
-        this.$confirm("取消会将已选择的数据清空, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.selectionList1 = [];
-            this.table = false;
-          })
-          .catch(() => {});
-      } else {
-        this.table = false;
-      }
-    },
-    // 确定
-    makeSure() {
-      //初始化maplist
-      var mapList = [];
-      console.log("this.selectionList", this.selectionList);
-      this.selectionList.forEach((item, i) => {
-        //初始化mapItem
-        var mapItem = {
-          //销售订单id
-          saleOrderId: 0,
-          //车序号
-          truckNo: "",
-          //收货地址id
-          shippingAddressId: 0,
-          //收货日期
-          dateOfReceipt: null,
-          //收货方姓名
-          orderConsignee: "",
-          //收货方电话
-          orderConsigneeTel: "",
-          //车序号物资ID
-          saleMaterialId: 0,
-          //物资数量
-          materialNumber: 0,
-        };
-        mapItem.saleOrderId = this.$route.params.saleOrderId;
-        mapItem.truckNo = item.cxh;
-        mapItem.shippingAddressId = item.saleShipperAddressId;
-        mapItem.dateOfReceipt = item.saleDateOfReceipt;
-        mapItem.orderConsignee = item.saleOrderConsignee;
-        mapItem.orderConsigneeTel = item.saleOrderConsigneeTel;
-        mapItem.saleMaterialId = item.saleMaterialId;
-        mapItem.materialNumber = item.orderPlanWeight;
-        mapList.push(mapItem);
-      });
-      // 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() {
-      this.$router.go(-1);
-    },
-    //关闭事件
-    handleClose(done) {
-      this.$confirm("确认关闭？")
-        .then((_) => {
-          done();
-        })
-        .catch((_) => {});
-    },
-
-    CloseClick() {},
-  },
-};
-</script>
-<style lang='scss' scoped>
-.addSalePlan {
-  width: 100%;
-}
-.switch {
-  margin-left: 60rem;
-}
-.lineId {
-  display: flex;
-  justify-content: center;
-  margin-left: 2rem;
-  .text {
-    display: inline-block;
-    width: 170px;
-    text-align: right;
-  }
-  .input {
-    width: 250px;
-    margin-right: 20px;
-  }
-  .input1 {
-    width: 60px;
-    margin-right: 20px;
-  }
-}
-.form-box,
-.from {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-top: 5px;
-  margin-bottom: 20px;
-}
-.button-box {
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
-}
-.select {
-  margin-left: 2rem;
-}
-.makeSureAdd {
-  width: 100px;
-  margin-left: 3.5rem;
-  margin-top: 0.3rem;
-  align-items: center;
-  justify-content: center;
-  text-align: center;
-  display: flex;
-}
-.demo-form-inline {
-  margin-left: 2rem;
-}
-.table_form {
-  margin-left: -16rem;
-}
-.textinput {
-  width: 50px;
-}
-.textinput1 {
-  width: 50px;
-  text-align: center;
-  size: small;
-}
-.textinput2 {
-  width: 50px;
-  margin-right: 30px;
-}
-.textinput3 {
-  width: 270px;
-}
-.textinput4 {
-  width: 60px;
-}
-.textinput5 {
-  width: 120px;
-}
-</style>

src/views/appoint/components/saleContract/addSaleOrderSend.vue

@@ -83,7 +83,7 @@
                 </el-input>
                 <el-button
                   type="primary"
-                  placeholder="请输入内容(必填)"
+                  placeholder="请输入内容(非必填)"
                   @click="select(scope.$index,3)"
                   >浏览</el-button
                 >
@@ -142,11 +142,9 @@
     <!-- 线路模态框 -->
     <el-drawer 
       :visible.sync="drawer" 
-      :with-header="false"
       :destroy-on-close="false"
       direction="rtl"
       size="40%"
-      :show-close="false"
       :wrapperClosable="false"
       modal
       close-on-press-escape
@@ -186,11 +184,9 @@
     <!-- 车辆模态框 -->
     <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
@@ -230,11 +226,9 @@
     <!-- 收货地址的模态框 -->
     <el-drawer 
       :visible.sync="addressDrawer" 
-      :with-header="false"
       :destroy-on-close="false"
       direction="rtl"
       size="40%"
-      :show-close="false"
       :wrapperClosable="false"
       modal
       close-on-press-escape
@@ -369,7 +363,7 @@ export default {
         },
         {
           prop: "saleDateOfReceipt",
-          label: "收货日期",
+          label: "发货日期",
           width: "270",
           slot: true,
         },
@@ -438,7 +432,7 @@ export default {
         console.log(typeof e.saleDateOfReceipt)
       })
       
-      console.log(this.selectionList)
+      console.log("this.selectionList",this.selectionList)
       if(state){
         this.axios.post('/api/v1/ams/dispatchTruckOrderBySale',{
           saleOrderId:this.$route.params.saleOrderId,
@@ -582,9 +576,9 @@ export default {
         this.drawer = true;
       }else if(num == 2){
         if(!this.materialId){
-          this.$message.warning('请选择物资后，在点击')
+          this.$message.warning('请选择物资后，再点击')
         }else if(!this.lineId){
-          this.$message.warning('请选择线路后，在点击')
+          this.$message.warning('请选择线路后，再点击')
         }else{
           this.truckDrawer = true;
         }
@@ -597,7 +591,7 @@ export default {
     //线路表格的确定事件
     AddClick(){
       this.drawer = false;
-      this.lineName = this.cacheLine.lineName;
+      this.lineName = this.cacheLine.lineName +"  "+ this.cacheLine.lineDesk;
       this.lineId = this.cacheLine.lineId;
     }
   },
@@ -613,7 +607,7 @@ export default {
       justify-content: center;
       align-items: center;
       .el-input {
-        width: 250px;
+        width: 350px;
         margin-left: 10px;
         margin-right: 10px;
       }

src/views/appoint/components/saleContract/addTruckNoDetail.vue

@@ -3,7 +3,6 @@
   <div class="salePlan">
     <div class="main">
       <span class="text">新增车次物资信息</span>
-      <span class="a"></span>
     </div>
     <div>
       <div class="form-box" style="margin-left: 5rem">

src/views/appoint/components/saleContract/saleOrder.vue

@@ -98,60 +98,10 @@
 
         </dilTable>
       </el-tab-pane>
-
-
-      <!-- 财务已审批 -->
-      <el-tab-pane label="财务已审批" name="third">
-        <dilTable v-bind.sync="option3" ref="table1">
-          <el-table-column fixed="right" label="操作" width="200">
-            <template slot-scope="scope">
-              <el-button
-                @click="lookclick(scope.row.saleOrderId)"
-                type="text"
-                size="small"
-                >查看</el-button
-              >
-              <el-button
-                @click="passclick(scope.row.saleOrderId)"
-                type="text"
-                size="small"
-                >修改日志</el-button
-              >
-              <el-button
-                @click="detailclick1(scope.row)"
-                type="text"
-                size="small"
-                >物资详情</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="tableData1" border >
-                  <el-table-column
-                    v-for="(item, i) in tableHead"
-                    :key="i"
-                    :prop="item.prop"
-                    :label="item.label"
-                    :width="item.width"
-                  ></el-table-column>
-                </el-table>
-              </div>
-            </el-form>
-          </template>
-        </el-table-column>
-
-
-        </dilTable>
-      </el-tab-pane>
-      <!-- 销售公司已审批 -->
-       <el-tab-pane label="销售公司已审批" name="four">
+      <!-- 已审批 -->
+       <el-tab-pane label="已审批" name="four">
         <dilTable v-bind.sync="option4" ref="table">
-          <el-table-column fixed="right" label="操作" width="130">
+          <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
               <el-button
                 @click="sendClick(scope.row.saleOrderId)"
@@ -280,7 +230,13 @@ export default {
       console.log(tab, event);
     },
     onclick() {
-      console.log(this.input);
+      if(this.activeName == "first"){
+        this.option.requestUrl = "/api/v1/ams/getSaleOrderInfoes?apiId=408&con="+this.input;
+      }else if(this.activeName == "second"){
+        this.option2.requestUrl = "/api/v1/ams/getSaleOrderReportedes?apiId=408&con="+this.input;      
+      }else if(this.activeName == "four"){
+        this.option4.requestUrl = "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&con="+this.input;      
+      }
     },
     seeclick(saleOrderId) {
       this.$router.push("/saleOrderDetail/" + saleOrderId);
@@ -297,10 +253,7 @@ export default {
     sendClick(saleOrderId){
       this.$router.push("/addSaleOrderSend/" + saleOrderId);
     },
-    // detailedClick(saleOrderId){
-    //   this.$router.push("saleOrderMaterial/" + saleOrderId);
-    // },
-    // -------查看物资详情 (销售公司已审批)
+    // -------查看物资详情 (已审批)
     detailclick(row) {
       // 记录重复点击次数
       if (this.oldRow === row) {

src/views/sale/components/transport_appointment/openDistribution.vue

@@ -168,20 +168,16 @@ export default {
     },
     firstGetRequestUrl(){
     if(getCookie("orgCode") == "chengyunshang"){
-      console.log("enter",getCookie('userId'))
       this.first.requestUrl = "/api/v1/ams/getPCDispatchSaleOrderList?apiId=242&dispatchType=0&carrierSsoId="+ getCookie('userId');
     }else{
-      console.log("out",this.ssoId)
      this.first.requestUrl = "/api/v1/ams/getPCDispatchSaleOrderList?apiId=242&dispatchType=0&carrierSsoId=" + this.ssoId;
     }
 
     },
     secondGetRequestUrl(){
     if(getCookie("orgCode") == "chengyunshang"){
-      console.log("enter",getCookie('userId'))
       this.second.requestUrl = "/api/v1/ams/selectDispatchSaleOrderList?apiId=233&carrierSsoId="+ getCookie('userId');
     }else{
-            console.log("out",this.ssoId)
      this.second.requestUrl = "/api/v1/ams/selectDispatchSaleOrderList?apiId=233&carrierSsoId=" + this.ssoId;
     }
 

src/views/sale/components/transport_excute/enFactoryResult.vue

@@ -48,7 +48,7 @@ export default {
       inputText: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=210&orderType=1",
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=210&orderType=2",
       },
       //记录旧的row对象
       oldRow: "",
@@ -83,7 +83,7 @@ export default {
     //   框计算
     onclick() {
       this.option.requestUrl =
-        "/api/v1/tms/getAllEnFactoryResult?apiId=210&orderType=1&con="+
+        "/api/v1/tms/getAllEnFactoryResult?apiId=210&orderType=2&con="+
         this.inputText;
     },
     // 查看物资详情
@@ -116,6 +116,11 @@ export default {
       this.axios
         .get("/api/v1/tms/getMaterial?orderId=" + orderId)
         .then((res) => {
+          res.data.data.forEach(e => {
+            if(e.specificationModel == "()"){
+              e.specificationModel = null;
+            } 
+          });
           this.tableData = res.data.data;
         });
     },

src/views/sale/components/transport_excute/grossWeightResult.vue

@@ -24,13 +24,13 @@ export default {
             inputText:'',
             option: {       
                 // 表格请求数据的地址
-                requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=212&orderType=1",
+                requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=212&orderType=2",
             },
         }
     },
     methods:{
         onclick(){
-            this.option.requestUrl = "/api/v1/qms/getQueueApply?apiId=125&orderType=1&con="+this.inputText;
+            this.option.requestUrl = "/api/v1/qms/getQueueApply?apiId=125&orderType=2&con="+this.inputText;
         }
     }
 }

src/views/sale/components/transport_excute/loadTruckResult.vue

@@ -22,14 +22,14 @@ export default {
       option: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/tms/getAllLoadResult?apiId=221&status=0&orderType=1",
+          "/api/v1/tms/getAllLoadResult?apiId=221&status=0&orderType=2",
       },
     };
   },
   methods: {
     onclick() {
       this.option.requestUrl =
-        "/api/v1/tms/getAllLoadResult?apiId=221&status=0&orderType=1&con=" + this.inputText;
+        "/api/v1/tms/getAllLoadResult?apiId=221&status=0&orderType=2&con=" + this.inputText;
     },
   },
 

src/views/sale/components/transport_excute/outFactory/outFactoryResult.vue

@@ -48,7 +48,7 @@ export default {
       inputText: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=225&orderType=1",
+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=225&orderType=2",
       },
       //记录旧的row对象
       oldRow: "",
@@ -116,6 +116,11 @@ export default {
       this.axios
         .get("/api/v1/tms/getMaterial?orderId=" + orderId)
         .then((res) => {
+          res.data.data.forEach(e => {
+            if(e.specificationModel == "()"){
+              e.specificationModel = null;
+            } 
+          });
           this.tableData = res.data.data;
         });
     },

src/views/sale/components/transport_excute/qualityResult.vue

@@ -24,13 +24,13 @@ export default {
             inputText:'',
             option: {       
                 // 表格请求数据的地址
-                requestUrl: "/api/v1/tms/getQualityResult?apiId=413&orderType=1",
+                requestUrl: "/api/v1/tms/getQualityResult?apiId=413&orderType=2",
             },
         }
     },
     methods:{
         onclick(){
-            this.option.requestUrl = "/api/v1/tms/getQualityResult?apiId=125&orderType=1&con="+this.inputText;
+            this.option.requestUrl = "/api/v1/tms/getQualityResult?apiId=125&orderType=2&con="+this.inputText;
         }
     }
 }

src/views/sale/components/transport_excute/returnResult.vue

@@ -24,13 +24,13 @@ export default {
             inputText:'',
             option: {       
                 // 表格请求数据的地址
-                requestUrl: "/api/v1/qms/getQueueApply?apiId=125&orderType=1",
+                requestUrl: "/api/v1/qms/getQueueApply?apiId=125&orderType=2",
             },
         }
     },
     methods:{
         onclick(){
-            this.option.requestUrl = "/api/v1/qms/getQueueApply?apiId=125&orderType=1&con="+this.inputText;
+            this.option.requestUrl = "/api/v1/qms/getQueueApply?apiId=125&orderType=2&con="+this.inputText;
         }
     }
 }

src/views/sale/components/transport_excute/tareWeightResult.vue

@@ -24,13 +24,13 @@ export default {
             inputText:'',
             option: {       
                 // 表格请求数据的地址
-                requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=211&orderType=1",
+                requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=211&orderType=2",
             },
         }
     },
     methods:{
         onclick(){
-            this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=211&orderType=1&con="+this.inputText;
+            this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=211&orderType=2&con="+this.inputText;
         }
     }
 }

src/views/sale/components/transport_order/receiveOrder.vue

@@ -1,289 +1,332 @@
 // 接收运单
 <template>
-	<div class="steel_inbound">
-		<div class="sache">
-			<el-input placeholder="请输入内容" v-model="inputText" clearable>
-			</el-input>
-			<el-button type="primary" class="btn" @click="onClick">
-				<i class="el-icon-search"></i>查询
-			</el-button>
-		</div>
-		<template>
-			<div>
-				<el-tabs v-model="activeName">
-					<!-- 已接收 -->
-					<el-tab-pane label="已接收" name="first">
-						<dilTable v-bind.sync="first" ref="table">
-							<el-table-column fixed="right" label="操作" width="50">
-								<template slot-scope="scope">
-								<el-button @click="detailclick(scope.row)" type="text" size="small">
-									物资详情
-								</el-button>
-								</template>
-							</el-table-column>
-							 <!-- 物资详情抽屉 -->
-							<el-table-column type="expand" width="1">
-							<template slot-scope="props">
-								<el-form label-position="center" inline class="demo-table-expand">
-								<div v-if="false">{{ props }}</div>
-								<div>
-									<el-table :data="tableData" border >
-									<el-table-column
-										v-for="(item, i) in tableHead"
-										:key="i"
-										:prop="item.prop"
-										:label="item.label"
-										:width="item.width"
-									></el-table-column>
-									</el-table>
-								</div>
-								</el-form>
-							</template>
-							</el-table-column>
-						</dilTable>
-					</el-tab-pane>
-					<!-- 已拒绝 -->
-					<el-tab-pane label="已拒绝" name="second">
-						<dilTable v-bind.sync="second" ref="table1">
-							<el-table-column fixed="right" label="操作" width="50">
-								<template slot-scope="scope">
-								<el-button @click="detailclick1(scope.row)" type="text" size="small">
-									物资详情
-								</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="tableData1" border >
-									<el-table-column
-										v-for="(item, i) in tableHead"
-										:key="i"
-										:prop="item.prop"
-										:label="item.label"
-										:width="item.width"
-									></el-table-column>
-									</el-table>
-								</div>
-								</el-form>
-							</template>
-							</el-table-column>
-						</dilTable>
-					</el-tab-pane>
-					<!-- 未接收 -->
-					<el-tab-pane label="未接收" name="third">
-						<dilTable v-bind.sync="third" ref="table2">
-							<el-table-column fixed="right" label="操作" width="50">
-								<template slot-scope="scope">
-								<el-button @click="detailclick2(scope.row)" type="text" size="small">
-									物资详情
-								</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="tableData2" border >
-									<el-table-column
-										v-for="(item, i) in tableHead"
-										:key="i"
-										:prop="item.prop"
-										:label="item.label"
-										:width="item.width"
-									></el-table-column>
-									</el-table>
-								</div>
-								</el-form>
-							</template>
-							</el-table-column>
-						</dilTable>
-					</el-tab-pane>
-				</el-tabs>
-			</div>
-		</template>
-	</div>
-
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onClick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+        <el-tabs v-model="activeName">
+          <!-- 未接收 -->
+          <el-tab-pane label="未接收" name="third">
+            <dilTable v-bind.sync="option3" ref="table2">
+              <el-table-column fixed="right" label="操作" width="120">
+                <template slot-scope="scope">
+                  <el-button
+                    @click="detailclick2(scope.row)"
+                    type="text"
+                    size="small"
+                  >
+                    物资详情
+                  </el-button>
+                  <el-button
+                    @click="closeOrder(scope.row)"
+                    type="text"
+                    size="small"
+                  >
+                    关闭订单
+                  </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="tableData2" border>
+                        <el-table-column
+                          v-for="(item, i) in tableHead"
+                          :key="i"
+                          :prop="item.prop"
+                          :label="item.label"
+                          :width="item.width"
+                        ></el-table-column>
+                      </el-table>
+                    </div>
+                  </el-form>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+          <!-- 已接收 -->
+          <el-tab-pane label="已接收" name="first">
+            <dilTable v-bind.sync="option1" ref="table">
+              <el-table-column fixed="right" label="操作" width="50">
+                <template slot-scope="scope">
+                  <el-button
+                    @click="detailclick(scope.row)"
+                    type="text"
+                    size="small"
+                  >
+                    物资详情
+                  </el-button>
+                </template>
+              </el-table-column>
+              <!-- 物资详情抽屉 -->
+              <el-table-column type="expand" width="1">
+                <template slot-scope="props">
+                  <el-form label-position="center" inline class="demo-table-expand">
+                    <div v-if="false">{{ props }}</div>
+                    <div>
+                      <el-table :data="tableData" border >
+                        <el-table-column
+                          v-for="(item, i) in tableHead"
+                          :key="i"
+                          :prop="item.prop"
+                          :label="item.label"
+                          :width="item.width"
+                        ></el-table-column>
+                      </el-table>
+                    </div>
+                  </el-form>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+          <!-- 已拒绝 -->
+          <el-tab-pane label="已拒绝" name="second">
+            <dilTable v-bind.sync="option2" ref="table1">
+              <el-table-column fixed="right" label="操作" width="50">
+                <template slot-scope="scope">
+                  <el-button
+                    @click="detailclick1(scope.row)"
+                    type="text"
+                    size="small"
+                  >
+                    物资详情
+                  </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="tableData1" border>
+                        <el-table-column
+                          v-for="(item, i) in tableHead"
+                          :key="i"
+                          :prop="item.prop"
+                          :label="item.label"
+                          :width="item.width"
+                        ></el-table-column>
+                      </el-table>
+                    </div>
+                  </el-form>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+        </el-tabs>
+  </div>
 </template>
 <script>
 import { getCookie } from "@/utils/util.js";
-	export default {
-		data() {
-			return {
-				inputText: "",
-				first: {
-					// first请求数据的地址，承运商(运输订单状态为已接收，接收状态为已接收)
-					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&carrierSsoId="+ getCookie('userId'),
-				},
-				second: {
-					// second请求数据的地址，承运商暂时设置为默认（运输订单状态为）
-					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&carrierSsoId="+ getCookie('userId'),
-				},
-				third: {
-					// second请求数据的地址
-					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&carrierSsoId="+ getCookie('userId'),
-				},
-				activeName: "first",
-				//记录旧的row对象(已接收)
-				oldRow: "",
-				//记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(已接收)
-				oldRowCount: 1,
-				//记录旧的row对象(已拒绝)
-				oldRow1: "",
-				//记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(已拒绝)
-				oldRowCount1: 1,
-				//记录旧的row对象(未接收)
-				oldRow1: "",
-				//记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(未接收)
-				oldRowCount1: 1,
-				tableHead: [
-					{
-					prop: "materialName",
-					label: "物资名称",
-					width: 150,
-					},
-					{
-					prop: "specificationModel",
-					label: "规格型号",
-					width: 150,
-					},
-					{
-					prop: "materialNumber",
-					label: "物资件数",
-					width: 100,
-					},
-					{
-					prop: "materialWeight",
-					label: "物资重量",
-					width: 100,
-					},
-				],
-				tableData: [],
-				tableData1: [],
-				tableData2: [],
-			}
-		},
-		methods: {
-		 onClick(){
-			  if(this.activeName == "first"){
-              this.option1.requestUrl = "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&carrierSsoId="+ getCookie('userId')+"&con=" + this.input;
-             }else if (this.activeName == "second") {
-			          this.option1.requestUrl = "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&carrierSsoId="+ getCookie('userId')+"&con=" + this.input;
-		     } else {
-			   this.option1.requestUrl = "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&carrierSsoId="+ getCookie('userId')+"&con=" + this.input;
-		  }
-        
-      
-		 },
-		// -------查看物资详情(已接收)
-		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;
-		// 根据销售订单物资中间表id查询物资信息
-		this.axios
-			.post("/api/v1/oms/getOrderMaterialList?orderId=" +row.orderId)
-			.then((res) => {
-			this.tableData = res.data.data;
-			});
-		},
-		
-		// -------查看物资详情(已拒绝)
-		detailclick1(row) {
-		// 记录重复点击次数
-		if (this.oldRow1 === row) {
-			this.oldRowCount1 += 1;
-		}
-		// 切换当前详情表
-		this.$refs.table1.toggleRowExpansion(row);
-		// 打开前关闭上一个详情表
-		if (this.oldRow1 != "") {
-			if (this.oldRow1 != row) {
-			if (this.oldRowCount1 % 2 === 1) {
-				this.$refs.table1.toggleRowExpansion(this.oldRow1);
-			} else {
-				this.oldRowCount1 = 1;
-			}
-			} else {
-			this.oldRow1 = null;
-			return;
-			}
-		}
-		// 重置上一个点击对象
-		this.oldRow1 = row;
-		// 根据销售订单物资中间表id查询物资信息
-		this.axios
-			.post("/api/v1/oms/getOrderMaterialList?orderId=" +row.orderId)
-			.then((res) => {
-			this.tableData1 = res.data.data;
-			});
-		},
+export default {
+  data() {
+    return {
+      inputText: "",
+      option1: {
+        // option1请求数据的地址，承运商(运输订单状态为已接收，接收状态为已接收)
+        requestUrl:
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&carrierSsoId=" +
+          getCookie("userId"),
+      },
+      option2: {
+        // option2请求数据的地址，承运商暂时设置为默认（运输订单状态为）
+        requestUrl:
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&carrierSsoId=" +
+          getCookie("userId"),
+      },
+      option3: {
+        // option3请求数据的地址
+        requestUrl:
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&carrierSsoId=" +
+          getCookie("userId"),
+      },
+      activeName: "third",
+      //记录旧的row对象(已接收)
+      oldRow: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(已接收)
+      oldRowCount: 1,
+      //记录旧的row对象(已拒绝)
+      oldRow1: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(已拒绝)
+      oldRowCount1: 1,
+      //记录旧的row对象(未接收)
+      oldRow2: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(未接收)
+      oldRowCount2: 1,
+      tableHead: [
+        {
+          prop: "materialName",
+          label: "物资名称",
+          width: 150,
+        },
+        {
+          prop: "specificationModel",
+          label: "规格型号",
+          width: 150,
+        },
+        {
+          prop: "materialNumber",
+          label: "物资件数",
+          width: 100,
+        },
+        {
+          prop: "materialWeight",
+          label: "物资重量",
+          width: 100,
+        },
+      ],
+      tableData: [],
+      tableData1: [],
+      tableData2: [],
+    };
+  },
+  methods: {
+    onClick() {
+      if (this.activeName == "first") {
+        this.option1.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&carrierSsoId=" +
+          getCookie("userId") +
+          "&con=" +
+          this.input;
+      } else if (this.activeName == "second") {
+        this.option1.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&carrierSsoId=" +
+          getCookie("userId") +
+          "&con=" +
+          this.input;
+      } else {
+        this.option1.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&carrierSsoId=" +
+          getCookie("userId") +
+          "&con=" +
+          this.input;
+      }
+    },
+    // -------查看物资详情 (已接收)
+    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;
+// 根据销售订单id查询物资信息
+      this.axios
+      .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
+        .then((res) => {
+          console.log("res.data.data",res.data.data)
+          this.tableData = res.data.data;
+        });
+    },
 
-		// -------查看物资详情(未接收)
-		detailclick2(row) {
-		// 记录重复点击次数
-		if (this.oldRow2 === row) {
-			this.oldRowCount2 += 1;
-		}
-		// 切换当前详情表
-		this.$refs.table2.toggleRowExpansion(row);
-		// 打开前关闭上一个详情表
-		if (this.oldRow2 != "") {
-			if (this.oldRow2 != row) {
-			if (this.oldRowCount2 % 2 === 1) {
-				this.$refs.table2.toggleRowExpansion(this.oldRow2);
-			} else {
-				this.oldRowCount2 = 1;
-			}
-			} else {
-			this.oldRow2 = null;
-			return;
-			}
-		}
-		// 重置上一个点击对象
-		this.oldRow2 = row;
-		// 根据销售订单物资中间表id查询物资信息
-		this.axios
-			.post("/api/v1/oms/getOrderMaterialList?orderId=" +row.orderId)
-			.then((res) => {
-			this.tableData2 = res.data.data;
-			});
-		},
+    // -------查看物资详情(已拒绝)
+    detailclick1(row) {
+      // 记录重复点击次数
+      if (this.oldRow1 === row) {
+        this.oldRowCount1 += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table1.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow1 != "") {
+        if (this.oldRow1 != row) {
+          if (this.oldRowCount1 % 2 === 1) {
+            this.$refs.table1.toggleRowExpansion(this.oldRow1);
+          } else {
+            this.oldRowCount1 = 1;
+          }
+        } else {
+          this.oldRow1 = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow1 = row;
+      // 根据销售订单物资中间表id查询物资信息
+      this.axios
+        .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
+        .then((res) => {
+          console.log("res.data.data",res.data.data)
+          this.tableData1 = res.data.data;
+        });
+    },
 
-		 }
-	}
+    // -------查看物资详情(未接收)
+    detailclick2(row) {
+      // 记录重复点击次数
+      if (this.oldRow2 === row) {
+        this.oldRowCount2 += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table2.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow2 != "") {
+        if (this.oldRow2 != row) {
+          if (this.oldRowCount2 % 2 === 1) {
+            this.$refs.table2.toggleRowExpansion(this.oldRow2);
+          } else {
+            this.oldRowCount2 = 1;
+          }
+        } else {
+          this.oldRow2 = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow2 = row;
+      // 根据销售订单物资中间表id查询物资信息
+      this.axios
+        .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
+        .then((res) => {
+          this.tableData2 = res.data.data;
+        });
+    },
+    //关闭选中行的订单
+    closeOrder(row){
+      this.$message.success('关闭成功');
+      this.axios
+        .post("/api/v1/oms/closeOrder?orderId=" + row.orderId)
+        .then((res) => {
+          if(res.data.code == '200'){
+            this.$router.go(0);
+          }
+        });   
+        
+    },
+  },
+};
 </script>
 <style lang="scss" scode>
-	.steel_inbound {
-		.sache {
-			padding: 1.25rem 0.375rem;
-			.el-input {
-			width: 20%;
-			margin-right: 1.25rem;
-			}
-		}
-	}
+.steel_inbound {
+  .sache {
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+}
 </style>