From 137647ba2e433ac50f0d1554358830433970ce20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=88=E6=98=AD=E6=9C=9D?= <18394339404@163.com>
Date: Wed, 24 Jul 2024 15:27:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20cost=E4=BF=AE=E6=94=B9=E4=B8=BA=E4=B8=8B?=
=?UTF-8?q?=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/select.js | 3 +++
src/views/record/index.vue | 52 +++++++++++++++++++++++++++++---------
2 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/src/api/select.js b/src/api/select.js
index a2c73b6..b091bf4 100644
--- a/src/api/select.js
+++ b/src/api/select.js
@@ -43,6 +43,9 @@ export const reqSelectProjectTitle = (projectName) => request({ url: `/WRD-admin
// 查询全部成本中心号
export const reqSelectCostCenter = (costCenter) => request({ url: `/WRD-admin/sys/workorder/listCostCenter`, method: 'get', params: { costCenter }})
+// 查询全部成本中心号
+export const reqSelectAllCostCenter = () => request({ url: `/WRD-admin/sys/cost/get`, method: 'get' })
+
// 查询各部门工作效率
export const getDeptEfficiency = (startDate, endDate) => request({ url: `/WRD-admin/sys/workorder/productivity`, method: 'get', params: { startDate, endDate }})
// 查询各部门工作效率
diff --git a/src/views/record/index.vue b/src/views/record/index.vue
index 628a303..2cde982 100644
--- a/src/views/record/index.vue
+++ b/src/views/record/index.vue
@@ -275,10 +275,6 @@
row.workRecordsList[index].endTime
}}
-
成本中心:
{{ row.workRecordsList[index].costCenter ? row.workRecordsList[index].costCenter : "未录入成本号" }}
@@ -474,14 +470,22 @@
-
+ /> -->
+
+
+
@@ -608,14 +612,22 @@
-
+ /> -->
+
+
+
@@ -711,14 +723,22 @@
-
+ /> -->
+
+
+
@@ -783,6 +803,7 @@ export default {
regionAndCityList: [],
regionList: [],
cityList: [],
+ costList: [],
region: '',
city: '',
departmentId: ' ',
@@ -1000,6 +1021,9 @@ export default {
})
this.cityList = cities.flat()
this.regionList = result.data.map(item => { return { value: item.region, label: item.region } })
+ // 初始化cost列表
+ const costs = await this.$API.select.reqSelectAllCostCenter()
+ this.costList = costs.data.map(item => { return { value: item.internalOrder, label: `${item.region} - ${item.internalOrder}` } })
},
// 初始化部门选项为不限
created() {
@@ -1429,7 +1453,9 @@ export default {
// 添加工程师工作记录
addStatus(row) {
this.$nextTick(() => {
- this.$refs.addWorkRecordForm.resetFields()
+ if (this.$refs.addWorkRecordForm) {
+ this.$refs.addWorkRecordForm.resetFields()
+ }
})
this.addDialogVisible = true
@@ -1439,7 +1465,9 @@ export default {
editStatus(row, index) {
if (this.permissions.indexOf('btn.UpdateRecord') !== -1) {
this.$nextTick(() => {
- this.$refs.editWorkRecordForm.clearValidate()
+ if (this.$refs.editWorkRecordForm) {
+ this.$refs.editWorkRecordForm.clearValidate()
+ }
})
this.editDialogVisible = true