Merge branch 'sit'

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

@@ -40,7 +40,7 @@ export default {
           tooltip: {},
           dataset: {
             source: [
-              ["product",  "本月完成率" ],
+              ["product",  "本月完成率" ,"本月完成金额"],
               
             ],
           },
@@ -64,24 +64,24 @@ export default {
                 },
               },
             },
-            // {
-            //   type: "bar",
-            //   barWidth:40,
-            //   label: {
-            //     show: true,
-            //     color: "#fff", 
-            //     position: 'top',
-            //     formatter: function (params) {
-            //       return params.value[2]+"元"
-            //     }
-            //   },
-            //   itemStyle: {
-            //     normal: { 
-            //       color: "#28ffcd", 
+            {
+              type: "bar",
+              barWidth:40,
+              label: {
+                show: true,
+                color: "#fff", 
+                position: 'top',
+                formatter: function (params) {
+                  return params.value[2]+"元"
+                }
+              },
+              itemStyle: {
+                normal: { 
+                  color: "#28ffcd", 
 
-            //     },
-            //   },
-            // },
+                },
+              },
+            },
             // {
             //   type: "bar",
             //   barWidth:40,
@@ -131,7 +131,7 @@ export default {
       this.total_finish_rate = res.data.total_finish_rate +"%"
   
       res.data.list.forEach((item,index) => {
-        this.$set(this.options.dataset.source, index+1, [item.department,Number(item.finish_rate).toFixed(2) ,item.total_tips])
+        this.$set(this.options.dataset.source, index+1, [item.department,Number(item.finish_rate).toFixed(2) ,Number(item.finish).toFixed(2)])
         
       });
       // console.log(this.options.dataset.source)

src/views/reportQuery/purchaseReport/components/columns.js

@@ -56,7 +56,7 @@ const table2 = [
     minWidth: "155px",
   },
   {
-    prop: "good_num",
+    prop: "total_num",
     label: "数量",
     minWidth: "155px",
   },
@@ -66,7 +66,7 @@ const table2 = [
     minWidth: "155px",
   },
   {
-    prop: "wait_good_num",
+    prop: "wait_total_num",
     label: "待处理采购单数",
     minWidth: "155px",
   },