build

src/views/businessReportQuery/businessProductReport/components/table1.vue

@@ -91,13 +91,14 @@ import asyncRequest from '@/apis/service/reportQuery/productReport'
 import periodDatePickerActive from '../period-date-picker-month/index.vue'
 import { table1 } from './columns'
 import { mapGetters } from 'vuex'
+import companyHelper from '@/mixins/companyHelper'
 
 export default {
   name: 'PurchaseOrder',
   components: {
     periodDatePickerActive
   },
-  mixins: [mixinPage, resToken],
+  mixins: [mixinPage, resToken, companyHelper],
   computed: {
     ...mapGetters(['tablebtnSize', 'searchSize', 'size'])
   },
@@ -165,7 +166,10 @@ export default {
         return
       }
       this.loading = true
-      const res = await asyncRequest.goodCostZhao(this.parmValue)
+      const res = await asyncRequest.goodCostZhao({
+        ...this.parmValue,
+        companySearchProp: this.currentCompany
+      })
       if (res && res.code === 0 && res.data) {
         console.log(res)
         this.tableData = res.data.list
@@ -250,7 +254,10 @@ export default {
           method: 'post',
           url: this.fileUrl + 'admin/goodCostZhaoExport',
           responseType: 'blob',
-          data: model,
+          data: {
+            ...model,
+            companyExportProp: this.currentCompany
+          },
           headers: {
             // 'Content-Type': 'multipart/form-data',
             // Accept: "application/vnd.ms-excel"

src/views/businessReportQuery/businessProductReport/components/table2.vue

@@ -28,15 +28,15 @@
               <periodDatePickerActive
                 :month="month"
                 :size="searchSize"
-                :newTime="newTime"
+                :new-time="newTime"
                 @timeReturned="time"
               />
             </el-col>
             <el-col :span="6" style="width: 230px">
               <el-input
+                v-model="parmValue.spuCode"
                 clearable
                 placeholder="商品成本信息"
-                v-model="parmValue.spuCode"
                 maxlength="40"
                 :size="searchSize"
                 @blur="
@@ -44,16 +44,15 @@
                   parmValue.page = 1;
                   searchList();
                 "
-              >
-              </el-input>
+              />
             </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"
+                @click="download"
               >
                 导出
               </el-button>
@@ -85,40 +84,41 @@
   </div>
 </template>
 <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-month/index.vue";
-import { table2 } from "./columns";
-import { mapGetters } from "vuex";
+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-month/index.vue'
+import companyHelper from '@/mixins/companyHelper'
+import { table2 } from './columns'
+import { mapGetters } from 'vuex'
 
 export default {
-  name: "purchaseOrder",
-  mixins: [mixinPage, resToken],
+  name: 'PurchaseOrder',
   components: {
-    periodDatePickerActive,
+    periodDatePickerActive
   },
+  mixins: [mixinPage, resToken, companyHelper],
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(['tablebtnSize', 'searchSize', 'size'])
   },
   data() {
     return {
-      newTime: "",
-      month: "",
-      //选中数组
+      newTime: '',
+      month: '',
+      // 选中数组
       changeList: [],
-      //全局url
+      // 全局url
       fileUrl: urlConfig.baseURL,
-      //loading
+      // loading
       loading: false,
-      //请求参数集合
+      // 请求参数集合
       parmValue: {
-        start_date: "", //起始时间
-        end_date: "", // 结束时间
+        start_date: '', // 起始时间
+        end_date: '', // 结束时间
         page: 1, // 页码
         size: 15, // 每页显示条数
-        spuCode:"" //商品成品信息
+        spuCode: '' // 商品成品信息
         // is_export:0//是否导出0/1
       },
       // 表格 - 数据集合
@@ -127,177 +127,183 @@ export default {
       table: {
         stripe: true,
         border: true,
-        _defaultHeader_: ["setcol"],
+        _defaultHeader_: ['setcol']
       },
       // 表格 - 分页
       pageInfo: {
         size: 15,
         curr: 1,
-        total: 0,
+        total: 0
       },
       // 表格表头 - 列参数
-      table2: table2,
-    };
+      table2: table2
+    }
   },
   mounted() {
-    this.month = this.transformTime();
-    this.getNewTime();
+    this.month = this.transformTime()
+    this.getNewTime()
   },
 
   methods: {
     transformTime() {
-      let time = new Date();
-      let y = time.getFullYear();
-      let M = time.getMonth() + 1;
-      return y + "-" + (M < 10 ? "0" + M : M);
+      const time = new Date()
+      const y = time.getFullYear()
+      const M = time.getMonth() + 1
+      return y + '-' + (M < 10 ? '0' + M : M)
     },
     getNewTime() {
-      this.newTime = new Date().valueOf();
+      this.newTime = new Date().valueOf()
     },
-    //初始化http请求
+    // 初始化http请求
     async searchList() {
-      if (this.loading) return;
+      if (this.loading) return
       if (
-        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
-        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+        (this.parmValue.start_date !== '' && this.parmValue.end_date === '') ||
+        (this.parmValue.start_date === '' && this.parmValue.end_date !== '')
       ) {
-        this.$message.warning("请选择时间！");
-        this.tableData = [];
-        this.pageInfo.total = 0;
-        return;
+        this.$message.warning('请选择时间！')
+        this.tableData = []
+        this.pageInfo.total = 0
+        return
       }
-      this.loading = true;
-      const res = await asyncRequest.goodPriceZhao(this.parmValue);
+      this.loading = true
+      const res = await asyncRequest.goodPriceZhao({
+        ...this.parmValue,
+        companySearchProp: this.currentCompany
+      })
       if (res && res.code === 0 && res.data) {
-        console.log(res);
-        this.tableData = res.data.list;
-        this.pageInfo.total = Number(res.data.count);
+        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();
+        await this.logout()
       } else {
-        this.tableData = [];
-        this.pageInfo.total = 0;
-        this.$message.warning(res.message);
+        this.tableData = []
+        this.pageInfo.total = 0
+        this.$message.warning(res.message)
       }
-      this.loading = false;
+      this.loading = false
     },
 
-    //重置
+    // 重置
     restSearch() {
-      this.month = this.transformTime();
+      this.month = this.transformTime()
 
-      this.parmValue.page = 1;
-      this.parmValue.sizee = 15;
-      this.parmValue.spuCode = ""
+      this.parmValue.page = 1
+      this.parmValue.sizee = 15
+      this.parmValue.spuCode = ''
       this.pageInfo = {
         size: 15,
         curr: 1,
-        total: 0,
-      };
-      this.getNewTime();
+        total: 0
+      }
+      this.getNewTime()
     },
 
     // 时间函数
     async time(e) {
-      this.parmValue.start_date = e.startTime || "";
-      this.parmValue.end_date = e.endTime || "";
-      this.month = e.value;
+      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.parmValue.start_date !== '' && this.parmValue.end_date === '') ||
+        (this.parmValue.start_date === '' && this.parmValue.end_date !== '')
       ) {
-        this.$message.warning("请选择时间！");
-        return;
+        this.$message.warning('请选择时间！')
+        return
       }
 
       // 表格 - 分页
       // this.$set(this.pageInfo)
       // this.$set(this.pageInfo, 'curr', '2');
-      this.pageInfo.curr = 1;
+      this.pageInfo.curr = 1
       // console.log(this.pageInfo.curr)
-      this.parmValue.page = 1;
-      await this.searchList();
+      this.parmValue.page = 1
+      await this.searchList()
     },
 
-    //选中触发函数
+    // 选中触发函数
     selection_change(e) {
-      const { list } = e;
-      //选中的数组集合
-      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : [];
+      const { list } = e
+      // 选中的数组集合
+      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : []
     },
-    //导出文件
+    // 导出文件
     async download() {
       // if(this.changeList.length<=0){
       //   this.$message.warning("请选择有效数据")
       //   return;
       // };
-      let 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 != "") {
+      const start_date = new Date(this.parmValue.start_date).valueOf()
+      const end_date = new Date(this.parmValue.end_date).valueOf()
+      const 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;
+          this.$message.warning('导出文件的时间区间不能超过30天')
+          return
         }
       } else {
-        this.$message.warning("请选择导出文件的时间区间");
-        return;
+        this.$message.warning('请选择导出文件的时间区间')
+        return
       }
-      let model = JSON.parse(JSON.stringify(this.parmValue));
+      const model = JSON.parse(JSON.stringify(this.parmValue))
       // model.is_export = 1;
       if (!this.loading) {
-        this.loading = true;
-        let httpType = `aplication/zip`;
+        this.loading = true
+        const httpType = `aplication/zip`
         axios({
-          method: "post",
-          url: this.fileUrl + "admin/goodPriceZhaoExport",
-          responseType: "blob",
-          data: model,
+          method: 'post',
+          url: this.fileUrl + 'admin/goodPriceZhaoExport',
+          responseType: 'blob',
+          data: {
+            ...model,
+            companyExportProp: this.currentCompany
+          },
           headers: {
             // 'Content-Type': 'multipart/form-data',
             // Accept: "application/vnd.ms-excel"
-            Accept: httpType,
-          },
+            Accept: httpType
+          }
         })
           .then((res) => {
             // console.log(res)
             // console.log(this.fileUrl)
             // return;
             if (res && res.status == 200 && res.data) {
-              let url = window.URL.createObjectURL(
+              const 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");
-              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(`导出成功！`);
+              )
+              const link = document.createElement('a')
+              link.style.display = 'none'
+              link.href = url
+              const 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);
+                this.loading = false
+              }, 500)
             } else {
-              this.$message.error(res.data.message);
+              this.$message.error(res.data.message)
               setTimeout(() => {
-                this.loading = false;
-              }, 500);
+                this.loading = false
+              }, 500)
             }
           })
           .catch((error) => {
-            console.log(error);
-            this.loading = false;
-          });
+            console.log(error)
+            this.loading = false
+          })
       }
