修改项目结算，新增实际结算总金额

修改人员信息，参与项目

oa-ui/src/components/Pagination/index.vue

@@ -54,7 +54,7 @@ export default {
     },
     autoScroll: {
       type: Boolean,
-      default: true
+      default: false
     },
     hidden: {
       type: Boolean,

oa-ui/src/views/flowable/form/budget/addBudget.vue

@@ -771,7 +771,6 @@ export default {
         addBudgetStaff(user);
       }
       for (let car of form.chooseCar) {
-        console.log(form.budgetId);
         car.budgetId = form.budgetId;
         addBudgetCar(car);
       }

oa-ui/src/views/flowable/form/procure/procureForm.vue

@@ -176,7 +176,6 @@ export default {
     },
     // 保存表单
     async saves() {
-      console.log(this.formTotal);
       if (this.formTotal != 0) {
         if (this.taskName == '编制计划') {
           this.form.planUserId = this.$refs.zhRef.localSignatureUserId;

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

@@ -2,13 +2,13 @@
  * @Author: ysh
  * @Date: 2024-10-10 10:03:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-24 16:45:48
+ * @LastEditTime: 2024-10-25 11:35:32
 -->
 <template>
   <div>
     <el-form-item label="主合同信息" label-width="120px">
       <div v-if="hasContract" v-loading="contractLoading">
-        <el-descriptions border style="margin-top: 10px" :column="2" v-for="item in contractObjList">
+        <el-descriptions border style="margin-top: 10px" :column="2" v-for="item,index in contractObjList" :key="index">
           <el-descriptions-item label="合同名称">
             {{ item.contractName }}
           </el-descriptions-item>
@@ -49,7 +49,7 @@
     </el-form-item>
     <el-form-item label="分包合同信息" label-width="120px">
       <div v-if="hasSubContract" v-loading="subContractLoading">
-        <el-descriptions border style="margin-top: 10px" :column="2" v-for="item in subContractObjList">
+        <el-descriptions border style="margin-top: 10px" :column="2" v-for="item,index in subContractObjList" :key="index">
           <el-descriptions-item label="分包合同名称">
             {{ item.subContractName }}
           </el-descriptions-item>
@@ -112,14 +112,13 @@ export default {
       subContractObjList: [],
       hasContract: true,
       hasSubContract: true,
-      contractLoading: true,
-      subContractLoading: true,
+      contractLoading: false,
+      subContractLoading: false,
     }
   },
   methods: {
     init() {
       const projectId = this.projectId;
-      console.log(projectId);
       this.contractLoading = true;
       this.subContractLoading = true;
       Promise.all([listProjectContract({ projectId }), listProjectSubcontract({ projectId })]).then(async response => {

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
- * @LastEditors: wrh
- * @LastEditTime: 2024-10-22 15:20:01
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-10-25 14:04:14
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -42,8 +42,8 @@
               </el-descriptions-item>
               <el-descriptions-item label="项目级别" label-class-name="my-label">
                 {{
-    chooseProject.projectLevel == "0" ? " 一般项目" : "重大项目"
-  }}
+                  chooseProject.projectLevel == "0" ? " 一般项目" : "重大项目"
+                }}
               </el-descriptions-item>
               <el-descriptions-item label="承担部门" label-class-name="my-label">
                 {{ chooseProject.undertakingDeptName }}
@@ -260,7 +260,7 @@
                 <td style="width: 280px">备注</td>
                 <td style="width: 100px">操作</td>
               </tr>
-              <tr v-for="(  work, index  ) in   settleSumList  " :key="index">
+              <tr v-for="(  work, index  ) in settleSumList  " :key="index">
                 <td>
                   {{ index + 1 }}
                 </td>
@@ -296,7 +296,7 @@
                 <td style="width: 280px">备注</td>
                 <td style="width: 100px">操作</td>
               </tr>
-              <tr v-for="(  dept, index  ) in   deptSettleList  " :key="index">
+              <tr v-for="(  dept, index  ) in deptSettleList  " :key="index" v-if="dept.content != '实际结算总金额'">
                 <td :rowspan="deptSettleList.length" v-if="index == 0">
                   {{ Number(actualSumSettle).toFixed(2) }}
                 </td>
@@ -308,7 +308,7 @@
                   </el-input> -->
                   <el-select v-model="dept.content" placeholder="请选择" filterable clearable style="width:100%;"
                     :disabled="isModify">
-                    <el-option v-for="item  in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
+                    <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
                       :value="item.deptName">
                     </el-option>
                   </el-select>
@@ -405,7 +405,7 @@
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
                   <span class="auditor"> {{ form.managerUserName ? form.managerUserName :
-    getUserName(form.managerUserId) }}
+                    getUserName(form.managerUserId) }}
                   </span>
                 </el-form-item>
               </el-col>
@@ -661,8 +661,8 @@ export default {
         ] = await Promise.all([
           getProject(res.rows[0].projectId),
           listBudget({ projectId: res.rows[0].projectId }),
-          listSettleWork({ settleId: settleId, pageSize: 30 }),
-          listSettleSummary({ settleId, pageSize: 20 })
+          listSettleWork({ settleId: settleId, pageSize: 50 }),
+          listSettleSummary({ settleId, pageSize: 50 })
         ]);
 
         if (projectResponse) {
@@ -713,7 +713,7 @@ export default {
           }
           this.settleSumList = settleSummaryResponse.rows.filter((item) => item.tableNumber == "0");
           this.deptSettleList = settleSummaryResponse.rows.filter(
-            (item) => item.tableNumber == "1"
+            (item) => item.tableNumber == "1" && item.content != '实际结算总金额'
           );
           this.calculateActualSumSettle();
         }
@@ -1054,6 +1054,8 @@ export default {
         item.settleId = settleId;
         addSettleSummary(item);
       }
+      let obj = { settleId: settleId, content: '实际结算总金额', amount: (this.actualSumSettle).toFixed(2), tableNumber: 1 }
+      addSettleSummary(obj)
     },
 
     // 更新数据

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

@@ -590,7 +590,6 @@ export default {
     },
     async confirmExamine() {
       let res = this.common == '0' ? false : true;
-      console.log(res);
       this.$set(this.taskForm.variables, "common", res);
       if (this.taskName == '技术审核') {
         let res = await getUsersDeptLeaderByDept({ deptId: 109 })

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-09-30 15:19:58
+ * @LastEditTime: 2024-10-25 14:05:06
 -->
 <template>
   <div class="app-container">
@@ -291,7 +291,6 @@ export default {
     },
     /**  发起流程申请 */
     async handleStartProcess(row) {
-      console.log(row);
       if (row.name == "绩效审批") {
         let deptId = this.$store.getters.deptId;
         let reportTime = parseTime(new Date(), '{y}-{m}')

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-22 14:50:46
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-08 10:42:03
+ * @LastEditTime: 2024-10-25 15:07:27
 -->
 <template>
   <div class="bg" v-loading="loading">
@@ -270,7 +270,6 @@ export default {
 <style lang="scss" scoped>
 .bg {
   background-color: #F0F2F5;
-  height: 1000px;
 }
 
 .header {
@@ -295,7 +294,7 @@ export default {
 
 .userInfo {
   background-color: #fff;
-  // height: 800px;
+  height: 900px;
   margin-right: 40px;
   padding: 5px;
 
@@ -355,7 +354,8 @@ export default {
 
 .stateInfo {
   background-color: #fff;
-  height: 800px;
+  height: 900px;
+  overflow-y: scroll;
   padding: 10px 30px 0;
 }
 </style>

oa-ui/src/views/oa/staff/participate.vue

@@ -1,57 +1,44 @@
 <!--
  * @Author: wrh
  * @Date: 2024-03-25 17:38:39
- * @LastEditors: wrh
- * @LastEditTime: 2024-07-25 16:02:48
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-10-25 15:25:30
 -->
 <template>
   <div>
-    <!-- <el-table :data="tableData" style="width: 100%" height="660px" :row-style="{height: '60px'}"> -->
-    <!-- <el-table-column type="expand">
-        <template slot-scope="props">
-          <div style="background-color: #F0F2F5;">
-            <el-descriptions direction="vertical" :column="3" border>
-              <el-descriptions-item label="工作内容">XXXXXX</el-descriptions-item>
-              <el-descriptions-item label="工作量">XXXXXX</el-descriptions-item>
-              <el-descriptions-item label="单位" :span="2">km²</el-descriptions-item>
-            </el-descriptions>
-          </div>
-        </template>
-      </el-table-column> -->
-    <!-- <el-table-column label="项目编号" width="100px" prop="projectNumber">
-      </el-table-column>
-      <el-table-column label="项目名称" prop="projectName">
-      </el-table-column>
-      <el-table-column label="项目负责人" width="100px" prop="projectLeaderUser.nickName">
-      </el-table-column>
-      <el-table-column label="承担部门" prop="undertakingDeptName">
-      </el-table-column>
-    </el-table> -->
-    <el-collapse v-model="activeNames" @change="handleChange">
-      <el-collapse-item :name="item.projectNumber" v-for="item in tableData" :key="item.projectNumber">
+    <el-collapse v-model="activeNames" @change="handleChange" accordion>
+      <el-collapse-item :name="item.projectId" v-for="item in tableData" :key="item.projectNumber">
         <template slot="title">
-          <div>
-            <svg-icon icon-class="ArrowRight" class="info-icon"></svg-icon>
-            {{ item.projectNumber + ' ' + ' ' + item.projectName + ' ' + ' ' + item.projectLeaderUser.nickName }}
+          <div :class="{ active: activeNames == item.projectId }">
+            <svg-icon :icon-class="activeNames == item.projectId ? 'ArrowDown' : 'ArrowRight'"
+              class="info-icon"></svg-icon>
+            {{ item.projectNumber + ' ' + ' ' + item.projectName + ' ' + ' ' + getUserName(item.projectLeader) }}
           </div>
         </template>
-        <div style="background-color: #F0F2F5;">
-          <el-descriptions direction="vertical" :column="3" border>
-            <el-descriptions-item label="工作内容">暂无信息，敬请期待</el-descriptions-item>
-            <el-descriptions-item label="工作量">暂无信息，敬请期待</el-descriptions-item>
-            <el-descriptions-item label="单位" :span="2">暂无信息，敬请期待</el-descriptions-item>
-          </el-descriptions>
+        <div class="tables">
+          <el-table :data="workData" style="width: 100%" align="center" v-loading="tableLoading" height="300px">
+            <el-table-column type="index" label="序号" />
+            <el-table-column prop="workType" label="工作类型" />
+            <el-table-column prop="workItem" label="工作项目" />
+            <el-table-column prop="workContent" label="工作内容" />
+            <el-table-column prop="workLoad" label="工作量" />
+          </el-table>
+          <div class="mt10" style="text-align:right;">
+            <el-pagination small layout="total,prev, pager, next" :total="workTotal" :current-page="pageNum"
+              @current-change="changePageNum"></el-pagination>
+          </div>
         </div>
       </el-collapse-item>
     </el-collapse>
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getListByPaticipates" />
+      :autoScroll="false" @pagination="getListByPaticipates" />
   </div>
 </template>
 
 <script>
-
 import { listProject } from "@/api/oa/project/project";
+import { listDeclare } from "@/api/oa/declare/declare"
+import { getDeclare } from "../../../api/oa/declare/declare";
 export default {
   data() {
     return {
@@ -64,7 +51,11 @@ export default {
       // 总条数
       total: 0,
       tableData: [],
-      activeNames: ['1'],
+      activeNames: '',
+      workData: [],
+      workTotal: 0,
+      tableLoading: false,
+      pageNum: 1,
     }
   },
   created() {
@@ -72,7 +63,21 @@ export default {
   },
   methods: {
     handleChange(val) {
-
+      if (val) {
+        this.getDeclareList();
+      }
+    },
+    getDeclareList() {
+      this.tableLoading = true
+      listDeclare({ pageNum: this.pageNum, projectId: this.activeNames, userId: this.$route.query.userId }).then(res => {
+        this.workData = res.rows;
+        this.workTotal = res.total;
+        this.tableLoading = false
+      })
+    },
+    changePageNum(val) {
+      this.pageNum = val;
+      this.getDeclareList();
     },
     getListByPaticipates() {
       this.queryParams.participates = this.$route.query.userId;
@@ -89,4 +94,13 @@ export default {
 .info-icon {
   font-size: 20px;
 }
+
+.active {
+  color: var(--current-color);
+}
+
+.tables {
+  border: 1px solid #e2e1e1;
+  padding: 10px;
+}
 </style>

oa-ui/src/views/oa/staff/projectInfo.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: wrh
  * @Date: 2024-03-25 17:38:39
- * @LastEditors: wrh
- * @LastEditTime: 2024-07-25 15:57:16
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-10-25 14:30:36
 -->
 <template>
   <div>
@@ -17,12 +17,15 @@
             </el-descriptions>
           </div>
         </template>
-      </el-table-column> -->
+</el-table-column> -->
       <el-table-column label="项目编号" width="100px" prop="projectNumber">
       </el-table-column>
       <el-table-column label="项目名称" prop="projectName">
       </el-table-column>
-      <el-table-column label="项目负责人" width="100px" prop="projectLeaderUser.nickName">
+      <el-table-column label="项目负责人" width="100px" prop="projectLeader">
+        <template slot-scope="scope">
+          {{ getUserName(scope.row.projectLeader) }}
+        </template>
       </el-table-column>
       <el-table-column label="承担部门" prop="undertakingDeptName">
       </el-table-column>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-10-11 09:23:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-24 16:01:43
+ * @LastEditTime: 2024-10-25 09:50:41
 -->
 <template>
   <div class="app-container bg">
@@ -85,7 +85,6 @@ export default {
     async getBorrowInfo() {
       let res = await getBorrowStatistic();
       this.borrowInfo = res.data;
-      console.log(res.data);
     },
     async getSettleInfo(){
       let res = await getSettleStatistic();