Merge branch 'sit'

src/assets/js/btnList.js

@@ -89,5 +89,6 @@ const btnList = [
   { code: "088", name: "确认收货" },
   { code: "089", name: "批量已与供应商确认" },
   { code: "090", name: "批量发货" },
+  { code: "091", name: "换货/补发" },
 ];
 export default btnList;

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

@@ -1,90 +1,10 @@
-//竞价单总数
+//已采反报价信息
 const table1 = [
-  // {
-  //   type: "expand",
-  //   _slot_: "expand",
-  //   fixed: "left",
-  //   _noset_: true,
-  // },
   // {
   //   type: "selection",
   //   fixed: "left",
   //   _noset_: true
   // },
-  {
-    prop: "addtime",
-    label: "竞价时间",
-    minWidth: "155px",
-  },
-  {
-    prop: "name",
-    label: "业务部门",
-    minWidth: "155px",
-  },
-  {
-    prop: "total",
-    label: "竞价数量",
-    minWidth: "155px",
-  },
-]
-//采购订单总金额
-const table2 = [
-  // {
-  //   type: "expand",
-  //   _slot_: "expand",
-  //   fixed: "left",
-  //   _noset_: true,
-  // },
-  // {
-  //   type: "selection",
-  //   fixed: "left",
-  //   _noset_: true
-  // },
-  {
-    prop: "addtime",
-    label: "竞价时间",
-    minWidth: "155px",
-  },
-  {
-    prop: "name",
-    label: "业务部门",
-    minWidth: "155px",
-  },
-  {
-    prop: "total_fee",
-    label: "采购金额",
-    minWidth: "155px",
-  },
-  {
-    prop: "total_num",
-    label: "数量",
-    minWidth: "155px",
-  },
-  {
-    prop: "wait_total_fee",
-    label: "待处理采购金额",
-    minWidth: "155px",
-  },
-  {
-    prop: "wait_total_num",
-    label: "待处理采购单数",
-    minWidth: "155px",
-  },
-]
-
-//商品修改报表
-const table3 = [
-  // {
-  //   type: "expand",
-  //   _slot_: "expand",
-  //   fixed: "left",
-  //   _noset_: true,
-  // },
-  {
-    type: "selection",
-    fixed: "left",
-    _noset_: true
-  },
   {
     prop: "skuCode",
     label: "商品上线编号",
@@ -100,505 +20,295 @@ const table3 = [
     label: "平台商品编码",
     minWidth: "155px",
   },
-  {
-    prop: "creater",
-    label: "采购维护人",
-    minWidth: "100px",
-  },
+
   {
     prop: "good_name",
     label: "商品名称",
     minWidth: "155px",
   },
   {
-    prop: "brand_name",
-    label: "品牌",
-    minWidth: "155px",
-  },
-  {
-    prop: "name",
-    label: "分类",
+    prop: "platform_name",
+    label: "上线平台",
     minWidth: "155px",
   },
   {
-    prop: "",
-    label: "变更",
-    fixed: "right",
-    _noset_: true,
-    width: "50px",
-    _slot_: "operation",
+    prop: "online_time",
+    label: "上线完成时间",
+    minWidth: "145px",
   },
-]
-
-
-
-
-//商品修改报表，修改具体内容
-const editTable3 = [
-  // {
-  //   prop: "id",
-  //   label: "id",
-  //   minWidth: "155px",
-  // },
   {
-    prop: "bidNo",
-    label: "返库商品编号",
-    minWidth: "200px",
-  },
-
-
-
-  {
-    prop: "infoNo",
-    label: "阶梯编号",
-    minWidth: "200px",
-  },
-  {
-    prop: "zxNo",
-    label: "竞价编号",
-    minWidth: "200px",
-  },
-  {
-    prop: "spuCode",
-    label: "spu商品code",
-    minWidth: "200px",
-  },
-  {
-    prop: "good_name",
-    label: "商品名称",
-    minWidth: "200px",
-  },
-  {
-    prop: "brandid",
-    label: "商品品牌",
-    minWidth: "200px",
-  },
-  {
-    prop: "brand_id",
-    label: "商品品牌",
-    minWidth: "200px",
-  },
-  {
-    prop: "cat_id",
-    label: "商品分类",
-    minWidth: "200px",
-  },
-  {
-    prop: "specinfo",
-    label: "规格集合",
-    minWidth: "200px",
-  },
-
-  {
-    prop: "cost_desc",
-    label: "工艺描述",
-    minWidth: "200px",
-  },
-  {
-    prop: "work_day",
-    label: "工期",
-    minWidth: "200px",
+    prop: "moq",
+    label: "起订量",
+    minWidth: "110",
   },
   {
-    prop: "delivery_day",
-    label: "物流时间",
-    minWidth: "200px",
+    prop: "nake_fee",
+    label: "成本单价",
+    minWidth: "110px",
   },
   {
-    prop: "good_img",
-    label: "商品主图",
-    minWidth: "200px",
+    prop: "cost_fee",
+    label: "工艺费",
+    minWidth: "110px",
   },
   {
-    prop: "expire_day",
-    label: "有效时间",
-    minWidth: "200px",
+    prop: "delivery_fee",
+    label: "物流费",
+    minWidth: "110px",
   },
   {
-    prop: "origin_place",
-    label: "产地",
-    minWidth: "200px",
+    prop: "cert_fee",
+    label: "证书费",
+    minWidth: "110px",
   },
   {
-    prop: "supplierNo",
-    label: "供应商",
-    minWidth: "200px",
+    prop: "mark_fee",
+    label: "加标费",
+    minWidth: "110px",
   },
   {
-    prop: "pay_way",
-    label: "支付方式",
-    minWidth: "200px",
+    prop: "packing_fee",
+    label: "包装费",
+    minWidth: "110px",
   },
-
   {
-    prop: "send_way",
-    label: "发货方式",
-    minWidth: "200px",
+    prop: "other_fee",
+    label: "其他费用",
+    minWidth: "110px",
   },
   {
-    prop: "metal_id",
-    label: "金属种类",
-    minWidth: "200px",
+    prop: "nake_total",
+    label: "成本合计",
+    minWidth: "110px",
   },
   {
-    prop: "is_gold_price",
-    label: "是否启用实时金价",
-    minWidth: "200px",
+    prop: "addtime",
+    label: "申请上线时间",
+    minWidth: "145px",
   },
+]
+//采购订单总金额
+const table2 = [
+   // {
+  //   type: "selection",
+  //   fixed: "left",
+  //   _noset_: true
+  // },
   {
-    prop: "config",
-    label: "配置要求",
-    minWidth: "200px",
+    prop: "skuCode",
+    label: "商品上线编号",
+    minWidth: "155px",
   },
   {
-    prop: "weight",
-    label: "商品总重量",
-    minWidth: "200px",
+    prop: "spuCode",
+    label: "商品成本编号",
+    minWidth: "155px",
   },
   {
-    prop: "is_diff",
-    label: "有无工差",
-    minWidth: "200px",
+    prop: "plat_code",
+    label: "平台商品编码",
+    minWidth: "155px",
   },
 
   {
-    prop: "demo_fee",
-    label: "打样费",
-    minWidth: "200px",
-  },
-  {
-    prop: "delivery_fee",
-    label: "物流费",
-    minWidth: "200px",
-  },
-  {
-    prop: "open_fee",
-    label: "开模费",
-    minWidth: "200px",
+    prop: "good_name",
+    label: "商品名称",
+    minWidth: "155px",
   },
   {
-    prop: "pakge_fee",
-    label: "打包费",
-    minWidth: "200px",
+    prop: "platform_name",
+    label: "上线平台",
+    minWidth: "155px",
   },
   {
-    prop: "nake_fee",
-    label: "裸价",
-    minWidth: "200px",
+    prop: "online_time",
+    label: "上线完成时间",
+    minWidth: "145px",
   },
   {
-    prop: "mark_fee",
-    label: "加标费",
-    minWidth: "200px",
+    prop: "moq",
+    label: "起订量",
+    minWidth: "110",
   },
   {
-    prop: "cert_fee",
-    label: "证书费",
-    minWidth: "200px",
+    prop: "sale_price",
+    label: "售价",
+    minWidth: "110px",
   },
   {
     prop: "cost_fee",
     label: "工艺费",
-    minWidth: "200px",
+    minWidth: "110px",
   },
+
   {
-    prop: "total_fee",
-    label: "成本总计",
-    minWidth: "200px",
+    prop: "market_price",
+    label: "市场价",
+    minWidth: "110px",
   },
   {
-    prop: "supply_area",
-    label: "供货区域",
-    minWidth: "200px",
+    prop: "market_platform",
+    label: "对比平台",
+    minWidth: "110px",
   },
   {
-    prop: "remark",
-    label: "备注",
-    minWidth: "200px",
-  },
-  {
-    prop: "sale_price",
-    label: "最终售价",
-    minWidth: "200px",
+    prop: "addtime",
+    label: "申请上线时间",
+    minWidth: "145px",
   },
+
+]
+
+//商品修改报表
+const table3 = [
+  // {
+  //   type: "expand",
+  //   _slot_: "expand",
+  //   fixed: "left",
+  //   _noset_: true,
+  // },
   {
-    prop: "createrid",
-    label: "创建人id",
-    minWidth: "200px",
+    type: "selection",
+    fixed: "left",
+    _noset_: true
   },
   {
-    prop: "creater",
-    label: "创建人",
-    minWidth: "200px",
+    prop: "skuCode",
+    label: "商品上线编号",
+    minWidth: "155px",
   },
   {
-    prop: "status",
-    label: "状态",
-    minWidth: "200px",
+    prop: "spuCode",
+    label: "商品成本编号",
+    minWidth: "155px",
   },
-  
   {
-    prop: "unit",
-    label: "单位",
-    minWidth: "200px",
+    prop: "plat_code",
+    label: "平台商品编码",
+    minWidth: "155px",
   },
   {
-    prop: "cat_info",
-    label: "分类",
-    minWidth: "200px",
+    prop: "creater",
+    label: "采购维护人",
+    minWidth: "100px",
   },
-
   {
-    prop: "supplierName",
-    label: "供应商名称",
-    minWidth: "200px",
+    prop: "good_name",
+    label: "商品名称",
+    minWidth: "155px",
   },
   {
     prop: "brand_name",
-    label: "品牌名称",
-    minWidth: "200px",
-  },
-  {
-    prop: "metal_name",
-    label: "贵金属名称",
-    minWidth: "200px",
-  },
-  {
-    prop: "delivery_place",
-    label: "发货地",
-    minWidth: "200px",
-  },
-
-  {
-    prop: "good_code",
-    label: "商品code",
-    minWidth: "200px",
-  },
-  {
-    prop: "good_unit",
-    label: "商品单位",
-    minWidth: "200px",
+    label: "品牌",
+    minWidth: "155px",
   },
-
   {
-    prop: "good_type",
-    label: "是否定制",
-    minWidth: "200px",
+    prop: "cat_name",
+    label: "分类",
+    minWidth: "155px",
+    
   },
   {
-    prop: "companyNo",
-    label: "业务企业",
-    minWidth: "200px",
+    prop: "company",
+    label: "业务企业名称",
+    minWidth: "155px",
   },
   {
-      prop: "company_id",
-      label: "业务公司",
-      minWidth: "200px",
-    },
-  {
-    prop: "moq",
-    label: "定制起订量",
-    minWidth: "200px",
+    prop: "name",
+    label: "供应商名称",
+    minWidth: "155px",
   },
   {
-    prop: "customized",
-    label: "定制工期",
-    minWidth: "200px",
+    prop: "platform_name",
+    label: "上线平台",
+    minWidth: "155px",
   },
   {
-    prop: "tax",
-    label: "税点",
-    minWidth: "200px",
+    prop: "online_time",
+    label: "上线完成时间",
+    minWidth: "155px",
   },
-
   {
-    prop: "is_auth",
-    label: "销售权限",
-    minWidth: "200px",
+    prop: "exam_status",
+    label: "上线状态",
+    minWidth: "155px",
   },
   {
     prop: "is_stock",
     label: "是否库存品",
-    minWidth: "200px",
+    minWidth: "155px",
   },
   {
-    prop: "auth_img",
-    label: "销售授权图片",
-    minWidth: "200px",
+    prop: "good_type",
+    label: "是否定制",
+    minWidth: "155px",
   },
-
-
   {
-    prop: "after_sales",
-    label: "售后说明",
-    minWidth: "200px",
+    prop: "specifications",
+    label: "规格",
+    minWidth: "155px",
   },
   {
-    prop: "craft_desc",
-    label: "工艺说明",
-    minWidth: "200px",
+    prop: "unit",
+    label: "单位",
+    minWidth: "155px",
   },
   {
     prop: "good_remark",
     label: "商品备注",
-    minWidth: "200px",
-  },
-  {
-    prop: "good_size",
-    label: "商品尺寸",
-    minWidth: "200px",
-  },
-  {
-    prop: "packing_way",
-    label: "包装方式",
-    minWidth: "200px",
+    minWidth: "155px",
   },
 
   {
-    prop: "packing_size",
-    label: "装箱尺寸",
-    minWidth: "200px",
+    prop: "supply_area",
+    label: "供货区域",
+    minWidth: "155px",
   },
   {
-    prop: "packing_spec",
-    label: "装箱规格",
-    minWidth: "200px",
+    prop: "craft_desc",
+    label: "工艺说明",
+    minWidth: "155px",
   },
   {
-    prop: "packing_list",
-    label: "包装清单",
-    minWidth: "200px",
+    prop: "noble_metal",
+    label: "贵金属信息",
+    minWidth: "155px",
   },
   {
-    prop: "packing_weight",
-    label: "装箱重量",
-    minWidth: "200px",
+    prop: "cgd_gold_price",
+    label: "供应商采购金价",
+    minWidth: "155px",
   },
   {
-    prop: "good_bar",
-    label: "商品条形码",
-    minWidth: "200px",
+    prop: "demo_fee",
+    label: "工艺说明",
+    minWidth: "155px",
   },
-
   {
-    prop: "lead_time",
-    label: "供货周期",
-    minWidth: "200px",
+    prop: "demo_fee",
+    label: "打样费",
+    minWidth: "155px",
   },
   {
-    prop: "sample_day",
-    label: "调样周期",
-    minWidth: "200px",
+    prop: "open_fee",
+    label: "开模费",
+    minWidth: "155px",
   },
   {
     prop: "sample_fee",
     label: "调样费",
-    minWidth: "200px",
-  },
-
-  {
-    prop: "good_thumb_img",
-    label: "商品缩略图",
-    minWidth: "200px",
-  },
-  {
-    prop: "good_info_img",
-    label: "详情介绍",
-    minWidth: "200px",
+    minWidth: "155px",
   },
-
   {
-    prop: "is_del",
-    label: "是否删除",
-    minWidth: "200px",
+    prop: "tax",
+    label: "税点",
+    minWidth: "155px",
   },
   {
     prop: "addtime",
-    label: "创建时间",
-    minWidth: "200px",
-  },
-  {
-    prop: "updatetime",
-    label: "更新时间",
-    minWidth: "200px",
-  },
-  //////////////////////////////
-  {
-    prop: "is_exclusive",
-    label: "专属类型",
-    minWidth: "200px",
-  },
-  {
-      prop: "noble_weight",
-      label: "贵金属重量",
-      minWidth: "200px",
-    },
-    {
-      prop: "noble_metal",
-      label: "贵金属种类",
-      minWidth: "200px",
-    },
-    {
-      prop: "other_config",
-      label: "其他配置要求",
-      minWidth: "200px",
-    },
-    {
-      prop: "spec_value",
-      label: "规格类型",
-      minWidth: "200px",
-    },
-    {
-      prop: "spec_value_value",
-      label: "规格值",
-      minWidth: "200px",
-    },
-    {
-      prop: "market_price",
-      label: "市场价",
-      minWidth: "200px",
-    },
-    {
-      prop: "cgd_gold_price",
-      label: "供应商采购金价",
-      minWidth: "200px",
-    },
-    {
-      prop: "noble_price",
-      label: "当前金价",
-      minWidth: "200px",
-    },
-    {
-      prop: "min_num",
-      label: "起订量(>=)",
-      minWidth: "200px",
-    },
-    {
-      prop: "package_fee",
-      label: "包装费",
-      minWidth: "200px",
-    },
-    {
-      prop: "other_fee",
-      label: "其他费用",
-      minWidth: "200px",
-    },
-    {
-      prop: "nake_total",
-      label: "成本合计",
-      minWidth: "200px",
-    },
-
-
- 
-
-
-  /////////////////////////////
-
-
-
-
+    label: "申请上线时间",
+    minWidth: "155px",
+  },
+  
 ]