-    },
-  },
-};
+    }
+  }
+}
 </script>
 <style lang="scss" scoped>
 .purchaseOrder {

src/views/businessReportQuery/businessProductReport/components/table3.vue

@@ -28,16 +28,16 @@
               <periodDatePickerActive
                 :month="month"
                 :size="searchSize"
-                :newTime="newTime"
+                :new-time="newTime"
                 @timeReturned="time"
               />
             </el-col>
 
             <el-col :span="6" style="width: 140px;padding:0 0 0 10px">
               <el-input
+                v-model="parmValue.creater"
                 clearable
                 placeholder="采购维护人"
-                v-model="parmValue.creater"
                 maxlength="40"
                 :size="searchSize"
                 @blur="
@@ -45,14 +45,13 @@
                   parmValue.page = 1;
                   searchList();
                 "
-              >
-              </el-input>
+              />
             </el-col>
             <el-col :span="6" style="width: 350px;padding:0 0 0 10px">
               <el-input
+                v-model="parmValue.supplier_name"
                 clearable
                 placeholder="供应商名称"
-                v-model="parmValue.supplier_name"
                 maxlength="40"
                 :size="searchSize"
                 @blur="
@@ -60,16 +59,15 @@
                   parmValue.page = 1;
                   searchList();
                 "
-              >
-              </el-input>
+              />
             </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"
+                @click="download"
               >
                 导出
               </el-button>
@@ -93,49 +91,50 @@
         </div>
       </template>
 
-      <template #catinfo="{ scope }"> </template>
+      <template #catinfo="{ scope }" />
     </ex-table>
   </div>
 </template>
 <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-month/index.vue";
-import { table3 } from "./columns";
-import { mapGetters } from "vuex";
+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-month/index.vue'
+import { table3 } from './columns'
+import { mapGetters } from 'vuex'
+import companyHelper from '@/mixins/companyHelper'
 
 export default {
-  name: "purchaseOrder",
-  mixins: [mixinPage, resToken],
+  name: 'PurchaseOrder',
   components: {
-    periodDatePickerActive,
+    periodDatePickerActive
   },
+  mixins: [mixinPage, resToken, companyHelper],
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(['tablebtnSize', 'searchSize', 'size'])
   },
   data() {
     return {
-      newTime: "",
-      month: "",
+      newTime: '',
+      month: '',
       editOld: {},
       editNew: {},
-      //选中数组
+      // 选中数组
       changeList: [],
       showData: [],
-      //全局url
+      // 全局url
       fileUrl: urlConfig.baseURL,
-      //loading
+      // loading
       loading: false,
-      //请求参数集合
+      // 请求参数集合
       parmValue: {
-        creater: "", //采购维护人
-        supplier_name: "", // 供应商名称
-        start_date: "", //起始时间
-        end_date: "", // 结束时间
+        creater: '', // 采购维护人
+        supplier_name: '', // 供应商名称
+        start_date: '', // 起始时间
+        end_date: '', // 结束时间
         page: 1, // 页码
-        size: 15, // 每页显示条数
+        size: 15 // 每页显示条数
       },
       // 表格 - 数据集合
       tableData: [],
@@ -143,189 +142,195 @@ export default {
       table: {
         stripe: true,
         border: true,
-        _defaultHeader_: ["setcol"],
+        _defaultHeader_: ['setcol']
       },
       // 表格 - 分页
       pageInfo: {
         size: 15,
         curr: 1,
-        total: 0,
+        total: 0
       },
 
-      table3: table3,
-    };
+      table3: table3
+    }
   },
   mounted() {
-    this.month = this.transformTime();
-    this.getNewTime();
+    this.month = this.transformTime()
+    this.getNewTime()
   },
 
   methods: {
     transformTime() {
-      let time = new Date();
-      let y = time.getFullYear();
-      let M = time.getMonth() + 1;
-      return y + "-" + (M < 10 ? "0" + M : M);
+      const time = new Date()
+      const y = time.getFullYear()
+      const M = time.getMonth() + 1
+      return y + '-' + (M < 10 ? '0' + M : M)
     },
     getNewTime() {
-      this.newTime = new Date().valueOf();
+      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") {
-        return info[key] ? (info[key] || "").split(",") : [];
-      } else if (key === "good_thumb_img") {
-        return info[key] ? (info[key] || "").split(",") : [];
+      if (key === 'good_img') {
+        return info[key] ? (info[key] || '').split(',') : []
+      } else if (key === 'good_info_img') {
+        return info[key] ? (info[key] || '').split(',') : []
+      } else if (key === 'good_thumb_img') {
+        return info[key] ? (info[key] || '').split(',') : []
       }
       // else if(key === "cat_id") {
       //   return info[key] ? (info[key] || "").split(",") : [];
       // }
-      return info[key];
+      return info[key]
     },
-    //初始化http请求
+    // 初始化http请求
     async searchList() {
-      if (this.loading) return;
+      if (this.loading) return
       if (
-        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
-        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+        (this.parmValue.start_date !== '' && this.parmValue.end_date === '') ||
+        (this.parmValue.start_date === '' && this.parmValue.end_date !== '')
       ) {
-        this.$message.warning("请选择时间！");
-        this.tableData = [];
-        this.pageInfo.total = 0;
-        return;
+        this.$message.warning('请选择时间！')
+        this.tableData = []
+        this.pageInfo.total = 0
+        return
       }
-      this.loading = true;
-      const res = await asyncRequest.goodSimpleZhao(this.parmValue);
-      console.log(res);
+      this.loading = true
+      const res = await asyncRequest.goodSimpleZhao({
+        ...this.parmValue,
+        companySearchProp: this.currentCompany
+      })
+      console.log(res)
       if (res && res.code === 0 && res.data) {
-        this.tableData = res.data.list;
+        this.tableData = res.data.list
         this.tableData.forEach((a) => {
-          a.cat_name = "";
-          let list = a.catinfo || [];
+          a.cat_name = ''
+          const list = a.catinfo || []
           list.forEach((b, i) => {
-            a.cat_name += i == 0 ? b.name : "/" + b.name;
-          });
-        });
-        this.pageInfo.total = Number(res.data.count);
+            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();
+        await this.logout()
       } else {
-        this.tableData = [];
-        this.pageInfo.total = 0;
-        this.$message.warning(res.message);
+        this.tableData = []
+        this.pageInfo.total = 0
+        this.$message.warning(res.message)
       }
-      this.loading = false;
+      this.loading = false
       // } else {
       //   this.$message.warning("请选择时间！");
       // }
     },
 
-    //重置
+    // 重置
     restSearch() {
-      this.month = this.transformTime();
+      this.month = this.transformTime()
 
-      this.parmValue.page = 1;
-      this.parmValue.sizee = 15;
-      this.parmValue.creater = ""; //采购维护人
-      this.parmValue.supplier_name = ""; // 供应商名称
+      this.parmValue.page = 1
+      this.parmValue.sizee = 15
+      this.parmValue.creater = '' // 采购维护人
+      this.parmValue.supplier_name = '' // 供应商名称
       this.pageInfo = {
         size: 15,
         curr: 1,
-        total: 0,
-      };
-      this.getNewTime();
+        total: 0
+      }
+      this.getNewTime()
     },
 
     // 时间函数
     async time(e) {
-      this.parmValue.start_date = e.startTime || "";
-      this.parmValue.end_date = e.endTime || "";
-      this.month = e.value;
+      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.parmValue.start_date !== '' && this.parmValue.end_date === '') ||
+        (this.parmValue.start_date === '' && this.parmValue.end_date !== '')
       ) {
-        this.$message.warning("请选择时间！");
-        return;
+        this.$message.warning('请选择时间！')
+        return
       }
