合并冲突

build/utils.js

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

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/loadShip.vue

@@ -15,12 +15,25 @@
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期"></el-date-picker> -->
 
       <el-button type="primary" class="btn" @click="onclick">
+        <el-date-picker
+          v-model="startTime"
+          type="datetime"
+          placeholder="选择日期"
+        >
+        </el-date-picker>
+        <span>至</span>
+        <el-date-picker
+          v-model="endTime"
+          type="datetime"
+          placeholder="选择日期"
+        >
+        </el-date-picker>
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" class="btn" @click="addclick">
         <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>
     </div>
@@ -49,14 +62,15 @@ export default {
   name: "homeworkPath",
   data() {
     return {
-      restaurants: [],
+      startTime: null,
+      endTime: null,
       input: "",
        startTime: null,
       endTime: null,
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getLoadShipList?apiId=63"
-      }
+        requestUrl: "/api/v1/tms/getLoadShipList?apiId=63",
+      },
     };
   },
   mounted() {},
@@ -93,13 +107,13 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true
+        center: true,
       })
         .then(() => {
           this.axios.post("/api/v1/tms/deleteLoadShip/" + resultId).then(() => {
             this.$message({
               type: "success",
-              message: "删除成功!"
+              message: "删除成功!",
             });
             this.option.requestUrl =
               "/api/v1/tms/getLoadShipList?apiId=63&i=" + new Date();
@@ -108,14 +122,14 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消删除!"
+            message: "取消删除!",
           });
         });
     },
