Merge branch 'sit'

src/common/echart/index.vue

@@ -51,6 +51,7 @@ export default {
   beforeDestroy () {
     this.chart.dispose()
     this.chart = null
+    window.removeEventListener('resize', this.$_handleResizeChart)
   },
   methods: {
     initChart () {
@@ -58,12 +59,12 @@ export default {
       // 初始化echart
       this.chart = this.$echarts.init(this.$el, 'tdTheme')
       this.chart.setOption(this.options, true)
-
     
-    window.addEventListener("resize", ()=> {                
-      this.chart.resize();           
-    });
+    window.addEventListener("resize", this.$_handleResizeChart);
 
+    },
+    $_handleResizeChart(){
+      this.chart.resize(); 
     }
   }
 }

src/views/bigScreen/datavScr/index.vue

@@ -140,6 +140,8 @@ export default {
   beforeDestroy() {
     clearInterval(this.timing);
     clearInterval(this.time);
+    this.timing = null;
+    this.time = null;
   },
   methods: {
     timeFn() {

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

@@ -14,17 +14,17 @@ const table1 = [
   {
     prop: "addtime",
     label: "咨询时间",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "name",
     label: "业务部门",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "咨询数量",
-    minwidth: "155px",
+    minWidth: "155px",
   },
 ]
 //采购订单总金额
@@ -43,32 +43,32 @@ const table2 = [
   {
     prop: "addtime",
     label: "咨询时间",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "name",
     label: "业务部门",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total_fee",
     label: "采购金额",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "good_num",
     label: "数量",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "wait_total_fee",
     label: "待处理采购金额",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "wait_good_num",
     label: "待处理采购单数",
-    minwidth: "155px",
+    minWidth: "155px",
   },
 ]
 //采购员回复咨询单数
@@ -85,29 +85,29 @@ const table3 = [
   //   _noset_: true
   // },
   {
-    prop: "date",
+    prop: "addtime",
     label: "采反日期",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
-    prop: "date",
+    prop: "name",
     label: "创建人部门",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
-    prop: "name",
+    prop: "nickname",
     label: "采购员",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "采反次数",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "num",
     label: "采反商品数量",
-    minwidth: "155px",
+    minWidth: "155px",
   },
 ]
 //采购员订单金额
@@ -118,40 +118,40 @@ const table4 = [
   //   fixed: "left",
   //   _noset_: true,
   // },
+  // {
+  //   type: "selection",
+  //   fixed: "left",
+  //   _noset_: true
+  // },
   {
-    type: "selection",
-    fixed: "left",
-    _noset_: true
-  },
-  {
-    prop: "date",
+    prop: "addtime",
     label: "采购日期",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
-    prop: "name",
+    prop: "cgder",
     label: "采购员",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "good_num",
     label: "采购数量",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "total_fee",
     label: "采购货款",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "wait_good_num",
     label: "待处理采购数量",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "wait_total_fee",
     label: "待处理采购货款",
-    minwidth: "155px",
+    minWidth: "155px",
   },
 ]
 
@@ -171,77 +171,77 @@ const table5 = [
   {
     prop: "addtime",
     label: "咨询时间",
-    minwidth: "145px",
+    minWidth: "155px",
   },
   {
     prop: "bidNo",
     label: "采购反馈单号",
-    minwidth: "145px",
+    minWidth: "155px",
   },
   {
     prop: "zxNo",
     label: "咨询订单号",
-    minwidth: "145px",
+    minWidth: "155px",
   },
   {
     prop: "cbaddtime",
     label: "回复时间",
-    minwidth: "145px",
+    minWidth: "155px",
   },
   {
     prop: "good_name",
     label: "产品名称",
-    minwidth: "145px",
+    minWidth: "165px",
   },
   {
     prop: "supplier",
     label: "供应商名称",
-    minwidth: "145px",
+    minWidth: "165px",
   },
   {
     prop: "total_fee",
     label: "成本合计",
-    minwidth: "145px",
+    minWidth: "125px",
   },
   {
     prop: "delivery_day",
     label: "物流时间（天）",
-    minwidth: "145px",
+    minWidth: "95px",
   },
   {
     prop: "work_day",
     label: "产品工期（天）",
-    minwidth: "145px",
+    minWidth: "95px",
   },
   {
     prop: "expire_day",
     label: "信息有效期（天）",
-    minwidth: "155px",
+    minWidth: "95px",
   },
   {
     prop: "creater",
     label: "采购员",
-    minwidth: "145px",
+    minWidth: "95px",
   },
   {
     prop: "num",
     label: "需求数量",
-    minwidth: "145px",
+    minWidth: "105px",
   },
   {
     prop: "arrival_time",
     label: "要求到货日期",
-    minwidth: "145px",
+    minWidth: "155px",
   },
   {
     prop: "salesman",
     label: "业务人员",
-    minwidth: "145px",
+    minWidth: "105px",
   },
   {
     prop: "companyName",
     label: "客户名称",
-    minwidth: "145px",
+    minWidth: "195px",
   },
 ]
 
@@ -261,32 +261,32 @@ const table6 = [
   {
     prop: "date",
     label: "咨询订单号",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "产品名称",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "需求数量",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "客户名称",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "咨询时间",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "截止时间",
-    minwidth: "155px",
+    minWidth: "155px",
   },
 ]
 
@@ -307,72 +307,72 @@ const table7 = [
   {
     prop: "date",
     label: "采购单编号",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "创建时间",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "供应商编号",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "供应商名称",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "产品名称",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "购买数量",
-    minwidth: "110px",
+    minWidth: "110px",
   },
   {
     prop: "total",
     label: "裸价",
-    minwidth: "100px",
+    minWidth: "100px",
   },
   {
     prop: "total",
     label: "成本合计",
-    minwidth: "110px",
+    minWidth: "110px",
   },
   {
     prop: "total",
     label: "单据状态",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "未发货数量",
-    minwidth: "110px",
+    minWidth: "110px",
   },
   {
     prop: "total",
     label: "创建人",
-    minwidth: "110px",
+    minWidth: "110px",
   },
   {
     prop: "total",
     label: "客户名称",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "采购员",
-    minwidth: "110px",
+    minWidth: "110px",
   },
   {
     prop: "total",
     label: "发货时间",
-    minwidth: "155px",
+    minWidth: "155px",
   },
 
 ]
@@ -394,57 +394,57 @@ const table8 = [
   {
     prop: "date",
     label: "售后单编号",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "创建时间",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "采购单编号",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "供应商名称",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "产品名称",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "购买数量",
-    minwidth: "105px",
+    minWidth: "105px",
   },
   {
     prop: "total",
     label: "签收日期",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "提出售后日期",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "售后数量",
-    minwidth: "105px",
+    minWidth: "105px",
   },
   {
     prop: "total",
     label: "问题描述",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "售后状态",
-    minwidth: "155px",
+    minWidth: "155px",
   },
 ]
 
@@ -465,42 +465,42 @@ const table9 = [
   {
     prop: "date",
     label: "录入供应商时间",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "供应商名称",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "采购维护人",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "供应商性质",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "供应商来源",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "付款方式",
-    minwidth: "125px",
+    minWidth: "125px",
   },
   {
     prop: "total",
     label: "发货方式",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "修改供应商时间",
-    minwidth: "155px",
+    minWidth: "155px",
   },
 ]
 
@@ -521,57 +521,57 @@ const table10 = [
   {
     prop: "date",
     label: "退货单号",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "退货时间",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "采购单编号",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "供应商名称",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "产品名称",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "购买数量",
-    minwidth: "105px",
+    minWidth: "105px",
   },
   {
     prop: "total",
     label: "采购员",
-    minwidth: "105px",
+    minWidth: "105px",
   },
   {
     prop: "total",
     label: "退货数量",
-    minwidth: "115px",
+    minWidth: "115px",
   },
   {
     prop: "total",
     label: "已发货数量",
-    minwidth: "115px",
+    minWidth: "115px",
   },
   {
     prop: "total",
     label: "退货原因",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "供应商是否可以退货",
-    minwidth: "155px",
+    minWidth: "155px",
   },
 ]
 
@@ -591,52 +591,52 @@ const table11 = [
   {
     prop: "date",
     label: "采购维护人",
-    minwidth: "125px",
+    minWidth: "125px",
   },
   {
     prop: "total",
     label: "产品编号(skuCode)",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "产品编号(spuCode)",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "产品名称",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "品牌名称",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "产品型号",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "供应商名称",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "税点",
-    minwidth: "105px",
+    minWidth: "105px",
   },
   {
     prop: "total",
     label: "成本价合计",
-    minwidth: "115px",
+    minWidth: "115px",
   },
   {
     prop: "total",
     label: "上线时间",
-    minwidth: "155px",
+    minWidth: "155px",
   },
 
 ]
@@ -657,32 +657,32 @@ const table12 = [
   {
     prop: "date",
     label: "产品下线时间",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "采购维护人",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "产品编号(skuCode)",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "产品编号(spuCode)",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "产品名称",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "供应商名称",
-    minwidth: "155px",
+    minWidth: "155px",
   },
 ]
 
@@ -702,27 +702,27 @@ const table13 = [
   {
     prop: "date",
     label: "产品操作时间",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "采购维护人",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "产品编号(spuCode)",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "产品名称",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "供应商名称",
-    minwidth: "155px",
+    minWidth: "155px",
   },
 ]
 
@@ -743,82 +743,82 @@ const table14 = [
   {
     prop: "date",
     label: "创建人",
-    minwidth: "115px",
+    minWidth: "115px",
   },
   {
     prop: "total",
     label: "创建人公司",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "创建人部门",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "创建时间",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "单据状态",
-    minwidth: "115px",
+    minWidth: "115px",
   },
   {
     prop: "total",
     label: "采购单号",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "出入库类型",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "产品名称",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "产品编码",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "出入库数量",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "出入库日期",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "维护人员",
-    minwidth: "115px",
+    minWidth: "115px",
   },
   {
     prop: "total",
     label: "发起人",
-    minwidth: "115px",
+    minWidth: "115px",
   },
   {
     prop: "total",
     label: "库房性质",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "库房公司",
-    minwidth: "155px",
+    minWidth: "155px",
   },
   {
     prop: "total",
     label: "库房名称",
-    minwidth: "155px",
+    minWidth: "155px",
   },
 
 ]

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

@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <div style="width: 100%">
+  <div v-loading="loading">
+    <div style="width: 100%" >
       <el-row style="padding: 10px 0 0 0px">
         <el-col :span="6" style="width: 363px">
           <periodDatePickerActive
@@ -12,7 +12,7 @@
             @timeReturned="time"
           />
         </el-col>
-        <el-col :span="4" style="width: 66px; float: right">
+        <!-- <el-col :span="4" style="width: 66px; float: right">
           <el-button
             type="primary"
             style="margin-left: 30px"
@@ -22,7 +22,7 @@
           >
             导出
           </el-button>
-        </el-col>
+        </el-col> -->
         <el-col :span="3" style="width: 66px; float: right">
           <el-button
             :size="searchSize"
@@ -62,8 +62,8 @@
         :size="searchSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="pageInfo.total"
-        @size-change="$emit('page-size-change', $event)"
-        @current-change="$emit('page-curr-change', $event)"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
       />
   </div>
 </template>
@@ -125,6 +125,16 @@ export default {
   },
 
   methods: {
+     //分页集合
+    handleSizeChange(val){
+      this.parmValue.size = val;
+      this.parmValue.page = 1;
+      this.searchList() 
+    },
+    handleCurrentChange(val){
+      this.parmValue.page = val;
+      this.searchList()
+    },
      //合并方法
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (columnIndex == 0) {
@@ -227,71 +237,71 @@ 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);
-      });
+    // 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)
+    //   // const res = await asyncRequest.exportcgdlist(model)
 
-      if (!this.loading) {
-        this.loading = true;
-        let httpType = `aplication/zip`;
-        axios({
-          method: "post",
-          url: this.fileUrl + "admin/exportcgdlist",
-          responseType: "blob",
-          data: model,
-          headers: {
-            // 'Content-Type': 'multipart/form-data',
-            // Accept: "application/vnd.ms-excel"
-            Accept: httpType,
-          },
-        })
-          .then((res) => {
-            // console.log(res)
-            // console.log(this.fileUrl)
-            // return;
-            if (res && res.status == 200 && res.data) {
-              let url = window.URL.createObjectURL(
-                new Blob([res.data], {
-                  // type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
-                  type: httpType,
-                })
-              );
-              let link = document.createElement("a");
-              link.style.display = "none";
-              link.href = url;
-              let excelName = "采购单.zip";
-              link.setAttribute("download", excelName);
-              document.body.appendChild(link);
-              link.click();
-              link.remove();
-              window.URL.revokeObjectURL(url); //释放掉blob对象
-              this.$message.success(`导出成功！`);
-              setTimeout(() => {
-                this.loading = false;
-              }, 500);
-            } else {
-              this.$message.error(res.data.message);
-              setTimeout(() => {
-                this.loading = false;
-              }, 500);
-            }
-          })
-          .catch((error) => {
-            console.log(error);
-            this.loading = false;
-          });
-      }
-    },
+    //   if (!this.loading) {
+    //     this.loading = true;
+    //     let httpType = `aplication/zip`;
+    //     axios({
+    //       method: "post",
+    //       url: this.fileUrl + "admin/exportcgdlist",
+    //       responseType: "blob",
+    //       data: model,
+    //       headers: {
+    //         // 'Content-Type': 'multipart/form-data',
+    //         // Accept: "application/vnd.ms-excel"
+    //         Accept: httpType,
+    //       },
+    //     })
+    //       .then((res) => {
+    //         // console.log(res)
+    //         // console.log(this.fileUrl)
+    //         // return;
+    //         if (res && res.status == 200 && res.data) {
+    //           let url = window.URL.createObjectURL(
+    //             new Blob([res.data], {
+    //               // type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
+    //               type: httpType,
+    //             })
+    //           );
+    //           let link = document.createElement("a");
+    //           link.style.display = "none";
+    //           link.href = url;
+    //           let excelName = "采购单.zip";
+    //           link.setAttribute("download", excelName);
+    //           document.body.appendChild(link);
+    //           link.click();
+    //           link.remove();
+    //           window.URL.revokeObjectURL(url); //释放掉blob对象
+    //           this.$message.success(`导出成功！`);
+    //           setTimeout(() => {
+    //             this.loading = false;
+    //           }, 500);
+    //         } else {
+    //           this.$message.error(res.data.message);
+    //           setTimeout(() => {
+    //             this.loading = false;
+    //           }, 500);
+    //         }
+    //       })
+    //       .catch((error) => {
+    //         console.log(error);
+    //         this.loading = false;
+    //       });
+    //   }
+    // },
   },
 };
 </script>
