添加项目、材料、机械删除校验；添加联表查询

plus-ui/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
    */

plus-ui/src/api/project/projectTeamMember/types.ts

@@ -78,6 +78,11 @@ export interface ProjectTeamMemberQuery extends PageRequest {
    */
   memberId?: string | number;
 
+  /**
+   * 施工人员姓名
+   */
+  memberName?: string;
+
   /**
    * 岗位（默认为0普通员工，1组长）
    */

plus-ui/src/views/materials/materialsInventory/index.vue

@@ -4,10 +4,8 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="材料名称" prop="materialsId">
-              <el-select v-model="queryParams.materialsId" clearable placeholder="请选择材料名称">
-                <el-option v-for="item in materialsOptions" :key="item.id" :label="item.materialsName" :value="item.id" />
-              </el-select>
+            <el-form-item label="材料名称" prop="materialsName">
+              <el-input v-model="queryParams.materialsName" placeholder="请输入材料名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -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<PageData<MaterialsInventoryForm, MaterialsInventoryQuery>>({
   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<PageData<MaterialsInventoryForm, MaterialsInventoryQuery>>
     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 });

plus-ui/src/views/project/contractor/index.vue

@@ -76,7 +76,7 @@
     </el-card>
     <!-- 添加或修改分包单位对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="contractorFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="contractorFormRef" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="公司名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入公司名称" />
         </el-form-item>

plus-ui/src/views/project/project/index.vue

@@ -86,19 +86,13 @@
     </el-card>
     <!-- 添加或修改项目对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="projectFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="projectFormRef" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="项目名称" prop="projectName">
           <el-input v-model="form.projectName" placeholder="请输入项目名称" />
         </el-form-item>
         <el-form-item label="项目简称" prop="shortName">
           <el-input v-model="form.shortName" placeholder="请输入项目简称" />
         </el-form-item>
-        <!-- <el-form-item label="父项目id" prop="pId">
-          <el-input v-model="form.pId" placeholder="请输入父项目id" />
-        </el-form-item> -->
-        <el-form-item label="项目图片" prop="picUrl">
-          <el-input v-model="form.picUrl" placeholder="请输入项目图片" />
-        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>

plus-ui/src/views/project/projectTeam/component/UserListDialog.vue

@@ -5,8 +5,8 @@
         {{ props.projectTeamVo.teamName }}
       </template>
       <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-        <el-form-item label="施工人员" prop="memberId">
-          <el-input v-model="queryParams.memberId" placeholder="请输入施工人员" clearable @keyup.enter="handleQuery" />
+        <el-form-item label="施工人员" prop="memberName">
+          <el-input v-model="queryParams.memberName" placeholder="请输入施工人员" clearable @keyup.enter="handleQuery" />
         </el-form-item>
         <el-form-item label="岗位" prop="postId">
           <el-select v-model="queryParams.postId" clearable placeholder="请选择岗位">