设备名称列表

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

@@ -73,30 +73,9 @@ public class CmcCarApprovalController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcCarApproval cmcCarApproval)
     {
-        return toAjax(cmcCarApprovalService.insertCmcCarApproval(cmcCarApproval));
-    }
-
-    /**
-     * 提交用车审批表
-     */
-    @Log(title = "用车审批表", businessType = BusinessType.INSERT)
-    @PostMapping( "/submit")
-    public AjaxResult submit(@RequestParam("form")String formData)
-    {
-        JSONObject formDataJson = JSONObject.parse(formData);
-        CmcCarApproval cmcCarApproval = new CmcCarApproval();
-        cmcCarApproval.setCarApplyId(formDataJson.getString("formId"));
         cmcCarApproval.setApplier(getLoginUser().getUserId());
         cmcCarApproval.setUseDept(getLoginUser().getDeptId());
-        cmcCarApproval.setApplyDate(DateUtils.getNowDate());
-        cmcCarApproval.setProjectId(formDataJson.getString("projectId"));
-        cmcCarApproval.setApplyReason(formDataJson.getString("applyReason"));
-        cmcCarApproval.setPassengers(formDataJson.getInteger("passengers"));
-        cmcCarApproval.setBeginDate(formDataJson.getDate("beginDate"));
-        cmcCarApproval.setEndDate(formDataJson.getDate("endDate"));
-        cmcCarApproval.setDays(formDataJson.getLong("days"));
-        cmcCarApprovalService.insertCmcCarApproval(cmcCarApproval);
-        return AjaxResult.success("提交用车审批表成功");
+        return toAjax(cmcCarApprovalService.insertCmcCarApproval(cmcCarApproval));
     }
 
     /**

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

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.oa;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.utils.DateUtils;
@@ -48,6 +49,16 @@ public class CmcDeviceController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询cmc设备名称列表
+     */
+    @GetMapping("/nameList")
+    public AjaxResult getNameList()
+    {
+        List<Map<String, Object>> list = cmcDeviceService.selectCmcDeviceNameList();
+        return success(list);
+    }
+
     /**
      * 导出cmc设备信息列表
      */

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

@@ -126,13 +126,13 @@ public class CmcPriceController extends BaseController
      * 根据比例等级查询出单位、一般地类、复杂地类
      */
     @GetMapping( "/price")
