Merge branch 'v3.0' into company

src/views/dataReport/table3.vue

@@ -25,7 +25,6 @@
       <template #table-header="{}">
         <div style="width: 100%">
           <el-row style="padding: 0 0 0 80px">
-
             <el-col :span="6" style="width: 363px;">
               <periodDatePickerActive
                 :start="parmValue.start_day"
@@ -37,7 +36,7 @@
               />
             </el-col>
 
-            <el-col :span="4">
+            <div style="width:260px;display:inline-block">
               <search-work-company
                 :value="parmValue.companyNo"
                 :placeholder="'业务公司名称'"
@@ -46,20 +45,16 @@
                 :no-disabled="true"
                 @searchChange="company_idsearchChange"
               />
-            </el-col>
-
-            <el-col :span="4" style="margin-left:10px">
-              <el-input placeholder="产品名称" size="mini" v-model="parmValue.good_name" clearable   @change="
-                pageInfo.curr = 1;
-                parmValue.page = 1;
-                searchList();
-              "  />
-            </el-col>
+            </div>
 
             <el-col :span="4" style="width: 66px; float: right">
-              <el-button type="primary" style="margin-left:30px;" :size="searchSize" class="fr" @click="download">
-                导出
-              </el-button>
+              <el-button
+                type="primary"
+                style="margin-left:30px;"
+                :size="searchSize"
+                class="fr"
+                @click="download"
+              >导出</el-button>
             </el-col>
             <el-col :span="3" style="width: 66px; float: right">
               <el-button
@@ -67,60 +62,67 @@
                 type="primary"
                 style="float: right; margin-left: 5px"
                 @click="searchList"
-              >
-                刷新
-              </el-button>
+              >刷新</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-button type="warning" class="fr" :size="searchSize" @click="restSearch">重置</el-button>
             </el-col>
           </el-row>
+
+          <el-row>
+            <div style="width:370px;display:inline-block;margin-top:10px">
+              <el-input
+                placeholder="产品名称"
+                size="mini"
+                v-model="parmValue.good_name"
+                clearable
+                @change="
+                pageInfo.curr = 1;
+                parmValue.page = 1;
+                searchList();
+              "
+              />
+            </div>
+          </el-row>
         </div>
       </template>
-
     </ex-table>
 
     <div v-else>
       <no-auth></no-auth>
     </div>
   </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/newReport'