@@ -299,5 +309,9 @@ export default {
 .purchaseOrder {
   // text-align: right;
 }
+/deep/ .el-pagination{
+  float: right;
+    margin-top: 10px;
+}
 </style>
    

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-loading="loading">
     <div style="width: 100%">
       <el-row style="padding: 10px 0 0 0px">
         <el-col :span="6" style="width: 363px">
@@ -12,7 +12,7 @@
             @timeReturned="time"
           />
         </el-col>
-        <el-col :span="4" style="width: 66px; float: right">
+        <!-- <el-col :span="4" style="width: 66px; float: right">
           <el-button
             type="primary"
             style="margin-left: 30px"
@@ -22,7 +22,7 @@
           >
             导出
           </el-button>
-        </el-col>
+        </el-col> -->
         <el-col :span="3" style="width: 66px; float: right">
           <el-button
             :size="searchSize"
@@ -62,8 +62,8 @@
         :size="searchSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="pageInfo.total"
-        @size-change="$emit('page-size-change', $event)"
-        @current-change="$emit('page-curr-change', $event)"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
       />
   </div>
 </template>
@@ -125,6 +125,17 @@ export default {
   },
 
   methods: {
+     //分页集合
+    handleSizeChange(val){
+      this.parmValue.size = val;
+      this.parmValue.page = 1;
+
+      this.searchList() 
+    },
+    handleCurrentChange(val){
+      this.parmValue.page = val;
+      this.searchList()
+    },
      //合并方法
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (columnIndex == 0) {
@@ -226,71 +237,71 @@ 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);
-      });
+    // 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)
+    //   // const res = await asyncRequest.exportcgdlist(model)
 
