feat:增加项目列表页面查询、创建多层子项目数据整合、创建单层子项目、创建多层项目数据整合。

src/views/projectcenter/ProjectManage.vue

@@ -5,28 +5,31 @@
 		<div class="filter">
 			<div class="filterItems">
 				<div class="select">
-					<a-select v-model:value="projectName" style="width: 270px" placeholder="请输入项目名称" :options="projectNameList"
-						@change="selectProjectName" allowClear showSearch></a-select>
+					<a-input v-model:value="sProjectName" style="width: 270px; height: 40px; border-radius: 8px;"
+						placeholder="请输入项目名称" @change="sProjectNameChange" allowClear showSearch>
+					</a-input>
 				</div>
 				<div class="select">
-					<a-select v-model:value="projectName" style="width: 270px" placeholder="请输入项目经理" :options="projectNameList"
-						@change="selectProjectName" allowClear showSearch></a-select>
+					<a-input v-model:value="sProjectOrder" style="width: 270px; height: 40px; border-radius: 8px;"
+						placeholder="请输入项目经理" @change="sProjectOrderChange" allowClear showSearch>
+					</a-input>
 				</div>
 				<div class="select">
-					<a-select v-model:value="projectName" style="width: 270px" placeholder="请选择状态" :options="projectNameList"
-						@change="selectProjectName" allowClear showSearch></a-select>
+					<a-select v-model:value="sProjectState" style="width: 270px" placeholder="请选择状态" :options="sProjectStateList"
+						@change="sProjectStateChange" allowClear showSearch></a-select>
 				</div>
 				<div class="select">
-					<a-date-picker v-model="selectTime" type="date" placeholder="创建时间" style="width: 270px" />
+					<a-date-picker v-model:value="sProjectTime" @change="sProjectTimeChange" type="date" placeholder="创建时间"
+						style="width: 270px" />
 				</div>
 				<div style="display: flex; margin-bottom: 20px">
 					<div class="btnn btn1">
 						<div class="search"></div>
-						<div class="btnText">搜索</div>
+						<div class="btnText" v-on:click="searchSubmit">搜索</div>
 					</div>
 					<div class="btn btn2">
 						<div class="search"></div>
-						<div class="btnText">重置</div>
+						<div class="btnText" v-on:click="searchReset">重置</div>
 					</div>
 				</div>
 			</div>
@@ -103,7 +106,7 @@
 					</div>
 				</div>
 				<div class="modalMain">
