1

src/views/purchaseIn/purchaseOrder/index.vue

@@ -637,6 +637,7 @@ export default {
       this.parmValue.apply_name = this.select === "6" ? this.input : ""; // 申请人
       this.parmValue.supplierNo = this.select === "7" ? this.input : ""; // 采购供应商编号
       this.parmValue.orderCode = this.select === "8" ? this.input : ""; // 采购供应商编号
+      console.log(this.pageInfo);
       // this.wsm_supplierNo = [];
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {

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

@@ -190,7 +190,7 @@ const table5 = [
   },
   {
     prop: "good_name",
-    label: "产品名称",
+    label: "商品名称",
     minWidth: "165px",
   },
   {
@@ -210,7 +210,7 @@ const table5 = [
   },
   {
     prop: "work_day",
-    label: "产品工期（天）",
+    label: "商品工期（天）",
     minWidth: "95px",
   },
   {
@@ -265,7 +265,7 @@ const table6 = [
   },
   {
     prop: "good_name",
-    label: "产品名称",
+    label: "商品名称",
     minWidth: "155px",
   },
   {
@@ -326,7 +326,7 @@ const table7 = [
   },
   {
     prop: "good_name",
-    label: "产品名称",
+    label: "商品名称",
     minWidth: "155px",
   },
   {
@@ -418,7 +418,7 @@ const table8 = [
   },
   {
     prop: "good_name",
-    label: "产品名称",
+    label: "商品名称",
     minWidth: "155px",
   },
   {
@@ -550,7 +550,7 @@ const table10 = [
   },
   {
     prop: "good_name",
-    label: "产品名称",
+    label: "商品名称",
     minWidth: "155px",
   },
   {
@@ -586,7 +586,7 @@ const table10 = [
   },
 ]
 
-//产品上线报表
+//商品上线报表
 const table11 = [
   // {
   //   type: "expand",
@@ -606,17 +606,17 @@ const table11 = [
   },
   {
     prop: "skuCode",
-    label: "产品编号(skuCode)",
+    label: "商品上线编号",
     minWidth: "155px",
   },
   {
     prop: "spuCode",
-    label: "产品编号(spuCode)",
+    label: "商品成本编号",
     minWidth: "155px",
   },
   {
     prop: "good_name",
-    label: "产品名称",
+    label: "商品名称",
     minWidth: "155px",
   },
   {
@@ -626,7 +626,7 @@ const table11 = [
   },
   {
     prop: "good_model",
-    label: "产品型号",
+    label: "商品型号",
     minWidth: "155px",
   },
   {
@@ -652,7 +652,7 @@ const table11 = [
 
 ]
 
-//产品下线报表
+//商品下线报表
 const table12 = [
   // {
   //   type: "expand",
@@ -667,7 +667,7 @@ const table12 = [
   },
   {
     prop: "updatetime",
-    label: "产品下线时间",
+    label: "商品下线时间",
     minWidth: "155px",
   },
   {
@@ -677,17 +677,17 @@ const table12 = [
   },
   {
     prop: "skuCode",
-    label: "产品编号(skuCode)",
+    label: "商品上线编号",
     minWidth: "155px",
   },
   {
     prop: "spuCode",
-    label: "产品编号(spuCode)",
+    label: "商品成本编号",
     minWidth: "155px",
   },
   {
     prop: "good_name",
-    label: "产品名称",
+    label: "商品名称",
     minWidth: "155px",
   },
   {
@@ -697,7 +697,7 @@ const table12 = [
   },
 ]
 
-//产品修改报表
+//商品修改报表
 const table13 = [
   // {
   //   type: "expand",
@@ -712,7 +712,7 @@ const table13 = [
   },
   {
     prop: "addtime",
-    label: "产品操作时间",
+    label: "商品操作时间",
     minWidth: "155px",
   },
   {
@@ -722,12 +722,12 @@ const table13 = [
   },
   {
     prop: "code",
-    label: "产品编号(spuCode)",
+    label: "商品成本编号",
     minWidth: "155px",
   },
   {
     prop: "good_name",
-    label: "产品名称",
+    label: "商品名称",
     minWidth: "155px",
   },
   {
@@ -796,12 +796,12 @@ const table14 = [
   },
   {
     prop: "total",
-    label: "产品名称",
+    label: "商品名称",
     minWidth: "155px",
   },
   {
     prop: "total",
-    label: "产品编码",
+    label: "商品编码",
     minWidth: "155px",
   },
   {
@@ -842,7 +842,7 @@ const table14 = [
 
 ]
 
-//产品修改报表
+//商品修改报表
 const table15 = [
   // {
   //   type: "expand",
@@ -867,7 +867,7 @@ const table15 = [
 ]
 
 
-//产品修改报表，修改具体内容
+//商品修改报表，修改具体内容
 const editTable13 = [
   // {
   //   prop: "id",

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

@@ -128,11 +128,14 @@ export default {
      //分页集合
     handleSizeChange(val){
       this.parmValue.size = val;
+      this.pageInfo.total = val;
       this.parmValue.page = 1;
       this.searchList() 
     },
     handleCurrentChange(val){
       this.parmValue.page = val;
+      this.pageInfo.total = val;
+
       this.searchList()
     },
      //合并方法
@@ -227,6 +230,15 @@ export default {
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
       this.parmValue.end_date = e.endTime || "";
+      if (
+        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
+        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
       await this.searchList();
     },
 

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

@@ -217,6 +217,15 @@ export default {
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
       this.parmValue.end_date = e.endTime || "";
+      if (
+        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
+        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
       await this.searchList();
     },
 

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

@@ -212,6 +212,15 @@ export default {
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
       this.parmValue.end_date = e.endTime || "";
+      if (
+        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
+        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
       await this.searchList();
     },
 

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

@@ -212,6 +212,15 @@ export default {
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
       this.parmValue.end_date = e.endTime || "";
+      if (
+        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
+        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
       await this.searchList();
     },
 

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

@@ -372,6 +372,15 @@ export default {
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
       this.parmValue.end_date = e.endTime || "";
+      if (
+        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
+        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
       await this.searchList();
     },
 

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

@@ -234,6 +234,18 @@ export default {
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
       this.parmValue.end_date = e.endTime || "";
+      if (
+        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
+        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+      
+      
+      
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
       await this.searchList();
     },
 

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

@@ -241,6 +241,15 @@ export default {
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
       this.parmValue.end_date = e.endTime || "";
+      if (
+        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
+        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
       await this.searchList();
     },
 

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

@@ -129,10 +129,12 @@ export default {
     handleSizeChange(val){
       this.parmValue.size = val;
       this.parmValue.page = 1;
+      this.pageInfo.total = val;
 
       this.searchList() 
     },
     handleCurrentChange(val){
+      this.pageInfo.total = val;
       this.parmValue.page = val;
       this.searchList()
     },
@@ -227,6 +229,15 @@ export default {
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
       this.parmValue.end_date = e.endTime || "";
+      if (
+        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
+        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
       await this.searchList();
     },
 

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

@@ -129,10 +129,12 @@ export default {
     handleSizeChange(val){
       this.parmValue.size = val;
       this.parmValue.page = 1;
+      this.pageInfo.total = val;
 
       this.searchList() 
     },
     handleCurrentChange(val){
+      this.pageInfo.total = val;
       this.parmValue.page = val;
       this.searchList()
     },
@@ -235,6 +237,15 @@ export default {
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
       this.parmValue.end_date = e.endTime || "";
+      if (
+        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
+        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
       await this.searchList();
     },
 

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

@@ -127,11 +127,13 @@ export default {
   methods: {
     //分页集合
     handleSizeChange(val){
+      this.pageInfo.total = val;
       this.parmValue.size = val;
       this.parmValue.page = 1;
       this.searchList() 
     },
     handleCurrentChange(val){
+      this.pageInfo.total = val;
       this.parmValue.page = val;
       this.searchList()
     },
@@ -227,6 +229,15 @@ export default {
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
       this.parmValue.end_date = e.endTime || "";
+      if (
+        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
+        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
       await this.searchList();
     },
 

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

@@ -166,7 +166,7 @@ export default {
       if (res && res.code === 0 && res.data) {
         console.log(res)
         this.tableData = res.data.list;
-        this.pageInfo.total = Number(res.data.total);
+        this.pageInfo.total = Number(res.data.count);
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {
@@ -200,6 +200,20 @@ export default {
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
       this.parmValue.end_date = e.endTime || "";
+      if (
+        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
+        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+      
+      // 表格 - 分页
+      // this.$set(this.pageInfo)
+      // this.$set(this.pageInfo, 'curr', '2');
+      this.pageInfo.curr = 1;
+      // console.log(this.pageInfo.curr)
+      this.parmValue.page = 1;
       await this.searchList();
     },
 

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

@@ -199,6 +199,15 @@ export default {
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
       this.parmValue.end_date = e.endTime || "";
+      if (
+        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
+        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
       await this.searchList();
     },
 

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

@@ -217,6 +217,15 @@ export default {
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
       this.parmValue.end_date = e.endTime || "";
+      if (
+        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
+        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
       await this.searchList();
     },
 

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

@@ -216,6 +216,15 @@ export default {
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
       this.parmValue.end_date = e.endTime || "";
+      if (
+        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
+        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
       await this.searchList();
     },
 

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

@@ -201,12 +201,30 @@ export default {
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
       this.parmValue.end_date = e.endTime || "";
+      if (
+        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
+        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
       await this.searchList();
     },
 
     async time2(e) {
       this.parmValue.update_start_date = e.startTime || "";
       this.parmValue.update_end_date = e.endTime || "";
+      if (
+        (this.parmValue.update_start_date !== "" && this.parmValue.update_end_date === "") ||
+        (this.parmValue.update_start_date === "" && this.parmValue.update_end_date !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
       await this.searchList();
     },
      //选中触发函数

src/views/reportQuery/purchaseReport/index.vue

@@ -16,9 +16,9 @@
             <el-tab-pane label="售后明细报表" name="table8"><table8 v-if="activeName == 'table8'"></table8></el-tab-pane>
             <el-tab-pane label="每日录入供应商报表" name="table9"><table9 v-if="activeName == 'table9'"></table9></el-tab-pane>
             <el-tab-pane label="退货流水报表" name="table10"><table10 v-if="activeName == 'table10'"></table10></el-tab-pane>
-            <el-tab-pane label="产品上线报表" name="table11"><table11 v-if="activeName == 'table11'"></table11></el-tab-pane>
-            <el-tab-pane label="产品下线报表" name="table12"><table12 v-if="activeName == 'table12'"></table12></el-tab-pane>
-            <el-tab-pane label="产品修改报表" name="table13"><table13 v-if="activeName == 'table13'"></table13></el-tab-pane>
+            <el-tab-pane label="商品上线报表" name="table11"><table11 v-if="activeName == 'table11'"></table11></el-tab-pane>
+            <el-tab-pane label="商品下线报表" name="table12"><table12 v-if="activeName == 'table12'"></table12></el-tab-pane>
+            <el-tab-pane label="商品修改报表" name="table13"><table13 v-if="activeName == 'table13'"></table13></el-tab-pane>
             <el-tab-pane label="出入库明细报表" name="table14"><table14 v-if="activeName == 'table14'"></table14></el-tab-pane>
             <el-tab-pane label="退货台账-业务口径" name="table15"><table15 v-if="activeName == 'table15'"></table15></el-tab-pane>