-      this.pageInfo.curr = 1;
-      this.parmValue.page = 1;
-      await this.searchList();
+      this.pageInfo.curr = 1
+      this.parmValue.page = 1
+      await this.searchList()
     },
 
-    //选中触发函数
+    // 选中触发函数
     selection_change(e) {
-      const { list } = e;
-      //选中的数组集合
-      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : [];
+      const { list } = e
+      // 选中的数组集合
+      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : []
     },
-    //导出文件
+    // 导出文件
     async download() {
-      let start_date = new Date(this.parmValue.start_date).valueOf();
-      let end_date = new Date(this.parmValue.end_date).valueOf();
+      const start_date = new Date(this.parmValue.start_date).valueOf()
+      const end_date = new Date(this.parmValue.end_date).valueOf()
       if (
-        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
-        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+        (this.parmValue.start_date !== '' && this.parmValue.end_date === '') ||
+        (this.parmValue.start_date === '' && this.parmValue.end_date !== '')
       ) {
-        this.$message.warning("请选择时间");
-        return;
+        this.$message.warning('请选择时间')
+        return
       }
-      let model = JSON.parse(JSON.stringify(this.parmValue));
+      const model = JSON.parse(JSON.stringify(this.parmValue))
       // model.is_export = 1;
       if (!this.loading) {
-        this.loading = true;
-        let httpType = `aplication/zip`;
+        this.loading = true
+        const httpType = `aplication/zip`
         axios({
-          method: "post",
-          url: this.fileUrl + "admin/goodSimpleZhaoExport",
-          responseType: "blob",
-          data: model,
+          method: 'post',
+          url: this.fileUrl + 'admin/goodSimpleZhaoExport',
+          responseType: 'blob',
+          data: {
+            ...model,
+            companyExportProp: this.currentCompany
+          },
           headers: {
             // 'Content-Type': 'multipart/form-data',
             // Accept: "application/vnd.ms-excel"
-            Accept: httpType,
-          },
+            Accept: httpType
+          }
         })
           .then((res) => {
             // console.log(res)
             // console.log(this.fileUrl)
             // return;
             if (res && res.status == 200 && res.data) {
-              let url = window.URL.createObjectURL(
+              const 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");
-              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(`导出成功！`);
+              )
+              const link = document.createElement('a')
+              link.style.display = 'none'
+              link.href = url
+              const 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);
+                this.loading = false
+              }, 500)
             } else {
-              this.$message.error(res.data.message);
+              this.$message.error(res.data.message)
               setTimeout(() => {
-                this.loading = false;
-              }, 500);
+                this.loading = false
+              }, 500)
             }
           })
           .catch((error) => {
-            console.log(error);
-            this.loading = false;
-          });
+            console.log(error)
+            this.loading = false
+          })
       }
