@@ -141,6 +141,7 @@
buildStatusName: '',
valuation: '',
projectOperationPattern: '',
+ projectOperationPatternName: '',
chargeDepartment: '',
chargeUser: '',
phone: '',
@@ -202,7 +203,7 @@
fileObj.value.refId = obj.id; //项目返回的id值
inheritAttr(obj, form);
form.buildStatusName = findText('build_status', form.buildStatus);
- form.projectOperationPattern = findText('project_operation_pattern', form.projectOperationPattern);
+ form.projectOperationPatternName = findText('project_operation_pattern', form.projectOperationPattern);
getDictMaps('pro_project_approval');
@@ -340,6 +341,7 @@
const res1 = await getDicts('pro_project_approval');
form.buildStatusName = findText('build_status', form.buildStatus);
const dicts = res1.data;
+ form.projectOperationPatternName = findText('project_operation_pattern', form.projectOperationPattern);
for (const key in fileGroup) {
if (Object.hasOwnProperty.call(fileGroup, key)) {
const element = fileGroup[key];
diff --git a/src/views/project/projectConfiguration/dwwh/tableDalgo.vue b/src/views/project/projectConfiguration/dwwh/tableDalgo.vue
index 6c1d24a..c33ebb3 100644
--- a/src/views/project/projectConfiguration/dwwh/tableDalgo.vue
+++ b/src/views/project/projectConfiguration/dwwh/tableDalgo.vue
@@ -266,6 +266,12 @@
diff --git a/src/views/project/projectJinDu/monthReport.vue b/src/views/project/projectJinDu/monthReport.vue
index fe6cd86..1aeac77 100644
--- a/src/views/project/projectJinDu/monthReport.vue
+++ b/src/views/project/projectJinDu/monthReport.vue
@@ -18,7 +18,7 @@
搜索
- 重置
+ 重置
导入
diff --git a/src/views/project/projectManage/projectDesign.vue b/src/views/project/projectManage/projectDesign.vue
index a9bfe73..def53be 100644
--- a/src/views/project/projectManage/projectDesign.vue
+++ b/src/views/project/projectManage/projectDesign.vue
@@ -10,7 +10,7 @@
搜索
- 重置
+ 重置
汇总统计
diff --git a/src/views/project/projectManage/projectDrawings.vue b/src/views/project/projectManage/projectDrawings.vue
index 87555e0..0e00a5f 100644
--- a/src/views/project/projectManage/projectDrawings.vue
+++ b/src/views/project/projectManage/projectDrawings.vue
@@ -16,7 +16,7 @@
搜索
- 重置
+ 重置
diff --git a/src/views/project/projectManage/projectGGL.vue b/src/views/project/projectManage/projectGGL.vue
index 3e5fe9b..4feed5a 100644
--- a/src/views/project/projectManage/projectGGL.vue
+++ b/src/views/project/projectManage/projectGGL.vue
@@ -24,7 +24,7 @@
搜索
- 重置
+ 重置
@@ -164,6 +164,7 @@
/** 重置按钮操作 */
function resetQuery() {
proxy.resetForm('queryRef');
+ dateRange.value = [];
handleQuery();
}
/** 新增按钮操作 */
diff --git a/src/views/project/projectManage/projectReport.vue b/src/views/project/projectManage/projectReport.vue
index 4ac3df2..319f83a 100644
--- a/src/views/project/projectManage/projectReport.vue
+++ b/src/views/project/projectManage/projectReport.vue
@@ -3,7 +3,7 @@
-
+
@@ -13,7 +13,7 @@
搜索
- 重置
+ 重置