From 82abc47c6670fd44288c09817e0479036000c840 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Mon, 22 Jul 2024 16:26:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E9=87=91=E9=9A=B6=E5=B1=9E=E7=BB=B4?=
 =?UTF-8?q?=E5=BA=A6=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                          |  2 +-
 src/views/budget/budgetList.vue               | 26 +++++++++-
 .../statisticalReport/budgetProgress.vue      | 49 ++++++++++++++++++-
 src/views/system/department.vue               |  5 +-
 4 files changed, 77 insertions(+), 5 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 8b32bdf..d55d71b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -29,7 +29,7 @@ service.interceptors.request.use(
         text: "正在加载中..."
       })
     }
-    if (store.getters.token) {
+    if (getToken()) {
       // let each request carry token
       // ['X-Token'] is a custom headers key
       // please modify it according to the actual situation
diff --git a/src/views/budget/budgetList.vue b/src/views/budget/budgetList.vue
index 3e2397b..74010e0 100644
--- a/src/views/budget/budgetList.vue
+++ b/src/views/budget/budgetList.vue
@@ -27,6 +27,28 @@
             ></DatePicker>
           </span>
 
+          <span style="padding: 0 6px">资金隶属情况</span>
+          <span>
+            <el-select
+              placeholder="资金隶属情况"
+              clearable
+              multiple
+              collapse-tags
+              size="small"
+              v-model="select.dimension"
+              style="width: 200px"
+            >
+              <el-option
+                v-for="item in dimensions"
+                :label="item.value"
+                :value="item.id"
+                :key="item.id"
+              >
+              </el-option>
+            </el-select>
+          </span>
+
+
           <span style="padding: 0 6px"> 预算类型 </span>
           <span>
              <el-cascader
@@ -915,6 +937,7 @@ export default {
         department: "",
         is_auth: 0,
         type_pid: "",
+        dimension: []
       },
       departments: [], //部门类型
       dimensions: [
@@ -1124,7 +1147,8 @@ export default {
         is_tree: this.isTree ? 1 : "",
         top_pid: !this.isTree ? 1 : "",
         is_auth:this.select.is_auth,
-        type_pid: this.select.type_pid
+        type_pid: this.select.type_pid,
+        dimension: this.select.dimension.toString()
       }).then((res) => {
         if (this.isTree) this.treeData = res.list;
         else {
diff --git a/src/views/statisticalReport/budgetProgress.vue b/src/views/statisticalReport/budgetProgress.vue
index 61f8b0b..09d5e4d 100644
--- a/src/views/statisticalReport/budgetProgress.vue
+++ b/src/views/statisticalReport/budgetProgress.vue
@@ -26,6 +26,27 @@
           />
         </span>
 
+        <span style="padding: 0 6px">资金隶属情况</span>
+        <span>
+            <el-select
+              placeholder="资金隶属情况"
+              clearable
+              multiple
+              collapse-tags
+              size="small"
+              v-model="select.dimension"
+              style="width: 200px"
+            >
+              <el-option
+                v-for="item in dimensions"
+                :label="item.value"
+                :value="item.id"
+                :key="item.id"
+              >
+              </el-option>
+            </el-select>
+          </span>
+
         <span style="padding: 0 6px;">
           科室
         </span>
@@ -75,13 +96,36 @@
   export default {
     data() {
       return {
+        dimensions: [
+          {
+            value: "年初部门预算",
+            id: "1"
+          },
+          {
+            value: "年中追加部门预算",
+            id: "2"
+          },
+          {
+            value: "上年结转资金",
+            id: "3"
+          },
+          {
+            value: "基本户资金",
+            id: "4"
+          },
+          {
+            value: "其他",
+            id: "5"
+          }
+        ],
         types: [], //预算类型
         departments: [],
         select: {
           pageIndex: 1,
           year: '',
           type: '',
-          department: ''
+          department: '',
+          dimension: []
         },
         rateTotal: '0%',
         moneyTotal: 0,
@@ -407,7 +451,8 @@
           year: this.select.year,
           type: this.select.type,
           plan_department_id: this.select.department,
-          top_pid: 1
+          top_pid: 1,
+          dimension: this.select.dimension.toString()
         })
         for (var m of res.list.data) {
           m.pid_info_name = m.pid_info?.name
diff --git a/src/views/system/department.vue b/src/views/system/department.vue
index b33d4cf..75b1a44 100644
--- a/src/views/system/department.vue
+++ b/src/views/system/department.vue
@@ -127,7 +127,10 @@
     },
     methods: {
       querySearch(queryString, cb) {
-        listuser().then(response => {
+        listuser({
+          page: 1,
+          page_size: 999
+        }).then(response => {
           var data = response.data;
           for (var m of data) {
             m.value = m.name;