修改计量委托导出

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()"
+      <el-button
+        type="primary"
+        @click="exportData()"
+        v-if="activeName == 'second'"
         ><i class="el-icon-download"></i>导出(Excel)</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>

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

@@ -22,10 +22,10 @@
         <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
       >
     </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">

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

@@ -23,10 +23,10 @@
         <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
       >
     </div>
-
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="待计量" name="first">
         <dilTable
@@ -41,6 +41,7 @@
           ref="excelDom"
           v-bind.sync="option2"
           @selection-change="selectionChange2"
+          v-if="activeName == 'second'"
         >
         </dilTable>
       </el-tab-pane>

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/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/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/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/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>