-    public AjaxResult getPriceInfo(@Param("workItem")String workItem, @Param("subItem")String subItem, @Param("scaleGrade")String scaleGrade, @Param("priceType")String priceType)
+    public AjaxResult getPriceInfo(@Param("workItem")String workItem, @Param("subItem")String subItem, @Param("scaleGrade")String scaleGrade, @Param("groundType")String groundType)
     {
         List<CmcPrice> cmcPriceList = cmcPriceService.selectCmcPriceByScaleGrade(workItem, subItem, scaleGrade);
         JSONObject price = new JSONObject();
         price.put("id", cmcPriceList.get(0).getId());
         price.put("unit", cmcPriceList.get(0).getUnit());
-        if (priceType.equals("一般地类"))
+        if (groundType.equals("0"))
             price.put("price", cmcPriceList.get(0).getCommonPrice());
         else
             price.put("price", cmcPriceList.get(0).getComplexPrice());

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

@@ -95,6 +95,10 @@ public class CmcCarApproval extends BaseEntity
     @Excel(name = "分管审批意见")
     private String managerComment;
 
+    /** 申请用途 */
+    @Excel(name = "申请用途")
+    private String carUsage;
+
     /** 工会审批人 */
     @Excel(name = "工会审批人")
     private Long unionUserId;
@@ -308,6 +312,15 @@ public class CmcCarApproval extends BaseEntity
     {
         return managerComment;
     }
+    public void setCarUsage(String carUsage)
+    {
+        this.carUsage = carUsage;
+    }
+
+    public String getCarUsage()
+    {
+        return carUsage;
+    }
     public void setUnionUserId(Long unionUserId)
     {
         this.unionUserId = unionUserId;

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

@@ -1,6 +1,8 @@
 package com.ruoyi.oa.mapper;
 
 import java.util.List;
+import java.util.Map;
+
 import com.ruoyi.oa.domain.CmcDevice;
 
 /**
@@ -27,6 +29,13 @@ public interface CmcDeviceMapper
      */
     public List<CmcDevice> selectCmcDeviceList(CmcDevice cmcDevice);
 
+    /**
+     * 查询cmc设备名称集合
+     *
+     * @return cmc设备名称集合
+     */
+    public List<Map<String,Object>> selectCmcDeviceNameList();
+
     /**
      * 新增cmc设备信息
      * 

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

@@ -1,6 +1,8 @@
 package com.ruoyi.oa.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.ruoyi.oa.domain.CmcDevice;
 
 /**
@@ -27,6 +29,13 @@ public interface ICmcDeviceService
      */
     public List<CmcDevice> selectCmcDeviceList(CmcDevice cmcDevice);
 
+    /**
+     * 查询cmc设备名称集合
+     *
+     * @return cmc设备名称集合
+     */
+    public List<Map<String,Object>> selectCmcDeviceNameList();
+
     /**
      * 新增cmc设备信息
      * 

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

@@ -1,6 +1,8 @@
 package com.ruoyi.oa.service.impl;
 
 import java.util.List;
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.oa.mapper.CmcDeviceMapper;
@@ -43,6 +45,16 @@ public class CmcDeviceServiceImpl implements ICmcDeviceService
         return cmcDeviceMapper.selectCmcDeviceList(cmcDevice);
     }
 
+    /**
+     * 查询cmc设备名称集合
+     *
+     * @return cmc设备名称集合
+     */
+    public List<Map<String,Object>> selectCmcDeviceNameList()
+    {
+        return cmcDeviceMapper.selectCmcDeviceNameList();
+    }
+
     /**
      * 新增cmc设备信息
      * 

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

@@ -23,6 +23,7 @@
         <result property="deptComment"    column="dept_comment"    />
         <result property="managerUserId"    column="manager_user_id"    />
         <result property="managerComment"    column="manager_comment"    />
+        <result property="carUsage"    column="car_usage"    />
         <result property="unionUserId"    column="union_user_id"    />
         <result property="unionComment"    column="union_comment"    />
         <result property="gmUserId"    column="gm_user_id"    />
@@ -52,7 +53,7 @@
     </resultMap>
 
     <sql id="selectCmcCarApprovalVo">
-        select ca.car_apply_id, ca.applier, u.nick_name, ca.use_dept, d.dept_name, ca.cars, ca.drivers, ca.project_id, p.project_number, p.project_name, ca.apply_reason, ca.passengers, ca.apply_date, ca.begin_date, ca.begin_halfday, ca.end_date, ca.end_halfday, ca.days, ca.dept_user_id, ca.dept_comment, ca.manager_user_id, ca.manager_comment, ca.union_user_id, ca.union_comment, ca.gm_user_id, ca.gm_comment, ca.dispatcher, ca.dispatch_comment, ca.estimate_cost from cmc_car_approval as ca
+        select ca.car_apply_id, ca.applier, u.nick_name, ca.use_dept, d.dept_name, ca.cars, ca.drivers, ca.project_id, p.project_number, p.project_name, ca.apply_reason, ca.passengers, ca.apply_date, ca.begin_date, ca.begin_halfday, ca.end_date, ca.end_halfday, ca.days, ca.dept_user_id, ca.dept_comment, ca.manager_user_id, ca.manager_comment, ca.car_usage, ca.union_user_id, ca.union_comment, ca.gm_user_id, ca.gm_comment, ca.dispatcher, ca.dispatch_comment, ca.estimate_cost from cmc_car_approval as ca
             left join sys_user as u on u.user_id = ca.applier
             left join sys_dept as d on d.dept_id = ca.use_dept
             left join cmc_project as p on ca.project_id = p.project_id
@@ -78,6 +79,7 @@
             <if test="deptComment != null  and deptComment != ''"> and ca.dept_comment = #{deptComment}</if>
             <if test="managerUserId != null "> and ca.manager_user_id = #{managerUserId}</if>
             <if test="managerComment != null  and managerComment != ''"> and ca.manager_comment = #{managerComment}</if>
+            <if test="carUsage != null  and carUsage != ''"> and ca.car_usage = #{carUsage}</if>
             <if test="unionUserId != null "> and ca.union_user_id = #{unionUserId}</if>
             <if test="unionComment != null  and unionComment != ''"> and ca.union_comment = #{unionComment}</if>
             <if test="gmUserId != null "> and ca.gm_user_id = #{gmUserId}</if>
@@ -114,6 +116,7 @@
             <if test="deptComment != null">dept_comment,</if>
             <if test="managerUserId != null">manager_user_id,</if>
             <if test="managerComment != null">manager_comment,</if>
+            <if test="carUsage != null">car_usage,</if>
             <if test="unionUserId != null">union_user_id,</if>
             <if test="unionComment != null">union_comment,</if>
             <if test="gmUserId != null">gm_user_id,</if>
@@ -141,6 +144,7 @@
             <if test="deptComment != null">#{deptComment},</if>
             <if test="managerUserId != null">#{managerUserId},</if>
             <if test="managerComment != null">#{managerComment},</if>
+            <if test="carUsage != null">#{carUsage},</if>
             <if test="unionUserId != null">#{unionUserId},</if>
             <if test="unionComment != null">#{unionComment},</if>
             <if test="gmUserId != null">#{gmUserId},</if>
@@ -171,6 +175,7 @@
             <if test="deptComment != null">dept_comment = #{deptComment},</if>
             <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
             <if test="managerComment != null">manager_comment = #{managerComment},</if>
+            <if test="carUsage != null">car_usage = #{carUsage},</if>
             <if test="unionUserId != null">union_user_id = #{unionUserId},</if>
             <if test="unionComment != null">union_comment = #{unionComment},</if>
             <if test="gmUserId != null">gm_user_id = #{gmUserId},</if>

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

@@ -62,6 +62,10 @@
         where d.device_id = #{deviceId}
     </select>
 
+    <select id="selectCmcDeviceNameList" resultType="java.util.Map">
+        select distinct name from cmc_device
+    </select>
+
     <insert id="insertCmcDevice" parameterType="CmcDevice" useGeneratedKeys="true" keyProperty="deviceId">
         insert into cmc_device
         <trim prefix="(" suffix=")" suffixOverrides=",">

oa-ui/src/api/oa/car/carApproval.js

@@ -32,15 +32,6 @@ export function addCarApproval(data) {
   })
 }
 
-// 新增cmc用车审批
-export function submitCarApproval(data) {
-  return request({
-    url: '/oa/carApproval/submit',
-    method: 'post',
-    data: data
-  })
-}
-
 // 修改cmc用车审批
 export function updateCarApproval(data) {
   return request({

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

@@ -1,3 +1,9 @@
+/*
+ * @Author: wrh
+ * @Date: 2024-03-05 17:18:12
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-04-09 16:41:10
+ */
 import request from '@/utils/request'
 
 // 查询cmc设备信息列表
@@ -9,6 +15,14 @@ export function listDevice(query) {
   })
 }
 
