修改刷新

src/views/TMS/components/domesticMine/entrustMine.vue

@@ -21,9 +21,12 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" @click="exportData()"
-        ><i class="el-icon-download"></i>导出(Excel)</el-button
-      >
+      <el-button type="primary" @click="exportData()">
+        <i class="el-icon-download"></i>导出(Excel)
+      </el-button>
+       <el-button type="primary" @click="refresh()">
+        <i class="el-icon-refresh"></i>刷新
+      </el-button>
     </div>
 
     <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -137,6 +140,9 @@ export default {
       console.log(selection);
       this.selectionListMap2 = selection;
     },
+    refresh(){
+      this.$router.go(0);
+    }
   },
 };
 </script>

src/views/TMS/components/importedEmergency/entrustEmergency.vue

@@ -24,6 +24,9 @@
       <el-button type="primary" @click="exportData()"
         ><i class="el-icon-download"></i>导出(Excel)</el-button
       >
+       <el-button type="primary" @click="refresh()">
+        <i class="el-icon-refresh"></i>刷新
+      </el-button>
     </div>
 
     <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -137,6 +140,9 @@ export default {
       console.log(selection);
       this.selectionListMap2 = selection;
     },
+    refresh(){
+      this.$router.go(0);
+    }
   },
 };
 </script>

src/views/TMS/components/importedMine/entrust.vue

@@ -25,6 +25,9 @@
       <el-button type="primary" @click="exportData()"
         ><i class="el-icon-download"></i>导出(Excel)</el-button
       >
+       <el-button type="primary" @click="refresh()">
+        <i class="el-icon-refresh"></i>刷新
+      </el-button>
     </div>
 
     <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -145,6 +148,9 @@ export default {
       console.log(selection);
       this.selectionListMap2 = selection;
     },
+    refresh(){
+      this.$router.go(0);
+    }
   },
 };
 </script>

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

@@ -15,6 +15,9 @@
       <el-button type="primary" class="btn" @click="addclick">
         <i class="el-icon-circle-plus-outline"></i>新增
       </el-button>
+      <el-button type="primary" @click="refresh()">
+        <i class="el-icon-refresh"></i>刷新
+      </el-button>
     </div>
     <dilTable v-bind.sync="option">
       <el-table-column fixed="right" label="操作" align="center" width="100">
@@ -97,6 +100,9 @@ export default {
             message: "取消删除!"
           });
         });
+    },
+    refresh(){
+      this.$router.go(0);
     }
   }
 };

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

@@ -15,6 +15,9 @@
       <el-button type="primary" class="btn" @click="addclick">
         <i class="el-icon-circle-plus-outline"></i>新增
       </el-button>
+       <el-button type="primary" @click="refresh()">
+        <i class="el-icon-refresh"></i>刷新
+      </el-button>
     </div>
     <dilTable v-bind.sync="option">
       <el-table-column fixed="right" label="操作" align="center" width="100">
@@ -83,6 +86,9 @@ export default {
             message: "取消删除!"
           });
         });
+    },
+    refresh(){
+      this.$router.go(0);
     }
   }
 };

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

@@ -7,6 +7,9 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
+      <el-button type="primary" @click="refresh()">
+        <i class="el-icon-refresh"></i>刷新
+      </el-button>
     </div>
     <el-table :data="selectionList" border highlight-current-row>
       <el-table-column type="index" width="50" label="序号" align="center">
@@ -217,6 +220,9 @@ export default {
           this.initialization();
         }
       });
+    },
+    refresh(){
+      this.$router.go(0);
     }
   }
 };

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

@@ -1,5 +1,5 @@
 <template>
-  <!-- 水路货物运单页面 -->
+  <!-- 装船作业明细页面 -->
   <div class="shipTransport">
     <div class="top">
 
@@ -7,6 +7,9 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
+      <el-button type="primary" @click="refresh()">
+        <i class="el-icon-refresh"></i>刷新
+      </el-button>
     <dilTable v-bind.sync="option">
     </dilTable>
   </div>
@@ -35,6 +38,9 @@ export default {
     btnclick(pathId) {
       this.$router.push("/path/addHomeworkPath/" + pathId);
     },
+    refresh(){
+      this.$router.go(0);
+    }
   },
 };
 </script>

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

@@ -14,6 +14,9 @@
       </el-button>
       <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()">
+        <i class="el-icon-refresh"></i>刷新
       </el-button>
       <el-button
         type="primary"
@@ -210,6 +213,9 @@ export default {
           });
         });
     },
