Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

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

@@ -21,18 +21,29 @@
       <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">
       <el-tab-pane label="待计量" name="first">
-        <dilTable ref="excelDom" v-bind.sync="option" @selection-change="selectionChange">
+        <dilTable
+          ref="excelDom"
+          v-bind.sync="option"
+          @selection-change="selectionChange"
+        >
         </dilTable>
       </el-tab-pane>
       <el-tab-pane label="已计量" name="second">
-        <dilTable ref="excelDom" v-bind.sync="option2" @selection-change="selectionChange2">
+        <dilTable
+          ref="excelDom"
+          v-bind.sync="option2"
+          @selection-change="selectionChange2"
+        >
         </dilTable>
       </el-tab-pane>
     </el-tabs>
@@ -137,6 +148,9 @@ export default {
       console.log(selection);
       this.selectionListMap2 = selection;
     },
+    refresh(){
+      this.$router.go(0);
+    }
   },
 };
 </script>

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

@@ -13,7 +13,7 @@
           <el-button  type="primary">导入车皮号(Excel)</el-button>
       </el-upload>
       <div style="margin-right:200px;">当前导入数量：{{tableData.length}}</div>
-      <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> -->
     </div>
     <div>
       <span style="color:red">导入数据中的 品名、发货单位、车号、发站 是必须的</span>

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

@@ -22,10 +22,13 @@
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" @click="exportData()"
+      v-if="activeName == 'second'"
         ><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">
       <el-tab-pane label="待计量" name="first">
         <dilTable  ref="excelDom" v-bind.sync="option" @selection-change="selectionChange">
@@ -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

@@ -23,10 +23,13 @@
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" @click="exportData()"
+      v-if="activeName == 'second'"
         ><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">
       <el-tab-pane label="待计量" name="first">
         <dilTable
@@ -41,6 +44,7 @@
           ref="excelDom"
           v-bind.sync="option2"
           @selection-change="selectionChange2"
+          v-if="activeName == 'second'"
         >
         </dilTable>
       </el-tab-pane>
@@ -145,6 +149,9 @@ export default {
       console.log(selection);
       this.selectionListMap2 = selection;
     },
+    refresh(){
+      this.$router.go(0);
+    }
   },
 };
 </script>

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

@@ -18,7 +18,7 @@
       </div>
     </div>
     <div class="button_box">
-        <el-button type="primary" @click="makeSure">新增驳船作业</el-button>
+        <el-button type="primary" @click="makeSure" :disable="isLock">新增驳船作业</el-button>
     </div>
   </div>
 </template>
@@ -30,6 +30,7 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      isLock:false,
       input:'',
       restaurants: [],
       state: "",

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

@@ -18,7 +18,12 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin: auto; font-size: 25px;font-family: FangSong;line-height: 50px"
+            style="
+              margin: auto;
+              font-size: 25px;
+              font-family: FangSong;
+              line-height: 50px;
+            "
             width="1000px"
             class="tablePart0"
           >
@@ -33,7 +38,7 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin-top: 5px;font-family: FangSong;line-height: 40px;"
+            style="margin-top: 5px; font-family: FangSong; line-height: 40px"
             width="1000px"
             class="tablePart1"
           >
@@ -56,7 +61,7 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="border-top: 0px;font-family: FangSong;line-height: 40px"
+            style="border-top: 0px; font-family: FangSong; line-height: 40px"
             width="1000px"
             class="tablePart2"
           >
@@ -71,7 +76,7 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="border-top: 0px;font-family: FangSong;line-height: 40px"
+            style="border-top: 0px; font-family: FangSong; line-height: 40px"
             width="1000px"
             class="tablePart3"
           >
@@ -90,23 +95,21 @@
             border="1"
             cellpadding="10"
             cellspacing="0"
-            style="border-top: 0px;font-family: FangSong;line-height: 40px"
+            style="border-top: 0px; font-family: FangSong; line-height: 40px"
             width="1000px"
             class="tablePart4"
           >
             <tr>
               <th style="width: 0.6%"></th>
               <th style="width: 10.5%">船舶联系方式:{{ item.capacityTel }}</th>
-            
             </tr>
           </table>
