查询勘察项目列表

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

@@ -71,6 +71,21 @@ public class CmcProjectController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询cmc项目列表
+     */
+    @GetMapping("/listInvest")
+    public TableDataInfo listInvest(CmcProject cmcProject)
+    {
+        startPage();
+        List<CmcProject> list = cmcProjectService.selectCmcInvestProjectList(cmcProject);
+        for (CmcProject project : list) {
+            project.setUndertakingDeptName(deptIdToName(project));
+            project.setQualityInspectorName(inspectorIdToName(project));
+        }
+        return getDataTable(list);
+    }
+
     /**
      * 导出cmc项目列表
      */

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcProjectMapper.java

@@ -35,6 +35,14 @@ public interface CmcProjectMapper
      */
     public List<CmcProject> selectCmcProjectList(CmcProject cmcProject);
 
+    /**
+     * 查询cmc勘察项目列表
+     *
+     * @param cmcProject cmc项目
+     * @return cmc项目集合
+     */
+    public List<CmcProject> selectCmcInvestProjectList(CmcProject cmcProject);
+
     /**
      * 新增cmc项目
      * 

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcProjectService.java

@@ -36,6 +36,14 @@ public interface ICmcProjectService
      */
     public List<CmcProject> selectCmcProjectList(CmcProject cmcProject);
 
+    /**
+     * 查询cmc勘察项目列表
+     *
+     * @param cmcProject cmc项目
+     * @return cmc项目集合
+     */
+    public List<CmcProject> selectCmcInvestProjectList(CmcProject cmcProject);
+
     /**
      * 新增cmc项目
      * 

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcProjectServiceImpl.java

@@ -58,6 +58,18 @@ public class CmcProjectServiceImpl implements ICmcProjectService
         return cmcProjectMapper.selectCmcProjectList(cmcProject);
     }
 
+    /**
+     * 查询cmc勘察项目列表
+     *
+     * @param cmcProject cmc项目
+     * @return cmc项目
+     */
+    @Override
+    public List<CmcProject> selectCmcInvestProjectList(CmcProject cmcProject)
+    {
+        return cmcProjectMapper.selectCmcInvestProjectList(cmcProject);
+    }
+
     /**
      * 新增cmc项目
      * 

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml

@@ -116,6 +116,10 @@
         <include refid="selectCmcProjectVo"/>
         <where>
             (p.project_number REGEXP '^[0-9]+W[0-9]' or p.project_number REGEXP '^[0-9]+C[0-9]') AND NOT (p.project_number REGEXP '[/\\*-]')
+            and (case when p.undertaking_dept not like concat('%', '113', '%') then p.undertaking_dept not like concat('%', '113', '%')
+            when p.undertaking_dept is null then p.undertaking_dept is null
+            when p.undertaking_dept like concat('%', '113', '%') then p.undertaking_dept like concat('%', ',', '%')
+            end)
             <if test="projectId != null  and projectId != ''"> and p.project_id = #{projectId}</if>
             <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
             <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
@@ -139,6 +143,33 @@
         order by p.register_time desc, p.project_number desc
     </select>
 
+    <select id="selectCmcInvestProjectList" parameterType="CmcProject" resultMap="CmcProjectResult">
+        <include refid="selectCmcProjectVo"/>
+        <where>
+            (p.project_number REGEXP '^[0-9]+W[0-9]' or p.project_number REGEXP '^[0-9]+C[0-9]') AND NOT (p.project_number REGEXP '[/\\*-]')
+            AND p.undertaking_dept like concat('%', 113, '%')
+            <if test="projectId != null  and projectId != ''"> and p.project_id = #{projectId}</if>
+            <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
+            <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
+            <if test="projectLeader != null "> and p.project_leader = #{projectLeader}</if>
+            <if test="isFinished != null  and isFinished != ''"> and p.is_finished = #{isFinished}</if>
+            <if test="projectSource != null  and projectSource != ''"> and p.project_source = #{projectSource}</if>
+            <if test="partyAId != null  and partyAId != ''"> and p.party_a_id = #{partyAId}</if>
+            <if test="contactPerson != null  and contactPerson != ''"> and p.contact_person = #{contactPerson}</if>
+            <if test="telephone != null  and telephone != ''"> and p.telephone = #{telephone}</if>
+            <if test="projectType != null  and projectType != ''"> and p.project_type = #{projectType}</if>
+            <if test="projectLevel != null  and projectLevel != ''"> and p.project_level = #{projectLevel}</if>
+            <if test="projectRegistrant != null "> and p.project_registrant = #{projectRegistrant}</if>
+            <if test="projectPlanner != null "> and p.project_planner = #{projectPlanner}</if>
+            <if test="siteLeader != null "> and p.site_leader = #{siteLeader}</if>
+            <if test="planTime != null "> and p.plan_time = #{planTime}</if>
+            <if test="entryTime != null "> and p.entry_time = #{entryTime}</if>
+            <if test="exitTime != null "> and p.exit_time = #{exitTime}</if>
+            <if test="participates != null  and participates != ''"> and find_in_set(#{participates}, p.participates)</if>
+        </where>
+        order by p.register_time desc, p.project_number desc
+    </select>
+
     <select id="selectCmcProjectByProjectId" parameterType="String" resultMap="CmcProjectResult">
         <include refid="selectCmcProjectVo"/>
         where p.project_id = #{projectId}

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

@@ -2,7 +2,7 @@
  * @Author: wrh
  * @Date: 2024-01-30 16:37:46
  * @LastEditors: wrh
- * @LastEditTime: 2024-09-06 09:45:24
+ * @LastEditTime: 2024-09-20 16:36:46
  */
 import request from '@/utils/request'
 