+    refresh(){
+      this.$router.go(0);
+    }
   },
 };
 </script>

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

@@ -15,6 +15,9 @@
       <el-button type="primary" class="btn" @click="addclick">
         <i class="el-icon-circle-plus-outline"></i>新增
       </el-button>
+      <el-button type="primary" @click="refresh()">
+        <i class="el-icon-refresh"></i>刷新
+      </el-button>
     </div>
     <dilTable v-bind.sync="option">
       <el-table-column fixed="right" label="操作" align="center" width="100">
@@ -87,6 +90,9 @@ export default {
             message: "取消删除!"
           });
         });
+    },
+    refresh(){
+      this.$router.go(0);
     }
   }
 };

src/views/appoint/components/ship/addDeliveryAttorney.vue

@@ -53,7 +53,7 @@
     <!-- 确定和取消 -->
     <div class="button_box">
       <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="makeSure">确定</el-button>
+      <el-button type="primary" @click="makeSure" :loading="isLoading">确定</el-button>
     </div>
     <!-- 模态框 -->
     <el-drawer
@@ -92,12 +92,13 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      isLoading:false,
       input: "",
-      carrierId:"",//承运单位id
+      carrierId:null,//承运单位id
       carriers:[],
-      downSwimPortId:"",//提货单位id
+      downSwimPortId:null,//提货单位id
       downSwimPorts:[],
-      portId:"",//到达港id
+      portId:null,//到达港id
       ports:[],
       drawer: false,
       direction: "rtl",