-        
 
           <table
             border="1"
             cellpadding="10"
             cellspacing="0"
-            style="border-top: 0px;font-family: FangSong;line-height: 40px"
+            style="border-top: 0px; font-family: FangSong; line-height: 40px"
             width="1000px"
             class="tablePart5"
           >
@@ -121,7 +124,7 @@
             border="1"
             cellpadding="10"
             cellspacing="0"
-            style="border-top: 0px;font-family: FangSong;line-height: 40px"
+            style="border-top: 0px; font-family: FangSong; line-height: 40px"
             width="1000px"
             class="tablePart6"
           >
@@ -135,7 +138,7 @@
             border="1"
             cellpadding="10"
             cellspacing="0"
-            style="border-top: 0px;font-family: FangSong;line-height: 40px"
+            style="border-top: 0px; font-family: FangSong; line-height: 40px"
             width="1000px"
             class="tablePart7"
           >
@@ -151,12 +154,18 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin: auto; margin-top: 5px; font-size: 25px;font-family: FangSong;line-height: 40px"
+            style="
+              margin: auto;
+              margin-top: 5px;
+              font-size: 25px;
+              font-family: FangSong;
+              line-height: 40px;
+            "
             width="1000px"
             class="tablePart6"
           >
+            <tr></tr>
             <tr>
-               <tr>
               <td style="width: 38%"></td>
             </tr>
             <tr>
@@ -168,8 +177,12 @@
             <tr>
               <td style="width: 38%"></td>
             </tr>
-              <td style="width: 35%">{{ item.shipperName }}</td>
-          
+            <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>
@@ -178,7 +191,13 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin: auto; margin-top: 5px; font-size: 25px;font-family: FangSong;line-height: 40px"
+            style="
+              margin: auto;
+              margin-top: 5px;
+              font-size: 25px;
+              font-family: FangSong;
+              line-height: 40px;
+            "
             width="1000px"
             class="tablePart7"
           >
@@ -190,7 +209,7 @@
               <th style="width: 3%">月</th>
               <td style="width: 0.5%">{{ item.date }}</td>
               <th style="width: 3%">日</th>
-              <th style="width:7%"></th>
+              <th style="width: 7%"></th>
             </tr>
           </table>
         </div>

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"
@@ -104,11 +107,11 @@ export default {
     },
     addPick() {
       if (this.shipmentInstructionList.length == 0) {
-        this.$message.warning("请勾选已下发的提货委托,方可生成提货委托书");
+        this.$message.warning("请勾选已下发的装船指令,方可生成装船通知书");
         return;
       }
-      // if (this.shipmentInstructionList.instructions != null) {
-      //   this.$message.warning("请勾选已下发的提货委托,方可生成提货委托书");
+      // if (this.shipmentInstructionList.instructions = null) {
+      //   this.$message.warning("装船通知书暂时针对");
       //   return;
       // }
       let shipmentInstructionList = {
@@ -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/addCargoResult.vue

@@ -127,9 +127,6 @@ export default {
     currentRadioChange3(selection) {
       (this.second2.mapList3 = selection), (this.receiver = selection.pierName);
     },
-    
-
-
 
     // 确定git
     makeSure() {

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

@@ -146,7 +146,6 @@
               margin-top: 5px;
               font-size: 25px;
               line-height: 40px;
-              table-layout: fixed;
             "
             width="1000px"
             class="tablePart6"
@@ -164,7 +163,11 @@
               <td style="width: 38%"></td>
             </tr>
             <tr>
-              <th style="width: 50px; border-collapse: collapse"></th>
+              <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: 38%; font-family: FangSong">
                 {{ item.shipperName }}
               </td>

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);
     }
   }
 };

src/views/statisticalReport/components/Ship_dynamic_table.vue

@@ -14,7 +14,7 @@
           <i class="el-icon-search"></i>查询
         </el-button>
         <el-button type="primary" class="btn" @click="getPdfs()">
-          <i class="el-icon-upload2"></i>下载PDF
+          <i class="el-icon-download"></i>下载PDF
         </el-button>
       </div>
       <table-item :tableData="tableData" :col="col" id="pdfDom"> </table-item>