-import periodDatePickerActive from './period-date-picker/main.vue'
-import { table3 } from './columns'
-import { mapGetters } from 'vuex'
-import dayjs from 'dayjs'
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import urlConfig from "@/apis/url-config";
+import asyncRequest from "@/apis/service/reportQuery/newReport";
+import periodDatePickerActive from "./period-date-picker/main.vue";
+import { table3 } from "./columns";
+import { mapGetters } from "vuex";
+import dayjs from "dayjs";
 
 export default {
-  name: 'SaleReport',
+  name: "SaleReport",
   components: {
     periodDatePickerActive
   },
   mixins: [mixinPage, resToken],
   computed: {
-    ...mapGetters(['tablebtnSize', 'searchSize', 'size']),
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
       const tran =
-        this.$store.getters.btnList.find((i) => i.menu_route == "reportTableThree") || {};
+        this.$store.getters.btnList.find(
+          i => i.menu_route == "reportTableThree"
+        ) || {};
       const { action } = tran ?? {};
       return action ?? [];
     }
   },
   data() {
     return {
-    // 选中数组
+      // 选中数组
       changeList: [],
       // 全局url
       fileUrl: urlConfig.baseURL,
@@ -128,15 +130,14 @@ export default {
       loading: false,
       // 请求参数集合
       parmValue: {
-        good_name:"",
-        companyNo: '',
-        start_day: '', // 起始时间
-        end_day: '', // 结束时间
+        good_name: "",
+        companyNo: "",
+        start_day: "", // 起始时间
+        end_day: "", // 结束时间
         // is_export:0,//是否导出0/1
 
         page: 1, // 页码
         size: 15 // 每页显示条数
-
       },
       // 表格 - 数据集合
       tableData: [],
@@ -144,7 +145,7 @@ export default {
       table: {
         stripe: true,
         border: true,
-        _defaultHeader_: ['setcol']
+        _defaultHeader_: ["setcol"]
       },
       // 表格 - 分页
       pageInfo: {
@@ -154,177 +155,185 @@ export default {
       },
       // 表格表头 - 列参数
       table3: table3
-    }
+    };
   },
   mounted() {
-    this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
-    this.parmValue.end_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
-    this.searchList()
+    this.parmValue.start_day = dayjs()
+      .subtract(0, "day")
+      .format("YYYY-MM-DD");
+    this.parmValue.end_day = dayjs()
+      .subtract(0, "day")
+      .format("YYYY-MM-DD");
+    this.searchList();
   },
 
   methods: {
-  // 初始化http请求
+    // 初始化http请求
     async searchList() {
       if (!this.parmValue.start_day || !this.parmValue.end_day) {
-        this.$message.warning('请选择时间区间')
-        this.tableData = []
-        return
+        this.$message.warning("请选择时间区间");
+        this.tableData = [];
+        return;
       }
 
-      const start_day = new Date(this.parmValue.start_day).valueOf()
-      const end_day = new Date(this.parmValue.end_day).valueOf()
-      const flag = end_day - start_day > 31 * 24 * 60 * 60 * 1000
+      const start_day = new Date(this.parmValue.start_day).valueOf();
+      const end_day = new Date(this.parmValue.end_day).valueOf();
+      const flag = end_day - start_day > 31 * 24 * 60 * 60 * 1000;
 
-      if (this.parmValue.start_day != '' && this.parmValue.end_day != '') {
+      if (this.parmValue.start_day != "" && this.parmValue.end_day != "") {
         if (flag) {
-          this.$message.warning('筛选的时间区间不能超过31天')
-          return
+          this.$message.warning("筛选的时间区间不能超过31天");
+          return;
         }
       }
 
-      this.loading = true
+      this.loading = true;
 
-      const res = await asyncRequest.salestock(this.parmValue)
+      const res = await asyncRequest.salestock(this.parmValue);
       if (res && res.code === 0 && res.data) {
-        this.tableData = res.data.list
+        this.tableData = res.data.list;
 
-        console.log(this.tableData)
-        this.pageInfo.total = Number(res.data.count)
+        console.log(this.tableData);
+        this.pageInfo.total = Number(res.data.count);
       } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout()
+        await this.logout();
       } else {
-        this.$message.warning(res.message)
-        this.tableData = []
-        this.pageInfo.total = 0
+        this.$message.warning(res.message);
+        this.tableData = [];
+        this.pageInfo.total = 0;
       }
-      this.loading = false
+      this.loading = false;
     },
 
     company_idsearchChange(e) {
-      const { code } = e
-      this.parmValue.companyNo = code || ''
-      this.searchList()
+      const { code } = e;
+      this.parmValue.companyNo = code || "";
+      this.searchList();
     },
 
     // 重置
     restSearch() {
       this.parmValue = {
-        good_name:"",
-        companyNo: '',
-        start_day: '', // 新建起始时间
-        end_day: '', // 新建结束时间
+        good_name: "",
+        companyNo: "",
+        start_day: "", // 新建起始时间
+        end_day: "", // 新建结束时间
         // is_export:0,//是否导出0/1
         page: 1, // 页码
         size: 15 // 每页显示条数
-      }
-      this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
-      this.parmValue.end_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
+      };
+      this.parmValue.start_day = dayjs()
+        .subtract(0, "day")
+        .format("YYYY-MM-DD");
+      this.parmValue.end_day = dayjs()
+        .subtract(0, "day")
+        .format("YYYY-MM-DD");
       // 表格 - 分页
       this.pageInfo = {
         size: 15,
         curr: 1,
         total: 0
-      }
-      this.searchList()
+      };
+      this.searchList();
     },
 
     // 时间函数
     async time(e) {
-      this.parmValue.start_day = e.startTime || ''
-      this.parmValue.end_day = e.endTime || ''
+      this.parmValue.start_day = e.startTime || "";
+      this.parmValue.end_day = e.endTime || "";
       if (
-        (this.parmValue.start_day !== '' && this.parmValue.end_day === '') ||
-      (this.parmValue.start_day === '' && this.parmValue.end_day !== '')
+        (this.parmValue.start_day !== "" && this.parmValue.end_day === "") ||
+        (this.parmValue.start_day === "" && this.parmValue.end_day !== "")
       ) {
-        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
+      const { list } = e;
       // 选中的数组集合
-      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : []
+      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : [];
     },
     // 导出文件
     async download() {
       if (!this.parmValue.start_day || !this.parmValue.end_day) {
-        this.$message.warning('请选择时间区间')
-        this.tableData = []
-        return
+        this.$message.warning("请选择时间区间");
+        this.tableData = [];
+        return;
       }
-      
-      const model = JSON.parse(JSON.stringify(this.parmValue))
-      delete model['page']
-      delete model['size']
+
+      const model = JSON.parse(JSON.stringify(this.parmValue));
+      delete model["page"];
+      delete model["size"];
       // model.is_export = 1;
-      const start_day = new Date(this.parmValue.start_day).valueOf()
-      const end_day = new Date(this.parmValue.end_day).valueOf()
-      const flag = end_day - start_day > 31 * 24 * 60 * 60 * 1000
-      if (this.parmValue.start_day != '' && this.parmValue.end_day != '') {
+      const start_day = new Date(this.parmValue.start_day).valueOf();
+      const end_day = new Date(this.parmValue.end_day).valueOf();
+      const flag = end_day - start_day > 31 * 24 * 60 * 60 * 1000;
+      if (this.parmValue.start_day != "" && this.parmValue.end_day != "") {
         if (flag) {
-          this.$message.warning('导出文件的时间区间不能超过31天')
-          return
+          this.$message.warning("导出文件的时间区间不能超过31天");
+          return;
         }
       } else {
-        this.$message.warning('请选择导出文件的时间区间')
-        return
+        this.$message.warning("请选择导出文件的时间区间");
+        return;
       }
       if (!this.loading) {
-        this.loading = true
-        const httpType = `aplication/zip`
+        this.loading = true;
+        const httpType = `aplication/zip`;
         axios({
-          method: 'post',
-          url: this.fileUrl + 'admin/sse',
-          responseType: 'blob',
+          method: "post",
+          url: this.fileUrl + "admin/sse",
+          responseType: "blob",
           data: model,
           headers: {
             Accept: httpType
           }
         })
-          .then((res) => {
+          .then(res => {
             if (res && res.status == 200 && res.data) {
               const url = window.URL.createObjectURL(
                 new Blob([res.data], {
                   type: httpType
                 })
-              )
-              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(`导出成功！`)
+              );
+              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
-          })
+          .catch(error => {
+            console.log(error);
+            this.loading = false;
+          });
       }
     }
   }
-}
+};
 </script>
  <style lang="scss" scoped>
 .purchaseOrder {
-// text-align: right;
+  // text-align: right;
 }
 </style>
 

src/views/dataReport/table5.vue

@@ -25,7 +25,6 @@
       <template #table-header="{}">
         <div style="width: 100%">
           <el-row style="padding: 0 0 0 80px">
-
             <el-col :span="6" style="width: 363px;">
               <periodDatePickerActive
                 :start="parmValue.start_day"
@@ -37,7 +36,7 @@
               />
             </el-col>
 
-            <el-col :span="4" style="width: 350px">
+            <el-col :span="4" style="width: 320px">
               <search-supplier
                 :size="'mini'"
                 :value="parmValue.supplierNo"
@@ -51,9 +50,13 @@
             </el-col>
 
             <el-col :span="4" style="width: 66px; float: right">
-              <el-button type="primary" style="margin-left:30px;" :size="searchSize" class="fr" @click="download">
-                导出
-              </el-button>
+              <el-button
+                type="primary"
+                style="margin-left:30px;"
+                :size="searchSize"
+                class="fr"
+                @click="download"
+              >导出</el-button>
             </el-col>
             <el-col :span="3" style="width: 66px; float: right">
               <el-button
@@ -61,19 +64,10 @@
                 type="primary"
                 style="float: right; margin-left: 5px"
                 @click="searchList"
-              >
-                刷新
-              </el-button>
+              >刷新</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-button type="warning" class="fr" :size="searchSize" @click="restSearch">重置</el-button>
             </el-col>
           </el-row>
 
@@ -88,47 +82,70 @@
                 @searchChange="company_idsearchChange"
               />
             </el-col>
-            
-
 
-            <el-col :span="4" style="margin-left:10px;">
-              <el-select v-model="parmValue.depart_id" size="mini" placeholder="部门" filterable clearable  @change="
+            <div style="width:160px;margin-left:10px;display:inline-block">
+              <el-select
+                v-model="parmValue.depart_id"
+                style="width:100%"
+                size="mini"
+                placeholder="部门"
+                filterable
+                clearable
+                @change="
                   pageInfo.curr = 1;
                   parmValue.page = 1;
                   searchList();
-                ">
-                <el-option v-for="depart in departList" :key="depart.id" :label="depart.name" :value="depart.id" />
+                "
+              >
+                <el-option
+                  v-for="depart in departList"
+                  :key="depart.id"
+                  :label="depart.name"
+                  :value="depart.id"
+                />
               </el-select>
-            </el-col>
+            </div>
 
-            <el-col :span="4" style="margin-left:10px;width:350px">
-              <el-select v-model="parmValue.person_id" size="mini" placeholder="供应商负责人" filterable clearable  @change="
+            <div :span="4" style="width:160px;margin-left:10px;display:inline-block">
+              <el-select
+                v-model="parmValue.person_id"
+                size="mini"
+                placeholder="供应商负责人"
+                filterable
+                clearable
+                @change="
                   pageInfo.curr = 1;
                   parmValue.page = 1;
                   searchList();
-                ">
-                <el-option v-for="depart in activeOptions" :key="depart.id" :label="depart.nickname" :value="depart.id" />
+                "
+              >
+                <el-option
+                  v-for="depart in activeOptions"
+                  :key="depart.id"
+                  :label="depart.nickname"
+                  :value="depart.id"
+                />
               </el-select>
-            </el-col>
+            </div>
           </el-row>
         </div>
       </template>
 
-      <template #order_type="{scope}">
-        {{ xs_order_type_options.find(({id}) => id === String(scope.row.order_type)).label }}
-      </template>
+      <template
+        #order_type="{scope}"
+      >{{ xs_order_type_options.find(({id}) => id === String(scope.row.order_type)).label }}</template>
 
-      <template #order_source="{scope}">
-        {{ xs_order_source_options.find(({id}) => id === String(scope.row.order_source)).label }}
-      </template>
+      <template
+        #order_source="{scope}"
+      >{{ xs_order_source_options.find(({id}) => id === String(scope.row.order_source)).label }}</template>
 
-      <template #status="{scope}">
-        {{ statusOptions.find(({value}) => value === String(scope.row.status)).label }}
-      </template>
+      <template
+        #status="{scope}"
+      >{{ statusOptions.find(({value}) => value === String(scope.row.status)).label }}</template>
 
-      <template #platform_type="{scope}">
-        {{ String(scope.row.platform_type) === '1' ? 'ToB' : String(scope.row.platform_type) === '2' ? 'ToC' : '--' }}
-      </template>
+      <template
+        #platform_type="{scope}"
+      >{{ String(scope.row.platform_type) === '1' ? 'ToB' : String(scope.row.platform_type) === '2' ? 'ToC' : '--' }}</template>
     </ex-table>
 
     <div v-else>
@@ -137,34 +154,39 @@
   </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/newReport'
-import periodDatePickerActive from './period-date-picker/main.vue'
-import { xs_order_type_options, xs_order_source_options } from '@/assets/js/statusList'
-import { table5 } from './columns'
-import { mapGetters } from 'vuex'
-import dayjs from 'dayjs'
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import urlConfig from "@/apis/url-config";
+import asyncRequest from "@/apis/service/reportQuery/newReport";
+import periodDatePickerActive from "./period-date-picker/main.vue";
+import {
+  xs_order_type_options,
+  xs_order_source_options
+} from "@/assets/js/statusList";
+import { table5 } from "./columns";
+import { mapGetters } from "vuex";
+import dayjs from "dayjs";
 
 export default {
-  name: 'SaleReport',
+  name: "SaleReport",
   components: {
     periodDatePickerActive
   },
   mixins: [mixinPage, resToken],
   computed: {
-    ...mapGetters(['tablebtnSize', 'searchSize', 'size']),
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
       const tran =
-        this.$store.getters.btnList.find((i) => i.menu_route == "reportTableFive") || {};
+        this.$store.getters.btnList.find(
+          i => i.menu_route == "reportTableFive"
+        ) || {};
       const { action } = tran ?? {};
       return action ?? [];
     }
   },
   data() {
     return {
-      activeOptions:[],
+      activeOptions: [],
       xs_order_type_options,
       xs_order_source_options,
       // 选中数组
@@ -175,23 +197,22 @@ export default {
       loading: false,
       // 请求参数集合
       parmValue: {
-        depart_id:"",
-        person_id:"",
+        depart_id: "",
+        person_id: "",
         supplierNo: [],
-        start_day: '', // 起始时间
-        end_day: '', // 结束时间
+        start_day: "", // 起始时间
+        end_day: "", // 结束时间
         // is_export:0,//是否导出0/1
 
         page: 1, // 页码
         size: 15 // 每页显示条数
-
       },
       statusOptions: [
-      { value: '0', label: '待采购备货' },
-      { value: '1', label: '待库管发货' },
-      { value: '2', label: '已发货待收货' },
-      { value: '3', label: '已收货' },
-      { value: '4', label: '已全部退货' }
+        { value: "0", label: "待采购备货" },
+        { value: "1", label: "待库管发货" },
+        { value: "2", label: "已发货待收货" },
+        { value: "3", label: "已收货" },
+        { value: "4", label: "已全部退货" }
       ],
       // 表格 - 数据集合
       tableData: [],
@@ -199,7 +220,7 @@ export default {
       table: {
         stripe: true,
         border: true,
-        _defaultHeader_: ['setcol']
+        _defaultHeader_: ["setcol"]
       },
       // 表格 - 分页
       pageInfo: {
@@ -209,99 +230,101 @@ export default {
       },
       // 表格表头 - 列参数
       table5: table5
-    }
+    };
   },
   mounted() {
     // this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
     // this.parmValue.end_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
-    this.searchList()
-    this.getDepartList()
-    this.getAllActive()
+    this.searchList();
+    this.getDepartList();
+    this.getAllActive();
   },
 
   methods: {
-    async getDepartList(){
-      const { data = {} } = await asyncRequest.depart_list()
-      const { depart = [] } = data
+    async getDepartList() {
+      const { data = {} } = await asyncRequest.depart_list();
+      const { depart = [] } = data;
       this.departList = depart;
     },
     async getAllActive() {
       const res = await asyncRequest.accountall({
         ...this.dataForm,
         size: 100000,
-        level: '2'
-      })
+        level: "2"
+      });
       if (res && res.code === 0 && res.data) {
-        this.activeOptions = res.data.list
+        this.activeOptions = res.data.list;
       } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout()
+        await this.logout();
       } else {
-        this.$message.warning(res.message)
+        this.$message.warning(res.message);
       }
     },
     async supplierChange(e) {
-      const { code, label } = e
-      this.parmValue.supplierNo = code ? [code] : []
-      this.searchList()
+      const { code, label } = e;
+      this.parmValue.supplierNo = code ? [code] : [];
+      this.searchList();
     },
     // 初始化http请求
     async searchList() {
       if (
-        (this.parmValue.start_day !== '' && this.parmValue.end_day === '') ||
-      (this.parmValue.start_day === '' && this.parmValue.end_day !== '')
+        (this.parmValue.start_day !== "" && this.parmValue.end_day === "") ||
+        (this.parmValue.start_day === "" && this.parmValue.end_day !== "")
       ) {
-        this.$message.warning('时间区间不完整！')
-        return
+        this.$message.warning("时间区间不完整！");
+        return;
       }
 
-      const start_day = new Date(this.parmValue.start_day).valueOf()
-      const end_day = new Date(this.parmValue.end_day).valueOf()
-      const flag = end_day - start_day > 31 * 24 * 60 * 60 * 1000
+      const start_day = new Date(this.parmValue.start_day).valueOf();
+      const end_day = new Date(this.parmValue.end_day).valueOf();
+      const flag = end_day - start_day > 31 * 24 * 60 * 60 * 1000;
 
-      if (this.parmValue.start_day != '' && this.parmValue.end_day != '') {
+      if (this.parmValue.start_day != "" && this.parmValue.end_day != "") {
         if (flag) {
-          this.$message.warning('筛选的时间区间不能超过31天')
-          return
+          this.$message.warning("筛选的时间区间不能超过31天");
+          return;
         }
       }
 
-      this.loading = true
+      this.loading = true;
 
       const res = await asyncRequest.orderoutbk({
         ...this.parmValue,
-        supplierNo: Array.isArray(this.parmValue.supplierNo) ? this.parmValue.supplierNo[0] : this.parmValue.supplierNo
-      })
+        supplierNo: Array.isArray(this.parmValue.supplierNo)
+          ? this.parmValue.supplierNo[0]
+          : this.parmValue.supplierNo
+      });
       if (res && res.code === 0 && res.data) {
-        this.tableData = res.data.list
-        this.pageInfo.total = Number(res.data.count)
+        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.$message.warning(res.message)
-        this.tableData = []
-        this.pageInfo.total = 0
+        this.$message.warning(res.message);
+        this.tableData = [];
+        this.pageInfo.total = 0;
       }
-      this.loading = false
+      this.loading = false;
     },
 
     company_idsearchChange(e) {
-      const { code } = e
-      this.parmValue.companyNo = code || ''
-      this.searchList()
+      const { code } = e;
+      this.parmValue.companyNo = code || "";
+      this.searchList();
     },
 
     // 重置
     restSearch() {
       this.parmValue = {
-        depart_id:"",
-        person_id:"",
-        supplierNo: '',
-        start_day: '', // 新建起始时间
-        end_day: '', // 新建结束时间
+        depart_id: "",
+        person_id: "",
+        supplierNo: "",
+        start_day: "", // 新建起始时间
+        end_day: "", // 新建结束时间
         // is_export:0,//是否导出0/1
         page: 1, // 页码
         size: 15 // 每页显示条数
-      }
+      };
 
       // this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
       // this.parmValue.end_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
@@ -310,108 +333,112 @@ export default {
         size: 15,
         curr: 1,
         total: 0
-      }
-      this.searchList()
+      };
+      this.searchList();
     },
 
     // 时间函数
     async time(e) {
-      this.parmValue.start_day = e.startTime || ''
-      this.parmValue.end_day = e.endTime || ''
+      this.parmValue.start_day = e.startTime || "";
+      this.parmValue.end_day = e.endTime || "";
       if (
-        (this.parmValue.start_day !== '' && this.parmValue.end_day === '') ||
-      (this.parmValue.start_day === '' && this.parmValue.end_day !== '')
+        (this.parmValue.start_day !== "" && this.parmValue.end_day === "") ||
+        (this.parmValue.start_day === "" && this.parmValue.end_day !== "")
       ) {
-        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
+      const { list } = e;
       // 选中的数组集合
-      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : []
+      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : [];
     },
     // 导出文件
     async download() {
-    // if(this.changeList.length<=0){
-    //   this.$message.warning("请选择有效数据")
-    //   return;
-    // }
-      const model = JSON.parse(JSON.stringify({
-        ...this.parmValue,
-        supplierNo: Array.isArray(this.parmValue.supplierNo) ? this.parmValue.supplierNo[0] : this.parmValue.supplierNo
-      }))
+      // if(this.changeList.length<=0){
+      //   this.$message.warning("请选择有效数据")
+      //   return;
+      // }
+      const model = JSON.parse(
+        JSON.stringify({
+          ...this.parmValue,
+          supplierNo: Array.isArray(this.parmValue.supplierNo)
+            ? this.parmValue.supplierNo[0]
+            : this.parmValue.supplierNo
+        })
+      );
 
-      delete model['page']
-      delete model['size']
+      delete model["page"];
+      delete model["size"];
       // model.is_export = 1;
-      const start_day = new Date(this.parmValue.start_day).valueOf()
-      const end_day = new Date(this.parmValue.end_day).valueOf()
-      const flag = end_day - start_day > 31 * 24 * 60 * 60 * 1000
+      const start_day = new Date(this.parmValue.start_day).valueOf();
+      const end_day = new Date(this.parmValue.end_day).valueOf();
+      const flag = end_day - start_day > 31 * 24 * 60 * 60 * 1000;
 
-      if (this.parmValue.start_day != '' && this.parmValue.end_day != '') {
+      if (this.parmValue.start_day != "" && this.parmValue.end_day != "") {
         if (flag) {
-          this.$message.warning('导出文件的时间区间不能超过31天')
-          return
+          this.$message.warning("导出文件的时间区间不能超过31天");
+          return;
         }
-      } 
+      }
 
       if (!this.loading) {
-        this.loading = true
-        const httpType = `aplication/zip`
+        this.loading = true;
+        const httpType = `aplication/zip`;
         axios({
-          method: 'post',
-          url: this.fileUrl + 'admin/OrderOutExport',
-          responseType: 'blob',
+          method: "post",
+          url: this.fileUrl + "admin/OrderOutExport",
+          responseType: "blob",
           data: model,
           headers: {
             Accept: httpType
           }
         })
-          .then((res) => {
+          .then(res => {
             if (res && res.status == 200 && res.data) {
               const url = window.URL.createObjectURL(
                 new Blob([res.data], {
                   type: httpType
                 })
-              )
-              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(`导出成功！`)
+              );
+              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
-          })
+          .catch(error => {
+            console.log(error);
+            this.loading = false;
+          });
       }
     }
   }
-}
+};
 </script>
  <style lang="scss" scoped>
 .purchaseOrder {
-// text-align: right;
+  // text-align: right;
 }
 </style>
 

