From 415c0acfd92b37013e03d17827b3c495ebae9942 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Mon, 8 May 2023 15:35:21 +0800
Subject: [PATCH] 2023-5-8

---
 src/store/modules/user.js                     |  8 +++++-
 src/views/budget/components/addUpload.vue     |  2 ++
 src/views/budget/upload.vue                   |  2 +-
 .../contract/paymentRegistrationList.vue      | 27 ++++++++-----------
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 51b0dd2..de6d0f5 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -20,6 +20,7 @@ const getDefaultState = () => {
     name: '',
     username:'',
     avatar: '',
+    department: {},
     roles: []
   }
 }
@@ -47,6 +48,9 @@ const mutations = {
   },
   SET_ROLES: (state, roles) => {
     state.roles = roles
+  },
+  SET_DEPARTMENT: (state, department) => {
+    state.department = department
   }
 }
 
@@ -123,7 +127,8 @@ const actions = {
           roles,
           name,
           username,
-          avatar
+          avatar,
+          department
         } = response
 
         commit('SET_USERNAME',username)
@@ -131,6 +136,7 @@ const actions = {
         commit('SET_ROLES', roles)
         commit('SET_NAME', name)
         commit('SET_AVATAR', avatar)
+        commit('SET_DEPARTMENT',department)
         resolve(response)
       }).catch(error => {
         reject(error)
diff --git a/src/views/budget/components/addUpload.vue b/src/views/budget/components/addUpload.vue
index 516e2e6..36487c3 100644
--- a/src/views/budget/components/addUpload.vue
+++ b/src/views/budget/components/addUpload.vue
@@ -243,6 +243,8 @@ export default {
       if (val) {
         if (this.type === "editor") {
           this.getDetail();
+        } else {
+          this.form.plan_department_id = this.$store.state.user.department?.id
         }
       } else {
         this.id = "";
diff --git a/src/views/budget/upload.vue b/src/views/budget/upload.vue
index ff24346..6aa47d7 100644
--- a/src/views/budget/upload.vue
+++ b/src/views/budget/upload.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="padding: 0 20px;">
-    <lx-header icon="md-apps" style="margin-bottom: 10px; border: 0px; margin-top: 15px" text="绩效指标">
+    <lx-header icon="md-apps" style="margin-bottom: 10px; border: 0px; margin-top: 15px" text="预算计划">
       <div slot="content"></div>
       <slot>
         <div class="selects">
diff --git a/src/views/contract/paymentRegistrationList.vue b/src/views/contract/paymentRegistrationList.vue
index e01d3d5..fa06946 100644
--- a/src/views/contract/paymentRegistrationList.vue
+++ b/src/views/contract/paymentRegistrationList.vue
@@ -121,23 +121,18 @@
             width: 320,
             align: "left",
             customFn: (row) => {
-              {
-                if (row.act_plan_link.length > 0) {
-                  return row.act_plan_link.map(item => {
-                      return ( < div > [{
-                          item.plan.year
-                        }] - {
-                          item.plan.name
-                        } < br / > [使用金额] {
-                          item.use_money
-                        }
-                        元 < /div>)
-                      })
-                  }
-                }
-
+              if (row.act_plan_link.length > 0) {
+                return row.act_plan_link.map(item => {
+                  return (
+                    <div>
+                      [{item.plan?.year}] - {item.plan?.name}
+                      <br/>
+                      [使用金额] {item.use_money}元 </div>
+                  )
+                })
               }
-            },
+            }
+          },
             {
               prop: 'status',
               label: '状态',