From e57e645d24a89adb3391be16f6948b292183fa04 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 11 二月 2025 14:02:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectEngineering/projectLibrary/component/BasicInfo.vue | 74 ++++++++++++++++++++++++++++++------
1 files changed, 61 insertions(+), 13 deletions(-)
diff --git a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
index 7b6c23b..8cacff2 100644
--- a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
+++ b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
@@ -9,12 +9,23 @@
</el-col>
<el-col :span="6">
<el-form-item class="item" label="椤圭洰浠ｇ爜" label-width="100px" prop="projectCode">
- <el-input v-model.trim="projectForm.projectCode" class="item" clearable disabled maxlength="255"
+ <el-input v-model.trim="projectForm.projectCode" class="item" clearable maxlength="255"
placeholder="璇疯緭鍏�"/>
</el-form-item>
</el-col>
<el-col :span="12" style="position: relative">
- <div style="width: 150px; position: absolute;"><img alt="" src="../../../../assets/images/s.png"/></div>
+ <div style="width: 100%; height: 100%; position: absolute;">
+ <el-form-item class="item" label="璧嬬爜" label-width="50px" prop="coding">
+ <template slot-scope="scope">
+ <!-- <div class="yellow-dot" v-if="scope.row.coding === 'yellow'"></div>-->
+ <!-- <div class="green-dot" v-if="scope.row.coding === 'green'"></div>-->
+ <!-- <div class="red-dot" v-if="scope.row.coding === 'red'"></div>-->
+ <div class="red-dot"></div>
+ <tag-list></tag-list>
+ </template>
+ </el-form-item>
+ <!-- <img alt="" src="../../../../assets/images/s.png"/>-->
+ </div>
</el-col>
</el-row>
<el-row :gutter="20">
@@ -43,10 +54,10 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="椤圭洰闃舵" label-width="100px" prop="fundsType" style="width: 100%">
- <el-input v-model.trim="projectForm.projectPhase" class="item" clearable disabled maxlength="255"
- placeholder="璇疯緭鍏�"/>
- </el-form-item>
+<!-- <el-form-item label="椤圭洰闃舵" label-width="100px" prop="fundsType" style="width: 100%">-->
+<!-- <el-input v-model.trim="projectForm.projectPhase" class="item" clearable disabled maxlength="255"-->
+<!-- placeholder="璇疯緭鍏�"/>-->
+<!-- </el-form-item>-->
</el-col>
</el-row>
<el-row :gutter="20">
@@ -67,11 +78,17 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="椤圭洰涓氫富鍗曚綅" label-width="100px" prop="projectOwnerUnit" style="width: 100%">
- <el-input v-model.trim="projectForm.projectOwnerUnit" class="item" clearable maxlength="255"
- placeholder="璇疯緭鍏�"/>
- </el-form-item>
+ <el-form-item label="椤圭洰闃舵" label-width="100px" prop="fundsType" style="width: 100%">
+ <el-input v-model.trim="projectForm.projectPhase" class="item" clearable disabled maxlength="255"
+ placeholder="璇疯緭鍏�"/>
+ </el-form-item>
</el-col>
+<!-- <el-col :span="6">-->
+<!-- <el-form-item label="椤圭洰涓氫富鍗曚綅" label-width="100px" prop="projectOwnerUnit" style="width: 100%">-->
+<!-- <el-input v-model.trim="projectForm.projectOwnerUnit" class="item" clearable maxlength="255"-->
+<!-- placeholder="璇疯緭鍏�"/>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
</el-row>
<el-row :gutter="20">
<el-col :span="6">
@@ -294,6 +311,7 @@
<script>
// import Upload from '@element-plus/icons-vue/dist/Upload.vue';
import Map from '@/views/components/Map/index.vue';
+import TagList from "./TagList.vue";
// import MapMouseEvent from '@/views/components/Map/types';
// import UploadStandard from '@/components/uploadStandard.vue';
// import { usePlanLibrary } from '@/hooks/detailsInformation';
@@ -304,10 +322,12 @@
import {approvalList} from "@/api/system/dept";
export default {
+ name: 'BasicInfo',
dicts: ['sys_funding_type', 'sys_investment_type', 'sys_project_type', 'sys_project_status', 'sys_competent_department'
, 'sys_administrative_divisions', 'sys_centralized_management', 'sys_approval_type', 'sys_key_categories', 'sys_annual_plan'],
components: {
Map,
+ TagList,
// UploadStandard,
// RemoteSelect
},
@@ -354,7 +374,7 @@
engineeringIdList: [],
content: '',
contact: '',
- projectOwnerUnit: '',
+ projectOwnerUnit: null,
planStartTime: '',
planCompleteTime: '',
projectContactPerson: '',
@@ -364,6 +384,7 @@
yearInvestAmount: '',
competentDepartmentList: [],
managementCentralizationList: [],
+ remark: ''
},
subclass: '',
largeCategory: '',
@@ -407,7 +428,7 @@
if (this.projectForm.id) {
this.getProjectInfo(this.projectForm.id);
} else {
- this.getProjectCodeApi();
+ // this.getProjectCodeApi();
this.$emit('updateIsShow', true);
}
// this.handleLoadMore(1);
@@ -421,6 +442,7 @@
getProject(id).then(res => {
this.projectForm = res.data;
this.$emit('updateIsShow', true);
+
});
},
getApprovalList() {
@@ -428,9 +450,10 @@
this.approvalList = res.data;
});
},
- submit() {
+ submit(usedStatus) {
this.$refs["projectForm"].validate(valid => {
if (valid) {
+ this.projectForm.usedStatus = usedStatus;
if (this.projectForm.id) {
updateProject(this.projectForm).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
@@ -530,6 +553,7 @@
this.largeCategory = labels.join(',');
}
}, 1000);
+ this.$emit('basicInfoForm', newVal)
},
deep: true
}
@@ -570,4 +594,28 @@
width: 20px;
}
}
+
+.yellow-dot {
+ width: 10px; /* 鍦嗙偣鐨勫搴� */
+ height: 10px; /* 鍦嗙偣鐨勯珮搴� */
+ background-color: yellow; /* 鍦嗙偣鐨勯鑹� */
+ border-radius: 50%; /* 浣垮厓绱犲彉鎴愬渾褰� */
+ display: inline-block; /* 纭繚鍏冪礌鍙互鍜屽叾浠栧唴鑱斿厓绱犱竴璧锋樉绀� */
+}
+
+.red-dot {
+ width: 10px; /* 鍦嗙偣鐨勫搴� */
+ height: 10px; /* 鍦嗙偣鐨勯珮搴� */
+ background-color: red; /* 鍦嗙偣鐨勯鑹� */
+ border-radius: 50%; /* 浣垮厓绱犲彉鎴愬渾褰� */
+ display: inline-block; /* 纭繚鍏冪礌鍙互鍜屽叾浠栧唴鑱斿厓绱犱竴璧锋樉绀� */
+}
+
+.green-dot {
+ width: 10px; /* 鍦嗙偣鐨勫搴� */
+ height: 10px; /* 鍦嗙偣鐨勯珮搴� */
+ background-color: green; /* 鍦嗙偣鐨勯鑹� */
+ border-radius: 50%; /* 浣垮厓绱犲彉鎴愬渾褰� */
+ display: inline-block; /* 纭繚鍏冪礌鍙互鍜屽叾浠栧唴鑱斿厓绱犱竴璧锋樉绀� */
+}
</style>
--
Gitblit v1.8.0