-      if (!this.loading) {
-        this.loading = true;
-        let httpType = `aplication/zip`;
-        axios({
-          method: "post",
-          url: this.fileUrl + "admin/exportcgdlist",
-          responseType: "blob",
-          data: model,
-          headers: {
-            // 'Content-Type': 'multipart/form-data',
-            // Accept: "application/vnd.ms-excel"
-            Accept: httpType,
-          },
-        })
-          .then((res) => {
-            // console.log(res)
-            // console.log(this.fileUrl)
-            // return;
-            if (res && res.status == 200 && res.data) {
-              let url = window.URL.createObjectURL(
-                new Blob([res.data], {
-                  // type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
-                  type: httpType,
-                })
-              );
-              let link = document.createElement("a");
-              link.style.display = "none";
-              link.href = url;
-              let excelName = "采购单.zip";
-              link.setAttribute("download", excelName);
-              document.body.appendChild(link);
-              link.click();
-              link.remove();
-              window.URL.revokeObjectURL(url); //释放掉blob对象
-              this.$message.success(`导出成功！`);
-              setTimeout(() => {
-                this.loading = false;
-              }, 500);
-            } else {
-              this.$message.error(res.data.message);
-              setTimeout(() => {
-                this.loading = false;
-              }, 500);
-            }
-          })
-          .catch((error) => {
-            console.log(error);
-            this.loading = false;
-          });
-      }
-    },
+    //   if (!this.loading) {
+    //     this.loading = true;
+    //     let httpType = `aplication/zip`;
+    //     axios({
+    //       method: "post",
+    //       url: this.fileUrl + "admin/exportcgdlist",
+    //       responseType: "blob",
+    //       data: model,
+    //       headers: {
+    //         // 'Content-Type': 'multipart/form-data',
+    //         // Accept: "application/vnd.ms-excel"
+    //         Accept: httpType,
+    //       },
+    //     })
+    //       .then((res) => {
+    //         // console.log(res)
+    //         // console.log(this.fileUrl)
+    //         // return;
+    //         if (res && res.status == 200 && res.data) {
+    //           let url = window.URL.createObjectURL(
+    //             new Blob([res.data], {
+    //               // type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
+    //               type: httpType,
+    //             })
+    //           );
+    //           let link = document.createElement("a");
+    //           link.style.display = "none";
+    //           link.href = url;
+    //           let excelName = "采购单.zip";
+    //           link.setAttribute("download", excelName);
+    //           document.body.appendChild(link);
+    //           link.click();
+    //           link.remove();
+    //           window.URL.revokeObjectURL(url); //释放掉blob对象
+    //           this.$message.success(`导出成功！`);
+    //           setTimeout(() => {
+    //             this.loading = false;
+    //           }, 500);
+    //         } else {
+    //           this.$message.error(res.data.message);
+    //           setTimeout(() => {
+    //             this.loading = false;
+    //           }, 500);
+    //         }
+    //       })
+    //       .catch((error) => {
+    //         console.log(error);
+    //         this.loading = false;
+    //       });
+    //   }
+    // },
   },
 };
 </script>
