修改

build/utils.js

@@ -23,7 +23,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // let devModules = ['index','sale']
 // let devModules = ['index','SporadicManage','RMS','statisticalReport']
 // let devModules = ['index','inward','statisticalReport']
- let devModules = ['index','WMS','appoint','TMS','inward','statisticalReport']
+ let devModules = ['index','WMS','appoint','TMS','inward','statisticalReport','sale']
 // let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
 // let devModules = ['index','RMS'];
 if (pathSrc.indexOf('node_modules') > -1) {

config/index.js

@@ -64,7 +64,7 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://localhost:8019",
+    target: "http://localhost:8080",
     // target: "http://192.168.1.101:8019",
     ws: true,
     pathRewrite: {
@@ -72,7 +72,7 @@ let proxyTable = {
     }
   },
   "/views/api/v1": {
-    target: "http://localhost:8019",
+    target: "http://localhost:8080",
     // target: "http://192.168.1.109:8080",
     ws: true,
     pathRewrite: {

src/views/TMS/components/domesticMine/approveWagonPleaseAdd.vue

@@ -97,10 +97,12 @@ export default {
         this.axios
           .post("/api/v1/tms/addApproveWagonPlease", approveWagonPlease)
           .then(() => {
+            if(res.data.code=="200"){
             this.$message({
               type: "success",
               message: "新增成功!",
             });
+            }
             this.$router.go(-1);
           });
     },

src/views/TMS/components/domesticMine/approveWagonPleaseEdit.vue

@@ -66,7 +66,8 @@ export default {
       if (
         approveWagonPlease.resultApproveDate == null ||
         approveWagonPlease.resultApproveNumber == null ||
-        approveWagonPlease.resultCategory == null
+        approveWagonPlease.resultCategory == null||
+        approveWagonPlease.shipperId==null
       )
         this.$message.error("存在空值！");
       else if (!isNumber(val)) this.$message.error("请车数必须是数字！");

src/views/TMS/components/domesticMine/entrustMine.vue

@@ -47,7 +47,7 @@ export default {
       let map = {
         resultIdList: this.selectionListMap,
       };
-      console.log("map" + map);
+      // console.log("map" + map);
       if (this.selectionListMap.length == 0) {
         this.$message({
           message: "请勾选要发送计量委托的实绩!",
@@ -57,20 +57,25 @@ export default {
         this.axios
           .post("/api/v1/tms/batchSendMeasureCommission", map)
           .then((res) => {
-            if (res.data.code == "200") {
+            if (res.data.data == "发送成功") {
               this.$message({
                 type: "success",
-                message: "发送成功",
+                message: res.data.data,
               });
               this.option.requestUrl =
-                "/api/v1/tms/getLoadResultToSendMC?apiId=209&resultType=3";
+                "/api/v1/tms/getLoadResultToSendMC?apiId=209&resultType=3&i"+new Date();
+            }else {
+                this.$message({
+                type: "warning",
+                message: res.data.data,
+              });
             }
           });
       }
     },
     selectionChange(selection) {
       this.selectionListMap = [];
-      console.log(selection);
+      // console.log(selection);
       this.selectionListMap = selection;
     },
   },

src/views/TMS/components/domesticMine/wagonPleaseAdd.vue

@@ -253,7 +253,7 @@ export default {
   },
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .contractDetails {
   .form {
     display: flex;

src/views/TMS/components/domesticMine/wagonPleaseEdit.vue

@@ -218,6 +218,7 @@ export default {
       if (
         tmstrainPleaseApproveResult.resultPlanDate==null||
         tmstrainPleaseApproveResult.resultCategory==null||
+        tmstrainPleaseApproveResult.supplierId == null ||
         tmstrainPleaseApproveResult.sendStationId==null||
         tmstrainPleaseApproveResult.toTheStationId==null||
         tmstrainPleaseApproveResult.resultPleaseNumber==null

src/views/TMS/components/domesticMine/wagonUnLoadEdit.vue

@@ -2,11 +2,11 @@
   <!-- 修改车皮装车实绩 -->
   <div class="unloadWagon">
     <page-title>返回</page-title>
-      <div class="form">
-        <div class="form_box">
-          <dil-form :formId="118" v-model="form1"></dil-form>
-        </div>
+    <div class="form">
+      <div class="form_box">
+        <dil-form :formId="118" v-model="form1"></dil-form>
       </div>
+    </div>
     <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
@@ -18,11 +18,11 @@ import PageTitle from "@/components/Page/Title";
 import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
- data(){
-     return {
+  data() {
+    return {
       form1: {},
-  }
- },
+    };
+  },
   mounted() {
     this.information();
   },
@@ -30,7 +30,10 @@ export default {
     information() {
       //编辑车皮装车作业
       this.axios
-        .post("/api/v1/tms/getTmstrainWagonUnLoadResultByUnLoadingId/" + this.$route.params.unloadingId)
+        .post(
+          "/api/v1/tms/getTmstrainWagonUnLoadResultByUnLoadingId/" +
+            this.$route.params.unloadingId
+        )
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
@@ -59,27 +62,36 @@ export default {
         unloadingPointId: this.form1.unloadingPointId,
         resultBigTicketWeight: this.form1.resultBigTicketWeight,
         resultRailHorizontalWeight: this.form1.resultRailHorizontalWeight,
-        resultRemark: this.form1.resultRemark
+        resultRemark: this.form1.resultRemark,
       };
       console.log(tmstrainWagonUnloadResult);
       if (
-        tmstrainWagonUnloadResult.resultArrivalDate==null||
-      tmstrainWagonUnloadResult.resultUnloadTime==null||
-      tmstrainWagonUnloadResult.unloadingPointId==null
-      ) this.$message.error("存在空值！");
+        tmstrainWagonUnloadResult.resultArrivalDate == null ||
+        tmstrainWagonUnloadResult.resultUnloadTime == null ||
+        tmstrainWagonUnloadResult.unloadingPointId == null
+      )
+        this.$message.error("存在空值！");
       else
-      this.axios
-        .post(
-          "/api/v1/tms/upadteTmstrainWagonUnLoadResultByUnLoadingId",
-          tmstrainWagonUnloadResult
-        )
-        .then(() => {
-          this.$message({
-            type: "success",  
-            message: "修改成功!",
+        this.axios
+          .post(
+            "/api/v1/tms/upadteTmstrainWagonUnLoadResultByUnLoadingId",
+            tmstrainWagonUnloadResult
+          )
+          .then(() => {
+            if (res.data.code == "200") {
+              this.$message({
+                type: "success",
+                message: "修改成功!",
+              });
+
+              this.$router.go(-1);
+            } else {
+              this.$message({
+                type: "warning",
+                message: res.data.data,
+              });
+            }
           });
-          this.$router.go(-1);
-        });
     },
   },
 };

src/views/TMS/components/importedEmergency/entrustEmergency.vue

@@ -53,14 +53,19 @@ export default {
         this.axios
           .post("/api/v1/tms/batchSendMeasureCommission", map)
           .then((res) => {
-            if (res.data.code == "200") {
+            if (res.data.data == "发送成功") {
               this.$message({
                 type: "success",
-                message: "发送成功",
+                message: res.data.data,
               });
               this.option.requestUrl =
                 "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=2&i=" +
                 new Date();
+            }else{
+               this.$message({
+                type: "warning",
+                message: res.data.data,
+              });
             }
           });
       }

src/views/TMS/components/importedMine/entrust.vue

@@ -56,15 +56,20 @@ export default {
         this.axios
           .post("/api/v1/tms/batchSendMeasureCommission", map)
           .then((res) => {
-            if (res.data.code == "200") {
+            if (res.data.data == "发送成功") {
               this.$message({
                 type: "success",
-                message: "发送成功",
+                message: res.data.data,
               });
               this.option.requestUrl =
                 "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=1" +
                 "&i=" +
                 new Date();
+            }else{
+                this.$message({
+                type: "warning",
+                message: res.data.data,
+              });
             }
           });
       }

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

@@ -314,19 +314,19 @@ export default {
       if (getCookie("orgCode") == "shouhuokehu") {
         if (this.activeName == "first") {
           this.option.requestUrl =
-            "/api/v1/ams/getSaleOrderInfoes?apiId=408&con=" +
+            "/api/v1/ams/getSaleOrderInfoes?apiId=408&saleType=1&con=" +
             this.input +
             "&consigneeSsoId=" +
             getCookie("userId");
         } else if (this.activeName == "second") {
           this.option2.requestUrl =
-            "/api/v1/ams/getSaleOrderReportedes?apiId=408&con=" +
+            "/api/v1/ams/getSaleOrderReportedes?apiId=408&saleType=1&con=" +
             this.input +
             "&consigneeSsoId=" +
             getCookie("userId");
         } else if (this.activeName == "four") {
           this.option4.requestUrl =
-            "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1&con=" +
+            "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&saleType=1&shipperId=1&con=" +
             this.input +
             "&consigneeSsoId=" +
             getCookie("userId");
@@ -334,16 +334,19 @@ export default {
       } else {
         if (this.activeName == "first") {
           this.option.requestUrl =
-            "/api/v1/ams/getSaleOrderInfoes?apiId=408&con=" + this.input;
+            "/api/v1/ams/getSaleOrderInfoes?apiId=408&saleType=1&con=" + this.input;
         } else if (this.activeName == "second") {
           this.option2.requestUrl =
-            "/api/v1/ams/getSaleOrderReportedes?apiId=408&con=" + this.input;
+            "/api/v1/ams/getSaleOrderReportedes?apiId=408&saleType=1&con=" + this.input;
         } else if (this.activeName == "four") {
           this.option4.requestUrl =
-            "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1&con=" +
+            "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&saleType=1&shipperId=1&con=" +
             this.input;
         }
       }
+    },
+    handleClose(){
+
     },
     seeclick(saleOrderId) {
       this.$router.push("/saleOrderDetail/" + saleOrderId);

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

@@ -15,7 +15,7 @@
       :visible.sync="dialogTableVisible"
       :before-close="handleClose"
     >
-      <el-input style="width:250px" v-model="carrierText"></el-input>
+      <el-input style="width: 250px" v-model="carrierText"></el-input>
       <el-button type="primary" @click="getCarrier">查询</el-button>
       <dilTable
         v-bind.sync="carrierOption"
@@ -165,27 +165,27 @@ export default {
       carrierName: null,
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/ams/getHaveCarTruckNoList?apiId=466"
+        requestUrl: "/api/v1/ams/getHaveCarTruckNoList?apiId=466",
       },
       option2: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/ams/getSaleOrderReportedes?apiId=408"
+        requestUrl: "/api/v1/ams/getSaleOrderReportedes?apiId=408",
       },
       option3: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/ams/getAmsSaleOrderApprovedes?apiId=409"
+        requestUrl: "/api/v1/ams/getAmsSaleOrderApprovedes?apiId=409",
       },
       option4: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/ams/getSteelTruckNoList?apiId=411"
+        requestUrl: "/api/v1/ams/getSteelTruckNoList?apiId=411",
       },
       option0: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/ams/getNoCarTruckNoList?apiId=466"
+        requestUrl: "/api/v1/ams/getNoCarTruckNoList?apiId=466",
       },
       carrierOption: {
         requestUrl: "/api/v1/uc/getCarrierListByLike?apiId=412",
-        selectionType: "radio"
+        selectionType: "radio",
       },
       mapList: [],
       mapItemList: [],
@@ -213,23 +213,23 @@ export default {
         {
           prop: "materialName",
           label: "物资名称",
-          width: 150
+          width: 150,
         },
         {
           prop: "specificationModel",
           label: "规格型号",
-          width: 150
+          width: 150,
         },
         {
           prop: "materialNumber",
           label: "物资件数",
-          width: 100
+          width: 100,
         },
         {
           prop: "materialWeight",
           label: "物资重量",
-          width: 100
-        }
+          width: 100,
+        },
       ],
       //(销售公司已审批)
       tableData: [],
@@ -240,7 +240,7 @@ export default {
       //(未上报)
       tableData3: [],
       //(未派车)
-      tableData0: []
+      tableData0: [],
     };
   },
   methods: {
@@ -252,8 +252,9 @@ export default {
       this.option0.requestUrl =
         "/api/v1/ams/getNoCarTruckNoList?apiId=466&i=" + new Date();
     },
+    handleClose() {},
     updateCarrier(scope) {
-      console.log(scope.row);
+      // console.log(scope.row);
       this.saleOrderMaterialId = scope.row.saleOrderMaterialId;
       this.dialogTableVisible = true;
     },
@@ -269,9 +270,9 @@ export default {
     updateTruckCapacity() {
       let map = {
         carrierId: this.carrierId,
-        saleOrderMaterialId: this.saleOrderMaterialId
+        saleOrderMaterialId: this.saleOrderMaterialId,
       };
-      this.axios.post("/api/v1/ams/updateTruckNoCarrier", map).then(res => {
+      this.axios.post("/api/v1/ams/updateTruckNoCarrier", map).then((res) => {
         if (res.data.code == "200") {
           this.$message.success("修改授权成功");
           this.getRequestUrl();
@@ -290,12 +291,13 @@ export default {
       if (this.activeName == "four") {
         this.option4.requestUrl =
           "/api/v1/ams/getSteelTruckNoList?apiId=411&con=" + this.input;
+        // console.log("aaaa" + this.input);
       } else if (this.activeName == "five") {
-        this.option0.requestUrl =
-          "/api/v1/ams/getNoCarTruckNoList?apiId=466&con=" + this.input;
+        this.option0.requestUrl = 
+        "/api/v1/ams/getNoCarTruckNoList?apiId=466&con=" + this.input;
       } else if (this.activeName == "first") {
-        this.option.requestUrl =
-          "/api/v1/ams/getHaveCarTruckNoList?apiId=466&con=" + this.input;
+        this.option.requestUrl = 
+        "/api/v1/ams/getHaveCarTruckNoList?apiId=466&con=" + this.input;
       }
     },
     seeclick(saleOrderId) {
@@ -336,7 +338,7 @@ export default {
           "/api/v1/ams/getTruckNoMaterialList?saleOrderMaterialId=" +
             row.saleOrderMaterialId
         )
-        .then(res => {
+        .then((res) => {
           this.tableData = res.data.data;
         });
     },
@@ -370,7 +372,7 @@ export default {
           "/api/v1/ams/getTruckNoMaterialList?saleOrderMaterialId=" +
             row.saleOrderMaterialId
         )
-        .then(res => {
+        .then((res) => {
           this.tableData3 = res.data.data;
         });
     },
@@ -404,11 +406,11 @@ export default {
           "/api/v1/ams/getTruckNoMaterialList?saleOrderMaterialId=" +
             row.saleOrderMaterialId
         )
-        .then(res => {
+        .then((res) => {
           this.tableData0 = res.data.data;
         });
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

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

@@ -12,7 +12,7 @@
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <!-- 已审批 -->
-       <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="200">
             <template slot-scope="scope">
@@ -31,25 +31,24 @@
             </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>
-
+          <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-tabs>
@@ -69,11 +68,10 @@ export default {
       carrierName: null,
       option4: {
         // 表格请求数据的地址
-        requestUrl:
-          "",
+        requestUrl: "",
       },
       mapList: [],
-      mapItemList:[],
+      mapItemList: [],
       //记录旧的row对象 (销售公司已审批)
       oldRow: "",
       //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态 (销售公司已审批)
@@ -104,39 +102,47 @@ export default {
       tableData: [],
     };
   },
-  created(){
-      this.initUrl();
+  created() {
+    this.initUrl();
   },
   methods: {
-    initUrl(){
-        if (getCookie("orgCode") == "chengyunshang") {
+    initUrl() {
+      if (getCookie("orgCode") == "chengyunshang") {
         this.option4.requestUrl =
           "/api/v1/ams/getSaleOrderListToCarrier?apiId=467&carrierSsoId=" +
           getCookie("userId");
       } else {
         this.option4.requestUrl =
-          "/api/v1/ams/getSaleOrderListToCarrier?apiId=467&carrierSsoId=" + null;
+          "/api/v1/ams/getSaleOrderListToCarrier?apiId=467&carrierSsoId=" +
+          null;
       }
     },
-    refresh(){
+    refresh() {
       this.$router.go(0);
     },
     handleClick(tab, event) {
       console.log(tab, event);
     },
     onclick() {
-      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&shipperId=1&con="+this.input;      
+      if (getCookie("orgCode") == "chengyunshang") {
+        if (this.activeName == "four") {
+          this.option4.requestUrl =
+            "/api/v1/ams/getSaleOrderListToCarrier?apiId=467&carrierSsoId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input;
+        }
+      } else {
+        if (this.activeName == "four") {
+          this.option4.requestUrl =
+            "/api/v1/ams/getSaleOrderListToCarrier?apiId=467&con=" + this.input+"&carrierSsoId="+"";
+        }
       }
     },
     seeclick(saleOrderId) {
       this.$router.push("/saleOrderDetail/" + saleOrderId);
     },
-    steelSendClick(saleOrderId){
+    steelSendClick(saleOrderId) {
       this.$router.push("/addSaleOrderSteelSendCarrier/" + saleOrderId);
     },
     // -------查看物资详情 (已审批)
@@ -164,7 +170,7 @@ export default {
       this.oldRow = row;
       // 根据销售订单id查询物资信息
       this.axios
-        .post("/api/v1/ams/getSaleMaterialList?saleOrderId=" +row.saleOrderId)
+        .post("/api/v1/ams/getSaleMaterialList?saleOrderId=" + row.saleOrderId)
         .then((res) => {
           this.tableData = res.data.data;
         });

src/views/appoint/components/ship/addDeliveryNotice.vue

@@ -166,12 +166,40 @@ export default {
         //验证是否为数字
       }
       if (
-        typeof map.noticePileFreeDays != "undefined" &&
-        !isNumber(map.noticePileFreeDays)
+        typeof  map.purchaseContractUnitPrice != "undefined" &&
+        !isNumber(map.purchaseContractUnitPrice)
       ) {
-        this.$message.error("免堆天数得为数字");
+        this.$message.error("单价得为数字");
+        return;
+      } if (
+        typeof  map.tfeContent != "undefined" &&
+        !isNumber(map.tfeContent)
+      ) {
+        this.$message.error("tfe含量得为数字");
+        return;
+      } 
+      if (
+        typeof  map.silicaContent != "undefined" &&
+        !isNumber(map.silicaContent)
+      ) {
+        this.$message.error("二氧化硅含量得为数字");
+        return;
+      } 
+      if (
+        typeof  map.aluminaContent != "undefined" &&
+        !isNumber(map.aluminaContent)
+      ) {
+        this.$message.error("氧化铝含量得为数字");
+        return;
+      } 
+       if (
+        typeof  map.phosphorusContent != "undefined" &&
+        !isNumber(map.phosphorusContent)
+      ) {
+        this.$message.error("含磷量得为数字");
         return;
-      } else
+      }      
+      else
         this.axios.post("/api/v1/tms/insertDeliveryNotice", map).then(res => {
           if (res.data.code == 200) {
             // this.$router.push("/ship/cargoResult");

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

@@ -23,7 +23,7 @@
         placeholder="请输入内容"
         v-model="inputTruck"
         clearable
-        style="width:200px"
+        style="width: 200px"
       >
       </el-input>
       <el-button type="primary" class="btn" @click="onClickTruck">
@@ -185,7 +185,7 @@ import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
-      shiyHeigth: 140,
+      shiyHeigth: 190,
       isHeigth: true,
       pageSize: 100,
       isKuang: false,
@@ -195,25 +195,25 @@ export default {
         // 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"),
+          "",
         selectionType: "select",
-        mapList: []
+        mapList: [],
       },
       truck: {
         requestUrl: "",
-        selectionType: "radio"
+        selectionType: "radio",
       },
       activeName: "third",
       //记录旧的row对象(已接收)
@@ -232,32 +232,67 @@ export default {
         {
           prop: "materialName",
           label: "物资名称",
-          width: 150
+          width: 150,
         },
         {
           prop: "specificationModel",
           label: "规格型号",
-          width: 150
+          width: 150,
         },
         {
           prop: "materialNumber",
           label: "物资件数",
-          width: 100
+          width: 100,
         },
         {
           prop: "materialWeight",
           label: "物资重量",
-          width: 100
-        }
+          width: 100,
+        },
       ],
       tableData: [],
       tableData1: [],
       tableData2: [],
       capacityId: null,
       dialogTableVisible: false,
-      orderId: null
+      orderId: null,
     };
   },
+  created() {
+    if (getCookie("chengyunshang")) {
+      this.option1.requestUrl =
+        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&carrierSsoId=" +
+        getCookie("userId") +
+        "&t=" +
+        new Date();
+      this.option2.requestUrl =
+        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&carrierSsoId=" +
+        getCookie("userId") +
+        "&t=" +
+        new Date();
+      this.option3.requestUrl =
+        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&carrierSsoId=" +
+        getCookie("userId") +
+        "&t=" +
+        new Date();
+    } else {
+      this.option1.requestUrl =
+        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&carrierSsoId=" +
+        "" +
+        "&t=" +
+        new Date();
+      this.option2.requestUrl =
+        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&carrierSsoId=" +
+        "" +
+        "&t=" +
+        new Date();
+      this.option3.requestUrl =
+        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&carrierSsoId=" +
+        "" +
+        "&t=" +
+        new Date();
+    }
+  },
   methods: {
     onClickTruck() {
       if (getCookie("orgCode") == "chengyunshang") {
@@ -275,21 +310,39 @@ export default {
       }
     },
     getRequestUrl() {
-      this.option1.requestUrl =
-        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&carrierSsoId=" +
-        getCookie("userId") +
-        "&t=" +
-        new Date();
-      this.option2.requestUrl =
-        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&carrierSsoId=" +
-        getCookie("userId") +
-        "&t=" +
-        new Date();
-      this.option3.requestUrl =
-        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&carrierSsoId=" +
-        getCookie("userId") +
-        "&t=" +
-        new Date();
+      if (getCookie("orgCode") == "chengyunshang") {
+        this.option1.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&carrierSsoId=" +
+          getCookie("userId") +
+          "&t=" +
+          new Date();
+        this.option2.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&carrierSsoId=" +
+          getCookie("userId") +
+          "&t=" +
+          new Date();
+        this.option3.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&carrierSsoId=" +
+          getCookie("userId") +
+          "&t=" +
+          new Date();
+      } else {
+        this.option1.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&carrierSsoId=" +
+          "" +
+          "&t=" +
+          new Date();
+        this.option2.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&carrierSsoId=" +
+          "" +
+          "&t=" +
+          new Date();
+        this.option3.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&carrierSsoId=" +
+          "" +
+          "&t=" +
+          new Date();
+      }
     },
     selectionChange(selection) {
       this.option3.mapList = selection;
@@ -298,34 +351,34 @@ export default {
       if (this.option3.mapList.length == 0) {
         this.$message({
           type: "warning",
-          message: "请先选择要关闭的订单!"
+          message: "请先选择要关闭的订单!",
         });
       } else {
         this.$confirm("是否关闭这些订单", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
-          center: true
+          center: true,
         })
           .then(() => {
             //初始化maplist
             var mapList = [];
-            this.option3.mapList.forEach(item => {
+            this.option3.mapList.forEach((item) => {
               //初始化mapItem
               var mapItem = {
                 //销售订单物资中间表id
-                orderId: 0
+                orderId: 0,
               };
               mapItem.orderId = item.orderId;
               mapList.push(mapItem);
             });
             this.$message({
               type: "success",
-              message: "关闭成功!"
+              message: "关闭成功!",
             });
             this.axios
               .post("/api/v1/oms/batchCloseOrder", mapList)
-              .then(res => {
+              .then((res) => {
                 if (res.data.code == "200") {
                   this.getRequestUrl();
                 }
@@ -334,7 +387,7 @@ export default {
           .catch(() => {
             this.$message({
               type: "info",
-              message: "取消关闭!"
+              message: "取消关闭!",
             });
           });
       }
@@ -386,9 +439,9 @@ export default {
       this.axios
         .post("/api/v1/oms/updateCapacityId", {
           capacityId: this.capacityId,
-          orderId: this.orderId
+          orderId: this.orderId,
         })
-        .then(res => {
+        .then((res) => {
           if (res.data.code == "200") {
             this.$message.success("修改运力成功");
             this.getRequestUrl();
@@ -399,24 +452,46 @@ export default {
         });
     },
     onClick() {
-      if (this.activeName == "first") {
-        this.option1.requestUrl =
-          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&carrierSsoId=" +
-          getCookie("userId") +
-          "&con=" +
-          this.inputText;
-      } else if (this.activeName == "second") {
-        this.option2.requestUrl =
-          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&carrierSsoId=" +
-          getCookie("userId") +
-          "&con=" +
-          this.inputText;
+      if (getCookie("orgCode") == "chengyunshang") {
+        if (this.activeName == "first") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&carrierSsoId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.inputText;
+        } else if (this.activeName == "second") {
+          this.option2.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&carrierSsoId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.inputText;
+        } else {
+          this.option3.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&carrierSsoId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.inputText;
+        }
       } else {
-        this.option3.requestUrl =
-          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&carrierSsoId=" +
-          getCookie("userId") +
-          "&con=" +
-          this.inputText;
+        if (this.activeName == "first") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&carrierSsoId=" +
+            "" +
+            "&con=" +
+            this.inputText;
+        } else if (this.activeName == "second") {
+          this.option2.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&carrierSsoId=" +
+            "" +
+            "&con=" +
+            this.inputText;
+        } else {
+          this.option3.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&carrierSsoId=" +
+            "" +
+            "&con=" +
+            this.inputText;
+        }
       }
     },
     // -------查看物资详情 (已接收)
@@ -445,7 +520,7 @@ export default {
       // 根据销售订单id查询物资信息
       this.axios
         .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
-        .then(res => {
+        .then((res) => {
           console.log("res.data.data", res.data.data);
           this.tableData = res.data.data;
         });
@@ -477,7 +552,7 @@ export default {
       // 根据销售订单物资中间表id查询物资信息
       this.axios
         .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
-        .then(res => {
+        .then((res) => {
           console.log("res.data.data", res.data.data);
           this.tableData1 = res.data.data;
         });
@@ -509,7 +584,7 @@ export default {
       // 根据销售订单物资中间表id查询物资信息
       this.axios
         .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
-        .then(res => {
+        .then((res) => {
           this.tableData2 = res.data.data;
         });
     },
@@ -519,16 +594,16 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true
+        center: true,
       })
         .then(() => {
           this.$message({
             type: "success",
-            message: "关闭成功!"
+            message: "关闭成功!",
           });
           this.axios
             .post("/api/v1/oms/closeOrder?orderId=" + row.orderId)
-            .then(res => {
+            .then((res) => {
               if (res.data.code == "200") {
                 this.getRequestUrl();
               }
@@ -537,11 +612,11 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消关闭!"
+            message: "取消关闭!",
           });
         });
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scode>

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

@@ -23,7 +23,7 @@
         placeholder="请输入内容"
         v-model="inputTruck"
         clearable
-        style="width:200px"
+        style="width: 200px"
       >
       </el-input>
       <el-button type="primary" class="btn" @click="onClickTruck">
@@ -185,7 +185,7 @@ import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
-      shiyHeigth: 140,
+      shiyHeigth: 190,
       isHeigth: true,
       pageSize: 100,
       isKuang: false,
@@ -195,25 +195,25 @@ export default {
         // option1请求数据的地址，承运商(运输订单状态为已接收，接收状态为已接收)
         requestUrl:
           "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&shipperId=2&carrierSsoId=" +
-          getCookie("userId")
+          "",
       },
       option2: {
         // option2请求数据的地址，承运商暂时设置为默认（运输订单状态为）
         requestUrl:
           "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&shipperId=2&carrierSsoId=" +
-          getCookie("userId")
+          "",
       },
       option3: {
         // option3请求数据的地址
         requestUrl:
           "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&shipperId=2&carrierSsoId=" +
-          getCookie("userId"),
+          "",
         selectionType: "select",
-        mapList: []
+        mapList: [],
       },
       truck: {
         requestUrl: "",
-        selectionType: "radio"
+        selectionType: "radio",
       },
       activeName: "third",
       //记录旧的row对象(已接收)
@@ -232,32 +232,76 @@ export default {
         {
           prop: "materialName",
           label: "物资名称",
-          width: 150
+          width: 150,
         },
         {
           prop: "specificationModel",
           label: "规格型号",
-          width: 150
+          width: 150,
         },
         {
           prop: "materialNumber",
           label: "物资件数",
-          width: 100
+          width: 100,
         },
         {
           prop: "materialWeight",
           label: "物资重量",
-          width: 100
-        }
+          width: 100,
+        },
       ],
       tableData: [],
       tableData1: [],
       tableData2: [],
       capacityId: null,
       dialogTableVisible: false,
-      orderId: null
+      orderId: null,
     };
   },
+  created() {
+    if (getCookie("orgCode") == "chengyunshang") {
+      if (this.activeName == "first") {
+        this.option1.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&shipperId=2&carrierSsoId=" +
+          getCookie("userId") +
+          "&t=" +
+          new Date();
+      } else if (this.activeName == "second") {
+        this.option2.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&shipperId=2&carrierSsoId=" +
+          getCookie("userId") +
+          "&t=" +
+          new Date();
+      } else {
+        this.option3.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&shipperId=2&carrierSsoId=" +
+          getCookie("userId") +
+          "&t=" +
+          new Date();
+      }
+    } else {
+      if (this.activeName == "first") {
+        this.option1.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&shipperId=2&carrierSsoId=" +
+          "" +
+          "&t=" +
+          new Date();
+      } else if (this.activeName == "second") {
+        this.option2.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&shipperId=2&carrierSsoId=" +
+          "" +
+          "&t=" +
+          new Date();
+      } else {
+        this.option3.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&shipperId=2&carrierSsoId=" +
+          "" +
+          "&t=" +
+          new Date();
+      }
+    }
+  },
+
   methods: {
     onClickTruck() {
       if (getCookie("orgCode") == "chengyunshang") {
@@ -275,6 +319,7 @@ export default {
       }
     },
     getRequestUrl() {
+      if(getCookie("orgCode")=="chengyunshang"){
       this.option1.requestUrl =
         "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&shipperId=2&carrierSsoId=" +
         getCookie("userId") +
@@ -290,6 +335,23 @@ export default {
         getCookie("userId") +
         "&t=" +
         new Date();
+      }else{
+         this.option1.requestUrl =
+        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&shipperId=2&carrierSsoId=" +
+        "" +
+        "&t=" +
+        new Date();
+      this.option2.requestUrl =
+        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&shipperId=2&carrierSsoId=" +
+       ""+
+        "&t=" +
+        new Date();
+      this.option3.requestUrl =
+        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&shipperId=2&carrierSsoId=" +
+        "" +
+        "&t=" +
+        new Date();
+      }
     },
     selectionChange(selection) {
       this.option3.mapList = selection;
@@ -298,34 +360,34 @@ export default {
       if (this.option3.mapList.length == 0) {
         this.$message({
           type: "warning",
-          message: "请先选择要关闭的订单!"
+          message: "请先选择要关闭的订单!",
         });
       } else {
         this.$confirm("是否关闭这些订单", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
-          center: true
+          center: true,
         })
           .then(() => {
             //初始化maplist
             var mapList = [];
-            this.option3.mapList.forEach(item => {
+            this.option3.mapList.forEach((item) => {
               //初始化mapItem
               var mapItem = {
                 //销售订单物资中间表id
-                orderId: 0
+                orderId: 0,
               };
               mapItem.orderId = item.orderId;
               mapList.push(mapItem);
             });
             this.$message({
               type: "success",
-              message: "关闭成功!"
+              message: "关闭成功!",
             });
             this.axios
               .post("/api/v1/oms/batchCloseOrder", mapList)
-              .then(res => {
+              .then((res) => {
                 if (res.data.code == "200") {
                   this.getRequestUrl();
                 }
@@ -334,7 +396,7 @@ export default {
           .catch(() => {
             this.$message({
               type: "info",
-              message: "取消关闭!"
+              message: "取消关闭!",
             });
           });
       }
@@ -385,9 +447,9 @@ export default {
       this.axios
         .post("/api/v1/oms/updateCapacityId", {
           capacityId: this.capacityId,
-          orderId: this.orderId
+          orderId: this.orderId,
         })
-        .then(res => {
+        .then((res) => {
           if (res.data.code == "200") {
             this.$message.success("修改运力成功");
             this.getRequestUrl();
@@ -398,24 +460,46 @@ export default {
         });
     },
     onClick() {
-      if (this.activeName == "first") {
-        this.option1.requestUrl =
-          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&shipperId=2&carrierSsoId=" +
-          getCookie("userId") +
-          "&con=" +
-          this.inputText;
-      } else if (this.activeName == "second") {
-        this.option2.requestUrl =
-          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&shipperId=2&carrierSsoId=" +
-          getCookie("userId") +
-          "&con=" +
-          this.inputText;
+      if (getCookie("orgCode") == "chengyunshang") {
+        if (this.activeName == "first") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&shipperId=2&carrierSsoId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.inputText;
+        } else if (this.activeName == "second") {
+          this.option2.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&shipperId=2&carrierSsoId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.inputText;
+        } else {
+          this.option3.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&shipperId=2&carrierSsoId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.inputText;
+        }
       } else {
-        this.option3.requestUrl =
-          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&shipperId=2&carrierSsoId=" +
-          getCookie("userId") +
-          "&con=" +
-          this.inputText;
+        if (this.activeName == "first") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&shipperId=2&carrierSsoId=" +
+            "" +
+            "&con=" +
+            this.inputText;
+        } else if (this.activeName == "second") {
+          this.option2.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&shipperId=2&carrierSsoId=" +
+            "" +
+            "&con=" +
+            this.inputText;
+        } else {
+          this.option3.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&shipperId=2&carrierSsoId=" +
+            "" +
+            "&con=" +
+            this.inputText;
+        }
       }
     },
     // -------查看物资详情 (已接收)
@@ -444,7 +528,7 @@ export default {
       // 根据销售订单id查询物资信息
       this.axios
         .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
-        .then(res => {
+        .then((res) => {
           console.log("res.data.data", res.data.data);
           this.tableData = res.data.data;
         });
@@ -476,7 +560,7 @@ export default {
       // 根据销售订单物资中间表id查询物资信息
       this.axios
         .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
-        .then(res => {
+        .then((res) => {
           console.log("res.data.data", res.data.data);
           this.tableData1 = res.data.data;
         });
@@ -508,7 +592,7 @@ export default {
       // 根据销售订单物资中间表id查询物资信息
       this.axios
         .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
-        .then(res => {
+        .then((res) => {
           this.tableData2 = res.data.data;
         });
     },
@@ -518,16 +602,16 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true
+        center: true,
       })
         .then(() => {
           this.$message({
             type: "success",
-            message: "关闭成功!"
+            message: "关闭成功!",
           });
           this.axios
             .post("/api/v1/oms/closeOrder?orderId=" + row.orderId)
-            .then(res => {
+            .then((res) => {
               if (res.data.code == "200") {
                 this.getRequestUrl();
               }
@@ -536,11 +620,11 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消关闭!"
+            message: "取消关闭!",
           });
         });
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scode>

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

@@ -23,7 +23,7 @@
         placeholder="请输入内容"
         v-model="inputTruck"
         clearable
-        style="width:200px"
+        style="width: 200px"
       >
       </el-input>
       <el-button type="primary" class="btn" @click="onClickTruck">
@@ -185,7 +185,7 @@ import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
-      shiyHeigth: 140,
+      shiyHeigth: 190,
       isHeigth: true,
       pageSize: 100,
       isKuang: false,
@@ -195,25 +195,25 @@ export default {
         // option1请求数据的地址，承运商(运输订单状态为已接收，接收状态为已接收)
         requestUrl:
           "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&shipperId=1&carrierSsoId=" +
-          getCookie("userId")
+          "",
       },
       option2: {
         // option2请求数据的地址，承运商暂时设置为默认（运输订单状态为）
         requestUrl:
           "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&shipperId=1&carrierSsoId=" +
-          getCookie("userId")
+          "",
       },
       option3: {
         // option3请求数据的地址
         requestUrl:
           "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&shipperId=1&carrierSsoId=" +
-          getCookie("userId"),
+          "",
         selectionType: "select",
-        mapList: []
+        mapList: [],
       },
       truck: {
         requestUrl: "",
-        selectionType: "radio"
+        selectionType: "radio",
       },
       activeName: "third",
       //记录旧的row对象(已接收)
@@ -232,32 +232,75 @@ export default {
         {
           prop: "materialName",
           label: "物资名称",
-          width: 150
+          width: 150,
         },
         {
           prop: "specificationModel",
           label: "规格型号",
-          width: 150
+          width: 150,
         },
         {
           prop: "materialNumber",
           label: "物资件数",
-          width: 100
+          width: 100,
         },
         {
           prop: "materialWeight",
           label: "物资重量",
-          width: 100
-        }
+          width: 100,
+        },
       ],
       tableData: [],
       tableData1: [],
       tableData2: [],
       capacityId: null,
       dialogTableVisible: false,
-      orderId: null
+      orderId: null,
     };
   },
+  created() {
+    if (getCookie("orgCode") == "chengyunshang") {
+      if (this.activeName == "first") {
+        this.option1.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&shipperId=1&carrierSsoId=" +
+          getCookie("userId") +
+          "&t=" +
+          new Date();
+      } else if (this.activeName == "second") {
+        this.option2.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&shipperId=1&carrierSsoId=" +
+          getCookie("userId") +
+          "&t=" +
+          new Date();
+      } else {
+        this.option3.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&shipperId=1&carrierSsoId=" +
+          getCookie("userId") +
+          "&t=" +
+          new Date();
+      }
+    } else {
+      if (this.activeName == "first") {
+        this.option1.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&shipperId=1&carrierSsoId=" +
+          "" +
+          "&t=" +
+          new Date();
+      } else if (this.activeName == "second") {
+        this.option2.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&shipperId=1&carrierSsoId=" +
+          "" +
+          "&t=" +
+          new Date();
+      } else {
+        this.option3.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&shipperId=1&carrierSsoId=" +
+          "" +
+          "&t=" +
+          new Date();
+      }
+    }
+  },
   methods: {
     onClickTruck() {
       if (getCookie("orgCode") == "chengyunshang") {
@@ -275,21 +318,39 @@ export default {
       }
     },
     getRequestUrl() {
-      this.option1.requestUrl =
-        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&shipperId=1&carrierSsoId=" +
-        getCookie("userId") +
-        "&t=" +
-        new Date();
-      this.option2.requestUrl =
-        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&shipperId=1&carrierSsoId=" +
-        getCookie("userId") +
-        "&t=" +
-        new Date();
-      this.option3.requestUrl =
-        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&shipperId=1&carrierSsoId=" +
-        getCookie("userId") +
-        "&t=" +
-        new Date();
+      if (getCookie("orgCode") == "chengyunshang") {
+        this.option1.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&shipperId=1&carrierSsoId=" +
+          getCookie("userId") +
+          "&t=" +
+          new Date();
+        this.option2.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&shipperId=1&carrierSsoId=" +
+          getCookie("userId") +
+          "&t=" +
+          new Date();
+        this.option3.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&shipperId=1&carrierSsoId=" +
+          getCookie("userId") +
+          "&t=" +
+          new Date();
+      } else {
+        this.option1.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&shipperId=1&carrierSsoId=" +
+          "" +
+          "&t=" +
+          new Date();
+        this.option2.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&shipperId=1&carrierSsoId=" +
+          "" +
+          "&t=" +
+          new Date();
+        this.option3.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&shipperId=1&carrierSsoId=" +
+          "" +
+          "&t=" +
+          new Date();
+      }
     },
     selectionChange(selection) {
       this.option3.mapList = selection;
@@ -298,34 +359,34 @@ export default {
       if (this.option3.mapList.length == 0) {
         this.$message({
           type: "warning",
-          message: "请先选择要关闭的订单!"
+          message: "请先选择要关闭的订单!",
         });
       } else {
         this.$confirm("是否关闭这些订单", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
-          center: true
+          center: true,
         })
           .then(() => {
             //初始化maplist
             var mapList = [];
-            this.option3.mapList.forEach(item => {
+            this.option3.mapList.forEach((item) => {
               //初始化mapItem
               var mapItem = {
                 //销售订单物资中间表id
-                orderId: 0
+                orderId: 0,
               };
               mapItem.orderId = item.orderId;
               mapList.push(mapItem);
             });
             this.$message({
               type: "success",
-              message: "关闭成功!"
+              message: "关闭成功!",
             });
             this.axios
               .post("/api/v1/oms/batchCloseOrder", mapList)
-              .then(res => {
+              .then((res) => {
                 if (res.data.code == "200") {
                   this.getRequestUrl();
                 }
@@ -334,7 +395,7 @@ export default {
           .catch(() => {
             this.$message({
               type: "info",
-              message: "取消关闭!"
+              message: "取消关闭!",
             });
           });
       }
@@ -386,9 +447,9 @@ export default {
       this.axios
         .post("/api/v1/oms/updateCapacityId", {
           capacityId: this.capacityId,
-          orderId: this.orderId
+          orderId: this.orderId,
         })
-        .then(res => {
+        .then((res) => {
           if (res.data.code == "200") {
             this.$message.success("修改运力成功");
             this.getRequestUrl();
@@ -399,24 +460,46 @@ export default {
         });
     },
     onClick() {
-      if (this.activeName == "first") {
-        this.option1.requestUrl =
-          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&shipperId=1&carrierSsoId=" +
-          getCookie("userId") +
-          "&con=" +
-          this.inputText;
-      } else if (this.activeName == "second") {
-        this.option2.requestUrl =
-          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&shipperId=1&carrierSsoId=" +
-          getCookie("userId") +
-          "&con=" +
-          this.inputText;
+      if (getCookie("orgCode") == "chengyunshang") {
+        if (this.activeName == "first") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&shipperId=1&carrierSsoId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.inputText;
+        } else if (this.activeName == "second") {
+          this.option2.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&shipperId=1&carrierSsoId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.inputText;
+        } else {
+          this.option3.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&shipperId=1&carrierSsoId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.inputText;
+        }
       } else {
-        this.option3.requestUrl =
-          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&shipperId=1&carrierSsoId=" +
-          getCookie("userId") +
-          "&con=" +
-          this.inputText;
+        if (this.activeName == "first") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&shipperId=1&carrierSsoId=" +
+            "" +
+            "&con=" +
+            this.inputText;
+        } else if (this.activeName == "second") {
+          this.option2.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&shipperId=1&carrierSsoId=" +
+            "" +
+            "&con=" +
+            this.inputText;
+        } else {
+          this.option3.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&shipperId=1&carrierSsoId=" +
+            "" +
+            "&con=" +
+            this.inputText;
+        }
       }
     },
     // -------查看物资详情 (已接收)
@@ -445,7 +528,7 @@ export default {
       // 根据销售订单id查询物资信息
       this.axios
         .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
-        .then(res => {
+        .then((res) => {
           console.log("res.data.data", res.data.data);
           this.tableData = res.data.data;
         });
@@ -477,7 +560,7 @@ export default {
       // 根据销售订单物资中间表id查询物资信息
       this.axios
         .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
-        .then(res => {
+        .then((res) => {
           console.log("res.data.data", res.data.data);
           this.tableData1 = res.data.data;
         });
@@ -509,7 +592,7 @@ export default {
       // 根据销售订单物资中间表id查询物资信息
       this.axios
         .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
-        .then(res => {
+        .then((res) => {
           this.tableData2 = res.data.data;
         });
     },
@@ -519,16 +602,16 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true
+        center: true,
       })
         .then(() => {
           this.$message({
             type: "success",
-            message: "关闭成功!"
+            message: "关闭成功!",
           });
           this.axios
             .post("/api/v1/oms/closeOrder?orderId=" + row.orderId)
-            .then(res => {
+            .then((res) => {
               if (res.data.code == "200") {
                 this.getRequestUrl();
               }
@@ -537,11 +620,11 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消关闭!"
+            message: "取消关闭!",
           });
         });
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scode>

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

@@ -23,7 +23,7 @@
         placeholder="请输入内容"
         v-model="inputTruck"
         clearable
-        style="width:200px"
+        style="width: 200px"
       >
       </el-input>
       <el-button type="primary" class="btn" @click="onClickTruck">
@@ -192,7 +192,7 @@ import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
-      shiyHeigth: 140,
+      shiyHeigth: 190,
       isHeigth: true,
       pageSize: 100,
       isKuang: false,
@@ -202,25 +202,25 @@ export default {
         // option1请求数据的地址，承运商(运输订单状态为已接收，接收状态为已接收)
         requestUrl:
           "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&shipperId=1&carrierSsoId=" +
-          getCookie("userId")
+          "",
       },
       option2: {
         // option2请求数据的地址，承运商暂时设置为默认（运输订单状态为）
         requestUrl:
           "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&shipperId=1&carrierSsoId=" +
-          getCookie("userId")
+          "",
       },
       option3: {
         // option3请求数据的地址
         requestUrl:
-          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&shipperId=1&carrierSsoId=" +
-          getCookie("userId"),
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&shipperId=1&&carrierSsoId=" +
+          "",
         selectionType: "select",
-        mapList: []
+        mapList: [],
       },
       truck: {
         requestUrl: "",
-        selectionType: "radio"
+        selectionType: "radio",
       },
       activeName: "third",
       //记录旧的row对象(已接收)
@@ -239,32 +239,69 @@ export default {
         {
           prop: "materialName",
           label: "物资名称",
-          width: 150
+          width: 150,
         },
         {
           prop: "specificationModel",
           label: "规格型号",
-          width: 150
+          width: 150,
         },
         {
           prop: "materialNumber",
           label: "物资件数",
-          width: 100
+          width: 100,
         },
         {
           prop: "materialWeight",
           label: "物资重量",
-          width: 100
-        }
+          width: 100,
+        },
       ],
       tableData: [],
       tableData1: [],
       tableData2: [],
       capacityId: null,
       dialogTableVisible: false,
-      orderId: null
+      orderId: null,
     };
   },
+
+  created() {
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option1.requestUrl =
+        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&shipperId=1&carrierSsoId=" +
+        getCookie("userId") +
+        "&t=" +
+        new Date();
+      this.option2.requestUrl =
+        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&shipperId=1&carrierSsoId=" +
+        getCookie("userId") +
+        "&t=" +
+        new Date();
+      this.option3.requestUrl =
+        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&shipperId=1&carrierSsoId=" +
+        getCookie("userId") +
+        "&t=" +
+        new Date();
+    } else {
+      this.option1.requestUrl =
+        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&shipperId=1&carrierSsoId=" +
+        "" +
+        "&t=" +
+        new Date();
+      this.option2.requestUrl =
+        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&shipperId=1&carrierSsoId=" +
+        "" +
+        "&t=" +
+        new Date();
+      this.option3.requestUrl =
+        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&shipperId=1&carrierSsoId=" +
+        "" +
+        "&t=" +
+        new Date();
+    }
+  },
+
   methods: {
     onClickTruck() {
       if (getCookie("orgCode") == "chengyunshang") {
@@ -281,22 +318,41 @@ export default {
           this.inputTruck;
       }
     },
+
     getRequestUrl() {
-      this.option1.requestUrl =
-        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&shipperId=1&carrierSsoId=" +
-        getCookie("userId") +
-        "&t=" +
-        new Date();
-      this.option2.requestUrl =
-        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&shipperId=1&carrierSsoId=" +
-        getCookie("userId") +
-        "&t=" +
-        new Date();
-      this.option3.requestUrl =
-        "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&shipperId=1&carrierSsoId=" +
-        getCookie("userId") +
-        "&t=" +
-        new Date();
+      if (getCookie("orgCode") == "chengyunshang") {
+        this.option1.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&shipperId=1&carrierSsoId=" +
+          getCookie("userId") +
+          "&t=" +
+          new Date();
+        this.option2.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&shipperId=1&carrierSsoId=" +
+          getCookie("userId") +
+          "&t=" +
+          new Date();
+        this.option3.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&shipperId=1&carrierSsoId=" +
+          getCookie("userId") +
+          "&t=" +
+          new Date();
+      } else {
+        this.option1.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&shipperId=1&carrierSsoId=" +
+          "" +
+          "&t=" +
+          new Date();
+        this.option2.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&shipperId=1&carrierSsoId=" +
+          "" +
+          "&t=" +
+          new Date();
+        this.option3.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&shipperId=1&carrierSsoId=" +
+          "" +
+          "&t=" +
+          new Date();
+      }
     },
     selectionChange(selection) {
       this.option3.mapList = selection;
@@ -305,34 +361,34 @@ export default {
       if (this.option3.mapList.length == 0) {
         this.$message({
           type: "warning",
-          message: "请先选择要关闭的订单!"
+          message: "请先选择要关闭的订单!",
         });
       } else {
         this.$confirm("是否关闭这些订单", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
-          center: true
+          center: true,
         })
           .then(() => {
             //初始化maplist
             var mapList = [];
-            this.option3.mapList.forEach(item => {
+            this.option3.mapList.forEach((item) => {
               //初始化mapItem
               var mapItem = {
                 //销售订单物资中间表id
-                orderId: 0
+                orderId: 0,
               };
               mapItem.orderId = item.orderId;
               mapList.push(mapItem);
             });
             this.$message({
               type: "success",
-              message: "关闭成功!"
+              message: "关闭成功!",
             });
             this.axios
               .post("/api/v1/oms/batchCloseOrder", mapList)
-              .then(res => {
+              .then((res) => {
                 if (res.data.code == "200") {
                   this.getRequestUrl();
                 }
@@ -341,7 +397,7 @@ export default {
           .catch(() => {
             this.$message({
               type: "info",
-              message: "取消关闭!"
+              message: "取消关闭!",
             });
           });
       }
@@ -393,9 +449,9 @@ export default {
       this.axios
         .post("/api/v1/oms/updateCapacityId", {
           capacityId: this.capacityId,
-          orderId: this.orderId
+          orderId: this.orderId,
         })
-        .then(res => {
+        .then((res) => {
           if (res.data.code == "200") {
             this.$message.success("修改运力成功");
             this.getRequestUrl();
@@ -405,25 +461,54 @@ export default {
           }
         });
     },
+    // 点击查询事件
     onClick() {
-      if (this.activeName == "first") {
-        this.option1.requestUrl =
-          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&shipperId=1&carrierSsoId=" +
-          getCookie("userId") +
-          "&con=" +
-          this.inputText;
-      } else if (this.activeName == "second") {
-        this.option2.requestUrl =
-          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&shipperId=1&carrierSsoId=" +
-          getCookie("userId") +
-          "&con=" +
-          this.inputText;
+      if (getCookie("orgCode") == "chengyunshang") {
+        // 已接收
+        if (this.activeName == "first") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&shipperId=1&carrierSsoId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.inputText;
+          // 已拒绝
+        } else if (this.activeName == "second") {
+          this.option2.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&shipperId=1&carrierSsoId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.inputText;
+          // 未接收
+        } else {
+          this.option3.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&shipperId=1&carrierSsoId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.inputText;
+        }
       } else {
-        this.option3.requestUrl =
-          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&shipperId=1&carrierSsoId=" +
-          getCookie("userId") +
-          "&con=" +
-          this.inputText;
+        // 已接收
+        if (this.activeName == "first") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&shipperId=1&carrierSsoId=" +
+            "" +
+            "&con=" +
+            this.inputText;
+          // 已拒绝
+        } else if (this.activeName == "second") {
+          this.option2.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&shipperId=1&carrierSsoId=" +
+            "" +
+            "&con=" +
+            this.inputText;
+          // 未接收
+        } else {
+          this.option3.requestUrl =
+            "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&shipperId=1&carrierSsoId=" +
+            "" +
+            "&con=" +
+            this.inputText;
+        }
       }
     },
     // -------查看物资详情 (已接收)
@@ -452,7 +537,7 @@ export default {
       // 根据销售订单id查询物资信息
       this.axios
         .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
-        .then(res => {
+        .then((res) => {
           console.log("res.data.data", res.data.data);
           this.tableData = res.data.data;
         });
@@ -484,7 +569,7 @@ export default {
       // 根据销售订单物资中间表id查询物资信息
       this.axios
         .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
-        .then(res => {
+        .then((res) => {
           console.log("res.data.data", res.data.data);
           this.tableData1 = res.data.data;
         });
@@ -516,7 +601,7 @@ export default {
       // 根据销售订单物资中间表id查询物资信息
       this.axios
         .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
-        .then(res => {
+        .then((res) => {
           this.tableData2 = res.data.data;
         });
     },
@@ -526,17 +611,17 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true
+        center: true,
       })
         .then(() => {
           this.axios
             .post("/api/v1/oms/closeOrder?orderId=" + row.orderId)
-            .then(res => {
+            .then((res) => {
               if (res.data.code == "200") {
                 this.getRequestUrl();
                 this.$message({
                   type: "success",
-                  message: "关闭成功!"
+                  message: "关闭成功!",
                 });
               }
             });
@@ -544,11 +629,11 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消关闭!"
+            message: "取消关闭!",
           });
         });
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scode>

src/views/statisticalReport/components/Ship_dynamic_table.vue

@@ -17,7 +17,7 @@ import tableItem from "./tableItem";
 export default {
   name: "TableView",
   components: {
-    tableItem
+    tableItem,
   },
   data() {
     return {
@@ -26,107 +26,107 @@ export default {
       col: [
         {
           prop: "pm",
-          label: "品名"
+          label: "品名",
         },
         {
           prop: "portName",
-          label: "港口名称"
+          label: "港口名称",
         },
         {
           prop: "tonnage",
-          label: "下游港口吨位"
+          label: "下游港口吨位",
         },
         {
           label: "未到闸船舶",
           children: [
             {
               prop: "capacity1",
-              label: "船名"
+              label: "船名",
             },
             {
               prop: "capacityNumber1",
-              label: "吨位"
+              label: "吨位",
             },
             {
               prop: "locationValue1",
-              label: "位置"
+              label: "位置",
             },
             {
               prop: "outPortTime1",
-              label: "离港时间"
-            }
-          ]
+              label: "离港时间",
+            },
+          ],
         },
         {
           label: "等闸船舶",
           children: [
             {
               prop: "capacity2",
-              label: "船名"
+              label: "船名",
             },
             {
               prop: "capacityNumber2",
-              label: "吨位"
+              label: "吨位",
             },
             {
               prop: "locationValue2",
-              label: "位置"
+              label: "位置",
             },
             {
               prop: "outPortTime2",
-              label: "离港时间"
-            }
-          ]
+              label: "离港时间",
+            },
+          ],
         },
         {
           label: "已过闸船舶",
           children: [
             {
               prop: "capacity3",
-              label: "船名"
+              label: "船名",
             },
             {
               prop: "capacityNumber3",
-              label: "吨位"
+              label: "吨位",
             },
             {
               prop: "locationValue3",
-              label: "位置"
+              label: "位置",
             },
             {
               prop: "outPortTime3",
-              label: "离港时间"
-            }
-          ]
+              label: "离港时间",
+            },
+          ],
         },
         {
           label: "到港待卸船舶",
           children: [
             {
               prop: "capacity4",
-              label: "船名"
+              label: "船名",
             },
             {
               prop: "capacityNumber4",
-              label: "吨位"
+              label: "吨位",
             },
             {
               prop: "locationValue4",
-              label: "位置"
+              label: "位置",
             },
             {
               prop: "outPortTime4",
-              label: "离港时间"
+              label: "离港时间",
             },
             {
               prop: "dgsj",
-              label: "到港时间"
-            }
-          ]
-        }
+              label: "到港时间",
+            },
+          ],
+        },
       ],
       // 表格数据
-      tableData: []
+      tableData: [],
     };
   },
   created() {},
@@ -145,18 +145,23 @@ export default {
         tonnage: "下游港口吨位",
         capacity1: "船名",
         capacityNumber1: "吨位",
-        locationValue1: "位置"
+        locationValue1: "位置",
       });
     },
     initialization() {
-      this.axios.post("/api/v1/tms/selectAllShipDynamaics").then(res => {
+      this.axios.post("/api/v1/tms/selectAllShipDynamaics").then((res) => {
         if (res.data.code == "200") {
           this.tableData = res.data.data;
           console.log(this.tableData);
+        } else {
+          this.$message({
+            type: "warning",
+            message: res.data.data,
+          });
         }
       });
-    }
-  }
+    },
+  },
 };
 </script>