tdsh

config/index.js

@@ -65,24 +65,15 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
     target: "http://172.16.33.166:8080",
-    // target: "http://localhost:8019",
+    // target: "http://localhost:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
     }
   },
-  "/api/v1/join": {
-    target: "http://172.16.33.166:8080",
-    // target: "http://192.168.1.108:8066",
-    ws: true,
-    pathRewrite: {
-      "^api/v1/join": "/api/v1/join"
-    }
-  },
   "/views/api/v1": {
     target: "http://172.16.33.166:8080",
     // target: "http://172.16.33.166:8080",
-
     // target: "http://192.168.1.115:8080",
     ws: true,
     pathRewrite: {

src/views/RMS/components/addCapacity.vue

@@ -267,6 +267,7 @@ export default {
   .form_box {
     width: 100%;
     margin-top: 30px;
+    margin-left: 50px;
     display: flex;
     justify-content: center;
     .el-form-item {

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

@@ -59,19 +59,19 @@ export default {
     activeName(val){
       if (getCookie("orgCode") == "chengyunshang") {
         if(val == "option"){
-          this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&i="+new Date()+"&carrierSSOId=" + null;
+          this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&i="+new Date()+"&carrierSSOId=" + null;
         }else if(val == "first"){
-          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&i="+new Date()+"&carrierSSOId=" + null;
+          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&i="+new Date()+"&carrierSSOId=" + null;
         }else if(val == "second"){
-          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&i="+new Date()+"&carrierSSOId=" + null;
+          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&i="+new Date()+"&carrierSSOId=" + null;
         }
       }else{
         if(val == "option"){
-          this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&i="+new Date()+"&carrierSSOId=" + null;
+          this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&i="+new Date()+"&carrierSSOId=" + null;
         }else if(val == "first"){
-          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&i="+new Date()+"&carrierSSOId=" + null;
+          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&i="+new Date()+"&carrierSSOId=" + null;
         }else if(val == "second"){
-          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&i="+new Date()+"&carrierSSOId=" + null;
+          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&i="+new Date()+"&carrierSSOId=" + null;
         }
       }
       
@@ -80,32 +80,32 @@ export default {
   created() {
     //判断是否是承运商
     if (getCookie("orgCode") == "chengyunshang") {
-      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&carrierSSOId=" + getCookie("userId");
-      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&carrierSSOId=" + getCookie("userId");
-      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&carrierSSOId=" + getCookie("userId");
+      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&carrierSSOId=" + getCookie("userId");
+      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&carrierSSOId=" + getCookie("userId");
+      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&carrierSSOId=" + getCookie("userId");
     } else {
-      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&carrierSSOId=" + null;
-      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&carrierSSOId=" + null;
-      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&carrierSSOId=" + null;
+      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&carrierSSOId=" + null;
+      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&carrierSSOId=" + null;
+      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&carrierSSOId=" + null;
     }
   },
   methods: {
     onclick() {
     if (getCookie("orgCode") == "chengyunshang") {
        if(this.activeName == "option"){
-        this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + getCookie("userId");
+        this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + getCookie("userId");
       }else if (this.activeName == "first") {
-        this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=5&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + getCookie("userId");
+        this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=5&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + getCookie("userId");
       } else if (this.activeName == "second") {
-        this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + getCookie("userId");
+        this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + getCookie("userId");
       }
     }else{
       if(this.activeName == "option"){
-        this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + null;
+        this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + null;
       }else if (this.activeName == "first") {
-        this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=5&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + null;
+        this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=5&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + null;
       } else if (this.activeName == "second") {
-        this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + null;
+        this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + null;
       }
     }
       
@@ -118,7 +118,7 @@ export default {
         this.axios.post('/api/v1/oms/deleteOrders',{list:this.list}).then((res)=>{
           if(res.data.code == "200"){
             this.$message.success('关闭成功')
-            this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&con=" + this.input +"&i="+new Date();
+            this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&con=" + this.input +"&i="+new Date();
           }
         })
       }

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

@@ -1,19 +1,24 @@
 <template>
   <!-- 辅料出厂作业页面 -->
   <div class="homeworkPath">
-   <div class="top"> 
-      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+    <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>
+    <dilTable v-bind.sync="option"> </dilTable>
   </div>
 </template>
 
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   name: "homeworkPath",
   data() {
@@ -22,24 +27,38 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=5",
+        requestUrl: "",
       },
     };
   },
-
+  created() {
+    this.getRequestUrl();
+  },
   methods: {
-    
+    getRequestUrl(){
+      if (getCookie("orgCode") == "chengyunshang") {
+        this.option.requestUrl =
+          "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=5&carrierSsoId=" +
+          getCookie("userId");
+      } else {
+        this.option.requestUrl =
+          "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=5&carrierSsoId=" +
+          null;
+      }
+    },
     onclick() {
-     this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=5&con=" + this.input;
+      this.option.requestUrl =
+        "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=5&con=" +
+        this.input;
     },
-   }
+  },
 };
 </script>
 <style lang='scss'>
 .homeworkPath {
-   .top {
+  .top {
     padding: 40px;
-    .input{
+    .input {
       width: 250px;
       margin-right: 10px;
     }

src/views/TMS/components/importedTruck/assignmentPlan.vue

@@ -2,18 +2,29 @@
   <!-- 分派计划 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input
+        class="el-input"
+        placeholder="请输入内容"
+        v-model="input"
+        clearable
+      >
+      </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
+  
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <!--接收 -->
       <el-tab-pane label="待接收" name="zero">
         <dilTable v-bind.sync="zero" ref="table">
           <el-table-column fixed="right" label="操作" width="80">
             <template slot-scope="scope">
-              <el-button @click="receiveClick(scope.row.planId)" type="text" size="small">
+              <el-button
+                @click="receiveClick(scope.row.planId)"
+                type="text"
+                size="small"
+              >
                 接收
               </el-button>
             </template>
@@ -51,8 +62,8 @@ export default {
       status: "",
       input: "",
       activeName: "zero",
-      zero:{
-          requestUrl: "/api/v1/ams/getAllPurPlan?apiId=79&status=1",
+      zero: {
+        requestUrl: "/api/v1/ams/getAllPurPlan?apiId=79&status=1",
       },
       option1: {
         //待分解
@@ -81,13 +92,10 @@ export default {
             message: "接收成功!",
           });
           // console.log(this.arr[0].text_prop);
-          this.axios
-            .post(
-              "/api/v1/ams/receptionPurPlan/" + planId
-            )
-            .then(() => {
-              this.zero.requestUrl = "/api/v1/ams/getAllPurPlan?apiId=79&status=1&q=1"
-            });
+          this.axios.post("/api/v1/ams/receptionPurPlan/" + planId).then(() => {
+            this.zero.requestUrl =
+              "/api/v1/ams/getAllPurPlan?apiId=79&status=1&q=1";
+          });
         })
         .catch(() => {
           this.$message({
@@ -97,15 +105,18 @@ export default {
         });
     },
     onclick() {
-      if(this.activeName=='zero'){
-        this.zero.requestUrl = "/api/v1/ams/getAllPurPlan?apiId=79&status=1&con=" + this.input
-      }else if(this.activeName == 'first'){
+      if (this.activeName == "zero") {
+        this.zero.requestUrl =
+          "/api/v1/ams/getAllPurPlan?apiId=79&status=1&con=" + this.input;
+      } else if (this.activeName == "first") {
         this.option1.requestUrl =
-        "/api/v1/ams/getDecomposedPlan?apiId=82&status=2&con=" + this.input;
-      }else{
-        this.option2.requestUrl = "/api/v1/ams/getDecomposedPlan?apiId=82&status=2&planStatus=1&con=" + this.input
+          "/api/v1/ams/getDecomposedPlan?apiId=82&status=2&con=" + this.input;
+      } else {
+        this.option2.requestUrl =
+          "/api/v1/ams/getDecomposedPlan?apiId=82&status=2&planStatus=1&con=" +
+          this.input;
       }
-      },
+    },
     seeClick(planId) {
       console.log(planId);
       this.$router.push("/breakdownPlanAdd/" + planId);
@@ -116,10 +127,16 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
+<style lang='scss'>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input el-input--suffix {
+      .el-input__inner {
+        width: 20%;
+        margin-right: 1.25rem;
+      }
+    }
   }
 }
 </style>

src/views/TMS/components/importedTruck/breakdownPlan.vue

@@ -3,7 +3,7 @@
   <div class="homeworkPath">
     <div class="top">
   <span class="top_title">运输计划号: </span>
-      <el-input
+      <el-input class="el-input"
         placeholder="请输入内容"
         v-model="input"
         clearable>
@@ -56,10 +56,14 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
+<style lang='scss'>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/TMS/components/importedTruck/transportReserve.vue

@@ -2,7 +2,7 @@
   <!-- 运输预约 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="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>
@@ -137,10 +137,14 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
+<style lang='scss'>
 .homeworkPath {
-   .top {
-    padding: 1.25rem 1.875rem;
+  .top {
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/TMS/components/importedTruck/truckDriverReceive.vue

@@ -2,7 +2,7 @@
   <!-- 司机接单 -->
   <div class="homeworkPath">
     <div class="top">
-       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+       <el-input class="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>
@@ -56,8 +56,12 @@ export default {
 </script>
 <style lang='scss' scoped>
 .homeworkPath {
-   .top {
-    padding: 1.25rem 1.875rem;
+  .top {
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/TMS/components/importedTruck/truckEnfactoryResult.vue

@@ -2,7 +2,7 @@
   <!-- 进厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -66,7 +66,11 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/TMS/components/importedTruck/truckJiMaoResult.vue

@@ -2,7 +2,7 @@
   <!-- 计毛实绩页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="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>
@@ -35,7 +35,11 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/TMS/components/importedTruck/truckJiPiResult.vue

@@ -2,7 +2,7 @@
   <!-- 计皮实绩页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="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>
@@ -34,7 +34,11 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/TMS/components/importedTruck/truckLeaveFactoryResult.vue

@@ -2,7 +2,7 @@
   <!-- 出厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="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>
@@ -34,7 +34,11 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/TMS/components/importedTruck/truckLoadResult.vue

@@ -3,7 +3,12 @@
   <div class="homeworkPath">
     <div class="top">
       <div class="top">
-        <el-input placeholder="请输入内容" v-model="input" clearable>
+        <el-input
+          class="el-input"
+          placeholder="请输入内容"
+          v-model="input"
+          clearable
+        >
         </el-input>
         <el-button type="primary" class="btn" @click="onclick">
           <i class="el-icon-search"></i>查询
@@ -41,7 +46,7 @@ export default {
   name: "homeworkPath",
   data() {
     return {
-      input:'',
+      input: "",
       option: {
         // 表格请求数据的地址
         requestUrl:
@@ -51,7 +56,9 @@ export default {
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=91&status=0&orderType=8&con="+this.input;
+      this.option.requestUrl =
+        "/api/v1/tms/getAllLoadResult?apiId=91&status=0&orderType=8&con=" +
+        this.input;
     },
     updateClick(resultId) {
       this.$router.push("/truckLoadResultEdit/" + resultId);
@@ -91,7 +98,13 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+    .top {
+      padding: 1.25rem 0.375rem;
+      .el-input {
+        width: 20%;
+        margin-right: 1.25rem;
+      }
+    }
   }
 }
 </style>

src/views/TMS/components/importedTruck/truckQualityResult.vue

@@ -2,7 +2,7 @@
   <!-- 质检作业 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="e;-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -51,7 +51,11 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/TMS/components/importedTruck/truckReceiptResult.vue

@@ -2,7 +2,7 @@
   <!-- 收货作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input  class="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>
@@ -35,7 +35,11 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/TMS/components/importedTruck/truckUnloadResult.vue

@@ -2,7 +2,7 @@
   <!-- 卸货实绩页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="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>
@@ -33,7 +33,11 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/WMS/components/steel/addCheckWarehouse.vue

@@ -97,15 +97,15 @@ export default {
     onclick(a) {
       if (a == 1) {
         this.first.requestUrl =
-          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
-          this.input;
+         "/api/v1/wms/getSteelMaterialModelList?apiId=448&warehouseId="+3+"&con="+this.input;   
       }
     },
     ondrawer(num) {
       this.drawer = true;
       this.a = num;
+      console.log("jlll");
       if(num==1){
-          this.first.requestUrl = "/api/v1/wms/getSteelMaterialList?apiId=443&warehouseId="+3
+          this.first.requestUrl = "/api/v1/wms/getSteelMaterialList?apiId=448&warehouseId="+3
       }else{
           this.second.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=库" + "&i=" + new Date();
       }

src/views/WMS/components/steel/bar1_steel/bar1_steel_restack.vue

@@ -30,9 +30,9 @@
                     <el-button type="text" size="mini" @click="deleteclick(scope.row.resultId)">
                      删除
                    </el-button>
-                   <el-button type="text" size="mini"   @click="editclick(scope.row.resultId)">
+                   <!-- <el-button type="text" size="mini"   @click="editclick(scope.row.resultId)">
                      修改
-                   </el-button>
+                   </el-button> -->
                 </template>
               </el-table-column>
             </dilTable>
@@ -114,9 +114,9 @@ export default {
 
     //   },
     //根据id进行修改
-    editclick(resultId) {
-      this.$router.push("/bar1_editSteel_restack/" + resultId);
-    },
+    // editclick(resultId) {
+    //   this.$router.push("/bar1_editSteel_restack/" + resultId);
+    // },
     handleClick(tab, event) {
       console.log(tab, event);
     },

src/views/WMS/components/steel/bar1_steel/bar1_steel_restackAdd.vue

@@ -86,7 +86,7 @@
             </div>
             <div class="stack">
                 <span>新垛位：</span>
-                <el-select v-model="value5" placeholder="请选择" @change ="onchange5()">
+                <el-select v-model="value5" placeholder="请选择">
                     <el-option
                         v-for="(item,i) in options5"
                         :key="i"
@@ -194,6 +194,7 @@ export default {
         },
     }
   },
+    
     mounted(){
         this.initialization();
         //新增下拉框方法
@@ -214,23 +215,28 @@ export default {
         makeSure1() {
             this.table = false;
             let maps =this.selectionList1;
-            console.log("maps",maps)
+            console.log(maps)
             if(
                 maps[0]==null 
             )this.$message.error("存在空值！");
+            // 判断用户填写的件数是否已经超过当前垛位的最大数量
             else
             this.axios
                 .post("/api/v1/wms/createRestackMakeResult?keeperId=2&beforeLevel="+this.value3+"&afterStackingId="+this.value5+"&afterWarehouseId="+this.value1+"&afterBeforeStackingId="+this.value2+"&resultRemark="+"",maps)
                 .then((res) => {
+                    console.log(res);
                     if (res.data.code == 200) {
                         this.$message({
-                        type: "success",
-                        message: "新增成功!",
+                            type: "success",
+                            message: "新增成功!",
                         });
-                        this.$router.go(-1);
-                    }else{
-                        this.$message.error("新增失败,可能存在重复！");
+                    }else if(res.data.code == 201){
+                        this.$message({
+                            type:"faile",
+                            message:res.data.data
+                        })
                     }
+                    this.$router.go(-1);
                     });
         },
          open() {

src/views/WMS/components/steel/steel_real.vue

@@ -35,6 +35,8 @@ export default {
  name:"steel_real",
   data(){
     return {
+      warehouseId:"",
+      time:'',
       rowIndex:null,
       mapList:[],
       inputText:"",

src/views/WMS/components/steel/steel_sendreceive.vue

@@ -40,7 +40,7 @@ export default {
   data() {
     return {
       option: {
-        requestUrl: "/api/v1/wms/getSendReceive?apiId=97&warehouseId=3&startTime=null&endTime=null&i=" +new Date(),
+        requestUrl: "/api/v1/wms/getSendReceive?apiId=97&startTime=null&endTime=null&i=" +new Date(),
       },
       startTime: null,
       endTime: null,
@@ -76,14 +76,14 @@ export default {
       }
       if(startTime && endTime){
         if(startTime < endTime){
-          this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&warehouseId=3&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
         }else{
           this.startTime = null;
           this.endTime = null;
           this.$message.warning('开始时间要比结束时间早')
         }
       }else{
-        this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&warehouseId=3&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+        this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
       }
     },
   },

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

@@ -401,7 +401,7 @@ export default {
       addressDrawer:false,
       //线路的表格
       line: {
-        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
+        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con="+'销售',
         selectionType: "radio",
       },
       //车辆的表格
@@ -755,7 +755,7 @@ export default {
     },
     //点击取消按钮的事件
     cancel(){
-      this.$router.push('/saleOrder')
+      this.$router.push('/saleOrderCoproduct')
     },
     //点击删除按钮删除当前点击的对象
     deleteRow(index){

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

@@ -25,12 +25,6 @@
                 size="small"
                 >派车</el-button
               >
-              <!-- <el-button
-                @click="coproductSendClick(scope.row.saleOrderId)"
-                type="text"
-                size="small"
-                >副产品派车</el-button
-              > -->
               <el-button
                 @click="addClick(scope.row.saleOrderId)"
                 type="text"
@@ -164,6 +158,9 @@ export default {
   name: "saleOrder",
   data() {
     return {
+      // shiyHeigth:140,
+      // isHeigth:true,
+      // isKuang:false,
       activeName: "four",
       input: "",
       option: {
@@ -266,9 +263,6 @@ export default {
     sendClick(saleOrderId){
       this.$router.push("/addSaleOrderSend/" + saleOrderId);
     },
-    // coproductSendClick(saleOrderId){
-    //   this.$router.push("/addSaleOrderCoproductSend/" + saleOrderId);
-    // },
     // -------查看物资详情 (已审批)
     detailclick(row) {
       // 记录重复点击次数

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

@@ -518,9 +518,6 @@ export default {
          this.$message.error("请选择装卸点")
          return
       }
-<<<<<<< HEAD
-      console.log(this.tableData)
-=======
       // console.log(this.tableData)
       var DueTime;
       if(this.DueTime==null){
@@ -528,7 +525,6 @@ export default {
       }else{
         DueTime = sjTime(this.DueTime);
       }
->>>>>>> 8324c8325fe8ffd482f76b081509947ab8cab64f
       let requiremnet = {
         requirementEstimatedDuration: this.form.requirementEstimatedDuration,
         requirementOverlimit: this.form.requirementOverlimit,

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

@@ -151,6 +151,7 @@
         <!-- 查询所有的车辆 -->
         <dilTable
           v-bind.sync="truck"
+          :isHeigth="isHeigth" :shiyHeigth="shiyHeigth" :isKuang="isKuang"
           @selection-change="currentRadioChange1"
         ></dilTable>
       </div>
@@ -169,6 +170,9 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      shiyHeigth:140,
+      isHeigth:true,
+      isKuang:false,
       planId : null ,
       disabled:false,
       //线路名称

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

@@ -58,7 +58,7 @@
       </el-button>
    <dilTable v-bind.sync="zero" @radio-change="currentRadioChange1" ></dilTable>    
     </el-drawer>
-    <el-drawer
+    <!-- <el-drawer
       :visible.sync="drawer"
       :direction="direction"
       :before-close="handleClose"
@@ -72,7 +72,51 @@
         <i class="el-icon-plus"></i>确认
       </el-button>
    <dilTable v-bind.sync="second" @selection-change="currentRadioChange" ></dilTable>    
+    </el-drawer> -->
+
+    <el-drawer 
+      :visible.sync="drawer" 
+      :with-header="false"
+      :destroy-on-close="true"
+      direction="rtl"
+      size="40%"
+      :show-close="true"
+      :wrapperClosable="false"
+      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="onclick"
+        style="margin-left: 5px"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="onConfirm"
+        style="margin-left: 5px"
+      >
+        <i class="el-icon-check"></i>确定
+      </el-button>
+      <div class="tablecls">
+        <!-- 查询所有的车辆 -->
+        <dilTable
+          v-bind.sync="second"
+          :isHeigth="isHeigth" :shiyHeigth="shiyHeigth" :isKuang="isKuang"
+          @selection-change="currentRadioChange"
+        ></dilTable>
+      </div>
     </el-drawer>
+
 		<vxe-table v-model="tableData" keep-source border resizable show-overflow show-footer ref="xTable"
 			max-height="400" :footer-method="footerMethod" :data="tableData"
 			:edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
@@ -140,6 +184,9 @@ export default {
   },
   data() {
     return {
+      shiyHeigth:140,
+      isHeigth:true,
+      isKuang:false,
       lineId:null,
       requirementId:null,
       capacityNumber:null,