新增安全交底打印；

修改人员修改、新增的错误；
修改预算中，重新选择人员重新计算值等。

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

@@ -219,8 +219,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="postLevel != null and postLevel != ''">post_level,</if>
  			<if test="salaryLevel != null and salaryLevel != ''">salary_level,</if>
 			<if test="operatorLevel != null and operatorLevel != ''">operator_level,</if>
- 			<if test="entryDate != null and entryDate != ''">entry_date,</if>
- 			<if test="birthday != null and birthday != ''">birthday,</if>
+ 			<if test="entryDate != null">entry_date,</if>
+ 			<if test="birthday != null">birthday,</if>
  			<if test="age != null and age != ''">age,</if>
 			<if test="idCard != null">id_card,</if>
 			<if test="nativePlace != null">native_place,</if>
@@ -254,8 +254,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="postLevel != null and postLevel != ''">#{postLevel},</if>
  			<if test="salaryLevel != null and salaryLevel != ''">#{salaryLevel},</if>
 			<if test="operatorLevel != null and operatorLevel != ''">#{operatorLevel},</if>
- 			<if test="entryDate != null and entryDate != ''">#{entryDate},</if>
- 			<if test="birthday != null and birthday != ''">#{birthday},</if>
+ 			<if test="entryDate != null">#{entryDate},</if>
+ 			<if test="birthday != null">#{birthday},</if>
  			<if test="age != null and age != ''">#{age},</if>
 			<if test="idCard != null">#{idCard},</if>
 			<if test="nativePlace != null">#{nativePlace},</if>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-25 15:05:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-01 09:46:19
+ * @LastEditTime: 2024-08-01 14:13:16
 -->
 <template>
   <div>
@@ -105,9 +105,7 @@
             <el-breadcrumb-item>选择项目</el-breadcrumb-item>
             <el-breadcrumb-item>{{ projectForm.projectNumber }}</el-breadcrumb-item>
             <el-breadcrumb-item>{{ projectForm.projectName }}</el-breadcrumb-item>
-            <el-breadcrumb-item>{{ projectForm.projectLeaderUser
-        ? projectForm.projectLeaderUser.nickName
-        : "" }}</el-breadcrumb-item>
+            <el-breadcrumb-item>{{ getUserName(projectForm.projectLeader) }}</el-breadcrumb-item>
           </el-breadcrumb>
           <el-form ref="form2" :model="peopleForm" style="padding: 20px 100px 0">
             <!-- 选择人员 -->
@@ -138,13 +136,6 @@
                   <td>{{ 1780 }}</td>
                   <td>{{ user.salary.salary }}</td>
                   <td>{{ parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) }}</td>
-                  <!-- <td>
-                    <el-input
-                      v-model="user.inOutPrice"
-                      placeholder="请输入进出场单价"
-                      @change="calculateUserTotal(user)"
-                    ></el-input>
-                  </td> -->
                   <td>
                     <el-input v-model="user.days" placeholder="请输入天数" @blur="calculateUserTotal(user)"></el-input>
                   </td>
@@ -156,8 +147,10 @@
                 </tr>
               </table>
             </el-form-item>
+            <div class="mb20" style="color:red">tips:人员成本=(基础工资+岗位工资)/21.75，固定工资中的年功工资暂忽略不计，绩效工资计入直接成本，津贴补贴、五险一金扣除暂未考虑
+            </div>
+
 
-            <div style="color:red">tips:人员成本=(基础工资+岗位工资)/21.75，固定工资中的年功工资暂忽略不计，绩效工资计入直接成本，津贴补贴、五险一金扣除暂未考虑</div>
             <!-- 选择车辆 -->
             <el-form-item label="选择车辆：">
               <span v-if="chooseCar.length != 0">
@@ -200,6 +193,8 @@
                 </tr>
               </table>
             </el-form-item>
+
+
             <!-- 选择设备 -->
             <el-form-item label="选择设备：">
               <span v-if="chooseDevice.length != 0">
