From a3dbb8fe40e06f9abd9718f14aaa7311bddbc150 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 13 二月 2025 21:46:05 +0800
Subject: [PATCH] 除了项目中心，其它项目页面都不显示审核状态
---
src/views/projectEngineering/projectLibrary/component/BasicInfo.vue | 261 +++++++++++++++++++++++++++++++++------------------
1 files changed, 169 insertions(+), 92 deletions(-)
diff --git a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
index cd4835a..5256d81 100644
--- a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
+++ b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
@@ -4,22 +4,35 @@
<el-row :gutter="20">
<el-col :span="6">
<el-form-item class="item" label="椤圭洰鍚嶇О" label-width="100px" prop="projectName">
- <el-input v-model.trim="projectForm.projectName" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ <el-input v-model.trim="projectForm.projectName" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�"/>
</el-form-item>
</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" placeholder="璇疯緭鍏�" />
+ <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">
<el-col :span="12">
<el-form-item class="item" label="寤鸿鍐呭" label-width="100px" prop="content">
- <el-input v-model.trim="projectForm.content" style="width: 100%;" clearable maxlength="255" placeholder="璇疯緭鍏�" type="textarea" />
+ <el-input v-model.trim="projectForm.content" style="width: 100%;" clearable maxlength="255"
+ placeholder="璇疯緭鍏�" type="textarea"/>
</el-form-item>
</el-col>
</el-row>
@@ -41,15 +54,16 @@
</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">
<el-col :span="6">
<el-form-item label="椤圭洰绫诲瀷" label-width="100px" prop="projectType" style="width: 100%">
- <el-select v-model="projectForm.projectType" clearable placeholder="璇烽�夋嫨" style="width: 100%" >
+ <el-select v-model="projectForm.projectType" clearable placeholder="璇烽�夋嫨" style="width: 100%">
<el-option v-for="item in dict.type.sys_project_type" :key="item.value" :label="item.label"
:value="item.value"/>
</el-select>
@@ -57,36 +71,45 @@
</el-col>
<el-col :span="6">
<el-form-item label="椤圭洰鐘舵��" label-width="100px" prop="projectstatus" style="width: 100%">
- <el-select v-model="projectForm.projectStatus"clearable placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-select v-model="projectForm.projectStatus" clearable placeholder="璇烽�夋嫨" @change="handleProjectStatusChange" style="width: 100%">
<el-option v-for="item in dict.type.sys_project_status" :key="item.value" :label="item.label"
:value="item.value"/>
</el-select>
</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">
- <el-form-item label="椤圭洰鑱旂郴浜�" label-width="100px" prop="projectContactPerson" style="width: 100%">
- <el-input v-model.trim="projectForm.projectContactPerson" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ <el-form-item label="椤圭洰鑱旂郴浜�" label-width="100px" prop="projectContactPerson" style="width: 100%">
+ <el-input v-model.trim="projectForm.projectContactPerson" class="item" clearable maxlength="255"
+ placeholder="璇疯緭鍏�"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鑱旂郴鏂瑰紡" label-width="100px" prop="contact" style="width: 100%">
- <el-input v-model.trim="projectForm.contact" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ <el-input v-model.trim="projectForm.contact" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�"/>
</el-form-item>
</el-col>
<el-col :span="6">
<!-- TODO锛氭殏鏃朵笉鍋� -->
<el-form-item label="鍏宠仈宸ョ▼" label-width="100px" prop="engineering" style="width: 100%">
<!-- <el-input v-model.trim="getEngineeringName" class="item" clearable disabled maxlength="255" placeholder="璇峰湪宸ョ▼涓�夋嫨椤圭洰" />-->
- <el-select v-model="projectForm.engineeringIdList" :multiple="true" collapse-tags placeholder="璇烽�夋嫨" style="width: 100%">
- <el-option v-for="item in selectOptions" :key="item.id" :label="item.engineeringName" :value="item.id" />
-<!-- <RemoteSelect v-if="selectOptions.length" :hasMore="hasMore" :loading="loading" :page="page" @loadMore="handleLoadMore" />-->
+ <el-select v-model="projectForm.engineeringIdList" :multiple="true" collapse-tags placeholder="璇烽�夋嫨"
+ style="width: 100%">
+ <el-option v-for="item in selectOptions" :key="item.id" :label="item.engineeringName" :value="item.id"/>
+ <!-- <RemoteSelect v-if="selectOptions.length" :hasMore="hasMore" :loading="loading" :page="page" @loadMore="handleLoadMore" />-->
</el-select>
</el-form-item>
</el-col>
@@ -101,12 +124,12 @@
placeholder="璇烽�夋嫨"
style="width: 100%"
collapse-tags
- @change="changeDepartment">
+ >
<el-option
- v-for ="item in approvalList"
- :key="item.id"
- :value="item.id"
- :label="item.value"
+ v-for="item in approvalList"
+ :key="item.id"
+ :value="item.id"
+ :label="item.value"
/>
</el-select>
</el-form-item>
@@ -118,7 +141,7 @@
clearable
placeholder="璇烽�夋嫨"
style="width: 100%"
- >
+ >
<el-option v-for="item in dict.type.sys_administrative_divisions" :key="item.value" :label="item.label"
:value="item.value"/>
</el-select>
@@ -133,7 +156,6 @@
placeholder="璇烽�夋嫨"
style="width: 100%"
collapse-tags
- @change="changePutUnder"
>
<el-option v-for="item in dict.type.sys_centralized_management" :key="item.value" :label="item.label"
:value="item.value"/>
@@ -157,8 +179,8 @@
</el-col>
<el-col :span="6">
<el-form-item label="鎶曡祫绫诲埆" label-width="100px" style="width: 100%">
- <el-input v-model="largeCategory" clearable disabled placeholder="璇烽�夋嫨澶х被" style="width: 49%" />
- <el-input v-model="subclass" clearable disabled placeholder="璇烽�夋嫨灏忕被" style="width: 49%;margin-left: 2%" />
+ <el-input v-model="largeCategory" clearable disabled placeholder="璇烽�夋嫨澶х被" style="width: 49%"/>
+ <el-input v-model="subclass" clearable disabled placeholder="璇烽�夋嫨灏忕被" style="width: 49%;margin-left: 2%"/>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -191,7 +213,6 @@
placeholder="閫夋嫨鏃堕棿"
style="width: 100%"
type="date"
- @change="chaneStartWork"
value-format="yyyy-MM-dd HH:mm:ss"/>
</el-form-item>
</el-col>
@@ -208,12 +229,13 @@
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="涓爣鍗曚綅" label-width="100px" prop="setTime" style="width: 100%">
- <el-input v-model.trim="projectForm.winUnit" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" />
+ <el-input v-model.trim="projectForm.winUnit" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="涓爣閲戦" label-width="100px" style="width: 100%">
- <el-input v-model.trim="projectForm.winAmount" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�" type="number" />
+ <el-input v-model.trim="projectForm.winAmount" class="item" clearable maxlength="255" placeholder="璇疯緭鍏�"
+ type="number"/>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -242,7 +264,8 @@
</el-col>
<el-col :span="6">
<el-form-item label="骞村害鎶曡祫閲戦" label-width="100px" prop="company" style="width: 100%; min-width: 260px">
- <el-input v-model.trim="projectForm.yearInvestAmount" clearable maxlength="255" placeholder="璇疯緭鍏�" style="width: 90%" type="number" />
+ <el-input v-model.trim="projectForm.yearInvestAmount" clearable maxlength="255" placeholder="璇疯緭鍏�"
+ style="width: 90%" type="number"/>
<span style="margin-left: 2px">鍏�</span>
</el-form-item>
</el-col>
@@ -251,9 +274,10 @@
<el-col :span="18">
<el-form-item label="椤圭洰鍦板潃:" label-width="100px" prop="medicalAddr" style="width: 100%">
<div class="input-row">
- <el-input v-model.trim="projectForm.projectAddress" class="input-item" disabled maxlength="255" placeholder="璇疯緭鍏�"></el-input>
+ <el-input v-model.trim="projectForm.projectAddress" class="input-item" disabled maxlength="255"
+ placeholder="璇疯緭鍏�"></el-input>
<div v-if="!disabled" class="map-btn" @click="dialogMap = true">
- <img alt="" src="@/assets/images/positionl.png" />
+ <img alt="" src="@/assets/images/positionl.png"/>
</div>
</div>
</el-form-item>
@@ -287,20 +311,23 @@
<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';
// import { getList } from '@/api/engineeringLibrary/index';
// import RemoteSelect from '@/components/RemoteSelect/index.vue';
import Cookies from "js-cookie";
-import { addProject, getProject, updateProject, getProjectCode } from '@/api/projectEngineering/projectInfo';
+import {addProject, getProject, updateProject, getProjectCode} from '@/api/projectEngineering/projectInfo';
import {approvalList} from "@/api/system/dept";
export default {
- 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'],
+ 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
},
@@ -308,7 +335,11 @@
disabled: {
type: Boolean,
default: false
- }
+ },
+ isShow: {
+ type: Boolean,
+ required: true,
+ },
},
data() {
return {
@@ -317,7 +348,7 @@
projectName: '',
projectCode: '',
projectType: '',
- projectStatus: 'working',
+ projectStatus: 'pendding',
fundType: '',
investType: '',
importanceType: '',
@@ -343,7 +374,7 @@
engineeringIdList: [],
content: '',
contact: '',
- projectOwnerUnit: '',
+ projectOwnerUnit: null,
planStartTime: '',
planCompleteTime: '',
projectContactPerson: '',
@@ -352,8 +383,11 @@
year: '',
yearInvestAmount: '',
competentDepartmentList: [],
- managementCentralizationList: []
+ managementCentralizationList: [],
+ remark: ''
},
+ subclass: '',
+ largeCategory: '',
approvalList: [],
setTime: '',
planStartTime: '',
@@ -364,50 +398,61 @@
loading: false,
hasMore: true,
selectOptions: [],
- accept: ['pdf', 'docx', 'xlsx', 'jpg','jpeg'],
- largeCategory: '',
- subclass: '',
+ accept: ['pdf', 'docx', 'xlsx', 'jpg', 'jpeg'],
mapCreateInfo: {},
demoFormRef: null,
rules: {
- projectName: [{ required: true, message: '璇疯緭鍏ラ」鐩悕绉�', trigger: 'blur' }]
+ projectName: [{required: true, message: '璇疯緭鍏ラ」鐩悕绉�', trigger: 'blur'}]
}
};
},
computed: {
- dialogMapList () {
+ dialogMapList() {
return [{
addr: this.projectForm.projectAddress,
name: '鍒涘缓'
}];
},
},
- created() {
- const projectForm = Cookies.get("projectForm");
+ mounted() {
+ this.projectForm.id = this.$route.query.projectId;
+ const projectForm = localStorage.getItem("projectForm");
+ //鍒濆鍖栦富绠￠儴闂ㄤ笅鎷夋
+ this.getApprovalList();
if (projectForm) {
- this.projectForm = JSON.parse(projectForm);
+ this.projectForm = JSON.parse(projectForm);
+ this.$emit('updateIsShow', true);
} else {
- //鍒濆鍖栦富绠￠儴闂ㄤ笅鎷夋
- this.getApprovalList();
- if(this.$route.query.projectId) {
- this.projectForm.id = this.$route.query.projectId;
- }
+ this.projectForm.id = this.$route.query.projectId;
// 鍦ㄧ粍浠跺垱寤烘椂鑾峰彇椤圭洰淇℃伅锛屽鏋� projectId 瀛樺湪
if (this.projectForm.id) {
this.getProjectInfo(this.projectForm.id);
} else {
- this.getProjectCodeApi();
+ // this.getProjectCodeApi();
+ this.$emit('updateIsShow', true);
}
// this.handleLoadMore(1);
}
},
beforeDestroy() {
- Cookies.set("projectForm",JSON.stringify(this.projectForm));
+ localStorage.setItem("projectForm", JSON.stringify(this.projectForm));
},
methods: {
+ handleProjectStatusChange(value) {
+ // 鏍规嵁閫変腑鐨� projectStatus 淇敼 anotherField 鐨勫��
+ if (value === 'working' || value === 'stop') {
+ this.projectForm.projectPhase = '瀹炴柦闃舵';
+ } else if (value === 'finish') {
+ this.projectForm.projectPhase = '绔ｅ伐鎶曠敤闃舵';
+ } else if (value === 'pendding') {
+ this.projectForm.projectPhase = '鍌ㄥ瑙勫垝闃舵';
+ }
+ },
getProjectInfo(id) {
getProject(id).then(res => {
this.projectForm = res.data;
+ this.$emit('updateIsShow', true);
+
});
},
getApprovalList() {
@@ -415,10 +460,11 @@
this.approvalList = res.data;
});
},
- submit() {
+ submit(usedStatus) {
this.$refs["projectForm"].validate(valid => {
if (valid) {
- if (this.projectForm.id != null) {
+ this.projectForm.usedStatus = usedStatus;
+ if (this.projectForm.id) {
updateProject(this.projectForm).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
//璺宠浆鍒颁笅涓粍浠�
@@ -440,26 +486,27 @@
this.projectForm.projectCode = res.data;
});
},
- changeDepartment(val) {
- if (!val.length) {
- this.largeCategory = '';
- return;
- }
- const labels = this.approvalList.filter(item => val.includes(item.id)).map(item => item.value);
- this.largeCategory = labels.join(',');
- },
- changePutUnder(val) {
- if (!val.length) {
- this.subclass = '';
- return;
- }
- const labels = this.dict.type.sys_centralized_management.filter(item => val.includes(item.value)).map(item => item.label);
- this.subclass = labels.join(',');
- },
+ // changeDepartment(val) {
+ // console.log("瑙﹀彂浜嬩欢" + val + this.approvalList)
+ // if (!val.length) {
+ // this.largeCategory = '';
+ // return;
+ // }
+ // const labels = this.approvalList.filter(item => val.includes(item.id)).map(item => item.value);
+ // this.largeCategory = labels.join(',');
+ // },
+ // changePutUnder(val) {
+ // if (!val.length) {
+ // this.subclass = '';
+ // return;
+ // }
+ // const labels = this.dict.type.sys_centralized_management.filter(item => val.includes(item.value)).map(item => item.label);
+ // this.subclass = labels.join(',');
+ // },
async loadDataList(newPage) {
try {
this.loading = true;
- const res = await getList({ pageNum: newPage, pageSize: 10000 });
+ const res = await getList({pageNum: newPage, pageSize: 10000});
const list = res.rows || [];
if (newPage === 1) {
this.selectOptions = [];
@@ -486,7 +533,7 @@
},
mapCreateClick() {
console.log("鍒涘缓")
- const { lon, lat, addr } = this.mapCreateInfo;
+ const {lon, lat, addr} = this.mapCreateInfo;
if (lon && lat && addr) {
this.projectForm.longitude = lon;
this.projectForm.latitude = lat;
@@ -494,28 +541,32 @@
this.$message.success('鑾峰彇鍦板潃鎴愬姛');
this.dialogMap = false;
} else {
- this.$message.error('鑾峰彇鍧愭爣澶辫触');
+ this.$message.error('璇峰厛鐐瑰嚮鍦板浘閫夋嫨鍦板潃');
}
},
},
watch: {
- 'projectForm.managementCentralizationList'(val) {
- if (val) {
- const labels = this.dict.type.sys_centralized_management
- .filter(item => val.includes(item.value))
- .map(item => item.label);
- this.subclass = labels.join(',');
- }
- },
- 'projectForm.competentDepartmentList'(val) {
- if (val) {
- const labels = this.approvalList
- .filter(item => val.includes(item.id))
- .map(item => item.value);
- this.largeCategory = labels.join(',');
- }
- },
+ 'projectForm': {
+ handler(newVal, oldVal) {
+ setTimeout(() => {
+ if (newVal.managementCentralizationList) {
+ const labels = this.dict.type.sys_centralized_management
+ .filter(item => newVal.managementCentralizationList.includes(item.value))
+ .map(item => item.label);
+ this.subclass = labels.join(',');
+ }
+ if (newVal.competentDepartmentList) {
+ const labels = this.approvalList
+ .filter(item => newVal.competentDepartmentList.includes(item.id))
+ .map(item => item.value);
+ this.largeCategory = labels.join(',');
+ }
+ }, 1000);
+ this.$emit('basicInfoForm', newVal)
+ },
+ deep: true
+ }
}
};
</script>
@@ -524,10 +575,12 @@
.item {
width: 100%;
}
+
.map_div {
width: 100%;
height: 643px;
}
+
.input-row {
display: flex;
width: 100%;
@@ -551,4 +604,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