From 512f5243b98ded882317ec95d52e197c166d7920 Mon Sep 17 00:00:00 2001
From: bonus <1203338439@qq.com>
Date: Tue, 3 Dec 2024 13:53:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/material/basic/bmProject/index.vue | 10 +-
src/views/material/ma/type/index.vue | 181 +++++++++++++++----
2 files changed, 149 insertions(+), 42 deletions(-)
diff --git a/src/views/material/basic/bmProject/index.vue b/src/views/material/basic/bmProject/index.vue
index 63e53006..c70550c2 100644
--- a/src/views/material/basic/bmProject/index.vue
+++ b/src/views/material/basic/bmProject/index.vue
@@ -148,9 +148,15 @@
+
+
+
@@ -394,7 +400,7 @@ import { unitTypeList,impUnitTypeList } from '@/api/basic/basic'
// import '@riophae/vue-treeselect/dist/vue-treeselect.css'
export default {
name: 'bmProject',
- dicts: ['sys_normal_disable'],
+ dicts: ['bm_project_status'],
// components: { Treeselect },
data() {
return {
diff --git a/src/views/material/ma/type/index.vue b/src/views/material/ma/type/index.vue
index c05cc1e3..5851324e 100644
--- a/src/views/material/ma/type/index.vue
+++ b/src/views/material/ma/type/index.vue
@@ -318,70 +318,72 @@
-
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
@@ -475,15 +477,14 @@
-
+
- 月
@@ -722,7 +723,7 @@ export default {
level1TempName: undefined,
level0TempName: undefined,
level1Temp: undefined,
- uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址
+ uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地
defaultProps: {
children: "children",
label: "label",
@@ -939,6 +940,9 @@ export default {
this.form.itemType = row.itemType;
this.form.materialType = row.materialType;
this.form.materialName = row.materialName;
+ if (response.data.keeperNickName) {
+ this.form.keeperUserId = response.data.keeperUserId;
+ }
this.isLevel1Disabled = true;
this.isLevel2Disabled = true;
this.isLevel3Disabled = true;
@@ -958,6 +962,9 @@ export default {
this.form.itemType = row.itemType;
this.form.materialType = row.materialType;
this.form.materialName = row.materialName;
+ if (response.data.keeperNickName) {
+ this.form.keeperUserId = response.data.keeperUserId;
+ }
this.isLevel1Disabled = true;
this.isLevel2Disabled = true;
this.isLevel3Disabled = true;
@@ -1022,7 +1029,7 @@ export default {
// downloadFile({ fileName: `物资类型信息_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
// })
// },
- /** 导出按钮操作 */
+ /** 导出按钮作 */
handleExport() {
let queryTemp = this.queryParams;
queryTemp.level = 0;
@@ -1050,9 +1057,14 @@ export default {
if (data.level === 3) {
this.reset();
Object.assign(this.form, data);
- (this.treeTemp = this.treeOptions[0].children),
- this.treeTemp.forEach((item) => {
- item.children.forEach((itemTemp) => {
+
+ // 修改这部分代码，添加空值判断
+ if (this.treeOptions && this.treeOptions[0] && this.treeOptions[0].children) {
+ this.treeTemp = this.treeOptions[0].children;
+
+ // 使用可选链操作符来避免undefined错误
+ this.treeTemp?.forEach((item) => {
+ item.children?.forEach((itemTemp) => {
if (itemTemp.level == 2 && itemTemp.id == data.parentId) {
this.level2Temp = itemTemp.id;
this.level2TempName = itemTemp.label;
@@ -1060,17 +1072,21 @@ export default {
}
});
});
- // console.log('treeTemp',this.treeTemp)
- this.treeTemp.forEach((item) => {
- if (item.level == 1 && item.id == this.level1Temp) {
- this.level1TempName = item.label;
- }
- });
- this.treeTemp.forEach((item) => {
- if (item.level == 0 && item.id == data.houseId) {
- this.level0TempName = item.label;
- }
- });
+
+ // 同样添加空值判断
+ this.treeTemp?.forEach((item) => {
+ if (item.level == 1 && item.id == this.level1Temp) {
+ this.level1TempName = item.label;
+ }
+ });
+
+ this.treeTemp?.forEach((item) => {
+ if (item.level == 0 && item.id == data.houseId) {
+ this.level0TempName = item.label;
+ }
+ });
+ }
+
this.isLevel1Disabled = true;
this.isLevel2Disabled = true;
this.isLevel3Disabled = true;
@@ -1230,4 +1246,89 @@ export default {
> .el-tree-node__content {
background-color: #8decf1;
}
+
+::v-deep .el-dialog {
+ // 表单标签文字样式
+ .el-form-item__label {
+ font-size: 14px;
+ color: #606266;
+ font-weight: 500;
+ line-height: 1.5;
+ }
+
+ // 输入框文字样式
+ .el-input__inner {
+ font-size: 14px;
+ color: #303133;
+
+ &::placeholder {
+ font-size: 13px;
+ color: #c0c4cc;
+ }
+ }
+
+ // 单位文字样式
+ span {
+ font-size: 14px;
+ color: #606266;
+ margin-left: 8px;
+ }
+
+ // 下拉选择框文字样式
+ .el-select {
+ .el-input__inner {
+ font-size: 14px;
+ color: #303133;
+ }
+ }
+
+ // 只读输入框样式
+ .el-input.is-disabled .el-input__inner {
+ background-color: #f5f7fa;
+ border-color: #e4e7ed;
+ color: #606266;
+ cursor: not-allowed;
+ }
+}
+
+// 表格内文字样式
+::v-deep .el-table {
+ font-size: 14px;
+
+ th {
+ font-weight: 500;
+ color: #303133;
+ }
+
+ td {
+ color: #606266;
+ }
+}
+
+// 按钮文字样式
+::v-deep .el-button {
+ font-size: 14px;
+
+ &--text {
+ font-size: 13px;
+ }
+}
+
+// 树节点文字样式
+::v-deep .el-tree-node__label {
+ font-size: 14px;
+ color: #606266;
+}
+
+// 搜索框文字样式
+::v-deep .el-input--small {
+ .el-input__inner {
+ font-size: 13px;
+
+ &::placeholder {
+ font-size: 13px;
+ color: #c0c4cc;
+ }
+ }
+}