Browse Source

代理箱 打开加载缓慢,检索条件代理名称增加分页
控制一下,先选POD场站,再选联系人
POD场站/空箱返场,如果场站没有维护联系人,再次选择的时候,清空

Qukatie 6 days ago
parent
commit
03302687af

+ 3 - 0
src/router/axios.js

@@ -79,6 +79,9 @@ axios.interceptors.response.use(res => {
   if (statusWhiteList.includes(status)) return Promise.reject(res);
   //如果是401则跳转到登录页面
   if (status === 401) store.dispatch('FedLogOut').then(() => router.push({ path: '/login' }));
+  if (status === 601) {
+      return res
+  }
   // 如果请求为非200否者默认统一处理
   if (status !== 200) {
     Message({

File diff suppressed because it is too large
+ 550 - 246
src/views/boxManagement/agentBox/detailsPage.vue


+ 3 - 2
src/views/boxManagement/agentBox/index.vue

@@ -113,11 +113,12 @@ export default {
             type: "select",
             filterable: true,
             remote: true,
-            dicUrl: "/api/blade-los/bcorps/listAll?status=0&corpTypeName=国内同行及代理,国外同行及代理&cnName={{key}}",
+            dicUrl: "/api/blade-los/bcorps/listByType?status=0&current=1&size=5&corpTypeName=国内同行及代理,国外同行及代理&cnName={{key}}",
             props: {
               label: "shortName",
               value: "shortName",
-              desc: "code"
+              desc: "code",
+              res: 'data.records'
             }
           },
           {

+ 4 - 2
src/views/boxManagement/containerNumber/detailsPage.vue

@@ -63,8 +63,9 @@
               placeholder="代理名称"
               key="id"
               label="shortName"
+              res="records"
               :disabled="editDisabled"
-              url="/blade-los/bcorps/listAll?status=0&corpTypeName=国内同行及代理,国外同行及代理"
+              url="/blade-los/bcorps/listByType?status=0&current=1&size=5&corpTypeName=国内同行及代理,国外同行及代理"
               :filterable="true"
               :remote="true"
               dataName="shortName"
@@ -420,7 +421,8 @@
               placeholder="代理名称"
               key="id"
               label="shortName"
-              url="/blade-los/bcorps/listAll?status=0&corpTypeName=国内同行及代理,国外同行及代理"
+              res="records"
+              url="/blade-los/bcorps/listByType?status=0&current=1&size=5&corpTypeName=国内同行及代理,国外同行及代理"
               :filterable="true"
               :remote="true"
               dataName="shortName"

+ 5 - 0
src/views/boxManagement/podComeback/index.vue

@@ -57,6 +57,7 @@
                 res="records"
                 :url="'/blade-los/bcorpsattn/list?pid=' + podForm.podStationId"
                 :filterable="true"
+                :disabled="!podForm.podStationId"
                 @selectChange="dicChange('podCyContact', $event)"
               ></dic-select>
             </tempalte>
@@ -406,6 +407,10 @@ export default {
           this.podForm.podStationId = row.id;
           this.podForm.podStationCode = row.code;
           this.podForm.podStationEname = row.enName;
+          this.podForm.podCyContact = null;
+          this.podForm.podCyAddress = null;
+          this.podForm.podCyEmail = null;
+          this.podForm.podCyTel = null;
           getBcorpsattnList(1, 20, { pid: row.id }).then(res => {
             if (res.data.data.records.length) {
               this.podForm.podCyContact = res.data.data.records[0].cname;

+ 12 - 12
src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -469,24 +469,24 @@ export default {
         menu: false,
         index: true,
         column: [
-          {
-            label: "放箱号",
-            prop: "containerNumber",
-            width: 100,
-            overHidden: true
-          },
+          // {
+          //   label: "放箱号",
+          //   prop: "containerNumber",
+          //   width: 100,
+          //   overHidden: true
+          // },
           {
             label: "内部放箱号",
             prop: "internalContainerNumber",
             width: 100,
             overHidden: true
           },
-          {
-            label: "放箱号类型",
-            prop: "busType",
-            width: 100,
-            overHidden: true
-          },
+          // {
+          //   label: "放箱号类型",
+          //   prop: "busType",
+          //   width: 100,
+          //   overHidden: true
+          // },
           {
             label: "场站",
             prop: "polStationCname",

+ 99 - 44
src/views/iosBasicData/businessCenter/customerLetter/detailsPage.vue

@@ -2208,51 +2208,106 @@ export default {
         });
       }
       if (name == "生成订单") {
-        if (!this.form.preContainersList.length) {
-          return this.$message.error("集装箱明细不能为空");
-        }
-        if (this.form.status != 3) {
-          for (let item of this.form.preContainersList) {
-            if (!item.id) {
-              return this.$message.error("请保存数据");
-            }
-            // if (!item.srcCostId) {
-            //   return this.$message.error("价格编号不能为空,请提取价格维护价格编号");
-            // }
-            if (Number(item.oceanFreight) < Number(item.salesPrice)) {
-              return this.$message.error("集装箱的海运费低于销售价,请点击运费申请");
+        this.$refs["form"].validate(valid => {
+          console.log(valid, this.form);
+          if (valid) {
+            if (!this.form.preContainersList.length) {
+              return this.$message.error("集装箱明细不能为空");
             }
-            if (!item.cntrTypeCode || !item.quantity) {
-              this.$refs.crud.rowCell(item, item.$index);
-              return this.$message.error("请完善明细信息");
+            if (this.form.status != 3) {
+              for (let item of this.form.preContainersList) {
+                if (!item.id) {
+                  return this.$message.error("请保存数据");
+                }
+                if (Number(item.oceanFreight) < Number(item.salesPrice)) {
+                  return this.$message.error("集装箱的海运费低于销售价,请点击运费申请");
+                }
+                if (!item.cntrTypeCode || !item.quantity) {
+                  this.$refs.crud.rowCell(item, item.$index);
+                  return this.$message.error("请完善明细信息");
+                }
+              }
             }
-          }
-        }
-        this.$confirm("是否生成订单?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          this.form.businessType = "KHTS";
-          this.form.billNoFormat = "KHTS";
-          this.form.businessTypeCode = "KHTS";
-          verificationPrompt(this.form).then(res => {
-            const loading = this.$loading({
-              lock: true,
-              text: "加载中",
-              spinner: "el-icon-loading",
-              background: "rgba(255,255,255,0.7)"
-            });
-            submitBookingCabin(this.form)
-              .then(res => {
-                this.$message.success("操作成功");
-                this.getDetails(this.form.id);
-              })
-              .finally(() => {
-                loading.close();
+            this.$confirm("是否生成订单?", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning"
+            }).then(() => {
+              this.form.businessType = "KHTS";
+              this.form.billNoFormat = "KHTS";
+              this.form.businessTypeCode = "KHTS";
+              verificationPrompt(this.form).then(res => {
+                const loading = this.$loading({
+                  lock: true,
+                  text: "加载中",
+                  spinner: "el-icon-loading",
+                  background: "rgba(255,255,255,0.7)"
+                });
+                submitBookingCabin(this.form)
+                  .then(res => {
+                    this.$message.success("操作成功");
+                    this.getDetails(this.form.id);
+                  })
+                  .finally(() => {
+                    loading.close();
+                  });
               });
-          });
+            });
+          } else {
+            return false;
+          }
         });
+        // this.$refs["form"].validate(valid => {
+        //   if (valid) {
+        //     if (!this.form.preContainersList.length) {
+        //       return this.$message.error("集装箱明细不能为空");
+        //     }
+        //     if (this.form.status != 3) {
+        //       for (let item of this.form.preContainersList) {
+        //         if (!item.id) {
+        //           return this.$message.error("请保存数据");
+        //         }
+        //         // if (!item.srcCostId) {
+        //         //   return this.$message.error("价格编号不能为空,请提取价格维护价格编号");
+        //         // }
+        //         if (Number(item.oceanFreight) < Number(item.salesPrice)) {
+        //           return this.$message.error("集装箱的海运费低于销售价,请点击运费申请");
+        //         }
+        //         if (!item.cntrTypeCode || !item.quantity) {
+        //           this.$refs.crud.rowCell(item, item.$index);
+        //           return this.$message.error("请完善明细信息");
+        //         }
+        //       }
+        //     }
+        //     this.$confirm("是否生成订单?", {
+        //       confirmButtonText: "确定",
+        //       cancelButtonText: "取消",
+        //       type: "warning"
+        //     }).then(() => {
+        //       this.form.businessType = "KHTS";
+        //       this.form.billNoFormat = "KHTS";
+        //       this.form.businessTypeCode = "KHTS";
+        //       verificationPrompt(this.form).then(res => {
+        //         const loading = this.$loading({
+        //           lock: true,
+        //           text: "加载中",
+        //           spinner: "el-icon-loading",
+        //           background: "rgba(255,255,255,0.7)"
+        //         });
+        //         submitBookingCabin(this.form)
+        //           .then(res => {
+        //             this.$message.success("操作成功");
+        //             this.getDetails(this.form.id);
+        //           })
+        //           .finally(() => {
+        //             loading.close();
+        //           });
+        //       });
+        //     });
+        //   } else {
+        //     return false;
+        //   }
+        // });
       }
       if (name == "一键保存") {
         if (!this.form.preContainersList.length) {
@@ -2565,8 +2620,8 @@ export default {
           submit(this.form)
             .then(res => {
               this.$message.success("保存成功");
-              if(type=='goBack'){
-                 this.$emit("goBack");
+              if (type == "goBack") {
+                this.$emit("goBack");
               }
               this.getDetails(res.data.data.id);
             })
@@ -2751,7 +2806,7 @@ export default {
           type: "warning"
         })
           .then(() => {
-            this.submit("goBack")
+            this.submit("goBack");
           })
           .catch(() => {
             this.$emit("goBack");

+ 5 - 0
src/views/iosBasicData/podStation/index.vue

@@ -55,6 +55,7 @@
                 res="records"
                 :url="'/blade-los/bcorpsattn/list?pid=' + podForm.podStationId"
                 :filterable="true"
+                :disabled="!podForm.podStationId"
                 @selectChange="dicChange('podCyContact', $event)"
               ></dic-select>
             </tempalte>
@@ -365,6 +366,10 @@ export default {
           this.podForm.podStationId = row.id;
           this.podForm.podStationCode = row.code;
           this.podForm.podStationEname = row.enName;
+          this.podForm.podCyContact = null;
+          this.podForm.podCyAddress = null;
+          this.podForm.podCyEmail = null;
+          this.podForm.podCyTel = null;
           getBcorpsattnList(1, 20, { pid: row.id }).then(res => {
             if (res.data.data.records.length) {
               this.podForm.podCyContact = res.data.data.records[0].cname;

Some files were not shown because too many files changed in this diff