Merge branch 'sit'

public/index.html

@@ -58,7 +58,6 @@
       <!-- <p style="width: 100%;text-align: center;color: #606266;">努力加载中...</p> -->
     </div>
   </div>
-  <!-- built files will be auto injected -->
 </body>
 
 </html>

src/common/echart/index.vue

@@ -54,17 +54,12 @@ export default {
   },
   methods: {
     initChart () {
+      // console.log(this.$router)
       // 初始化echart
       this.chart = this.$echarts.init(this.$el, 'tdTheme')
       this.chart.setOption(this.options, true)
 
-      // console.log(this.chart)
-
-    //  window.onresize =  (ec) => { // 监听窗口大小变化
-    //     console.log(ec)
-    //     this.chart.resize()
-    //     // myChart1.resize()       // 自适应大小变化
-    // }
+    
     window.addEventListener("resize", ()=> {                
       this.chart.resize();           
     });

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

@@ -103,7 +103,11 @@ export default {
   },
   methods:{
    async initHttp(){
-      let res = await asyncRequest.datatordertransferratetoday();
+    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) => {

src/layout/components/Navbar.vue

@@ -14,7 +14,7 @@
         <i
           v-if="isShow"
           class="el-icon-message-solid right-menu-item hover-effect shake"
-          @click="openNotice"
+          @click="openNotice()"
           style="height: 50px; width: 40px; line-height: 52px; font-size: 22px"
         />
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
@@ -157,79 +157,97 @@ export default {
     };
   },
   mounted() {
-    this.openNotice(1);
+    this.openNotice(true);
   },
   methods: {
-    async openNotice(type) {
+    async openNotice(is) {
       if (getNotice() && getNotice().length > 0) {
         this.lastNotice = JSON.parse(getNotice());
       } else {
         this.lastNotice = null;
       }
-      console.log(this.lastNotice);
-      this.loading = true;
-      const { code, data } = await asyncRequest.list(this.parmValue);
+      const { code, count, item, message } = await this.initData();
       if (code === 0) {
-        const { list, count } = data;
-        if (count !== 0) {
-          this.activeMsg = list[0];
-          this.isShow = true;
-          if (this.lastNotice + "" !== "null") {
-            const { type, addtime, sys_type } = this.activeMsg;
-            if (
-              addtime === this.lastNotice.addtime &&
-              sys_type === this.lastNotice.sys_type
-            ) {
-              if (type === "1") {
-                this.checked = true;
-              } else {
-                this.checked = false;
-              }
+        if (count != 0) {
+          this.activeMsg = item;
+          if (this.lastNotice + "" === "null") {
+            this.showModel = true;
+          } else {
+            if (is) {
+              this.typeShow();
             } else {
-              this.checked = false;
+              this.showModel = true;
             }
-          } else {
-            this.page_set_notice();
-            this.checked = false;
-          }
-          if (type === 1) {
-            this.typeShow();
-          } else {
-            this.showModel = true;
           }
         } else {
-          this.$message.warning("暂无信息推送！");
+          this.$message.warning("暂无系统消息！");
         }
       } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
-        this.activeMsg = null;
-        this.isShow = false;
+        this.$message.warning(message);
       }
+    },
+
+    async initData() {
+      let res = {
+        code: 0,
+        count: 0,
+        item: {},
+        message: "",
+      };
+
+      this.loading = true;
+      const { code, data, message } = await asyncRequest.list(this.parmValue);
       this.loading = false;
+      res.code = code;
+      res.message = message;
+      if (code === 0) {
+        const { list, count } = data;
+        res.count = count;
+        if (count !== 0) {
+          res.item = JSON.parse(JSON.stringify(list[0]));
+        }
+      }
+      return res;
     },
     typeShow() {
+      const {
+        addtime: laddtime,
+        type: ltype,
+        sys_type: lsys_type,
+      } = this.lastNotice;
+      const { sys_type, addtime } = this.activeMsg;
+      if (laddtime === addtime && lsys_type === sys_type) {
+        if (ltype === "1") {
+          this.showModel = this.is_Tips();
+        } else {
+          this.showModel = true;
+        }
+      } else {
+        this.showModel = true;
+      }
+    },
+    is_Tips() {
       let nowtime = new Date().valueOf();
-      if (this.activeMsg.sys_type === "VER") {
-        this.statsTime = new Date(this.activeMsg.addtime).valueOf();
+      console.log(this.lastNotice);
+      const { sys_type, addtime } = this.activeMsg;
+      let timeV = new Date(addtime).valueOf();
+      if (sys_type === "VER") {
+        this.statsTime = timeV;
         this.endTime = this.statsTime + 1000 * 60 * 60 * 24 * 7;
-
-        if (
-          nowtime > this.statsTime &&
-          nowtime < this.endTime &&
-          !this.checked
-        ) {
-          this.showModel = true;
+        if (nowtime >= this.statsTime && nowtime <= this.endTime) {
+          return false;
         } else {
-          this.showModel = false;
+          return true;
         }
       } else {
         this.statsTime = 0;
-        this.endTime = new Date(this.activeMsg.addtime).valueOf();
-        if (nowtime < this.endTime && !this.checked) {
-          this.showModel = true;
+        this.endTime = timeV;
+        if (nowtime <= this.endTime) {
+          return false;
         } else {
-          this.showModel = false;
+          return true;
         }
       }
     },

src/main.js

@@ -60,7 +60,6 @@ Vue.use(PuzzleVerification)
 
 // register global utility filters
 Object.keys(filters).forEach(key => {
-  console.log("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",key)
   Vue.filter(key, filters[key])
 })
 

src/store/modules/user.js

@@ -193,7 +193,7 @@ const actions = {
               })
               arrag.push(pItem)
             })
-            console.log(arrag);
+            // console.log(arrag);
 
             list.forEach(asd => {
               // console.log(asd);

src/views/bigScreen/datavScr/index.vue

@@ -15,6 +15,7 @@
                   :reverse="true"
                   :color="['#50e3c2', '#67a1e5']"
                 />
+                
               </div>
               <dv-decoration-8
                 class="dv-dec-8"
@@ -49,7 +50,7 @@
             </div>
           </div>
 
-          <div class="body-box">
+          <div class="body-box" v-if="initFlag">
             <!-- 第三行数据 -->
             <div class="content-box">
               <div>
@@ -118,6 +119,8 @@ export default {
       dateWeek: null,
       weekday: ["周日", "周一", "周二", "周三", "周四", "周五", "周六"],
       decorationColor: ["#568aea", "#000000"],
+      initFlag:true,
+      time:null,
     };
   },
   components: {
@@ -132,9 +135,11 @@ export default {
   mounted() {
     this.timeFn();
     this.cancelLoading();
+    this.timeInit()
   },
   beforeDestroy() {
     clearInterval(this.timing);
+    clearInterval(this.time);
   },
   methods: {
     timeFn() {
@@ -149,6 +154,22 @@ export default {
         this.loading = false;
       }, 500);
     },
+
+    //一分钟更新一次数据
+    timeInit(){
+      this.time = null;
+      this.time = setInterval(()=>{
+        console.log(111)
+        this.initFlag = false;
+        setTimeout(()=>{
+          this.$message({
+            message: '更新数据成功',
+            type: 'success'
+          });
+          this.initFlag = true;
+        },500)
+      },60000)
+    }
   },
 };
 </script>

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

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

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

@@ -1,112 +1,71 @@
 <template>
-    <div>
-      <ex-table
-        v-loading="loading"
-        :table="table"
-        :data="tableData"
-        :columns="table1"
-        :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>
+    <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 table1" :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="$emit('page-size-change', $event)"
+        @current-change="$emit('page-curr-change', $event)"
+      />
+  </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 { table1} from "./columns";
+import { table1 } from "./columns";
 import { mapGetters } from "vuex";
 
 export default {
   name: "purchaseOrder",
   mixins: [mixinPage, resToken],
   components: {
-    periodDatePickerActive
+    periodDatePickerActive,
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
-    
   },
   data() {
     return {
@@ -137,22 +95,21 @@ export default {
       loading: false,
       //请求参数集合
       parmValue: {
-        
         start_date: "", //起始时间
         end_date: "", // 结束时间
 
         page: 1, // 页码
         size: 15, // 每页显示条数
-       
       },
       // 表格 - 数据集合
-      tableData: [],
+      tableData: [
+      ],
       // 表格 - 参数
-      table: {
-        stripe: true,
-        border: true,
-        _defaultHeader_: ["setcol"],
-      },
+      // table: {
+      //   stripe: true,
+      //   border: true,
+      //   _defaultHeader_: ["setcol"],
+      // },
       // 表格 - 分页
       pageInfo: {
         size: 15,
@@ -164,11 +121,54 @@ export default {
     };
   },
   mounted() {
-
     this.searchList();
   },
 
   methods: {
+     //合并方法
+    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 (
@@ -178,22 +178,24 @@ export default {
         this.$message.warning("时间区间不完整！");
         return;
       }
-      return;
+      // return;
       this.loading = true;
-      
-      const res = await asyncRequest.list(this.parmValue);
+
+      const res = await asyncRequest.reportzixuntotal(this.parmValue);
+      console.log(res)
       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;
       }
       this.loading = false;
     },
-   
+
     //重置
     restSearch() {
       this.parmValue = {
@@ -210,7 +212,7 @@ export default {
       };
       this.searchList();
     },
-    
+
     // 时间函数
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
@@ -218,27 +220,26 @@ 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("请选择有效数据")
+      if (this.changeList.length <= 0) {
+        this.$message.warning("请选择有效数据");
         return;
       }
       let model = {
-        cgdNos:[]
-      }
-      this.changeList.forEach(item => {
-        model.cgdNos.push(item.cgdNo)
+        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;
@@ -262,7 +263,7 @@ export default {
               let url = window.URL.createObjectURL(
                 new Blob([res.data], {
                   // type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
-                  type: httpType
+                  type: httpType,
                 })
               );
               let link = document.createElement("a");

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

@@ -1,112 +1,71 @@
 <template>
-    <div>
-      <ex-table
-        v-loading="loading"
-        :table="table"
-        :data="tableData"
-        :columns="table2"
-        :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>
+    <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 table2" :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="$emit('page-size-change', $event)"
+        @current-change="$emit('page-curr-change', $event)"
+      />
+  </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 { table2} from "./columns";
+import { table2 } 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,
@@ -164,11 +121,54 @@ export default {
     };
   },
   mounted() {
-   
     this.searchList();
   },
 
   methods: {
+     //合并方法
+    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 (
@@ -178,10 +178,10 @@ export default {
         this.$message.warning("时间区间不完整！");
         return;
       }
-      return;
+      // return;
       this.loading = true;
-      
-      const res = await asyncRequest.list(this.parmValue);
+
+      const res = await asyncRequest.reportpurcheaseordersum(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.pageInfo.total = Number(res.data.count);
@@ -190,10 +190,11 @@ export default {
       } else {
         this.tableData = [];
         this.pageInfo.total = 0;
+        this.$message.warning(res.message)
       }
       this.loading = false;
     },
-   
+
     //重置
     restSearch() {
       this.parmValue = {
@@ -210,7 +211,7 @@ export default {
       };
       this.searchList();
     },
-    
+
     // 时间函数
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
@@ -218,27 +219,26 @@ 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("请选择有效数据")
+      if (this.changeList.length <= 0) {
+        this.$message.warning("请选择有效数据");
         return;
       }
       let model = {
-        cgdNos:[]
-      }
-      this.changeList.forEach(item => {
-        model.cgdNos.push(item.cgdNo)
+        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;
@@ -262,7 +262,7 @@ export default {
               let url = window.URL.createObjectURL(
                 new Blob([res.data], {
                   // type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
-                  type: httpType
+                  type: httpType,
                 })
               );
               let link = document.createElement("a");

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

@@ -1,112 +1,71 @@
 <template>
-    <div>
-      <ex-table
-        v-loading="loading"
-        :table="table"
-        :data="tableData"
-        :columns="table3"
-        :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>
+    <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 table3" :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="$emit('page-size-change', $event)"
+        @current-change="$emit('page-curr-change', $event)"
+      />
+  </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 { table3} from "./columns";
+import { table3 } 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,50 @@ export default {
   },
 
   methods: {
+     //合并方法
+    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 +178,10 @@ export default {
         this.$message.warning("时间区间不完整！");
         return;
       }
-      return;
+      // return;
       this.loading = true;
-      
-      const res = await asyncRequest.list(this.parmValue);
+
+      const res = await asyncRequest.reportconsultbidssum(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.pageInfo.total = Number(res.data.count);
@@ -189,10 +190,11 @@ export default {
       } else {
         this.tableData = [];
         this.pageInfo.total = 0;
+        this.$message.warning(res.message)
       }
       this.loading = false;
     },
-   
+
     //重置
     restSearch() {
       this.parmValue = {
@@ -209,7 +211,7 @@ export default {
       };
       this.searchList();
     },
-    
+
     // 时间函数
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
@@ -217,27 +219,26 @@ 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("请选择有效数据")
+      if (this.changeList.length <= 0) {
+        this.$message.warning("请选择有效数据");
         return;
       }
       let model = {
-        cgdNos:[]
-      }
-      this.changeList.forEach(item => {
-        model.cgdNos.push(item.cgdNo)
+        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;
@@ -261,7 +262,7 @@ export default {
               let url = window.URL.createObjectURL(
                 new Blob([res.data], {
                   // type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
-                  type: httpType
+                  type: httpType,
                 })
               );
               let link = document.createElement("a");