用车审批合并工会、经营层

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

@@ -37,6 +37,10 @@ public class CmcBudgetSettle extends BaseEntity
     @Excel(name = "系数")
     private Long coefficient;
 
+    /** 地类 */
+    @Excel(name = "地类")
+    private String groundType;
+
     /** 结算金额 */
     @Excel(name = "结算金额")
     private BigDecimal settle;
@@ -95,6 +99,15 @@ public class CmcBudgetSettle extends BaseEntity
     {
         return coefficient;
     }
+    public void setGroundType(String groundType)
+    {
+        this.groundType = groundType;
+    }
+
+    public String getGroundType()
+    {
+        return groundType;
+    }
     public void setSettle(BigDecimal settle) 
     {
         this.settle = settle;
@@ -113,6 +126,7 @@ public class CmcBudgetSettle extends BaseEntity
             .append("priceId", getPriceId())
             .append("workload", getWorkload())
             .append("coefficient", getCoefficient())
+            .append("groundType", getGroundType())
             .append("settle", getSettle())
             .toString();
     }

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

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="priceId"    column="price_id"    />
         <result property="workload"    column="workload"    />
         <result property="coefficient"    column="coefficient"    />
+        <result property="groundType"    column="ground_type"    />
         <result property="settle"    column="settle"    />
         <association property="cmcPrice"    javaType="CmcPrice"         resultMap="CmcPriceResult" />
     </resultMap>
@@ -26,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcBudgetSettleVo">
-        select bs.budget_settle_id, bs.budget_id, bs.price_id, p.work_type, p.work_item, p.sub_item, p.scale_grade, p.unit, p.common_price, p.complex_price, bs.workload, bs.coefficient, bs.settle from cmc_budget_settle as bs
+        select bs.budget_settle_id, bs.budget_id, bs.price_id, p.work_type, p.work_item, p.sub_item, p.scale_grade, p.unit, p.common_price, p.complex_price, bs.workload, bs.coefficient, bs.ground_type, bs.settle from cmc_budget_settle as bs
         left join cmc_price as p on p.id = bs.price_id
     </sql>
 
@@ -37,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="priceId != null "> and bs.price_id = #{priceId}</if>
             <if test="workload != null "> and bs.workload = #{workload}</if>
             <if test="coefficient != null "> and bs.coefficient = #{coefficient}</if>
+            <if test="groundType != null and groundType != ''"> and bs.ground_type = #{groundType}</if>
             <if test="settle != null "> and bs.settle = #{settle}</if>
         </where>
     </select>
@@ -54,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="priceId != null">price_id,</if>
             <if test="workload != null">workload,</if>
             <if test="coefficient != null">coefficient,</if>
+            <if test="groundType != null">ground_type,</if>
             <if test="settle != null">settle,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -62,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="priceId != null">#{priceId},</if>
             <if test="workload != null">#{workload},</if>
             <if test="coefficient != null">#{coefficient},</if>
+            <if test="groundType != null">#{groundType},</if>
             <if test="settle != null">#{settle},</if>
          </trim>
     </insert>
@@ -73,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="priceId != null">price_id = #{priceId},</if>
             <if test="workload != null">workload = #{workload},</if>
             <if test="coefficient != null">coefficient = #{coefficient},</if>
+            <if test="groundType != null">ground_type = #{groundType},</if>
             <if test="settle != null">settle = #{settle},</if>
         </trim>
         where budget_settle_id = #{budgetSettleId}

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
  * @LastEditors: wrh
- * @LastEditTime: 2024-03-27 16:47:27
+ * @LastEditTime: 2024-04-09 14:17:41
 -->
 
 <template>
@@ -35,7 +35,11 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-form-item label="项目编号：" prop="projectId" v-if="taskForm.procDefName == '用车审批'">
+              <el-radio-group v-model="isUnion" v-if="taskName == '用车申请'">
+                <el-radio-button label="工会用车"></el-radio-button>
+                <el-radio-button label="非工会用车"></el-radio-button>
+              </el-radio-group>
+              <el-form-item label="项目编号：" prop="projectId">
                 <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
                   :disabled="taskName != '用车申请'" clearable>
                   <el-option v-for="item in projectList" :key="item.value" :label="item.projectNumber"
@@ -47,7 +51,8 @@
                   }}</el-descriptions-item>
                   <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
                   }}</el-descriptions-item>
