Bläddra i källkod

Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

liyg 2 år sedan
förälder
incheckning
d548371570

+ 1 - 1
src/views/TMS/components/importedShip/loadShip.vue

@@ -50,7 +50,7 @@ export default {
   mounted() {},
   methods: {
     onclick() {
-      // this.option.requestUrl = "/api/v1/tms/getLoadShipList?apiId=63&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getLoadShipList?apiId=63&con=" + this.input;
     },
     click(resultId) {
       console.log("aaa" + resultId);

+ 3 - 3
src/views/TMS/components/importedShip/shipLocation.vue

@@ -178,15 +178,15 @@ export default {
   },
   methods: {
     onblur(scope) {
-      console.log("我是交了");
-      console.log(scope);
+      // console.log("我是交了");
+      // console.log(scope);
       this.axios
         .post(
           "/api/v1/tms/getShipLocationStatus?shipLocation=" +
             scope.row.shipLocation
         )
         .then(res => {
-          console.log(res.data.data);
+          // console.log(res.data.data);
           scope.row.locationStatus = res.data.data.locationStatus;
         });
     },

+ 66 - 58
src/views/TMS/components/importedShip/shipmentInstructionText.vue

@@ -7,7 +7,7 @@
       <div
         v-for="(item, index) in shipmentInstructionLists"
         :key="index"
-        style="margin-top:40px"
+        style="margin-top: 40px"
       >
         <div class="title">
           <i class="titleText" align="center">装船通知</i>
@@ -18,14 +18,12 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin: auto;font-size:20px;"
+            style="margin: auto; font-size: 20px;font-family: FangSong;line-height: 50px"
             width="1000px"
             class="tablePart0"
           >
             <tr>
-              <td style="width :100%">
-                TO:{{ item.piername}}有限公司:
-              </td>
+              <td style="width: 100%">TO:{{ item.piername }}有限公司:</td>
             </tr>
           </table>
         </div>
@@ -35,36 +33,36 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin-top: 5px;"
+            style="margin-top: 5px;font-family: FangSong;line-height: 40px;"
             width="1000px"
             class="tablePart1"
           >
             <tr>
-              <td style="width :100%" padding-right="20px">
+              <td style="width: 100%" padding-right="20px;">
                 &nbsp;&nbsp;&nbsp;&nbsp; 兹委任{{ item.carrierName }}有限公司
-               代表我司到贵港办理:海轮"{{item.foreignShipName}}"{{item.numberOfLoans}}湿吨
-               {{item.materialName}}的提货、数量、清场、交接等相关事宜。恳请给予办理为盼!!
-               谢谢!!(传真件与原件具有同等法律效应)。
+                代表我司到贵港办理:海轮"{{ item.foreignShipName }}"{{
+                  item.numberOfLoans
+                }}湿吨
+                {{
+                  item.materialName
+                }}的提货、数量、清场、交接等相关事宜。恳请给予办理为盼!
+                谢谢!(传真件与原件具有同等法律效应)。
               </td>
             </tr>
           </table>
-        
 
-          
           <!-- tablePart2 -->
           <table
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="
-            border-top:0px"
+            style="border-top: 0px;font-family: FangSong;line-height: 40px"
             width="1000px"
             class="tablePart2"
           >
             <tr>
-              <th style="width:0.6%"></th>
-              <th style="width:20.5%">具体提货船舶信息如下:</th>
-             
+              <th style="width: 1.1%"></th>
+              <th style="width: 20.5%">具体提货船舶信息如下:</th>
             </tr>
           </table>
 
@@ -73,15 +71,17 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="
-          border-top: 0px"
+            style="border-top: 0px;font-family: FangSong;line-height: 40px"
             width="1000px"
             class="tablePart3"
           >
             <tr>
-             <th style="width:0.6%"></th>
-              <th style="width :10.5%">船名:{{item.capacityNumber}}({{item.instruct}}吨)航次{{item.capacityBookingNumber}}</th>
-              
+              <th style="width: 0.6%"></th>
+              <th style="width: 10.5%">
+                船名:{{ item.capacityNumber }}({{ item.instruct }}吨)航次{{
+                  item.capacityBookingNumber
+                }}
+              </th>
             </tr>
           </table>
 
@@ -90,58 +90,58 @@
             border="1"
             cellpadding="10"
             cellspacing="0"
-            style="
-          border-top: 0px"
+            style="border-top: 0px;font-family: FangSong;line-height: 40px"
             width="1000px"
             class="tablePart4"
           >
             <tr>
-              <th style="width:0.6%"></th>
-              <th style="width :10.5%">船舶联系方式:{{item.capacityTel}}</th>
+              <th style="width: 0.6%"></th>
+              <th style="width: 10.5%">船舶联系方式:{{ item.capacityTel }}</th>
+            
             </tr>
           </table>
+        
 
           <table
             border="1"
             cellpadding="10"
             cellspacing="0"
-            style="
-          border-top: 0px"
+            style="border-top: 0px;font-family: FangSong;line-height: 40px"
             width="1000px"
             class="tablePart5"
           >
             <tr>
-              <th style="width:0.6%"></th>
-              <th style="width :10.5%">中转港:{{item.transitPort}} 目的港口{{item.arriveName}}</th>
+              <th style="width: 0.6%"></th>
+              <th style="width: 10.5%">
+                中转港:{{ item.transitPort }}, 目的港:{{ item.arriveName }}
+              </th>
             </tr>
           </table>
-           <table
+          <table
             border="1"
             cellpadding="10"
             cellspacing="0"
-            style="
-          border-top: 0px"
+            style="border-top: 0px;font-family: FangSong;line-height: 40px"
             width="1000px"
             class="tablePart6"
           >
             <tr>
-              <th style="width:0.6%"></th>
-              <th style="width :10.5%">收货人:{{item.shipperName}}</th>
+              <th style="width: 0.6%"></th>
+              <th style="width: 10.5%">收货人:{{ item.shipperName }}</th>
             </tr>
           </table>
 
-           <table
+          <table
             border="1"
             cellpadding="10"
             cellspacing="0"
-            style="
-          border-top: 0px"
+            style="border-top: 0px;font-family: FangSong;line-height: 40px"
             width="1000px"
             class="tablePart7"
           >
             <tr>
-              <th style="width:0.6%"></th>
-              <th style="width :10.5%">交接方式:{{item.havdoverMode}}</th>
+              <th style="width: 0.6%"></th>
+              <th style="width: 10.5%">交接方式:{{ item.havdoverMode }}</th>
             </tr>
           </table>
         </div>
@@ -151,13 +151,13 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin: auto;margin-top: 5px;font-size:20px;"
+            style="margin: auto; margin-top: 5px; font-size: 20px;font-family: FangSong;line-height: 40px"
             width="1000px"
             class="tablePart6"
           >
             <tr>
-              <th style="width:50px;"></th>
-              <td style="width :33%">{{ item.shipperName }}</td>
+              <th style="width: 50px"></th>
+              <td style="width: 33%">{{ item.shipperName }}</td>
             </tr>
           </table>
         </div>
@@ -167,18 +167,19 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin: auto;margin-top: 5px;font-size:20px;"
+            style="margin: auto; margin-top: 5px; font-size: 20px;font-family: FangSong;line-height: 40px"
             width="1000px"
             class="tablePart7"
           >
             <tr>
-              <td style="width :63%"></td>
-              <td style="width :4%">{{ item.year }}</td>
-              <th style="width :7%">年</th>
-              <td style="width :3%">{{ item.month }}</td>
-              <th style="width :7%">月</th>
-              <td style="width :3%">{{ item.date }}</td>
-              <th style="width :7%">日</th>
+              <td style="width: 63%"></td>
+              <td style="width: 1%">{{ item.year }}</td>
+              <th style="width: 3%">年</th>
+              <td style="width: 0.6%">{{ item.month }}</td>
+              <th style="width: 3%">月</th>
+              <td style="width: 0.5%">{{ item.date }}</td>
+              <th style="width: 3%">日</th>
+              <th style="width:7%"></th>
             </tr>
           </table>
         </div>
@@ -187,7 +188,7 @@
     <div class="buttns">
       <el-button class="buttn" type="primary" @click="getPdf()">
         <i class="el-icon-download">{{ "\xa0\xa0" }}</i
-        >导出(pdf)
+        >导出(装船指令pdf)
       </el-button>
     </div>
   </div>
@@ -203,7 +204,7 @@ export default {
   data() {
     return {
       shipmentInstructionLists: [],
-      htmlTitle: "装船通知单"
+      htmlTitle: "装船通知单",
     };
   },
   created() {
@@ -214,20 +215,20 @@ export default {
       this.$router.go(-2);
     },
     getwts() {
-      console.log(this.$route.params.text)
+      console.log(this.$route.params.text);
       this.shipmentInstructionLists = JSON.parse(
         this.$route.params.text
       ).shipmentInstructionList;
       console.log(this.shipmentInstructionLists);
       // this.amsShipDeliveryNameLists = this.$route.params.test;
       console.log(this.shipmentInstructionLists);
-      this.shipmentInstructionLists.forEach(e => {
+      this.shipmentInstructionLists.forEach((e) => {
         e.year = e.instructionTime.split("-")[0];
         e.month = e.instructionTime.split("-")[1];
         e.date = e.instructionTime.split("-")[2].split(" ")[0];
       });
-    }
-  }
+    },
+  },
 };
 </script>
 
@@ -237,6 +238,9 @@ export default {
   margin-bottom: 30px;
   .titleText {
     font-size: 30px;
+    font-family: SimSun;
+    font-weight: 900;
+    line-height: 40px;
   }
 }
 .buttns {
@@ -246,7 +250,7 @@ export default {
   margin-left: 465px;
   .buttn {
     margin-left: 10px;
-    width: 130px;
+    width: 270px;
   }
 }
 .tableBody {
@@ -276,6 +280,10 @@ export default {
   th {
     border-top: 0px;
   }
+  .tablePart8 td,
+  th {
+    border-top: 0px;
+  }
 }
 .blank {
   width: 100%;

+ 16 - 2
src/views/TMS/components/importedShip/shipmentInstructions.vue

@@ -21,7 +21,7 @@
         @click="addPick"
         v-if="activeName === 'second'"
       >
-        <i class="el-icon-circle-plus-outline"></i>生成船指令PDF
+        <i class="el-icon-circle-plus-outline"></i>生成船指令PDF
       </el-button>
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -122,7 +122,21 @@ export default {
     handleClick(tab, event) {
       console.log(tab, event);
     },
-    onclick() {},
+    onclick() {
+         if (this.activeName == "first") {
+          this.option1.requestUrl =
+            "/api/v1/tms/getShipMentInstructionsList?apiId=74&status=未下发&carrierSSOId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input;  
+      } else{
+          this.option2.requestUrl =
+            "/api/v1/tms/getShipMentInstructionsList?apiId=74&status=已下发&carrierSSOId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input;  
+      }
+    },
     btnclick() {
       this.$router.push("/addShipmentInstructions/");
     },

+ 30 - 39
src/views/TMS/components/importedShip/updateBargeShip.vue

@@ -1,11 +1,11 @@
 <template>
   <!-- 修改驳船作业 -->
-    <div class="shipTransport">
+  <div class="shipTransport">
     <page-title>返回</page-title>
     <div class="form">
       <div class="form_box">
-          <dil-form :formId="133" v-model="form1" ref="from1"></dil-form>
-      </div> 
+        <dil-form :formId="133" v-model="form1" ref="from1"></dil-form>
+      </div>
     </div>
     <!-- 确定和取消 -->
     <div class="button_box">
@@ -20,11 +20,11 @@ import PageTitle from "@/components/Page/Title";
 import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
- data(){
-     return {
+  data() {
+    return {
       form1: {},
-  }
- },
+    };
+  },
   mounted() {
     this.information();
   },
@@ -32,13 +32,12 @@ export default {
     information() {
       //编辑驳船作业
       this.axios
-        .post("/api/v1/tms/getBargeOperation/" + this.$route.params.bargeOperationId)
+        .post(
+          "/api/v1/tms/getBargeOperation/" + this.$route.params.bargeOperationId
+        )
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
-            // console.log(e);
-            // console.log(this.form1);
-            // console.log(this.$route.params.loadingId);
           });
         });
     },
@@ -58,68 +57,60 @@ export default {
         bargeOperationId: this.$route.params.bargeOperationId,
         smallCapacityId: this.form1.smallCapacityId,
         bargeSmallshipLoadWeight: this.form1.bargeSmallshipLoadWeight,
-        bargeRefuteDate: sjTime(
-          this.form1.bargeRefuteDate
-        ),
+        bargeRefuteDate: sjTime(this.form1.bargeRefuteDate),
         bargeRefuteLocation: this.form1.bargeRefuteLocation,
-        bargeBackDate: sjTime(
-          this.form1.bargeBackDate
-        ),
+        bargeBackDate: sjTime(this.form1.bargeBackDate),
         bargeBackLocation: this.form1.bargeBackLocation,
       };
-          if (
+      if (
         bagerShipMap.bargeOperationId == null ||
         bagerShipMap.bargeSmallshipLoadWeight == null ||
-        bagerShipMap.bargeRefuteDate == null||
-        bagerShipMap.bargeRefuteLocation==null||
-        bagerShipMap.bargeBackDate==null||
-        bagerShipMap.bargeBackLocation==null
+        bagerShipMap.bargeRefuteDate == null ||
+        bagerShipMap.bargeRefuteLocation == null ||
+        bagerShipMap.bargeBackDate == null ||
+        bagerShipMap.bargeBackLocation == null
       )
         this.$message.error("存在空值!");
       else if (!isNumber(val)) this.$message.warning("合计吨位请填写数字");
       this.axios
-        .post(
-          "/api/v1/tms/updateBargeOperation",
-          bagerShipMap
-        )
+        .post("/api/v1/tms/updateBargeOperation", bagerShipMap)
         .then((res) => {
           if (res.data.code == 200) {
             this.$message({
               type: "success",
               message: "修改成功!",
             });
-            // this.$refs.table.refreshData();
             this.$router.go(-1);
           } else {
             this.$message.error("修改失败!");
           }
-          this.$refs['table'].resetField();
+          this.$refs["table"].resetField();
         });
     },
   },
 };
 </script>
 <style lang="scss">
-.shipTransport{
-  .form{
+.shipTransport {
+  .form {
     display: flex;
-    .form_box{
+    .form_box {
       width: 320px;
       margin-left: 35%;
       margin-top: 30px;
       margin-right: 20px;
-      .el-form{
-        .preview-group{
-          .el-form-item{
-            .el-form-item__label{
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
               display: inline-block;
               width: 70px !important;
             }
-            .el-form-item__content{
-              .el-select{
+            .el-form-item__content {
+              .el-select {
                 width: 250px;
               }
-              .el-input{
+              .el-input {
                 width: 250px;
               }
             }
@@ -128,7 +119,7 @@ export default {
       }
     }
   }
-  .button_box{
+  .button_box {
     margin-left: 45%;
   }
 }

+ 75 - 47
src/views/appoint/components/ship/attorneytext.vue

@@ -7,7 +7,7 @@
       <div
         v-for="(item, index) in amsShipDeliveryNameLists"
         :key="index"
-        style="margin-top:40px"
+        style="margin-top: 40px"
       >
         <div class="title">
           <i class="titleText" align="center">委托书</i>
@@ -18,13 +18,13 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin: auto;font-size:20px;"
+            style="margin: auto; font-size: 20px"
             width="1000px"
             class="tablePart0"
           >
             <tr>
-              <td style="width :100%">
-                {{ item.carrierName }}有限公司
+              <td style="width: 100%; font-family: FangSong">
+                {{ item.carrierName }}:
               </td>
             </tr>
           </table>
@@ -35,44 +35,54 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin-top: 5px;"
+            style="margin-top: 5px"
             width="1000px"
             class="tablePart1"
           >
             <tr>
-              <td style="width :100%" padding-right="20px">
-                &nbsp;&nbsp;&nbsp;&nbsp; 兹委任重庆市万州区万港船务有限公司
+              <td
+                style="width: 100%; font-family: FangSong; line-height: 40px"
+                padding-right="20px"
+              >
+                &nbsp;&nbsp; 兹委任{{
+                  item.carrierName
+                }}
                 前来贵港办理我公司的货权提货和水路运输事宜,品种:{{
                   item.materialName
                 }};外轮船名:{{ item.resultForeignShipName }}; 数量:{{
                   item.purchaseOrderMaterialNum
                 }}
-                湿吨(如遇最后一批提货,须清场),物流流向:万州港。望贵公司予以支持为盼。
+                湿吨(如遇该轮最后一批提货请清场),物流流向:{{
+                  item.portName1
+                }}。望贵公司予以支持为盼。
               </td>
             </tr>
           </table>
-        
 
-          
           <!-- tablePart2 -->
           <table
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="
-            border-top:0px"
+            style="border-top: 0px; line-height: 40px"
             width="1000px"
             class="tablePart2"
           >
             <tr>
-              <th style="width:3%"></th>
-              <th style="width :12.5%;padding-left:2 px;">提货联系人:</th>
-              <td style="width :10.5%">
+              <th style="width: 3%"></th>
+              <th
+                style="width: 12.5%; padding-left: 2 px; font-family: FangSong"
+              >
+                提货联系人:
+              </th>
+              <td style="width: 10.5%; font-family: FangSong">
                 {{ item.attorneyPickupContactPerson }}
               </td>
-              <th style="width:3%"></th>
-              <th style="width :10%">身份证号:</th>
-              <td style="width :59%">{{ item.attorneyPickupIdcard }}</td>
+              <th style="width: 3%"></th>
+              <th style="width: 10%; font-family: FangSong">身份证号:</th>
+              <td style="width: 59%; font-family: FangSong">
+                {{ item.attorneyPickupIdcard }}
+              </td>
             </tr>
           </table>
 
@@ -81,15 +91,14 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="
-          border-top: 0px"
+            style="border-top: 0px; line-height: 40px"
             width="1000px"
             class="tablePart3"
           >
             <tr>
-              <th style="width:3%"></th>
-              <th style="width :10.5%">联系电话:</th>
-              <td style="width :98%">
+              <th style="width: 3%"></th>
+              <th style="width: 10.5%; font-family: FangSong">联系电话:</th>
+              <td style="width: 98%; font-family: FangSong">
                 {{ item.attorneyContactTelephone }}
               </td>
             </tr>
@@ -100,13 +109,13 @@
             border="1"
             cellpadding="10"
             cellspacing="0"
-            style="
-          border-top: 0px"
+            style="border-top: 0px; line-height: 40px"
             width="1000px"
             class="tablePart4"
           >
             <tr>
-              <th style="width :12.5%">顺颂商祺!</th>
+              <th style="width: 0.4%"></th>
+              <th style="width: 12.5%; font-family: FangSong">顺颂商祺!</th>
             </tr>
           </table>
 
@@ -114,13 +123,15 @@
             border="1"
             cellpadding="10"
             cellspacing="0"
-            style="
-          border-top: 0px"
+            style="border-top: 0px; line-height: 40px"
             width="1000px"
             class="tablePart5"
           >
             <tr>
-              <th style="width :10.5%">(传真件/扫描件有效)</th>
+              <th style="width: 0.3%"></th>
+              <th style="width: 10.5%; font-family: FangSong">
+                (传真件/扫描件有效)
+              </th>
             </tr>
           </table>
         </div>
@@ -130,13 +141,20 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin: auto;margin-top: 5px;font-size:20px;"
+            style="
+              margin: auto;
+              margin-top: 5px;
+              font-size: 20px;
+              line-height: 40px;
+            "
             width="1000px"
             class="tablePart6"
           >
             <tr>
-              <th style="width:50px;"></th>
-              <td style="width :33%">{{ item.shipperName }}</td>
+              <th style="width: 50px"></th>
+              <td style="width: 33%; font-family: FangSong">
+                {{ item.shipperName }}
+              </td>
             </tr>
           </table>
         </div>
@@ -146,18 +164,25 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin: auto;margin-top: 5px;font-size:20px;"
+            style="
+              margin: auto;
+              margin-top: 5px;
+              font-size: 20px;
+              font-family: FangSong;
+              line-height: 40px;
+            "
             width="1000px"
             class="tablePart7"
           >
             <tr>
-              <td style="width :63%"></td>
-              <td style="width :4%">{{ item.year }}</td>
-              <th style="width :7%">年</th>
-              <td style="width :3%">{{ item.month }}</td>
-              <th style="width :7%">月</th>
-              <td style="width :3%">{{ item.date }}</td>
-              <th style="width :7%">日</th>
+              <td style="width: 63%"></td>
+              <td style="width: 1%">{{ item.year }}</td>
+              <th style="width: 3%">年</th>
+              <td style="width: 0.7%">{{ item.month }}</td>
+              <th style="width: 3%">月</th>
+              <td style="width: 0.7%">{{ item.date }}</td>
+              <th style="width: 3%">日</th>
+              <th style="width:5%"></th>
             </tr>
           </table>
         </div>
@@ -166,7 +191,7 @@
     <div class="buttns">
       <el-button class="buttn" type="primary" @click="getPdf()">
         <i class="el-icon-download">{{ "\xa0\xa0" }}</i
-        >导出(pdf)
+        >导出(委托书pdf)
       </el-button>
     </div>
   </div>
@@ -182,7 +207,7 @@ export default {
   data() {
     return {
       amsShipDeliveryNameLists: [],
-      htmlTitle: "委托书"
+      htmlTitle: "委托书",
     };
   },
   created() {
@@ -200,13 +225,13 @@ export default {
       console.log(this.amsShipDeliveryNameLists);
       // this.amsShipDeliveryNameLists = this.$route.params.test;
       console.log(this.amsShipDeliveryNameLists);
-      this.amsShipDeliveryNameLists.forEach(e => {
+      this.amsShipDeliveryNameLists.forEach((e) => {
         e.year = e.attorneyTime.split("-")[0];
         e.month = e.attorneyTime.split("-")[1];
         e.date = e.attorneyTime.split("-")[2].split(" ")[0];
       });
-    }
-  }
+    },
+  },
 };
 </script>
 
@@ -215,7 +240,10 @@ export default {
   text-align: center;
   margin-bottom: 30px;
   .titleText {
-    font-size: 30px;
+    font-size: 40px;
+    font-family: SimSun;
+    font-weight: 900;
+    line-height: 40px;
   }
 }
 .buttns {
@@ -225,7 +253,7 @@ export default {
   margin-left: 465px;
   .buttn {
     margin-left: 10px;
-    width: 130px;
+    width: 260px;
   }
 }
 .tableBody {

+ 13 - 2
src/views/appoint/components/ship/deliveryAttorney.vue

@@ -95,11 +95,22 @@ export default {
 
   methods: {
     selectionChange(selection) {
-      console.log(selection);
       this.amsShipDeliveryList = selection;
     },
     onclick() {
-      this.$message.info("功能尚未开通,请联系管理员!");
+      if (this.activeName == "first") {
+          this.option1.requestUrl =
+            "/api/v1/tms/getAmsshipDeliveryAttroneyList?apiId=73&status=0&carrierSSOId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input;  
+      } else{
+          this.option2.requestUrl =
+            "/api/v1/tms/getAmsshipDeliveryAttroneyList?apiId=73&status=1&carrierSSOId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input;  
+      }
     },
     click(pathId) {
       this.$router.push("/path/addDeliveryNotice/" + pathId);

+ 16 - 1
src/views/appoint/components/ship/deliveryNotice.vue

@@ -49,6 +49,7 @@
   </div>
 </template>
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   name: "homeworkPath",
   data() {
@@ -70,7 +71,21 @@ export default {
     };
   },
   methods: {
-    onclick() { },
+    onclick() {
+        if (this.activeName == "first") {
+          this.option1.requestUrl =
+            "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=0&carrierSSOId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input;  
+      } else{
+          this.option2.requestUrl =
+            "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&status=1&carrierSSOId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input;  
+      }
+     },
     addClick() {
       this.$router.push("/addDeliveryNotice/");
     },