项目详情新增项目变更记录

oa-ui/src/utils/request.js

@@ -17,7 +17,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 300000 //5分钟
 })
 
 // request拦截器

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

@@ -420,6 +420,38 @@
           </el-descriptions>
         </div>
       </div>
+
+      <div class="box1 mt20">
+        <div class="title">项目变更记录
+          <div class="line"></div>
+        </div>
+        <div class="info mt20">
+          <el-descriptions class="descriptions xmsc" border :column="2" style="text-align: center;">
+            <el-descriptions-item :span="2">
+              <template slot="label">
+                <svg-icon slot="prefix" icon-class="form" />
+                变更记录表
+              </template>
+              <div>
+                <el-table :data="projectChangeList">
+                  <el-table-column type="index" label="序号" width="55" align="center" />
+                  <el-table-column label="项目编号" align="center" width="80" prop="project.projectNumber" />
+                  <el-table-column label="项目名称" align="center" prop="project.projectName" />
+                  <el-table-column label="承担部门" align="center" prop="undertakingDeptName" />
+                  <el-table-column label="项目负责人" align="center" width="90" prop="leaderUser.nickName" />
+                  <el-table-column label="变更内容" align="center" width="600" prop="content" />
+                  <el-table-column label="登记人" align="center" width="80" prop="registrantUser.nickName" />
+                  <el-table-column label="登记时间" align="center" prop="registerTime" width="100">
+                    <template slot-scope="scope">
+                      <span>{{ parseTime(scope.row.registerTime, '{y}-{m}-{d}') }}</span>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </div>
     <el-dialog title="项目预算" :visible.sync="openBudget" width="1000px" append-to-body>
       <budget-tab :taskForm="taskForm"></budget-tab>
@@ -478,6 +510,7 @@ import BorrowData from '@/views/flowable/form/inProgress/borrowData.vue';
 import BudgetTab from '@/views/flowable/form/projectProcess/budgetTab.vue';
 import achiData from "@/views/flowable/form/inProgress/achiData.vue";
 import choosePeople from '@/views/flowable/form/budget/components/choosePeople.vue'
+import { listProjectChange, getProjectChange, delProjectChange, addProjectChange, updateProjectChange } from "@/api/oa/project/projectChange";
 export default {
   components: { budgetInfo, SafeTab, TechnicalTab, PlanTab, SettleData, BorrowData, BudgetTab, achiData, choosePeople },
   created() {
@@ -485,13 +518,14 @@ export default {
     this.getDeviceList();
     this.getCarList();
     if (this.$route.query) {
-      this.taskForm.formId = this.$route.query.projectId
-      let projectId = this.$route.query.projectId
-      this.getProjectInfo(projectId)
-      this.getProjectWorkList(projectId)
-      this.getProjectCommentList(projectId)
+      this.taskForm.formId = this.$route.query.projectId;
+      let projectId = this.$route.query.projectId;
+      this.getProjectInfo(projectId);
+      this.getProjectWorkList(projectId);
+      this.getProjectCommentList(projectId);
       this.getContractDataList(projectId);
       this.getProjectProgressList(projectId);
+      this.getProjectChangeList(projectId);
     }
   },
   data() {
@@ -522,7 +556,8 @@ export default {
       cars: [],
       drivers: [],
       participates: [],
-      undertakingDept: []
+      undertakingDept: [],
+      projectChangeList: [],
     }
   },
   methods: {
@@ -552,6 +587,11 @@ export default {
         }
       })
     },
+    getProjectChangeList(projectId) {
+      listProjectChange({ pageNum: 1, pageSize: 100, projectId }).then(response => {
+        this.projectChangeList = response.rows;
+      });
+    },
     getUserList() {
       listUser({
         pageNum: 1,