-                  <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ? chooseProject.projectLeaderUser.nickName : ''
+                  <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
+                    chooseProject.projectLeaderUser.nickName : ''
                   }}</el-descriptions-item>
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
                     <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
@@ -87,28 +92,31 @@
               </el-row>
               <el-divider></el-divider>
               <!-- 部门审核意见 -->
-              <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px" v-if="taskForm.procDefName == '用车审批'">
+              <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px" v-if="form.dept.deptId > 102">
                 <el-input type="textarea" :rows="2" placeholder="请输入部门审核意见" v-model="form.deptComment"
                   :disabled="taskName != '部门审核'">
                 </el-input>
               </el-form-item>
               <!-- 分管审核意见 -->
-              <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px"
-                v-if="taskForm.procDefName == '用车审批'">
+              <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px" v-if="form.dept.deptId > 102">
                 <el-input type="textarea" :rows="2" placeholder="请输入分管审核意见" v-model="form.managerComment"
                   :disabled="taskName != '分管审核'">
                 </el-input>
               </el-form-item>
               <!-- 工会审核意见 -->
-              <el-form-item label="工会审核意见：" prop="unionComment" label-width="120px"
-                v-if="taskForm.procDefName == '用车审批（工会）'">
+              <el-form-item label="工会审核意见：" prop="unionComment" label-width="120px" v-if="form.dept.deptId == 0">
                 <el-input type="textarea" :rows="2" placeholder="请输入工会审核意见" v-model="form.unionComment"
                   :disabled="taskName != '工会审核'">
                 </el-input>
               </el-form-item>
+              <!-- 总经理审核意见 -->
+              <el-form-item label="总经理审核意见" prop="gmComment" label-width="120px" v-if="form.dept.deptId == 102">
+                <el-input type="textarea" :rows="2" placeholder="请输入总经理审核意见" v-model="form.gmComment"
+                  :disabled="taskName != '总经理审核'">
+                </el-input>
+              </el-form-item>
               <!-- 安排用车意见 -->
-              <el-form-item label="安排用车意见：" prop="dispatchComment" label-width="120px"
-                v-if="taskForm.procDefName == '用车审批'">
+              <el-form-item label="安排用车意见：" prop="dispatchComment" label-width="120px">
                 <el-input type="textarea" :rows="2" placeholder="请输入安排用车意见" v-model="form.dispatchComment"
                   :disabled="taskName != '安排用车'">
                 </el-input>
@@ -179,6 +187,8 @@ export default {
   },
   created() {
     this.form.user.nickName = this.$store.getters.name;
+    this.form.dept.deptId = this.$store.getters.deptId;
+    console.log(this.form.dept.deptId)
     this.form.dept.deptName = this.$store.getters.deptName;
     this.getProjectList();
     this.getCarList();
@@ -196,6 +206,7 @@ export default {
           nickName: '',
         },
         dept: {
+          deptId: '',
           deptName: '',
         },
         applyDate: undefined,
@@ -224,6 +235,7 @@ export default {
       driverList: [],
       chooseProject: {},
       isSelect: false,
+      isUnion: '非工会用车',
       formTotal: 0,
       flowData: {}
     }
@@ -235,11 +247,11 @@ export default {
     // 初始化表单
     initForm() {
       getCarApproval(this.taskForm.formId).then(res => {
-        console.log(res.data)
         if (this.isEmptyObject(res.data)) {
           this.formTotal = 0;
           this.form.user.nickName = this.$store.getters.name;
           this.form.applier = this.$store.getters.userId;
+          this.form.dept.deptId = this.$store.getters.deptId;
           this.form.dept.deptName = this.$store.getters.deptName;
           this.form.applyDate = new Date();
         }
@@ -316,9 +328,11 @@ export default {
       if (this.taskName == '用车申请') {
         getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
           let userId = res.data.userId;
-          if (this.taskForm.procDefName == '用车审批') {
-            this.$set(this.taskForm.variables, "approval", userId);
-          }
+          if (this.isUnion == '非工会用车')
+            this.$set(this.taskForm.variables, "dept", this.form.dept.deptId);
+          else
+            this.$set(this.taskForm.variables, "dept", 0);
+          this.$set(this.taskForm.variables, "approval", userId);
           complete(this.taskForm).then(response => {
             this.$modal.msgSuccess(response.msg);
             this.$emit('goBack')
@@ -430,4 +444,5 @@ export default {
 
 ::v-deep .el-textarea.is-disabled .el-textarea__inner {
   color: #121212 !important;
-}</style>
+}
+</style>