diff --git a/src/api/materials/materialsInventory/types.ts b/src/api/materials/materialsInventory/types.ts
index db3c5ca..0ce3ba1 100644
--- a/src/api/materials/materialsInventory/types.ts
+++ b/src/api/materials/materialsInventory/types.ts
@@ -1,3 +1,5 @@
+import { MaterialsVO } from '@/api/materials/materials/types';
+
export interface MaterialsInventoryVO {
/**
* 主键id
@@ -63,6 +65,11 @@ export interface MaterialsInventoryVO {
* 备注
*/
remark: string;
+
+ /**
+ * 材料封装
+ */
+ materialsVo: MaterialsVO;
}
export interface MaterialsInventoryForm extends BaseEntity {
@@ -138,6 +145,11 @@ export interface MaterialsInventoryQuery extends PageRequest {
*/
materialsId?: string | number;
+ /**
+ * 材料名称
+ */
+ materialsName?: string;
+
/**
* 项目id
*/
diff --git a/src/api/project/projectTeamMember/types.ts b/src/api/project/projectTeamMember/types.ts
index ef47fc3..67a754a 100644
--- a/src/api/project/projectTeamMember/types.ts
+++ b/src/api/project/projectTeamMember/types.ts
@@ -78,6 +78,11 @@ export interface ProjectTeamMemberQuery extends PageRequest {
*/
memberId?: string | number;
+ /**
+ * 施工人员姓名
+ */
+ memberName?: string;
+
/**
* 岗位(默认为0普通员工,1组长)
*/
diff --git a/src/views/materials/materialsInventory/index.vue b/src/views/materials/materialsInventory/index.vue
index 97d5fbe..56f1b12 100644
--- a/src/views/materials/materialsInventory/index.vue
+++ b/src/views/materials/materialsInventory/index.vue
@@ -4,10 +4,8 @@
-
-
-
-
+
+
搜索
@@ -194,18 +192,15 @@ const initFormData: MaterialsInventoryForm = {
disposition: undefined,
recipient: undefined,
shipper: undefined,
- remark: undefined,
- materialsVo: {
- id: undefined,
- materialsName: undefined,
- materialsCode: undefined
- }
+ remark: undefined
};
const data = reactive>({
form: { ...initFormData },
queryParams: {
current: 1,
pageSize: 10,
+ sortField: 'createTime',
+ sortOrder: 'descend',
materialsId: undefined,
projectId: currentProject.value.id,
outPut: undefined,
@@ -217,12 +212,7 @@ const data = reactive>
disposition: undefined,
recipient: undefined,
shipper: undefined,
- params: {},
- materialsVo: {
- id: undefined,
- materialsName: undefined,
- materialsCode: undefined
- }
+ params: {}
},
rules: {
id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }],
@@ -240,7 +230,7 @@ const getList = async () => {
materialsInventoryList.value = res.data.records;
total.value = res.data.total;
const materialsMap = new Map();
- res.data.records.forEach((record) => {
+ res.data.records.forEach((record: MaterialsInventoryVO) => {
const { id, materialsName } = record.materialsVo;
if (!materialsMap.has(id)) {
materialsMap.set(id, { id, materialsName });
diff --git a/src/views/project/contractor/index.vue b/src/views/project/contractor/index.vue
index 8d4ca56..c42764b 100644
--- a/src/views/project/contractor/index.vue
+++ b/src/views/project/contractor/index.vue
@@ -76,7 +76,7 @@
-
+
diff --git a/src/views/project/project/index.vue b/src/views/project/project/index.vue
index 3d0866c..ded4e59 100644
--- a/src/views/project/project/index.vue
+++ b/src/views/project/project/index.vue
@@ -86,19 +86,13 @@
-
+
-
-
-
-
diff --git a/src/views/project/projectTeam/component/UserListDialog.vue b/src/views/project/projectTeam/component/UserListDialog.vue
index d9495a8..91d689b 100644
--- a/src/views/project/projectTeam/component/UserListDialog.vue
+++ b/src/views/project/projectTeam/component/UserListDialog.vue
@@ -5,8 +5,8 @@
{{ props.projectTeamVo.teamName }}
-
-
+
+