-
-
-export { table1, table2, table3,editTable3}
+export { table1, table2, table3}

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

@@ -1,78 +1,75 @@
 <template>
-  <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
+  <div>
+    <ex-table
+      v-loading="loading"
+      :table="table"
       :data="tableData"
-      :size="searchSize"
-      :span-method="objectSpanMethod"
-      border
-      style="width: 100%; margin-top: 20px"
+      :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"
     >
-      <el-table-column :prop="item.prop" :label="item.label" v-for="(item,index) in table1" :key="index"/>
-      
-    </el-table>
-    <el-pagination
-        :current-page.sync="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"
-      />
+      <template #table-header="{}">
+        <div style="width: 100%">
+          <el-row style="padding: 0 0 0 80px">
+            <el-col :span="6" style="width: 363px">
+              <periodDatePickerActive
+                :month="month"
+                :size="searchSize"
+                :newTime="newTime"
+                @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>
 </template>
-   <script>
+<script>
 import mixinPage from "@/mixins/elPaginationHandle";
 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 asyncRequest from "@/apis/service/reportQuery/productReport";
+import periodDatePickerActive from "../period-date-picker-month/index.vue";
 import { table1 } from "./columns";
 import { mapGetters } from "vuex";
 
@@ -87,6 +84,8 @@ export default {
   },
   data() {
     return {
+      newTime: "",
+      month: "",
       //选中数组
       changeList: [],
       //全局url
@@ -97,19 +96,17 @@ export default {
       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,
@@ -121,123 +118,80 @@ export default {
     };
   },
   mounted() {
-    this.searchList();
+    this.month = this.transformTime();
+      this.getNewTime();
   },
 
   methods: {
-     //分页集合
-    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()
-    },
-     //合并方法
-    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex == 0) {
-        //合并相同的名字
-        let nameSpan = this.getSpanNumber(this.tableData, "addtime");
-        return {
-          rowspan: nameSpan[rowIndex],
-          colspan: 1,
-        };
-      }
+    transformTime() {
+      let time = new Date();
+      let y = time.getFullYear();
+      let M = time.getMonth() + 1;
+      return y + "-" + (M < 10 ? "0" + M : M);
     },
-    //获取要合并的行数
-    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];
-      }
+    getNewTime() {
+      this.newTime = new Date().valueOf();
     },
     //初始化http请求
     async searchList() {
+      if (this.loading) return;
       if (
         (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
         (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
       ) {
-        this.$message.warning("时间区间不完整！");
+        this.$message.warning("请选择时间！");
+        this.tableData = [];
+        this.pageInfo.total = 0;
         return;
       }
-      // return;
       this.loading = true;
-
-      const res = await asyncRequest.reportzixuntotal(this.parmValue);
-      console.log(res)
+      const res = await asyncRequest.goodCostZhao(this.parmValue);
       if (res && res.code === 0 && res.data) {
+        console.log(res);
         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.$message.warning(res.message);
       }
       this.loading = false;
     },
 
     //重置
     restSearch() {
-      this.parmValue = {
-        start_date: "", //新建起始时间
-        end_date: "", // 新建结束时间
-        page: 1, // 页码
-        size: 15, // 每页显示条数
-      };
-      // 表格 - 分页
+      this.month = this.transformTime();
+
+      this.parmValue.page = 1;
+      this.parmValue.sizee = 15;
       this.pageInfo = {
         size: 15,
         curr: 1,
         total: 0,
       };
-      this.searchList();
+      this.getNewTime();
     },
 
     // 时间函数
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
       this.parmValue.end_date = e.endTime || "";
+      this.month = e.value;
       if (
         (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
         (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
       ) {
-        this.$message.warning("时间区间不完整！");
+        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();
     },
@@ -249,81 +203,81 @@ export default {
       this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : [];
     },
     //导出文件
-    // async download() {
-    //   if (this.changeList.length <= 0) {
-    //     this.$message.warning("请选择有效数据");
-    //     return;
-    //   }
-    //   let model = {
-    //     cgdNos: [],
-    //   };
-    //   this.changeList.forEach((item) => {
-    //     model.cgdNos.push(item.cgdNo);
-    //   });
-
-    //   // const res = await asyncRequest.exportcgdlist(model)
-
-    //   if (!this.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;
-    //       });
-    //   }
-    // },
+    async download() {
+      // if(this.changeList.length<=0){
+      //   this.$message.warning("请选择有效数据")
+      //   return;
+      // };
+      let start_date = new Date(this.parmValue.start_date).valueOf();
+      let end_date = new Date(this.parmValue.end_date).valueOf();
+      let flag = end_date - start_date > 30 * 24 * 60 * 60 * 1000;
+      if (this.parmValue.start_date != "" && this.parmValue.end_date != "") {
+        if (flag) {
+          this.$message.warning("导出文件的时间区间不能超过30天");
+          return;
+        }
+      } else {
+        this.$message.warning("请选择导出文件的时间区间");
+        return;
+      }
+      let model = JSON.parse(JSON.stringify(this.parmValue));
+      // model.is_export = 1;
+      if (!this.loading) {
+        this.loading = true;
+        let httpType = `aplication/zip`;
+        axios({
+          method: "post",
+          url: this.fileUrl + "admin/goodCostZhaoExport",
+          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>
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .purchaseOrder {
   // text-align: right;
 }
-/deep/ .el-pagination{
-  float: right;
-    margin-top: 10px;
-}
 </style>
-   

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

@@ -1,78 +1,75 @@
 <template>
-  <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
+  <div>
+    <ex-table
+      v-loading="loading"
+      :table="table"
       :data="tableData"
-      :size="searchSize"
-      :span-method="objectSpanMethod"
-      border
-      style="width: 100%; margin-top: 20px"
+      :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"
     >
-      <el-table-column :prop="item.prop" :label="item.label" v-for="(item,index) in table2" :key="index"/>
-      
-    </el-table>
-    <el-pagination
-        :current-page.sync="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"
-      />
+      <template #table-header="{}">
+        <div style="width: 100%">
+          <el-row style="padding: 0 0 0 80px">
+            <el-col :span="6" style="width: 500px">
+              <periodDatePickerActive
+                :month="month"
+                :size="searchSize"
+                :newTime="newTime"
+                @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="3" 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>
 </template>
-   <script>
+<script>
 import mixinPage from "@/mixins/elPaginationHandle";
 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 asyncRequest from "@/apis/service/reportQuery/productReport";
+import periodDatePickerActive from "../period-date-picker-month/index.vue";
 import { table2 } from "./columns";
 import { mapGetters } from "vuex";
 
@@ -87,6 +84,8 @@ export default {
   },
   data() {
     return {
+      newTime: "",
+      month: "",
       //选中数组
       changeList: [],
       //全局url
@@ -97,13 +96,12 @@ export default {
       parmValue: {
         start_date: "", //起始时间
         end_date: "", // 结束时间
-
         page: 1, // 页码
         size: 15, // 每页显示条数
+        // is_export:0//是否导出0/1
       },
       // 表格 - 数据集合
-      tableData: [
-      ],
+      tableData: [],
       // 表格 - 参数
       table: {
         stripe: true,
@@ -121,81 +119,36 @@ export default {
     };
   },
   mounted() {
-    this.searchList();
+      this.month = this.transformTime();
+        this.getNewTime();
   },
 
   methods: {
-     //分页集合
-    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()
-    },
-     //合并方法
-    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];
-      }
+     transformTime() {
+      let time = new Date();
+      let y = time.getFullYear();
+      let M = time.getMonth() + 1;
+      return y + "-" + (M < 10 ? "0" + M : M);
     },
+     getNewTime() {
+         this.newTime = new Date().valueOf();
+       },
     //初始化http请求
     async searchList() {
+     if (this.loading) return;
       if (
         (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
         (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
-      ) {
-        this.$message.warning("时间区间不完整！");
+     ) {
+        this.$message.warning("请选择时间！");
+        this.tableData = [];
+        this.pageInfo.total = 0;
         return;
       }
-      // return;
       this.loading = true;
-
-      const res = await asyncRequest.reportpurcheaseordersum(this.parmValue);
+      const res = await asyncRequest.goodPriceZhao(this.parmValue);
       if (res && res.code === 0 && res.data) {
+        console.log(res);
         this.tableData = res.data.list;
         this.pageInfo.total = Number(res.data.count);
       } else if (res && res.code >= 100 && res.code <= 104) {
@@ -203,40 +156,43 @@ export default {
       } else {
         this.tableData = [];
         this.pageInfo.total = 0;
-        this.$message.warning(res.message)
+        this.$message.warning(res.message);
       }
       this.loading = false;
     },
 
     //重置
     restSearch() {
-      this.parmValue = {
-        start_date: "", //新建起始时间
-        end_date: "", // 新建结束时间
-        page: 1, // 页码
-        size: 15, // 每页显示条数
-      };
-      // 表格 - 分页
+      this.month = this.transformTime();
+
+      this.parmValue.page = 1;
+      this.parmValue.sizee = 15;
       this.pageInfo = {
         size: 15,
         curr: 1,
         total: 0,
       };
-      this.searchList();
+      this.getNewTime();
     },
 
     // 时间函数
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
       this.parmValue.end_date = e.endTime || "";
+      this.month = e.value;
       if (
         (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
         (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
       ) {
-        this.$message.warning("时间区间不完整！");
+        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();
     },
@@ -248,81 +204,81 @@ export default {
       this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : [];
     },
     //导出文件
-    // async download() {
-    //   if (this.changeList.length <= 0) {
-    //     this.$message.warning("请选择有效数据");
-    //     return;
-    //   }
-    //   let model = {
-    //     cgdNos: [],
-    //   };
-    //   this.changeList.forEach((item) => {
-    //     model.cgdNos.push(item.cgdNo);
-    //   });
-
-    //   // const res = await asyncRequest.exportcgdlist(model)
-
-    //   if (!this.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;
-    //       });
-    //   }
-    // },
+    async download() {
+      // if(this.changeList.length<=0){
+      //   this.$message.warning("请选择有效数据")
+      //   return;
+      // };
+      let start_date = new Date(this.parmValue.start_date).valueOf();
+      let end_date = new Date(this.parmValue.end_date).valueOf();
+      let flag = end_date - start_date > 30 * 24 * 60 * 60 * 1000;
+      if (this.parmValue.start_date != "" && this.parmValue.end_date != "") {
+        if (flag) {
+          this.$message.warning("导出文件的时间区间不能超过30天");
+          return;
+        }
+      } else {
+        this.$message.warning("请选择导出文件的时间区间");
+        return;
+      }
+      let model = JSON.parse(JSON.stringify(this.parmValue));
+      // model.is_export = 1;
+      if (!this.loading) {
+        this.loading = true;
+        let httpType = `aplication/zip`;
+        axios({
+          method: "post",
+          url: this.fileUrl + "admin/goodPriceZhaoExport",
+          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>
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .purchaseOrder {
   // text-align: right;
 }
-/deep/ .el-pagination{
-  float: right;
-    margin-top: 10px;
-}
 </style>
-   

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

@@ -24,40 +24,16 @@
       <template #table-header="{}">
         <div style="width: 100%">
           <el-row style="padding: 0 0 0 80px">
-            <el-col :span="6" style="width: 463px">
+            <el-col :span="6" style="width: 220px">
               <periodDatePickerActive
-                :start="parmValue.start_date"
-                :end="parmValue.end_date"
-                :placeholder="'产品操作'"
-                :width="'205px'"
+                :month="month"
                 :size="searchSize"
+                :newTime="newTime"
                 @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-row>
-          <el-row style="padding: 10px 0 0 0" gutter="10">
-            <el-col :span="6" style="width: 240px">
+
+            <el-col :span="6" style="width: 140px;padding:0 0 0 10px">
               <el-input
                 clearable
                 placeholder="采购维护人"
@@ -72,7 +48,7 @@
               >
               </el-input>
             </el-col>
-            <el-col :span="6" style="width: 240px">
+            <el-col :span="6" style="width: 350px;padding:0 0 0 10px">
               <el-input
                 clearable
                 placeholder="供应商名称"
@@ -89,11 +65,27 @@
             </el-col>
             <el-col :span="4" style="width: 66px; float: right">
               <el-button
-                type="warning"
+                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"
-                @click="restSearch"
+                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>
@@ -101,133 +93,17 @@
         </div>
       </template>
 
-      <template #operation="{ scope }">
-        <el-tooltip effect="dark" content="修改内容对比" placement="top">
-          <i class="el-icon-view tb-icon" @click="dlgTable(scope.row)"></i>
-        </el-tooltip>
-      </template>
+      <template #catinfo="{ scope }"> </template>
     </ex-table>
-
-    <el-dialog
-      title="产品修改差异对比"
-      :visible.sync="dialogTableVisible"
-      :center="true"
-      align="left"
-      top="3vh"
-      width="1040px"
-      :close-on-click-modal="false"
-      element-loading-text="拼命加载中"
-      element-loading-spinner="el-icon-loading"
-      element-loading-background="rgba(0, 0, 0, 0.8)"
-      @close="dialogTableVisible = false"
-    >
-      <el-table
-        :data="showData"
-        :size="searchSize"
-        border
-        stripe
-        max-height="750px"
-        style="width: 100%; margin: -20px 0 0"
-      >
-        <el-table-column
-          prop="key_name"
-          label="修改字段名称"
-          width="130px"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          prop="key"
-          label="修改字段"
-          width="130px"
-          show-overflow-tooltip
-        />
-        <el-table-column prop="before" label="修改前" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <div v-if="scope.row.key === 'good_img'">
-              <img
-                v-for="(si, sii) in scope.row.before"
-                :key="si + sii"
-                :src="si"
-                alt=""
-                class="fl"
-                v-viewer
-                style="width: 30px; height: 30px"
-              />
-            </div>
-            <div v-else-if="scope.row.key === 'good_info_img'">
-              <img
-                v-for="(si, sii) in scope.row.after"
-                :key="si + sii"
-                :src="si"
-                alt=""
-                v-viewer
-                 class="fl"
-                style="width: 30px; height: 30px"
-              />
-            </div>
-            <div v-else-if="scope.row.key === 'good_thumb_img'">
-              <img
-                v-for="(si, sii) in scope.row.after"
-                :key="si + sii"
-                :src="si"
-                alt=""
-                v-viewer
-                 class="fl"
-                style="width: 30px; height: 30px"
-              />
-            </div>
-            <div v-else>{{ scope.row.before }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="after" label="修改后" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <div v-if="scope.row.key === 'good_img'">
-              <img
-                v-for="(si, sii) in scope.row.after"
-                :key="si + sii"
-                :src="si"
-                alt=""
-                v-viewer
-                 class="fl"
-                style="width: 30px; height: 30px"
-              />
-            </div>
-            <div v-else-if="scope.row.key === 'good_info_img'">
-              <img
-                v-for="(si, sii) in scope.row.after"
-                :key="si + sii"
-                :src="si"
-                alt=""
-                v-viewer
-                 class="fl"
-                style="width: 30px; height: 30px"
-              />
-            </div>
-            <div v-else-if="scope.row.key === 'good_thumb_img'">
-              <img
-                v-for="(si, sii) in scope.row.after"
-                :key="si + sii"
-                :src="si"
-                alt=""
-                v-viewer
-                 class="fl"
-                style="width: 30px; height: 30px"
-              />
-            </div>
-            <div v-else>{{ scope.row.after }}</div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
   </div>
 </template>
-   <script>
+<script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import urlConfig from "@/apis/url-config";
 import asyncRequest from "@/apis/service/reportQuery/productReport";
-import periodDatePickerActive from "../period-date-picker/main.vue";
-import { table3, editTable3 } from "./columns";
+import periodDatePickerActive from "../period-date-picker-month/index.vue";
+import { table3 } from "./columns";
 import { mapGetters } from "vuex";
 
 export default {
@@ -241,9 +117,10 @@ export default {
   },
   data() {
     return {
+      newTime: "",
+      month: "",
       editOld: {},
       editNew: {},
-      dialogTableVisible: false,
       //选中数组
       changeList: [],
       showData: [],
@@ -276,46 +153,29 @@ export default {
       },
 
       table3: table3,
-      editTable3,
     };
   },
   mounted() {
-    this.searchList();
+    this.month = this.transformTime();
+    this.getNewTime();
   },
 
   methods: {
-    dlgTable(row) {
-      this.showData = [];
-      const { before_info, after_info } = row;
-
-      let keyList = [];
-      for (let key in after_info) {
-        keyList.push(key);
-      }
-
-      for (let i = 0; i < keyList.length; i++) {
-        
-        let model = {
-          key: keyList[i],
-          key_name:
-            (editTable3.find((s) => s.prop === keyList[i]) || {}).label ||
-            "--",
-          before: this.get_key_value(keyList[i], before_info),
-          after: this.get_key_value(keyList[i], after_info),
-        };
-        // console.log(model.key_name)
-        this.showData.push(model);
-      }
-      this.dialogTableVisible = true;
+    transformTime() {
+      let time = new Date();
+      let y = time.getFullYear();
+      let M = time.getMonth() + 1;
+      return y + "-" + (M < 10 ? "0" + M : M);
+    },
+    getNewTime() {
+      this.newTime = new Date().valueOf();
     },
     get_key_value(key, info) {
       if (key === "good_img") {
         return info[key] ? (info[key] || "").split(",") : [];
-      }
-      else if(key === "good_info_img") {
+      } else if (key === "good_info_img") {
         return info[key] ? (info[key] || "").split(",") : [];
-      }
-      else if(key === "good_thumb_img") {
+      } else if (key === "good_thumb_img") {
         return info[key] ? (info[key] || "").split(",") : [];
       }
       // else if(key === "cat_id") {
@@ -325,19 +185,28 @@ export default {
     },
     //初始化http请求
     async searchList() {
+      if (this.loading) return;
       if (
         (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
         (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
       ) {
-        this.$message.warning("时间区间不完整！");
+        this.$message.warning("请选择时间！");
+        this.tableData = [];
+        this.pageInfo.total = 0;
         return;
       }
-      // return;
       this.loading = true;
       const res = await asyncRequest.goodSimpleZhao(this.parmValue);
       console.log(res);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
+        this.tableData.forEach((a) => {
+          a.cat_name = "";
+          let list = a.catinfo || [];
+          list.forEach((b, i) => {
+            a.cat_name += i == 0 ? b.name : "/" + b.name;
+          });
+        });
         this.pageInfo.total = Number(res.data.count);
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
@@ -347,36 +216,37 @@ export default {
         this.$message.warning(res.message);
       }
       this.loading = false;
+      // } else {
+      //   this.$message.warning("请选择时间！");
+      // }
     },
 
     //重置
     restSearch() {
-      this.parmValue = {
-        creater: "", //采购维护人
-        supplier_name: "", // 供应商名称
-        start_date: "", //新建起始时间
-        end_date: "", // 新建结束时间
-        page: 1, // 页码
-        size: 15, // 每页显示条数
-      };
-      // 表格 - 分页
+      this.month = this.transformTime();
+
+      this.parmValue.page = 1;
+      this.parmValue.sizee = 15;
+      this.parmValue.creater = ""; //采购维护人
+      this.parmValue.supplier_name = ""; // 供应商名称
       this.pageInfo = {
         size: 15,
         curr: 1,
         total: 0,
       };
-      this.searchList();
+      this.getNewTime();
     },
 
     // 时间函数
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
       this.parmValue.end_date = e.endTime || "";
+      this.month = e.value;
       if (
         (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
         (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
       ) {
-        this.$message.warning("时间区间不完整！");
+        this.$message.warning("请选择时间！");
         return;
       }
       this.pageInfo.curr = 1;
@@ -392,20 +262,13 @@ export default {
     },
     //导出文件
     async download() {
-      // if(this.changeList.length<=0){
-      //   this.$message.warning("请选择有效数据")
-      //   return;
-      // }
       let start_date = new Date(this.parmValue.start_date).valueOf();
       let end_date = new Date(this.parmValue.end_date).valueOf();
-      let flag = end_date - start_date > 30 * 24 * 60 * 60 * 1000;
-      if (this.parmValue.start_date != "" && this.parmValue.end_date != "") {
-        if (flag) {
-          this.$message.warning("导出文件的时间区间不能超过30天");
-          return;
-        }
-      } else {
-        this.$message.warning("请选择导出文件的时间区间");
+      if (
+        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
+        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+      ) {
+        this.$message.warning("请选择时间");
         return;
       }
       let model = JSON.parse(JSON.stringify(this.parmValue));
@@ -415,7 +278,7 @@ export default {
         let httpType = `aplication/zip`;
         axios({
           method: "post",
-          url: this.fileUrl + "admin/reportchangelogeexport",
+          url: this.fileUrl + "admin/goodSimpleZhaoExport",
           responseType: "blob",
           data: model,
           headers: {
@@ -438,7 +301,7 @@ export default {
               let link = document.createElement("a");
               link.style.display = "none";
               link.href = url;
-              let excelName = "产品修改报表.zip";
+              let excelName = "商品基本信息报表.zip";
               link.setAttribute("download", excelName);
               document.body.appendChild(link);
               link.click();
@@ -464,10 +327,11 @@ export default {
   },
 };
 </script>
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .purchaseOrder {
   // text-align: right;
 }
+
 /deep/ .el-dialog {
   width: 80%;
   // height: 50vh;
@@ -475,4 +339,3 @@ export default {
   min-height: 500px;
 }
 </style>
-   

src/views/reportQuery/productReport/index.vue

@@ -51,7 +51,7 @@ export default {
   },
   data() {
     return {
-      activeName: 'table3'
+      activeName: 'table1'
     }
   },
   methods: {

src/views/reportQuery/productReport/period-date-picker-month/index.vue

@@ -0,0 +1,90 @@
+<template>
+  <div class="fl time">
+    <el-date-picker
+      v-model="value"
+      type="month"
+      :size="size"
+      placeholder="选择月"
+      value-format="yyyy-MM"
+      @change="timeChange"
+      :editable="false"
+      :clearable="true"
+      :disabled="isEdit"
+      :picker-options="pickerOptions"
+    >
+    </el-date-picker>
+  </div>
+</template>
+
+<script>
+// 选择时间段(只有日期)组件
+// timeReturned 返回值{startTime: Number,endTime: Number}
+export default {
+  name: "PeriodDatePicker",
+  props: ["month", "disabled", "size", "width", "type", "placeholder", "newTime"],
+  data() {
+    return {
+      value: this.month,
+      isEdit: this.disabled,
+      pickerOptions: {
+        disabledDate: (time) => {
+          return time.getTime() > new Date().valueOf();
+        },
+      },
+    };
+  },
+  watch: {
+    disabled: function (val) {
+      this.isEdit = val;
+    },
+    month: function (val) {
+      this.value = val;
+    },
+    newTime: function (val) {
+      this.timeChange();
+    },
+  },
+  mounted() {},
+  methods: {
+    timeChange() {
+      if (this.value === null) {
+        this.value = "";
+        let model = {
+          startTime: "",
+          endTime: "",
+          value: this.value,
+        };
+        this.$emit("timeReturned", model);
+      } else {
+        let end = "";
+        let time = new Date(this.value);
+        let y = time.getFullYear();
+        let M = time.getMonth() + 1;
+        let timeTemplate = y + "-" + (M < 10 ? "0" + M : M) + "-";
+        if (M + "" === "12") {
+          end = timeTemplate + "31";
+        } else {
+          let M2 = parseInt(M) + 1;
+          let ti2 = y + "-" + (M < 10 ? "0" + M2 : M2) + "-01";
+          let timestamp = new Date(ti2).valueOf() - 1000 * 60 * 60 * 24;
+          let time2 = new Date(timestamp);
+          let D = time2.getDate();
+          end = timeTemplate + (D < 10 ? "0" + D : D);
+        }
+        let model = {
+          startTime: `${this.value}-01`,
+          endTime: end,
+          value: this.value,
+        };
+        this.$emit("timeReturned", model);
+      }
+      console.log(this.value);
+    },
+  },
+};
+</script>
+<style lang="scss">
+.date-picker.el-input {
+  // width: 150px !important;
+}
+</style>

src/views/sellOut/sellOutOrder/detail.vue

@@ -92,16 +92,16 @@
                       ).find((item) => item.id === resitem.status) || {}
                     ).label || '--'
                   "></el-tag>
-                  <el-tooltip v-if="resitem.status === '3' && resitem.is_receive === '0'" class="fr" effect="dark"
+                  <el-tooltip v-if="resitem.status === '3' && resitem.is_receive === '0'&&powers.some((item) => item == '026')" class="fr" effect="dark"
                     content="同意退货" style="padding: 3px 0 0 0" placement="top">
                     <i class="el-icon-video-play tb-icon" @click="agree_return"></i>
                   </el-tooltip>
 
-                  <el-tooltip class="fr" effect="dark" content="取消申请" style="padding: 3px 0 0 0" v-if="
+                  <el-tooltip class="fr" effect="dark" content="取消申请" style="padding: 3px 0 0 0" v-if="(
                     resitem.status === '1' ||
                     resitem.status === '2' ||
                     resitem.status === '3' ||
-                    resitem.status === '4'
+                    resitem.status === '4')&&powers.some((item) => item == '027')
                   " placement="top">
                     <i class="el-icon-circle-close tb-icon" @click="close_return"></i>
                   </el-tooltip>
@@ -109,7 +109,7 @@
                 ? '换货'
                 : resitem.is_receive === '0'
                   ? '补发'
-                  : '--'" style="padding: 3px 0 0 0" v-if="resitem.status === '5' && resitem.is_reissue + '' === '0' && resitem.except_code === '2'
+                  : '--'" style="padding: 3px 0 0 0" v-if="resitem.status === '5' && resitem.is_reissue + '' === '0' && resitem.except_code === '2'&& powers.some((item) => item == '091')
     " placement="top">
                     <i class="el-icon-shopping-cart-2 tb-icon" @click="reissue"></i>
                   </el-tooltip>