新增结算一键导入功能，修改合同线上评审签名出错的bug

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcSettleController.java

@@ -6,28 +6,18 @@ import java.io.InputStream;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.utils.SnowFlake;
-import com.ruoyi.file.domain.FilesAchievement;
-import com.ruoyi.file.domain.FilesStorage;
 import com.ruoyi.oa.domain.CmcSettle;
-import com.ruoyi.oa.service.ICmcSettleSummaryService;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -92,7 +82,7 @@ public class CmcSettleController extends BaseController
             return AjaxResult.error("文件内容为空！");
         }
         else {
-            File profilePath = new File(profile + "/upload/导入数据");
+            File profilePath = new File(profile + "/upload/项目结算/导入数据");
             if (!profilePath.exists())
                 profilePath.mkdirs();
             File transferFile = new File( profilePath + "/" + file.getOriginalFilename());
@@ -105,17 +95,21 @@ public class CmcSettleController extends BaseController
                 rowNumber = sheetAt.getPhysicalNumberOfRows();
             }
             JSONArray jsonArray = new JSONArray();
-            JSONObject jsonObject = new JSONObject();
             for (int i = 1; i < rowNumber - 1;) {
+                JSONObject jsonObject = new JSONObject();
                 i++;
-                jsonObject.put("priceId", getStringCellValue(sheetAt.getRow(i).getCell(0)));
-                jsonObject.put("content", getStringCellValue(sheetAt.getRow(i).getCell(1)));
-                jsonObject.put("workload", getStringCellValue(sheetAt.getRow(i).getCell(4)));
-                jsonObject.put("groundType", getStringCellValue(sheetAt.getRow(i).getCell(5)));
-                jsonObject.put("coefficient", getStringCellValue(sheetAt.getRow(i).getCell(6)));
-                jsonObject.put("remark", getStringCellValue(sheetAt.getRow(i).getCell(7)));
-                jsonArray.add(jsonObject);
+                String column0 = getStringCellValue(sheetAt.getRow(i).getCell(0));
+                if (column0 != null && !column0.equals("")) {
+                    jsonObject.put("priceId", column0);
+                    jsonObject.put("content", getStringCellValue(sheetAt.getRow(i).getCell(1)));
+                    jsonObject.put("workload", getStringCellValue(sheetAt.getRow(i).getCell(4)));
+                    jsonObject.put("groundType", getStringCellValue(sheetAt.getRow(i).getCell(5)));
+                    jsonObject.put("coefficient", getStringCellValue(sheetAt.getRow(i).getCell(7)));
+                    jsonObject.put("remark", getStringCellValue(sheetAt.getRow(i).getCell(8)));
+                    jsonArray.add(jsonObject);
+                }
             }
+            in.close();
             return AjaxResult.success(jsonArray);
         }
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcPrice.java

@@ -17,6 +17,7 @@ public class CmcPrice extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 结算单价id */
+    @Excel(name = "编号")
     private Long id;
 
     /** 工作类别 */

oa-ui/src/api/oa/settle/settle.js

@@ -50,4 +50,13 @@ export function getSettleStatistic(query) {
     method: 'get',
     params: query
   })
+}
+
+// 导入结算
+export function uploadSettleSheet(data) {
+  return request({
+    url: '/oa/settle/uploadSheet',
+    method: 'post',
+    data: data
+  })
 }

oa-ui/src/views/flowable/form/business/contractForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-30 16:30:04
+ * @LastEditTime: 2025-01-09 14:54:11
 -->
 <template>
   <div class="app-container">
@@ -135,7 +135,7 @@
             <el-col :span="6">
               <el-form-item label="日期：" label-width="120px">
                 <el-date-picker v-model="form.draftTime" :disabled="taskName != '合同拟稿'" type="date"
-                  value-format="yyyy-MM-dd" placeholder="选择日期">
+                  value-format="yyyy-MM-dd" placeholder="选择日期" style="width:190px;">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -177,7 +177,7 @@
                   </el-select>
                 </td>
                 <td>
-                  <el-input v-model="comment.comment" type="textarea" clearable :autosize="{ minRows: 4 }"
+                  <el-input v-model="comment.comment" type="textarea" clearable :autosize="{ minRows: 2 }"
                     :disabled="taskName != '线上会审' || (taskName == '线上会审' && comment.userId != userId)"></el-input>
                 </td>
                 <td @click="clickFile(comment)">
@@ -290,8 +290,6 @@
               </tr>
             </table>
           </el-form-item>
-          <el-form-item label="">
-          </el-form-item>
           <el-divider></el-divider>
           <el-form-item label="分管审批意见" prop="managerComment">
             <el-input v-model="form.managerComment" type="textarea" :autosize="{ minRows: 4 }" placeholder="请输入审批意见"
