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

src/views/WMS/components/port_deposit/loadPortStock.vue

@@ -11,8 +11,7 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-    </div>
-    <div class="totalNumber" style="margin-left: 1040px">
+      <div class="totalNumber" style="margin-left:10px">
       <span
         style="
           color: IndianRed;
@@ -33,8 +32,10 @@
       <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>
       </el-button>
+      </div>
     </div>
-    <span
+    
+    <!-- <span
       class="el-input"
       style="
         color: red;
@@ -44,7 +45,7 @@
         font-weight: bold;
       "
       >万州港实时库存详情</span
-    >
+    > -->
     <mergeRowTable
       ref="excelDom"
       v-bind.sync="option"
@@ -75,7 +76,7 @@ export default {
         // 表格请求数据的地址
         requestUrl: "/api/v1/wmsh/getLoadPortStockList?apiId=158",
         comparison:"materialName",
-        columnIndexs:[1,2,3]
+        columnIndexs:[0,1,2,3]
       },
       option2: {
         requestUrl: "/api/v1/wmsh/getLoadPortStockByMaterialName?apiId=493",
@@ -120,6 +121,7 @@ export default {
 .homeworkPath {
   .top {
     padding: 1.25rem 0.375rem;
+    display: flex;
     .my-autocomplete {
       width: 20%;
       margin-right: 40rpx;

src/views/WMS/components/port_deposit/unloadPortStock.vue

@@ -14,8 +14,8 @@
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
-    <dilTable v-bind.sync="option">
-    </dilTable>
+    <mergeRowTable v-bind.sync="option">
+    </mergeRowTable>
   </div>
 </template>
 
@@ -29,6 +29,8 @@ export default {
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/wmsh/getUnloadPortStockList?apiId=497",
+        comparison:"portName",
+        columnIndexs:[0,1]
       },
     };
   },