修改倒垛

config/index.js

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

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

@@ -32,8 +32,7 @@
     <div class="lineId from">
       <span class="text">采购订单号：</span>
       <el-input class="input" v-model="purchaseOrderNo" disabled> </el-input>
-      <el-button type="primary" @click="ondrawer(6)" v-if="materialId && supplierId">浏览</el-button>
-      <span v-else class="span"></span>
+      <el-button type="primary" @click="ondrawer(6)">浏览</el-button>
     </div>
     <div class="orderType from">
       <span class="text">订单类别：</span>
@@ -130,7 +129,7 @@
           <i class="el-icon-search"></i>查询
         </el-button>
       </div>
-      <div v-if="onDrawerNumber == 1">
+      <div v-show="onDrawerNumber == 1">
         <dilTable
           v-bind.sync="frist"
           @radio-change="currentRadioChange1"
@@ -139,7 +138,7 @@
           :drawer="drawer"
         ></dilTable>
       </div>
-      <div v-else-if="onDrawerNumber == 2">
+      <div v-show="onDrawerNumber == 2">
         <dilTable
           v-bind.sync="secend"
           @radio-change="currentRadioChange2"
@@ -148,7 +147,7 @@
           :drawer="drawer"
         ></dilTable>
       </div>
-      <div v-else-if="onDrawerNumber == 3">
+      <div v-show="onDrawerNumber == 3">
         <dilTable
           v-bind.sync="third"
           @selection-change="currentRadioChange3"
@@ -157,7 +156,7 @@
           :drawer="drawer"
         ></dilTable>
       </div>
-      <div v-else-if="onDrawerNumber == 4">
+      <div v-show="onDrawerNumber == 4">
         <dilTable
           v-bind.sync="unloadPoint"
           @radio-change="currentRadioChange4"
@@ -166,7 +165,7 @@
           :drawer="drawer"
         ></dilTable>
       </div>
-      <div v-else-if="onDrawerNumber == 5">
+      <div v-show="onDrawerNumber == 5">
         <dilTable
           v-bind.sync="line"
           @radio-change="currentRadioChange5"
@@ -175,7 +174,7 @@
           :drawer="drawer"
         ></dilTable>
       </div>
-      <div v-else-if="onDrawerNumber == 6">
+      <div v-show="onDrawerNumber == 6">
         <dilTable
           v-bind.sync="purchaseOrder"
           @radio-change="currentRadioChange6"
@@ -271,8 +270,7 @@ export default {
         mapList1: [],
       },
       secend: {
-        requestUrl:
-          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=",
+        requestUrl:"",
         selectionType: "radio",
         mapList2: [],
       },
@@ -282,15 +280,15 @@ export default {
         mapList3: [],
       },
       unloadPoint: {
-        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        requestUrl: "",
         selectionType: "radio",
       },
       line: {
-        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
+        requestUrl: "",
         selectionType: "radio",
       },
       purchaseOrder:{
-        requestUrl: "/api/v1/ams/getPurchaseOrderList?apiId=81",
+        requestUrl: "",
         selectionType: "radio",
       }
     };
@@ -344,9 +342,9 @@ export default {
               this.purchaseOrderId = res.data.data.purchaseOrderId;
               this.purchaseOrderNo=res.data.data.purchaseOrderNo;
               if (res.data.data.receiveUnitId == 1) {
-                this.orderType = 6;
+                this.orderType = 17;
               } else {
-                this.orderType = 7;
+                this.orderType = 18;
               }
             }
           } else {
@@ -355,9 +353,6 @@ export default {
         });
       }
     },
-    func(res){
-      this.isKuang = false;
-    },
     onclick() {
       if(this.input){
         this.isKuang = true;
@@ -373,47 +368,44 @@ export default {
             this.third.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null + "&index=" + this.input;
           }
         } else if (this.onDrawerNumber == 4) {
-          this.unloadPoint.requestUrl =  "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.input;
+          this.unloadPoint.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.input;
         } else if (this.onDrawerNumber == 5) {
           this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
         }else if (this.onDrawerNumber == 6) {
-          this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&con=" + this.input+"&i="+new Date();
+          this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId="+this.supplierId+"&con=" + this.input+"&i="+new Date();
         }
       }else{
         if (this.onDrawerNumber == 1) {
-          this.frist.requestUrl = "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050"
+          this.frist.requestUrl = "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&i="+new Date();
         } else if (this.onDrawerNumber == 2) {
-          this.secend.requestUrl = "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" + this.materialId;
+          this.secend.requestUrl = "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" + this.materialId+"&i="+new Date();
         } else if (this.onDrawerNumber == 3) {
           //判断是否是承运商查询车辆
           if (getCookie("orgCode") == "chengyunshang") {
-            this.third.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + getCookie("userId");
+            this.third.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + getCookie("userId")+"&i="+new Date();
           } else {
-            this.third.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null;
+            this.third.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null+"&i="+new Date();
           }
         } else if (this.onDrawerNumber == 4) {
-          this.unloadPoint.requestUrl =  "/api/v1/uc/getUnloadingMesByLike?apiId=374";
+          this.unloadPoint.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&i="+new Date();
         } else if (this.onDrawerNumber == 5) {
-          this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3";
+          this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i="+new Date();
         }else if (this.onDrawerNumber == 6) {
-          this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81";
+          this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId="+this.supplierId+"&i="+new Date();
         }
-<<<<<<< HEAD
-=======
-      } else if (a == 4) {
+        }else if (a == 4) {
         this.unloadPoint.requestUrl =
           "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.input;
       } else if (a == 5) {
         this.option.requestUrl =
           "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
->>>>>>> 9c1ccc273de01f5cc5dcdbff3c1f3ab12835836d
       }
     },
     ondrawer(num) {
-      this.onDrawerNumber = num;
       this.drawer = true;
+      this.onDrawerNumber = num;
       if(num == 1){
-        this.frist.requestUrl = "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050"
+        this.frist.requestUrl = "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" + this.input;
       }else if (num == 2) {
         this.secend.requestUrl = "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" + this.materialId;
       } else if (num == 3) {
@@ -426,9 +418,9 @@ export default {
       } else if (num == 4) {
         this.unloadPoint.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date();
       } else if (num == 5) {
-        this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
+        this.line.requestUrl ="/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
       }else if (num == 6) {
-        this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&i=" + new Date();
+        this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId="+ this.supplierId+"&i=" + new Date();
       }
     },
     // 返回
@@ -454,6 +446,16 @@ export default {
       this.lineId = selection.lineId;
     },
     currentRadioChange6(selection) {
+      console.log(selection)
+      if (selection.shipperId == 1) {
+        this.orderType = 6;
+      } else {
+        this.orderType = 7;
+      }
+      this.materialName = selection.materialName;
+      this.materialId = selection.materialId;
+      this.supplierId = selection.supplierId;
+      this.supplierName = selection.supplierName;
       this.purchaseOrderNo = selection.purchaseOrderNo;
       this.purchaseOrderId = selection.purchaseOrderId;
     },
@@ -461,6 +463,10 @@ export default {
       this.selectionList = [];
       this.selectionList = selection;
     },
+    func(res){
+      console.log(res)
+      this.isKuang = false;
+    },
     // 确认
     onClickConfirm() {
       var state = 0;
@@ -557,7 +563,7 @@ export default {
               message: "添加成功!",
               type: "success",
             });
-            this.$router.push("/transportReserveRan");
+            this.$router.push("/transportationReservation");
           }
         });
       }