新增测绘项目台账，合同编码列，以及关联合同按钮

oa-ui/src/views/flowable/form/components/chooseContract.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-22 11:12:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-05 14:08:32
+ * @LastEditTime: 2025-02-21 10:03:23
 -->
 <template>
   <div>
@@ -28,6 +28,7 @@
     <el-table ref="choosePContract" v-loading="loading" :data="contractList" highlight-current-row
       @current-change="handleCurrentChange" :row-key="getRowKeys" @row-dblclick="confirmChoose" @row-click="selectRow">
       <el-table-column label="序号" align="center" type="index" width="55" />
+      <el-table-column label="关联项目" align="center" prop="project.projectName"/>
       <el-table-column label="合同名称" align="center" key="contractName" prop="contractName" min-width="100px" />
       <el-table-column label="合同编码" align="center" key="contractCode" prop="contractCode" />
       <el-table-column label="合同编号" align="center" prop="contractNumber" min-width="100px" />

oa-ui/src/views/flowable/task/todo/index.vue

@@ -10,6 +10,9 @@
           placeholder="选择时间">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="标题">
+        <el-input v-model="searchText" size="small"  @input="filterTitle()" clearable placeholder="仅搜索当前页面标题"></el-input>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -17,15 +20,10 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <!-- <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['system:deployment:remove']">删除
-        </el-button> -->
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-if="dataShow" v-loading="loading" :data="todoList" border @selection-change="handleSelectionChange">
+    <el-table v-if="dataShow" v-loading="loading" :data="filterList" border @selection-change="handleSelectionChange">
       <el-table-column type="index" label="序号" width="55" align="center" />
       <!-- <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true" /> -->
       <el-table-column label="流程名称" align="center" prop="procDefName" />
@@ -39,18 +37,20 @@
       <el-table-column label="流程发起人" align="center">
         <template slot-scope="scope">
           <label>{{ scope.row.startUserName }} <el-tag type="info" size="mini">{{ scope.row.startDeptName
-          }}</el-tag></label>
+              }}</el-tag></label>
         </template>
       </el-table-column>
       <el-table-column label="接收时间" align="center" prop="createTime" width="180" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleProcess(scope.row)">处理</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit-outline"
+            @click="handleProcess(scope.row)">处理</el-button>
           <el-button size="mini" type="text" icon="el-icon-share" @click="handleAssign(scope.row)">转办</el-button>
         </template>
       </el-table-column>
     </el-table>
 
+    <div class="mt20" style="font-size:12px;color:#e45656;text-align:right;">tips:标题搜索只搜索当前页码列表，可在右下角调整每页条数，若当前页面未查询到，可点击下一页;</div>
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
     <!--选择流程接收人-->
