修改项目信息界面

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

@@ -156,6 +156,11 @@ export default {
       type: Array
     }
   },
+  watch:{
+    settleList(val){
+      this.initTable();
+    }
+  },
   data() {
     return {
       settleSum: {},
@@ -183,10 +188,12 @@ export default {
     }
   },
   mounted() {
-    this.initTable();
+    
   },
   methods: {
     initTable() {
+      this.deductionsList = []
+      this.deptSettleList = []
       for (let s of this.settleList) {
         if (s.tableNumber == '0') {
           this.deductionsList.push(s)

oa-ui/src/views/flowable/form/inProgress/settleData.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 14:45:03
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-28 18:35:30
+ * @LastEditTime: 2024-05-30 15:57:17
 -->
 <template>
   <div class="mt20">
@@ -20,11 +20,11 @@
       <el-table-column type="index" label="序号" width="50" />
       <el-table-column label="上报人" prop="reporterName" />
       <el-table-column label="申请时间" prop="reportTime" width="100" />
-      <el-table-column label="综合事务部意见" prop="zhComment" show-overflow-tooltip  width="120" />
-      <el-table-column label="技术质量部意见" prop="jsComment" show-overflow-tooltip  width="120" />
-      <el-table-column label="项目管理部意见" prop="xmComment" show-overflow-tooltip  width="120" />
-      <el-table-column label="承担部门意见" prop="deptComment" show-overflow-tooltip  width="120" />
-      <el-table-column label="经营管理部意见" prop="jyComment" show-overflow-tooltip  width="120" />
+      <el-table-column label="综合事务部意见" prop="zhComment" show-overflow-tooltip width="120" />
+      <el-table-column label="技术质量部意见" prop="jsComment" show-overflow-tooltip width="120" />
+      <el-table-column label="项目管理部意见" prop="xmComment" show-overflow-tooltip width="120" />
+      <el-table-column label="承担部门意见" prop="deptComment" show-overflow-tooltip width="120" />
+      <el-table-column label="经营管理部意见" prop="jyComment" show-overflow-tooltip width="120" />
       <el-table-column label="分管审核意见" prop="managerComment" show-overflow-tooltip width="120" />
       <el-table-column label="总经理意见" prop="gmComment" show-overflow-tooltip width="120" />
       <el-table-column label="操作" fixed="right" header-align="center">
@@ -33,28 +33,33 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-dialog title="结算明细" :visible.sync="open" append-to-body>
-      <el-table :data="summaryList" style="width: 100%">
-        <el-table-column type="index" label="序号" width="50" />
-        <el-table-column prop="content" label="内容" />
-        <el-table-column prop="amount" label="结算金额" />
-        <el-table-column prop="remark" label="备注" />
-      </el-table>
+    <el-dialog title="结算明细" :visible.sync="open" append-to-body width="65%">
+      <settle-print :form="clickRow" :chooseProject="chooseProject" :workList="workList"
+        :settleList="summaryList"></settle-print>
     </el-dialog>
   </div>
 </template>
 
 <script>
+import { getProject } from "@/api/oa/project/project";
 import { listSettle, getSettle, delSettle, addSettle, updateSettle } from "@/api/oa/settle/settle";
+import { listSettleWork } from '@/api/oa/settle/settleWork';
+import { listSettleSummary } from '@/api/oa/settle/settleSummary';
+import { getPrice } from "@/api/oa/price/price";
 import { listDefinition } from "@/api/flowable/definition";
 import { getNextFlowNodeByStart } from "@/api/flowable/todo";
 import { definitionStart } from "@/api/flowable/definition";
 import { todoList } from "@/api/flowable/todo";
 import { MessageBox } from 'element-ui'
-import { getUser } from "@/api/system/user";
+import { listUser, getUser } from "@/api/system/user";
 import { Snowflake } from '@/utils/snowFlake.js'
-import { listSettleSummary } from '@/api/oa/settle/settleSummary'
+import SettleForm from '../settleForm.vue';
+import SettlePrint from '../components/settlePrint.vue';
 export default {
+  components: {
+    SettleForm,
+    SettlePrint
+  },
   props: {
     taskForm: {
       type: Object,
@@ -66,14 +71,31 @@ export default {
       open: false,
       dataList: [],
       definitionList: [], //流程列表
-      summaryList:[]
+      summaryList: [],
+      workList: [],
+      settleList: [],
+      userList:[],
+      chooseProject: {},
+      clickRow: {}
     }
   },
   mounted() {
+    this.getUserList();
     this.getSettleData();
     this.listDefinition();
+    this.getChooseProject();
   },
   methods: {
+    getUserList() {
+      listUser({
+        pageNum: 1,
+        pageSize: 9999
+      }).then(res => {
+        if (res.code == 200) {
+          this.userList = res.rows
+        }
+      })
+    },
     getSettleData() {
       listSettle({ projectId: this.taskForm.formId }).then(res => {
         if (res.code == 200) {
@@ -84,8 +106,33 @@ export default {
         }
       })
     },
+    getChooseProject() {
+      getProject(this.taskForm.formId).then(res => {
+        if (res.data)
+          this.chooseProject = res.data
+      })
+    },
+    getSettleWorkList(settleId) {
+      listSettleWork({ pageNum: 1, pageSize: 9999, settleId }).then(res => {
+        if (res.code == 200) {
+          this.workList = res.rows;
+          for (let work of this.workList) {
+            getPrice(work.priceId).then(res => {
+              if (res.data) {
+                this.$set(work, "scale", res.data.scaleGrade);
+                this.$set(work, "unit", res.data.unit);
+                if (work.groundType == "0") {
+                  work.price = res.data.commonPrice;
+                } else {
+                  work.price = res.data.complexPrice;
+                }
+              }
+            });
+          }
+        }
+      })
+    },
     getReporter(row) {
-      console.log(row);
       getUser(row.reporter).then(res => {
         this.$set(row, 'reporterName', res.data.nickName)
       })
@@ -107,10 +154,25 @@ export default {
       });
     },
     handleLook(row) {
-      console.log(row);
+      this.clickRow = row
+      this.clickRow.zhUserName = this.getUserNickName(row.zhUserId);
+      this.clickRow.jsUserName = this.getUserNickName(row.jsUserId);
+      this.clickRow.xmUserName = this.getUserNickName(row.xmUserId);
+      this.clickRow.deptUserName = this.getUserNickName(row.deptUserId);
+      this.clickRow.jyUserName = this.getUserNickName(row.jyUserId);
+      this.clickRow.managerUserName = this.getUserNickName(row.managerUserId);
+      this.clickRow.gmUserName = this.getUserNickName(row.gmUserId);
       this.getSummaryList(row.settleId)
+      this.getSettleWorkList(row.settleId)
       this.open = true
     },
+    getUserNickName(id){
+      for(let user of this.userList){
+        if(user.userId == id){
+          return user.nickName
+        }
+      }
+    },
     addSettleFlow() {
       let row = this.definitionList[0];
       let formId = new Snowflake(1n, 1n, 0n).nextId().toString();

oa-ui/src/views/flowable/form/projectProcess/inProgress.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-15 09:35:41
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-29 15:31:52
+ * @LastEditTime: 2024-05-30 10:51:38
 -->
 <template>
   <div>
@@ -44,6 +44,15 @@
             }}</el-tag>
           <el-button class="ml10" @click="openCar = true" type="primary" size="mini" icon="el-icon-plus"></el-button> -->
         </el-form-item>
+        <el-form-item label="使用设备：">
+          <el-tooltip class="item" effect="dark" content="直接获取设备申请中的设备,若无车辆,则需要先提交项目的设备申请" placement="top-end">
+            <el-select v-model="form.devices" multiple disabled style="width:90%">
+              <el-option v-for="item in deviceList" :key="item.deviceId" :label="item.name + '【' + (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series + '】' : '')
+        + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place" :value="item.deviceId">
+              </el-option>
+            </el-select>
+          </el-tooltip>
+        </el-form-item>
         <el-row :gutter="20">
           <el-col :span="11">
             <el-form-item label="进场时间：">
@@ -132,9 +141,11 @@ import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate
 import { listProjectProgress, getProjectProgress, addProjectProgress, delProjectProgress } from "@/api/oa/project/projectProgress";
 import { getProject, updateProject } from "@/api/oa/project/project";
 import { getCar } from "@/api/oa/car/car";
-import { listCarApproval, getCarApproval } from '@/api/oa/car/carApproval'
+import { listCarApproval, getCarApproval } from '@/api/oa/car/carApproval';
 import { listUser } from '@/api/system/user';
-import { listCar } from '@/api/oa/car/car'
+import { listCar } from '@/api/oa/car/car';
+import { listDevice, getDevice } from "@/api/oa/device/device";
+import { listDeviceApproval } from "@/api/oa/device/deviceApproval"
 import borrowData from '../inProgress/borrowData.vue';
 import SettleData from '../inProgress/settleData.vue';
 import ChoosePeople from '../budget/components/choosePeople.vue';
@@ -193,6 +204,7 @@ export default {
       budgetId: "",
       userList: [],
       carList: [],
+      deviceList: [],
       participates: [],
       chooseCar: [],
       chooseDriver: [],
@@ -211,6 +223,7 @@ export default {
       this.initProgress();
       this.getUserList();
       this.getCarList();
+      this.getDeviceList();
     }
   },
   mounted() {
@@ -230,7 +243,10 @@ export default {
           if (res.data.drivers) {
             this.form.drivers = (res.data.drivers.split(',')).map(Number);
           }
-          if (!(res.data.cars && res.data.drivers)) {
+          if (res.data.devices) {
+            this.form.devices = (res.data.devices.split(',')).map(Number);
+          }
+          if (!(res.data.cars && res.data.drivers && res.data.devices)) {
             this.getCarAndDriver();
           }
         }
@@ -260,7 +276,6 @@ export default {
     // 通过用车审批表获取车辆和驾驶员信息
     getCarAndDriver() {
       listCarApproval({ projectId: this.taskForm.formId }).then(res => {
-        console.log(res);
         if (res.rows) {
           this.form.drivers = []
           this.form.cars = []
@@ -281,6 +296,21 @@ export default {
           }
         }
       })
+      listDeviceApproval({ projectId: this.taskForm.formId }).then(res => {
+        console.log(res.rows);
+        if (res.rows) {
+          this.form.devices = []
+          for (let data of res.rows) {
+            if (data.devices) {
+              let devices = data.devices.split(',');
+              devices = devices.map(Number);
+              devices.map(item => {
+                this.form.devices.push(Number(item));
+              });
+            }
+          }
+        }
+      })
     },
     addProgressList() {
       this.progressList.push({
@@ -319,11 +349,15 @@ export default {
       this.form.projectId = this.taskForm.formId;
       this.form.cars = this.form.cars.length != 0 ? this.form.cars.join(',') : '';
       this.form.drivers = this.form.drivers.length != 0 ? this.form.drivers.join(',') : '';
+      this.form.devices = this.form.devices.length != 0 ? this.form.devices.join(',') : '';
       // this.participates = this.participates.map(item => item.userId)
       this.form.participates = this.participates.join(',')
       console.log(this.form);
       updateProject(this.form).then(res => {
         this.$message.success("保存成功");
+        this.form.cars = (this.form.cars.split(',')).map(Number);
+        this.form.drivers = (this.form.drivers.split(',')).map(Number);
+        this.form.devices = (this.form.devices.split(',')).map(Number);
       });
     },
     // 查询用户列表
@@ -338,6 +372,15 @@ export default {
         this.carList = res.rows
       })
     },
+    getDeviceList() {
+      listDevice({
+        pageNum: 1,
+        pageSize: 99999999,
+        type: '仪器设备'
+      }).then(res => {
+        this.deviceList = res.rows
+      })
+    },
     submitNextFlow() {
       this.$confirm('项目结束后不可再修改，请问是否确定结束？', '提示', {
         confirmButtonText: '确定',

oa-ui/src/views/flowable/form/projectProcess/safeTab.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-empty description="未进行安全交底" v-if="isEmpty"></el-empty>
     <div v-if="!isEmpty">
-      <h3 class="text-center">{{ form.projectNumber + '-' + form.projectName + ' 安全交底' }}</h3>
+      <h3 class="text-center"><b>{{ form.projectNumber + '-' + form.projectName + ' 安全交底' }}</b></h3>
       <el-form ref="safeForm" :model="form" :rules="rules" label-width="125px" disabled>
         <el-form-item label="项目编号：" prop="projectNumber">
           {{ form.projectNumber }}
@@ -54,6 +54,7 @@
 <script>
 import { listSafe, getSafe, delSafe, addSafe, updateSafe } from "@/api/oa/safe/safe";
 import { listUser } from '@/api/system/user';
+import { getProject } from "@/api/oa/project/project";
 export default {
   props: {
     taskForm: {
@@ -96,8 +97,18 @@ export default {
         if (res.data) {
           this.isEmpty = false;
           this.form = res.data;
-          this.$set(this.form, "projectNumber", this.projectNumber);
-          this.$set(this.form, "projectName", this.projectName);
+          if (this.projectNumber != '' && this.projectName != '') {
+            this.$set(this.form, "projectNumber", this.projectNumber);
+            this.$set(this.form, "projectName", this.projectName);
+          } else {
+            getProject(this.taskForm.formId).then(res => {
+              console.log(res);
+              if (res.data) {
+                this.$set(this.form, "projectNumber", res.data.projectNumber);
+                this.$set(this.form, "projectName", res.data.projectName);
+              }
+            })
+          }
         }
       });
     },

oa-ui/src/views/flowable/form/projectProcess/technicalTab.vue

@@ -2,13 +2,13 @@
  * @Author: ysh
  * @Date: 2024-04-19 15:32:00
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-23 14:35:16
+ * @LastEditTime: 2024-05-30 13:52:57
 -->
 <template>
   <div class="app-container">
     <el-empty description="技术方案未编制" v-if="!haveTechnical"></el-empty>
     <div v-if="haveTechnical">
-      <h3 class="text-center">{{ form.projectNumber + '-' + form.projectName + ' 技术交底' }}</h3>
+      <h3 class="text-center"><b>{{ form.projectNumber + '-' + form.projectName + ' 技术交底' }}</b></h3>
       <el-form ref="technicalForm" :model="form" :rules="rules" label-width="125px" disabled>
         <el-form-item label="项目编号：" prop="projectNumber">
           {{ form.projectNumber }}
@@ -103,7 +103,7 @@
         <el-row>
           <el-col :span="6" :xs="24" :offset="12">
             <el-form-item label="签名" prop="manager">
-              <span class="auditor"> {{ form.managerUser }} </span>
+              <span class="auditor"> {{ form.managerUser? form.managerUser.nickName:''}} </span>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -120,6 +120,7 @@
 <script>
 import technicalForm from "../technicalForm.vue";
 import { listUser } from "@/api/system/user";
+import { getProject } from "@/api/oa/project/project";
 import {
   listTechnical,
   getTechnical,
@@ -171,8 +172,18 @@ export default {
         if (res.data) {
           this.haveTechnical = true;
           this.form = res.data;
-          this.$set(this.form, "projectNumber", this.projectNumber);
-          this.$set(this.form, "projectName", this.projectName);
+          if (this.projectNumber != '' && this.projectName != '') {
+            this.$set(this.form, "projectNumber", this.projectNumber);
+            this.$set(this.form, "projectName", this.projectName);
+          } else {
+            getProject(this.taskForm.formId).then(res => {
+              console.log(res);
+              if (res.data) {
+                this.$set(this.form, "projectNumber", res.data.projectNumber);
+                this.$set(this.form, "projectName", res.data.projectName);
+              }
+            })
+          }
           let data = res.data;
           if (res.data.qualityInspector == null || res.data.qualityInspector == undefined || res.data.qualityInspector == "") {
             data.qualityInspector = []

oa-ui/src/views/flowable/form/settleForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-28 19:08:56
+ * @LastEditTime: 2024-05-30 15:05:58
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -111,8 +111,7 @@
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setFinalDocument">
             </FileUpload>
             <div v-if="taskName != '分管审核' && form.finalDocument" class="upload-list">
-              <el-link :href="`${baseUrl}${'/profile/upload' + form.finalDocument}`" :underline="false"
-                target="_blank">
+              <el-link :href="`${baseUrl}${'/profile/upload' + form.finalDocument}`" :underline="false" target="_blank">
                 <span class="el-icon-document" style="color:#00f;"> {{ getFileName(form.finalDocument) }} </span>
               </el-link>
             </div>
@@ -449,6 +448,7 @@ import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept } from '@/api/system/post.js'
 import SettlePrint from './components/settlePrint.vue';
 import { getDept } from "@/api/system/dept"
+import { getContract } from "@/api/oa/contract/contract";
 import ChooseProject from './components/chooseProject.vue';
 export default {
   components: {
@@ -476,7 +476,7 @@ export default {
   },
   data() {
     return {
-      baseUrl:process.env.VUE_APP_BASE_API,
+      baseUrl: process.env.VUE_APP_BASE_API,
       printOpen: false,
       loading: true,
       drawer: false,
@@ -908,8 +908,8 @@ export default {
       getSettle(this.taskForm.formId).then(res => {
         if (res.data) {
           updateSettle(this.form);
-          this.addSettleWorkFn(settleId);
-          this.addSettleSummaryFn(settleId);
+          this.updateSettleWorkFn(settleId);
+          this.updateSettleSummaryFn(settleId);
         } else {
           addSettle(this.form).then(res => {
             this.addSettleWorkFn(settleId);
@@ -996,13 +996,13 @@ export default {
       }
     },
     setSettleDocument(val) {
-      this.getDoc(val,'settleDocument')
+      this.getDoc(val, 'settleDocument')
     },
     setModifyDocument(val) {
-      this.getDoc(val,'modifyDocument')
+      this.getDoc(val, 'modifyDocument')
     },
     setFinalDocument(val) {
-      this.getDoc(val,'finalDocument')
+      this.getDoc(val, 'finalDocument')
     },
     getDoc(val, name) {
       if (val) {

oa-ui/src/views/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-15 15:48:32
+ * @LastEditTime: 2024-05-30 17:27:56
 -->
 
 <template>
@@ -183,7 +183,7 @@ export default {
           icon: 'lock',
           bgColor: '#0be1bd',
           boxShadow: '0 5px 20px rgba(11,225,189,0.5)',
-          path: '/device'
+          path: '/device/equipment'
         }, {
           id: 7,
           name: '投标管理',
@@ -198,14 +198,15 @@ export default {
           bgColor: '#20B2AA',
           boxShadow: '0 5px 20px rgba(32,178,170,0.5)',
           path: '/staff/people'
-        }, {
-          id: 9,
-          name: '预算管理',
-          icon: 'form',
-          bgColor: '#E64A19',
-          boxShadow: '0 5px 20px rgba(230,74,25,0.5)',
-          path: '/budget'
-        }
+        }, 
+        // {
+        //   id: 9,
+        //   name: '预算管理',
+        //   icon: 'form',
+        //   bgColor: '#E64A19',
+        //   boxShadow: '0 5px 20px rgba(230,74,25,0.5)',
+        //   path: '/budget'
+        // }
       ]
     }
   },

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: 2024-05-29 11:13:40
+ * @LastEditTime: 2024-05-30 17:38:17
 -->
 <template>
   <div class="project-wrapper">
@@ -295,7 +295,9 @@ export default {
     // 查询项目列表
     getList() {
       this.loading = true
-      this.queryParams.undertakingDept = this.deptId
+      if(this.deptId > 104){
+        this.queryParams.undertakingDept = this.deptId
+      }
       listProject(this.queryParams).then(response => {
         this.projectList = response.rows;
         this.total = response.total;
@@ -303,7 +305,6 @@ export default {
         for (let project of this.projectList) {
           getProjectProgress(project.projectId).then(res => {
             if (res.data) {
-              debugger
               let len = res.data.length
               if (len != 0) {
                 this.$set(project, 'percentage', Number(res.data[len - 1].percentage))

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

@@ -7,6 +7,7 @@
     <el-divider></el-divider>
 
     <div class="content">
+      <!-- 项目基本信息 -->
       <div class="box1">
         <div class="title">项目基本信息
           <div class="line"></div>
@@ -142,6 +143,7 @@
           </el-descriptions>
         </div>
       </div>
+      <!-- 项目管理部安排 -->
       <div class="box1 mt20">
         <div class="title">项目管理部安排
           <div class="line"></div>
@@ -204,6 +206,7 @@
           </el-descriptions>
         </div>
       </div>
+      <!-- 任务审核情况  -->
       <div class="box1 mt20">
         <div class="title">任务审核情况
           <div class="line"></div>
@@ -218,7 +221,9 @@
               <div>
                 <el-input disabled type="textarea" v-model="projectComment.jyComment"></el-input>
                 <div class="sign mt10">
-                  <div class="mr20">签名：<span class="auditor">{{ projectComment.jyUser ? projectComment.jyUser.nickName : '' }}</span>
+                  <div class="mr20">签名：<span class="auditor">{{ projectComment.jyUser ? projectComment.jyUser.nickName :
+        ''
+                      }}</span>
                   </div>
                   <div class="ml20"><span>审核时间：{{ projectComment.jyApprovalTime }}</span></div>
                 </div>
@@ -232,7 +237,8 @@
               <div>
                 <el-input disabled type="textarea" v-model="projectComment.manageComment"></el-input>
                 <div class="sign mt10">
-                  <div class="mr20">签名：<span class="auditor">{{ projectComment.managerUser ? projectComment.managerUser.nickName : '' }}</span>
+                  <div class="mr20">签名：<span class="auditor">{{ projectComment.managerUser ?
+        projectComment.managerUser.nickName : '' }}</span>
                   </div>
                   <div class="ml20"><span>审核时间：{{ projectComment.manageApprovalTime }}</span></div>
                 </div>
@@ -255,10 +261,131 @@
           </el-descriptions>
         </div>
       </div>
+
+      <div class="box1 mt20">
+        <div class="title">项目生产情况
+          <div class="line"></div>
+        </div>
+        <div class="info mt20">
+          <el-descriptions class="descriptions" border :column="2" style="text-align: center;">
+            <el-descriptions-item :span="2">
+              <template slot="label">
+                <svg-icon slot="prefix" icon-class="form" />
+                安全交底记录表
+              </template>
+              <el-link type="primary" @click="openSafe = true">安全交底记录表</el-link>
+            </el-descriptions-item>
+            <el-descriptions-item :span="2">
+              <template slot="label">
+                <svg-icon slot="prefix" icon-class="form" />
+                技术交底记录表
+              </template>
+              <el-link type="primary" @click="openTech = true">技术交底记录表</el-link>
+            </el-descriptions-item>
+            <el-descriptions-item :span="2">
+              <template slot="label">
+                <svg-icon slot="prefix" icon-class="equipment" />
+                申请设备
+              </template>
+              <el-select v-model="devices" multiple disabled style="width:100%">
+                <el-option v-for="item in deviceList" :key="item.deviceId" :label="item.name + '【' + (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series + '】' : '')
+        + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place" :value="item.deviceId">
+                </el-option>
+              </el-select>
+            </el-descriptions-item>
+            <el-descriptions-item :span="2">
+              <template slot="label">
+                <svg-icon slot="prefix" icon-class="car" />
+                使用车辆
+              </template>
+              <el-select v-model="cars" multiple disabled style="width:100%">
+                <el-option v-for="item in carList" :label="item.licensePlate + item.brand" :value="item.carId"
+                  :key="item.carId">
+                </el-option>
+              </el-select>
+            </el-descriptions-item>
+            <el-descriptions-item :span="2">
+              <template slot="label">
+                <svg-icon slot="prefix" icon-class="peoples" />
+                驾驶员
+              </template>
+              <el-select v-model="drivers" multiple disabled style="width:100%">
+                <el-option v-for="item in userList" :label="item.nickName" :value="item.userId" :key="item.userId">
+                </el-option>
+              </el-select>
+            </el-descriptions-item>
+            <el-descriptions-item :span="2">
+              <template slot="label">
+                <svg-icon slot="prefix" icon-class="dept" />
+                参与人员
+              </template>
+              <el-select v-model="participates" multiple disabled style="width:100%">
+                <el-option v-for="item in userList" :label="item.nickName" :value="item.userId" :key="item.userId">
+                </el-option>
+              </el-select>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                <svg-icon slot="prefix" icon-class="date" />
+                进场时间
+              </template>
+              {{ project.entryTime }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                <svg-icon slot="prefix" icon-class="date" />
+                撤场时间
+              </template>
+              {{ project.exitTime }}
+            </el-descriptions-item>
+            <el-descriptions-item :span="2">
+              <template slot="label">
+                <svg-icon slot="prefix" icon-class="date" />
+                项目进度
+              </template>
+              <div>
+                <el-table :data="progressList">
+                  <el-table-column type="index" width="50" />
+                  <el-table-column label="截至日期" prop="date" />
+                  <el-table-column label="累计总进度（%）" prop="percentage" />
+                  <el-table-column label="情况说明" prop="situation" />
+                </el-table>
+              </div>
+            </el-descriptions-item>
+            <el-descriptions-item :span="2">
+              <template slot="label">
+                <svg-icon slot="prefix" icon-class="date" />
+                项目借款
+              </template>
+              <borrow-data :taskForm="taskForm"></borrow-data>
+            </el-descriptions-item>
+            <el-descriptions-item :span="2">
+              <template slot="label">
+                <svg-icon slot="prefix" icon-class="date" />
+                成果汇交
+              </template>
+              {{'xxxx'}}
+            </el-descriptions-item>
+            <el-descriptions-item :span="2">
+              <template slot="label">
+                <svg-icon slot="prefix" icon-class="date" />
+                产值结算
+              </template>
+              <settle-data :taskForm="taskForm"></settle-data>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </div>
     <el-dialog title="项目预算" :visible.sync="openBudget" width="1000px" append-to-body>
       <budget-info :taskForm="taskForm" :taskName="''"></budget-info>
     </el-dialog>
+    <el-dialog title="安全交底记录表" :visible.sync="openSafe" width="1000px" append-to-body>
+      <safe-tab :taskForm="taskForm"></safe-tab>
+    </el-dialog>
+    <el-dialog title="技术交底记录表" :visible.sync="openTech" width="1000px" append-to-body>
+      <technical-tab :taskForm="taskForm"></technical-tab>
+    </el-dialog>
   </div>
 </template>
 
@@ -266,23 +393,33 @@
 import { getDept } from "@/api/system/dept";
 import { getUsersDeptLeaderByDept } from '@/api/system/post'
 import { listUser, getUser } from "@/api/system/user";
-import { listProject, getProject, submitProject, modifyProject, delProject } from "@/api/oa/project/project";
+import { getProject } from "@/api/oa/project/project";
 import { listProjectWork, addProjectWork } from "@/api/oa/project/projectWork";
 import { listProjectComment, getProjectComment } from "@/api/oa/project/projectComment";
 import { listProjectProgress, getProjectProgress } from "@/api/oa/project/projectProgress";
 import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
+import { listDevice } from "@/api/oa/device/device";
+import { listCar } from '@/api/oa/car/car';
 import budgetInfo from '../../flowable/form/budget/budgetInfo.vue';
+import SafeTab from '../../flowable/form/projectProcess/safeTab.vue';
+import TechnicalTab from '../../flowable/form/projectProcess/technicalTab.vue';
+import SettleData from '../../flowable/form/inProgress/settleData.vue';
+import BorrowData from '../../flowable/form/inProgress/borrowData.vue';
 export default {
-  components: { budgetInfo },
+  components: { budgetInfo, SafeTab, TechnicalTab, SettleData, BorrowData },
   created() {
     this.getUserList();
+    this.getDeviceList();
+    this.getCarList();
     if (this.$route.query) {
       this.taskForm.formId = this.$route.query.projectId
-      this.getProjectInfo(this.$route.query.projectId)
-      this.getProjectWorkList(this.$route.query.projectId)
-      this.getProjectCommentList(this.$route.query.projectId)
-      this.getContractDataList(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);
     }
   },
   data() {
@@ -292,15 +429,24 @@ export default {
       activeName: '1',
       column: 3,
       userList: [],
+      deviceList: [],
+      carList: [],
       workList: [],
       deptLeaderList: [],
+      progressList: [],
       contractCode: "",
       contractNumber: "",
       openBudget: false,
+      openSafe: false,
+      openTech: false,
       taskForm: {
         formId: ''
       },
-      projectComment: {}
+      projectComment: {},
+      devices: [],
+      cars: [],
+      drivers: [],
+      participates: []
     }
   },
   methods: {
@@ -319,9 +465,20 @@ export default {
             })
             getUsersDeptLeaderByDept({ deptId: Number(dept) }).then(res => {
               this.deptLeaderList.push(res.data.nickName);
-              console.log(this.deptLeaderList);
             })
           }
+          if (this.project.devices) {
+            this.devices = (this.project.devices.split(',')).map(Number)
+          }
+          if (this.project.cars) {
+            this.cars = (this.project.cars.split(',')).map(Number)
+          }
+          if (this.project.drivers) {
+            this.drivers = (this.project.drivers.split(',')).map(Number)
+          }
+          if (this.project.participates) {
+            this.participates = (this.project.participates.split(',')).map(Number)
+          }
         }
       })
     },
@@ -335,6 +492,28 @@ export default {
         }
       })
     },
+    getDeviceList() {
+      listDevice({
+        pageNum: 1,
+        pageSize: 99999999,
+        type: '仪器设备'
+      }).then(res => {
+        this.deviceList = res.rows
+      })
+    },
+    getCarList() {
+      listCar({ pageSize: 9999, pageNum: 1 }).then(res => {
+        this.carList = res.rows
+      })
+    },
+    getProjectProgressList(projectId) {
+      getProjectProgress(projectId).then(res => {
+        if (res.data) {
+          this.progressList = res.data;
+
+        }
+      });
+    },
     // 获取项目相关合同编号
     getContractDataList(projectId) {
       listProjectContract({ projectId }).then(res => {
@@ -365,7 +544,6 @@ export default {
     },
     getProjectCommentList(projectId) {
       getProjectComment(projectId).then(res => {
-        console.log(res);
         if (res.data) {
           this.projectComment = res.data
         }
@@ -382,13 +560,11 @@ export default {
       }
     },
     getUserListName(userIdArr) {
-      debugger
       if (userIdArr) {
         for (let user of userIdArr) {
 
         }
       }
-
     },
     getFileName(name) {
       if (name != null) {