Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/OP/EntryDetails.vue

@@ -1139,10 +1139,6 @@ export default {
         },
         eptschedule(val){
             var subTypeId=0
-            if(this.listvalue==""||this.tablevalue==""){
-                this.$message.error('请选择需要导出的表格');
-                return
-            }
             if(val==1){
                 subTypeId=this.listvalue
             }else if(val==2){
@@ -1150,6 +1146,10 @@ export default {
             }else{
                 subTypeId=1
             }
+            if(subTypeId==""){
+                this.$message.error('请选择需要导出的表格');
+                return
+            }
             var url = "/api/Groups/PostEnterExitCostDownload"
             var that = this
             var data={
@@ -1174,7 +1174,7 @@ export default {
             }).then(function (res) {
                 console.log(res)
                 if(res.data.code==200){
-                    // window.open(res.data.data.url)
+                    window.open(res.data.data.url)
                 }
             })
         }