-    },
-  },
-};
+    }
+  }
+}
 </script>
 <style lang="scss" scoped>
 .purchaseOrder {

src/views/businessReportQuery/businessProductReport/period-date-picker/main.vue

@@ -17,9 +17,9 @@
     />
     <samp style="padding: 0 3px; margin: 0">至</samp>
     <el-date-picker
+      v-model="endTime"
       style="margin: 0"
       :size="size"
-      v-model="endTime"
       class="date-picker"
       :style="{ width: width }"
       type="date"
@@ -38,8 +38,8 @@
 // 选择时间段(只有日期)组件
 // timeReturned 返回值{startTime: Number,endTime: Number}
 export default {
-  name: "PeriodDatePicker",
-  props: ["start", "end", "disabled", "size", "width", "type", "placeholder"],
+  name: 'PeriodDatePicker',
+  props: ['start', 'end', 'disabled', 'size', 'width', 'type', 'placeholder'],
   data() {
     return {
       startTime: this.start,
@@ -47,98 +47,98 @@ export default {
       isEdit: this.disabled,
       pickerOptions1: {
         disabledDate: (time) => {
-          if (this.endTime != null && this.endTime != "" && time) {
-            return time.getTime() > new Date(this.endTime).valueOf();
+          if (this.endTime != null && this.endTime != '' && time) {
+            return time.getTime() > new Date(this.endTime).valueOf()
           }
-        },
+        }
       },
       pickerOptions2: {
         disabledDate: (time) => {
-          if (this.startTime != null && this.startTime != "" && time) {
-            return time.getTime() < new Date(this.startTime).valueOf();
+          if (this.startTime != null && this.startTime != '' && time) {
+            return time.getTime() < new Date(this.startTime).valueOf()
           }
-        },
-      },
-    };
+        }
+      }
+    }
   },
   watch: {
-    disabled: function (val) {
-      this.isEdit = val;
+    disabled: function(val) {
+      this.isEdit = val
     },
     start(val) {
-      this.startTime = val;
+      this.startTime = val
     },
     end(val) {
-      this.endTime = val;
-    },
+      this.endTime = val
+    }
   },
   mounted() {},
   methods: {
     timeChange() {
       if (
-        this.startTime !== "" &&
+        this.startTime !== '' &&
         this.startTime !== null &&
-        this.endTime !== "" &&
+        this.endTime !== '' &&
         this.endTime !== null
       ) {
-        if (this.type + "" === "1" && !this.setType(365)) {
-          this.showMessage("时间跨度不能超过一年！");
-          return;
-        } else if (this.type + "" === "2" && !this.setType(90)) {
-          this.showMessage("时间跨度不能超过90天！");
-          return;
-        }else if (this.type + "" === "3" && !this.setType(30)) {
-          this.showMessage("时间跨度不能超过30天！");
-          return;
+        if (this.type + '' === '1' && !this.setType(365)) {
+          this.showMessage('时间跨度不能超过一年！')
+          return
+        } else if (this.type + '' === '2' && !this.setType(90)) {
+          this.showMessage('时间跨度不能超过90天！')
+          return
+        } else if (this.type + '' === '3' && !this.setType(30)) {
+          this.showMessage('时间跨度不能超过30天！')
+          return
         } else if (
           new Date(this.endTime).valueOf() < new Date(this.startTime).valueOf()
         ) {
-          this.showMessage("结束时间不大于开始时间！");
-          return;
+          this.showMessage('结束时间不大于开始时间！')
+          return
         } else {
-          this.timeReturned();
+          this.timeReturned()
         }
       } else {
-        this.timeReturned();
+        this.timeReturned()
       }
     },
     timeReturned() {
-      let s = this.startTime == null ? "" : this.startTime;
-      let e = this.endTime == null ? "" : this.endTime;
-      let model = {
-        startTime: s == "" ? "" : this.transformTime(s),
-        endTime: e == "" ? "" : this.transformTime(e),
-      };
+      const s = this.startTime == null ? '' : this.startTime
+      const e = this.endTime == null ? '' : this.endTime
+      const model = {
+        startTime: s == '' ? '' : this.transformTime(s),
+        endTime: e == '' ? '' : this.transformTime(e)
+      }
 
-      this.$emit("timeReturned", model);
+      this.$emit('timeReturned', model)
     },
 
     transformTime(tTime) {
-      let time = new Date(tTime);
-      let y = time.getFullYear();
-      let M = time.getMonth() + 1;
-      let d = time.getDate();
-      return y + "-" + (M < 10 ? "0" + M : M) + "-" + (d < 10 ? "0" + d : d);
+      const time = new Date(tTime)
+      const y = time.getFullYear()
+      const M = time.getMonth() + 1
+      const d = time.getDate()
+      return y + '-' + (M < 10 ? '0' + M : M) + '-' + (d < 10 ? '0' + d : d)
     },
     showMessage(message) {
-      this.$message.error(message);
-      this.startTime = "";
-      this.endTime = "";
-      this.timeReturned();
+      this.$message.error(message)
+      this.startTime = ''
+      this.endTime = ''
+      this.timeReturned()
     },
     setType(days) {
-      let step = 24 * 3600 * 1000;
-      let sDay = new Date(this.startTime).valueOf();
-      let eDay = new Date(this.endTime).valueOf();
-      let isok = true;
+      const step = 24 * 3600 * 1000
+      const sDay = new Date(this.startTime).valueOf()
+      const eDay = new Date(this.endTime).valueOf()
+      let isok = true
       if (eDay - sDay > step * days) {
-        isok = false;
+        isok = false
       }
 
-      return isok;
-    },
-  },
-};
+      return isok
+    }
+  }
+}
 </script>
 <style lang="scss">
 .date-picker.el-input {

src/views/supplierPurchaseIn/supplierWsmInOrder/detail.vue

@@ -85,7 +85,7 @@
                 :type="sitem.order_type"
                 :skucode="sitem.skuCode"
                 :spucode="sitem.spuCode"
-                :iscgd="true"
+                :iscgd="iscgd"
               />
             </el-collapse-item>
             <el-collapse-item
@@ -232,6 +232,7 @@ export default {
       activeNames: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10"],
       cg_order_type_options,
       sitem: null,
+      iscgd:true,
       status: "",
       statusOptions: [
         {
@@ -334,6 +335,7 @@ export default {
       const res = await asyncRequest.orderininfo({ wsm_in_code: this.queryId });
       if (res && res.code === 0 && res.data) {
         this.sitem = res.data;
+        if(this.sitem.order_type === '4') this.iscgd = false
         const { status, can, wsm_in_code } = this.sitem;
         this.status = status;
         if (can && can.length > 0) {