设备使用记录

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

@@ -117,7 +117,7 @@ public class CmcDeviceApprovalController extends BaseController
         cmcDeviceApproval.setApplier(getLoginUser().getUserId());
         cmcDeviceApproval.setDept(getLoginUser().getDeptId());
         cmcDeviceApproval.setApplyDate(DateUtils.getNowDate());
-        cmcDeviceApproval.setProjectId(formDataJson.getString("projectNumber"));
+        cmcDeviceApproval.setProjectId(formDataJson.getInteger("projectId"));
         cmcDeviceApproval.setApplyReason(formDataJson.getString("applyReason"));
         cmcDeviceApproval.setBeginDate(formDataJson.getDate("beginDate"));
         cmcDeviceApproval.setEndDate(formDataJson.getDate("endDate"));

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

@@ -83,6 +83,10 @@ public class CmcDevice extends BaseEntity
     @Excel(name = "管理部门")
     private Long manageDept;
 
+    /** 管理部门 */
+    @Excel(name = "管理部门")
+    private String manageDeptName;
+
     public void setDeviceId(Integer deviceId)
     {
         this.deviceId = deviceId;
@@ -227,6 +231,15 @@ public class CmcDevice extends BaseEntity
     {
         return manageDept;
     }
+    public void setManageDeptName(String manageDeptName)
+    {
+        this.manageDeptName = manageDeptName;
+    }
+
+    public String getManageDeptName()
+    {
+        return manageDeptName;
+    }
 
     @Override
     public String toString() {

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

@@ -33,9 +33,17 @@ public class CmcDeviceApproval extends BaseEntity
     @Excel(name = "设备id")
     private String devices;
 
+    /** 项目id */
+    @Excel(name = "项目id")
+    private Integer projectId;
+
     /** 项目编号 */
     @Excel(name = "项目编号")
-    private String projectId;
+    private String projectNumber;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String projectName;
 
     /** 申领事由 */
     @Excel(name = "申领事由")
@@ -137,15 +145,33 @@ public class CmcDeviceApproval extends BaseEntity
     {
         return devices;
     }
-    public void setProjectId(String projectId) 
+    public void setProjectId(Integer projectId)
     {
         this.projectId = projectId;
     }
 
-    public String getProjectId() 
+    public Integer getProjectId()
     {
         return projectId;
     }
+    public void setProjectNumber(String projectNumber)
+    {
+        this.projectNumber = projectNumber;
+    }
+
+    public String getProjectNumber()
+    {
+        return projectNumber;
+    }
+    public void setProjectName(String projectName)
+    {
+        this.projectName = projectName;
+    }
+
+    public String getProjectName()
+    {
+        return projectName;
+    }
     public void setApplyReason(String applyReason) 
     {
         this.applyReason = applyReason;

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

@@ -10,6 +10,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dept"    column="dept"    />
         <result property="devices"    column="devices"    />
         <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="projectName"    column="project_name"    />
         <result property="applyReason"    column="apply_reason"    />
         <result property="applyDate"    column="apply_date"    />
         <result property="returnDate"    column="return_date"    />
@@ -28,37 +30,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcDeviceApprovalVo">
-        select device_apply_id, applier, dept, devices, project_id, apply_reason, apply_date, return_date, begin_date, begin_halfday, end_date, end_halfday, days, dept_user_id, dept_comment, manager_user_id, manager_comment, dispatcher, dispatch_comment, estimate_cost from cmc_device_approval
+        select da.device_apply_id, da.applier, da.dept, da.devices, da.project_id, p.project_number, p.project_name, da.apply_reason, da.apply_date, da.return_date, da.begin_date, da.begin_halfday, da.end_date, da.end_halfday, da.days, da.dept_user_id, da.dept_comment, da.manager_user_id, da.manager_comment, da.dispatcher, da.dispatch_comment, da.estimate_cost from cmc_device_approval as da left join cmc_project as p
     </sql>
 
     <select id="selectCmcDeviceApprovalList" parameterType="CmcDeviceApproval" resultMap="CmcDeviceApprovalResult">
         <include refid="selectCmcDeviceApprovalVo"/>
+        on da.project_id = p.project_id
         <where>  
-            <if test="applier != null "> and applier = #{applier}</if>
-            <if test="dept != null "> and dept = #{dept}</if>
-            <if test="devices != null  and devices != ''"> and devices = #{devices}</if>
-            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
-            <if test="applyReason != null  and applyReason != ''"> and apply_reason = #{applyReason}</if>
-            <if test="applyDate != null "> and apply_date = #{applyDate}</if>
-            <if test="returnDate != null "> and return_date = #{returnDate}</if>
-            <if test="beginDate != null "> and begin_date = #{beginDate}</if>
-            <if test="beginHalfday != null  and beginHalfday != ''"> and begin_halfday = #{beginHalfday}</if>
-            <if test="endDate != null "> and end_date = #{endDate}</if>
-            <if test="endHalfday != null  and endHalfday != ''"> and end_halfday = #{endHalfday}</if>
-            <if test="days != null "> and days = #{days}</if>
-            <if test="deptUserId != null "> and dept_user_id = #{deptUserId}</if>
-            <if test="deptComment != null  and deptComment != ''"> and dept_comment = #{deptComment}</if>
-            <if test="managerUserId != null "> and manager_user_id = #{managerUserId}</if>
-            <if test="managerComment != null  and managerComment != ''"> and manager_comment = #{managerComment}</if>
-            <if test="dispatcher != null "> and dispatcher = #{dispatcher}</if>
-            <if test="dispatchComment != null  and dispatchComment != ''"> and dispatch_comment = #{dispatchComment}</if>
-            <if test="estimateCost != null "> and estimate_cost = #{estimateCost}</if>
+            <if test="applier != null "> and da.applier = #{applier}</if>
+            <if test="dept != null "> and da.dept = #{dept}</if>
+            <if test="devices != null  and devices != ''"> and da.devices = #{devices}</if>
+            <if test="projectId != null  and projectId != ''"> and da.project_id = #{projectId}</if>
+            <if test="applyReason != null  and applyReason != ''"> and da.apply_reason = #{applyReason}</if>
+            <if test="applyDate != null "> and da.apply_date = #{applyDate}</if>
+            <if test="returnDate != null "> and da.return_date = #{returnDate}</if>
+            <if test="beginDate != null "> and da.begin_date = #{beginDate}</if>
+            <if test="beginHalfday != null  and beginHalfday != ''"> and da.begin_halfday = #{beginHalfday}</if>
+            <if test="endDate != null "> and da.end_date = #{endDate}</if>
+            <if test="endHalfday != null  and endHalfday != ''"> and da.end_halfday = #{endHalfday}</if>
+            <if test="days != null "> and da.days = #{days}</if>
+            <if test="deptUserId != null "> and da.dept_user_id = #{deptUserId}</if>
+            <if test="deptComment != null  and deptComment != ''"> and da.dept_comment = #{deptComment}</if>
+            <if test="managerUserId != null "> and da.manager_user_id = #{managerUserId}</if>
+            <if test="managerComment != null  and managerComment != ''"> and da.manager_comment = #{managerComment}</if>
+            <if test="dispatcher != null "> and da.dispatcher = #{dispatcher}</if>
+            <if test="dispatchComment != null  and dispatchComment != ''"> and da.dispatch_comment = #{dispatchComment}</if>
+            <if test="estimateCost != null "> and da.estimate_cost = #{estimateCost}</if>
         </where>
     </select>
     
     <select id="selectCmcDeviceApprovalByDeviceApplyId" parameterType="String" resultMap="CmcDeviceApprovalResult">
         <include refid="selectCmcDeviceApprovalVo"/>
-        where device_apply_id = #{deviceApplyId}
+        on da.project_id = p.project_id
+        where da.device_apply_id = #{deviceApplyId}
     </select>
         
     <insert id="insertCmcDeviceApproval" parameterType="CmcDeviceApproval">

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

@@ -22,36 +22,39 @@
         <result property="checkTime"    column="check_time"    />
         <result property="warranty"    column="warranty"    />
         <result property="manageDept"    column="manage_dept"    />
+        <result property="manageDeptName"    column="dept_name"    />
     </resultMap>
 
     <sql id="selectCmcDeviceVo">
-        select device_id, device_number, code, name, type, acquisition_time, cost, expect_life, series, brand, day_cost, place, remark, check_term, check_time, warranty, manage_dept from cmc_device
+        select d.device_id, d.device_number, d.code, d.name, d.type, d.acquisition_time, d.cost, d.expect_life, d.series, d.brand, d.day_cost, d.place, d.remark, d.check_term, d.check_time, d.warranty, d.manage_dept, dept.dept_name from cmc_device as d left join sys_dept as dept
     </sql>
 
     <select id="selectCmcDeviceList" parameterType="CmcDevice" resultMap="CmcDeviceResult">
         <include refid="selectCmcDeviceVo"/>
+        on dept.dept_id = d.manage_dept
         <where>
-            <if test="deviceNumber != null  and deviceNumber != ''"> and device_number like concat('%', #{deviceNumber}, '%')</if>
-            <if test="code != null  and code != ''"> and code like concat('%', #{code}, '%')</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="type != null  and type != ''"> and type like concat('%', #{type}, '%')</if>
-            <if test="acquisitionTime != null "> and acquisition_time = #{acquisitionTime}</if>
-            <if test="cost != null "> and cost = #{cost}</if>
-            <if test="expectLife != null "> and expect_life = #{expectLife}</if>
-            <if test="series != null  and series != ''"> and series like concat('%', #{series}, '%')</if>
-            <if test="brand != null  and brand != ''"> and brand like concat('%', #{brand}, '%')</if>
-            <if test="dayCost != null "> and day_cost = #{dayCost}</if>
-            <if test="place != null  and place != ''"> and place like concat('%', #{place}, '%')</if>
-            <if test="checkTerm != null "> and check_term = #{checkTerm}</if>
-            <if test="checkTime != null "> and check_time = #{checkTime}</if>
-            <if test="warranty != null "> and warranty = #{warranty}</if>
-            <if test="manageDept != null "> and manage_dept = #{manageDept}</if>
+            <if test="deviceNumber != null  and deviceNumber != ''"> and d.device_number like concat('%', #{deviceNumber}, '%')</if>
+            <if test="code != null  and code != ''"> and d.code like concat('%', #{code}, '%')</if>
+            <if test="name != null  and name != ''"> and d.name like concat('%', #{name}, '%')</if>
+            <if test="type != null  and type != ''"> and d.type like concat('%', #{type}, '%')</if>
+            <if test="acquisitionTime != null "> and d.acquisition_time = #{acquisitionTime}</if>
+            <if test="cost != null "> and d.cost = #{cost}</if>
+            <if test="expectLife != null "> and d.expect_life = #{expectLife}</if>
+            <if test="series != null  and series != ''"> and d.series like concat('%', #{series}, '%')</if>
+            <if test="brand != null  and brand != ''"> and d.brand like concat('%', #{brand}, '%')</if>
+            <if test="dayCost != null "> and d.day_cost = #{dayCost}</if>
+            <if test="place != null  and place != ''"> and d.place like concat('%', #{place}, '%')</if>
+            <if test="checkTerm != null "> and d.check_term = #{checkTerm}</if>
+            <if test="checkTime != null "> and d.check_time = #{checkTime}</if>
+            <if test="warranty != null "> and d.warranty = #{warranty}</if>
+            <if test="manageDept != null "> and d.manage_dept = #{manageDept}</if>
         </where>
     </select>
 
     <select id="selectCmcDeviceByDeviceId" parameterType="Integer" resultMap="CmcDeviceResult">
         <include refid="selectCmcDeviceVo"/>
-        where device_id = #{deviceId}
+        on dept.dept_id = d.manage_dept
+        where d.device_id = #{deviceId}
     </select>
 
     <insert id="insertCmcDevice" parameterType="CmcDevice" useGeneratedKeys="true" keyProperty="deviceId">

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

@@ -48,7 +48,7 @@
       </el-table-column>
       <el-table-column label="总价" align="center" prop="cost">
         <template slot-scope="scope">
-          {{ scope.row.cost + '万元' }}
+          {{ scope.row.cost + '元' }}
         </template>
       </el-table-column>
       <el-table-column label="预计使用年限" align="center" prop="expectLife">
@@ -98,7 +98,7 @@
         </el-form-item>
         <el-form-item label="总价" prop="cost">
           <el-input style="width:130px;margin-right:10px;" v-model="form.cost" placeholder="请输入金额" />
-          <span>万元</span>
+          <span>元</span>
         </el-form-item>
         <el-form-item label="预计使用年限" prop="expectLife">
           <el-input v-model="form.expectLife" placeholder="请输入年限" style="width:130px;margin-right:10px;" />

oa-ui/src/views/oa/device/expense.vue

@@ -32,7 +32,7 @@
           <svg-icon slot="prefix" icon-class="TeenyiconsYenSolid" class="el-input__icon input-icon" />
           购买价格
         </template>
-        {{ deviceInfo.cost }}
+        {{ deviceInfo.cost }} 元
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
@@ -95,7 +95,7 @@
           <svg-icon slot="prefix" icon-class="dept" class="el-input__icon input-icon" />
           管理部门
         </template>
-        {{ deviceInfo.manageDept }}
+        {{ deviceInfo.manageDeptName }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
@@ -108,7 +108,7 @@
     <!-- 费用明细 -->
     <el-divider></el-divider>
 
-    <el-card>
+    <el-deviced>
       <div slot="header" class="clearfix">
         <h3>设备使用记录</h3>
       </div>
@@ -133,37 +133,34 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column type="index" width="55" align="center" label="序号" />
         <el-table-column label="项目编号" align="center" prop="projectNumber">
-          <template slot-scope="scope">
-            <el-tag :type="typeStyle(scope.row.expenseType)">{{ expenseTypeText(scope.row.expenseType) }}</el-tag>
-          </template>
         </el-table-column>
         <el-table-column label="项目名称" align="center" prop="projectName">
           <template slot-scope="scope">
-            {{ scope.row.expense }}
+            {{ scope.row.projectName }}
           </template>
         </el-table-column>
-        <el-table-column label="申请时间" align="center" prop="expense">
+        <el-table-column label="申请时间" align="center" prop="beginDate">
           <template slot-scope="scope">
-            {{ scope.row.expense }}
+            {{ scope.row.beginDate }}
           </template>
         </el-table-column>
-        <el-table-column label="归还时间" align="center" prop="occurDate" width="180">
+        <el-table-column label="归还时间" align="center" prop="returnDate" width="180">
           <template slot-scope="scope">
-            {{ scope.row.occurDate }}
+            {{ scope.row.returnDate }}
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-              v-hasPermi="['oa:carExpense:edit']">修改</el-button>
+              v-hasPermi="['oa:deviceApproval:edit']">修改</el-button>
             <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-              v-hasPermi="['oa:carExpense:remove']">删除</el-button>
+              v-hasPermi="['oa:deviceApproval:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
       <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
         @pagination="getList" />
-    </el-card>
+    </el-deviced>
     <!-- 添加明细 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="expenseForm" :model="form" :rules="rules" label-width="100px">
@@ -192,12 +189,11 @@
 </template>
 
 <script>
-import { getCar } from '@/api/oa/car/car.js'
 import { getDevice } from '@/api/oa/device/device.js'
-import { listCarExpense, getCarExpense, delCarExpense, addCarExpense, updateCarExpense } from "@/api/oa/car/carExpense";
+import { listDeviceApproval, getDeviceApproval, delDeviceApproval, addDeviceApproval, updateDeviceApproval } from "@/api/oa/device/deviceApproval";
 export default {
   data() {
-    let validateExpense = (rule, value, callback) => {
+    let validateApproval = (rule, value, callback) => {
       setTimeout(() => {
         if (!value) {
           return callback(new Error('请输入金额'));
@@ -231,7 +227,7 @@ export default {
           { required: true, message: '请选择费用类型', trigger: 'change' }
         ],
         expense: [
-          { validator: validateExpense, required: true, trigger: 'blur' },
+          { validator: validateApproval, required: true, trigger: 'blur' },
         ],
         occurDate: [
           { required: true, message: '请选择发生日期', trigger: 'change' },
@@ -256,8 +252,8 @@ export default {
   },
   methods: {
     getList() {
-      this.queryParams.carId = this.$route.query.carId
-      listCarExpense(this.queryParams).then(res => {
+      this.queryParams.devices = this.$route.query.deviceId
+      listDeviceApproval(this.queryParams).then(res => {
         console.log(res);
         this.expenseList = res.rows;
         this.total = res.total;
@@ -275,7 +271,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.carExpenseId)
+      this.ids = selection.map(item => item.deviceApprovalId)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -286,8 +282,8 @@ export default {
     },
     handleUpdate(row) {
       this.reset();
-      const carExpenseId = row.carExpenseId || this.ids
-      getCarExpense(carExpenseId).then(response => {
+      const deviceApprovalId = row.deviceApprovalId || this.ids
+      getDeviceApproval(deviceApprovalId).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改车辆明细";
@@ -295,24 +291,24 @@ export default {
     },
     handleDelete(row) {
       debugger
-      const carExpenseIds = row.carExpenseId || this.ids;
-      this.$modal.confirm('是否确认删除车辆费用编号为"' + carExpenseIds + '"的数据项？').then(function () {
-        return delCarExpense(carExpenseIds);
+      const deviceApprovalIds = row.deviceApprovalId || this.ids;
+      this.$modal.confirm('是否确认删除车辆费用编号为"' + deviceApprovalIds + '"的数据项？').then(function () {
+        return delDeviceApproval(deviceApprovalIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => { });
     },
     handleExport() {
-      this.download('oa/carExpense/export', {
+      this.download('oa/deviceApproval/export', {
         ...this.queryParams
-      }, `carExpense_${new Date().getTime()}.xlsx`)
+      }, `deviceApproval_${new Date().getTime()}.xlsx`)
     },
     // 表单重置
     reset() {
       this.form = {
-        carExpenseId: null,
-        carId: null,
+        deviceApprovalId: null,
+        deviceId: null,
         expenseType: null,
         expense: null,
         occurDate: null
@@ -322,15 +318,15 @@ export default {
     submitForm() {
       this.$refs["expenseForm"].validate(valid => {
         if (valid) {
-          this.form.carId = this.$route.query.carId
-          if (this.form.carExpenseId != null) {
-            updateCarExpense(this.form).then(response => {
+          this.form.deviceId = this.$route.query.deviceId
+          if (this.form.deviceApprovalId != null) {
+            updateDeviceApproval(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addCarExpense(this.form).then(response => {
+            addDeviceApproval(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();

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

@@ -49,7 +49,7 @@
       <el-table-column label="购买价格" align="center" prop="cost">
 
         <template slot-scope="scope">
-          {{ scope.row.cost + '万元' }}
+          {{ scope.row.cost + '元' }}
         </template>
       </el-table-column>
       <el-table-column label="预计使用年限" align="center" prop="expectLife" />
@@ -59,7 +59,7 @@
       <el-table-column label="校验周期（年）" align="center" prop="checkTerm" />
       <el-table-column label="保修期（月）" align="center" prop="warranty" />
       <el-table-column label="校验日期" align="center" prop="checkTime" />
-      <el-table-column label="管理部门" align="center" prop="manageDept" />
+      <el-table-column label="管理部门" align="center" prop="manageDeptName" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 
@@ -116,7 +116,7 @@
           <el-col :span="12">
             <el-form-item label="购买价格" prop="cost">
               <el-input style="width:130px;margin-right:10px;" v-model="form.cost" placeholder="请输入金额" />
-              <span>万元</span>
+              <span>元</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -166,8 +166,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="管理部门" prop="manageDept">
-              <el-input v-model="form.manageDept" placeholder="请输入管理部门" />
+            <el-form-item label="管理部门" prop="manageDeptName">
+              <el-input v-model="form.manageDeptName" placeholder="请输入管理部门" />
             </el-form-item>
           </el-col>
         </el-row>