@@ -670,6 +665,7 @@ export default {
     getChooseUser(val) {
       this.chooseUser = val;
       this.openPeople = false;
+      this.recalculateCost(val,'staffCost','staffCost');
     },
     getChooseCar(val) {
       this.chooseCar = val;
@@ -677,10 +673,23 @@ export default {
         car.mileage = 1.5
       }
       this.openCar = false;
+      this.recalculateCost(val,'expense','carCost');
     },
     getChooseDevice(val) {
       this.chooseDevice = val;
       this.openDevice = false;
+      this.recalculateCost(val,'depreciation','deviceCost');
+    },
+    recalculateCost(arr, name, formName) {
+      let sum = arr.reduce((accumulator, item) => {
+        // 检查 carCost 属性是否存在且为数字（或可转换为数字）  
+        if (item[name] != null && !isNaN(Number(item[name]))) {
+          return accumulator + Number(item[name]);
+        }
+        return accumulator;
+      }, 0);
+      this.$set(this.budgetForm, formName, sum.toFixed(2));
+      this.getFixCost();
     },
     getUserSalary(userId) {
       getSalary(userId).then(res => {

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-07-24 16:09:37
+ * @LastEditTime: 2024-08-01 14:50:10
 -->
 <template>
   <div class="app-container">
@@ -11,7 +11,7 @@
         <h2 class="text-center"><b>承接合同评审表</b></h2>
         <el-divider></el-divider>
         <el-form ref="form" :model="form" :rules="rules" label-width="130px" :disabled="formDisabled">
-          <el-row :gutter="20">
+          <el-row :gutter="20">择
             <el-col :span="12" :xs="24">
               <el-form-item label="投标项目名称：" prop="tenderId">
                 <el-button type="primary" size="mini" @click="tbOpen = true"
@@ -1027,12 +1027,8 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.isTenderIdValid = this.validateTenderId(this.form.tenderId);
+      // this.isTenderIdValid = this.validateTenderId(this.form.tenderId);
       this.isDocumentValid = this.validateDocument(this.form.contractDocument)
-      if (!this.isTenderIdValid) {
-        // tenderId无效，阻止提交  
-        return;
-      }
       if (!this.isDocumentValid) {
         return;
       }

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

@@ -0,0 +1,160 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-07-30 16:56:08
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-31 17:39:52
+-->
+<template>
+  <div>
+    <div id="printSafe">
+      <h2 class="text-center title">环境、职业健康安全、信息安全管理交底记录表</h2>
+      <table border="1">
+        <tr>
+          <td :colspan="1" class="fontbold">项目名称</td>
+          <td :colspan="4">{{ form.projectName }}</td>
+          <td :colspan="2" class="fontbold">项目编号</td>
+          <td :colspan="2">{{ form.projectNumber }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">承担部门</td>
+          <td :colspan="4">{{ getDeptName(form.undertakingDept) }}</td>
+          <td :colspan="2" class="fontbold">项目负责人</td>
+          <td :colspan="2">{{ getUserName(form.projectLeader) }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">接受交底人</td>
+          <td :colspan="8">{{ getUserName(form.disclosureAccepter) }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">环境管理要求</td>
+          <td :colspan="8" style="white-space: pre-wrap;">{{ form.environmentComment }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">安全生产与职业健康要求</td>
+          <td :colspan="8" style="white-space: pre-wrap;">{{ form.outsideComment }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">信息安全管理要求</td>
+          <td :colspan="8" style="white-space: pre-wrap;">{{ form.insideComment }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">安全交底意见</td>
+          <td :colspan="4">{{ form.disclosureComment }}</td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{
+            getUserName(form.disclosurer) }}</span></td>
+          <td :colspan="2" style="text-align:left;width:240px;">日期：{{ form.disclosureTime }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">接受交底意见</td>
+          <td :colspan="4">{{ form.acceptComment }}</td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">
+            签名：<span class="auditor">{{ getUserName(form.disclosureAccepter) }}</span>
+          </td>
+          <td :colspan="2" style="text-align:left;width:240px;">日期：{{ form.acceptTime }}</td>
+        </tr>
+      </table>
+    </div>
+    <div class="text-center mt20">
+      <el-button type="primary" v-print="print">确认打印</el-button>
+      <el-button @click="$emit('cancel')">取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    form: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      settleSum: {},
+      deptSettleList: [],
+      deductionsList: [],
+      actualSumSettle: '',
+      undertakingDept: [],
+      print: {
+        id: 'printSafe',
+        popTitle: '环境、职业健康安全、信息安全管理交底记录表', // 打印配置页上方标题
+        extraHead: '', //最上方的头部文字，附加在head标签上的额外标签,使用逗号分隔
+        preview: false, // 是否启动预览模式，默认是false（开启预览模式，可以先预览后打印）
+        previewTitle: '', // 打印预览的标题（开启预览模式后出现）,
+        previewPrintBtnLabel: '', // 打印预览的标题的下方按钮文本，点击可进入打印（开启预览模式后出现）
+        zIndex: '', // 预览的窗口的z-index，默认是 20002（此值要高一些，这涉及到预览模式是否显示在最上面）
+        previewBeforeOpenCallback() { }, //预览窗口打开之前的callback（开启预览模式调用）
+        previewOpenCallback() { }, // 预览窗口打开之后的callback（开启预览模式调用）
+        beforeOpenCallback() { }, // 开启打印前的回调事件
+        openCallback() { }, // 调用打印之后的回调事件
+        closeCallback() { }, //关闭打印的回调事件（无法确定点击的是确认还是取消）
+        url: '',
+        standard: '',
+        extraCss: ''
+      }
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+table {
+  /*边框*/
+  /* border: 1px solid black; */
+  width: 90%;
+  // text-align: center;
+  border-collapse: collapse;
+  margin: 0 auto;
+
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+  td {
+    padding: 5px;
+    // line-height: 30px;
+  }
+}
+
+.header {
+  font-family: '黑体';
+  font-size: 16px;
+  font-weight: bold;
+  line-height: 30px;
+}
+
+.bg {
+  background-color: #eee;
+  -webkit-print-color-adjust: exact;
+}
+
+.title {
+  font-family: '黑体';
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 30px;
+}
+
+.fontbold {
+  font-weight: bold;
+  min-width: 150px;
+  text-align: center;
+}
+
+.conment-width {
+  // max-width: 200px;
+}
+
+
+@page {
+  size: auto;
+  /* 去除页脚 */
+  margin-bottom: 0;
+  // 横向A4
+  // size:A4 landscape;
+}
+
+@media print {
+  #print table {
+    width: 100%;
+  }
+}
+</style>

oa-ui/src/views/flowable/form/finance/borrowForm.vue

@@ -279,7 +279,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <div style="text-align: center;">
+        <div style="text-align: center;" v-if="taskName !=''">
           <el-button type="primary" @click="submitForm">提 交</el-button>
         </div>
       </el-col>

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

@@ -2,6 +2,7 @@
   <div class="app-container" v-loading="loading">
     <el-empty description="未进行安全交底" v-if="isEmpty"></el-empty>
     <div v-if="!isEmpty">
+      <el-button type="success" @click="openPrint = true">打印</el-button>
       <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">
@@ -60,6 +61,9 @@
         </el-row>
       </el-form>
     </div>
+    <el-dialog title="安全交底表格预览" :visible.sync="openPrint" width="65%" append-to-body>
+      <safe-print :form="form"></safe-print>
+    </el-dialog>
   </div>
 </template>
 
@@ -67,7 +71,9 @@
 import { listSafe, getSafe, delSafe, addSafe, updateSafe } from "@/api/oa/safe/safe";
 import { listUser } from '@/api/system/user';
 import { getProject } from "@/api/oa/project/project";
+import safePrint from '../components/safePrint.vue';
 export default {
+  components: { safePrint },
   props: {
     taskForm: {
       type: Object,
@@ -101,7 +107,8 @@ export default {
       form: {},
       rules: {},
       userList: [],
-      loading:false
+      loading:false,
+      openPrint:false,
     }
   },
   mounted() {
@@ -123,6 +130,8 @@ export default {
               if (res.data) {
                 this.$set(this.form, "projectNumber", res.data.projectNumber);
                 this.$set(this.form, "projectName", res.data.projectName);
+                this.$set(this.form, "projectLeader", res.data.projectLeader);
+                this.$set(this.form, "undertakingDept", res.data.undertakingDept);
                 this.loading = false
               }
             })

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

@@ -117,9 +117,9 @@
           <el-table-column label="学历" align="center" key="degree" prop="degree" :formatter="formatterDegree"
             v-if="columns[12].visible" />
           <el-table-column label="籍贯" align="center" key="nativePlace" prop="nativePlace" v-if="columns[13].visible" />
-          <el-table-column label="政治面貌" align="center" key="politicalAffiliation" :formatter="formatterPoliticalAffiliation" prop="politicalAffiliation"
-            v-if="columns[14].visible" />
-          <el-table-column label="民族" align="center" key="ethnic" prop="ethnic"  v-if="columns[15].visible" />
+          <el-table-column label="政治面貌" align="center" key="politicalAffiliation"
+            :formatter="formatterPoliticalAffiliation" prop="politicalAffiliation" v-if="columns[14].visible" />
+          <el-table-column label="民族" align="center" key="ethnic" prop="ethnic" v-if="columns[15].visible" />
 
           <el-table-column label="合同签订" align="center" key="contractSign" prop="contractSign" v-if="columns[7].visible"
             :show-overflow-tooltip="true">
@@ -227,14 +227,14 @@
             </el-form-item>
             <el-form-item label="入职年月" prop="entryDate">
               <el-date-picker v-model="form.entryDate" type="month" placeholder="请输入入职年月" style="width:100%;"
-                value-format="yyyy-MM" />
+                format="yyyy-MM" />
             </el-form-item>
             <el-form-item label="合同签订" prop="contractSign">
-              <el-date-picker v-model="form.contractSign" type="month" placeholder="请输入合同签订" style="width:100%;"
+              <el-date-picker v-model="form.contractSign" type="date" placeholder="请输入合同签订" style="width:100%;"
                 value-format="yyyy-MM-dd" />
             </el-form-item>
             <el-form-item label="合同期满" prop="contractExpire">
-              <el-date-picker v-model="form.contractExpire" type="month" placeholder="请输入合同期满" style="width:100%;"
+              <el-date-picker v-model="form.contractExpire" type="date" placeholder="请输入合同期满" style="width:100%;"
                 value-format="yyyy-MM-dd" />
             </el-form-item>
             <el-form-item label="出生年月" prop="birthday">
@@ -728,12 +728,16 @@ export default {
     },
 
     getBirthdayByIdCard(idCard) {
-      // 使用 substring() 方法和 split() 方法提取出生年月日信息
-      const birthday = [idCard.substr(6, 4), idCard.substr(10, 2), idCard.substr(12, 2)].join('-')
-      // 使用 Date 对象的 toISOString() 方法将出生年月日信息转换为日期格式
-      const date = new Date(birthday);
-      const formattedDate = this.parseTime(date, '{y}-{m}-{d}')
-      return formattedDate;
+      if (idCard) {
+        // 使用 substring() 方法和 split() 方法提取出生年月日信息
+        const birthday = [idCard.substr(6, 4), idCard.substr(10, 2), idCard.substr(12, 2)].join('-')
+        // 使用 Date 对象的 toISOString() 方法将出生年月日信息转换为日期格式
+        const date = new Date(birthday);
+        const formattedDate = this.parseTime(date, '{y}-{m}-{d}')
+        return formattedDate;
+      }else{
+        return null
+      }
     },
     getAgeByIdCard(idCard) {
       const sexAndAge = {}
@@ -741,7 +745,7 @@ export default {
       const userCard = idCard
       //如果用户身份证号码为undefined则返回空
       if (!userCard) {
-        return sexAndAge
+        return ''
       }
       // 获取出生日期
       const yearBirth = userCard.substring(6, 10)
@@ -791,10 +795,10 @@ export default {
       return aSalaryLevel - bSalaryLevel;
     },
     formatterDegree(row) {
-      let v = this.selectDictLabel(this.dict.type.sys_user_degree,row.degree)
+      let v = this.selectDictLabel(this.dict.type.sys_user_degree, row.degree)
       return v
     },
-    formatterPoliticalAffiliation(row){
+    formatterPoliticalAffiliation(row) {
       let v = this.selectDictLabels(this.dict.type.sys_user_political, row.politicalAffiliation, ',')
       return v
     }