src/views/dataReport/table7.vue

@@ -24,7 +24,6 @@
       <template #table-header="{}">
         <div style="width: 100%">
           <el-row style="padding: 0 0 0 80px">
-
             <el-col :span="6" style="width: 363px;">
               <periodDatePickerActive
                 :start="parmValue.start_date"
@@ -36,9 +35,13 @@
               />
             </el-col>
             <el-col :span="4" style="width: 66px; float: right">
-              <el-button type="primary" style="margin-left:30px;" :size="searchSize" class="fr" @click="download">
-                导出
-              </el-button>
+              <el-button
+                type="primary"
+                style="margin-left:30px;"
+                :size="searchSize"
+                class="fr"
+                @click="download"
+              >导出</el-button>
             </el-col>
             <el-col :span="3" style="width: 66px; float: right">
               <el-button
@@ -46,11 +49,12 @@
                 type="primary"
                 style="float: right; margin-left: 5px"
                 @click="searchList"
-              >
-                刷新
-              </el-button>
+              >刷新</el-button>
             </el-col>
 
+            <el-col :span="4" style="width: 66px; float: right">
+              <el-button type="warning" class="fr" :size="searchSize" @click="restSearch">重置</el-button>
+            </el-col>
           </el-row>
           <el-row style="padding: 10px 0 0 0">
             <!-- <el-col :span="6" style="width: 150px">
