Merge branch 'master' of http://oa.sccehui.com:6101/cmc-coding/cmc-oa

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-18 17:38:50
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-18 19:00:46
+ * @LastEditTime: 2024-08-20 16:33:37
 -->
 <template>
   <div>
@@ -70,6 +70,12 @@ import { listPartyA, getPartyA, delPartyA, addPartyA, updatePartyA } from "@/api
 
 export default {
   name: "PartyA",
+  props: {
+    projectSource: {
+      type: String,
+      default: '2'
+    }
+  },
   data() {
     return {
       // 遮罩层
@@ -112,10 +118,20 @@ export default {
   created() {
     this.getList();
   },
+  watch: {
+    projectSource() {
+      this.getList();
+    }
+  },
   methods: {
     /** 查询cmc业主单位列表 */
     getList() {
       this.loading = true;
+      if (this.projectSource == '0') {
+        this.queryParams.partyAName = '中国电建集团成都勘测设计研究院有限公司'
+      } else {
+        this.queryParams.partyAName = null
+      }
       listPartyA(this.queryParams).then(response => {
         this.partyAList = response.rows;
         this.total = response.total;

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
- * @LastEditors: wrh
- * @LastEditTime: 2024-08-13 13:56:20
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-08-20 16:34:35
 -->
 <template>
   <div class="project-wrapper">
@@ -38,12 +38,12 @@
       </el-form-item>
       <el-form-item label="甲方单位" prop="partyAId">
         <el-select v-model="addForm.partyAId" filterable placeholder="请选择" disabled style="width: 100%;">
-          <el-option v-for="item in partyAList" :key="item.value" :label="item.partyAName"
-            :value="item.partyAId" :disabled="disabled">
+          <el-option v-for="item in partyAList" :key="item.value" :label="item.partyAName" :value="item.partyAId"
+            :disabled="disabled">
           </el-option>
         </el-select>
         <el-button type="primary" @click="partyAOpen = true" size="mini"
-          v-if="$route.query.taskName == '项目登记'" >选择单位</el-button>
+          v-if="$route.query.taskName == '项目登记'">选择单位</el-button>
       </el-form-item>
       <el-form-item label="联系人：" prop="contactPerson">
         <el-input v-model="addForm.contactPerson"></el-input>
@@ -93,9 +93,9 @@
     <el-dialog title="选择合同" :visible.sync="openContract" width="70%" append-to-body>
       <choose-contract @choose="setContract" @close="openContract = false"></choose-contract>
     </el-dialog>
-    
-    <el-dialog title="选择甲方单位" :visible.sync="partyAOpen" width="70%" append-to-body>
-      <choose-party-a @confirm="confirmPartyA"></choose-party-a>
+
+    <el-dialog title="选择甲方单位" :visible.sync="partyAOpen" width="60%" append-to-body>
+      <choose-party-a @confirm="confirmPartyA" :projectSource="addForm.projectSource"></choose-party-a>
     </el-dialog>
   </div>
 </template>

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-07-15 09:29:00
+ * @LastEditTime: 2024-08-20 10:44:03
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -673,17 +673,18 @@ export default {
         if (settleWorkResponse) {
           this.settleWorkList = settleWorkResponse.rows;
           for (let work of this.settleWorkList) {
-            getPrice(work.priceId).then((settleWorkResponse) => {
-              if (settleWorkResponse.data) {
-                this.setValue(work, "scale", settleWorkResponse.data.scaleGrade);
-                this.setValue(work, "unit", settleWorkResponse.data.unit);
-                if (work.groundType == "0") {
-                  work.price = settleWorkResponse.data.commonPrice;
-                } else {
-                  work.price = settleWorkResponse.data.complexPrice;
+            if(work.priceId)
+              getPrice(work.priceId).then((settleWorkResponse) => {
+                if (settleWorkResponse.data) {
+                  this.setValue(work, "scale", settleWorkResponse.data.scaleGrade);
+                  this.setValue(work, "unit", settleWorkResponse.data.unit);
+                  if (work.groundType == "0") {
+                    work.price = settleWorkResponse.data.commonPrice;
+                  } else {
+                    work.price = settleWorkResponse.data.complexPrice;
+                  }
                 }
-              }
-            });
+              });
           }
         }
         // 结算汇总里的扣除明细以及部门结算金额

oa-ui/src/views/flowable/form/work/declareForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-08-16 09:16:36
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-16 16:24:17
+ * @LastEditTime: 2024-08-19 11:05:07
 -->
 <template>
   <div class="app-container">
@@ -255,9 +255,10 @@ export default {
       })
     },
     async approveForm() {
-      updateDeclare(this.form);
       const params = { taskId: this.taskForm.taskId };
       if (this.taskName == '项目负责人审核') {
+        this.form.checkStatus = '1';
+        updateDeclare(this.form);
         let resData = await getUsersDeptLeader({ userId: this.form.userId });
         if (resData.data) {
           this.$set(this.taskForm.variables, "approval", resData.data.userId);
@@ -266,6 +267,8 @@ export default {
           })
         }
       } else if (this.taskName == '部门负责人审核') {
+        this.form.auditStatus = '1';
+        updateDeclare(this.form);
         this.$set(this.taskForm.variables, "approval", this.form.userId);
         getNextFlowNode(params).then(() => {
           this.handleComplete(this.taskForm);
@@ -273,6 +276,8 @@ export default {
       }
     },
     confirmForm() {
+      this.form.confirmStatus = '1';
+      updateDeclare(this.form);
       const params = { taskId: this.taskForm.taskId };
       getNextFlowNode(params).then(() => {
         this.handleComplete(this.taskForm);

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

@@ -17,18 +17,40 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <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>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="finishedList" border @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true" />
-      <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true" />
+    <el-table v-loading="loading" :data="tableData" border @selection-change="handleSelectionChange">
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
+      <el-table-column type="expand">
+        <template slot-scope="props">
+          <el-timeline>
+            <el-timeline-item v-for="(process, index) in props.row.children" :key="index"
+              :timestamp="process.createTime" :color="'#0bbd87'">
+              <el-card>
+                <el-descriptions :column="5" border>
+                  <el-descriptions-item label="任务节点">{{ process.taskName }}</el-descriptions-item>
+                  <el-descriptions-item label="流程发起人">{{ process.startUserName }}
+                    <el-tag type="info" size="mini">
+                      {{ process.startDeptName }}
+                    </el-tag></el-descriptions-item>
+                  <el-descriptions-item label="接受时间">{{ process.createTime }}</el-descriptions-item>
+                  <el-descriptions-item label="审批时间">{{ process.finishTime }}</el-descriptions-item>
+                  <el-descriptions-item label="耗时">{{ process.duration }}</el-descriptions-item>
+                </el-descriptions>
+              </el-card>
+            </el-timeline-item>
+          </el-timeline>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true" />
+      <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true" /> -->
       <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true" />
+      <el-table-column label="项目编号" align="center" prop="projectName" :formatter="formatProjectName" />
       <el-table-column label="任务节点" align="center" prop="taskName" />
       <el-table-column label="流程发起人" align="center">
         <template slot-scope="scope">
@@ -47,7 +69,8 @@
           <el-button size="mini" type="text" icon="el-icon-tickets"
             @click="handleFlowRecord(scope.row)">办理进度</el-button>
           <el-button size="mini" type="text" icon="el-icon-tickets" @click="handleFlowNote(scope.row)">表单信息</el-button>
-          <el-button size="mini" type="text" icon="el-icon-refresh-left" @click="handleRevoke(scope.row)" :disabled="beDisabled(scope.row)">撤回
+          <el-button size="mini" type="text" icon="el-icon-refresh-left" @click="handleRevoke(scope.row)"
+            :disabled="beDisabled(scope.row)">撤回
           </el-button>
         </template>
       </el-table-column>
@@ -121,12 +144,28 @@ export default {
       formOpen: false,
       // 当前点击的行数据
       clickRow: {},
-      detailsOpen:false
+      detailsOpen: false,
     };
   },
   created() {
     this.getList();
   },
+  computed: {
+    tableData() {
+      const processed = [];
+      const map = {};
+      this.finishedList.forEach(item => {
+        if (!map[item.procInsId]) {
+          map[item.procInsId] = { ...item, children: [] };
+          processed.push(map[item.procInsId]);
+        } else {
+          map[item.procInsId].children.push(item);
+        }
+      });
+      console.log(processed);
+      return processed;
+    },
+  },
   methods: {
     /** 查询流程定义列表 */
     getList() {
@@ -223,10 +262,10 @@ export default {
         }
       })
     },
-    beDisabled(row){
-      if(row.procDefName == '项目流转' && row.taskName == '项目安排'){
+    beDisabled(row) {
+      if (row.procDefName == '项目流转' && row.taskName == '项目安排') {
         return true
-      }else{
+      } else {
         return false
       }
     },
@@ -304,7 +343,23 @@ export default {
       }).then(response => {
         this.download(response.msg);
       })
+    },
+    formatProjectName(row){
+      if(row.projectNumber && row.projectName)
+        return row.projectNumber + '-' + row.projectName
+      else
+        return '无'
     }
   }
 };
 </script>
+<style lang="scss" scoped>
+.timeline-table {
+  border-collapse: collapse;
+
+  td {
+    padding: 8px;
+  }
+
+}
+</style>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-24 10:21:34
+ * @LastEditTime: 2024-08-20 10:58:56
 -->
 <template>
   <div class="app-container">
@@ -32,14 +32,15 @@
     <el-table v-loading="loading" :data="myProcessList" border @selection-change="handleSelectionChange">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column label="流程状态" align="center" width="100">
+      <el-table-column label="流程状态" align="center" prop="finishTime" width="100">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.finishTime == null" size="mini">进行中</el-tag>
+          <el-tag type="warning" v-if="scope.row.finishTime == null" size="mini">进行中</el-tag>
           <el-tag type="success" v-if="scope.row.finishTime != null" size="mini">已完成</el-tag>
         </template>
       </el-table-column>
       <!-- <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true" /> -->
       <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true" />
+      <el-table-column label="项目编号" align="center" prop="projectName" :formatter="formatProjectName" />
       <!-- <el-table-column label="流程类别" align="center" prop="category" width="100px" /> -->
       <!-- <el-table-column label="流程版本" align="center" width="80px">
         <template slot-scope="scope">
@@ -76,34 +77,6 @@
     <el-dialog :title="title" :visible.sync="open" width="400px" append-to-body>
       <progress-tree :definitionList="definitionList" @confirm="handleStartProcess"
         @close="open = false"></progress-tree>
-      <!-- <el-form :model="queryProcessParams" ref="queryProcessForm" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="名称" prop="name">
-          <el-input v-model="queryProcessParams.name" placeholder="请输入名称" clearable size="small"
-            @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleProcessQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetProcessQuery">重置</el-button>
-        </el-form-item>
-      </el-form> -->
-      <!-- <el-table v-loading="processLoading" fit :data="definitionList" border>
-        <el-table-column label="流程名称" align="center" prop="name" />
-        <el-table-column label="流程版本" align="center">
-          <template slot-scope="scope">
-            <el-tag size="medium">v{{ scope.row.version }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="流程分类" align="center" prop="category" />
-        <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
-
-          <template slot-scope="scope">
-            <el-button size="mini" type="text" icon="el-icon-edit-outline"
-              @click="handleStartProcess(scope.row)">发起流程</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination v-show="processTotal > 0" :total="processTotal" :page.sync="queryProcessParams.pageNum"
-        :limit.sync="queryProcessParams.pageSize" @pagination="listDefinition" /> -->
     </el-dialog>
     <el-dialog title="流程进度" :visible.sync="detailsOpen" append-to-body width="600px">
       <el-scrollbar style="height: 600px;">
@@ -174,7 +147,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         name: null,
         category: null,
         key: null,
@@ -236,6 +209,14 @@ export default {
       this.loading = true;
       myProcessList(this.queryParams).then(response => {
         this.myProcessList = response.data.records;
+        this.myProcessList.sort((a, b) => {
+          // 如果有结束时间，则返回1，表示a应该排在b之后  
+          if (a.finishTime) return 1;
+          // 如果b有结束时间，则返回-1，表示a应该排在b之前  
+          if (b.finishTime) return -1;
+          // 如果都没有结束时间，则返回0，表示它们的顺序不变  
+          return 0;
+        })
         this.total = response.data.total;
         this.loading = false;
       });
@@ -287,6 +268,19 @@ export default {
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
+    // 排序
+    handleSortChange({ column, prop, order }) {
+      if (prop === 'finishTime') {
+        this.myProcessList.sort((a, b) => {
+          // 如果有结束时间，则排在后面  
+          if (a.finishTime && !b.finishTime) return 1;
+          // 如果没有结束时间，则排在前面  
+          if (!a.finishTime && b.finishTime) return -1;
+          // 如果都有或都没有结束时间，则保持原有顺序（或根据其他规则排序）  
+          return 0;
+        })
+      }
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.open = true;
@@ -496,6 +490,12 @@ export default {
       }).then(response => {
         this.download(response.msg);
       })
+    },
+    formatProjectName(row) {
+      if (row.projectNumber && row.projectName)
+        return row.projectNumber + '-' + row.projectName
+      else
+        return '无'
     }
   }
 };

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

@@ -29,6 +29,7 @@
       <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" />
+      <el-table-column label="项目编号" align="center" prop="projectName" :formatter="formatProjectName" />
       <el-table-column label="当前节点" align="center" prop="taskName" />
       <!-- <el-table-column label="流程版本" align="center">
         <template slot-scope="scope">
@@ -252,6 +253,12 @@ export default {
         this.$modal.msgSuccess("删除成功");
       })
     },
+    formatProjectName(row){
+      if(row.projectNumber && row.projectName)
+        return row.projectNumber + '-' + row.projectName
+      else
+        return '无'
+    }
   }
 };
 </script>

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-07-23 16:54:28
+ * @LastEditTime: 2024-08-20 11:01:48
 -->
 
 <template>
@@ -88,6 +88,7 @@
           <el-table v-loading="taskLoading" :data="todoList" height="400px">
             <el-table-column type="index" label="序号" width="55" align="center" />
             <el-table-column label="流程名称" align="center" prop="procDefName" />
+      <el-table-column label="项目编号" align="center" prop="projectName" :formatter="formatProjectName" show-overflow-tooltip />
             <el-table-column label="当前节点" align="center" prop="taskName" />
             <el-table-column label="流程发起人" align="center">
               <template slot-scope="scope">
@@ -104,18 +105,7 @@
             </el-table-column>
           </el-table>
         </div>
-        <!-- <div class="calendar-warpper"> -->
-        <!-- <Calendar></Calendar> -->
-        <!-- <el-calendar v-model="times"> -->
-        <!-- </el-calendar> -->
-        <!-- </div> -->
       </el-col>
-      <!-- <el-col :span="8" :xs="24">
-        <div class="header">XXXX</div>
-        <div class="project-content">
-
-        </div>
-      </el-col> -->
     </el-row>
 
     <el-dialog title="" :visible.sync="noticeOpen" width="750px" append-to-body>
@@ -386,6 +376,12 @@ export default {
       }
       return path
     },
+    formatProjectName(row){
+      if(row.projectNumber && row.projectName)
+        return row.projectNumber + '-' + row.projectName
+      else
+        return '无'
+    }
   }
 }
 </script>

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

@@ -36,22 +36,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['oa:borrow:add']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['oa:borrow:edit']">修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['oa:borrow:remove']">删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          v-hasPermi="['oa:borrow:export']">导出</el-button>
-      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -108,11 +92,15 @@
 import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/oa/borrow/borrow";
 import { listProject } from '@/api/oa/project/project';
 import BorrowForm from '../../flowable/form/finance/borrowForm.vue';
+import { mapGetters } from 'vuex'
 export default {
   name: "Borrow",
   components: {
     BorrowForm
   },
+  computed: {
+    ...mapGetters(['roles','deptId']),
+  },
   data() {
     return {
       // 遮罩层
@@ -158,7 +146,7 @@ export default {
         xmTime: null,
         managerTime: null,
         zjlTime: null,
-        lendTime: null
+        lendTime: null,
       },
       // 表单参数
       form: {},
@@ -179,6 +167,10 @@ export default {
     /** 查询cmc借款申请列表 */
     getList() {
       this.loading = true;
+      if(this.roles.some(element => element === "dept")){
+        this.queryParams.applyDept = this.deptId;
+        // this.queryParams.undertakingDept = this.deptId;
+      }
       listBorrow(this.queryParams).then(response => {
         this.borrowList = response.rows;
         this.total = response.total;

oa-ui/src/views/oa/car/approval.vue

@@ -65,7 +65,7 @@
           <span>{{ parseTime(scope.row.beginDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束日期" align="center" prop="endDate" >
+      <el-table-column label="结束日期" align="center" prop="endDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -98,10 +98,14 @@
 import { listCarApproval, getCarApproval, delCarApproval, addCarApproval, updateCarApproval } from "@/api/oa/car/carApproval";
 import { listProject } from '@/api/oa/project/project';
 import carForm from '../../flowable/form/oa/carForm.vue';
+import { mapGetters } from 'vuex'
 
 export default {
   components: { carForm },
   name: "CarApproval",
+  computed: {
+    ...mapGetters(['roles', 'deptId']),
+  },
   data() {
     return {
       // 遮罩层
@@ -173,6 +177,9 @@ export default {
     /** 查询cmc用车审批列表 */
     getList() {
       this.loading = true;
+      if (this.roles.some(element => element === "dept")) {
+        this.queryParams.useDept = this.deptId;
+      }
       listCarApproval(this.queryParams).then(response => {
         this.carApprovalList = response.rows;
         this.total = response.total;

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: wrh
  * @Date: 2024-08-14 14:24:11
- * @LastEditors: wrh
- * @LastEditTime: 2024-08-14 15:11:29
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-08-19 11:47:08
 -->
 <template>
   <div class="app-container">
@@ -22,19 +22,8 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="工作项目" prop="workItem">
-        <el-input
-          v-model="queryParams.workItem"
-          placeholder="请输入工作项目"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="填报时间" prop="submitTime">
-        <el-date-picker clearable
-          v-model="queryParams.submitTime"
-          type="date"
-          value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.submitTime" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择填报时间">
         </el-date-picker>
       </el-form-item>
@@ -78,14 +67,8 @@
         >删除</el-button>
       </el-col> -->
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['oa:declare:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:declare:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -102,24 +85,29 @@
       <el-table-column label="工天" align="center" prop="workLoad" />
       <el-table-column label="工天单价" align="center" prop="price" />
       <el-table-column label="系数" align="center" prop="coefficient" />
+      <el-table-column label="预估绩效" align="center">
+        <template slot-scope="scope">
+          {{ predictMoney(scope.row) }}
+        </template>
+      </el-table-column>
       <el-table-column label="一审状态" align="center" prop="checkStatus">
         <template slot-scope="scope">
-          <span>{{ scope.row.checkStatus == '0' ? '待审核' : '已审核' }}</span>
+          <el-tag :type="formartType(scope.row.checkStatus)">{{ formatFn(scope.row, 'checkStatus') }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="二审状态" align="center" prop="auditStatus">
         <template slot-scope="scope">
-          <span>{{ scope.row.auditStatus == '0' ? '待审核' : '已审核' }}</span>
+          <el-tag :type="formartType(scope.row.auditStatus)">{{ formatFn(scope.row, 'auditStatus') }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="填报时间" align="center" prop="submitTime" width="180">
+      <el-table-column label="确认状态" align="center" prop="confirmStatus">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.submitTime, '{y}-{m}-{d}') }}</span>
+          <el-tag :type="formartType(scope.row.confirmStatus)">{{ formatFn(scope.row, 'confirmStatus') }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="确认状态" align="center" prop="confirmStatus">
+      <el-table-column label="填报时间" align="center" prop="submitTime" width="180">
         <template slot-scope="scope">
-          <span>{{ scope.row.confirmStatus == '0' ? '待确认' : '已确认' }}</span>
+          <span>{{ parseTime(scope.row.submitTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -141,14 +129,9 @@
         </template>
       </el-table-column> -->
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改工作填报对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -163,7 +146,7 @@
           <el-input v-model="form.workItem" placeholder="请输入工作项目" />
         </el-form-item>
         <el-form-item label="工作内容">
-          <editor v-model="form.workContent" :min-height="192"/>
+          <editor v-model="form.workContent" :min-height="192" />
         </el-form-item>
         <el-form-item label="工天" prop="workLoad">
           <el-input v-model="form.workLoad" placeholder="请输入工天" />
@@ -175,10 +158,7 @@
           <el-input v-model="form.coefficient" placeholder="请输入系数" />
         </el-form-item>
         <el-form-item label="填报时间" prop="submitTime">
-          <el-date-picker clearable
-            v-model="form.submitTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.submitTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择填报时间">
           </el-date-picker>
         </el-form-item>
@@ -301,7 +281,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.formId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -343,18 +323,42 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const formIds = row.formId || this.ids;
-      this.$modal.confirm('是否确认删除工作填报编号为"' + formIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除工作填报编号为"' + formIds + '"的数据项？').then(function () {
         return delDeclare(formIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
       this.download('oa/declare/export', {
         ...this.queryParams
       }, `declare_${new Date().getTime()}.xlsx`)
+    },
+    formatFn(row, type) {
+      if (type == 'confirmStatus') {
+        if (row[type] && row[type] == '1') {
+          return '已确认'
+        } else {
+          return '待确认'
+        }
+      }
+      if (row[type] && row[type] == '1') {
+        return '已审核'
+      } else {
+        return '待审核'
+      }
+    },
+    formartType(val) {
+      if (val && val == '1')
+        return 'success'
+      else
+        return 'warning'
+    },
+    predictMoney(row){
+      let result = parseFloat(row.price * row.workLoad * row.coefficient)
+      return result.toFixed(2)
     }
   }
 };

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

@@ -141,9 +141,16 @@
                 </el-table>
               </div>
             </el-descriptions-item>
+            <el-descriptions-item :span="3">
+              <template slot="label">
+                <svg-icon slot="prefix" icon-class="business" />
+                资料提交要求
+              </template>
+              {{ project.projectRequest }}
+            </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
-                <svg-icon slot="prefix" icon-class="edit" />
+                <svg-icon slot="prefix" icon-class="excel" />
                 项目备注
               </template>
               {{ project.remark }}