@@ -307,7 +305,7 @@
               <el-form-item label="日期：" label-width="120px">
                 <!-- <span> {{ form.managerTime ? form.managerTime : managerTime }} </span> -->
                 <el-date-picker v-model="form.managerTime" :disabled="taskName != '分管审核'" type="date"
-                  value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
+                  value-format="yyyy-MM-dd" placeholder="选择日期" style="width:190px;"></el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
@@ -325,7 +323,7 @@
               <el-form-item label="日期：" label-width="120px">
                 <!-- <span> {{ form.gmTime ? form.gmTime : gmTime }} </span> -->
                 <el-date-picker v-model="form.gmTime" :disabled="taskName != '总经理审核'" type="date"
-                  value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
+                  value-format="yyyy-MM-dd" placeholder="选择日期" style="width:190px;"></el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
@@ -659,7 +657,7 @@ export default {
                     comment.commentUser = undefined;
                   }
                   else {
-                    // comment.commentTime = parseTime(new Date(), '{y}-{m}-{d}');
+                    comment.commentTime = parseTime(new Date(), '{y}-{m}-{d}');
                   }
                 }
               }

oa-ui/src/views/flowable/form/business/subContract.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-30 16:30:28
+ * @LastEditTime: 2025-01-09 14:59:44
 -->
 <template>
   <div class="app-container">
@@ -152,7 +152,7 @@
                   </el-select>
                 </td>
                 <td>
-                  <el-input v-model="comment.comment" type="textarea" clearable :autosize="{ minRows: 4 }"
+                  <el-input v-model="comment.comment" type="textarea" clearable :autosize="{ minRows: 2 }"
                     :disabled="taskName != '线上会审' || (taskName == '线上会审' && comment.userId != userId)"></el-input>
                 </td>
                 <!-- 线上会审附件 -->
@@ -658,7 +658,7 @@ export default {
                     comment.commentUser = undefined;
                   }
                   else {
-                    // comment.commentTime = parseTime(new Date(), '{y}-{m}-{d}');
+                    comment.commentTime = parseTime(new Date(), '{y}-{m}-{d}');
                   }
                 }
               }

oa-ui/src/views/flowable/form/components/flowBtn/returnBtn.vue

@@ -2,14 +2,14 @@
  * @Author: ysh
  * @Date: 2024-09-27 15:19:36
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-09 14:12:58
+ * @LastEditTime: 2025-01-09 09:51:00
 -->
 <template>
   <div>
     <el-form ref="taskForm" :model="taskForm" :rules="rules" label-width="80px">
       <el-form-item label="退回节点" prop="targetKey">
         <el-radio-group v-model="taskForm.targetKey">
-          <el-radio-button v-for="item in returnTaskList" :key="item.id" :label="item.id">{{ item.name }}
+          <el-radio-button v-for="item in returnTaskList" :key="item.id" :label="item.id" v-if="item.name != '技术安排'">{{ item.name }} 
           </el-radio-button>
         </el-radio-group>
       </el-form-item>

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-12-31 11:06:44
+ * @LastEditTime: 2025-01-09 11:43:24
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -76,7 +76,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-form-item label="原始上报数据" prop="">
+          <el-form-item label="附件上传" prop="">
             <FileUpload v-if="taskName == '结算发起'" :limit="1" :filePathName="'项目结算/原始数据'"
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="setSettleDocument">
             </FileUpload>
@@ -90,7 +90,7 @@
               </el-link>
             </div>
           </el-form-item>
-          <el-form-item label="经营发展部审核结算单" prop="">
+          <!-- <el-form-item label="经营发展部审核结算单" prop="">
             <FileUpload v-if="taskName == '经营发展部校核'" :limit="1" :filePathName="'项目结算/经营发展部审核结算单'"
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="setModifyDocument">
             </FileUpload>
@@ -117,7 +117,7 @@
                 <span class="el-icon-download">下载文件</span>
               </el-link>
             </div>
-          </el-form-item>
+          </el-form-item> -->
 
           <div class="headers" v-hasRole="['leader', 'business']">
             合同信息
@@ -129,7 +129,7 @@
             <div class="line"></div>
           </div>
           <el-form-item label-width="60px">
-            <el-table :data="budgetList">
+            <el-table :data="budgetList" v-if="budgetList.length > 0">
               <el-table-column prop="budgetSettleId" label="序号" />
               <el-table-column prop="content" label="工作内容" />
               <el-table-column label="具体内容" width="150px">
@@ -154,14 +154,27 @@
               <el-table-column prop="settle" label="金额" />
               <el-table-column prop="remark" label="备注" />
             </el-table>
-            <p style="text-align: right;font-size:18px;padding-right:13%">
+            <p style="text-align: right;font-size:18px;padding-right:13%" v-if="budgetList.length > 0">
               <b>预算内项目结算总金额：{{ budgetSettle }}</b>
             </p>
