Merge branch 'dev' of http://120.46.155.214:3000/xiaodai2022/order-ui-pc into dev

src/apis/service/reportQuery/purchaseReport/index.js

@@ -24,9 +24,15 @@ export default {
 
    //已采反报价信息
    reportconsultinfobidssum: (data, params) => http(api + "reportconsultinfobidssum", data, "post", params),
+   //已采反报价信息导出
+   reportconsultinfobidssumexport: (data, params) => http(api + "reportconsultinfobidssumexport", data, "post", params),
    //未采反信息
    reportconsultinfobidssumnot: (data, params) => http(api + "reportconsultinfobidssumnot", data, "post", params),
+   //未采反信息导出
+   reportconsultinfobidssumnotexport: (data, params) => http(api + "reportconsultinfobidssumnotexport", data, "post", params),
    //订单明细
    reportorderlistdetailed: (data, params) => http(api + "reportorderlistdetailed", data, "post", params),
+   //订单明细导出
+   reportorderlistdetailedexport: (data, params) => http(api + "reportorderlistdetailedexport", data, "post", params),
    
 };

src/components/echart/bottom/bottomRightChart/chart.vue

@@ -71,8 +71,8 @@ export default {
                 show: true,
                 color: "#fff", 
                 position: 'top',
-                formatter: function (params) {
-                  return params.value[2]+"元"
+                formatter: params=> {
+                  return this.getNum(params.value[2])
                 }
               },
               itemStyle: {
@@ -124,6 +124,17 @@ export default {
 
   },
   methods:{
+    getNum(num){
+        num = Number(num);
+        if(!num) return '0.00';
+        if(num > 10000 || num < -10000){
+          const moneys = num/10000
+          const realVal =parseFloat(moneys).toFixed(2);
+          return realVal+"万元"
+        }else{
+          return num.toFixed(2) + "元"
+        }
+      },
     async initHttp(){
      let res = await asyncRequest.datamonthfinishrate();
      if(res.code == 0){

src/views/reportQuery/purchaseReport/components/table5.vue

@@ -123,7 +123,7 @@ export default {
         end_date: "", // 结束时间
         page: 1, // 页码
         size: 15, // 每页显示条数
-        is_export:0//是否导出0/1
+        // is_export:0//是否导出0/1
        
       },
       // 表格 - 数据集合
@@ -185,7 +185,7 @@ export default {
         end_date: "", // 结束时间
         page: 1, // 页码
         size: 15, // 每页显示条数
-        is_export:0//是否导出0/1
+        // is_export:0//是否导出0/1
       };
       // 表格 - 分页
       this.pageInfo = {
@@ -216,13 +216,13 @@ export default {
       //   return;
       // }
       let model = JSON.parse(JSON.stringify(this.parmValue))
-      model.is_export = 1;
+      // model.is_export = 1;
       if (!this.loading) {
         this.loading = true;
         let httpType = `aplication/zip`;
         axios({
           method: "post",
-          url: this.fileUrl + "admin/reportconsultinfobidssum",
+          url: this.fileUrl + "admin/reportconsultinfobidssumexport",
           responseType: "blob",
           data: model,
           headers: {

src/views/reportQuery/purchaseReport/components/table6.vue

@@ -121,7 +121,7 @@ export default {
         companyName:"", //客户名称
         start_date: "", //起始时间
         end_date: "", // 结束时间
-        is_export:0,//是否导出0/1
+        // is_export:0,//是否导出0/1
         page: 1, // 页码
         size: 15, // 每页显示条数
        
@@ -184,7 +184,7 @@ export default {
         end_date: "", // 新建结束时间
         page: 1, // 页码
         size: 15, // 每页显示条数
-        is_export:0//是否导出0/1
+        // is_export:0//是否导出0/1
       };
       // 表格 - 分页
       this.pageInfo = {
@@ -215,13 +215,13 @@ export default {
       //   return;
       // }
       let model = JSON.parse(JSON.stringify(this.parmValue))
-      model.is_export = 1;
+      // model.is_export = 1;
       if (!this.loading) {
         this.loading = true;
         let httpType = `aplication/zip`;
         axios({
           method: "post",
-          url: this.fileUrl + "admin/reportconsultinfobidssumnot",
+          url: this.fileUrl + "admin/reportconsultinfobidssumnotexport",
           responseType: "blob",
           data: model,
           headers: {
@@ -244,7 +244,7 @@ export default {
               let link = document.createElement("a");
               link.style.display = "none";
               link.href = url;
-              let excelName = "已采反报价.zip";
+              let excelName = "未采反信息.zip";
               link.setAttribute("download", excelName);
               document.body.appendChild(link);
               link.click();

src/views/reportQuery/purchaseReport/components/table7.vue

@@ -140,7 +140,7 @@ export default {
         
         start_date: "", //起始时间
         end_date: "", // 结束时间
-        is_export:0,//是否导出0/1
+        // is_export:0,//是否导出0/1
 
         page: 1, // 页码
         size: 15, // 每页显示条数
@@ -200,7 +200,7 @@ export default {
       this.parmValue = {
         start_date: "", //新建起始时间
         end_date: "", // 新建结束时间
-        is_export:0,//是否导出0/1
+        // is_export:0,//是否导出0/1
         page: 1, // 页码
         size: 15, // 每页显示条数
       };
@@ -233,13 +233,13 @@ export default {
       //   return;
       // }
       let model = JSON.parse(JSON.stringify(this.parmValue))
-      model.is_export = 1;
+      // model.is_export = 1;
       if (!this.loading) {
         this.loading = true;
         let httpType = `aplication/zip`;
         axios({
           method: "post",
-          url: this.fileUrl + "admin/reportorderlistdetailed",
+          url: this.fileUrl + "admin/reportorderlistdetailedexport",
           responseType: "blob",
           data: model,
           headers: {
@@ -262,7 +262,7 @@ export default {
               let link = document.createElement("a");
               link.style.display = "none";
               link.href = url;
-              let excelName = "已采反报价.zip";
+              let excelName = "订单明细报表.zip";
               link.setAttribute("download", excelName);
               document.body.appendChild(link);
               link.click();