2023-9-6

src/store/modules/user.js

@@ -1,168 +1,173 @@
-import {
-  login,
-  logout,
-  getInfo,
-  loginOss
-} from '@/api/user'
-import {
-  getToken,
-  setToken,
-  removeToken
-} from '@/utils/auth'
-import {
-  resetRouter
-} from '@/router'
-
-const getDefaultState = () => {
-  return {
-    token: getToken(),
-    name: '',
-    avatar: '',
-    roles: []
-  }
-}
-
-const state = getDefaultState()
-
-const mutations = {
-  RESET_STATE: (state) => {
-    Object.assign(state, getDefaultState())
-  },
-  SET_TOKEN: (state, token) => {
-    state.token = token
-  },
-  SET_NAME: (state, name) => {
-    state.name = name
-  },
-  SET_AVATAR: (state, avatar) => {
-    state.avatar = avatar
-  },
-  SET_ROLES: (state, roles) => {
-    state.roles = roles
-  }
-}
-
-const actions = {
-  loginskip({
-    commit
-  }, userInfo) {
-    const {
-      token,
+import {
+  login,
+  logout,
+  getInfo,
+  loginOss
+} from '@/api/user'
+import {
+  getToken,
+  setToken,
+  removeToken
+} from '@/utils/auth'
+import {
+  resetRouter
+} from '@/router'
+
+const getDefaultState = () => {
+  return {
+    token: getToken(),
+    name: '',
+    info: {},
+    avatar: '',
+    roles: []
+  }
+}
+
+const state = getDefaultState()
+
+const mutations = {
+  RESET_STATE: (state) => {
+    Object.assign(state, getDefaultState())
+  },
+  SET_TOKEN: (state, token) => {
+    state.token = token
+  },
+  SET_INFO: (state, info) => {
+    state.info = info
+  },
+  SET_NAME: (state, name) => {
+    state.name = name
+  },
+  SET_AVATAR: (state, avatar) => {
+    state.avatar = avatar
+  },
+  SET_ROLES: (state, roles) => {
+    state.roles = roles
+  }
+}
+
+const actions = {
+  loginskip({
+    commit
+  }, userInfo) {
+    const {
+      token,
       tp,
-      loginId
-    } = userInfo
-
-    return new Promise((resolve, reject) => {
-      loginOss({
-        token: token,
-        tp: tp,
-        loginId: loginId
+      loginId
+    } = userInfo
+
+    return new Promise((resolve, reject) => {
+      loginOss({
+        token: token,
+        tp: tp,
+        loginId: loginId
       }).then(response => {
-
+
         //console.log(response)
-        
-        const {
-          data
-        } = response;
-        console.log(response.access_token)
-        commit('SET_TOKEN', response.access_token)
-        setToken(response.access_token)
-        resolve()
-      }).catch(error => {
-        reject(error)
-      })
-    })
-  },
-  // user login
-  login({
-    commit
-  }, userInfo) {
-    const {
-      username,
-      password
-    } = userInfo
-    return new Promise((resolve, reject) => {
-      login({
-        username: username.trim(),
-        password: password
-      }).then(response => {
-        console.log(response)
-        const {
-          data
-        } = response;
-        console.log(response.access_token)
-        commit('SET_TOKEN', response.access_token)
-        setToken(response.access_token)
-        resolve()
-      }).catch(error => {
-        reject(error)
-      })
-    })
-  },
-
-  // get user info
-  getInfo({
-    commit,
-    state
-  }) {
-    return new Promise((resolve, reject) => {
-      getInfo(state.token).then(response => {
-
-        if (!response) {
-          reject('身份验证失败请重新登录')
-        }
-        response["roles"] = ["admin"];
-        const {
-          roles,
-          name,
-          avatar
-        } = response
-
-
-
-        commit('SET_ROLES', roles)
-        commit('SET_NAME', name)
-        commit('SET_AVATAR', avatar)
-        resolve(response)
-      }).catch(error => {
-        reject(error)
-      })
-    })
-  },
-
-  // user logout
-  logout({
-    commit,
-    state
-  }) {
+
+        const {
+          data
+        } = response;
+        console.log(response.access_token)
+        commit('SET_TOKEN', response.access_token)
+        setToken(response.access_token)
+        resolve()
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  // user login
+  login({
+    commit
+  }, userInfo) {
+    const {
+      username,
+      password
+    } = userInfo
     return new Promise((resolve, reject) => {
-      console.log("logout",state.token)
-      logout(state.token).then(() => {
-        removeToken() // must remove  token  first
-        resetRouter()
-        commit('RESET_STATE')
-        resolve()
-      }).catch(error => {
-        reject(error)
-      })
-    })
-  },
-
-  // remove token
-  resetToken({
-    commit
-  }) {
-    return new Promise(resolve => {
-      removeToken() // must remove  token  first
-      commit('RESET_STATE')
-      resolve()
-    })
-  }
-}
-
-export default {
-  namespaced: true,
-  state,
-  mutations,
-  actions
+      login({
+        username: username.trim(),
+        password: password
+      }).then(response => {
+        console.log(response)
+        const {
+          data
+        } = response;
+        console.log(response.access_token)
+        commit('SET_TOKEN', response.access_token)
+        setToken(response.access_token)
+        resolve()
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+
+  // get user info
+  getInfo({
+    commit,
+    state
+  }) {
+    return new Promise((resolve, reject) => {
+      getInfo(state.token).then(response => {
+
+        if (!response) {
+          reject('身份验证失败请重新登录')
+        }
+        response["roles"] = ["admin"];
+        const {
+          roles,
+          name,
+          avatar
+        } = response
+
+
+
+        commit('SET_ROLES', roles)
+        commit('SET_NAME', name)
+        commit('SET_AVATAR', avatar)
+        commit('SET_INFO', response)
+        resolve(response)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+
+  // user logout
+  logout({
+    commit,
+    state
+  }) {
+    return new Promise((resolve, reject) => {
+      console.log("logout",state.token)
+      logout(state.token).then(() => {
+        removeToken() // must remove  token  first
+        resetRouter()
+        commit('RESET_STATE')
+        resolve()
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+
+  // remove token
+  resetToken({
+    commit
+  }) {
+    return new Promise(resolve => {
+      removeToken() // must remove  token  first
+      commit('RESET_STATE')
+      resolve()
+    })
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
 }

src/views/finance/components/file.vue

@@ -66,6 +66,7 @@ export default {
           width: 100,
           align: "left",
           render: (h, { row }) => {
+            if (this.role == 0 || this.role == 1)
             return h("Poptip", {
               props: {
                 transfer: true,

src/views/statisticalReport/components/addGovPlane.vue

@@ -28,6 +28,32 @@
           </div>
         </div>
       </template>
+      <template #department_id>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red; font-weight: 600; padding-right: 4px"
+            >*</span
+            >
+            责任科室 ：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select
+              placeholder="科室选择"
+              clearable
+              v-model="form.department_id"
+              style="width: 300px"
+            >
+              <el-option
+                v-for="item in departments"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              >
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
       <template v-slot:content>
         <div class="xy-table-item">
           <div class="xy-table-item-label">项目内容 ：</div>
@@ -314,6 +340,7 @@ export default {
 
       form: {
         name: "",
+        department_id: this.$store.state.user.info?.department_id,
         content: "",
         plan_money: "",
         public_plane_date: "",

src/views/statisticalReport/govProcure.vue

@@ -7,6 +7,25 @@
     >
       <div slot="content"></div>
       <slot>
+        <span style="padding: 0 6px; word-break: keep-all">科室</span>
+        <span>
+           <el-select
+             placeholder="科室选择"
+             clearable
+             size="small"
+             v-model="select.department_id"
+             style="width: 160px"
+           >
+              <el-option
+                v-for="item in departments"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              >
+              </el-option>
+            </el-select>
+        </span>
+
         <span style="padding: 0 6px; word-break: keep-all">关键字</span>
         <span>
           <Input
@@ -70,6 +89,7 @@
 <script>
 import addGovPlane from "@/views/statisticalReport/components/addGovPlane.vue";
 import { index, destroy } from "@/api/govPlane";
+import {listdeptNoAuth} from "@/api/system/department";
 export default {
   components: {
     addGovPlane,
@@ -77,7 +97,9 @@ export default {
   data() {
     return {
       type: -1,//0为业务员1财审
+      departments: [],
       select: {
+        department_id: '',
         page: 1,
         page_size: 10,
         keyword: "",
@@ -193,6 +215,13 @@ export default {
       this.list = res.data;
     },
 
+    //获取科室
+    getDepartment() {
+      listdeptNoAuth().then((res) => {
+        this.departments = res;
+      });
+    },
+
     destroy (row) {
       destroy({ id: row.id }).then(res => {
         this.$message({
@@ -205,6 +234,7 @@ export default {
   },
   computed: {},
   created() {
+    this.getDepartment();
     this.getList();
   },
   beforeRouteEnter (to, from , next) {