09/01

src/utils/axios.js

@@ -16,7 +16,7 @@ export default ({ data }) => {
     function (config) {
       // if (data.url !== "/user/login") {
       //   config.headers["Authorization"] =
-      //     "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IkQ1RTkxMDI5OUU0RURFNUZEM0EwNTJBMEFDRDUzMUQzIiwidHlwIjoiYXQrand0In0.eyJuYmYiOjE2NjE5MjUwNjksImV4cCI6MTY2MTk2ODI2OSwiaXNzIjoiaHR0cDovLzYwLjIwOS4xMjUuMjM4OjM1MTAxIiwiY2xpZW50X2lkIjoiZGp5dXNlciIsInN1YiI6ImQ4NWZkNTkwLWQ5ZjYtNDQxMC05M2ExLWY2ZmFjNzdiNjA2ZSIsImF1dGhfdGltZSI6MTY2MTkyNTA2OSwiaWRwIjoibG9jYWwiLCJsb2dpbnR5cGUiOiIyIiwibG9naW5pZCI6ImQ4NWZkNTkwLWQ5ZjYtNDQxMC05M2ExLWY2ZmFjNzdiNjA2ZSIsImp0aSI6IjE5NTk1MDE4NkU1MTJDNUM5RjRBNUNGNkJFREE4MUIyIiwiaWF0IjoxNjYxOTI1MDY5LCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwib2ZmbGluZV9hY2Nlc3MiXSwiYW1yIjpbIjIiXX0.VnujZ706in-B_ESjGexiY1eodTej9BHsPYdJTm5nI57xCn4-YCeWlNPIiB3OQX5oiIBuZzUGvUDJEAHdIKkQV2rdjO3tnkc0Lq3Ioyz40QAE57weRY_ufQkZtrrUveUVKnjFqt5oI9mV7Xk-Z2XBji6gP9AziYb9bSTOFRXGGMTA1ZsdYm2HIPV0Mc7c811bhmExea6YPYIrMda9sEj8VoXFbmdS1Cr6bvcSxqoscfVcA3MYaZuUDaNyCxvaL312tt1DjFC3V-c17OmRYWFNzJ6FAJpP1G_xG0HKG--pFQnifdv4oiNMa0JzwgZNwDvp3hmI3eTsALCypAU3XSilnQ";
+      //     "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IkQ1RTkxMDI5OUU0RURFNUZEM0EwNTJBMEFDRDUzMUQzIiwidHlwIjoiYXQrand0In0.eyJuYmYiOjE2NjE5OTk0NjAsImV4cCI6MTY2MjA0MjY2MCwiaXNzIjoiaHR0cDovLzYwLjIwOS4xMjUuMjM4OjM1MTAxIiwiY2xpZW50X2lkIjoiZGp5dXNlciIsInN1YiI6ImQ4NWZkNTkwLWQ5ZjYtNDQxMC05M2ExLWY2ZmFjNzdiNjA2ZSIsImF1dGhfdGltZSI6MTY2MTk5OTQ2MCwiaWRwIjoibG9jYWwiLCJsb2dpbnR5cGUiOiIyIiwibG9naW5pZCI6ImQ4NWZkNTkwLWQ5ZjYtNDQxMC05M2ExLWY2ZmFjNzdiNjA2ZSIsImp0aSI6IkI2NkI3MjE3RUMyRTQzQUUzRjIyOERGREQ3RUU2QzE3IiwiaWF0IjoxNjYxOTk5NDYwLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwib2ZmbGluZV9hY2Nlc3MiXSwiYW1yIjpbIjIiXX0.TLgjeDFWxxESnQ-4E1wxNiWpYAss4m2vB_RNVHKlBk3pP3EzBT-EqDVlZDGRYKCFiQ1AWmo6NFEdE7gn_1ATmJ_cnawS2Us1W028wAtP9IkImjWzCY8DL1bNXBdQZ2mJBAdbkfHRQht2mliRwOYLArXfJjZJ_XOW6HwCzuhEC4ic6o4ziJtCY9_rJPaOkI80unzMvaN_F2_AQ4d4pTD3ofQzyV4DiMKpVgTt24q8Dou_7qhROQWDRcEsBXHIaO6Pb3w8aYO1pJdaXPwt-29zTWeMX5BVFN-5zHrCvgrOs2eQRp6b-uvQuUc-Cx1xxdbSXPdhEteDs_pC_iQBar6e7w";
       // }
       return config;
     },

src/views/ISF/Edit5.vue

@@ -175,7 +175,6 @@
               label="公司ID"
               prop="companyId"
               :rules="[
-                { required: true, message: '请填写 ID' },
                 {
                   validator: (rule, value, callback) => {
                     CheckCompanyId(rule, value, callback, 'ST');
@@ -428,7 +427,6 @@
               label="公司ID"
               prop="companyId"
               :rules="[
-                { required: true, message: '请填写 ID' },
                 {
                   validator: (rule, value, callback) => {
                     CheckCompanyId(rule, value, callback, 'BKP');
@@ -726,8 +724,8 @@ export default {
         shipmentTypeCode: [{ required: true, message: "请选择船运货物类型" }],
       },
       rules1: {
-        idTypeCode: [{ required: true, message: "请选择ID类型" }],
-        companyId: [{ required: true, message: "请填写 ID" }],
+        // idTypeCode: [{ required: true, message: "请选择ID类型" }],
+        // companyId: [{ required: true, message: "请填写 ID" }],
         companyName: [{ required: true, message: "请填写名称" }],
         address: [{ required: true, message: "请填写详细地址" }],
         countryCode: [{ required: true, message: "请选择国家" }],
@@ -880,6 +878,7 @@ export default {
       this.$refs.CompanyIdDialog.FnOpen();
     },
     CheckCompanyId(rule, value, callback, type) {
+      console.log(rule, value, callback, type);
       let FnRegular = (regular) => {
         if (regular.test(value)) {
           callback();
@@ -887,26 +886,30 @@ export default {
           callback(new Error("ID与ID类型不匹配，请检查。"));
         }
       };
-      switch (this.form.companyListBackup[type].idTypeCode) {
-        case "EI":
-          // NN-NNNNNNN
-          FnRegular(/\d{2}-\d{7}$/);
-          break;
-        case "ANI":
-          // YYDDPP-NNNNN
-          FnRegular(/\d{6}-\d{5}$/);
-          break;
-        case "CBP Encrypted NO.":
-          // CCCCCCCCCCC
-          FnRegular(/^[A-Z]{11}$/i);
-          break;
-        case "SSN":
-          // NNN-NN-NNNN
-          FnRegular(/\d{3}-\d{2}-\d{4}$/);
-          break;
-        default:
-          callback();
-          break;
+      if (value != "") {
+        switch (this.form.companyListBackup[type].idTypeCode) {
+          case "EI":
+            // NN-NNNNNNN
+            FnRegular(/\d{2}-\d{7}$/);
+            break;
+          case "ANI":
+            // YYDDPP-NNNNN
+            FnRegular(/\d{6}-\d{5}$/);
+            break;
+          case "CBP Encrypted NO.":
+            // CCCCCCCCCCC
+            FnRegular(/^[A-Z]{11}$/i);
+            break;
+          case "SSN":
+            // NNN-NN-NNNN
+            FnRegular(/\d{3}-\d{2}-\d{4}$/);
+            break;
+          default:
+            callback();
+            break;
+        }
+      } else {
+        callback();
       }
     },
     GetData() {

src/views/send/Edit10.vue

@@ -226,6 +226,7 @@
                   v-model="form.mblno"
                   placeholder="SCAC+HBLNO，例如：NIAV0000001"
                   @keyup.native="keyUpMblno"
+                  :disabled="form.EditType == '修改' ? true : false"
                 ></el-input>
               </el-form-item>
             </el-col>

src/views/send/Edit5.vue

@@ -227,6 +227,7 @@
                   v-model="form.mblno"
                   placeholder="SCAC+HBLNO，例如：NIAV0000001"
                   @keyup.native="keyUpMblno"
+                  :disabled="form.EditType == '修改' ? true : false"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -321,7 +322,6 @@
               label="公司ID"
               prop="companyId"
               :rules="[
-                { required: true, message: '请填写 ID' },
                 {
                   validator: (rule, value, callback) => {
                     CheckCompanyId(rule, value, callback, 'ST');
@@ -575,7 +575,6 @@
               label="公司ID"
               prop="companyId"
               :rules="[
-                { required: true, message: '请填写 ID' },
                 {
                   validator: (rule, value, callback) => {
                     CheckCompanyId(rule, value, callback, 'BKP');
@@ -1034,26 +1033,30 @@ export default {
           callback(new Error("ID与ID类型不匹配，请检查。"));
         }
       };
-      switch (this.form.companyListBackup[type].idTypeCode) {
-        case "EI":
-          // NN-NNNNNNN
-          FnRegular(/\d{2}-\d{7}$/);
-          break;
-        case "ANI":
-          // YYDDPP-NNNNN
-          FnRegular(/\d{6}-\d{5}$/);
-          break;
-        case "CBP Encrypted NO.":
-          // CCCCCCCCCCC
-          FnRegular(/^[A-Z]{11}$/i);
-          break;
-        case "SSN":
-          // NNN-NN-NNNN
-          FnRegular(/\d{3}-\d{2}-\d{4}$/);
-          break;
-        default:
-          callback();
-          break;
+      if (value != "") {
+        switch (this.form.companyListBackup[type].idTypeCode) {
+          case "EI":
+            // NN-NNNNNNN
+            FnRegular(/\d{2}-\d{7}$/);
+            break;
+          case "ANI":
+            // YYDDPP-NNNNN
+            FnRegular(/\d{6}-\d{5}$/);
+            break;
+          case "CBP Encrypted NO.":
+            // CCCCCCCCCCC
+            FnRegular(/^[A-Z]{11}$/i);
+            break;
+          case "SSN":
+            // NNN-NN-NNNN
+            FnRegular(/\d{3}-\d{2}-\d{4}$/);
+            break;
+          default:
+            callback();
+            break;
+        }
+      } else {
+        callback();
       }
     },
     GetData() {

src/views/send/List.vue

@@ -96,8 +96,8 @@
         <template slot-scope="scope">
           <span v-if="scope.row.mateState == 'S1'">ISF和AMS匹配</span>
           <span v-else-if="scope.row.mateState == 'S2'">未匹配AMS</span>
-          <span v-else-if="scope.row.mateState == '01'">海关已接受</span>
-          <span v-else-if="scope.row.mateState == '02'">海关已拒绝</span>
+          <span v-else-if="scope.row.mateState == '01'">海关已拒绝</span>
+          <span v-else-if="scope.row.mateState == '02'">海关已接受</span>
           <span v-else>{{ scope.row.mateState }}</span>
         </template>
       </el-table-column>
@@ -302,7 +302,7 @@ export default {
             ...scope.row,
             EditType: "修改",
           };
-        }else if (type == "复制") {
+        } else if (type == "复制") {
           this.GetList();
           let DelArr = ["gid", "isDel", "pid", "hid", "hblNo", "mblno"];
           let data = scope.row;