@@ -15,6 +15,15 @@ export function listProject(query) {
   })
 }
 
+// 查询cmc勘察项目列表
+export function listInvestProject(query) {
+  return request({
+    url: '/oa/project/listInvest',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询cmc项目详细
 export function getProject(projectId) {
   return request({

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-25 15:05:59
  * @LastEditors: wrh
- * @LastEditTime: 2024-09-19 17:06:19
+ * @LastEditTime: 2024-09-20 09:28:33
 -->
 <template>
   <div>
@@ -165,7 +165,7 @@
               <table border="1">
                 <tr>
                   <td style="width: 120px">车牌号</td>
-                  <td style="width: 100px">油耗</td>
+                  <td style="width: 100px">油耗（元/km）</td>
                   <td style="width: 100px">总里程</td>
                   <td style="width: 110px">折旧成本（天）</td>
                   <td style="width: 110px">预算天数</td>
@@ -674,7 +674,7 @@ export default {
     getChooseCar(val) {
       this.chooseCar = val;
       for (let car of this.chooseCar) {
-        car.mileage = 1.5
+        car.mileage = 1.0
       }
       this.openCar = false;
       this.recalculateCost(val,'expense','carCost');
@@ -771,6 +771,7 @@ export default {
         addBudgetStaff(user);
       }
       for (let car of form.chooseCar) {
+        console.log(form.budgetId);
         car.budgetId = form.budgetId;
         addBudgetCar(car);
       }
@@ -789,21 +790,25 @@ export default {
       updateBudget(form);
       delBudgetStaff(form.budgetId).then(res => {
         for (let user of form.chooseUser) {
+          user.budgetId = form.budgetId;
           addBudgetStaff(user);
         }
       });
       delBudgetCar(form.budgetId).then(res => {
         for (let car of form.chooseCar) {
+          car.budgetId = form.budgetId;
           addBudgetCar(car);
         }
       })
       delBudgetDevice(form.budgetId).then(res => {
         for (let device of form.chooseDevice) {
+          device.budgetId = form.budgetId;
           addBudgetDevice(device);
         }
       })
       delBudgetSettle(form.budgetId).then(res => {
         for (let work of form.contentList) {
+          work.budgetId = form.budgetId;
           addBudgetSettle(work)
         }
         this.$message.success('预算添加成功')

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: wrh
- * @LastEditTime: 2024-08-27 14:34:34
+ * @LastEditTime: 2024-09-20 13:52:12
 -->
 <template>
   <div class="main">
@@ -114,6 +114,7 @@
               <td>岗位工资</td>
               <td>人员成本（天）</td>
               <td>预算天数</td>
+              <td></td>
               <td>金额</td>
               <td>备注</td>
             </tr>
@@ -129,17 +130,20 @@
               <td v-else>
                 {{ user.days }}
               </td>
+              <td></td>
               <td>{{ user.staffCost }}</td>
               <td></td>
             </tr>
             <tr v-if="carLen != 1" style="background-color:#f8f8f9">
               <td :rowspan="carLen">车辆</td>
               <td>车牌号</td>
-              <td>油耗</td>
+              <td>油耗（元/km）</td>
               <td>总里程</td>
               <td>折旧成本（天）</td>
               <td>预算天数</td>
+              <td>过路费</td>
               <td>金额</td>
+              <td>备注</td>
             </tr>
             <tr v-for="car in chooseCar" :key="'car' + car.carId">
               <td>{{ car.car ? car.car.licensePlate : '' }}</td>
@@ -159,8 +163,8 @@
               <td v-else>
                 {{ car.days }}
               </td>
+              <td> {{ car.toll }} </td>
               <td>{{ car.expense }}</td>
-              <td></td>
             </tr>
             <tr v-if="deviceLen != 1" style="background-color:#f8f8f9">
               <td :rowspan="deviceLen">设备</td>
@@ -169,6 +173,7 @@
               <td>品牌</td>
               <td>折旧成本（天）</td>
               <td>预算天数</td>
+              <td></td>
               <td>金额</td>
             </tr>
             <tr v-for="device in chooseDevice" :key="'device' + device.deviceId">
@@ -183,11 +188,12 @@
               <td v-else>
                 {{ device.days }}
               </td>
+              <td></td>
               <td>{{ device.depreciation }}</td>
               <td></td>
             </tr>
             <tr>
-              <td :colspan="6" class="head">间接成本合计</td>
+              <td :colspan="7" class="head">间接成本合计</td>
               <td :colspan="1" class="head">{{ budgetForm.fixCost }}</td>
               <td></td>
             </tr>

oa-ui/src/views/flowable/form/budget/components/budgetForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: wrh
- * @LastEditTime: 2024-04-29 14:34:29
+ * @LastEditTime: 2024-09-19 17:58:29
 -->
 <template>
   <div>
@@ -34,10 +34,11 @@
       <tr>
         <td :rowspan="carLen" class="head">车辆</td>
         <td class="head">车牌号</td>
-        <td class="head">油耗</td>
+        <td class="head">油耗（元/km）</td>
         <td class="head">总里程</td>
         <td class="head">折旧成本（天）</td>
         <td class="head">预算天数</td>
+        <td class="head">过路费</td>
         <td class="head">金额</td>
       </tr>
       <tr v-for="car in chooseCar" :key="'car' + car.carId">
@@ -46,6 +47,7 @@
         <td>{{ car.distance }}</td>
         <td>{{ car.dayCost }}</td>
         <td>{{ car.days }}</td>
+        <td>{{ car.toll }}</td>
         <td>{{ car.expense }}</td>
       </tr>
       <tr>
@@ -66,7 +68,7 @@
         <td>{{ device.depreciation }}</td>
       </tr>
       <tr>
-        <td colspan="6" class="head">间接成本小计</td>
+        <td colspan="7" class="head">间接成本小计</td>
         <td>{{ budgetForm.fixCost }}</td>
       </tr>
       <tr>

oa-ui/src/views/flowable/form/budget/components/budgetTable.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 15:50:41
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-02 15:01:28
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-09-20 10:23:57
 -->
 <template>
   <div>
@@ -64,6 +64,7 @@
               <td>岗位工资</td>
               <td>人员成本（天）</td>
               <td>预算天数</td>
+              <td></td>
               <td>金额</td>
               <td>备注</td>
             </tr>
@@ -74,16 +75,18 @@
               <td>{{ parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) }}</td>
               <!-- <td>{{ user.inOutPrice }}</td> -->
               <td>{{ user.days }}</td>
+              <td></td>
               <td>{{ user.staffCost }}</td>
               <td></td>
             </tr>
             <tr v-if="carLen != 1" style="background-color:#f8f8f9">
               <td :rowspan="carLen" style="background-color:#f8f8f9">车辆</td>
               <td>车牌号</td>
-              <td>油耗</td>
+              <td>油耗（元/km）</td>
               <td>总里程</td>
               <td>折旧成本（天）</td>
               <td>预算天数</td>
+              <td>过路费</td>
               <td>金额</td>
               <td>备注</td>
             </tr>
@@ -93,8 +96,9 @@
               <td>{{ car.distance }}</td>
               <td>{{ car.dayCost }}</td>
               <td>{{ car.days }}</td>
+              <td>{{ car.toll }}</td>
               <td>{{ car.expense }}</td>
-              <td></td>
+              <td>{{ car.remark }}</td>
             </tr>
             <tr v-if="deviceLen != 1" style="background-color:#f8f8f9">
               <td :rowspan="deviceLen" style="background-color:#f8f8f9">设备</td>
@@ -103,6 +107,7 @@
               <td>品牌</td>
               <td>折旧成本（天）</td>
               <td>预算天数</td>
+              <td></td>
               <td>金额</td>
               <td>备注</td>
             </tr>
@@ -112,11 +117,12 @@
               <td>{{ device.brand }}</td>
               <td>{{ device.dayCost }}</td>
               <td>{{ device.days }}</td>
+              <td></td>
               <td>{{ device.depreciation }}</td>
               <td></td>
             </tr>
             <tr>
-              <td :colspan="6" class="head">间接成本合计</td>
+              <td :colspan="7" class="head">间接成本合计</td>
               <td :colspan="1" class="head">{{ budgetForm.fixCost }}</td>
               <td></td>
             </tr>

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

@@ -44,22 +44,23 @@
       <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
       <el-table-column label="项目名称" align="center" prop="project.projectName" />
-      <el-table-column label="备注说明" align="center" prop="submitSituation" />
+      <el-table-column label="备注说明" align="center" :show-overflow-tooltip="true" width="150" prop="submitSituation" />
       <el-table-column label="项目负责人" align="center" prop="leaderUser.nickName" />
-      <el-table-column label="生产部门检查员" align="center" prop="produceUser.nickName" />
-      <el-table-column label="质量检查员" align="center" prop="qualityUser.nickName" />
-      <el-table-column label="技术质量与安全部负责人" align="center" prop="deptUser.nickName" />
-      <el-table-column label="归档人" align="center" prop="archiverUser.nickName" />
+      <!-- <el-table-column label="生产部门检查员" align="center" prop="produceUser.nickName" /> -->
+      <!-- <el-table-column label="质量检查员" align="center" prop="qualityUser.nickName" /> -->
+      <el-table-column label="技术质量与安全部意见" align="center" :show-overflow-tooltip="true" width="150" prop="deptComment" />
+      <el-table-column label="技术质量与安全部负责人" align="center" width="170" prop="deptUser.nickName" />
+      <el-table-column label="归档人" align="center" prop="archiveUser.nickName" />
       <el-table-column label="成果提交日期" align="center" prop="submitTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.submitTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="资料接收时间" align="center" prop="receiveTime" width="180">
+      <!-- <el-table-column label="资料接收时间" align="center" prop="receiveTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.receiveTime, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <!-- <el-table-column label="质量检查时间" align="center" prop="qualityTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.qualityTime, '{y}-{m}-{d}') }}</span>

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

@@ -34,7 +34,6 @@
       <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
       <el-table-column label="项目名称" align="center" prop="project.projectName" />
-      <el-table-column label="接受交底人" align="center" prop="accepterUser.nickName" />
       <el-table-column label="安全交底人" align="center" prop="disclosurerUser.nickName" />
       <!-- <el-table-column label="环境要求" align="center" prop="environmentComment" />
       <el-table-column label="外业要求" align="center" prop="outsideComment" />
@@ -45,6 +44,7 @@
           <span>{{ parseTime(scope.row.disclosureTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="接受交底人" align="center" prop="accepterUser.nickName" />
       <el-table-column label="接受交底时间" align="center" prop="acceptTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.acceptTime, '{y}-{m}-{d}') }}</span>

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

@@ -34,14 +34,14 @@
       <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
       <el-table-column label="项目名称" align="center" prop="project.projectName" />
-      <el-table-column label="接受交底人" align="center" prop="accepterUser.nickName" />
-      <el-table-column label="技术交底人" align="center" prop="disclosurerUser.nickName" />
+      <el-table-column label="技术交底人" align="center" prop="disclosureUser.nickName" />
       <el-table-column label="技术交底意见" align="center" prop="disclosureComment" width="180" show-overflow-tooltip />
       <el-table-column label="技术交底时间" align="center" prop="disclosureTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.disclosureTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="接受交底人" align="center" prop="acceptUser.nickName" />
       <el-table-column label="接受交底时间" align="center" prop="acceptTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.acceptTime, '{y}-{m}-{d}') }}</span>