From df592f31fb2b950dd89844eb8be5521e364db39d Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Wed, 1 Nov 2023 10:01:02 +0800 Subject: [PATCH] 2023-11-1 --- src/api/out/index.js | 4 +- src/views/budget/budgetList.vue | 11 ++ src/views/system/workerComponents/book.vue | 121 +++++++++++++++++ .../system/workerComponents/bookBorrow.vue | 126 ++++++++++++++++++ .../system/workerComponents/lineChart.vue | 119 ----------------- src/views/system/workerComponents/type.vue | 4 +- 6 files changed, 262 insertions(+), 123 deletions(-) create mode 100644 src/views/system/workerComponents/book.vue create mode 100644 src/views/system/workerComponents/bookBorrow.vue delete mode 100644 src/views/system/workerComponents/lineChart.vue diff --git a/src/api/out/index.js b/src/api/out/index.js index 92270d6..263b6d5 100644 --- a/src/api/out/index.js +++ b/src/api/out/index.js @@ -15,12 +15,12 @@ export function getOutDetail({ tbname,out_caigou_id,out_contract_id,out_pay_id,o }) } -export function httpCurl(params,noloading = true,s= '/Api/flowDetail',method='GET') { +export function httpCurl(params,noloading = true,s= '/Api/flowDetail',method='GET',url) { return request({ method: 'post', url: '/api/admin/other/http-curl', data: { - url: process.env.VUE_APP_OUT_OLD, + url: url || process.env.VUE_APP_OUT_OLD, method, params: { s, diff --git a/src/views/budget/budgetList.vue b/src/views/budget/budgetList.vue index ec9705f..a843722 100644 --- a/src/views/budget/budgetList.vue +++ b/src/views/budget/budgetList.vue @@ -714,6 +714,7 @@ export default { }, list: [], totalMoney: 0, + updateMoney: 0, total: 0, pageIndex: 1, pageSize: 10, @@ -775,6 +776,11 @@ export default { return parseTime(new Date(value), "{y}-{m}-{d}"); }, }, + { + label: '科室', + width: 150, + prop: 'plan_department.name' + }, { label: "描述", minWidth: 300, @@ -895,6 +901,10 @@ export default { sums[index] = moneyFormatter(this.totalMoney); return; } + if (column.property === 'update_money') { + sums[index] = moneyFormatter(this.updateMoney); + return + } // const values = data.map(item => Number(item[column.property])); // if (!values.every(value => isNaN(value)) && (column.property === 'money' || column.property === 'plan_price'|| column.property === 'fund_log_total')) { // @@ -948,6 +958,7 @@ export default { this.total = res.list.total; } this.totalMoney = res.total_money; + this.updateMoney = res.update_money; }); }, //新增提交 diff --git a/src/views/system/workerComponents/book.vue b/src/views/system/workerComponents/book.vue new file mode 100644 index 0000000..e4b11fb --- /dev/null +++ b/src/views/system/workerComponents/book.vue @@ -0,0 +1,121 @@ + + + + + diff --git a/src/views/system/workerComponents/bookBorrow.vue b/src/views/system/workerComponents/bookBorrow.vue new file mode 100644 index 0000000..90f6221 --- /dev/null +++ b/src/views/system/workerComponents/bookBorrow.vue @@ -0,0 +1,126 @@ + + + + + diff --git a/src/views/system/workerComponents/lineChart.vue b/src/views/system/workerComponents/lineChart.vue deleted file mode 100644 index 16a1b4a..0000000 --- a/src/views/system/workerComponents/lineChart.vue +++ /dev/null @@ -1,119 +0,0 @@ - - - - - diff --git a/src/views/system/workerComponents/type.vue b/src/views/system/workerComponents/type.vue index af950a3..b3a9005 100644 --- a/src/views/system/workerComponents/type.vue +++ b/src/views/system/workerComponents/type.vue @@ -2,7 +2,7 @@
预算类型z执行情况预算类型执行情况
@@ -26,7 +26,7 @@ export default { w: 6, h: 4, i: "5", - name: "预算类型z执行情况", + name: "预算类型执行情况", }, inject: { getStatistic: {