瀏覽代碼

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

余思翰 11 月之前
父節點
當前提交
0c9ea35495
共有 2 個檔案被更改,包括 47 行新增7 行删除
  1. 1
    1
      oa-ui/src/utils/request.js
  2. 46
    6
      oa-ui/src/views/oa/project/info.vue

+ 1
- 1
oa-ui/src/utils/request.js 查看文件

17
   // axios中请求配置有baseURL选项,表示请求URL公共部分
17
   // axios中请求配置有baseURL选项,表示请求URL公共部分
18
   baseURL: process.env.VUE_APP_BASE_API,
18
   baseURL: process.env.VUE_APP_BASE_API,
19
   // 超时
19
   // 超时
20
-  timeout: 10000
20
+  timeout: 300000 //5分钟
21
 })
21
 })
22
 
22
 
23
 // request拦截器
23
 // request拦截器

+ 46
- 6
oa-ui/src/views/oa/project/info.vue 查看文件

420
           </el-descriptions>
420
           </el-descriptions>
421
         </div>
421
         </div>
422
       </div>
422
       </div>
423
+
424
+      <div class="box1 mt20">
425
+        <div class="title">项目变更记录
426
+          <div class="line"></div>
427
+        </div>
428
+        <div class="info mt20">
429
+          <el-descriptions class="descriptions xmsc" border :column="2" style="text-align: center;">
430
+            <el-descriptions-item :span="2">
431
+              <template slot="label">
432
+                <svg-icon slot="prefix" icon-class="form" />
433
+                变更记录表
434
+              </template>
435
+              <div>
436
+                <el-table :data="projectChangeList">
437
+                  <el-table-column type="index" label="序号" width="55" align="center" />
438
+                  <el-table-column label="项目编号" align="center" width="80" prop="project.projectNumber" />
439
+                  <el-table-column label="项目名称" align="center" prop="project.projectName" />
440
+                  <el-table-column label="承担部门" align="center" prop="undertakingDeptName" />
441
+                  <el-table-column label="项目负责人" align="center" width="90" prop="leaderUser.nickName" />
442
+                  <el-table-column label="变更内容" align="center" width="600" prop="content" />
443
+                  <el-table-column label="登记人" align="center" width="80" prop="registrantUser.nickName" />
444
+                  <el-table-column label="登记时间" align="center" prop="registerTime" width="100">
445
+                    <template slot-scope="scope">
446
+                      <span>{{ parseTime(scope.row.registerTime, '{y}-{m}-{d}') }}</span>
447
+                    </template>
448
+                  </el-table-column>
449
+                </el-table>
450
+              </div>
451
+            </el-descriptions-item>
452
+          </el-descriptions>
453
+        </div>
454
+      </div>
423
     </div>
455
     </div>
424
     <el-dialog title="项目预算" :visible.sync="openBudget" width="1000px" append-to-body>
456
     <el-dialog title="项目预算" :visible.sync="openBudget" width="1000px" append-to-body>
425
       <budget-tab :taskForm="taskForm"></budget-tab>
457
       <budget-tab :taskForm="taskForm"></budget-tab>
478
 import BudgetTab from '@/views/flowable/form/projectProcess/budgetTab.vue';
510
 import BudgetTab from '@/views/flowable/form/projectProcess/budgetTab.vue';
479
 import achiData from "@/views/flowable/form/inProgress/achiData.vue";
511
 import achiData from "@/views/flowable/form/inProgress/achiData.vue";
480
 import choosePeople from '@/views/flowable/form/budget/components/choosePeople.vue'
512
 import choosePeople from '@/views/flowable/form/budget/components/choosePeople.vue'
513
+import { listProjectChange, getProjectChange, delProjectChange, addProjectChange, updateProjectChange } from "@/api/oa/project/projectChange";
481
 export default {
514
 export default {
482
   components: { budgetInfo, SafeTab, TechnicalTab, PlanTab, SettleData, BorrowData, BudgetTab, achiData, choosePeople },
515
   components: { budgetInfo, SafeTab, TechnicalTab, PlanTab, SettleData, BorrowData, BudgetTab, achiData, choosePeople },
483
   created() {
516
   created() {
485
     this.getDeviceList();
518
     this.getDeviceList();
486
     this.getCarList();
519
     this.getCarList();
487
     if (this.$route.query) {
520
     if (this.$route.query) {
488
-      this.taskForm.formId = this.$route.query.projectId
489
-      let projectId = this.$route.query.projectId
490
-      this.getProjectInfo(projectId)
491
-      this.getProjectWorkList(projectId)
492
-      this.getProjectCommentList(projectId)
521
+      this.taskForm.formId = this.$route.query.projectId;
522
+      let projectId = this.$route.query.projectId;
523
+      this.getProjectInfo(projectId);
524
+      this.getProjectWorkList(projectId);
525
+      this.getProjectCommentList(projectId);
493
       this.getContractDataList(projectId);
526
       this.getContractDataList(projectId);
494
       this.getProjectProgressList(projectId);
527
       this.getProjectProgressList(projectId);
528
+      this.getProjectChangeList(projectId);
495
     }
529
     }
496
   },
530
   },
497
   data() {
531
   data() {
522
       cars: [],
556
       cars: [],
523
       drivers: [],
557
       drivers: [],
524
       participates: [],
558
       participates: [],
525
-      undertakingDept: []
559
+      undertakingDept: [],
560
+      projectChangeList: [],
526
     }
561
     }
527
   },
562
   },
528
   methods: {
563
   methods: {
552
         }
587
         }
553
       })
588
       })
554
     },
589
     },
590
+    getProjectChangeList(projectId) {
591
+      listProjectChange({ pageNum: 1, pageSize: 100, projectId }).then(response => {
592
+        this.projectChangeList = response.rows;
593
+      });
594
+    },
555
     getUserList() {
595
     getUserList() {
556
       listUser({
596
       listUser({
557
         pageNum: 1,
597
         pageNum: 1,

Loading…
取消
儲存