修改

src/views/TMS/components/domesticMine/entrustMine.vue

@@ -20,6 +20,9 @@
       </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
+      </el-button>
+       <el-button type="primary" class="btn" @click="batchSendMeasureCommission" v-if="activeName == 'first'">
+        重发计量委托
       </el-button>
       <!-- <el-button type="primary" @click="exportData()">
         <i class="el-icon-download"></i>导出(Excel)
@@ -91,7 +94,31 @@ export default {
     handleClick(tag, event) {
       console.log(tag, event);
     },
-
+    batchSendMeasureCommission(){
+      if(!this.selectionListMap || this.selectionListMap.length<=0){
+        this.$message.warning("请先勾选！");
+        return;
+      }
+      this.$confirm('确定重新发送计量委托？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+            let map={
+              resultIdList:this.selectionListMap
+            }
+            this.axios
+              .post('/api/v1/tms/batchSendMeasureCommission',map)
+              .then(res => {
+                this.$message.success(res.data.data);
+            })
+        }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除'
+            });          
+        });
+    },
     onclick() {
       let startTime = null;
       let endTime = null;

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

@@ -20,6 +20,9 @@
       </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
+      </el-button>
+       <el-button type="primary" class="btn" @click="batchSendMeasureCommission" v-if="activeName == 'first'">
+        重发计量委托
       </el-button>
       <el-button type="primary" @click="exportData()"
       v-if="activeName == 'second'"
@@ -80,6 +83,31 @@ export default {
     handleClick(tag, event) {
       console.log(tag, event);
     },
+    batchSendMeasureCommission(){
+      if(!this.selectionListMap || this.selectionListMap.length<=0){
+        this.$message.warning("请先勾选！");
+        return;
+      }
+      this.$confirm('确定重新发送计量委托？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+            let map={
+              resultIdList:this.selectionListMap
+            }
+            this.axios
+              .post('/api/v1/tms/batchSendMeasureCommission',map)
+              .then(res => {
+                this.$message.success(res.data.data);
+            })
+        }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除'
+            });          
+        });
+    },
     onclick() {
       let startTime = null;
       let endTime = null;

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

@@ -22,6 +22,9 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
+      <el-button type="primary" class="btn" @click="batchSendMeasureCommission" v-if="activeName == 'first'">
+        重发计量委托
+      </el-button>
       <el-button type="primary" @click="exportData()"
       v-if="activeName == 'second'"
         ><i class="el-icon-download"></i>导出(Excel)</el-button
@@ -94,6 +97,31 @@ export default {
     handleClick(tag, event) {
       console.log(tag, event);
     },
+    batchSendMeasureCommission(){
+      if(!this.selectionListMap || this.selectionListMap.length<=0){
+        this.$message.warning("请先勾选！");
+        return;
+      }
+      this.$confirm('确定重新发送计量委托？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+            let map={
+              resultIdList:this.selectionListMap
+            }
+            this.axios
+              .post('/api/v1/tms/batchSendMeasureCommission',map)
+              .then(res => {
+                this.$message.success(res.data.data);
+            })
+        }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除'
+            });          
+        });
+    },
     onclick() {
       let startTime = null;
       let endTime = null;

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

@@ -111,7 +111,8 @@ export default {
     orderNumber: '',
     capacityNumber: '',
     startPointName: '',
-    endPointName: ''
+    endPointName: '',
+    statusCode:''
   },
   setup() {
     const map = shallowRef(null)
@@ -532,7 +533,8 @@ export default {
           that.currentPointName = result.regeocode.formattedAddress
           that.initCustomMarkes(
             that.capacityNumber,
-            '位置：' +
+            that.statusCode+
+            '：' +
               that.currentPointName +
               '<br/>' +
               '距离：' +

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

@@ -22,8 +22,11 @@
           <el-button type="primary" class="btn" @click="onclick">
             <i class="el-icon-search"></i>
           </el-button>
+           <el-button type="primary" class="btn" @click="exportToExcel('销售钢材拼装统计报表')">
+            <i class="el-icon-download"></i>导出
+          </el-button>
     </div>
-    <div class="saleSpellingtable">
+    <div class="saleSpellingtable" id='table'>
         <el-table
         :data="saleSpellingData"
         border="true"
@@ -76,6 +79,7 @@
 </template>
 
 <script>
+import FileSaver from "file-saver";
 export default{
     data(){
         return{
@@ -89,6 +93,24 @@ export default{
         this.getSpellingData();
     },
     methods:{
+        exportToExcel(tableTitle="表格标题") {
+            let tables = document.getElementById("table");//此处是拿表格document元素,也可以取父div的ref
+            let table_book = XLSX.utils.table_to_book(tables);
+            var table_write = XLSX.write(table_book, {
+                bookType: "xlsx",
+                bookSST: true,
+                type: "array"
+            });
+            try {
+                FileSaver.saveAs(
+                    new Blob([table_write], { type: "application/octet-stream" }),
+                    tableTitle+".xlsx"
+                );
+            } catch (e) {
+                if (typeof console !== "undefined") console.log(e, table_write);
+            }
+            return table_write;
+        },
         async getSpellingData(){
           const loading = this.$loading({
                 lock: true,

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

@@ -1752,7 +1752,8 @@ export default {
         orderNumber: '',
         capacityNumber: '',
         startPointName: '',
-        endPointName: ''
+        endPointName: '',
+        statusCode:'位置'
       },
       saleSteelKey: false,
       tableRowIndex: '',
@@ -3001,6 +3002,11 @@ export default {
             that.pathOption.startPointName = '达钢集团小东门'
             that.pathOption.endPointName = row.arrivalAddress
             that.value7 = true
+            if(row.orderStatus=='已完成'){
+              that.pathOption.statusCode='位置'
+            }else{
+              that.pathOption.statusCode='当前位置'
+            }
           } else {
             this.$message.error('车辆没有开启GPS')
           }