@@ -92,6 +92,7 @@ export default {
       total: 0,
       // 流程待办任务表格数据
       todoList: [],
+      filterList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -103,6 +104,7 @@ export default {
         name: null,
         category: null
       },
+      searchText: '',
       // 表单参数
       form: {},
       // 表单校验
@@ -113,7 +115,7 @@ export default {
       checkSendUser: false, // 是否展示人员选择模块
       checkType: '', // 选择类型
       checkValues: null, // 选中任务接收人员数据
-      taskId: ''
+      taskId: '',
     };
   },
   created() {
@@ -125,10 +127,19 @@ export default {
       this.loading = true;
       todoList(this.queryParams).then(response => {
         this.todoList = response.data.records;
+        this.filterList = response.data.records;
         this.total = response.data.total;
+        this.filterTitle();
         this.loading = false;
       });
     },
+    filterTitle() {
+      this.filterList = this.todoList.filter(data => {
+        if (data.title) {
+          return !this.searchText || data.title.toLowerCase().includes(this.searchText.toLowerCase())
+        }
+      })
+    },
     getProjectInfo(row) {
       getProcessVariables(row.taskId).then(res => {
         if (res.data) {

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-01-07 15:34:38
+ * @LastEditTime: 2025-02-21 10:20:56
 -->
 <template>
   <div class="project-wrapper">
@@ -72,8 +72,9 @@
               :percentage="scope.row.percentage" text-color="#fff"></el-progress>
           </template>
         </el-table-column>
-        <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" width="120px" sortable  />
+        <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" width="120px" sortable />
         <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" sortable />
+        <el-table-column label="合同编码" align="center" prop="contract.contractCode" sortable />
         <el-table-column label="承担部门" align="center" key="undertakingDeptName" prop="undertakingDeptName" sortable />
         <el-table-column label="项目负责人" align="center" key="projectLeaderName" prop="projectLeaderUser.nickName" sortable
           width="120px" />
@@ -90,126 +91,18 @@
           <template slot-scope="scope" v-if="scope.row.userId !== 1">
             <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
               v-hasPermi="['oa:project:query']">查看</el-button>
-            <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-              v-hasPermi="['oa:project:edit']">修改</el-button> -->
             <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
               v-hasPermi="['oa:project:remove']">删除</el-button>
+            <el-button size="mini" type="text" icon="el-icon-document" @click="handleRelate(scope.row)"
+              v-hasPermi="['oa:project:relate']">关联合同</el-button>
           </template>
         </el-table-column>
       </el-table>
       <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
         :autoScroll="false" @pagination="getList" />
     </el-card>
-    <!-- 新建项目 -->
-    <el-dialog :title="title" :visible.sync="addOpen" append-to-body>
-      <el-form :model="addForm" :rules="rules" label-width="100px">
-        <el-form-item label="项目编号：" prop="projectNumber">
-          <el-input v-model="addForm.projectNumber"></el-input>
-        </el-form-item>
-        <el-form-item label="项目名称：" prop="projectName">
-          <el-input v-model="addForm.projectName"></el-input>
-        </el-form-item>
-        <el-form-item label="项目负责人：" prop="projectLeader">
-          <el-tag effect="plain" type="warning" style="margin-right: 10px;"
-            v-if="addForm.projectLeaderName != undefined">{{
-        addForm.projectLeaderName }}</el-tag>
-          <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="choosePeople">选择</el-button>
-        </el-form-item>
-        <el-form-item label="项目类型：" prop="projectType">
-          <el-input v-model="addForm.projectType"></el-input>
-        </el-form-item>
-        <el-form-item label="项目级别：" prop="projectLevel">
-          <el-radio v-model="addForm.projectLevel" label="0">一般项目</el-radio>
-          <el-radio v-model="addForm.projectLevel" label="1">重大项目</el-radio>
-        </el-form-item>
-        <el-form-item label="项目来源：" prop="projectSource">
-          <el-radio v-model="addForm.projectSource" label="0">院内</el-radio>
-          <el-radio v-model="addForm.projectSource" label="1">院外</el-radio>
-        </el-form-item>
-        <el-form-item label="甲方单位：" prop="partyA">
-          <el-input v-model="addForm.partyA"></el-input>
-        </el-form-item>
-        <el-form-item label="联系人：" prop="contactPerson">
-          <el-input v-model="addForm.contactPerson"></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话：" prop="telephone">
-          <el-input v-model="addForm.telephone"></el-input>
-        </el-form-item>
-        <el-form-item label="项目概况：" prop="projectRegistrant">
-          <table border="1">
-            <tr>
-              <td style="width:250px;">工作内容</td>
-              <td>等级或比例尺</td>
-              <td>单位</td>
-              <td>工作量</td>
-              <td style="width:100px;">要求完成时间</td>
-              <td>备注</td>
-            </tr>
-            <tr v-for="(work, index) in workList" :key="index">
-              <td>
-                <el-input v-model="work.content" type="textarea" autosize clearable></el-input>
-              </td>
-              <td>
-                <el-input v-model="work.scale" clearable></el-input>
-              </td>
-              <td>
-                <el-input v-model="work.unit" clearable></el-input>
-              </td>
-              <td>
-                <el-input v-model="work.workload" clearable></el-input>
-              </td>
-              <td>
-                <el-date-picker style="width:140px;" v-model="work.deadline" value-format="yyyy-MM-dd" type="date"
-                  placeholder="选择日期">
-                </el-date-picker>
-              </td>
-              <td>
-                <el-input v-model="work.remark" type="textarea" autosize clearable></el-input>
-              </td>
-              <td>
-                <el-button type="danger" icon="el-icon-minus" size="mini" circle
-                  @click="deletWorkItem(index)"></el-button>
-              </td>
-            </tr>
-          </table>
-
-          <el-button icon="el-icon-plus" size="mini" @click="addWorkList"></el-button>
-        </el-form-item>
-        <el-form-item label="项目登记人：" prop="projectRegistrant">
-          <el-input v-model="addForm.projectRegistrant"></el-input>
-        </el-form-item>
-        <el-form-item label="备注：" prop="projectRegistrant">
-          <el-input v-model="addForm.remark" type="textarea" rows="3"></el-input>
-        </el-form-item>
-
-      </el-form>
-      <div slot="footer" class="dialog-footer" style="text-align: center;">
-        <el-button type="primary" @click="confirmAddForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-      <!-- 人员选择对话框 -->
-      <el-dialog width="30%" title="选择项目负责人" :visible.sync="peopleVisible" append-to-body>
-        <el-form>
-          <el-form-item label="部门：">
-            <el-select v-model="peopleForm.deptId" @change="handleChangeDept">
-              <el-option v-for="item in peopleForm.deptList" :key="item.deptId" :label="item.deptName"
-                :value="item.deptId" v-if="item.deptName != '四川中水成勘院测绘工程有限责任公司'">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="人员：">
-            <el-select v-model="peopleForm.userId">
-              <el-option v-for="item in peopleForm.userList" :key="item.userId" :label="item.nickName"
-                :value="item.userId">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button @click="confirmPeople" type="primary">确定</el-button>
-            <el-button @click="cancelChoosePeople">取消</el-button>
-          </el-form-item>
-        </el-form>
-      </el-dialog>
+    <el-dialog title="关联合同" :visible.sync="relateOpen" width="60%" append-to-body>
+      <choose-contract @choose="confirmContract" @close="relateOpen = false"></choose-contract>
     </el-dialog>
   </div>
 </template>
@@ -217,6 +110,7 @@
 <script>
 import { listProject, listProjectFuzzy, submitProject, modifyProject, delProject } from "@/api/oa/project/project";
 import { listProjectProgress, getProjectProgress } from "@/api/oa/project/projectProgress";
+import { addProjectContract, delProjectContract } from "@/api/oa/contract/projectContract";
 import { listDept } from '@/api/system/dept';
 import { listUser, getUser } from '@/api/system/user';
 import { mapGetters } from 'vuex';
@@ -225,8 +119,10 @@ import { listDefinition } from "@/api/flowable/definition";
 import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
 import { todoList, getNextFlowNodeByStart } from "@/api/flowable/todo";
 import { Snowflake } from '@/utils/snowFlake.js'
+import chooseContract from '@/views/flowable/form/components/chooseContract.vue';
 
 export default {
+  components: { chooseContract },
   name: 'Project',
   computed: {
     ...mapGetters(['deptId', 'userId'])
@@ -247,6 +143,7 @@ export default {
       total: 0,
       loading: true,
       addOpen: false,
+      relateOpen: false,
       modifyOpen: false,
       title: '',
       addForm: {},
@@ -348,10 +245,6 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
-    handleAdd() {
-      this.title = '新增项目'
-      this.addOpen = true
-    },
     handleView(row) {
       let id = row.projectId
       this.$router.push(
@@ -376,6 +269,27 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => { });
     },
+    // 关联合同
+    handleRelate(row) {
+      this.relateOpen = true;
+      this.addForm = row
+    },
+    confirmContract(contract) {
+      const projectId = this.addForm.projectId;
+      let projectContract = {
+        projectId: projectId,
+        contractId: contract.contractId
+      }
+      if (!this.addForm.contract) {
+        addProjectContract(projectContract)
+      } else {
+        delProjectContract(this.addForm.contract.contractId).then(() => {
+          addProjectContract(projectContract)
+        });
+      }
+      this.getList();
+      this.relateOpen = false;
+    },
     confirmAddForm() {
       this.addForm.workList = this.workList;
       let formData = new FormData();
@@ -546,7 +460,7 @@ export default {
       }
       return path
     },
-    sortIsFinshed(a,b){
+    sortIsFinshed(a, b) {
       return Number(a.isFinished) - Number(b.isFinished)
     }
   },

oa-ui/src/views/oa/project/invest.vue

@@ -96,6 +96,7 @@
         </el-table-column>
         <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" width="120px" />
         <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" />
+        <el-table-column label="合同编码" align="center" prop="contract.contractCode" />
         <el-table-column label="承担部门" align="center" key="undertakingDeptName" prop="undertakingDeptName" />
         <el-table-column label="项目负责人" align="center" key="projectLeaderName" prop="projectLeaderUser.nickName"
           width="120px" />