Merge branch 'developer' of http://code.cyweb.top/scj/zhxy/v3/cloud-ui into developer

src/views/purchase/purchasingrequisition/index.vue

@@ -78,7 +78,7 @@
 					</el-form-item>
 					<el-form-item label="需求部门" prop="deptId">
 						<el-select v-model="state.queryForm.deptCode" placeholder="请选择需求部门" clearable filterable style="width: 200px">
-							<el-option v-for="item in secondDeptList" :key="item.id" :label="item.name" :value="item.id" />
+							<el-option v-for="item in secondDeptList" :key="item.id" :label="item.deptName" :value="item.deptCode" />
 						</el-select>
 					</el-form-item>
 					<el-form-item>
@@ -1352,8 +1352,8 @@ const loadSecondDeptList = async () => {
 		const res = await getDeptListByLevelTwo();
 		if (res.data && Array.isArray(res.data)) {
 			secondDeptList.value = res.data.map((item: any) => ({
-				id: item.id || item.deptId,
-				name: item.name || item.deptName,
+				deptCode: item.deptCode,
+        deptName: item.deptName,
 			}));
 		}
 	} catch (err) {