From bb6ced2c55cfb497b23325b7639275cc5afaf139 Mon Sep 17 00:00:00 2001
From: "271556543@qq.com" <271556543@qq.com>
Date: Mon, 8 Aug 2022 15:26:10 +0800
Subject: [PATCH] =?UTF-8?q?2022.8.8=20=E9=83=A8=E9=97=A8=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/department.js                  | 72 ++++++++++---------
 src/views/budget/budgetList.vue               |  4 +-
 .../contract/components/detailContract.vue    | 22 +++++-
 src/views/contract/contractList.vue           |  4 +-
 .../statisticalReport/budgetProgress.vue      |  4 +-
 5 files changed, 67 insertions(+), 39 deletions(-)

diff --git a/src/api/system/department.js b/src/api/system/department.js
index 6e016c7..13f4679 100644
--- a/src/api/system/department.js
+++ b/src/api/system/department.js
@@ -1,32 +1,40 @@
-import request from '@/utils/request'
-
-export function save(data) {
-  return request({
-    url: '/api/admin/department/save',
-    method: 'post',
-    data
-  })
-}
-
-export function listdept() {
-  return request({
-    url: '/api/admin/department',
-    method: 'get'
-  })
-}
-
-export function del(data) {
-  return request({
-    url: '/api/admin/department/delete',
-    method: 'post',
-    data
-  })
-}
-
-export function adminDepartmentList(data) {
-  return request({
-    url: '/api/admin/other/admin-department-list',
-    method: 'get',
-    params: data
-  })
-}
+import request from '@/utils/request'
+
+export function save(data) {
+  return request({
+    url: '/api/admin/department/save',
+    method: 'post',
+    data
+  })
+}
+
+export function listdept() {
+  return request({
+    url: '/api/admin/department',
+    method: 'get'
+  })
+}
+
+export function listdeptNoAuth(params = {show_tree:1}){
+  return request({
+    url:'/api/admin/other/admin-department-list',
+    method:'get',
+    params
+  })
+}
+
+export function del(data) {
+  return request({
+    url: '/api/admin/department/delete',
+    method: 'post',
+    data
+  })
+}
+
+export function adminDepartmentList(data) {
+  return request({
+    url: '/api/admin/other/admin-department-list',
+    method: 'get',
+    params: data
+  })
+}
diff --git a/src/views/budget/budgetList.vue b/src/views/budget/budgetList.vue
index 831124a..ff7cea7 100644
--- a/src/views/budget/budgetList.vue
+++ b/src/views/budget/budgetList.vue
@@ -217,7 +217,7 @@
 
 <script>
 import {addBudget,getBudget,delBudget,editorBudget,detailBudget} from "@/api/budget/budget"
-import {listdept} from "@/api/system/department"
+import {listdeptNoAuth} from "@/api/system/department"
 import {Message} from "element-ui";
 import {parseTime} from "@/utils"
 export default {
@@ -336,7 +336,7 @@ export default {
     },
     //获取科室
     getDepartment(){
-      listdept().then(res=>{
+      listdeptNoAuth().then(res=>{
         this.departments = res
       })
     },
diff --git a/src/views/contract/components/detailContract.vue b/src/views/contract/components/detailContract.vue
index 7b0777a..4df2a1c 100644
--- a/src/views/contract/components/detailContract.vue
+++ b/src/views/contract/components/detailContract.vue
@@ -123,7 +123,7 @@ export default {
           label:"ID",
           sortable:false,
           prop:'id',
-          width:160
+          width:130
         },
         {
           label:"类型",
@@ -150,6 +150,12 @@ export default {
           sortable: false,
           prop:'money',
           align:'right'
+        },
+        {
+          label:'使用金额',
+          sortable: false,
+          prop:'useMoney',
+          align:'right'
         }
       ],
       journalTable:[
@@ -272,6 +278,20 @@ export default {
       this.id = id
       let res = await detailContract({id:id})
       this.detail = res
+      let plans = res.plans
+      let linkPlan = res.plan_link
+      let linkPlanTable = plans.map(item => {
+        let res = linkPlan.filter(item1 => {
+          return item1.plan_id === item.id
+        })[0]
+        return {
+          id:item.id,
+          name:item.name,
+          money:item.money,
+          useMoney:res.use_money
+        }
+      })
+      this.detail.plans = linkPlanTable
 
       let plan = await getContractSign({contract_id:id})
       this.signPlan = plan.data
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index ca5d5e1..d989f79 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -293,7 +293,7 @@
 <script>
 import {getContract,addContrant,delContract} from "@/api/contract/contract"
 import {getparameter} from "@/api/system/dictionary"
-import {listdept} from "@/api/system/department";
+import {listdeptNoAuth} from "@/api/system/department";
 import {getBudget} from "@/api/budget/budget"
 import {getOatoken} from "@/api/oatoken"
 import {parseTime} from "@/utils"
@@ -849,7 +849,7 @@ export default {
     },
     //获取科室
     async getDepartment(){
-      this.departments = await listdept()
+      this.departments = await listdeptNoAuth()
     },
     //获取购买形式列表
     async getPurchaseType(){
diff --git a/src/views/statisticalReport/budgetProgress.vue b/src/views/statisticalReport/budgetProgress.vue
index e3ec797..4228ba1 100644
--- a/src/views/statisticalReport/budgetProgress.vue
+++ b/src/views/statisticalReport/budgetProgress.vue
@@ -49,7 +49,7 @@
 
 <script>
 import {getProgress} from "@/api/budget/budget"
-import {listdept} from "@/api/system/department";
+import {listdeptNoAuth} from "@/api/system/department";
 export default {
   data() {
     return {
@@ -131,7 +131,7 @@ export default {
     },
     //获取科室
     getDepartment(){
-      listdept().then(res=>{
+      listdeptNoAuth().then(res=>{
         this.departments = res
       })
     },