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

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

@@ -76,6 +76,9 @@ export default {
         requestUrl: "/api/v1/tms/getWeightResult?apiId=491&resultType=1",
         // 控制显示多选列
         selectionType: "select",
+        maxHeight:500,
+        isshowSummary:true,
+        showSummaryList:['resultBillableTonnage','resultGrossWeight','resultNetWeight','resultTareWeight']
       },
       selectionListMap: [],
       selectionListMap2: [],

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

@@ -441,6 +441,13 @@
           show-overflow-tooltip
         >
         </el-table-column>
+        <el-table-column
+          prop="isAccept"
+          label="异地库接收标志"
+          width="60px"
+          show-overflow-tooltip
+        >
+        </el-table-column>
       </el-table>
     </div>
     <div>