feat:报表筛选

src/apis/service/reportQuery/newReport/index.js

@@ -7,5 +7,7 @@ export default {
   salestock: (data, params) => http(api + 'salestock', data, 'post', params),
   ocl: (data, params) => http(api + 'ocl', data, 'post', params),
   orderoutbk: (data, params) => http(api + 'orderoutbk', data, 'post', params),
-  sna: (data, params) => http(api + 'sna', data, 'post', params)
+  sna: (data, params) => http(api + 'sna', data, 'post', params),
+  depart_list: (data, params) => http(api + 'ulist', data, 'post', params),
+  accountall: (data, params) => http(api + 'userCompanyBasicList', data, 'post', params)
 }

src/views/dataReport/table1.vue

@@ -14,7 +14,7 @@
               />
             </el-col>
           
-            <el-col :span="4" style="width: 350px">
+            <el-col :span="4" style="width: 300px">
               <search-supplier
                 :size="'mini'"
                 :value="parmValue.supplierNo"
@@ -26,6 +26,14 @@
                 @searchChange="supplierChange"
               />
             </el-col>
+
+            <el-col :span="4" style="margin-left:10px;width:350px">
+              <el-select v-model="parmValue.person_id" size="mini" placeholder="供应商负责人" filterable clearable  @change="
+                  searchList();
+                ">
+                <el-option v-for="depart in activeOptions" :key="depart.id" :label="depart.nickname" :value="depart.id" />
+              </el-select>
+            </el-col>
           
             <el-col :span="4" style="width: 66px; float: right">
               <el-button
@@ -111,6 +119,7 @@ export default {
   },
   data() {
     return {
+      activeOptions:[],
       // 选中数组
       changeList: [],
       // 全局url
@@ -119,6 +128,7 @@ export default {
       loading: false,
       // 请求参数集合
       parmValue: {
+        person_id:"",
         supplierNo: [],
         supplier_name: '',
         start_day: dayjs(this.getStartDate()).format('YYYY-MM-DD'), // 起始时间
@@ -141,9 +151,24 @@ export default {
     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.getAllActive()
   },
 
   methods: {
+    async getAllActive() {
+      const res = await asyncRequest.accountall({
+        ...this.dataForm,
+        size: 100000,
+        level: '2'
+      })
+      if (res && res.code === 0 && res.data) {
+        this.activeOptions = res.data.list
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout()
+      } else {
+        this.$message.warning(res.message)
+      }
+    },
     async supplierChange(e) {
       const { code, label } = e
       this.parmValue.supplierNo = code ? [code] : []
@@ -197,6 +222,7 @@ export default {
     // 重置
     restSearch() {
       this.parmValue = {
+        person_id:"",
         supplier_name: '',
         supplierNo: [],
         start_day: dayjs().subtract(0, 'day').format('YYYY-MM-DD'),

src/views/dataReport/table3.vue

@@ -37,7 +37,7 @@
               />
             </el-col>
 
-            <el-col :span="6">
+            <el-col :span="4">
               <search-work-company
                 :value="parmValue.companyNo"
                 :placeholder="'业务公司名称'"
@@ -48,6 +48,14 @@
               />
             </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>
+
             <el-col :span="4" style="width: 66px; float: right">
               <el-button type="primary" style="margin-left:30px;" :size="searchSize" class="fr" @click="download">
                 导出
@@ -120,6 +128,7 @@ export default {
       loading: false,
       // 请求参数集合
       parmValue: {
+        good_name:"",
         companyNo: '',
         start_day: '', // 起始时间
         end_day: '', // 结束时间
@@ -200,6 +209,7 @@ export default {
     // 重置
     restSearch() {
       this.parmValue = {
+        good_name:"",
         companyNo: '',
         start_day: '', // 新建起始时间
         end_day: '', // 新建结束时间

src/views/dataReport/table5.vue

@@ -88,6 +88,28 @@
                 @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="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                ">
+                <el-option v-for="depart in departList" :key="depart.id" :label="depart.name" :value="depart.id" />
+              </el-select>
+            </el-col>
+
+            <el-col :span="4" style="margin-left:10px;width:350px">
+              <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-select>
+            </el-col>
           </el-row>
         </div>
       </template>
@@ -142,6 +164,7 @@ export default {
   },
   data() {
     return {
+      activeOptions:[],
       xs_order_type_options,
       xs_order_source_options,
       // 选中数组
@@ -152,6 +175,8 @@ export default {
       loading: false,
       // 请求参数集合
       parmValue: {
+        depart_id:"",
+        person_id:"",
         supplierNo: [],
         start_day: '', // 起始时间
         end_day: '', // 结束时间
@@ -190,9 +215,30 @@ export default {
     // 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()
   },
 
   methods: {
+    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'
+      })
+      if (res && res.code === 0 && res.data) {
+        this.activeOptions = res.data.list
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout()
+      } else {
+        this.$message.warning(res.message)
+      }
+    },
     async supplierChange(e) {
       const { code, label } = e
       this.parmValue.supplierNo = code ? [code] : []
@@ -247,6 +293,8 @@ export default {
     // 重置
     restSearch() {
       this.parmValue = {
+        depart_id:"",
+        person_id:"",
         supplierNo: '',
         start_day: '', // 新建起始时间
         end_day: '', // 新建结束时间

src/views/dataReport/table6.vue

@@ -217,6 +217,7 @@ export default {
         page: 1, // 页码
         size: 15 // 每页显示条数
       },
+      departList:[],
       // 表格 - 数据集合
       tableData: [],
       xs_order_type_options,
@@ -284,6 +285,8 @@ export default {
     // 重置
     restSearch() {
       this.parmValue = {
+        depart_id:"",
+        person_id:"",
         supplier_name: '', // 要搜索的供应商名称
         creater: '', // 要搜索的采购维护人
         start_date: '', // 起始时间