Merge branch 'v3.0' into company

src/apis/service/businessReportQuery/saleReportOrder/index.js

@@ -12,7 +12,7 @@ export default {
   // 发票数据导入
   receiptimport: (data, params) => http(api + 'receiptimport', data, 'post', params),
   // 新建业务需求表
-  add: (data, params) => http(api + 'execsave', data, 'post', params),
+  add: (data, params) => http(api + 'r_execsave', data, 'post', params),
   // 获取预约导出业务需求表
   exportList: (data, params) => http(api + 'execlist', data, 'post', params),
 

src/views/businessReportQuery/businessSaleReportOrder/addEdit.vue

@@ -57,9 +57,7 @@
             style="width: 230px"
             :closable="false"
             :title="
-              type + '' === '2'
-                ? '报表会在提交后开始执行！'
-                : '报表会在明天01:00开始生成'
+              type + '' === '2' ? '报表会在提交后开始执行！' : '报表会在明天01:00开始生成'
             "
             type="warning"
           >
@@ -78,7 +76,8 @@
   </el-dialog>
 </template>
 <script>
-import asyncRequest from "@/apis/service/reportQuery/financeReport/index.js";
+// import asyncRequest from "@/apis/service/reportQuery/financeReport/index.js";
+import asyncRequest from "@/apis/service/businessReportQuery/saleReportOrder/index.js";
 import resToken from "@/mixins/resToken";
 import PeriodDatePicker from "./components/PeriodDatePicker";
 export default {
@@ -222,7 +221,7 @@ export default {
 };
 </script>
 
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .account {
 }
 </style>