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",
         },
         },

 <template>
 <template>
-    <el-dialog
+  <el-dialog
     class="entryDialog classCUploadDialog"
     class="entryDialog classCUploadDialog"
-       title="申报数据导出"
-       :visible.sync="datasExportVisible"
-       :show-close="false"
-       width="60%"
-       :close-on-click-modal="false"
-     >
-      <div>
-     <el-form class="fedexFormStyle"
-           ref="selectTemplateForm"
-           :model="selectTemplateFormData"
-           :rules="selectTemplateFormRules"
-           label-position="left"
-           size="small"
-         >
-       <Formitem label="模板类型" prop="dataSource">
-                 <el-select
-                   type="text"
-                   v-model="selectTemplateFormData.dataSource"
-                   clearable
-                   placeholder=""
-                 >
-                   <el-option
-                    v-for="(item, index) in $store.getters.dict.TEMPLATE_TYPE"
-                    :key="index"
-                    :label="item.itemChineseName"
-                    :value="item.itemValue"
-                   ></el-option>
-                 </el-select>
-               </Formitem>
-     </el-form>
-     </div>
-       <div class="dialogOption entrySave revokeOperation">
-         <el-button
-           class="entrySaveButton entrySaveButton-background revokeSubmitBtn"
-           type="primary"
-           @click="startDownload"
-           >确定</el-button>
-           <el-button
-           class="entrySaveButton"
-           @click="cancelDownload"
-           >关闭</el-button>
-       </div>
-   </el-dialog>
-   </template>
-     
-     <script>
-     export default {
-       props: {
-         showDialog: {
-           type: Boolean,
-           default: false,
-         }
-       },
-       data() {
-         return {
-         datasExportVisible:false,
-         selectTemplateFormData:{
-            dataSource:''
-         },
-         selectTemplateFormRules: {
-            dataSource: [
-               { required: true, message: '请选择模板类型', trigger: 'change' }
-             ],
-         }
-         };
-       },
-       watch: {
-           showDialog(val) {
-               if (val) {
-                   this.datasExportVisible = val
-                   this.selectTemplateFormData.dataSource=""
-               }
-           },
-     },
-     created() {
-     },
-       methods: {
-       startDownload(){
-         this.$refs.selectTemplateForm.validate((valid) => {
-             if (valid) {
-               this.$emit('startDatasExport', this.selectTemplateFormData.dataSource)
-           } else {
-               return false;
-             }
-           });
-       },
-   
-       cancelDownload(){
-          this.datasExportVisible = false
-          this.selectTemplateFormData.dataSource=""
-          this.$emit('cancelDatasExport')
-       }
-       },
-     };
-     </script>
-     
-     <style lang="scss" scoped>
-     @import "@/assets/styles/variables.scss";
-     .modelItem {
-       width: 100%;
-       .modelItem-title {
-         display: flex;
-         justify-content: space-between;
-         margin-bottom: 5px;
-         font-size: 14px;
-         font-weight: 600;
-         color: #333;
-       }
-     }
-     .revokeOperation{
-     margin-bottom:25px;
-     .revokeSubmitBtn{
-       margin-right: 30px;
-     }
-   }
-     </style>
-     
\ No newline at end of file
+    title="申报数据导出"
+    :visible.sync="datasExportVisible"
+    :show-close="false"
+    width="60%"
+    :close-on-click-modal="false"
+  >
+    <div>
+      <el-form
+        class="fedexFormStyle"
+        ref="selectTemplateForm"
+        :model="selectTemplateFormData"
+        :rules="selectTemplateFormRules"
+        label-position="left"
+        size="small"
+      >
+        <Formitem label="模板类型" prop="dataSource">
+          <el-select
+            type="text"
+            v-model="selectTemplateFormData.dataSource"
+            clearable
+            placeholder=""
+          >
+            <el-option
+              v-for="(item, index) in $store.getters.dict.TEMPLATE_TYPE"
+              :key="index"
+              :label="item.itemChineseName"
+              :value="item.itemValue"
+            ></el-option>
+          </el-select>
+        </Formitem>
+      </el-form>
+    </div>
+    <div class="dialogOption entrySave revokeOperation">
+      <el-button
+        class="entrySaveButton entrySaveButton-background revokeSubmitBtn"
+        type="primary"
+        @click="startDownload"
+        >确定</el-button
+      >
+      <el-button class="entrySaveButton" @click="cancelDownload"
+        >关闭</el-button
+      >
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  props: {
+    showDialog: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      datasExportVisible: false,
+      selectTemplateFormData: {
+        dataSource: "",
+      },
+      selectTemplateFormRules: {
+        dataSource: [
+          { required: true, message: "请选择模板类型", trigger: "change" },
+        ],
+      },
+    };
+  },
+  watch: {
+    showDialog(val) {
+      if (val) {
+        this.datasExportVisible = val;
+        this.selectTemplateFormData.dataSource = "";
+      }
+    },
+  },
+  created() {},
+  methods: {
+    startDownload() {
+      this.$refs.selectTemplateForm.validate((valid) => {
+        if (valid) {
+          this.$emit(
+            "startDatasExport",
+            this.selectTemplateFormData.dataSource
+          );
+        } else {
+          return false;
+        }
+      });
+    },
+
+    cancelDownload() {
+      this.datasExportVisible = false;
+      this.selectTemplateFormData.dataSource = "";
+      this.$emit("cancelDatasExport");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/styles/variables.scss";
+.modelItem {
+  width: 100%;
+  .modelItem-title {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 5px;
+    font-size: 14px;
+    font-weight: 600;
+    color: #333;
+  }
+}
+.revokeOperation {
+  margin-bottom: 25px;
+  .revokeSubmitBtn {
+    margin-right: 30px;
+  }
+}
+</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")