@@ -76,44 +80,30 @@
                 <el-option label="采购已驳回" value="7" />
                 <el-option label="申请已取消" value="8" />
               </el-select>
-            </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-col>-->
           </el-row>
         </div>
       </template>
-
     </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/newReport'
-import periodDatePickerActive from './period-date-picker/main.vue'
-import { table7 } 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/newReport";
+import periodDatePickerActive from "./period-date-picker/main.vue";
+import { table7 } from "./columns";
+import { mapGetters } from "vuex";
 
 export default {
-  name: 'SaleReport',
+  name: "SaleReport",
   components: {
     periodDatePickerActive
   },
   mixins: [mixinPage, resToken],
   computed: {
-    ...mapGetters(['tablebtnSize', 'searchSize', 'size'])
-
+    ...mapGetters(["tablebtnSize", "searchSize", "size"])
   },
   data() {
     return {
@@ -125,13 +115,12 @@ export default {
       loading: false,
       // 请求参数集合
       parmValue: {
-        status: '', // 处理状态
-        start_date: '', // 起始时间
-        end_date: '', // 结束时间
+        status: "", // 处理状态
+        start_date: "", // 起始时间
+        end_date: "", // 结束时间
         // is_export:0,//是否导出0/1
         page: 1, // 页码
         size: 15 // 每页显示条数
-
       },
       // 表格 - 数据集合
       tableData: [],
@@ -139,7 +128,7 @@ export default {
       table: {
         stripe: true,
         border: true,
-        _defaultHeader_: ['setcol']
+        _defaultHeader_: ["setcol"]
       },
       // 表格 - 分页
       pageInfo: {
@@ -149,78 +138,78 @@ export default {
       },
       // 表格表头 - 列参数
       table7: table7
-    }
+    };
   },
   mounted() {
-    this.searchList()
+    this.searchList();
   },
 
   methods: {
     // 初始化http请求
     async searchList() {
       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.loading = true
+      this.loading = true;
 
-      const res = await asyncRequest.saleexportthdata(this.parmValue)
+      const res = await asyncRequest.saleexportthdata(this.parmValue);
       if (res && res.code === 0 && res.data) {
-        this.tableData = res.data.list
-        this.pageInfo.total = Number(res.data.count)
+        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.$message.warning(res.message)
-        this.tableData = []
-        this.pageInfo.total = 0
+        this.$message.warning(res.message);
+        this.tableData = [];
+        this.pageInfo.total = 0;
       }
-      this.loading = false
+      this.loading = false;
     },
 
     // 重置
     restSearch() {
       this.parmValue = {
-        status: '', // 处理状态
-        start_date: '', // 新建起始时间
-        end_date: '', // 新建结束时间
+        status: "", // 处理状态
+        start_date: "", // 新建起始时间
+        end_date: "", // 新建结束时间
         page: 1, // 页码
         size: 15 // 每页显示条数
         // is_export:0//是否导出0/1
-      }
+      };
       // 表格 - 分页
       this.pageInfo = {
         size: 15,
         curr: 1,
         total: 0
-      }
-      this.searchList()
+      };
+      this.searchList();
     },
 
     // 时间函数
     async time(e) {
-      this.parmValue.start_date = e.startTime || ''
-      this.parmValue.end_date = e.endTime || ''
+      this.parmValue.start_date = e.startTime || "";
+      this.parmValue.end_date = e.endTime || "";
       if (
-        (this.parmValue.start_date !== '' && this.parmValue.end_date === '') ||
-        (this.parmValue.start_date === '' && this.parmValue.end_date !== '')
+        (this.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
+      const { list } = e;
       // 选中的数组集合
-      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : []
+      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : [];
     },
     // 导出文件
     async download() {
@@ -228,27 +217,27 @@ export default {
       //   this.$message.warning("请选择有效数据")
       //   return;
       // }
-      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 != '') {
+      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;
       }
-      const 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
-        const httpType = `aplication/zip`
+        this.loading = true;
+        const httpType = `aplication/zip`;
         axios({
-          method: 'post',
-          url: this.fileUrl + 'admin/saleexportthdataexport',
-          responseType: 'blob',
+          method: "post",
+          url: this.fileUrl + "admin/saleexportthdataexport",
+          responseType: "blob",
           data: model,
           headers: {
             // 'Content-Type': 'multipart/form-data',
@@ -256,41 +245,41 @@ export default {
             Accept: httpType
           }
         })
-          .then((res) => {
+          .then(res => {
             if (res && res.status === 200 && res.data) {
               const url = window.URL.createObjectURL(
                 new Blob([res.data], {
                   type: httpType
                 })
-              )
-              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(`导出成功！`)
+              );
+              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
-          })
+          .catch(error => {
+            console.log(error);
+            this.loading = false;
+          });
       }
     }
   }
-}
+};
 </script>
    <style lang="scss" scoped>
 .purchaseOrder {