核算单价菜单

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

@@ -139,7 +139,18 @@ public class CmcWageController extends BaseController
             List<CmcWage> cmcWageList = util.importExcel(file.getInputStream());
             for (CmcWage cmcWage : cmcWageList) {
                 cmcWage.setUserId(cmcWage.getUserId() + 1);
-                cmcWageService.insertCmcWage(cmcWage);
+                CmcWage wage = new CmcWage();
+                wage.setUserId(cmcWage.getUserId());
+                wage.setPayMonth(cmcWage.getPayMonth());
+                List<CmcWage> wageList = cmcWageService.selectCmcWageList(wage);
+                if (wageList.size() > 0) {
+                    wage.setWageId(wageList.get(0).getWageId());
+                    wage.setSocialSecurityUnit(cmcWage.getSocialSecurityUnit());
+                    wage.setHouseFund(cmcWage.getHouseFund());
+                    cmcWageService.updateCmcWage(wage);
+                }
+                else
+                    cmcWageService.insertCmcWage(cmcWage);
             }
             return AjaxResult.success("上传成功");
         }

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

@@ -25,8 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectCmcCheckPriceVo"/>
         <where>  
             <if test="workType != null  and workType != ''"> and work_type = #{workType}</if>
-            <if test="workItem != null  and workItem != ''"> and work_item = #{workItem}</if>
-            <if test="subItem != null  and subItem != ''"> and sub_item = #{subItem}</if>
+            <if test="workItem != null  and workItem != ''"> and work_item like concat('%', #{workItem}, '%')</if>
+            <if test="subItem != null  and subItem != ''"> and sub_item like concat('%', #{subItem}, '%')</if>
             <if test="pricePercentage != null "> and price_percentage = #{pricePercentage}</if>
             <if test="scaleGrade != null  and scaleGrade != ''"> and scale_grade = #{scaleGrade}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>

oa-ui/src/api/oa/price/checkPrice.js

@@ -0,0 +1,86 @@
+import request from '@/utils/request'
+
+// 查询cmc核算单价列表
+export function listCheckPrice(query) {
+  return request({
+    url: '/oa/checkPrice/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc核算单价详细
+export function getCheckPrice(id) {
+  return request({
+    url: '/oa/checkPrice/' + id,
+    method: 'get'
+  })
+}
+
+// 新增cmc核算单价
+export function addCheckPrice(data) {
+  return request({
+    url: '/oa/checkPrice',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc核算单价
+export function updateCheckPrice(data) {
+  return request({
+    url: '/oa/checkPrice',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc核算单价
+export function delCheckPrice(id) {
+  return request({
+    url: '/oa/checkPrice/' + id,
+    method: 'delete'
+  })
+}
+
+//  查询工作类别列表
+export function getWorkTypeList() {
+  return request({
+    url: '/oa/checkPrice/workTypeList',
+    method: 'get'
+  })
+}
+
+// 根据工作类别查询工作项目
+export function getWorkItemList(params) {
+  return request({
+    url: '/oa/checkPrice/workItem',
+    method: 'get',
+    params:params
+  })
+}
+
+// 根据工作项目查询项目细项
+export function getSubItemList(params) {
+  return request({
+    url: '/oa/checkPrice/subItem',
+    method: 'get',
+    params:params
+  })
+}
+// 根据工作项目查询比例等级
+export function getScaleGradeList(params) {
+  return request({
+    url: '/oa/checkPrice/scaleGrade',
+    method: 'get',
+    params:params
+  })
+}
+// 根据比例等级查询出单位、一般地类、复杂地类
+export function getUnitPrice(params) {
+  return request({
+    url: '/oa/checkPrice/price',
+    method: 'get',
+    params:params
+  })
+}

oa-ui/src/views/oa/price/checkPrice.vue

@@ -0,0 +1,296 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="工作内容" prop="workItem">
+        <el-input
+          v-model="queryParams.workItem"
+          placeholder="请输入工作内容"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="内容细项" prop="subItem">
+        <el-input
+          v-model="queryParams.subItem"
+          placeholder="请输入内容细项"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['oa:price:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['oa:price:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['oa:price:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['oa:price:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="checkPriceList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="工作类别" align="center" prop="workType" />
+      <el-table-column label="工作内容" align="center" prop="workItem" />
+      <el-table-column label="内容细项" align="center" prop="subItem" />
+      <el-table-column label="单价比例" align="center" prop="pricePercentage" />
+      <el-table-column label="等级或比例尺" align="center" prop="scaleGrade" />
+      <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="一般地类单价" align="center" prop="commonPrice" />
+      <el-table-column label="复杂地类单价" align="center" prop="complexPrice" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <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:price:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:price: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"
+    />
+
+    <!-- 添加或修改cmc核算单价对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="工作内容" prop="workItem">
+          <el-input v-model="form.workItem" placeholder="请输入工作内容" />
+        </el-form-item>
+        <el-form-item label="内容细项" prop="subItem">
+          <el-input v-model="form.subItem" placeholder="请输入内容细项" />
+        </el-form-item>
+        <el-form-item label="单价比例" prop="pricePercentage">
+          <el-input v-model="form.pricePercentage" placeholder="请输入单价比例" />
+        </el-form-item>
+        <el-form-item label="等级或比例尺" prop="scaleGrade">
+          <el-input v-model="form.scaleGrade" placeholder="请输入等级或比例尺" />
+        </el-form-item>
+        <el-form-item label="单位" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入单位" />
+        </el-form-item>
+        <el-form-item label="一般地类单价" prop="commonPrice">
+          <el-input v-model="form.commonPrice" placeholder="请输入一般地类单价" />
+        </el-form-item>
+        <el-form-item label="复杂地类单价" prop="complexPrice">
+          <el-input v-model="form.complexPrice" placeholder="请输入复杂地类单价" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listCheckPrice, getCheckPrice, delCheckPrice, addCheckPrice, updateCheckPrice } from "@/api/oa/price/checkPrice";
+
+export default {
+  name: "CheckPrice",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc核算单价表格数据
+      checkPriceList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        workType: null,
+        workItem: null,
+        subItem: null,
+        pricePercentage: null,
+        scaleGrade: null,
+        unit: null,
+        commonPrice: null,
+        complexPrice: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc核算单价列表 */
+    getList() {
+      this.loading = true;
+      listCheckPrice(this.queryParams).then(response => {
+        this.checkPriceList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        workType: null,
+        workItem: null,
+        subItem: null,
+        pricePercentage: null,
+        scaleGrade: null,
+        unit: null,
+        commonPrice: null,
+        complexPrice: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc核算单价";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getCheckPrice(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc核算单价";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateCheckPrice(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCheckPrice(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除cmc核算单价编号为"' + ids + '"的数据项？').then(function() {
+        return delCheckPrice(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/checkPrice/export', {
+        ...this.queryParams
+      }, `checkPrice_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>