-    refresh(){
+    refresh() {
       this.$router.go(0);
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

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

@@ -0,0 +1,372 @@
+<template>
+  <div class="tableAllDate">
+    <page-title>返回</page-title>
+    <div id="pdfDom">
+      <div class="blank"></div>
+      <!-- 循环遍历传过来的数组中的所有的对象，生成多张提货委托书 -->
+      <div
+        v-for="(item, index) in shipmentInstructionLists"
+        :key="index"
+        style="margin-top: 40px"
+      >
+        <div class="title">
+          <i class="titleText" align="center">四川省达州钢铁集团有限公司</i>
+          <div class="link-top">
+            <br />
+            <i class="titleText2" align="center">业务联系函</i>
+          </div>
+        </div>
+
+        <div>
+          <!-- tablePart0 -->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="
+              margin: auto;
+              font-size: 25px;
+              font-family: FangSong;
+              line-height: 50px;
+            "
+            width="1000px"
+            class="tablePart0"
+          >
+            <tr>
+              <td style="width: 100%">{{ item.carrierName }}:</td>
+            </tr>
+          </table>
+        </div>
+
+        <div class="tableBody">
+          <!-- tablePart1 -->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="margin-top: 0px; font-family: FangSong; line-height: 40px"
+            width="1000px"
+            class="tablePart1"
+          >
+            <tr>
+              <th style="width: 1.1%"></th>
+              <th style="width: 20.5%">
+                <!-- &nbsp;&nbsp;&nbsp;&nbsp; 兹委任{{ item.carrierName }}有限公司
+                代表我司到贵港办理:海轮"{{ item.foreignShipName }}"{{
+                  item.numberOfLoans
+                }}湿吨
+                {{
+                  item.materialName
+                }}的提货、数量、清场、交接等相关事宜。恳请给予办理为盼!
+                谢谢!(传真件与原件具有同等法律效应)。 -->
+                感谢贵司对我司的大力支持！
+              </th>
+            </tr>
+          </table>
+
+          <!-- tablePart2 -->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="border-top: 0px; font-family: FangSong; line-height: 40px"
+            width="1000px"
+            class="tablePart2"
+          >
+            <tr>
+              <th style="width: 1.1%"></th>
+              <th style="width: 20.5%">
+                现我司已安排船舶到贵港提运 {{ item.numberOfLoans }}吨{{
+                  item.materialName
+                }}:
+              </th>
+            </tr>
+          </table>
+
+          <!-- tablePart3 -->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            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.capacityBookingNumber }}航次,吨位:{{
+                  item.instruct
+                }}吨,船电:
+                {{ item.capacityTel }}
+              </th>
+            </tr>
+          </table>
+
+          <!-- tablePart4 -->
+          <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            style="border-top: 0px; font-family: FangSong; line-height: 40px"
+            width="1000px"
+            class="tablePart4"
+          >
+            <tr>
+              <th style="width: 0.8%"></th>
+              <th style="width: 7.5%">中转港:{{item.transitPort}}</th>
+              <th style="width: 7.5%">目的港:{{item.arriveName}}</th>
+            </tr>
+          </table>
+
+          <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            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.year }}年{{item.month}}月{{item.date}}日抵达贵港
+              </th>
+            </tr>
+          </table>
+
+          <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            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%">望贵司能够积极配合与支持</th>
+            </tr>
+          </table>
+
+
+          <!-- tablePart4 -->
+          <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            style="border-top: 0px; line-height: 40px"
+            width="1000px"
+            class="tablePart4"
+          >
+            <tr>
+              <th style="width: 0.65%"></th>
+              <th style="width: 12.5%; font-family: FangSong">顺祝</th>
+            
+            </tr>
+          </table>
+
+
+          <!-- 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
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="
+              margin: auto;
+              margin-top: 5px;
+              font-size: 25px;
+              font-family: FangSong;
+              line-height: 40px;
+            "
+            width="1000px"
+            class="tablePart6"
+          >
+            <tr></tr>
+            <tr>
+              <td style="width: 38%"></td>
+            </tr>
+            <tr>
+              <td style="width: 38%"></td>
+            </tr>
+            <tr>
+              <td style="width: 38%"></td>
+            </tr>
+            <tr>
+              <td style="width: 38%"></td>
+            </tr>
+            <th style="width: 50px"></th>
+            <th style="width: 50px"></th>
+            <td style="width: 50px"></td>
+            <td style="width: 50px"></td>
+            <td style="width: 50px"></td>
+            <td style="width: 35%">{{ item.shipperName }}</td>
+          </table>
+        </div>
+        <div>
+          <!-- tablePart7 -->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="
+              margin: auto;
+              margin-top: 5px;
+              font-size: 25px;
+              font-family: FangSong;
+              line-height: 40px;
+            "
+            width="1000px"
+            class="tablePart7"
+          >
+            <tr>
+              <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>
+      </div>
+    </div>
+    <div class="buttns">
+      <el-button class="buttn" type="primary" @click="getPdf()">
+        <i class="el-icon-download">{{ "\xa0\xa0" }}</i
+        >导出(装船指令pdf)
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import table from "@/components/DilCommonUI/packages/table/src/table.vue";
+import PageTitle from "@/components/Page/Title";
+export default {
+  components: { table },
+  components: { PageTitle },
+  name: "Login",
+  data() {
+    return {
+      shipmentInstructionLists: [],
+      htmlTitle: "装船通知单",
+    };
+  },
+  created() {
+    this.getwts();
+  },
+  methods: {
+    backScan() {
+      this.$router.go(-2);
+    },
+    getwts() {
+      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) => {
+        e.year = e.instructionTime.split("-")[0];
+        e.month = e.instructionTime.split("-")[1];
+        e.date = e.instructionTime.split("-")[2].split(" ")[0];
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.title {
+  text-align: center;
+  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;
+    margin-left: 25%;
+    border-top: solid #00050b 1px;
+  }
+}
+.buttns {
+  display: flex;
+  flex-wrap: nowrap;
+  margin-top: 25px;
+  margin-left: 465px;
+  .buttn {
+    margin-left: 10px;
+    width: 270px;
+  }
+}
+.tableBody {
+  table,
+  th,
+  td {
+    border: 0px solid black;
+    font-size: 25px;
+    margin: auto;
+  }
+  .tablePart1 th {
+    border-top: 0px solid black;
+  }
+  .tablePart2 td,
+  th {
+    border-top: 0px;
+  }
+  .tablePart3 td,
+  th {
+    border-top: 0px;
+  }
+  .tablePart4 td,
+  th {
+    border-top: 0px;
+  }
+  .tablePart5 td,
+  th {
+    border-top: 0px;
+  }
+  .tablePart8 td,
+  th {
+    border-top: 0px;
+  }
+}
+.luokuan {
+  margin-top: 150px !important;
+}
+.blank {
+  width: 100%;
+  height: 50px;
+}
+</style>

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

@@ -18,14 +18,22 @@
       <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(宁波光明码头)
+      </el-button>
+      <el-button
+        type="primary"
+        class="btn2"
+        @click="addPierPick"
+        v-if="activeName === 'second'"
       >
         <i class="el-icon-circle-plus-outline"></i>生成装船指令PDF
       </el-button>
@@ -117,18 +125,27 @@ export default {
         this.$message.warning("请勾选已下发的装船指令,方可生成装船通知书");
         return;
       }
-      // if (this.shipmentInstructionList.instructions = null) {
-      //   this.$message.warning("装船通知书暂时针对");
-      //   return;
-      // }
       let shipmentInstructionList = {
         shipmentInstructionList: this.shipmentInstructionList,
       };
-      // console.log("list", shipmentInstructionList);
       let test = encodeURIComponent(JSON.stringify(shipmentInstructionList));
-      console.log("test",test);
       this.$router.push("/shipmentInstructionText/" + test);
     },
+    //生成宁波码头有限公司装船通知单
+    addPierPick() {
+      if (this.shipmentInstructionList.length == 0) {
+        this.$message.warning("请勾选已下发的装船指令,方可生成装船通知书");
+        return;
+      }
+      let shipmentInstructionList = {
+        shipmentInstructionList: this.shipmentInstructionList,
+      };
+      let jsonForPier = encodeURIComponent(
+        JSON.stringify(shipmentInstructionList)
+      );
+      this.$router.push("/shipmentInstructionForPierText/" + jsonForPier);
+    },
+
     handleClick(tab, event) {
       console.log(tab, event);
     },
@@ -252,9 +269,9 @@ export default {
           });
         });
     },
