Merge branch 'dev'

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

@@ -34,5 +34,14 @@ export default {
    reportorderlistdetailed: (data, params) => http(api + "reportorderlistdetailed", data, "post", params),
    //订单明细导出
    reportorderlistdetailedexport: (data, params) => http(api + "reportorderlistdetailedexport", data, "post", params),
+
+   //售后报表
+   reportorderreturnlist: (data, params) => http(api + "reportorderreturnlist", data, "post", params),
+   //售后报表导出
+   reportorderreturnlistexport: (data, params) => http(api + "reportorderreturnlistexport", data, "post", params),
+   //供应商报表
+   reportsupplierlist: (data, params) => http(api + "reportsupplierlist", data, "post", params),
+   //供应商报表导出
+   reportsupplierlistexport: (data, params) => http(api + "reportsupplierlistexport", data, "post", params),
    
 };

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

@@ -17,74 +17,71 @@ export default {
   data() {
     return {
       options: {
-          legend: {},
-          tooltip: {},
-          dataset: {
-            source: [
-              ["product", "今日", "本月", "今年"],
-              // ["销售一组", 20, 30, 50],
-              // ["销售二组", 15, 60, 80],
-              // ["销售三组", 10, 20, 100],
-              // ["销售6组", 1, 30, 100],
-            ],
-          },
-          xAxis: { type: "category" },
-          yAxis: {},
-          series: [
-            {
-              type: "bar",
-              label: {
-                show: true,
-                color: "#fff", 
-                position: 'top',
-                formatter: function (params) {
-                  return params.value[1]+"%"
-                }
+        legend: {},
+        tooltip: {},
+        dataset: {
+          source: [
+            ["product", "今日", "本月", "今年"],
+            // ["销售一组", 20, 30, 50],
+            // ["销售二组", 15, 60, 80],
+            // ["销售三组", 10, 20, 100],
+            // ["销售6组", 1, 30, 100],
+          ],
+        },
+        xAxis: { type: "category" },
+        yAxis: {},
+        series: [
+          {
+            type: "bar",
+            label: {
+              show: true,
+              color: "#fff",
+              position: "top",
+              formatter: function (params) {
+                return params.value[1] + "%";
               },
-              itemStyle: {
-                normal: { 
-                  color: "#1a8cd7", 
-
-                },
+            },
+            itemStyle: {
+              normal: {
+                color: "#1a8cd7",
               },
             },
-            {
-              type: "bar",
-              label: {
-                show: true,
-                color: "#fff", 
-                position: 'top',
-                formatter: function (params) {
-                  return params.value[2]+"%"
-                }
+          },
+          {
+            type: "bar",
+            label: {
+              show: true,
+              color: "#fff",
+              position: "top",
+              formatter: function (params) {
+                return params.value[2] + "%";
               },
-              itemStyle: {
-                normal: { 
-                  color: "skyblue", 
-
-                },
+            },
+            itemStyle: {
+              normal: {
+                color: "skyblue",
               },
             },
-            {
-              type: "bar",
-              label: {
-                show: true,
-                color: "#fff", 
-                position: 'top',
-                formatter: function (params) {
-                  return params.value[3]+"%"
-                }
+          },
+          {
+            type: "bar",
+            label: {
+              show: true,
+              color: "#fff",
+              position: "top",
+              formatter: function (params) {
+                return params.value[3] + "%";
               },
-              itemStyle: {
-                normal: { 
-                  color: "orange", 
-
-                },
+            },
+            itemStyle: {
+              normal: {
+                color: "orange",
               },
             },
-          ],
-        },
-        flag:false,
+          },
+        ],
+      },
+      flag: false,
     };
   },
   components: {
@@ -96,60 +93,76 @@ export default {
       default: () => ({}),
     },
   },
-  mounted(){
-    this.initHttp()
-    // this.initHttp2()
-    // this.initHttp3()
+  mounted() {
+    this.initHttp3();
   },
-  methods:{
-   async initHttp(){
-    let res = await asyncRequest.datatordertransferratetoday();
-    if(res.data.length<=0) {
-      this.$message.error("转单率暂无数据")
-      return;
-    }
-     if(res.code == 0){
-       console.log(res)
-      res.data.forEach((item,index) => {
-        this.$set(this.options.dataset.source, index+1, [item.companyName])
-        this.$set(this.options.dataset.source[index+1], 1, item.transfer_rate)
-      });
-     await this.initHttp2()
-     await this.initHttp3()
-     }else{
-       this.$message.error(res.message)
-       return;
-     }
+  methods: {
+    async initHttp() {
+      let res = await asyncRequest.datatordertransferratetoday();
+      if (res.data.length <= 0) {
+        for(let index = 0; index<this.options.dataset.source.length-1; index++){
+          this.$set(this.options.dataset.source[index + 1], 1, 0);
+        }    
+        return;
+      }
+      if (res.code == 0) {
+        //  console.log(res)
+        res.data.forEach((item, index) => {
+          this.$set(
+            this.options.dataset.source[index + 1],
+            1,
+            item.transfer_rate
+          );
+        });
+      } else {
+        this.$message.error(res.message);
+        return;
+      }
     },
-    async initHttp2(){
+    async initHttp2() {
       let res = await asyncRequest.datatordertransferratemonth();
-     if(res.code == 0){
-      res.data.forEach((item,index) => {
-        // this.$set(this.options.dataset.source, index+1, [item.companyName])
-        this.$set(this.options.dataset.source[index+1], 2, item.transfer_rate)
-      });
-     }else{
-       this.$message.error(res.message)
-       return;
-     }
+      if (res.data.length <= 0) {
+        for(let index = 0; index<this.options.dataset.source.length-1; index++){
+          this.$set(this.options.dataset.source[index + 1], 2, 0);
+        }    
+        return;
+      }
+      if (res.code == 0) {
+        res.data.forEach((item, index) => {
+          // this.$set(this.options.dataset.source, index+1, [item.companyName])
+          this.$set(
+            this.options.dataset.source[index + 1],
+            2,
+            item.transfer_rate
+          );
+        });
+      } else {
+        this.$message.error(res.message);
+        return;
+      }
     },
-    async initHttp3(){
+    async initHttp3() {
       let res = await asyncRequest.datatordertransferrateyear();
-     if(res.code == 0){
-      res.data.forEach((item,index) => {
-        // this.$set(this.options.dataset.source, index+1, [item.companyName])
-        this.$set(this.options.dataset.source[index+1], 3, item.transfer_rate)
-      });
-     }else{
-       this.$message.error(res.message)
-       return;
-     }
-    }
+      if (res.code == 0) {
+        res.data.forEach((item, index) => {
+          this.$set(this.options.dataset.source, index + 1, [item.companyName]);
+          this.$set(
+            this.options.dataset.source[index + 1],
+            3,
+            item.transfer_rate
+          );
+        });
+        await this.initHttp2();
+        await this.initHttp();
+      } else {
+        this.$message.error(res.message);
+        return;
+      }
+    },
   },
   watch: {
     // cdata: {
     //   handler() {
-      
     //   },
     //   immediate: true,
     //   deep: true,

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

@@ -397,37 +397,37 @@ const table8 = [
     _noset_: true
   },
   {
-    prop: "date",
+    prop: "returnCode",
     label: "售后单编号",
     minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "addtime",
     label: "创建时间",
     minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "cgdNo",
     label: "采购单编号",
     minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "supplier_name",
     label: "供应商名称",
     minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "good_name",
     label: "产品名称",
     minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "total_num",
     label: "购买数量",
     minWidth: "105px",
   },
   {
-    prop: "total",
+    prop: "receipttime",
     label: "签收日期",
     minWidth: "155px",
   },
@@ -437,17 +437,22 @@ const table8 = [
     minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "error_num",
     label: "售后数量",
     minWidth: "105px",
   },
   {
-    prop: "total",
+    prop: "error_remark",
     label: "问题描述",
     minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "error_reason",
+    label: "异常原因",
+    minWidth: "155px",
+  },
+  {
+    prop: "status",
     label: "售后状态",
     minWidth: "155px",
   },
@@ -468,42 +473,42 @@ const table9 = [
     _noset_: true
   },
   {
-    prop: "date",
+    prop: "addtime",
     label: "录入供应商时间",
     minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "name",
     label: "供应商名称",
     minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "creater",
     label: "采购维护人",
     minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "nature",
     label: "供应商性质",
     minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "source",
     label: "供应商来源",
     minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "pay_type",
     label: "付款方式",
     minWidth: "125px",
   },
   {
-    prop: "total",
+    prop: "delivery_way",
     label: "发货方式",
     minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "updatetime",
     label: "修改供应商时间",
     minWidth: "155px",
   },

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

@@ -178,16 +178,17 @@ export default {
         this.$message.warning("时间区间不完整！");
         return;
       }
-      return;
+      // return;
       this.loading = true;
       
-      const res = await asyncRequest.list(this.parmValue);
+      const res = await asyncRequest.reportorderreturnlist(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.pageInfo.total = Number(res.data.count);
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {
+        this.$message.warning(res.message)
         this.tableData = [];
         this.pageInfo.total = 0;
       }
@@ -224,28 +225,20 @@ export default {
       //选中的数组集合
       this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : [];
     },
-    //导出文件 
+     //导出文件 
     async download() {
-      if(this.changeList.length<=0){
-        this.$message.warning("请选择有效数据")
-        return;
-      }
-      let model = {
-        cgdNos:[]
-      }
-      this.changeList.forEach(item => {
-        model.cgdNos.push(item.cgdNo)
-      });
-      
-      // const res = await asyncRequest.exportcgdlist(model)
-
-
+      // if(this.changeList.length<=0){
+      //   this.$message.warning("请选择有效数据")
+      //   return;
+      // }
+      let model = JSON.parse(JSON.stringify(this.parmValue))
+      // model.is_export = 1;
       if (!this.loading) {
         this.loading = true;
         let httpType = `aplication/zip`;
         axios({
           method: "post",
-          url: this.fileUrl + "admin/exportcgdlist",
+          url: this.fileUrl + "admin/reportorderreturnlist",
           responseType: "blob",
           data: model,
           headers: {
@@ -268,7 +261,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/table9.vue

@@ -115,8 +115,8 @@ export default {
       parmValue: {
           start_date: "", //起始时间
           end_date: "", // 结束时间
-        start_date22: "", //起始时间22
-        end_date22: "", // 结束时间22
+        update_start_date: "", //起始时间22
+        update_end_date: "", // 结束时间22
         page: 1, // 页码
         size: 15, // 每页显示条数
        
@@ -156,16 +156,16 @@ export default {
       }
 
       if (
-        (this.parmValue.start_date22 !== "" && this.parmValue.end_date22 === "") ||
-        (this.parmValue.start_date22 === "" && this.parmValue.end_date22 !== "")
+        (this.parmValue.update_start_date !== "" && this.parmValue.update_end_date === "") ||
+        (this.parmValue.update_start_date === "" && this.parmValue.update_end_date !== "")
       ) {
         this.$message.warning("时间区间不完整！");
         return;
       }
-      return;
+      // return;
       this.loading = true;
       
-      const res = await asyncRequest.list(this.parmValue);
+      const res = await asyncRequest.reportsupplierlist(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.pageInfo.total = Number(res.data.count);
@@ -181,8 +181,10 @@ export default {
     //重置
     restSearch() {
       this.parmValue = {
-        start_date: "", //新建起始时间
-        end_date: "", // 新建结束时间
+        start_date: "", //起始时间
+          end_date: "", // 结束时间
+        update_start_date: "", //起始时间22
+        update_end_date: "", // 结束时间22
         page: 1, // 页码
         size: 15, // 每页显示条数
       };
@@ -203,8 +205,8 @@ export default {
     },
 
     async time2(e) {
-      this.parmValue.start_date22 = e.startTime || "";
-      this.parmValue.end_date22 = e.endTime || "";
+      this.parmValue.update_start_date = e.startTime || "";
+      this.parmValue.update_end_date = e.endTime || "";
       await this.searchList();
     },
      //选中触发函数
@@ -213,28 +215,20 @@ export default {
       //选中的数组集合
       this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : [];
     },
-    //导出文件 
+     //导出文件 
     async download() {
-      if(this.changeList.length<=0){
-        this.$message.warning("请选择有效数据")
-        return;
-      }
-      let model = {
-        cgdNos:[]
-      }
-      this.changeList.forEach(item => {
-        model.cgdNos.push(item.cgdNo)
-      });
-      
-      // const res = await asyncRequest.exportcgdlist(model)
-
-
+      // if(this.changeList.length<=0){
+      //   this.$message.warning("请选择有效数据")
+      //   return;
+      // }
+      let model = JSON.parse(JSON.stringify(this.parmValue))
+      // model.is_export = 1;
       if (!this.loading) {
         this.loading = true;
         let httpType = `aplication/zip`;
         axios({
           method: "post",
-          url: this.fileUrl + "admin/exportcgdlist",
+          url: this.fileUrl + "admin/reportsupplierlistexport",
           responseType: "blob",
           data: model,
           headers: {
@@ -257,7 +251,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();