+            <el-tag type="danger" v-else>
+              未发起项目预算
+            </el-tag>
           </el-form-item>
           <div class="headers">
             项目完成工作量及经费计算
             <div class="line"></div>
           </div>
+          <div class="flex mb10" style="padding-left:80px;">
+            <div style="flex:1">
+              <el-link type="success" :href="`${baseUrl}${'/profile/upload/项目结算/cmc项目结算导入模板.xlsx'}`">
+                结算工作量导入模板下载<i class="el-icon-download"></i>
+              </el-link>
+            </div>
+            <div class="text-right" style="flex:1">
+              <el-button size="mini" type="warning" icon="el-icon-upload2" @click="importOpen = true">一键导入</el-button>
+            </div>
+          </div>
           <el-form-item label-width="60px">
             <table border="1">
               <tr>
@@ -213,7 +226,7 @@
               </td>
               <td>
                 <div style="display: flex">
-                  <el-input-number :precision="2" style="width: 100px" v-model="work.coefficient" clearable
+                  <el-input-number :precision="3" style="width: 100px" v-model="work.coefficient" clearable
                     :disabled="isModify" @blur="calculateSettle(work)" :controls="false"></el-input-number>
                   <el-popover placement="top-start" title="系数备注" width="200" trigger="click">
                     <div v-html="work.noteTip"></div>
@@ -279,7 +292,7 @@
                   </el-input>
                 </td>
                 <td>
-                  <el-input-number :min="0" :precision="2" style="width: 200px" v-model="work.amount" clearable
+                  <el-input-number :min="0" :precision="3" style="width: 200px" v-model="work.amount" clearable
                     :disabled="isModify" :controls="false" @blur="calculateActualSumSettle()"></el-input-number>
                   <!-- {{ work.amount }} -->
                 </td>
@@ -511,6 +524,10 @@
       <return-btn :taskForm="taskForm" :comment="commentByRole()" @goBack="$emit('goBack')" @saves=""
         @cancel="returnOpen = false"></return-btn>
     </el-dialog>
+
+    <el-dialog title="导入结算工作量" :visible.sync="importOpen" width="400px" append-to-body>
+      <settle-import @getDataList="getImportSettleList" @cancel="importOpen = false" ></settle-import>
+    </el-dialog>
   </div>
 </template>
 
@@ -540,6 +557,7 @@ import ChooseProject from "./components/chooseProject.vue";
 import projectContractInfo from "./projectContractInfo.vue";
 import ReturnComment from '@/views/flowable/form/components/flowBtn/returnComment.vue';
 import ReturnBtn from '@/views/flowable/form/components/flowBtn/returnBtn.vue';