+// 查询cmc设备名称列表
+export function listDeviceName() {
+  return request({
+    url: '/oa/device/nameList',
+    method: 'get'
+  })
+}
+
 // 查询cmc设备信息详细
 export function getDevice(deviceId) {
   return request({

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-04-09 14:17:41
+ * @LastEditTime: 2024-04-10 10:16:05
 -->
 
 <template>
@@ -34,11 +34,15 @@
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
+                <el-col :span="6" :xs="24">
+                  <el-form-item label="申请用途：" prop="carUsage">
+                    <el-radio-group v-model="form.carUsage" @change="useChange" size="small">
+                      <el-radio-button label="1">工会用车</el-radio-button>
+                      <el-radio-button label="0">非工会用车</el-radio-button>
+                    </el-radio-group>
+                  </el-form-item>
+                </el-col>
               </el-row>
-              <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>
@@ -61,15 +65,17 @@
                   }}</el-descriptions-item>
                 </el-descriptions>
               </el-form-item>
-              <el-form-item label="乘车人数：" prop="passengers">
-                <el-input-number v-model="form.passengers" :min="1" :disabled="taskName != '用车申请'"></el-input-number>
-              </el-form-item>
               <el-form-item label="用车事由：" prop="applyReason">
                 <el-input type="textarea" :rows="2" placeholder="请输入用车事由" v-model="form.applyReason"
                   :disabled="taskName != '用车申请'">
                 </el-input>
               </el-form-item>
               <el-row>
+                <el-col :span="6" :xs="24">
+                  <el-form-item label="乘车人数：" prop="passengers">
+                    <el-input-number v-model="form.passengers" :min="1" :disabled="taskName != '用车申请'"></el-input-number>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="6" :xs="24">
                   <el-form-item label="开始日期：" prop="beginDate">
                     <el-date-picker style="width:140px;" v-model="form.beginDate" value-format="yyyy-MM-dd" type="date"
@@ -84,7 +90,7 @@
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" :xs="24">
+                <el-col :span="6" :xs="24">
                   <el-form-item label="共计:">
                     {{ form.days + '天' }}
                   </el-form-item>
@@ -92,25 +98,25 @@
               </el-row>
               <el-divider></el-divider>
               <!-- 部门审核意见 -->
-              <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px" v-if="form.dept.deptId > 102">
+              <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px" v-if="dept > 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="form.dept.deptId > 102">
+              <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px" v-if="dept > 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="form.dept.deptId == 0">
+              <el-form-item label="工会审核意见：" prop="unionComment" label-width="120px" v-if="dept == 101">
                 <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-form-item label="总经理审核意见" prop="gmComment" label-width="120px" v-if="dept == 102">
                 <el-input type="textarea" :rows="2" placeholder="请输入总经理审核意见" v-model="form.gmComment"
                   :disabled="taskName != '总经理审核'">
                 </el-input>
@@ -163,7 +169,7 @@
 <script>
 import { listProject, getProject } from "@/api/oa/project/project";
 import { listCar, getCar } from "@/api/oa/car/car";
-import { listCarApproval, getCarApproval, updateCarApproval, submitCarApproval, modifyCarApproval } from '@/api/oa/car/carApproval'
+import { listCarApproval, getCarApproval, updateCarApproval, addCarApproval, modifyCarApproval } from '@/api/oa/car/carApproval'
 import { listDriver } from "@/api/system/post";
 import {
   complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm,
@@ -187,8 +193,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.dept = this.$store.getters.deptId;
+    console.log(this.dept)
     this.form.dept.deptName = this.$store.getters.deptName;
     this.getProjectList();
     this.getCarList();
@@ -200,6 +206,7 @@ export default {
   data() {
     return {
       form: {
+        carUsage: '0',
         days: '',
         drivers: [],
         user: {
@@ -235,9 +242,9 @@ export default {
       driverList: [],
       chooseProject: {},
       isSelect: false,
-      isUnion: '非工会用车',
       formTotal: 0,
-      flowData: {}
+      flowData: {},
+      dept: 0,
     }
   },
   mounted() {
@@ -251,7 +258,7 @@ export default {
           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.dept = this.$store.getters.deptId;
           this.form.dept.deptName = this.$store.getters.deptName;
           this.form.applyDate = new Date();
         }
@@ -289,7 +296,7 @@ export default {
     submit() {
       this.$refs['carForm'].validate((valid) => {
         if (valid) {
-          this.form.formId = this.taskForm.formId;
+          this.form.carApplyId = this.taskForm.formId;
           let formData = new FormData();
           let jsonForm = JSON.stringify(this.form);
           formData.append("form", jsonForm);
@@ -297,7 +304,9 @@ export default {
           if (this.formTotal != 0) {
             modifyCarApproval(formData);
           } else {
-            submitCarApproval(formData);
+            this.form.cars = '';
+            this.form.drivers = '';
+            addCarApproval(this.form);
           }
           // 获取下一个流程节点
           getNextFlowNode(params).then(res => {
@@ -328,7 +337,7 @@ export default {
       if (this.taskName == '用车申请') {
         getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
           let userId = res.data.userId;
-          if (this.isUnion == '非工会用车')
+          if (this.form.carUsage == '0')
             this.$set(this.taskForm.variables, "dept", this.form.dept.deptId);
           else
             this.$set(this.taskForm.variables, "dept", 0);
@@ -425,6 +434,12 @@ export default {
         }
       }
       return true;
+    },
+    useChange(val) {
+      if (val == '1')
+        this.dept = 101;
+      else
+        this.dept = this.$store.getters.deptId;
     }
   },
 }