-    refresh(){
+    refresh() {
       this.$router.go(0);
-    }
+    },
   },
 };
 </script>
@@ -267,7 +284,15 @@ export default {
       margin-right: 40rpx;
     }
     .btn {
-      width: 12%;
+      width: 15%;
+      margin-left: 0.25rem;
+    }
+    .btn2 {
+      width: 15%;
+      margin-left: 0.25rem;
+    }
+    .btn3 {
+      width: 18%;
       margin-left: 0.25rem;
     }
   }

src/views/TMS/router/index.js

@@ -209,6 +209,7 @@ import mineralTareResult from "../components/importedMineral/transportExcute/tar
 import mineralUnload from "../components/importedMineral/transportExcute/unload.vue";
 import mineralQuality from "../components/importedMineral/transportExcute/qualityResult.vue";
 import shipmentInstructionText from "../components/importedShip/shipmentInstructionText.vue";
+import shipmentInstructionForPierText from "../components/importedShip/shipmentInstructionForPierText.vue";
 
 import addWagonLoadCopy from "../components/importedMine/addWagonloadCopy.vue";
 import outBoundWagon from "../components/importedMine/outBoundWagon.vue";
@@ -953,6 +954,13 @@ const constantRouterMap = [
         component: shipmentInstructionText
       },
 
+      {
+        path: "shipmentInstructionForPierText/:text",
+        name: "shipmentInstructionForPierText",
+        meta: { code: "xtpzgl-yhgl" },
+        component: shipmentInstructionForPierText
+      },
+
       {
         path: "assignmentPlan",
         name: "assignmentPlan",