Browse Source

1.进口矿新增进口球团品种;2.船舶动态表表头固定。

shxiaoc 1 year ago
parent
commit
da31575bc5

+ 4 - 4
src/views/appoint/components/ship/addDeliveryNotice.vue

@@ -9,7 +9,7 @@
         >浏览</el-button
       >
     </div> -->
-    <!-- 货权转移送达单位 
+    <!-- 货权转移送达单位
     <div class="mofrom">
       <span class="motext">货权转移送达单位</span>
       <el-input class="moinput" v-model="cargo" disabled> </el-input>
@@ -232,7 +232,7 @@ export default {
   data() {
     return {
       isLoading: false,
-      resultMemos:['低富粉','中富粉','高富粉','机精粉','进口块矿'],
+      resultMemos:['低富粉','中富粉','高富粉','机精粉','进口块矿','进口球团'],
       a: 1,
       cargoPictureUrl: "",
       shippingCertificate: "",
@@ -422,7 +422,7 @@ export default {
         this.second5.requestUrl =
           "/api/v1/tms/getBatchIdByForeign?apiId=489&con=" + this.input;
       }else if(a == 6){
-          this.second6.requestUrl = 
+          this.second6.requestUrl =
           "/api/v1/uc/queryMaterialByLike?apiId=244&index=" + this.input;
       }
     },
@@ -508,7 +508,7 @@ export default {
         sulfurcontent: this.form1.sulfurcontent,
         userId: getCookie("userId"),
       };
-      
+
       //判断放货数量是否为数字
       if (
         map.noticeCommerceMethod == null ||

+ 10 - 0
src/views/statisticalReport/components/Ship_dynamic_table.vue

@@ -1,12 +1,14 @@
 <template>
   <div>
     <div class="shipReport">
+      <div class="title-fixed">
       <div class="title">船舶动态表</div>
       <div class="top">
         <el-date-picker
           v-model="endTime"
           @change="DateChange"
           type="datetime"
+          style="width: 285px;"
           placeholder="选择截止时间">
         </el-date-picker>
         <!-- <el-button type="primary" class="btn" @click="onclick">
@@ -22,6 +24,7 @@
           <i class="el-icon-download"></i>下载Excel
         </el-button>
       </div>
+      </div>
       <table-item ref="ship" v-bind.sync="option" id="pdfDom">
       </table-item>
     </div>
@@ -780,5 +783,12 @@ export default {
   .black {
     font-weight: 1000;
   }
+  .title-fixed{
+    position: fixed;
+    left:20px;
+    top:20px;
+    z-index:999;
+    background-color: #fff;
+  }
 }
 </style>

+ 23 - 4
src/views/statisticalReport/components/tableItem.vue

@@ -3,7 +3,7 @@
     <table v-show="false">
       <tr>
         <td colspan="17">达州钢铁每日船舶动态明细表</td>
-        <td colspan="4">{{deadline}}</td> 
+        <td colspan="4">{{deadline}}</td>
       </tr>
     </table>
 
@@ -11,10 +11,11 @@
       :show-summary="isShowSum"
       :data="tableData"
       :height="height"
-      style="width: 100%"
+      style="width: 100%; margin-top: 216px;"
       :span-method="objectSpanMethod"
       :border="true"
       :header-cell-style="headerCellStyle"
+      header-row-class-name="announce_left"
     >
       <el-table-column
         v-if="isShowBox"
@@ -23,7 +24,8 @@
         align="center"
       >
       </el-table-column>
-      <template>
+      <template id="template_style">
+        <div style="height: 76px;width: 20px;"></div>
         <column-item
           v-for="item in col"
           :key="item.label"
@@ -143,7 +145,7 @@
               </el-table-column>
               <el-table-column width="200px" label="备注"> </el-table-column>
             </el-table-column>
-            
+
           </el-table>
         </div>
         <el-divider></el-divider>
@@ -751,6 +753,7 @@ export default {
 </script>
 <style>
 /* 处理表格表头和内容错位问题 */
+
 .el-table th.gutter {
   display: table-cell !important;
 }
@@ -758,6 +761,17 @@ export default {
 .el-table td {
   padding: 0.4375rem 0 !important;
 }
+
+ .el-table__header-wrapper:has(.announce_left){
+        position: fixed;
+        top:140px;
+        right: 10px;
+        width: 100%;
+        z-index:999;
+      }
+  .el-table__header:has(.announce_left){
+    margin-left: 30px;
+  }
 </style>
 <style lang="scss" scoped>
 .el-table {
@@ -786,4 +800,9 @@ export default {
     }
   }
 }
+
+/deep/ .announce_left{
+        top: 0;
+      }
+
 </style>