@@ -298,5 +309,9 @@ export default {
 .purchaseOrder {
   // text-align: right;
 }
+/deep/ .el-pagination{
+  float: right;
+    margin-top: 10px;
+}
 </style>
    

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

@@ -1,18 +1,18 @@
 <template>
-  <div>
+  <div v-loading="loading">
     <div style="width: 100%">
       <el-row style="padding: 10px 0 0 0px">
         <el-col :span="6" style="width: 363px">
           <periodDatePickerActive
             :start="parmValue.start_date"
             :end="parmValue.end_date"
-            :placeholder="'咨询'"
+            :placeholder="'采反'"
             :width="'165px'"
             :size="searchSize"
             @timeReturned="time"
           />
         </el-col>
-        <el-col :span="4" style="width: 66px; float: right">
+        <!-- <el-col :span="4" style="width: 66px; float: right">
           <el-button
             type="primary"
             style="margin-left: 30px"
@@ -22,7 +22,7 @@
           >
             导出
           </el-button>
-        </el-col>
+        </el-col> -->
         <el-col :span="3" style="width: 66px; float: right">
           <el-button
             :size="searchSize"
@@ -62,8 +62,8 @@
         :size="searchSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="pageInfo.total"
-        @size-change="$emit('page-size-change', $event)"
-        @current-change="$emit('page-curr-change', $event)"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
       />
   </div>
 </template>
@@ -125,6 +125,17 @@ export default {
   },
 
   methods: {
+     //分页集合
+    handleSizeChange(val){
+      this.parmValue.size = val;
+      this.parmValue.page = 1;
+
+      this.searchList() 
+    },
+    handleCurrentChange(val){
+      this.parmValue.page = val;
+      this.searchList()
+    },
      //合并方法
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (columnIndex == 0) {
@@ -135,6 +146,14 @@ export default {
           colspan: 1,
         };
       }
+      if (columnIndex == 1) {
+        //合并相同的名字
+        let nameSpan = this.getSpanNumber(this.tableData, "name");
+        return {
+          rowspan: nameSpan[rowIndex],
+          colspan: 1,
+        };
+      }
     },
     //获取要合并的行数
     getSpanNumber(data, prop) {
@@ -226,71 +245,71 @@ 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);
-      });
+    // 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)
+    //   // const res = await asyncRequest.exportcgdlist(model)
 