-					<router-link to="/sonproject" class="taskbox" style="
+					<div @click="createChildProject" class="taskbox" style="
               margin-right: 24px;
               background: linear-gradient(180deg, #ddeaff 0%, #f0f8fe 100%);
             ">
@@ -119,7 +122,7 @@
 						<div class="centerbox" style="color: rgba(78, 166, 255, 1)">
 							单层子项目
 						</div>
-					</router-link>
+					</div>
 					<div class="taskbox" @click="showModal3" style="
               background: linear-gradient(180deg, #fef3dd 0%, #fffaf0 100%);
             ">
@@ -240,7 +243,7 @@
 							<img style="width: 10px; height: 10px" src="../../assets/images/basicinfo/asterisk.png" />
 						</div>
 						<div class="inname">分类:</div>
-						<div class="in">
+						<div class="in select">
 							<a-select v-model:value="value2" placeholder="四个养成" :options="classifyList" @change="classificationChange"
 								style="border-radius: 8px; height: 40px" />
 						</div>
@@ -251,7 +254,7 @@
 						</div>
 						<div class="inname">项目经理:</div>
 						<div class="in">
-							<a-select v-model:value="value3" placeholder="请选择项目经理" :options="classifyList1"
+							<a-select v-model:value="value3" mode="multiple" placeholder="请选择项目经理" :options="classifyList1"
 								@change="classificationChange1" style="border-radius: 8px; height: 40px" />
 						</div>
 					</div>
@@ -260,8 +263,9 @@
 							<img style="width: 10px; height: 10px" src="../../assets/images/basicinfo/asterisk.png" />
 						</div>
 						<div class="inname">资源归属:</div>
-						<div class="in">
-							<a-input v-model:value="value5" style="border-radius: 8px; height: 40px" />
+						<div class="in select">
+							<a-select v-model:value="value5" placeholder="请选择资源归属" :options="classifyList5"
+								@change="classificationChange5" style="border-radius: 8px; height: 40px" />
 						</div>
 					</div>
 					<div class="pubtn">
@@ -293,7 +297,7 @@
 				<div class="modalMain">
 					<div style="margin-left: 40px; margin-top: 40px">
 						<span style="color: #000000; font-size: 14px">项目归属：</span>
-						<span style="color: #999999; font-size: 14px; margin-left: 10px">管理者进阶</span>
+						<span style="color: #999999; font-size: 14px; margin-left: 10px">{{ currentProjectName }}</span>
 					</div>
 					<div class="name">
 						<div class="star" style="margin-top: -4px">
@@ -301,7 +305,7 @@
 						</div>
 						<div class="inname">子项目名称:</div>
 						<div class="in">
-							<a-input v-model:value="value5" placeholder="请输入项目名称" style="border-radius: 8px; height: 40px" />
+							<a-input v-model:value="value6" placeholder="请输入项目名称" style="border-radius: 8px; height: 40px" />
 						</div>
 					</div>
 					<div class="name">
@@ -309,8 +313,9 @@
 							<img style="width: 10px; height: 10px" src="../../assets/images/basicinfo/asterisk.png" />
 						</div>
 						<div class="inname">分类:</div>
-						<div class="in">
-							<a-select v-model:value="value6" placeholder="四个养成" style="border-radius: 8px; height: 40px" />
+						<div class="in select">
+							<a-select v-model:value="value7" @change="classificationChange2" :options="classifyList2"
+								placeholder="四个养成" style="border-radius: 8px; height: 40px" />
 						</div>
 					</div>
 					<div class="name">
@@ -319,7 +324,8 @@
 						</div>
 						<div class="inname">子项目经理:</div>
 						<div class="in">
-							<a-input v-model:value="value7" placeholder="自动带出 可编辑" style="border-radius: 8px; height: 40px" />
+							<a-select v-model:value="value8" mode="multiple" @change="classificationChange3" :options="classifyList3"
+								placeholder="自动带出 可编辑" style="border-radius: 8px; height: 40px" />
 						</div>
 					</div>
 					<div class="name">
@@ -327,13 +333,14 @@
 							<img style="width: 10px; height: 10px" src="../../assets/images/basicinfo/asterisk.png" />
 						</div>
 						<div class="inname">资源归属:</div>
-						<div class="in">
-							<a-input v-model:value="value8" style="border-radius: 8px; height: 40px" />
+						<div class="in select">
+							<a-select v-model:value="value9" @change="classificationChange4" :options="classifyList4"
+								placeholder="请选择资源归属" style="border-radius: 8px; height: 40px" />
 						</div>
 					</div>
 					<div class="pubtn">
 						<a-button class="pubtn1" @click="closeModal3">取消</a-button>
-						<a-button class="pubtn2" @click="closeModal3">确定</a-button>
+						<a-button class="pubtn2" @click="createChildsProject">确定</a-button>
 					</div>
 				</div>
 			</a-modal>
@@ -478,6 +485,7 @@
 <script>
 import { reactive, toRefs, onMounted, ref } from "vue";
 import { message } from 'ant-design-vue';
+import { useRouter } from "vue-router";
 import ProjOwnerShip from "../../components/drawers/ProjectOwn";
 import ProjPowerList from "../../components/drawers/ProjPowerList";
 import ProjCheckShip from "../../components/drawers/ProjCheckPower";
@@ -535,8 +543,95 @@ export default {
 			ProjPvisible: false,
 			ProjCheckvisible: false,
 			ProjManagevisible: false,
+
+			currentProjectId: '',
+			currentProjectName: '',
+
 		});
 		// 数据接入 - start -
+		const router = useRouter();
+		// 搜索数据
+		const sProjectName = ref('');
+		const sProjectOrder = ref('');
+		const sProjectState = ref('');
+		const sProjectTime = ref('');
+
+		const sProjectStateList = ref([
+			{ value: 0, label: '草稿' },
+			{ value: 1, label: '进行中' },
+			{ value: 2, label: '未开始' },
+			{ value: 3, label: '已结束' },
+		]);
+
+		let name = '';
+		const sProjectNameChange = (key) => {
+			console.log('项目名称', key.target.value)
+			name = key.target.value
+		}
+		let managerid = '';
+		const sProjectOrderChange = (key) => {
+			console.log('项目经理', key.target.value)
+			managerid = key.target.value;
+		}
+		let status = '';
+		const sProjectStateChange = (key) => {
+			console.log('项目状态', key)
+			status = key;
+		}
+
+		let beginTime = '';
+		let endTime = '';
+		const sProjectTimeChange = (key, value) => {
+			console.log('项目时间', key)
+			console.log('项目时间', value)
+			console.log(new Date('2019-10-08 18:22:37').getTime())
+			beginTime = Math.ceil(new Date(value + ' ' + '00:00:00').getTime() / 1000);
+			endTime = Math.ceil(new Date(value + ' ' + '23:59:59').getTime() / 1000);
+		}
+
+		const searchReset = () => {
+			sProjectName.value = "";
+			sProjectOrder.value = "";
+			sProjectState.value = null;
+			sProjectTime.value = null;
+			name = "";
+			beginTime = "";
+			endTime = "";
+			status = null;
+			managerid = "";
+			getTableDate();
+		}
+
+		const searchSubmit = () => {
+			const obj = {
+				pageNo: 1,
+				pageSize: 10,
+				beginTime: beginTime,
+				endTime: endTime,
+				status: status,
+				name: name,
+				manager: managerid
+			}
+			let searchList = [];
+			for (let i in obj) {
+				if (obj[i] !== "") {
+					if (obj[i] !== null) {
+						searchList.push(1);
+					} else {
+						searchList.push(0);
+					}
+				} else {
+					searchList.push(0);
+				}
+			}
+			if (searchList.toString().indexOf("1") == -1) {
+				message.destroy();
+				message.warning("请输入搜索条件后进行搜索");
+			}
+			console.log('搜索的数据筛选条件', obj, searchList.toString())
+
+			getTableDate(obj);
+		}
 
 		// 项目分类
 		const classifyList = ref([
@@ -552,10 +647,22 @@ export default {
 		]);
 
 		const value1 = ref("");
-		const value2 = ref("");
-		const value3 = ref("");
+		const value2 = ref([]);
+		const value3 = ref([]);
 		const value4 = ref("");
-		const value5 = ref("");
+		const value5 = ref([]);
+
+		const classifyList5 = ref([
+			{ value: 1, label: '项目一' },
+			{ value: 2, label: '项目二' },
+			{ value: 3, label: '项目三' },
+		]);
+
+		let sourceBelongId = '';
+		const classificationChange5 = (key) => {
+			console.log(`selected ${key}`);
+			sourceBelongId = key;
+		}
 
 		let type = "";
 		const classificationChange = (key) => {
@@ -568,10 +675,21 @@ export default {
 		let managerId = "";
 
 		const classificationChange1 = (key) => {
-			console.log(`selected ${key}`);
-			console.log(classifyList1.value[key - 1].label);
-			manager = classifyList1.value[key - 1].label;
-			managerId = key;
+			console.log(`selected ${key}`, classifyList1);
+			let mstr = '';
+			let midstr = '';
+			for (let i = 0; i < key.length; i++) {
+				if (key.length - 1 !== i) {
+					midstr += key[i] + ',';
+					mstr += classifyList1.value[i].label + ',';
+				} else {
+					midstr += key[i];
+					mstr += classifyList1.value[i].label;
+				}
+			}
+			console.log(mstr, midstr)
+			manager = mstr;
+			managerId = midstr;
 		};
 
 		// 创建多层项目
@@ -590,7 +708,7 @@ export default {
 				category: type,
 				manager: manager,
 				managerId: managerId,
-				sourceBelongId: 2,
+				sourceBelongId: sourceBelongId,
 			};
 			console.log('创建多层项目提交的数据格式', obj);
 			for (let i in errorMsgs) {
@@ -606,12 +724,153 @@ export default {
 				console.log(res)
 				if (res.status == 200 && res.data.code == 200) {
 					// 创建成功 隐藏弹出框
+					value1.value = "";
+					type = "";
+					manager = "";
+					managerId = "";
+					sourceBelongId = "";
+					value2.value = [];
+					value3.value = [];
+					value4.value = "";
+					value5.value = [];
 					state.doublepro = false;
 				}
 			}).catch(err => {
 				console.log(err)
 			})
 		};
+		// 取消按钮 清空输入的数据
+		const closeModal2 = () => {
+			value1.value = "";
+			type = "";
+			manager = "";
+			managerId = "";
+			sourceBelongId = "";
+			value2.value = [];
+			value3.value = [];
+			value4.value = "";
+			value5.value = [];
+			state.doublepro = false;
+		};
+
+		// 创建单层子项目 (需要传入多层项目的ProjectID)
+		const createChildProject = () => {
+			console.log(state.currentProjectId)
+			router.push({
+				path: '/sonproject',
+				query: { projectId: state.currentProjectId, name: state.currentProjectName }
+			});
+		}
+
+		// 创建多层子项目
+		const value6 = ref("");
+		const value7 = ref([]);
+		const value8 = ref([]);
+		const value9 = ref([]);
+
+		const classifyList2 = ref([
+			{ value: 1, label: '管理者' },
+			{ value: 2, label: '领军者' },
+			{ value: 3, label: '产业人' },
+		]);
+
+		let categoryT = '';
+		const classificationChange2 = (key) => {
+			console.log(`selected ${key}`);
+			categoryT = key;
+		};
+
+		const classifyList3 = ref([
+			{ value: 1, label: '李俊国' },
+			{ value: 2, label: '将小米' },
+			{ value: 3, label: '刘孟君' },
+		]);
+
+		let managerT = '';
+		let managerIdT = '';
+		const classificationChange3 = (key) => {
+			console.log(`selected ${key}`);
+			console.log(`selected ${key}`, classifyList3);
+			let mstr = '';
+			let midstr = '';
+			for (let i = 0; i < key.length; i++) {
+				if (key.length - 1 !== i) {
+					midstr += key[i] + ',';
+					mstr += classifyList3.value[i].label + ',';
+				} else {
+					midstr += key[i];
+					mstr += classifyList3.value[i].label;
+				}
+			}
+			console.log(mstr, midstr)
+			managerT = mstr;
+			managerIdT = midstr;
+		};
+
+		const classifyList4 = ref([
+			{ value: 1, label: '项目一' },
+			{ value: 2, label: '项目二' },
+			{ value: 3, label: '项目三' },
+		]);
+
+		let sourceBelongIdT = '';
+		const classificationChange4 = (key) => {
+			console.log(`selected ${key}`);
+			sourceBelongIdT = key;
+		};
+
+		// 取消按钮 清空数据
+		const closeModal3 = () => {
+			value6.value = "";
+			categoryT = "";
+			managerT = "";
+			managerIdT = "";
+			sourceBelongIdT = "";
+			value7.value = [];
+			value8.value = [];
+			value9.value = [];
+			state.doublesonpro = false;
+		};
+
+		const createChildsProject = () => {
+
+			const errorMsgs = {
+				"name": "请输入子项目名称",
+				"category": "请选择子项目分类",
+				"manager": "请选择子项目经理",
+				"sourceBelongId": "请选择资源归属"
+			}
+
+			let obj = {
+				name: value6.value,
+				type: 2,
+				category: categoryT,
+				manager: managerT,
+				managerId: managerIdT,
+				sourceBelongId: sourceBelongIdT,
+			};
+
+			console.log('创建多层子项目提交的数据格式', obj);
+			for (let i in errorMsgs) {
+				console.log(obj[i])
+				if (obj[i] === "" || obj[i] === undefined) {
+					message.destroy()
+					message.warning(errorMsgs[i])
+					return
+				}
+			}
+
+			value6.value = "";
+			categoryT = "";
+			managerT = "";
+			managerIdT = "";
+			sourceBelongIdT = "";
+			value7.value = [];
+			value8.value = [];
+			value9.value = [];
+			state.doublesonpro = false;
+		}
+
 
 		// 数据接入 - end -
 
@@ -660,6 +919,20 @@ export default {
 				key: "status",
 				width: 100,
 				align: "center",
+				customRender: (value) => {
+					return (
+						<div>
+							{
+								value.record.status == 0 ?
+									"草稿" :
+									value.record.status == 1 ?
+										"进行中" :
+										value.record.status == 2 ?
+											"未开始" : "已结束"
+							}
+						</div>
+					)
+				}
 			},
 			{
 				title: "创建人",
@@ -745,6 +1018,8 @@ export default {
 									class="operation3"
 									style="cursor: pointer"
 									onClick={() => {
+										state.currentProjectId = value.record.projectId;
+										state.currentProjectName = value.record.name;
 										state.sonproject = true;
 									}}
 								>
@@ -2892,17 +3167,12 @@ export default {
 			state.doublepro = true;
 			state.estabish = false;
 		};
-		const closeModal2 = () => {
-			state.doublepro = false;
-		};
+
 
 		const showModal3 = () => {
 			state.doublesonpro = true;
 			state.sonproject = false;
 		};
-		const closeModal3 = () => {
-			state.doublesonpro = false;
-		};
 		const showCopyModal = () => {
 			state.copyModal = true;
 		};
@@ -2981,14 +3251,40 @@ export default {
 			createStoreyProject,
 			classifyList,
 			classifyList1,
+			classifyList2,
+			classifyList3,
+			classifyList4,
+			classifyList5,
 			classificationChange,
 			classificationChange1,
+			classificationChange2,
+			classificationChange3,
+			classificationChange4,
+			classificationChange5,
 			changePagination,
 			value1,
 			value2,
 			value3,
 			value4,
 			value5,
+			value6,
+			value7,
+			value8,
+			value9,
+
+			sProjectName,
+			sProjectOrder,
+			sProjectState,
+			sProjectTime,
+			sProjectStateList,
+			sProjectNameChange,
+			sProjectOrderChange,
+			sProjectStateChange,
+			sProjectTimeChange,
+			searchReset,
+			searchSubmit,
+			createChildProject,
+			createChildsProject
 		};
 	},
 };