@@ -206,9 +207,11 @@ export default {
     },
     // 确定
     makeSure() {
+      this.isLoading=true;
       // 判断用户是否输入了批次号
       if (this.batchIds == "" || this.batchIds == undefined) {
         this.$message.warning("请选择批次号");
+        this.isLoading=false;
         return;
       }
       let AmsshipDeliveryAttorney = {
@@ -257,17 +260,19 @@ export default {
       var val3 = this.value3;
 
       if (
-        // AmsshipDeliveryAttorney.attorneyId==null||
-        // AmsshipDeliveryAttorney.downSwimPortId == null ||
+        typeof AmsshipDeliveryAttorney.portId =='undefined' || AmsshipDeliveryAttorney.portId==null||
+        typeof AmsshipDeliveryAttorney.downSwimPortId =='undefined' ||  AmsshipDeliveryAttorney.downSwimPortId == null || 
+        typeof AmsshipDeliveryAttorney.requesterGroupId =='undefined' ||  AmsshipDeliveryAttorney.requesterGroupId == null ||
         AmsshipDeliveryAttorney.attorenyPickupIdcard == null ||
         AmsshipDeliveryAttorney.attorneyContactTelephone == null ||
         AmsshipDeliveryAttorney.attorneyPickupContactPerson == null
       )
         this.$message.error("存在空值,请核实以后再提交");
-      else if (!isTelePhone(val2)) this.$message.warning("联系电话格式不正确");
+      else if (!isTelePhone(val2)) 
+        this.$message.warning("联系电话格式不正确");
       else if (!checkCardNo(val3))
         this.$message.warning("请输入正确的身份证格式");
-      else
+      else{
         this.axios
           .post(
             "/api/v1/tms/insertshipDeliveryAttorney",
@@ -279,15 +284,18 @@ export default {
                 type: "success",
                 message: "新增成功",
               });
+              this.cancel();
             } else {
               this.$message({
                 type: "warning",
                 message: res.data.data,
               });
             }
-              this.$router.go(-1);
+             this.isLoading=false;
             
           });
+      }
+      this.isLoading=false;
     },
     // 取消
     cancel() {

src/views/appoint/components/ship/addDeliveryNotice.vue

@@ -178,7 +178,7 @@
     <!-- 确定和取消 -->
     <div class="button_box">
       <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="makeSure">确定</el-button>
+      <el-button type="primary" @click="makeSure" :loading="isLoading">确定</el-button>
     </div>
   </div>
 </template>
@@ -191,10 +191,11 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      isLoading:false,
       a: 1,
       cargoPictureUrl: "",
       shippingCertificate: "",
-      portId:"",
+      portId:null,
       ports:[],
       materialType: "",
       receiver: "",
@@ -349,16 +350,20 @@ export default {
       //   this.$message.warning("请选择送达单位");
       //   return;
       // }
+      this.isLoading=true;
       if (this.second2.mapList3.length == 0) {
         this.$message.warning("请选择收货人");
+        this.isLoading=false;
         return;
       }
       if (this.second3.mapList4.length == 0) {
         this.$message.warning("请选择物资品类");
+        this.isLoading=false;
         return;
       }
       if (this.second5.mapList5.length == 0) {
         this.$message.warning("请选择批次");
+        this.isLoading=false;
         return;
       }
 
@@ -428,7 +433,7 @@ export default {
         map.resultContactPerson == null ||
         map.resultTelephoneFax == null ||
         map.resultNumberOfLoans == null ||
-       //map.carrierId == null ||
+        map.portId == null ||
         map.groupId == null ||
         map.inFactoryShipName == null ||
         map.isNeedPortDisCharge == null ||
@@ -437,10 +442,12 @@ export default {
         // map.materialId==null
       ) {
         this.$message.error("存在空值！");
+        this.isLoading=false;
         return;
       }
       if (!isTelePhone(val2)) {
         this.$message.warning("电话号码或传真格式不正确");
+        this.isLoading=false;
         return;
       }
       if (
@@ -448,6 +455,7 @@ export default {
         !isNumber(map.noticePortConstructionFee)
       ) {
         this.$message.error("港建费金额得为数字");
+        this.isLoading=false;
         return;
       }
       if (
@@ -455,6 +463,7 @@ export default {
         !isNumber(map.purchaseContractMoisture)
       ) {
         this.$message.error("合同水分得为数字");
+        this.isLoading=false;
         return;
       }
       if (
@@ -462,6 +471,7 @@ export default {
         !isNumber(map.noticePortConstructionFee)
       ) {
         this.$message.error("港建费金额得为数字");
+        this.isLoading=false;
         return;
       }
       if (
@@ -469,6 +479,7 @@ export default {
         !isNumber(map.noticePileFreeDays)
       ) {
         this.$message.error("免堆天数得为数字");
+        this.isLoading=false;
         return;
       }
 
@@ -477,10 +488,12 @@ export default {
         !isNumber(map.purchaseContractUnitPrice)
       ) {
         this.$message.error("单价得为数字");
+        this.isLoading=false;
         return;
       }
       if (typeof map.tfeContent != "undefined" && !isNumber(map.tfeContent)) {
         this.$message.error("tfe含量得为数字");
+        this.isLoading=false;
         return;
       }
       if (
@@ -488,6 +501,7 @@ export default {
         !isNumber(map.silicaContent)
       ) {
         this.$message.error("二氧化硅含量得为数字");
+        this.isLoading=false;
         return;
       }
       if (
@@ -495,6 +509,7 @@ export default {
         !isNumber(map.aluminaContent)
       ) {
         this.$message.error("氧化铝含量得为数字");
+        this.isLoading=false;
         return;
       }
       if (
@@ -502,6 +517,7 @@ export default {
         !isNumber(map.phosphorusContent)
       ) {
         this.$message.error("含磷量得为数字");
+        this.isLoading=false;
         return;
       }
       if (
@@ -509,6 +525,7 @@ export default {
         !isNumber(map.resultNumberOfLoans)
       ) {
         this.$message.error("放货数量得为数字");
+        this.isLoading=false;
         return;
       } else
         this.axios.post("/api/v1/tms/insertDeliveryNotice", map).then((res) => {
@@ -517,13 +534,14 @@ export default {
               type: "success",
               message: "新增成功",
             });
+            this.cancel();
           } else {
             this.$message({
               type: "warning",
               message: res.data.data,
             });
           }
-          this.$router.go(-1);
+          this.isLoading=false;
         });
     },
     // 取消

src/views/appoint/components/ship/deliveryAttorney.vue

@@ -15,6 +15,9 @@
       </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()">
+        <i class="el-icon-refresh"></i>刷新
       </el-button>
       <el-button
         type="primary"
@@ -195,6 +198,9 @@ export default {
             message: "下发失败!"
           });
         });
+    },
+    refresh(){
+      this.$router.go(0);
     }
   }
 };

src/views/appoint/components/ship/deliveryNotice.vue

@@ -9,6 +9,9 @@
       <el-button type="primary" class="btn" @click="addClick">
         <i class="el-icon-circle-plus-outline"></i>新增
       </el-button>
+      <el-button type="primary" @click="refresh()">
+        <i class="el-icon-refresh"></i>刷新
+      </el-button>
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <!-- 未下发 -->
@@ -167,6 +170,9 @@ export default {
             message: "取消下发!"
           });
         });
+    },
+    refresh(){
+      this.$router.go(0);
     }
   }
 };