11/02

src/utils/axios.js

@@ -3,8 +3,8 @@ import { Message } from "element-ui";
 export default ({ data }) => {
   let baseURL = "";
   if (data.url == "/user/login") {
-    // baseURL = "http://60.209.125.238:35101"; //测试
-    baseURL = "http://djy-identity.myshipping.net"; //正式
+    baseURL = "http://60.209.125.238:35101"; //测试
+    // baseURL = "http://djy-identity.myshipping.net"; //正式
   } else {
     baseURL = process.env.VUE_APP_AXIOS_BASEURL;
   }
@@ -16,7 +16,7 @@ export default ({ data }) => {
     function (config) {
       // if (data.url !== "/user/login") {
       //   config.headers["Authorization"] =
-      //     "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IkQ1RTkxMDI5OUU0RURFNUZEM0EwNTJBMEFDRDUzMUQzIiwidHlwIjoiYXQrand0In0.eyJuYmYiOjE2NjE5OTk0NjAsImV4cCI6MTY2MjA0MjY2MCwiaXNzIjoiaHR0cDovLzYwLjIwOS4xMjUuMjM4OjM1MTAxIiwiY2xpZW50X2lkIjoiZGp5dXNlciIsInN1YiI6ImQ4NWZkNTkwLWQ5ZjYtNDQxMC05M2ExLWY2ZmFjNzdiNjA2ZSIsImF1dGhfdGltZSI6MTY2MTk5OTQ2MCwiaWRwIjoibG9jYWwiLCJsb2dpbnR5cGUiOiIyIiwibG9naW5pZCI6ImQ4NWZkNTkwLWQ5ZjYtNDQxMC05M2ExLWY2ZmFjNzdiNjA2ZSIsImp0aSI6IkI2NkI3MjE3RUMyRTQzQUUzRjIyOERGREQ3RUU2QzE3IiwiaWF0IjoxNjYxOTk5NDYwLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwib2ZmbGluZV9hY2Nlc3MiXSwiYW1yIjpbIjIiXX0.TLgjeDFWxxESnQ-4E1wxNiWpYAss4m2vB_RNVHKlBk3pP3EzBT-EqDVlZDGRYKCFiQ1AWmo6NFEdE7gn_1ATmJ_cnawS2Us1W028wAtP9IkImjWzCY8DL1bNXBdQZ2mJBAdbkfHRQht2mliRwOYLArXfJjZJ_XOW6HwCzuhEC4ic6o4ziJtCY9_rJPaOkI80unzMvaN_F2_AQ4d4pTD3ofQzyV4DiMKpVgTt24q8Dou_7qhROQWDRcEsBXHIaO6Pb3w8aYO1pJdaXPwt-29zTWeMX5BVFN-5zHrCvgrOs2eQRp6b-uvQuUc-Cx1xxdbSXPdhEteDs_pC_iQBar6e7w";
+      //     "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IkQ1RTkxMDI5OUU0RURFNUZEM0EwNTJBMEFDRDUzMUQzIiwidHlwIjoiYXQrand0In0.eyJuYmYiOjE2NjczNzk3MDMsImV4cCI6MTY2NzQyMjkwMywiaXNzIjoiaHR0cDovLzYwLjIwOS4xMjUuMjM4OjM1MTAxIiwiY2xpZW50X2lkIjoiZGp5dXNlciIsInN1YiI6ImQ4NWZkNTkwLWQ5ZjYtNDQxMC05M2ExLWY2ZmFjNzdiNjA2ZSIsImF1dGhfdGltZSI6MTY2NzM3OTcwMywiaWRwIjoibG9jYWwiLCJsb2dpbnR5cGUiOiIyIiwibG9naW5pZCI6ImQ4NWZkNTkwLWQ5ZjYtNDQxMC05M2ExLWY2ZmFjNzdiNjA2ZSIsImp0aSI6IjBCOUMyNTFBMUU3MzYzQkY0NkNFM0Q1OTA1NUY0RDVEIiwiaWF0IjoxNjY3Mzc5NzAzLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwib2ZmbGluZV9hY2Nlc3MiXSwiYW1yIjpbIjIiXX0.E-saiVHEMAe3yoKsZnnYY7Cs7SHIDPWgVuF4xalb3dDsmvHQekKFCcEMNpNfwotnz27375g2LwHDHxGr5riP4NWQguUxcHSvupkR0SOOjgK753B9ggb2dJB1_91wnfI39GEjkpqaTzOeTO1JkLHtL2FDzQqw-CDoTDgAUyd4U-wvW6oupM-WfRfMc6I5Ecs0bH_Vg6pgZZ-uTeWjAXqja1UR0vIDnv0xjcQ0YcoOOevwcHMoFwWZN_lXsp7PM7LFT36h5pr35BnDjTUB5GaVkXOBsore2Px5R1IowlXxCI8vx7EqIcu4_0KaC0q1XmE4Kr2Lymp4ju_V1f8XAgp-3w";
       // }
       return config;
     },

src/views/ISF/Edit5.vue

@@ -1203,6 +1203,15 @@ export default {
           delete this.form.gid;
         }
         if (this.form.mblno) {
+          if (this.form.inFoType == 1) {
+            let arr = [];
+            this.form.companyList.forEach((item) => {
+              if (item.companyType == "ST" || item.companyType == "BKP") {
+                arr.push(item);
+              }
+            });
+            this.form.companyList = arr;
+          }
           AddOrUpdate(form).then((res) => {
             if (res.data.code == 200) {
               if (!this.form.gid) {

src/views/send/Edit5.vue

@@ -1402,6 +1402,7 @@ export default {
               form.hstCode = `${form.hstCode},${item.hstCode}`;
             }
           });
+          this.form.companyList = [];
           Object.keys(this.form.companyListBackup).forEach((key) => {
             this.form.companyList.push({
               ...this.form.companyListBackup[key],
@@ -1412,6 +1413,15 @@ export default {
             delete this.form.gid;
           }
           if (this.form.mblno) {
+            if (this.form.inFoType == 1) {
+              let arr = [];
+              this.form.companyList.forEach((item) => {
+                if (item.companyType == "ST" || item.companyType == "BKP") {
+                  arr.push(item);
+                }
+              });
+              this.form.companyList = arr;
+            }
             AddOrUpdate(form).then((res) => {
               if (res.data.code == 200) {
                 if (!this.form.gid) {

src/views/send/HistoryList.vue

@@ -83,7 +83,7 @@
       <el-table-column prop="state" label="描述"> </el-table-column>
       <el-table-column prop="state" label="备注"> </el-table-column>
     </el-table> -->
-    <div class="HeaderTitle" style="margin-top: 2rem">
+    <!-- <div class="HeaderTitle" style="margin-top: 2rem">
       <p class="Left">
         <span>操作记录</span>
       </p>
@@ -115,7 +115,70 @@
       </el-table-column>
       <el-table-column prop="state" align="center" label="回执状态">
       </el-table-column>
-    </el-table>
+    </el-table> -->
+    <div class="CsFlex">
+      <div>
+        <h3 class="title">操作记录</h3>
+        <el-table
+          :data="Type0"
+          border
+          style="width: 90%"
+          :header-cell-style="{
+            background: 'rgb(160, 207, 255)',
+            color: '#fff',
+          }"
+          height="530"
+        >
+          <el-table-column
+            prop="sendTime"
+            label="操作时间"
+            width="180"
+            align="center"
+          >
+            <template slot-scope="scope">
+              {{ moment(scope.row.sendTime).format("YYYY-MM-DD HH:mm") }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="state" align="center" label="操作类型">
+          </el-table-column>
+          <el-table-column
+            prop="operator"
+            align="center"
+            label="操作人"
+            width="180"
+          >
+          </el-table-column>
+          <el-table-column prop="remark" align="center" label="备注">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <h3 class="title">回执记录</h3>
+        <el-table
+          :data="Type1"
+          border
+          style="width: 95%"
+          :header-cell-style="{
+            background: 'rgb(160, 207, 255)',
+            color: '#fff',
+          }"
+          height="530"
+        >
+          <el-table-column
+            prop="sendTime"
+            label="回执时间"
+            width="180"
+            align="center"
+          >
+            <template slot-scope="scope">
+              {{ moment(scope.row.sendTime).format("YYYY-MM-DD HH:mm") }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="state" align="center" label="回执内容">
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
   </div>
 </template>
 <script>
@@ -146,6 +209,8 @@ export default {
           value: "ISF-10",
         },
       ],
+      Type0: [],
+      Type1: [],
     };
   },
   computed: {
@@ -157,6 +222,8 @@ export default {
     ListData: {
       immediate: true,
       handler(newData) {
+        this.Type0 = [];
+        this.Type1 = [];
         if (this.$store.state.SendeditableTabsValue != 0) {
           if (!newData.gid) {
             Object.assign(this.$data.form, this.$options.data().form);
@@ -173,6 +240,15 @@ export default {
             delete form.hstCode;
             delete form.companyList;
             this.form = { ...this.form, ...form };
+            this.form.historyDto.forEach((item) => {
+              if (item.type == 0) {
+                // 操作记录
+                this.Type0.push(item);
+              } else {
+                // 回执记录
+                this.Type1.push(item);
+              }
+            });
           }
         }
       },
@@ -210,16 +286,21 @@ export default {
       }
     }
   }
-  .title {
-    width: 100%;
-    height: 3rem;
-    line-height: 3rem;
-    border-radius: 10px;
-    padding-left: 1rem;
-    box-sizing: border-box;
-    background: #409eff;
-    color: #fff;
-    margin-top: 2rem;
+  .CsFlex {
+    width: 95%;
+    margin: 0 auto;
+    display: flex;
+    div {
+      &:first-child {
+        flex: 3;
+      }
+      &:last-child {
+        flex: 2;
+      }
+      .title {
+        margin: 14px 0;
+      }
+    }
   }
 }
 </style>

src/views/send/List.vue

@@ -101,12 +101,12 @@
           <span v-else>{{ scope.row.mateState }}</span>
         </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         prop="SEBKPName"
         label="卖方公司名称/订舱人名称"
         align="center"
       >
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column align="center" prop="compName" label="所属公司">
       </el-table-column>
       <el-table-column align="center" prop="lastUpdate" label="最近编辑时间">
@@ -241,9 +241,18 @@ export default {
       Load(this.search_data).then((res) => {
         this.search_data.total = res.data.count;
         res.data.data.forEach((item) => {
-          Object.keys(item.historyDto[0]).forEach((item2) => {
-            item[`historyDto_${item2}`] = item.historyDto[0][item2];
+          let HArr = [];
+          item.historyDto.forEach((Hitem) => {
+            if (Hitem.type == 0) {
+              HArr.push(Hitem);
+            }
           });
+          if (HArr[0]) {
+            Object.keys(HArr[0]).forEach((item2) => {
+              item[`historyDto_${item2}`] = HArr[0][item2];
+            });
+          }
+
           item.companyList.forEach((item2) => {
             if (item.inFoType == "1" && item2.companyType == "BKP") {
               item["SEBKPName"] = item2.companyName;