+import SettleImport from "./settleImport.vue";
 export default {
   components: {
     flow,
@@ -548,7 +566,8 @@ export default {
     ChooseProject,
     projectContractInfo,
     ReturnComment,
-    ReturnBtn
+    ReturnBtn,
+    SettleImport
   },
   props: {
     taskName: {
@@ -644,6 +663,7 @@ export default {
       projectId: '',
       showAlter: true,
       returnOpen: false,
+      importOpen:false,
     };
   },
   created() {
@@ -1205,6 +1225,13 @@ export default {
       } else if (this.taskName == '董事长批准') {
         return this.form.dszComment
       }
+    },
+    getImportSettleList(val){
+      this.settleWorkList = val;
+      for(let work of this.settleWorkList){
+        this.calculateSettle(work)
+      }
+      this.importOpen = false;
     }
   },
 };
@@ -1218,7 +1245,7 @@ export default {
   font-weight: bold;
   font-size: 18px;
   padding-left: 40px;
-  padding-bottom: 40px;
+  padding-bottom: 20px;
 
   .line {
     position: absolute;

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

@@ -0,0 +1,73 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-01-08 15:53:45
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-01-09 13:58:07
+-->
+<template>
+  <div>
+    <el-upload ref="uploadSettleRef" :action="uploadFileUrl" class="upload-demo" drag :limit="1" :headers="headers"
+      :auto-upload="false" :on-success="handleSuccess">
+      <i class="el-icon-upload"></i>
+      <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+      <div class="el-upload__tip" slot="tip">
+        <div class="el-upload__tip text-center">
+          <span>批量导入项目完成工作量，若无模板，请先</span>
+          <el-link style="font-size:12px;;vertical-align: baseline;" type="primary" @click="downTemplate">下载模板</el-link>
+        </div>
+      </div>
+    </el-upload>
+    <div class="text-center mt20">
+      <el-button type="primary" @click="submitUpload">确 定</el-button>
+      <el-button @click="$emit('cancel')">取 消</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { uploadSettleSheet } from "@/api/oa/settle/settle"
+import { getPrice, getPriceRemarkByWorkType } from "@/api/oa/price/price";
+import { getToken } from "@/utils/auth";
+
+export default {
+  data() {
+    return {
+      baseUrl: process.env.VUE_APP_BASE_API,
+      uploadFileUrl: process.env.VUE_APP_BASE_API + "/oa/settle/uploadSheet", // 上传文件服务器地址
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
+    }
+  },
+  methods: {
+    async handleSuccess(response) {
+      if (response.code == 200) {
+        let list = response.data
+        const traList = list.map(item => ({
+          ...item,
+          coefficient: Number(item.coefficient),
+          groundType: item.groundType == '一般地类' ? '0' : '1',
+          priceId: Number(item.priceId),
+          workload: Number(item.workload),
+        }));
+        for (let i of traList) {
+          let res = await getPrice(i.priceId);
+          i.scale = res.data.scaleGrade;
+          i.unit = res.data.unit;
+          i.price = i.groundType == '1' ? res.data.commonPrice : res.data.complexPrice;
+          
+        }
+        this.$emit('getDataList', traList)
+      }
+    },
+    submitUpload() {
+      this.$refs['uploadSettleRef'].submit();
+    },
+    downTemplate(){
+      window.location.href = `${this.baseUrl}${'/profile/upload/项目结算/cmc项目结算导入模板.xlsx'}`
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -2,6 +2,11 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="18" :xs="24">
+        <div class="mb20" v-if="showAlter">
+          <el-alert title="任务被退回，请修改后重新提交" type="error" :closable="false">
+            <return-comment :taskForm="taskForm" @isReturn="isReturn"></return-comment>
+          </el-alert>
+        </div>
         <el-form ref="form" :model="form" :rules="rules" label-width="130px">
           <el-form-item label="项目编号：" prop="projectId" v-if="taskForm.procDefName == '技术方案'">
             <el-input v-model="chooseProject.projectNumber" placeholder="请输入项目编号" disabled style="width: 300px" />
@@ -76,7 +81,7 @@
               :underline="false" target="_blank">
               <span class="el-icon-document"> {{ getFileName(form.technicalDocument) }} </span>
             </el-link> -->
-            <div v-if="form.technicalDocument && taskName != '方案上传'">
+            <div v-if="form.technicalDocument">
               <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.technicalDocument}`)">
                 {{ getFileName(form.technicalDocument) }}
               </el-link>
@@ -201,6 +206,7 @@
           </el-row>
         </el-form>
         <div style="text-align: center;" v-if="taskName">
+          <el-button type="danger" @click="returnOpen = true" v-show="taskName != '技术安排' && taskName != '方案上传'">退 回</el-button>
           <el-button type="primary" @click="submitForm">提 交</el-button>
         </div>
       </el-col>
@@ -239,6 +245,9 @@
         <el-button type="primary" @click="confirmExamine">确 定</el-button>
       </span>
     </el-dialog>
+    <el-dialog title="退回" :visible.sync="returnOpen" width="40%" append-to-body>
+      <return-btn :taskForm="taskForm" @goBack="$emit('goBack')" @saves="" @cancel="returnOpen = false"></return-btn>
+    </el-dialog>
   </div>
 </template>
 
@@ -252,11 +261,15 @@ import flow from '@/views/flowable/task/todo/detail/flow';
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { getUsersManageLeaderByDept, getUsersDeptLeaderByDept, getUserByPost } from '@/api/system/post'
+import ReturnBtn from './components/flowBtn/returnBtn.vue';
+import ReturnComment from './components/flowBtn/returnComment.vue';
 
 export default {
   components: {
     FlowUser,
-    flow
+    flow,
+    ReturnBtn,
+    ReturnComment,
   },
   name: "Technical",
   props: {
@@ -340,7 +353,9 @@ export default {
       isDocumentValid: true,
       commentOpen: false,
       common: '0',
-      examineLabel: ''
+      examineLabel: '',
+      showAlter:true,
+      returnOpen:false,
     };
   },
   created() {
@@ -615,6 +630,9 @@ export default {
         isShow = (this.taskName == '总工审核' || this.taskName == '');
       return isShow;
     },
+    isReturn(val) {
+      this.showAlter = val
+    }
   }
 };
 </script>

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

@@ -2,7 +2,7 @@
  * @Author: wrh
  * @Date: 2024-08-14 14:24:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-01-03 09:28:39
+ * @LastEditTime: 2025-01-09 09:26:23
 -->
 <template>
   <div class="app-container">
@@ -246,6 +246,10 @@ export default {
       if (this.$store.getters.roles.includes('dept')) {
         this.queryParams.projectLeader = null
       }
+      if (this.$store.getters.userId == 1 ) {
+        this.queryParams.deptId = null
+        this.queryParams.projectLeader = null
+      }
       listDeclare(this.queryParams).then(response => {
         this.declareList = response.rows;
         this.total = response.total;