feat: 优化导出

@@ -228,9 +228,9 @@
           </div>
           </div>
         </TablePopover>
         </TablePopover>
       </template>
       </template>
-      <template v-slot:billNo="scope">
+      <template v-slot:logisticsNo="scope">
         <el-button type="text" @click="view(scope.row)">
         <el-button type="text" @click="view(scope.row)">
-          {{ scope.row.billNo }}
+          {{ scope.row.logisticsNo }}
         </el-button>
         </el-button>
       </template>
       </template>
     </Table>
     </Table>
@@ -276,15 +276,15 @@ export default {
           slot: true,
           slot: true,
         },
         },
         {
         {
-          name: "提运单号",
-          value: "billNo",
+          name: "物流运单编号",
+          value: "logisticsNo",
           width: "",
           width: "",
           align: "left",
           align: "left",
           slot: true,
           slot: true,
         },
         },
         {
         {
-          name: "物流运单编号",
-          value: "logisticsNo",
+          name: "提运单号",
+          value: "billNo",
           width: "",
           width: "",
           align: "left",
           align: "left",
         },
         },

@@ -8,7 +8,8 @@
     :close-on-click-modal="false"
     :close-on-click-modal="false"
   >
   >
     <div>
     <div>
-     <el-form class="fedexFormStyle"
+      <el-form
+        class="fedexFormStyle"
         ref="selectTemplateForm"
         ref="selectTemplateForm"
         :model="selectTemplateFormData"
         :model="selectTemplateFormData"
         :rules="selectTemplateFormRules"
         :rules="selectTemplateFormRules"
@@ -37,69 +38,71 @@
         class="entrySaveButton entrySaveButton-background revokeSubmitBtn"
         class="entrySaveButton entrySaveButton-background revokeSubmitBtn"
         type="primary"
         type="primary"
         @click="startDownload"
         @click="startDownload"
-           >确定</el-button>
-           <el-button
-           class="entrySaveButton"
-           @click="cancelDownload"
-           >关闭</el-button>
+        >确定</el-button
+      >
+      <el-button class="entrySaveButton" @click="cancelDownload"
+        >关闭</el-button
+      >
     </div>
     </div>
   </el-dialog>
   </el-dialog>
-   </template>
+</template>
 
 
-     <script>
-     export default {
+<script>
+export default {
   props: {
   props: {
     showDialog: {
     showDialog: {
       type: Boolean,
       type: Boolean,
       default: false,
       default: false,
-         }
+    },
   },
   },
   data() {
   data() {
     return {
     return {
-         datasExportVisible:false,
-         selectTemplateFormData:{
-            dataSource:''
+      datasExportVisible: false,
+      selectTemplateFormData: {
+        dataSource: "",
       },
       },
       selectTemplateFormRules: {
       selectTemplateFormRules: {
         dataSource: [
         dataSource: [
-               { required: true, message: '请选择模板类型', trigger: 'change' }
+          { required: true, message: "请选择模板类型", trigger: "change" },
         ],
         ],
-         }
+      },
     };
     };
   },
   },
   watch: {
   watch: {
     showDialog(val) {
     showDialog(val) {
       if (val) {
       if (val) {
-                   this.datasExportVisible = val
-                   this.selectTemplateFormData.dataSource=""
+        this.datasExportVisible = val;
+        this.selectTemplateFormData.dataSource = "";
       }
       }
     },
     },
   },
   },
-     created() {
-     },
+  created() {},
   methods: {
   methods: {
-       startDownload(){
+    startDownload() {
       this.$refs.selectTemplateForm.validate((valid) => {
       this.$refs.selectTemplateForm.validate((valid) => {
         if (valid) {
         if (valid) {
-               this.$emit('startDatasExport', this.selectTemplateFormData.dataSource)
+          this.$emit(
+            "startDatasExport",
+            this.selectTemplateFormData.dataSource
+          );
         } else {
         } else {
           return false;
           return false;
         }
         }
       });
       });
     },
     },
 
 
-       cancelDownload(){
-          this.datasExportVisible = false
-          this.selectTemplateFormData.dataSource=""
-          this.$emit('cancelDatasExport')
-       }
+    cancelDownload() {
+      this.datasExportVisible = false;
+      this.selectTemplateFormData.dataSource = "";
+      this.$emit("cancelDatasExport");
     },
     },
-     };
-     </script>
+  },
+};
+</script>
 
 
-     <style lang="scss" scoped>
-     @import "@/assets/styles/variables.scss";
-     .modelItem {
+<style lang="scss" scoped>
+@import "@/assets/styles/variables.scss";
+.modelItem {
   width: 100%;
   width: 100%;
   .modelItem-title {
   .modelItem-title {
     display: flex;
     display: flex;
@@ -109,12 +112,11 @@
     font-weight: 600;
     font-weight: 600;
     color: #333;
     color: #333;
   }
   }
-     }
-     .revokeOperation{
-     margin-bottom:25px;
-     .revokeSubmitBtn{
+}
+.revokeOperation {
+  margin-bottom: 25px;
+  .revokeSubmitBtn {
     margin-right: 30px;
     margin-right: 30px;
   }
   }
-   }
-     </style>
-     
\ No newline at end of file
+}
+</style>

@@ -1057,22 +1057,23 @@ export default {
 
 
     datasDownload(dataSource) {
     datasDownload(dataSource) {
       let obj = {
       let obj = {
-        billNo: this.sreachFormData.billNo,
+        // billNo: this.sreachFormData.billNo,
         declareId: [],
         declareId: [],
-        logisticsNo: this.sreachFormData.logisticsNo,
-        orderNo: this.sreachFormData.orderNo,
-        receiptStatus: this.sreachFormData.receiptStatus,
-        dataSource,
+        // logisticsNo: this.sreachFormData.logisticsNo,
+        // orderNo: this.sreachFormData.orderNo,
+        // receiptStatus: this.sreachFormData.receiptStatus,
+        dataSourceTemplate: dataSource,
+        ...this.sreachFormData,
       };
       };
+      console.log("obj===", obj, dataSource);
+
       obj.startCreateTime = "";
       obj.startCreateTime = "";
       obj.endCreateTime = "";
       obj.endCreateTime = "";
       if (this.sreachFormData.createTime.length > 0) {
       if (this.sreachFormData.createTime.length > 0) {
-        obj.startCreateTime = this.sreachFormData.createTime[0];
-        obj.endCreateTime = this.sreachFormData.createTime[1];
+        obj.startCreateTime = obj.createTime[0];
+        obj.endCreateTime = obj.createTime[1];
       }
       }
-      this.selected.forEach((item) => {
-        obj.declareId.push(item.declareId);
-      });
+      obj.declareId = this.selected.map((item) => item.declareId);
       exportDeclareData(obj)
       exportDeclareData(obj)
         .then((res) => {
         .then((res) => {
           // if (res.code === "200") {
           // if (res.code === "200") {
@@ -1094,6 +1095,10 @@ export default {
     },
     },
     //导出
     //导出
     downloadData() {
     downloadData() {
+      if (!this.selected.length) {
+        this.alertWarningMsg("请选择数据！");
+        return;
+      }
       this.loadings.exportDeclareLoading = true;
       this.loadings.exportDeclareLoading = true;
       this.$store
       this.$store
         .dispatch("GetInfo")
         .dispatch("GetInfo")