-      if (!this.loading) {
-        this.loading = true;
-        let httpType = `aplication/zip`;
-        axios({
-          method: "post",
-          url: this.fileUrl + "admin/exportcgdlist",
-          responseType: "blob",
-          data: model,
-          headers: {
-            // 'Content-Type': 'multipart/form-data',
-            // Accept: "application/vnd.ms-excel"
-            Accept: httpType,
-          },
-        })
-          .then((res) => {
-            // console.log(res)
-            // console.log(this.fileUrl)
-            // return;
-            if (res && res.status == 200 && res.data) {
-              let url = window.URL.createObjectURL(
-                new Blob([res.data], {
-                  // type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
-                  type: httpType,
-                })
-              );
-              let link = document.createElement("a");
-              link.style.display = "none";
-              link.href = url;
-              let excelName = "采购单.zip";
-              link.setAttribute("download", excelName);
-              document.body.appendChild(link);
-              link.click();
-              link.remove();
-              window.URL.revokeObjectURL(url); //释放掉blob对象
-              this.$message.success(`导出成功！`);
-              setTimeout(() => {
-                this.loading = false;
-              }, 500);
-            } else {
-              this.$message.error(res.data.message);
-              setTimeout(() => {
-                this.loading = false;
-              }, 500);
-            }
-          })
-          .catch((error) => {
-            console.log(error);
-            this.loading = false;
-          });
-      }
-    },
+    //   if (!this.loading) {
+    //     this.loading = true;
+    //     let httpType = `aplication/zip`;
+    //     axios({
+    //       method: "post",
+    //       url: this.fileUrl + "admin/exportcgdlist",
+    //       responseType: "blob",
+    //       data: model,
+    //       headers: {
+    //         // 'Content-Type': 'multipart/form-data',
+    //         // Accept: "application/vnd.ms-excel"
+    //         Accept: httpType,
+    //       },
+    //     })
+    //       .then((res) => {
+    //         // console.log(res)
+    //         // console.log(this.fileUrl)
+    //         // return;
+    //         if (res && res.status == 200 && res.data) {
+    //           let url = window.URL.createObjectURL(
+    //             new Blob([res.data], {
+    //               // type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
+    //               type: httpType,
+    //             })
+    //           );
+    //           let link = document.createElement("a");
+    //           link.style.display = "none";
+    //           link.href = url;
+    //           let excelName = "采购单.zip";
+    //           link.setAttribute("download", excelName);
+    //           document.body.appendChild(link);
+    //           link.click();
+    //           link.remove();
+    //           window.URL.revokeObjectURL(url); //释放掉blob对象
+    //           this.$message.success(`导出成功！`);
+    //           setTimeout(() => {
+    //             this.loading = false;
+    //           }, 500);
+    //         } else {
+    //           this.$message.error(res.data.message);
+    //           setTimeout(() => {
+    //             this.loading = false;
+    //           }, 500);
+    //         }
+    //       })
+    //       .catch((error) => {
+    //         console.log(error);
+    //         this.loading = false;
+    //       });
+    //   }
+    // },
   },
 };
 </script>
