Merge remote-tracking branch 'origin/master'

portal-manager-ui/admin/src/api/dataAdmin.js

@@ -112,7 +112,10 @@ export function getOrderList(params) {
 export function getOrderinfo(params) {
   return http.get(`${BASEURL}/wechat/order_data/orderinfo`, params);
 }
-
+// 部门列表
+export function getDeptList(params) {
+  return http.post(`${baseURL}/base/dept/list`, params);
+}
 /**
  *  取件记录报表
  */

portal-manager-ui/admin/src/views/dataAdmin/components/makeRecordReport/makeRecordReport.vue

@@ -28,10 +28,22 @@
             v-model="searchForm.time"
           >
           </a-range-picker>
+          <a-select v-model="searchForm.sectionid" showSearch :option-filter-prop="'label'">
+            <a-select-option value="" label="全部"> 全部部门 </a-select-option>
+            <a-select-option
+              v-for="(v, key) in depList"
+              :key="key"
+              :value="v.id"
+              :label="v.name"
+            >
+              {{ v.name }}
+            </a-select-option>
+          </a-select>
           <a-select v-model="searchForm.status">
             <a-select-option value=""> 全部 </a-select-option>
             <a-select-option
               v-for="(v, key) in statusItem"
+              
               :key="key"
               :value="Number(key)"
             >
@@ -109,7 +121,7 @@
 </template>
 
 <script>
-import { getOrderList } from "@/api/dataAdmin";
+import { getOrderList,getDeptList } from "@/api/dataAdmin";
 import { export2Excel } from "@/utils/js/exportExcel";
 let tHeader = [
   // 导出的表头名信息
@@ -227,6 +239,14 @@ export default {
         align: "center",
         dataIndex: "business_name",
       },
+      {
+        title: "部门名称",
+        align: "center",
+        dataIndex: "section_name",
+        customRender: (text) => {
+          return text || "--";
+        },
+      },
       {
         title: "创建时间",
         align: "center",
@@ -251,6 +271,7 @@ export default {
       searchForm: {
         status: "",
         title: "",
+        sectionid:"",
         time: [
           this.$moment(new Date()).format("YYYY-MM-DD"),
           this.$moment(new Date()).format("YYYY-MM-DD"),
@@ -263,12 +284,23 @@ export default {
       tableSelectedKeys: [],
       tableSelectedRows: [],
       tableSourceData: [],
+      depList:[]//部门列表
     };
   },
   created() {
     this.getOrderList();
+    this.getDeptList()
   },
   methods: {
+    // 部门列表
+    getDeptList(){
+      getDeptList({page:1,size:-1}).then(res=>{
+        const {data} = res.data
+        if(res.code == 1){
+          this.depList = data
+        }
+      })
+    },
     // 获取报表数据
     async getOrderList(search = {}) {
       let res = await getOrderList({