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

src/components/main.vue

@@ -2821,8 +2821,9 @@ export default {
   overflow: auto;
   ::-webkit-scrollbar {
     //滚动条宽高，如果不需要显示滚动条可设置宽高为0
-    width: 0px;
-    height: 0px;
+
+    width: 10px;
+    height: 10px;
   }
   ::-webkit-scrollbar-thumb {
     //滚动条颜色和圆角

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

@@ -13,7 +13,7 @@
         <i class="el-icon-refresh"></i>刷新
       </el-button>
     </div>
-    <el-table :data="selectionList" border highlight-current-row>
+    <el-table :data="selectionList" border highlight-current-row fit>
       <el-table-column type="index" width="50" label="序号" align="center">
       </el-table-column>
       <el-table-column
@@ -67,13 +67,6 @@
         </template>
       </el-table-column>
 
-      <el-table-column fixed="right" label="操作" width="60">
-        <template slot-scope="scope">
-          <el-button @click="click(scope.row)" type="text" size="small"
-            >保存</el-button
-          >
-        </template>
-      </el-table-column>
     </el-table>
   </div>
 </template>
@@ -162,7 +155,6 @@ export default {
         {
           prop: "locationMemo",
           label: "备注",
-          width: "140",
         },
       ],
       selectionList: [],

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

@@ -116,7 +116,7 @@ export default {
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/wmsh/getLoadPortStockList?apiId=158",
-        comparison:"materialName",
+        comparison:"type",
         columnIndexs:[0,1,2]
       },
       option2: {

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -1029,7 +1029,7 @@
             ref="receive"
             list-type="picture-card"
             action="null"
-            :limit="5"
+            :limit="11"
             :on-change="fileChange2"
             :on-preview="handlePictureCardPreview"
             :on-exceed="exceed"
@@ -1991,23 +1991,13 @@ export default {
             this.isShow2 = true
           }
           this.srcList2 = []
-          if (res.data.resultReceiveNotePhoto != null) {
-            this.srcList2.push({
-              title: '签收单',
-              src: res.data.resultReceiveNotePhoto
-            })
-          }
-          if (res.data.resultSignedNotePhoto != null) {
-            this.srcList2.push({
-              title: '质保书',
-              src: res.data.resultSignedNotePhoto
-            })
-          }
-          if (res.data.resultEmptyContainerPhoto != null) {
-            this.srcList2.push({
-              title: '空货箱照片',
-              src: res.data.resultEmptyContainerPhoto
-            })
+          if(res.data && res.data.length>0){
+            res.data.forEach(item=>{
+                this.srcList2.push({
+                title:"",
+                src:item
+              });
+            });
           }
         })
     },