修改

build/utils.js

@@ -21,12 +21,12 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 
 // let devModules = ["index", "appoint", "statisticalReport"];
 
-// let devModules = ["index", "appoint", "statisticalReport", "WMS","TMS"];
+let devModules = ["index", "appoint", "statisticalReport", "WMS","TMS"];
 // let devModules = ["all"];
 
 
 // let devModules = ["index", "appoint", "statisticalReport", "WMS"];
-let devModules = ["all"];
+// let devModules = ["all"];
 
 // let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
 // let devModules = ["index", "ADMINISTRATORS", "RMS"];

config/index.js

@@ -66,16 +66,12 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
     target: "http://172.16.33.166:80",
-    // target: "http://localhost:8080",
-    // target: "http://192.168.1.104:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
     }
   },
   "/views/api/v1": {
-    // target: "http://localhost:8080",
-    // target: "http://192.168.1.109:8080",
     target: "http://172.16.33.166:80",
     ws: true,
     pathRewrite: {

src/views/TMS/components/importedShip/shipmentInstructionForPierText.vue

@@ -11,8 +11,12 @@
       >
         <div class="title">
           <i class="titleText" align="center">四川省达州钢铁集团有限公司</i>
-          <div class="link-top"></div>
+          <div class="link-top">
+            <br />
+            <i class="titleText2" align="center">业务联系函</i>
+          </div>
         </div>
+
         <div>
           <!-- tablePart0 -->
           <table
@@ -29,31 +33,34 @@
             class="tablePart0"
           >
             <tr>
-              <td style="width: 100%">TO:{{ item.piername }}有限公司：</td>
+              <td style="width: 100%">{{ item.carrierName }}:</td>
             </tr>
           </table>
         </div>
+
         <div class="tableBody">
           <!-- tablePart1 -->
           <table
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin-top: 5px; font-family: FangSong; line-height: 40px"
+            style="margin-top: 0px; font-family: FangSong; line-height: 40px"
             width="1000px"
             class="tablePart1"
           >
             <tr>
-              <td style="width: 100%" padding-right="20px;">
-                &nbsp;&nbsp;&nbsp;&nbsp; 兹委任{{ item.carrierName }}有限公司
+              <th style="width: 1.1%"></th>
+              <th style="width: 20.5%">
+                <!-- &nbsp;&nbsp;&nbsp;&nbsp; 兹委任{{ item.carrierName }}有限公司
                 代表我司到贵港办理:海轮"{{ item.foreignShipName }}"{{
                   item.numberOfLoans
                 }}湿吨
                 {{
                   item.materialName
                 }}的提货、数量、清场、交接等相关事宜。恳请给予办理为盼!
-                谢谢!(传真件与原件具有同等法律效应)。
-              </td>
+                谢谢!(传真件与原件具有同等法律效应)。 -->
+                感谢贵司对我司的大力支持！
+              </th>
             </tr>
           </table>
 
@@ -68,7 +75,11 @@
           >
             <tr>
               <th style="width: 1.1%"></th>
-              <th style="width: 20.5%">具体提货船舶信息如下:</th>
+              <th style="width: 20.5%">
+                现我司已安排船舶到贵港提运 {{ item.numberOfLoans }}吨{{
+                  item.materialName
+                }}:
+              </th>
             </tr>
           </table>
 
@@ -84,9 +95,11 @@
             <tr>
               <th style="width: 0.6%"></th>
               <th style="width: 10.5%">
-                船名:{{ item.capacityNumber }}（{{ item.instruct }}吨）航次{{
-                  item.capacityBookingNumber
-                }}
+                船名:{{ item.capacityNumber }},
+                {{ item.capacityBookingNumber }}航次,吨位:{{
+                  item.instruct
+                }}吨,船电:
+                {{ item.capacityTel }}
               </th>
             </tr>
           </table>
@@ -101,8 +114,9 @@
             class="tablePart4"
           >
             <tr>
-              <th style="width: 0.6%"></th>
-              <th style="width: 10.5%">船舶联系方式:{{ item.capacityTel }}</th>
+              <th style="width: 0.8%"></th>
+              <th style="width: 7.5%">中转港:{{item.transitPort}}</th>
+              <th style="width: 7.5%">目的港:{{item.arriveName}}</th>
             </tr>
           </table>
 
@@ -117,7 +131,7 @@
             <tr>
               <th style="width: 0.6%"></th>
               <th style="width: 10.5%">
-                中转港:{{ item.transitPort }}, 目的港:{{ item.arriveName }}
+                预计{{ item.year }}年{{item.month}}月{{item.date}}日抵达贵港
               </th>
             </tr>
           </table>
@@ -132,24 +146,43 @@
           >
             <tr>
               <th style="width: 0.6%"></th>
-              <th style="width: 10.5%">收货人:{{ item.shipperName }}</th>
+              <th style="width: 10.5%">望贵司能够积极配合与支持</th>
             </tr>
           </table>
 
+
+          <!-- tablePart4 -->
           <table
             border="1"
             cellpadding="10"
             cellspacing="0"
-            style="border-top: 0px; font-family: FangSong; line-height: 40px"
+            style="border-top: 0px; line-height: 40px"
             width="1000px"
-            class="tablePart7"
+            class="tablePart4"
           >
             <tr>
-              <th style="width: 0.6%"></th>
-              <th style="width: 10.5%">交接方式:{{ item.havdoverMode }}</th>
+              <th style="width: 0.65%"></th>
+              <th style="width: 12.5%; font-family: FangSong">顺祝</th>
+            
             </tr>
           </table>
-        </div>
+
+
+          <!-- tablePart4 -->
+          <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            style="border-top: 0px; line-height: 40px"
+            width="1000px"
+            class="tablePart4"
+          >
+            <tr>
+              <th style="width: 12.5%; font-family: FangSong">商祺！</th>
+            </tr>
+          </table>
+
+        </div> 
         <div class="luokuan">
           <!-- tablePart6 -->
           <table
@@ -267,13 +300,19 @@ export default {
 <style lang="scss" scoped>
 .title {
   text-align: center;
-  margin-bottom: 30px;
+  margin-bottom: 85px;
   .titleText {
     font-size: 45px;
     font-family: SimSun;
     font-weight: 900;
     line-height: 40px;
   }
+  .titleText2 {
+    font-size: 40px;
+    font-family: SimSun;
+    font-weight: 500;
+    line-height: 40px;
+  }
   .link-top {
     width: 50%;
     height: 1px;
@@ -300,7 +339,7 @@ export default {
     margin: auto;
   }
   .tablePart1 th {
-    border-top: 1px solid black;
+    border-top: 0px solid black;
   }
   .tablePart2 td,
   th {

src/views/TMS/components/importedShip/shipmentInstructionText.vue

@@ -28,7 +28,7 @@
             class="tablePart0"
           >
             <tr>
-              <td style="width: 100%">TO:{{ item.piername }}有限公司：</td>
+              <td style="width: 100%">TO:{{ item.carrierName}}：</td>
             </tr>
           </table>
         </div>
@@ -44,7 +44,7 @@
           >
             <tr>
               <td style="width: 100%" padding-right="20px;">
-                &nbsp;&nbsp;&nbsp;&nbsp; 兹委任{{ item.carrierName }}有限公司
+                &nbsp;&nbsp;&nbsp;&nbsp; 兹委任{{ item.carrierNaming}}
                 代表我司到贵港办理:海轮"{{ item.foreignShipName }}"{{
                   item.numberOfLoans
                 }}湿吨

src/views/TMS/components/importedShip/shipmentInstructions.vue

@@ -15,24 +15,24 @@
       <el-button class="btn" type="primary" @click="btnclick(0)">
         <i class="el-icon-circle-plus-outline"></i>新增
       </el-button>
-       <el-button type="primary" @click="refresh()">
+      <el-button type="primary" @click="refresh()">
         <i class="el-icon-refresh"></i>刷新
       </el-button>
       <el-button
         type="primary"
-        class="btn"
+        class="btn3"
         @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>
-        <el-button
+      <el-button
         type="primary"
         class="btn2"
         @click="addPierPick"
         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">
@@ -125,7 +125,7 @@ export default {
       this.$router.push("/shipmentInstructionText/" + test);
     },
     //生成宁波码头有限公司装船通知单
-     addPierPick() {
+    addPierPick() {
       if (this.shipmentInstructionList.length == 0) {
         this.$message.warning("请勾选已下发的装船指令,方可生成装船通知书");
         return;
@@ -133,27 +133,28 @@ export default {
       let shipmentInstructionList = {
         shipmentInstructionList: this.shipmentInstructionList,
       };
-      let jsonForPier = encodeURIComponent(JSON.stringify(shipmentInstructionList));
+      let jsonForPier = encodeURIComponent(
+        JSON.stringify(shipmentInstructionList)
+      );
       this.$router.push("/shipmentInstructionForPierText/" + jsonForPier);
     },
 
-    
     handleClick(tab, event) {
       console.log(tab, event);
     },
     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;  
+      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() {
@@ -229,9 +230,9 @@ export default {
           });
         });
     },
-    refresh(){
+    refresh() {
       this.$router.go(0);
-    }
+    },
   },
 };
 </script>
@@ -244,12 +245,16 @@ export default {
       margin-right: 40rpx;
     }
     .btn {
-      width: 12%;
+      width: 15%;
       margin-left: 0.25rem;
     }
-    .btn2{
+    .btn2 {
       width: 15%;
-      margin-left:0.25rem ;
+      margin-left: 0.25rem;
+    }
+    .btn3 {
+      width: 18%;
+      margin-left: 0.25rem;
     }
   }
 }