@@ -298,5 +317,9 @@ export default {
 .purchaseOrder {
   // text-align: right;
 }
+/deep/ .el-pagination{
+  float: right;
+    margin-top: 10px;
+}
 </style>
    

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

@@ -1,112 +1,71 @@
 <template>
-    <div>
-      <ex-table
-        v-loading="loading"
-        :table="table"
-        :data="tableData"
-        :columns="table4"
-        :page="pageInfo"
-        :size="size"
-        @page-curr-change="handlePageChange"
-        @page-size-change="handleSizeChange"
-        @screen-reset="
-          pageInfo.curr = 1;
-          parmValue.page = 1;
-          searchList();
-        "
-        @screen-submit="
-          pageInfo.curr = 1;
-          parmValue.page = 1;
-          searchList();
-        "
-        @selection="selection_change"
-      >
-        <template #table-header="{}">
-          <div style="width: 100%">
-            <el-row style="padding: 0 0 0 80px">
-             
-               <el-col :span="6" style="width: 363px;">
-                <periodDatePickerActive
-                      :start="parmValue.start_date"
-                      :end="parmValue.end_date"
-                      :placeholder="'采购'"
-                      :width="'165px'"
-                      :size="searchSize"
-                      @timeReturned="time"
-                    />
-              </el-col>  
-              <el-col :span="4" style="width: 66px; float: right">       
-                <el-button type="primary" style="margin-left:30px;" @click="download" :size="searchSize"  class="fr">
-                    导出
-                </el-button>
-              </el-col>
-              <el-col :span="3" style="width: 66px; float: right">
-                <el-button
-                  :size="searchSize"
-                  type="primary"
-                  style="float: right; margin-left: 5px"
-                  @click="searchList"
-                >
-                  刷新
-                </el-button>
-              </el-col>
-              <el-col :span="4" style="width: 66px; float: right">
-                <el-button
-                  type="warning"
-                  class="fr"
-                  :size="searchSize"
-                  @click="restSearch"
-                >
-                  重置
-                </el-button>
-              </el-col>  
-            </el-row>
-            <!-- <el-row style="padding: 10px 0 0 0">
-              
-              <el-col :span="6" style="width: 363px;">
-                <periodDatePickerActive
-                      :start="parmValue.start_date"
-                      :end="parmValue.end_date"
-                      :placeholder="'导入'"
-                      :width="'165px'"
-                      :size="searchSize"
-                      @timeReturned="time"
-                    />
-              </el-col>  
-              <el-col :span="4" style="width: 66px; float: right">       
-                <el-button type="primary" style="margin-left:30px;" @click="download" :size="searchSize"  class="fr">
-                    导出
-                </el-button>
-              </el-col>
-              <el-col :span="3" style="width: 66px; float: right">
-                <el-button
-                  :size="searchSize"
-                  type="primary"
-                  style="float: right; margin-left: 5px"
-                  @click="searchList"
-                >
-                  刷新
-                </el-button>
-              </el-col>
-              <el-col :span="4" style="width: 66px; float: right">
-                <el-button
-                  type="warning"
-                  class="fr"
-                  :size="searchSize"
-                  @click="restSearch"
-                >
-                  重置
-                </el-button>
-              </el-col>     
-            </el-row> -->
-          </div>
-       </template>
-
-        
-      </ex-table>
+  <div v-loading="loading">
+    <div style="width: 100%">
+      <el-row style="padding: 10px 0 0 0px">
+        <el-col :span="6" style="width: 363px">
+          <periodDatePickerActive
+            :start="parmValue.start_date"
+            :end="parmValue.end_date"
+            :placeholder="'采购'"
+            :width="'165px'"
+            :size="searchSize"
+            @timeReturned="time"
+          />
+        </el-col>
+        <!-- <el-col :span="4" style="width: 66px; float: right">
+          <el-button
+            type="primary"
+            style="margin-left: 30px"
+            @click="download"
+            :size="searchSize"
+            class="fr"
+          >
+            导出
+          </el-button>
+        </el-col> -->
+        <el-col :span="3" style="width: 66px; float: right">
+          <el-button
+            :size="searchSize"
+            type="primary"
+            style="float: right; margin-left: 5px"
+            @click="searchList"
+          >
+            刷新
+          </el-button>
+        </el-col>
+        <el-col :span="4" style="width: 66px; float: right">
+          <el-button
+            type="warning"
+            class="fr"
+            :size="searchSize"
+            @click="restSearch"
+          >
+            重置
+          </el-button>
+        </el-col>
+      </el-row>
     </div>
-
-  
+    <el-table
+      :data="tableData"
+      :size="searchSize"
+      :span-method="objectSpanMethod"
+      border
+      style="width: 100%; margin-top: 20px"
+    >
+      <el-table-column :prop="item.prop" :label="item.label" v-for="(item,index) in table4" :key="index"/>
+      
+    </el-table>
+    <el-pagination
+        :current-page="pageInfo.curr"
+        :page-sizes="[15, 50, 100]"
+        :page-size="pageInfo.size"
+        :size="searchSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="pageInfo.total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+  </div>
 </template>
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
@@ -114,18 +73,17 @@ import resToken from "@/mixins/resToken";
 import urlConfig from "@/apis/url-config";
 import asyncRequest from "@/apis/service/reportQuery/purchaseReport";
 import periodDatePickerActive from "../period-date-picker/main.vue";
-import { table4} from "./columns";
+import { table4 } from "./columns";
 import { mapGetters } from "vuex";
 
 export default {
   name: "purchaseOrder",
   mixins: [mixinPage, resToken],
   components: {
-    periodDatePickerActive
+    periodDatePickerActive,
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
-    
   },
   data() {
     return {
@@ -137,16 +95,15 @@ export default {
       loading: false,
       //请求参数集合
       parmValue: {
-        
         start_date: "", //起始时间
         end_date: "", // 结束时间
 
         page: 1, // 页码
         size: 15, // 每页显示条数
-       
       },
       // 表格 - 数据集合
-      tableData: [],
+      tableData: [
+      ],
       // 表格 - 参数
       table: {
         stripe: true,
@@ -168,6 +125,60 @@ export default {
   },
 
   methods: {
+    //分页集合
+    handleSizeChange(val){
+      this.parmValue.size = val;
+      this.parmValue.page = 1;
+      this.searchList() 
+    },
+    handleCurrentChange(val){
+      this.parmValue.page = val;
+      this.searchList()
+    },
+     //合并方法
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex == 0) {
+        //合并相同的名字
+        let nameSpan = this.getSpanNumber(this.tableData, "addtime");
+        return {
+          rowspan: nameSpan[rowIndex],
+          colspan: 1,
+        };
+      }
+    },
+    //获取要合并的行数
+    getSpanNumber(data, prop) {
+      //data要处理的数组，prop要合并的属性，比如name
+
+      //数组的长度，有时候后台可能返回个null而不是[]
+      let length = Array.isArray(data) ? data.length : 0;
+      if (length > 0) {
+        //用于标识位置
+        let position = 0;
+        //用于对比的数据
+        let temp = data[0][prop];
+        //要返回的结果
+        let result = [1];
+        //假设数据是AABCC，我们的目标就是返回20120
+        for (let i = 1; i < length; i++) {
+          if (data[i][prop] == temp) {
+            //标识位置的数据加一
+            result[position] += 1;
+            //当前位置添0
+            result[i] = 0;
+          } else {
+            //不相同时，修改标识位置，该位置设为1，修改对比值
+            position = i;
+            result[i] = 1;
+            temp = data[i][prop];
+          }
+        }
+        //返回结果
+        return result;
+      } else {
+        return [0];
+      }
+    },
     //初始化http请求
     async searchList() {
       if (
@@ -177,10 +188,11 @@ export default {
         this.$message.warning("时间区间不完整！");
         return;
       }
-      return;
+      // return;
       this.loading = true;
-      
-      const res = await asyncRequest.list(this.parmValue);
+
+      const res = await asyncRequest.reportpurcheaseordersumbyuser(this.parmValue);
+      console.log(res)
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.pageInfo.total = Number(res.data.count);
@@ -189,10 +201,11 @@ export default {
       } else {
         this.tableData = [];
         this.pageInfo.total = 0;
+        this.$message.warning(res.message)
       }
       this.loading = false;
     },
-   
+
     //重置
     restSearch() {
       this.parmValue = {
@@ -209,7 +222,7 @@ export default {
       };
       this.searchList();
     },
-    
+
     // 时间函数
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
@@ -217,79 +230,78 @@ export default {
       await this.searchList();
     },
 
-     //选中触发函数
+    //选中触发函数
     selection_change(e) {
       const { list } = e;
       //选中的数组集合
       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)
+    //导出文件
+    // 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.loading) {
-        this.loading = true;
-        let httpType = `aplication/zip`;
-        axios({
-          method: "post",
-          url: this.fileUrl + "admin/exportcgdlist",
-          responseType: "blob",
-          data: model,
-          headers: {
-            // 'Content-Type': 'multipart/form-data',
-            // Accept: "application/vnd.ms-excel"
-            Accept: httpType,
-          },
-        })
-          .then((res) => {
-            // console.log(res)
-            // console.log(this.fileUrl)
-            // return;
-            if (res && res.status == 200 && res.data) {
-              let url = window.URL.createObjectURL(
-                new Blob([res.data], {
-                  // type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
-                  type: httpType
-                })
-              );
-              let link = document.createElement("a");
-              link.style.display = "none";
-              link.href = url;
-              let excelName = "采购单.zip";
-              link.setAttribute("download", excelName);
-              document.body.appendChild(link);
-              link.click();
-              link.remove();
-              window.URL.revokeObjectURL(url); //释放掉blob对象
-              this.$message.success(`导出成功！`);
-              setTimeout(() => {
-                this.loading = false;
-              }, 500);
-            } else {
-              this.$message.error(res.data.message);
-              setTimeout(() => {
-                this.loading = false;
-              }, 500);
-            }
-          })
-          .catch((error) => {
-            console.log(error);
-            this.loading = false;
-          });
-      }
-    },
+    //   if (!this.loading) {
+    //     this.loading = true;
+    //     let httpType = `aplication/zip`;
+    //     axios({
+    //       method: "post",
+    //       url: this.fileUrl + "admin/exportcgdlist",
+    //       responseType: "blob",
+    //       data: model,
+    //       headers: {
+    //         // 'Content-Type': 'multipart/form-data',
+    //         // Accept: "application/vnd.ms-excel"
+    //         Accept: httpType,
+    //       },
+    //     })
+    //       .then((res) => {
+    //         // console.log(res)
+    //         // console.log(this.fileUrl)
+    //         // return;
+    //         if (res && res.status == 200 && res.data) {
+    //           let url = window.URL.createObjectURL(
+    //             new Blob([res.data], {
+    //               // type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
+    //               type: httpType,
+    //             })
+    //           );
+    //           let link = document.createElement("a");
+    //           link.style.display = "none";
+    //           link.href = url;
+    //           let excelName = "采购单.zip";
+    //           link.setAttribute("download", excelName);
+    //           document.body.appendChild(link);
+    //           link.click();
+    //           link.remove();
+    //           window.URL.revokeObjectURL(url); //释放掉blob对象
+    //           this.$message.success(`导出成功！`);
+    //           setTimeout(() => {
+    //             this.loading = false;
+    //           }, 500);
+    //         } else {
+    //           this.$message.error(res.data.message);
+    //           setTimeout(() => {
+    //             this.loading = false;
+    //           }, 500);
+    //         }
+    //       })
+    //       .catch((error) => {
+    //         console.log(error);
+    //         this.loading = false;
+    //       });
+    //   }
+    // },
   },
 };
 </script>
@@ -297,5 +309,9 @@ export default {
 .purchaseOrder {
   // text-align: right;
 }
+/deep/ .el-pagination{
+  float: right;
+    margin-top: 10px;
+}
 </style>
    

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

@@ -172,6 +172,7 @@ export default {
       } else {
         this.tableData = [];
         this.pageInfo.total = 0;
+        this.$message.warning(res.message)
       }
       this.loading = false;
     },