提交代码

ruoyi-ui/public/index.html

@@ -10,7 +10,6 @@
   <script src="./easyplayer/EasyWasmPlayer.js"></script>
   <script type="text/javascript"
     src="https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=6zAD8CIavtzWnkGg0a7roush5maGMIPn"></script>  
-    <script src="./wx/jweixin-1.3.2.js"></script>    
   <title>
     <%= webpackConfig.name %>
   </title>

ruoyi-ui/src/App.vue

@@ -27,6 +27,14 @@ export default {
 }
 </style>
 <style lang="scss">
+.el-tabs--card > .el-tabs__header .el-tabs__item.is-active{
+  background-color: #1890ff !important;
+  color:#EEEEEE !important;
+}
+.app-container:first-child {
+  background-image: url("assets/images/app-bgvip.png?v=20230923");
+  background-size: 100% 100%;
+}
 .nest-menu,.el-submenu__title{
   position: relative;
   .todo_num_tips{

ruoyi-ui/src/api/flow/flowLabourInfo.js

@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+
+// 查询劳资投诉列表
+export function listFlowLabourInfo(query) {
+  return request({
+    url: '/flow/flowLabourInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询劳资投诉详细
+export function getFlowLabourInfo(id) {
+  return request({
+    url: '/flow/flowLabourInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增劳资投诉
+export function addFlowLabourInfo(data) {
+  return request({
+    url: '/flow/flowLabourInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改劳资投诉
+export function updateFlowLabourInfo(data) {
+  return request({
+    url: '/flow/flowLabourInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除劳资投诉
+export function delFlowLabourInfo(id) {
+  return request({
+    url: '/flow/flowLabourInfo/' + id,
+    method: 'delete'
+  })
+}
+
+// 查询我的劳资投诉列表
+export function findMyFlowLabours(cardId) {
+  return request({
+    url: '/flow/flowLabourInfo/findMyFlowLabours/' + cardId,
+    method: 'get'
+  })
+}
+
+// 查询劳资投诉进度列表
+export function findMyFlowLabourNodes(flowId) {
+  return request({
+    url: '/flow/flowLabourAuditNode/findMyFlowLabourNodes/' + flowId,
+    method: 'get'
+  })
+}
+

ruoyi-ui/src/api/publics.js

@@ -28,6 +28,15 @@ const getProjectList = () => {
         method: 'get'
     })
 }
+
+// 获取所有项目
+const getProjectAllList = () => {
+    return request({
+        url: '/publics/projectAllList',
+        method: 'get'
+    })
+}
+
 // 获取和我相关的项目信息
 const getMyProjectList = () => {
     return request({
@@ -53,6 +62,14 @@ const queryUnitList = (query) => {
     })
 }
 
+// 查询项目部门信息
+const queryAllUnitList = (projId,unitType) => {
+    return request({
+      url: '/publics/queryAllUnitList/'+projId+'/'+unitType,
+      method: 'get'
+    })
+}
+
 const selectProjectAllUnitUser = (query) => {
     return request({
       url: '/publics/selectProjectAllUnitUser',
@@ -97,9 +114,11 @@ export default{
     getDeptTree,
     getZgsDeptList,
     getProjectList,
+    getProjectAllList,
     getMyProjectList,
     getUserList,
     queryUnitList,
+    queryAllUnitList,
     selectProjectAllUnitUser,
     selectProjectUnitUser,
     selectProjectAuditinfo,

ruoyi-ui/src/assets/styles/variables.scss

@@ -36,7 +36,7 @@ $base-sub-menu-background:#000c17;
 $base-sub-menu-hover:#001528;
 */
 
-$base-sidebar-width: 200px;
+$base-sidebar-width: 220px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass

ruoyi-ui/src/components/flow/User/index.vue

@@ -22,7 +22,7 @@
             ref="tree"
             node-key="id"
             accordion
-            default-expanded-keys="100,101"
+            :default-expanded-keys="defaultEK"
             highlight-current
             @node-click="handleNodeClick"
           />
@@ -132,6 +132,7 @@ export default {
       title: "",
       // 部门树选项
       deptOptions: undefined,
+      defaultEK:[],
       // 是否显示弹出层
       open: false,
       // 部门名称
@@ -218,6 +219,7 @@ export default {
     getDeptTree() {
       deptTreeSelect().then(response => {
         this.deptOptions = response.data;
+        this.defaultEK.push(101);
       });
     },
     // 保存选中的数据id,row-key就是要指定一个key标识这一行的数据

ruoyi-ui/src/store/modules/settings.js

@@ -5,7 +5,7 @@ const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dyn
 const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
 const state = {
   title: '',
-  theme: storageSetting.theme || '#11A983',
+  theme: storageSetting.theme || '#1890ff',
   sideTheme: storageSetting.sideTheme || sideTheme,
   showSettings: showSettings,
   topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,

ruoyi-ui/src/views/flow/flowLabourInfo/index.vue

@@ -0,0 +1,403 @@
+<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="projectId">
+        <el-input
+          v-model="queryParams.projectId"
+          placeholder="请输入所属项目"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input
+          v-model="queryParams.projectName"
+          placeholder="请输入项目名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="总包单位" prop="deptId">
+        <el-input
+          v-model="queryParams.deptId"
+          placeholder="请输入总包单位"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="总包单位名称" prop="deptName">
+        <el-input
+          v-model="queryParams.deptName"
+          placeholder="请输入总包单位名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分包单位" prop="subDeptId">
+        <el-input
+          v-model="queryParams.subDeptId"
+          placeholder="请输入分包单位"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分包单位名称" prop="subDeptName">
+        <el-input
+          v-model="queryParams.subDeptName"
+          placeholder="请输入分包单位名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="劳工名称" prop="laborName">
+        <el-input
+          v-model="queryParams.laborName"
+          placeholder="请输入劳工名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="身份证码" prop="laborCardid">
+        <el-input
+          v-model="queryParams.laborCardid"
+          placeholder="请输入身份证码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系电话" prop="laborPhone">
+        <el-input
+          v-model="queryParams.laborPhone"
+          placeholder="请输入联系电话"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否有效" prop="isDel">
+        <el-input
+          v-model="queryParams.isDel"
+          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="['flow:flowLabourInfo: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="['flow:flowLabourInfo: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="['flow:flowLabourInfo: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="['flow:flowLabourInfo:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="flowLabourInfoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="所属项目" align="center" prop="projectId" />
+      <el-table-column label="项目名称" align="center" prop="projectName" />
+      <el-table-column label="总包单位" align="center" prop="deptId" />
+      <el-table-column label="总包单位名称" align="center" prop="deptName" />
+      <el-table-column label="分包单位" align="center" prop="subDeptId" />
+      <el-table-column label="分包单位名称" align="center" prop="subDeptName" />
+      <el-table-column label="劳工名称" align="center" prop="laborName" />
+      <el-table-column label="身份证码" align="center" prop="laborCardid" />
+      <el-table-column label="联系电话" align="center" prop="laborPhone" />
+      <el-table-column label="欠薪人数" align="center" prop="laborNumber" />
+      <el-table-column label="欠薪金额" align="center" prop="laborAmount" />
+      <el-table-column label="欠薪原因说明" align="center" prop="laborReason" />
+      <el-table-column label="附件凭证" align="center" prop="files" />
+      <el-table-column label="审核状态" align="center" prop="approveStatus" />
+      <el-table-column label="是否有效" align="center" prop="isDel" />
+      <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="['flow:flowLabourInfo:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['flow:flowLabourInfo: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-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="projectId">
+          <el-input v-model="form.projectId" placeholder="请输入所属项目" />
+        </el-form-item>
+        <el-form-item label="项目名称" prop="projectName">
+          <el-input v-model="form.projectName" placeholder="请输入项目名称" />
+        </el-form-item>
+        <el-form-item label="总包单位" prop="deptId">
+          <el-input v-model="form.deptId" placeholder="请输入总包单位" />
+        </el-form-item>
+        <el-form-item label="总包单位名称" prop="deptName">
+          <el-input v-model="form.deptName" placeholder="请输入总包单位名称" />
+        </el-form-item>
+        <el-form-item label="分包单位" prop="subDeptId">
+          <el-input v-model="form.subDeptId" placeholder="请输入分包单位" />
+        </el-form-item>
+        <el-form-item label="分包单位名称" prop="subDeptName">
+          <el-input v-model="form.subDeptName" placeholder="请输入分包单位名称" />
+        </el-form-item>
+        <el-form-item label="劳工名称" prop="laborName">
+          <el-input v-model="form.laborName" placeholder="请输入劳工名称" />
+        </el-form-item>
+        <el-form-item label="身份证码" prop="laborCardid">
+          <el-input v-model="form.laborCardid" placeholder="请输入身份证码" />
+        </el-form-item>
+        <el-form-item label="联系电话" prop="laborPhone">
+          <el-input v-model="form.laborPhone" placeholder="请输入联系电话" />
+        </el-form-item>
+        <el-form-item label="欠薪人数" prop="laborNumber">
+          <el-input v-model="form.laborNumber" placeholder="请输入欠薪人数" />
+        </el-form-item>
+        <el-form-item label="欠薪金额" prop="laborAmount">
+          <el-input v-model="form.laborAmount" placeholder="请输入欠薪金额" />
+        </el-form-item>
+        <el-form-item label="欠薪原因说明" prop="laborReason">
+          <el-input v-model="form.laborReason" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="附件凭证" prop="files">
+          <file-upload v-model="form.files"/>
+        </el-form-item>
+        <el-form-item label="是否有效" prop="isDel">
+          <el-input v-model="form.isDel" 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 { listFlowLabourInfo, getFlowLabourInfo, delFlowLabourInfo, addFlowLabourInfo, updateFlowLabourInfo } from "@/api/flow/flowLabourInfo";
+
+export default {
+  name: "FlowLabourInfo",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 劳资投诉表格数据
+      flowLabourInfoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectId: null,
+        projectName: null,
+        deptId: null,
+        deptName: null,
+        subDeptId: null,
+        subDeptName: null,
+        laborName: null,
+        laborCardid: null,
+        laborPhone: null,
+        approveStatus: null,
+        isDel: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询劳资投诉列表 */
+    getList() {
+      this.loading = true;
+      listFlowLabourInfo(this.queryParams).then(response => {
+        this.flowLabourInfoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        projectId: null,
+        projectName: null,
+        deptId: null,
+        deptName: null,
+        subDeptId: null,
+        subDeptName: null,
+        laborName: null,
+        laborCardid: null,
+        laborPhone: null,
+        laborNumber: null,
+        laborAmount: null,
+        laborReason: null,
+        files: null,
+        approveStatus: null,
+        isDel: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: 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 = "添加劳资投诉";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getFlowLabourInfo(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改劳资投诉";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateFlowLabourInfo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addFlowLabourInfo(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除劳资投诉编号为"' + ids + '"的数据项？').then(function() {
+        return delFlowLabourInfo(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('flow/flowLabourInfo/export', {
+        ...this.queryParams
+      }, `flowLabourInfo_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/flowable/definition/indexDrawer.vue

@@ -8,7 +8,7 @@
         <template slot="title">
           <div>流程发起角色配置</div>
         </template>
-        <el-tabs
+        <el-tabs  type="card"
           v-model="activeName"
           style="margin-left: 20px; margin-right: 20px"
           @tab-click="getList"

ruoyi-ui/src/views/flowable/definition/indexOrderDrawer.vue

@@ -8,7 +8,7 @@
         <template slot="title">
           <div>流程发起角色配置</div>
         </template>
-        <el-tabs
+        <el-tabs  type="card"
           v-model="activeName"
           style="margin-left: 20px; margin-right: 20px"
           @tab-click="getList"

ruoyi-ui/src/views/flowable/task/finished/detail/index.vue

@@ -5,7 +5,7 @@
         <span class="el-icon-document">已办任务</span>
         <el-button style="float: right;" size="mini" type="danger" @click="goBack">关闭</el-button>
       </div>
-      <el-tabs  tab-position="top" v-model="activeName" @tab-click="handleClick">
+      <el-tabs type="card" tab-position="top" v-model="activeName" @tab-click="handleClick">
         <!--表单信息-->
         <el-tab-pane label="表单信息" name="1">
           <el-col :span="16" :offset="4" v-if="variableOpen">

ruoyi-ui/src/views/flowable/task/myProcess/detail/index.vue

@@ -5,7 +5,7 @@
         <span class="el-icon-document">已发任务</span>
         <el-button style="float: right;" size="mini" type="danger" @click="goBack">关闭</el-button>
       </div>
-      <el-tabs  tab-position="top" v-model="activeName" @tab-click="handleClick">
+      <el-tabs type="card" tab-position="top" v-model="activeName" @tab-click="handleClick">
         <!--表单信息-->
         <el-tab-pane label="表单信息" name="1">
           <el-col :span="16" :offset="4">

ruoyi-ui/src/views/flowable/task/myProcess/index.vue

@@ -82,7 +82,7 @@
       </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tabs type="card" v-model="activeName" @tab-click="handleClick">
       <el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
       <el-tab-pane :label="tabs.await" name="await"></el-tab-pane>
       <el-tab-pane :label="tabs.finished" name="finished"></el-tab-pane>

ruoyi-ui/src/views/flowable/task/project/index.vue

@@ -92,7 +92,7 @@
       </el-form-item>
     </el-form>
     
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tabs type="card" v-model="activeName" @tab-click="handleClick">
       <el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
       <el-tab-pane :label="tabs.await" name="await"></el-tab-pane>
       <el-tab-pane :label="tabs.finished" name="finished"></el-tab-pane>

ruoyi-ui/src/views/flowable/task/todo/detail/index.vue

@@ -7,7 +7,7 @@
         <el-tag>任务节点:{{ taskName }}</el-tag>
         <el-button style="float: right;" size="mini" type="danger" @click="goBack">关闭</el-button>
       </div>
-      <el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
+      <el-tabs type="card" tab-position="top" v-model="activeName" @tab-click="handleClick">
         <!--表单信息-->
         <el-tab-pane label="表单信息" name="1">
           <el-col :span="16" :offset="4">

ruoyi-ui/src/views/project/attendance/attendanceDrawer.vue

@@ -5,7 +5,7 @@
                 <div>{{ title + " 【劳务实名管理】" }}</div>
             </template>
             <div>
-                <el-tabs v-model="activeName" @tab-click="handleClick">
+                <el-tabs type="card" v-model="activeName" @tab-click="handleClick">
                     <el-tab-pane label="考勤记录" name="first">
                         <main-index ref="main"></main-index>
                     </el-tab-pane>

ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue

@@ -4,7 +4,7 @@
       <template slot="title">
         <div>{{ drawerTitle + " 【材料取样复试】" }}</div>
       </template>
-      <el-tabs v-model="unitActiveName" style="margin-left: 20px; margin-right: 20px" @tab-click="getList">
+      <el-tabs type="card" v-model="unitActiveName" style="margin-left: 20px; margin-right: 20px" @tab-click="getList">
         <el-tab-pane v-for="(it, idx) in nodes" :label="it.unitName + ''" :name="it.unitId + ''"
           :key="idx"></el-tab-pane>
       </el-tabs>
@@ -39,7 +39,7 @@
         </el-col> -->
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
-      <el-tabs v-model="queryParams.activeName" @tab-click="getList" style="margin-left: 25px; margin-right: 25px">
+      <el-tabs type="card" v-model="queryParams.activeName" @tab-click="getList" style="margin-left: 25px; margin-right: 25px">
         <el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
         <el-tab-pane :label="tabs.jxz" name="jxz"></el-tab-pane>
         <el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane>

ruoyi-ui/src/views/project/checkDetection/index.vue

@@ -162,7 +162,7 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row> -->
-    <el-tabs v-model="queryParams.activeName" @tab-click="getList">
+    <el-tabs type="card" v-model="queryParams.activeName" @tab-click="getList">
       <el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
       <el-tab-pane :label="tabs.jxz" name="jxz"></el-tab-pane>
       <el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane

ruoyi-ui/src/views/project/costOutput/costMonth.vue

@@ -12,7 +12,7 @@
                     </div>
                         <el-button  slot="reference" size="mini" type="success" style="margin-right: 12px;" round>增加年份</el-button>
                     </el-popover>                    
-        <el-tabs v-model="activeName" >
+        <el-tabs type="card" v-model="activeName" >
             <el-tab-pane v-for="(it,idx) in monthInv" :label="''+it.year" :name="''+it.year" :key="idx">
                 <el-col v-for="(item,idxx) in it.value" :key="idxx" :span="12">
                     <el-form-item :label="names[item.month]"  class="w200" :class="item.money*1<0?'txt-error':''">

ruoyi-ui/src/views/project/costOutput/costOutputDrawer.vue

@@ -9,7 +9,7 @@
 
             <div style="margin-top:12px;" v-if="form.totalInv">
                 <el-form ref="form" label-width="100px">
-                    <el-tabs v-model="activeName" @tab-click="handleClick">
+                    <el-tabs type="card" v-model="activeName" @tab-click="handleClick">
                         <el-tab-pane label="总投资" name="first">
                             <el-form-item label="总投资" class="w400" :class="form.totalInv.money * 1 < 0 ? 'txt-error' : ''">
                                 <el-input-number :precision="4" v-model="form.totalInv.money" placeholder="请输入总投资">

ruoyi-ui/src/views/project/costOutput/costYear.vue

@@ -15,7 +15,7 @@
                     </el-popover>
 
         
-        <el-tabs v-model="activeName">
+        <el-tabs type="card" v-model="activeName">
             <el-tab-pane v-for="(it,idx) in yearInv" :label="''+it.year" :name="''+it.year" :key="idx">
                 <el-form-item label="年度投资"  class="w400"  :class="it.money*1<0?'txt-error':''">
                     <el-input-number :precision="4" v-model="it.money" placeholder="年度投资">                    

ruoyi-ui/src/views/project/materialSeal/index.vue

@@ -160,7 +160,7 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row> -->
-    <el-tabs v-model="queryParams.activeName" @tab-click="getList">
+    <el-tabs type="card" v-model="queryParams.activeName" @tab-click="getList">
       <el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
       <el-tab-pane :label="tabs.jxz" name="jxz"></el-tab-pane>
       <el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane

ruoyi-ui/src/views/project/materialSeal/projectMaterialSealDrawer.vue

@@ -4,7 +4,7 @@
       <template slot="title">
         <div>{{ title + " 【材料封样管理】" }}</div>
       </template>
-      <el-tabs v-model="unitActiveName" style="margin-left: 20px; margin-right: 20px" @tab-click="getList">
+      <el-tabs type="card" v-model="unitActiveName" style="margin-left: 20px; margin-right: 20px" @tab-click="getList">
         <el-tab-pane v-for="(it, idx) in nodes" :label="it.unitName + ''" :name="it.unitId + ''"
           :key="idx"></el-tab-pane>
       </el-tabs>
@@ -39,7 +39,7 @@
         </el-col> -->
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
-      <el-tabs v-model="queryParams.activeName" @tab-click="getList" style="margin-left: 25px; margin-right: 25px">
+      <el-tabs type="card" v-model="queryParams.activeName" @tab-click="getList" style="margin-left: 25px; margin-right: 25px">
         <el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
         <el-tab-pane :label="tabs.jxz" name="jxz"></el-tab-pane>
         <el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane>

ruoyi-ui/src/views/project/projectAuditinfo/index.vue

@@ -69,7 +69,7 @@
         </el-form-item>
       </el-form>
   
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tabs type="card" v-model="activeName" @tab-click="handleClick">
         <el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
         <el-tab-pane :label="tabs.await" name="await"></el-tab-pane>
         <el-tab-pane :label="tabs.finished" name="finished"></el-tab-pane

ruoyi-ui/src/views/project/projectChecking/index.vue

@@ -173,7 +173,7 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row> -->
-    <el-tabs v-model="queryParams.activeName" @tab-click="getList">
+    <el-tabs type="card" v-model="queryParams.activeName" @tab-click="getList">
       <el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
       <el-tab-pane :label="tabs.jxz" name="jxz"></el-tab-pane>
       <el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane

ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue

@@ -4,7 +4,7 @@
       <template slot="title">
         <div>{{ title + " 【举牌验收管理】" }}</div>
       </template>
-      <el-tabs v-model="unitActiveName" style="margin-left: 20px; margin-right: 20px" @tab-click="getList">
+      <el-tabs type="card" v-model="unitActiveName" style="margin-left: 20px; margin-right: 20px" @tab-click="getList">
         <el-tab-pane v-for="(it, idx) in nodes" :label="it.unitName + ''" :name="it.unitId + ''"
           :key="idx"></el-tab-pane>
       </el-tabs>
@@ -40,7 +40,7 @@
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
 
-      <el-tabs v-model="queryParams.activeName" @tab-click="getList" style="padding-left: 20px; padding-right: 20px">
+      <el-tabs type="card" v-model="queryParams.activeName" @tab-click="getList" style="padding-left: 20px; padding-right: 20px">
         <el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
         <el-tab-pane :label="tabs.jxz" name="jxz"></el-tab-pane>
         <el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane>

ruoyi-ui/src/views/project/projectCommittee/projectCommitteeDrawer.vue

@@ -5,7 +5,7 @@
                 <div>工委会管理</div>
             </template>
             <el-form ref="form" label-width="120px">
-                <el-tabs v-model="activeName" @tab-click="handleClick">
+                <el-tabs type="card" v-model="activeName" @tab-click="handleClick">
                     <el-tab-pane v-for="(dict, idx) in dict.type.project_working_type" :key="dict.value"
                         :label="dict.label" :name="'' + dict.value">
                         <el-row v-for="(dataItem, index) in datas[idx]" :key="idx + '-' + index">

ruoyi-ui/src/views/project/projectDeptWroks/projectDeptWroksDrawer.vue

@@ -10,7 +10,7 @@
       <template slot="title">
         <div>{{ title + " 【部门在册人员】" }}</div>
       </template>
-      <el-tabs v-model="activeName" style="padding-left: 20px" @tab-click="loadData">
+      <el-tabs type="card" v-model="activeName" style="padding-left: 20px" @tab-click="loadData">
         <el-tab-pane
           v-for="(it, idx) in nodes"
           :label="it.unitName + ''"

ruoyi-ui/src/views/project/projectMeasure/index.vue

@@ -172,7 +172,7 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row> -->
-    <el-tabs v-model="queryParams.activeName" @tab-click="getList">
+    <el-tabs type="card" v-model="queryParams.activeName" @tab-click="getList">
       <el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
       <el-tab-pane :label="tabs.jxz" name="jxz"></el-tab-pane>
       <el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane

ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue

@@ -4,7 +4,7 @@
       <template slot="title">
         <div>{{ title + " 【实测实量管理】" }}</div>
       </template>
-      <el-tabs v-model="unitActiveName" style="margin-left: 20px; margin-right: 20px" @tab-click="getList">
+      <el-tabs type="card" v-model="unitActiveName" style="margin-left: 20px; margin-right: 20px" @tab-click="getList">
         <el-tab-pane v-for="(it, idx) in nodes" :label="it.unitName + ''" :name="it.unitId + ''"
           :key="idx"></el-tab-pane>
       </el-tabs>
@@ -40,7 +40,7 @@
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
 
-      <el-tabs v-model="queryParams.activeName" @tab-click="getList" style="margin-left: 25px; margin-right: 25px">
+      <el-tabs type="card" v-model="queryParams.activeName" @tab-click="getList" style="margin-left: 25px; margin-right: 25px">
         <el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
         <el-tab-pane :label="tabs.jxz" name="jxz"></el-tab-pane>
         <el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane>

ruoyi-ui/src/views/project/projectPlan/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-tabs v-model="activeName" @tab-click="tabClick">
+    <el-tabs type="card" v-model="activeName" @tab-click="tabClick">
       <el-tab-pane label="城建项目计划" name="f"></el-tab-pane>
       <el-tab-pane label="重点项目计划" name="s"></el-tab-pane>
     </el-tabs>

ruoyi-ui/src/views/project/projectStandard/projectStandardDrawer.vue

@@ -8,7 +8,7 @@
                     </template>
                 </right-toolbar>
             </template>
-            <el-tabs v-model="activeName" :key="elKey">
+            <el-tabs type="card" v-model="activeName" :key="elKey">
                 <el-tab-pane :label="'' + it.deptName" :name="'' + it.deptId" :key="idx" v-for="(it, idx) in depts">
                     <div>
                         <el-button type="primary" @click="doAdd">增加</el-button>

ruoyi-ui/src/views/project/surBuildNode/buildNodeDrawer.vue

@@ -35,7 +35,7 @@
           </template>
         </right-toolbar>
       </template>
-      <el-tabs v-model="activeName">
+      <el-tabs type="card" v-model="activeName">
         <el-tab-pane
           :label="'' + it.nodeText"
           :name="'' + it.id"

ruoyi-ui/src/views/project/surProjectAttendance/attendanceDrawer.vue

@@ -10,7 +10,7 @@
       <template slot="title">
         <div>{{ title + " 【今日出勤】" }}</div>
       </template>
-      <el-tabs v-model="activeName" style="padding-left: 20px" @tab-click="loadData">
+      <el-tabs type="card" v-model="activeName" style="padding-left: 20px" @tab-click="loadData">
         <el-tab-pane
           v-for="(it, idx) in nodes"
           :label="it.unitName + ''"

ruoyi-ui/src/views/project/surProjectInsurance/insuranceDrawer.vue

@@ -10,7 +10,7 @@
       <template slot="title">
         <div>{{ title + " 【项目保险管理】" }}</div>
       </template>
-      <el-tabs v-model="activeName" style="padding-left: 20px" @tab-click="getList">
+      <el-tabs type="card" v-model="activeName" style="padding-left: 20px" @tab-click="getList">
         <el-tab-pane
           v-for="(it, idx) in nodes"
           :label="it.unitName + ''"

ruoyi-ui/src/views/project/surProjectQuarterlyAssess/assessItem.vue

@@ -1,7 +1,7 @@
 <template>
     <div v-if="datas && datas.length > 0">
 
-        <el-tabs v-model="activeNames">
+        <el-tabs type="card" v-model="activeNames">
             <el-tab-pane :label="'第' + it.quarterly + '季度'" :name="'' + it.quarterly" v-for="(it, idx) in datas" :key="idx">
                 <el-form label-width="120px" :ref="'frm' + it.quarterly" :model="it" :rules="rules">
                     <el-row v-if="1==2">

ruoyi-ui/src/views/project/surProjectSpecial/index.vue

@@ -121,7 +121,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tabs type="card" v-model="activeName" @tab-click="handleClick">
       <el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
       <el-tab-pane :label="tabs.wgq" name="wgq"></el-tab-pane>
       <el-tab-pane :label="tabs.ygq" name="ygq"></el-tab-pane>

ruoyi-ui/src/views/project/surProjectSpecial/surProjectSpecialDrawer.vue

@@ -10,7 +10,7 @@
       <template slot="title">
         <div>{{ drawerTitle + " 【特种人员管理】" }}</div>
       </template>
-      <el-tabs
+      <el-tabs type="card"
         v-model="unitActiveName"
         style="margin-left: 20px; margin-right: 20px"
         @tab-click="getList"
@@ -67,7 +67,7 @@
           @queryTable="getList"
         ></right-toolbar>
       </el-row>
-      <el-tabs
+      <el-tabs type="card"
         v-model="activeName"
         @tab-click="handleClick"
         style="margin-left: 25px; margin-right: 25px"

ruoyi-ui/src/views/system/user/index.vue

@@ -22,7 +22,7 @@
             ref="tree"
             node-key="id"
             accordion
-            default-expanded-keys="100,101"
+            :default-expanded-keys="defaultEK"
             highlight-current
             @node-click="handleNodeClick"
           />
@@ -30,7 +30,14 @@
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
           <el-form-item label="登录账号" prop="userName">
             <el-input
               v-model="queryParams.userName"
@@ -87,8 +94,16 @@
             ></el-date-picker>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</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>
 
@@ -101,7 +116,8 @@
               size="mini"
               @click="handleAdd"
               v-hasPermi="['system:user:add']"
-            >新增</el-button>
+              >新增</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -112,7 +128,8 @@
               :disabled="single"
               @click="handleUpdate"
               v-hasPermi="['system:user:edit']"
-            >修改</el-button>
+              >修改</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -123,7 +140,8 @@
               :disabled="multiple"
               @click="handleDelete"
               v-hasPermi="['system:user:remove']"
-            >删除</el-button>
+              >删除</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -133,7 +151,8 @@
               size="mini"
               @click="handleImport"
               v-hasPermi="['system:user:import']"
-            >导入</el-button>
+              >导入</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -143,19 +162,68 @@
               size="mini"
               @click="handleExport"
               v-hasPermi="['system:user:export']"
-            >导出</el-button>
+              >导出</el-button
+            >
           </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+            :columns="columns"
+          ></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" stripe>
+        <el-table
+          v-loading="loading"
+          :data="userList"
+          @selection-change="handleSelectionChange"
+          stripe
+        >
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
+          <el-table-column
-          <el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+            label="用户编号"
-          <el-table-column label="姓名" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+            align="center"
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+            key="userId"
-          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+            prop="userId"
-          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+            v-if="columns[0].visible"
+          />
+          <el-table-column
+            label="登录账号"
+            align="center"
+            key="userName"
+            prop="userName"
+            v-if="columns[1].visible"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="姓名"
+            align="center"
+            key="nickName"
+            prop="nickName"
+            v-if="columns[2].visible"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="部门"
+            align="center"
+            key="deptName"
+            prop="dept.deptName"
+            v-if="columns[3].visible"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="手机号码"
+            align="center"
+            key="phonenumber"
+            prop="phonenumber"
+            v-if="columns[4].visible"
+            width="120"
+          />
+          <el-table-column
+            label="状态"
+            align="center"
+            key="status"
+            v-if="columns[5].visible"
+          >
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.status"
@@ -165,7 +233,13 @@
               ></el-switch>
             </template>
           </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+          <el-table-column
+            label="创建时间"
+            align="center"
+            prop="createTime"
+            v-if="columns[6].visible"
+            width="160"
+          >
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
@@ -183,21 +257,37 @@
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['system:user:edit']"
-              >修改</el-button>
+                >修改</el-button
+              >
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['system:user:remove']"
-              >删除</el-button>
+                >删除</el-button
-              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
+              >
-                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
+              <el-dropdown
+                size="mini"
+                @command="(command) => handleCommand(command, scope.row)"
+                v-hasPermi="['system:user:resetPwd', 'system:user:edit']"
+              >
+                <el-button size="mini" type="text" icon="el-icon-d-arrow-right"
+                  >更多</el-button
+                >
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
+                  <el-dropdown-item
-                    v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
+                    command="handleResetPwd"
-                  <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
+                    icon="el-icon-key"
-                    v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
+                    v-hasPermi="['system:user:resetPwd']"
+                    >重置密码</el-dropdown-item
+                  >
+                  <el-dropdown-item
+                    command="handleAuthRole"
+                    icon="el-icon-circle-check"
+                    v-hasPermi="['system:user:edit']"
+                    >分配角色</el-dropdown-item
+                  >
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
@@ -215,7 +305,14 @@
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="780px"
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -225,14 +322,24 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+              <treeselect
+                v-model="form.deptId"
+                :options="deptOptions"
+                :show-count="true"
+                placeholder="请选择归属部门"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+              <el-input
+                v-model="form.phonenumber"
+                placeholder="请输入手机号码"
+                maxlength="11"
+                :disabled="form.userId != undefined"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -243,20 +350,38 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="登录账号" prop="userName">
+            <el-form-item
-              <el-input v-model="form.userName" placeholder="请输入登录账号" maxlength="30" />
+              v-if="form.userId == undefined"
+              label="登录账号"
+              prop="userName"
+            >
+              <el-input
+                v-model="form.userName"
+                placeholder="请输入登录账号"
+                maxlength="30"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
+            <el-form-item
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
+              v-if="form.userId == undefined"
+              label="用户密码"
+              prop="password"
+            >
+              <el-input
+                v-model="form.password"
+                placeholder="请输入用户密码"
+                type="password"
+                maxlength="20"
+                show-password
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="用户性别">
-              <el-select v-model="form.sex" placeholder="请选择性别">
+              <el-select v-model="form.sex" placeholder="请选择性别" style="width: 100%">
                 <el-option
                   v-for="dict in dict.type.sys_user_sex"
                   :key="dict.value"
@@ -268,12 +393,13 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
+              <el-radio-group v-model="form.status" style="width: 100%">
                 <el-radio
                   v-for="dict in dict.type.sys_normal_disable"
                   :key="dict.value"
                   :label="dict.value"
-                >{{dict.label}}</el-radio>
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -281,7 +407,12 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="岗位">
-              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
+              <el-select
+                v-model="form.postIds"
+                multiple
+                placeholder="请选择岗位"
+                style="width: 100%"
+              >
                 <el-option
                   v-for="item in postOptions"
                   :key="item.postId"
@@ -294,7 +425,12 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="角色">
-              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
+              <el-select
+                v-model="form.roleIds"
+                multiple
+                placeholder="请选择角色"
+                style="width: 100%"
+              >
                 <el-option
                   v-for="item in roleOptions"
                   :key="item.roleId"
@@ -309,15 +445,28 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <div class="page-warning">
-        <p><strong style="color: #E6A23C;">“总包公司个人”</strong> 有项目人员中担任职务项目的权限。</p>
+        <p>
-        <p><strong style="color: #E6A23C;">“【工作流】”</strong>标记角色，对应项目审批相关。</p>
+          <strong style="color: #e6a23c">“总包公司个人”</strong>
-        <p><strong style="color: #67C23A;">监理单位，分包单位同上。总包公司权限大于个人权限，请选择角色时以个人角色为主</strong></p>
+          有项目人员中担任职务项目的权限。
+        </p>
+        <p>
+          <strong style="color: #e6a23c">“【工作流】”</strong>标记角色，对应项目审批相关。
+        </p>
+        <p>
+          <strong style="color: #67c23a"
+            >监理单位，分包单位同上。总包公司权限大于个人权限，请选择角色时以个人角色为主</strong
+          >
+        </p>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -326,7 +475,14 @@
     </el-dialog>
 
     <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-dialog
+      :title="upload.title"
+      :visible.sync="upload.open"
+      width="400px"
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
       <el-upload
         ref="upload"
         :limit="1"
@@ -346,7 +502,13 @@
             <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+          <el-link
+            type="primary"
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate"
+            >下载模板</el-link
+          >
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -358,14 +520,23 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
+import {
+  listUser,
+  getUser,
+  delUser,
+  addUser,
+  updateUser,
+  resetUserPwd,
+  changeUserStatus,
+  deptTreeSelect,
+} from "@/api/system/user";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "User",
-  dicts: ['sys_normal_disable', 'sys_user_sex'],
+  dicts: ["sys_normal_disable", "sys_user_sex"],
   components: { Treeselect },
   data() {
     return {
@@ -403,7 +574,7 @@ export default {
       form: {},
       defaultProps: {
         children: "children",
-        label: "label"
+        label: "label",
       },
       // 用户导入参数
       upload: {
@@ -418,7 +589,7 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/system/user/importData"
+        url: process.env.VUE_APP_BASE_API + "/system/user/importData",
       },
       // 查询参数
       queryParams: {
@@ -427,7 +598,7 @@ export default {
         userName: undefined,
         phonenumber: undefined,
         status: undefined,
-        deptId: undefined
+        deptId: undefined,
       },
       // 列信息
       columns: [
@@ -437,54 +608,58 @@ export default {
         { key: 3, label: `部门`, visible: true },
         { key: 4, label: `手机号码`, visible: true },
         { key: 5, label: `状态`, visible: true },
-        { key: 6, label: `创建时间`, visible: true }
+        { key: 6, label: `创建时间`, visible: true },
       ],
+      defaultEK:[],
       // 表单校验
       rules: {
-        deptId: [
+        deptId: [{ required: true, message: "用户部门不能为空", trigger: "blur" }],
-          { required: true, message: "用户部门不能为空", trigger: "blur" }
-        ],
         userName: [
           { required: true, message: "登录账号不能为空", trigger: "blur" },
-          { min: 2, max: 20, message: '登录账号长度必须介于 2 和 20 之间', trigger: 'blur' }
+          {
-        ],
+            min: 2,
-        nickName: [
+            max: 20,
-          { required: true, message: "姓名不能为空", trigger: "blur" }
+            message: "登录账号长度必须介于 2 和 20 之间",
+            trigger: "blur",
+          },
         ],
+        nickName: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
         password: [
           { required: true, message: "用户密码不能为空", trigger: "blur" },
-          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
+          {
-        ],
+            min: 5,
-        roleIds: [
+            max: 20,
-          { required: true, message: "用户角色不能为空", trigger: "blur" }
+            message: "用户密码长度必须介于 5 和 20 之间",
+            trigger: "blur",
+          },
         ],
         email: [
           {
             type: "email",
             message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
+            trigger: ["blur", "change"],
-          }
+          },
         ],
         phonenumber: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号码",
-            trigger: "blur"
+            trigger: "blur",
-          }
+          },
-        ]
+        ],
-      }
+      },
     };
   },
   watch: {
     // 根据名称筛选部门树
     deptName(val) {
       this.$refs.tree.filter(val);
-    }
+    },
   },
   created() {
     this.getList();
     this.getDeptTree();
-    this.getConfigKey("sys.user.initPassword").then(response => {
+    this.getConfigKey("sys.user.initPassword").then((response) => {
       this.initPassword = response.msg;
     });
   },
@@ -492,17 +667,17 @@ export default {
     /** 查询用户列表 */
     getList() {
       this.loading = true;
-      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listUser(this.addDateRange(this.queryParams, this.dateRange)).then((response) => {
         this.userList = response.rows;
         this.total = response.total;
         this.loading = false;
-        }
+      });
-      );
     },
     /** 查询部门下拉树结构 */
     getDeptTree() {
-      deptTreeSelect().then(response => {
+      deptTreeSelect().then((response) => {
         this.deptOptions = response.data;
+        this.defaultEK.push(101);
       });
     },
     // 筛选节点
@@ -518,11 +693,15 @@ export default {
     // 用户状态修改
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
+      this.$modal
+        .confirm('确认要"' + text + '""' + row.userName + '"用户吗？')
+        .then(function () {
           return changeUserStatus(row.userId, row.status);
-      }).then(() => {
+        })
+        .then(() => {
           this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
+        })
+        .catch(function () {
           row.status = row.status === "0" ? "1" : "0";
         });
     },
@@ -545,7 +724,7 @@ export default {
         status: "0",
         remark: undefined,
         postIds: [],
-        roleIds: []
+        roleIds: [],
       };
       this.resetForm("form");
     },
@@ -564,7 +743,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.userId);
+      this.ids = selection.map((item) => item.userId);
       this.single = selection.length != 1;
       this.multiple = !selection.length;
     },
@@ -584,7 +763,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      getUser().then(response => {
+      getUser().then((response) => {
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
         this.open = true;
@@ -596,7 +775,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const userId = row.userId || this.ids;
-      getUser(userId).then(response => {
+      getUser(userId).then((response) => {
         this.form = response.data;
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
@@ -614,12 +793,14 @@ export default {
         cancelButtonText: "取消",
         closeOnClickModal: false,
         inputPattern: /^.{5,20}$/,
-        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
+        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
-      }).then(({ value }) => {
+      })
-          resetUserPwd(row.userId, value).then(response => {
+        .then(({ value }) => {
+          resetUserPwd(row.userId, value).then((response) => {
             this.$modal.msgSuccess("修改成功，新密码是：" + value);
           });
-        }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 分配角色操作 */
     handleAuthRole: function (row) {
@@ -628,16 +809,24 @@ export default {
     },
     /** 提交按钮 */
     submitForm: function () {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
+          if (this.form.roleIds.length == 0) {
+            this.$modal.msgError("请至少选择一个角色！");
+            return false;
+          }
           if (this.form.userId) {
-            updateUser(this.form).then(response => {
+            updateUser(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addUser(this.form).then(response => {
+            if (this.form.phonenumber != this.form.userName) {
+              this.$modal.msgError("手机号和登录账号不一致！");
+              return false;
+            }
+            addUser(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -649,18 +838,26 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const userIds = row.userId || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
+      this.$modal
+        .confirm('是否确认删除用户编号为"' + userIds + '"的数据项？')
+        .then(function () {
           return delUser(userIds);
-      }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/user/export', {
+      this.download(
-        ...this.queryParams
+        "system/user/export",
-      }, `user_${new Date().getTime()}.xlsx`)
+        {
+          ...this.queryParams,
+        },
+        `user_${new Date().getTime()}.xlsx`
+      );
     },
     /** 导入按钮操作 */
     handleImport() {
@@ -669,8 +866,11 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      this.download('system/user/importTemplate', {
+      this.download(
-      }, `user_template_${new Date().getTime()}.xlsx`)
+        "system/user/importTemplate",
+        {},
+        `user_template_${new Date().getTime()}.xlsx`
+      );
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
@@ -681,14 +881,20 @@ export default {
       this.upload.open = false;
       this.upload.isUploading = false;
       this.$refs.upload.clearFiles();
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.$alert(
+        "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+          response.msg +
+          "</div>",
+        "导入结果",
+        { dangerouslyUseHTMLString: true }
+      );
       this.getList();
     },
     // 提交上传文件
     submitFileForm() {
       this.$refs.upload.submit();
-    }
+    },
-  }
+  },
 };
 </script>
 <style lang="scss">
@@ -696,7 +902,7 @@ export default {
   padding: 8px 16px;
   background-color: #f0f9eb;
   border-radius: 4px;
-    border-left: 5px solid #67C23A;
+  border-left: 5px solid #67c23a;
   margin: 20px 0;
   font-size: 13px;
   margin-top: 10px;

ruoyi-ui/src/views/system/user/profile/index.vue

@@ -44,7 +44,7 @@
           <div slot="header" class="clearfix">
             <span>基本资料</span>
           </div>
-          <el-tabs v-model="activeTab">
+          <el-tabs type="card" v-model="activeTab">
             <el-tab-pane label="基本资料" name="userinfo">
               <userInfo :user="user" />
             </el-tab-pane>

ruoyi-ui/src/views/tool/build/RightPanel.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="right-board">
-    <el-tabs v-model="currentTab" class="center-tabs">
+    <el-tabs type="card" v-model="currentTab" class="center-tabs">
       <el-tab-pane label="组件属性" name="field" />
       <el-tab-pane label="表单属性" name="form" />
     </el-tabs>

ruoyi-ui/src/views/tool/gen/index.vue

@@ -159,7 +159,7 @@
     />
     <!-- 预览界面 -->
     <el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body class="scrollbar" :close-on-click-modal="false" :close-on-press-escape="false">
-      <el-tabs v-model="preview.activeName">
+      <el-tabs type="card" v-model="preview.activeName">
         <el-tab-pane
           v-for="(value, key) in preview.data"
           :label="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"

ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue

@@ -144,7 +144,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>-->
 
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tabs type="card" v-model="activeName" @tab-click="handleClick">
       <el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
       <el-tab-pane :label="tabs.dzg" name="dzg"></el-tab-pane>
       <el-tab-pane :label="tabs.dqr" name="dqr"></el-tab-pane>

ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue

@@ -144,7 +144,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>-->
 
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tabs type="card" v-model="activeName" @tab-click="handleClick">
       <el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
       <el-tab-pane :label="tabs.dzg" name="dzg"></el-tab-pane>
       <el-tab-pane :label="tabs.dqr" name="dqr"></el-tab-pane>

ruoyi-ui/src/views/video/aiBoxProjectConfig/aiBoxVideoConfigDrawer.vue

@@ -10,7 +10,7 @@
       <template slot="title">
         <div>{{ drawerTitle + " 【AI视频配置】" }}</div>
       </template>
-      <el-tabs
+      <el-tabs type="card"
         v-model="unitActiveName"
         style="margin-left: 20px; margin-right: 20px"
         @tab-click="getList"

ruoyi-ui/src/views/video/videoConfig/videoConfigDrawer.vue

@@ -10,7 +10,7 @@
       <template slot="title">
         <div>{{ drawerTitle + " 【视频配置】" }}</div>
       </template>
-      <el-tabs
+      <el-tabs type="card"
         v-model="unitActiveName"
         style="margin-left: 20px; margin-right: 20px"
         @tab-click="getList"

ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue

@@ -10,7 +10,7 @@
       <template slot="title">
         <div>{{ drawerTitle + " 【应急演练管理】" }}</div>
       </template>
-      <el-tabs
+      <el-tabs type="card"
         v-model="activeName"
         style="margin-left: 20px; margin-right: 20px"
         @tab-click="getworkTrainList"

ruoyi-ui/src/views/work/workFile/indexViewDrawer.vue

@@ -9,7 +9,7 @@
         <template slot="title">
           <div>{{ drawerTitle + " 【阅读详情】" }}</div>
         </template>
-        <el-tabs
+        <el-tabs type="card"
           v-model="activeName"
           style="margin-left: 20px; margin-right: 20px"
           @tab-click="getList"

ruoyi-ui/src/views/work/workJournalism/index.vue

@@ -85,7 +85,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tabs type="card" v-model="activeName" @tab-click="handleClick">
       <el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
       <el-tab-pane :label="tabs.yfb" name="yfb"></el-tab-pane>
       <el-tab-pane :label="tabs.dfb" name="dfb"></el-tab-pane>

ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue

@@ -10,7 +10,7 @@
       <template slot="title">
         <div>{{ drawerTitle + " 【教育培训管理】" }}</div>
       </template>
-      <el-tabs
+      <el-tabs type="card"
         v-model="activeName"
         style="margin-left: 20px; margin-right: 20px"
         @tab-click="getworkTrainList"

ruoyi-ui/src/views/wxsetting/labourComplaint/index.vue

@@ -1,238 +1,715 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" v-loading="loading">
-    <el-form ref="form" label-position="top" :model="form" :rules="rules" label-width="180px">
+    <transition v-if="state == 'INIT'" name="el-zoom-in-center">
-      <el-form-item label="投诉人姓名" prop="name">
+      <div v-show="state == 'INIT'" class="transition-box">
-        <el-input v-model="form.name" placeholder="请输入投诉人姓名" />
+        <el-alert
+          v-if="display"
+          show-icon
+          title="温馨提示"
+          type="info"
+          description="请如实准确的填写劳资投诉信息，投诉受理后我们会快速响应并处理。请勿重复提交投诉！"
+          close-text="查询投诉进度"
+          @close="showSearch"
+        >
+        </el-alert>
+        <el-form
+          ref="form"
+          label-position="top"
+          :model="form"
+          :rules="rules"
+          label-width="180px"
+        >
+          <el-form-item label="投诉人姓名" prop="laborName">
+            <el-input v-model="form.laborName" placeholder="请输入投诉人姓名" />
           </el-form-item>
-      <el-form-item label="投诉人联系电话" prop="phone">
+          <el-form-item label="投诉人手机号码" prop="laborPhone">
-        <el-input v-model="form.phone" placeholder="请输入投诉人联系电话" />
+            <el-input
+              v-model="form.laborPhone"
+              type="number"
+              pattern="[0-9]*"
+              placeholder="请输入投诉人手机号码"
+            />
           </el-form-item>
-      <el-form-item label="投诉人身份证号码" prop="cardId">
+          <el-form-item label="投诉人身份证号码" prop="laborCardId">
-        <el-input v-model="form.cardId" placeholder="请输入投诉人身份证号码" />
+            <el-input v-model="form.laborCardId" placeholder="请输入投诉人身份证号码" />
           </el-form-item>
-      <el-form-item label="所属项目名称" prop="projectName">
+          <el-form-item label="所属项目单位" prop="projectId">
-        <el-input v-model="form.projectName" placeholder="请输入所属项目名称" />
+            <el-select
+              v-model="form.projectId"
+              filterable
+              placeholder="请选择所属项目单位"
+              @change="projectChange"
+              class="sel"
+            >
+              <el-option
+                v-for="item in projectOptions"
+                :key="item.id"
+                :label="item.projectName"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
           </el-form-item>
-      <el-form-item label="总承包单位" prop="deptName">
+          <el-form-item label="所属总承包单位" prop="deptId" v-if="form.projectId">
-        <el-input v-model="form.deptName" placeholder="请输入总承包单位" />
+            <el-select
+              v-model="form.deptId"
+              placeholder="请选择所属总承包单位"
+              @change="deptChange"
+              class="sel"
+            >
+              <el-option
+                v-for="item in deptOptions"
+                :key="'dept' + item.unitId"
+                :label="item.unitName"
+                :value="item.unitId"
+              >
+              </el-option>
+            </el-select>
           </el-form-item>
-      <el-form-item label="劳务单位名称" prop="subDeptName">
+          <el-form-item label="所属劳务分包单位" prop="subDeptId" v-if="form.projectId">
-        <el-input v-model="form.subDeptName" placeholder="请输入劳务单位名称" />
+            <el-select
+              v-model="form.subDeptId"
+              placeholder="请选择所属劳务分包单位"
+              @change="subDeptChange"
+              class="sel"
+            >
+              <el-option
+                v-for="item in subDeptOptions"
+                :key="'subDept' + item.unitId"
+                :label="item.unitName"
+                :value="item.unitId"
+              >
+              </el-option>
+            </el-select>
           </el-form-item>
-      <el-form-item label="欠薪人数" prop="number">
+          <el-form-item label="欠薪人数" prop="laborNumber">
-        <el-input v-model="form.number" placeholder="请输入欠薪人数" />
+            <el-input
+              v-model="form.laborNumber"
+              type="number"
+              pattern="[0-9]*"
+              placeholder="请输入欠薪人数"
+              max="99999"
+            >
+              <i slot="suffix">人</i>
+            </el-input>
           </el-form-item>
-      <el-form-item label="欠薪金额" prop="amount">
+          <el-form-item label="欠薪金额" prop="laborAmount">
-        <el-input v-model="form.amount" placeholder="请输入欠薪金额" />
+            <el-input
+              v-model="form.laborAmount"
+              type="number"
+              pattern="[0-9]*"
+              placeholder="请输入欠薪金额"
+              max="999999999"
+            >
+              <i slot="suffix">元</i>
+            </el-input>
           </el-form-item>
-      <el-form-item label="拖欠原因说明" prop="remark">
+          <el-form-item label="拖欠原因说明" prop="laborReason">
-        <el-input type="textarea" rows="3" v-model="form.remark" placeholder="请输入拖欠原因说明" />
+            <el-input
+              v-model="form.laborReason"
+              type="textarea"
+              rows="3"
+              placeholder="请输入拖欠原因说明"
+            />
           </el-form-item>
           <el-form-item label="凭证附件" prop="files">
             <image-upload v-model="form.files" :limit="9" />
           </el-form-item>
         </el-form>
-    <div style="text-align: center;">
+        <div style="text-align: center; padding-bottom: 20px">
-      <el-button round icon="el-icon-finished" type="primary" @click="submitForm" style="width:90%;background-color: #409eff;border-color: #409eff;">确 定 提 交 投 诉</el-button>
+          <el-button
+            round
+            icon="el-icon-finished"
+            type="primary"
+            @click="submitForm"
+            style="width: 90%; background-color: #409eff; border-color: #409eff"
+            >确 定 提 交 投 诉</el-button
+          >
+        </div>
+      </div>
+    </transition>
+    <transition v-if="state == 'OK'" name="el-zoom-in-center">
+      <div v-show="state == 'OK'" class="transition-box">
+        <el-result
+          style="margin-top: 50px"
+          icon="success"
+          title="投诉成功"
+          subTitle="我们已收到您的劳资投诉，问题已提交相关部门审核。"
+        >
+          <template slot="extra">
+            <el-button
+              type="primary"
+              icon="el-icon-thumb"
+              size="medium"
+              plain
+              round
+              style="
+                width: 100%;
+                background-color: #409eff;
+                border-color: #409eff;
+                color: #ffffff;
+              "
+              @click="findFlowInfos"
+              :disabled="disabled"
+              :class="disabled ? 'button-dis' : 'button-active'"
+              >{{ buttonText }}</el-button
+            >
+          </template>
+        </el-result>
+      </div>
+    </transition>
+    <transition v-if="state == 'NO'" name="el-zoom-in-center">
+      <div v-show="state == 'NO'" class="transition-box">
+        <el-result
+          style="margin-top: 50px"
+          icon="warning"
+          title="投诉失败"
+          subTitle="我们已收到您的劳资投诉，问题已提交相关部门审核，请勿重复投诉。"
+        >
+          <template slot="extra">
+            <el-button
+              type="primary"
+              icon="el-icon-thumb"
+              size="medium"
+              style="
+                width: 100%;
+                background-color: #409eff;
+                border-color: #409eff;
+                color: #ffffff;
+              "
+              @click="findFlowInfos"
+              :disabled="disabled"
+              :class="disabled ? 'button-dis' : 'button-active'"
+              >{{ buttonText }}</el-button
+            >
+          </template>
+        </el-result>
+      </div>
+    </transition>
+    <transition v-if="state == 'QUERY'" name="el-zoom-in-center">
+      <div v-show="state == 'QUERY'" class="transition-box">
+        <el-alert
+          v-if="display"
+          show-icon
+          title="温馨提示"
+          type="info"
+          description="请输入身份证号码查询投诉进度及投诉结果！"
+          close-text="返回投诉主页"
+          @close="showIndex"
+        >
+        </el-alert>
+        <el-form
+          ref="queryForm"
+          :model="queryForm"
+          :rules="rules"
+          style="margin-top: 30px"
+        >
+          <el-form-item prop="laborCardId">
+            <el-input
+              v-model="queryForm.laborCardId"
+              placeholder="请输入投诉人身份证号码查询"
+            />
+          </el-form-item>
+        </el-form>
+        <div style="text-align: center">
+          <el-button
+            round
+            icon="el-icon-thumb"
+            type="primary"
+            @click="submitQuery"
+            :disabled="disabled"
+            :class="disabled ? 'button-dis' : 'button-active'"
+            >{{ buttonText }}</el-button
+          >
+        </div>
+      </div>
+    </transition>
+    <div class="inspect_max" v-if="showInspect">
+      <div class="inspect_list">
+        <div class="inspect_for" v-for="(item, index) in flowLabours">
+          <div class="inspect_for_bgd">
+            <div class="inspect_list_title">
+              <div class="inspect_list_title_label inspect_list_title_width">
+                <div class="inspect_list_title_number">
+                  {{ index < 9 ? "0" + (index + 1) : index + 1 }}
+                </div>
+                <div class="module_title module_title_flex inspect_list_title_text">
+                  投诉时间：{{ item.createTime }}
+                </div>
+              </div>
+            </div>
+            <div
+              :class="
+                item.approveStatus == '100'
+                  ? 'inspect_shtg'
+                  : item.approveStatus % 10 == 0
+                  ? 'inspect_shz'
+                  : 'inspect_shbh'
+              "
+            >
+              <div class="inspect_list_info_details">
+                <div class="inspect_list_info_data">
+                  <div class="inspect_list_info_data_prop">
+                    项目名称：{{ item.projectName }}
+                  </div>
+                  <div class="inspect_list_info_data_prop">
+                    总包单位：{{ item.deptName }}
+                  </div>
+                  <div class="inspect_list_info_data_prop" v-if="item.subDeptId">
+                    分包单位：{{ item.subDeptName }}
+                  </div>
+                  <div class="inspect_list_info_data_prop">
+                    欠薪人数：{{ item.laborNumber }} <el-tag size="small">人</el-tag>
+                  </div>
+                  <div class="inspect_list_info_data_prop">
+                    欠薪金额：{{ item.laborAmount }} <el-tag size="small">元</el-tag>
+                  </div>
+                  <div class="inspect_list_info_data_prop" v-if="item.files">
+                    <image-preview
+                      v-for="(file, idx) in item.files.split(',')"
+                      v-show="idx < 3"
+                      :src="file"
+                      :width="90"
+                      :height="90"
+                    />
+                  </div>
+                </div>
+              </div>
+              <div class="inspect_list_info_position">
+                原因说明：{{ item.laborReason }}
+              </div>
+              <div class="inspect_list_info_data_prop" style="text-align: center">
+                <el-button
+                  type="text"
+                  style="color: #1890ff"
+                  @click="showDetail(item.id, index)"
+                >
+                  <i class="el-icon-d-arrow-right"></i>
+                  {{ nav == index ? "收起" : "展开" }}流程详细信息
+                  <i class="el-icon-d-arrow-left"></i>
+                </el-button>
+              </div>
+              <div class="inspect_list_info_data_prop block" v-show="nav == index">
+                <el-timeline>
+                  <el-timeline-item
+                    v-for="(node, idx) in flowLabourNodes"
+                    :key="'fns' + idx"
+                    :icon="
+                      node.flowNode % 10 == 0
+                        ? 'el-icon-circle-check'
+                        : 'el-icon-circle-close'
+                    "
+                    :color="node.flowNode % 10 == 0 ? '#0bbd87' : '#f56c6c'"
+                    :type="node.flowNode % 10 == 0 ? 'success' : 'danger'"
+                    size="normal"
+                    :timestamp="node.createTime"
+                  >
+                    {{
+                      node.flowNode == "0"
+                        ? node.createBy + " 提交投诉"
+                        : node.flowNodeName
+                    }}
+                    <el-card shadow="never" v-show="node.flowNode != '0'">
+                      <p>{{ node.flowComment }}</p>
+                      <p v-if="node.files">
+                        <image-preview
+                          v-for="(file, idx) in node.files.split(',')"
+                          :src="file"
+                          :width="50"
+                          :height="50"
+                        />
+                      </p>
+                    </el-card>
+                  </el-timeline-item>
+                </el-timeline>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div v-if="flowLabours.length == 0">
+        <div style="padding-top: 70px; text-align: -webkit-center">
+          <el-image
+            src="https://szgcwx.jhncidg.com/staticFiles/nodata.png"
+            style="width: 200px; height: 135px"
+          ></el-image>
+          <div style="color: #a5abbb; margin-top: 20px">暂 无 投 诉 信 息</div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
 import {
-  listWxMenConfig,
+  addFlowLabourInfo,
-  getWxMenConfig,
+  findMyFlowLabours,
-  delWxMenConfig,
+  findMyFlowLabourNodes,
-  addWxMenConfig,
+} from "@/api/flow/flowLabourInfo";
-  updateWxMenConfig,
-} from "@/api/wxsetting/wxMenConfig";
-import { listRole } from "@/api/system/role";
 export default {
-  name: "WxMenConfig",
+  name: "labourComplaint",
-  dicts: ["sys_wechat_menu_type", "sys_common_isdel"],
   data() {
     return {
+      state: "QUERY",
       // 遮罩层
-      loading: true,
+      loading: false,
+      display: true,
+      showInspect: false,
       // 表单参数
       form: {},
+      queryForm: {},
+      // 选项列表
+      projectOptions: [],
+      deptOptions: [],
+      subDeptOptions: [],
+      flowLabours: [],
+      flowLabourNodes: [],
+      nav: null,
       // 表单校验
       rules: {
-        name: [
+        laborName: [{ required: true, message: "请输入投诉人名称", trigger: "blur" }],
-          { required: true, message: "请选择文件归属", trigger: "blur" }
+        laborPhone: [
-        ],
+          { required: true, message: "请输入投诉人手机号码", trigger: "blur" },
-        phone:[
+          {
-         { required: true, message: "请选择子公司", trigger: "blur" }
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-        ],
+            message: "请输入正确的手机号码",
-        cardId: [
+            trigger: "blur",
-          { required: true, message: "请选择文件归属", trigger: "blur" }
-        ],
-        projectName:[
-         { required: true, message: "请选择子公司", trigger: "blur" }
-        ],
-        deptName: [
-          { required: true, message: "请选择文件归属", trigger: "blur" }
-        ],
-        subDeptName:[
-         { required: true, message: "请选择子公司", trigger: "blur" }
-        ],
-        number: [
-          { required: true, message: "请选择文件归属", trigger: "blur" }
-        ],
-        amount:[
-         { required: true, message: "请选择子公司", trigger: "blur" }
-        ],
-        remark: [
-          { required: true},
-          { max: 200,message: "最多输入200字符" }
-        ]
           },
+        ],
+        laborCardId: [
+          { required: true, message: "请输入投诉人身份证号", trigger: "blur" },
+          {
+            pattern: /^[1-9]\d{5}(18|19|20|21|22)?\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|[Xx])$/,
+            message: "请输入正确的身份证号",
+            trigger: "blur",
+          },
+        ],
+        projectId: [{ required: true, message: "请选择所属项目单位", trigger: "blur" }],
+        deptId: [{ required: true, message: "请选择所属总承包单位", trigger: "blur" }],
+        subDeptId: [
+          { required: true, message: "请选择所属劳务分包单位", trigger: "blur" },
+        ],
+        laborNumber: [
+          { required: true, message: "请输入欠薪人数", trigger: "blur" },
+          {
+            min: 0,
+            max: 6,
+            message: "输入的数值过大，请确认后重新输入",
+            trigger: "blur",
+          },
+        ],
+        laborAmount: [
+          { required: true, message: "请输入欠薪金额", trigger: "blur" },
+          {
+            min: 0,
+            max: 10,
+            message: "输入的数值过大，请确认后重新输入",
+            trigger: "blur",
+          },
+        ],
+        laborReason: [
+          { required: true, message: "请输入拖欠原因说明", trigger: "blur" },
+          { max: 200, message: "最多输入600字符", trigger: "blur" },
+        ],
+      },
+      timer: null, // 定时器
+      count: 60, // 初始倒计时时间（单位：s）
+      buttonText: "查 询 投 诉 进 度", // 按钮显示文本
+      disabled: false, // 按钮是否可点击
     };
   },
   created() {
-    //this.getList();
+    this.reset();
-    //this.getRoles();
+    this.getAllProjects();
   },
   methods: {
-    /** 查询菜单配置列表 */
+    getAllProjects() {
-    getList() {
+      this.$api.publics.getProjectAllList().then((response) => {
-      this.loading = true;
+        this.projectOptions = response.data || [];
-      listWxMenConfig(this.queryParams).then((response) => {
-        this.wxMenConfigList = response.rows;
-        this.total = response.total;
-        this.loading = false;
       });
     },
-    /** 角色列表 */
+    projectChange(v) {
-    getRoles() {
+      this.projectOptions.forEach((option) => {
-      listRole({ pageNum: 1, pageSize: 100 }).then((response) => {
+        if (option.id == v) {
-        this.roles = response.rows;
+          this.form.projectName = option.projectName;
+        }
+      });
+      this.form.deptId = null;
+      this.form.subDeptId = null;
+      this.$api.publics.queryAllUnitList(v, 2).then((response) => {
+        this.deptOptions = response.data || [];
+      });
+      this.$api.publics.queryAllUnitList(v, 3).then((response) => {
+        this.subDeptOptions = response.data || [];
       });
     },
-    // 取消按钮
+    deptChange(v) {
-    cancel() {
+      this.deptOptions.forEach((option) => {
-      this.open = false;
+        if (option.unitId == v) {
-      this.reset();
+          this.form.deptName = option.unitName;
+        }
+      });
+      //this.$set(this.form, 'deptId', v);
+      this.$forceUpdate();
+    },
+    subDeptChange(v) {
+      this.subDeptOptions.forEach((option) => {
+        if (option.unitId == v) {
+          this.form.subDeptName = option.unitName;
+        }
+      });
+      //this.$set(this.form, 'subDeptId', v);
+      this.$forceUpdate();
     },
     // 表单重置
     reset() {
       this.form = {
-        id: null,
+        projectId: null
-        menuName: null,
-        menuIdenti: null,
-        menuImg: null,
-        menuUrl: null,
-        delFlag: null,
-        createTime: null,
       };
-      this.surMenuConfigRoleList = [];
       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 = "添加菜单配置";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      getWxMenConfig(id).then((response) => {
-        this.form = response.data;
-        this.surMenuConfigRoleList = response.data.surMenuConfigRoleList;
-        this.open = true;
-        this.title = "修改菜单配置";
-      });
-    },
     /** 提交按钮 */
     submitForm() {
-        this.$modal.msgWarning("04月20日...敬请期待");
+      let that = this;
-    //   this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate((valid) => {
-    //     if (valid) {
+        if (valid) {
-    //       this.form.surMenuConfigRoleList = this.surMenuConfigRoleList;
+          this.loading = true;
-    //       if (this.form.id) {
+          addFlowLabourInfo(this.form).then((response) => {
-    //         updateWxMenConfig(this.form).then((response) => {
+            setTimeout(() => {
-    //           this.$modal.msgSuccess("修改成功");
+              that.loading = false;
-    //           this.open = false;
+              if (response.data.id > 0) {
-    //           this.getList();
+                this.state = "OK";
-    //         });
-    //       } else {
-    //         addWxMenConfig(this.form).then((response) => {
-    //           this.$modal.msgSuccess("新增成功");
-    //           this.open = false;
-    //           this.getList();
-    //         });
-    //       }
-    //     }
-    //   });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal
-        .confirm('是否确认删除菜单配置编号为"' + ids + '"的数据项？')
-        .then(function () {
-          return delWxMenConfig(ids);
-        })
-        .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        })
-        .catch(() => {});
-    },
-    /** 菜单配置角色序号 */
-    rowSurMenuConfigRoleIndex({ row, rowIndex }) {
-      row.index = rowIndex + 1;
-    },
-    /** 菜单配置角色添加按钮操作 */
-    handleAddSurMenuConfigRole() {
-      let obj = {};
-      obj.roleId = "";
-      this.surMenuConfigRoleList.push(obj);
-    },
-    /** 菜单配置角色删除按钮操作 */
-    handleDeleteSurMenuConfigRole() {
-      if (this.checkedSurMenuConfigRole.length == 0) {
-        this.$modal.msgError("请先选择要删除的菜单配置角色数据");
               } else {
-        const surMenuConfigRoleList = this.surMenuConfigRoleList;
+                this.state = "NO";
-        const checkedSurMenuConfigRole = this.checkedSurMenuConfigRole;
+              }
-        this.surMenuConfigRoleList = surMenuConfigRoleList.filter(function (item) {
+            }, 1200);
-          return checkedSurMenuConfigRole.indexOf(item.index) == -1;
           });
         }
+      });
     },
-    /** 复选框选中数据 */
+    showIndex() {
-    handleSurMenuConfigRoleSelectionChange(selection) {
+      this.state = "INIT";
-      this.checkedSurMenuConfigRole = selection.map((item) => item.index);
     },
-    /** 导出按钮操作 */
+    showSearch() {
-    handleExport() {
+      this.state = "QUERY";
-      this.download(
-        "wxsetting/wxMenConfig/export",
-        {
-          ...this.queryParams,
     },
-        `wxMenConfig_${new Date().getTime()}.xlsx`
+    findFlowInfos() {
-      );
+      this.loading = true;
+      findMyFlowLabours(this.form.laborCardId).then((response) => {
+        this.loading = false;
+        this.flowLabours = response.data || [];
+        this.showInspect = true;
+        this.startCountdown();
+      });
+    },
+    submitQuery() {
+      this.$refs["queryForm"].validate((valid) => {
+        if (valid) {
+          this.loading = true;
+          findMyFlowLabours(this.queryForm.laborCardId).then((response) => {
+            this.loading = false;
+            this.flowLabours = response.data || [];
+            this.showInspect = true;
+            this.startCountdown();
+          });
+        }
+      });
+    },
+    resetCountdown() {
+      this.count = 60;
+      this.buttonText = "查 询 投 诉 进 度";
+      this.disabled = false; // 恢复按钮可点击
+    },
+    startCountdown() {
+      this.disabled = true; // 禁用按钮
+      this.buttonText = `${this.count} 秒 后 继 续 查 询`;
+      this.timer = setInterval(() => {
+        this.count--;
+        this.buttonText = `${this.count} 秒 后 继 续 查 询`;
+        if (this.count <= 0) {
+          clearInterval(this.timer);
+          this.resetCountdown();
+        }
+      }, 1000);
+    },
+    showDetail(detailId, nv) {
+      if (this.nav == nv) {
+        this.nav = null;
+        return false;
+      }
+      this.loading = true;
+      findMyFlowLabourNodes(detailId).then((response) => {
+        this.loading = false;
+        this.nav = nv;
+        this.flowLabourNodes = response.data || [];
+      });
     },
   },
 };
 </script>
+<style scope>
+.app-container {
+  height: 100%;
+  background-image: url("https://szgc.jhncidg.com/profile/static/bg.png");
+  background-size: 100% 100%;
+}
+.el-form--label-top .el-form-item__label {
+  padding: 0 !important;
+}
+.el-input__suffix {
+  right: 10px !important;
+}
+.el-alert {
+  display: flex !important;
+}
+.el-alert--info.is-light {
+  background: cornflowerblue !important;
+  color: #ffffff !important;
+}
+.el-alert--info .el-alert__description {
+  color: #ffffff !important;
+}
+.el-select-dropdown {
+  left: 20px !important;
+  right: 20px !important;
+}
+.sel {
+  width: 100%;
+}
+.el-alert__closebtn {
+  color: #f3cd46 !important;
+  font-weight: 900 !important;
+}
+.el-result__title {
+  font-weight: 900 !important;
+}
+.el-result__extra {
+  width: 100% !important;
+}
+.inspect_max {
+  padding: 0;
+}
+.inspect_list {
+  padding: 5px 0;
+}
+.inspect_for {
+  padding: 10px 0;
+  font-size: 13px;
+}
+.inspect_for_bgd {
+  background: #d3e0ed;
+  padding: 0 15px;
+  border-radius: 5px 5px 0 0;
+}
+.inspect_list_title {
+  border-bottom: 1px solid #323b86;
+  height: 40px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-weight: 900;
+}
+.inspect_list_title_label {
+  display: flex;
+  align-items: center;
+  width: calc(100% - 75px);
+}
+.inspect_list_title_width {
+  width: 100%;
+}
+.inspect_list_title_number {
+  width: 40px;
+  height: 40px;
+  border-bottom: 1px solid #000000;
+  text-align: center;
+  line-height: 40px;
+  color: #000000;
+}
+.inspect_list_title_text {
+  width: calc(100% - 40px);
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+.module_title_flex {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.module_title {
+  height: 20px;
+  line-height: 20px;
+  padding-left: 20px;
+  background: url("https://szgcwx.jhncidg.com/staticFiles/images/lw_8.png") no-repeat
+    left/17px;
+}
+.inspect_shtg {
+  padding: 15px 3px;
+  background-size: 120px 120px !important;
+  background: url("https://szgcwx.jhncidg.com/staticFiles/images/shtg.png") no-repeat top
+    40px right;
+}
+.inspect_shz {
+  padding: 15px 3px;
+  background-size: 120px 120px !important;
+  background: url("https://szgcwx.jhncidg.com/staticFiles/images/shz.png") no-repeat top
+    40px right;
+}
+.inspect_shbh {
+  padding: 15px 3px;
+  background-size: 120px 120px !important;
+  background: url("https://szgcwx.jhncidg.com/staticFiles/images/shbh.png") no-repeat top
+    40px right;
+}
+.inspect_list_info_details {
+  display: flex;
+  align-items: center;
+}
+.inspect_list_info_data {
+  width: 100%;
+}
+.inspect_list_info_data_prop {
+  padding: 5px 0;
+  word-break: break-all;
+}
+.inspect_list_info_position {
+  padding-bottom: 2px;
+}
+.button-active {
+  color: #ffffff;
+  width: 90% !important;
+  background-color: #1890ff !important;
+  border-color: #1890ff !important;
+}
+.button-dis {
+  color: #000000;
+  width: 90% !important;
+  background-color: #e6ebf5 !important;
+  border-color: #e6ebf5 !important;
+}
+.block {
+  border-radius: 5px;
+}
+.el-timeline {
+  padding-left: 5px !important;
+}
+.el-timeline-item__wrapper {
+  padding-left: 15px !important;
+}
+.el-timeline-item__content {
+  font-weight: 900;
+}
+.el-card {
+  border: 0px !important;
+  background-color: #d3e0ed !important;
+}
+.el-card__body {
+  border: 0px !important;
+  padding: 0px !important;
+  padding-right: 10px !important;
+  font-weight: 500 !important;
+}
+.el-image {
+  margin-right: 6px !important;
+}
+</style>

yanzhu-jh/src/main/java/com/yanzhu/jh/flow/controller/FlowLabourAuditNodeController.java

@@ -0,0 +1,123 @@
+package com.yanzhu.jh.flow.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.annotation.RateLimiter;
+import com.ruoyi.common.enums.LimitType;
+import com.yanzhu.jh.flow.domain.FlowLabourInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.yanzhu.jh.flow.domain.FlowLabourAuditNode;
+import com.yanzhu.jh.flow.service.IFlowLabourAuditNodeService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 劳资投诉审批节点Controller
+ * 
+ * @author JiangYuQi
+ * @date 2024-04-20
+ */
+@RestController
+@RequestMapping("/flow/flowLabourAuditNode")
+public class FlowLabourAuditNodeController extends BaseController
+{
+    @Autowired
+    private IFlowLabourAuditNodeService flowLabourAuditNodeService;
+
+    /**
+     * 查询劳资投诉审批节点列表
+     */
+    @PreAuthorize("@ss.hasPermi('flow:flowLabourAuditNode:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(FlowLabourAuditNode flowLabourAuditNode)
+    {
+        startPage();
+        List<FlowLabourAuditNode> list = flowLabourAuditNodeService.selectFlowLabourAuditNodeList(flowLabourAuditNode);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出劳资投诉审批节点列表
+     */
+    @PreAuthorize("@ss.hasPermi('flow:flowLabourAuditNode:export')")
+    @Log(title = "劳资投诉审批节点", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, FlowLabourAuditNode flowLabourAuditNode)
+    {
+        List<FlowLabourAuditNode> list = flowLabourAuditNodeService.selectFlowLabourAuditNodeList(flowLabourAuditNode);
+        ExcelUtil<FlowLabourAuditNode> util = new ExcelUtil<FlowLabourAuditNode>(FlowLabourAuditNode.class);
+        util.exportExcel(response, list, "劳资投诉审批节点数据");
+    }
+
+    /**
+     * 获取劳资投诉审批节点详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('flow:flowLabourAuditNode:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(flowLabourAuditNodeService.selectFlowLabourAuditNodeById(id));
+    }
+
+    /**
+     * 新增劳资投诉审批节点
+     */
+    @PreAuthorize("@ss.hasPermi('flow:flowLabourAuditNode:add')")
+    @Log(title = "劳资投诉审批节点", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody FlowLabourAuditNode flowLabourAuditNode)
+    {
+        return toAjax(flowLabourAuditNodeService.insertFlowLabourAuditNode(flowLabourAuditNode));
+    }
+
+    /**
+     * 修改劳资投诉审批节点
+     */
+    @PreAuthorize("@ss.hasPermi('flow:flowLabourAuditNode:edit')")
+    @Log(title = "劳资投诉审批节点", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody FlowLabourAuditNode flowLabourAuditNode)
+    {
+        return toAjax(flowLabourAuditNodeService.updateFlowLabourAuditNode(flowLabourAuditNode));
+    }
+
+    /**
+     * 删除劳资投诉审批节点
+     */
+    @PreAuthorize("@ss.hasPermi('flow:flowLabourAuditNode:remove')")
+    @Log(title = "劳资投诉审批节点", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(flowLabourAuditNodeService.deleteFlowLabourAuditNodeByIds(ids));
+    }
+
+    /**
+     * 新增劳资投诉
+     */
+    @Anonymous
+    @GetMapping("/findMyFlowLabourNodes/{flowId}")
+    @RateLimiter(count = 10, limitType = LimitType.IP)
+    public AjaxResult findMyFlowLabours(@PathVariable("flowId") Long flowId)
+    {
+        FlowLabourAuditNode flowLabourAuditNode = new FlowLabourAuditNode();
+        flowLabourAuditNode.setFlowId(flowId);
+        List<FlowLabourAuditNode> list = flowLabourAuditNodeService.selectFlowLabourAuditNodeList(flowLabourAuditNode);
+        return success(list);
+    }
+}

yanzhu-jh/src/main/java/com/yanzhu/jh/flow/controller/FlowLabourInfoController.java

@@ -0,0 +1,122 @@
+package com.yanzhu.jh.flow.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.annotation.RateLimiter;
+import com.ruoyi.common.enums.LimitType;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.yanzhu.jh.flow.domain.FlowLabourInfo;
+import com.yanzhu.jh.flow.service.IFlowLabourInfoService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 劳资投诉Controller
+ * 
+ * @author JiangYuQi
+ * @date 2024-04-19
+ */
+@RestController
+@RequestMapping("/flow/flowLabourInfo")
+public class FlowLabourInfoController extends BaseController
+{
+    @Autowired
+    private IFlowLabourInfoService flowLabourInfoService;
+
+    /**
+     * 查询劳资投诉列表
+     */
+    @PreAuthorize("@ss.hasPermi('flow:flowLabourInfo:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(FlowLabourInfo flowLabourInfo)
+    {
+        startPage();
+        List<FlowLabourInfo> list = flowLabourInfoService.selectFlowLabourInfoList(flowLabourInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出劳资投诉列表
+     */
+    @PreAuthorize("@ss.hasPermi('flow:flowLabourInfo:export')")
+    @Log(title = "劳资投诉", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, FlowLabourInfo flowLabourInfo)
+    {
+        List<FlowLabourInfo> list = flowLabourInfoService.selectFlowLabourInfoList(flowLabourInfo);
+        ExcelUtil<FlowLabourInfo> util = new ExcelUtil<FlowLabourInfo>(FlowLabourInfo.class);
+        util.exportExcel(response, list, "劳资投诉数据");
+    }
+
+    /**
+     * 获取劳资投诉详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('flow:flowLabourInfo:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(flowLabourInfoService.selectFlowLabourInfoById(id));
+    }
+
+    /**
+     * 新增劳资投诉
+     */
+    @Anonymous
+    @PostMapping
+    @RateLimiter(count = 10, limitType = LimitType.IP)
+    public AjaxResult add(@RequestBody FlowLabourInfo flowLabourInfo)
+    {
+        return flowLabourInfoService.insertFlowLabourInfo(flowLabourInfo);
+    }
+
+    /**
+     * 新增劳资投诉
+     */
+    @Anonymous
+    @GetMapping("/findMyFlowLabours/{cardId}")
+    @RateLimiter(count = 10, limitType = LimitType.IP)
+    public AjaxResult findMyFlowLabours(@PathVariable("cardId") String cardId)
+    {
+        FlowLabourInfo flowLabourInfo = new FlowLabourInfo();
+        flowLabourInfo.setLaborCardId(cardId);
+        List<FlowLabourInfo> list = flowLabourInfoService.selectFlowLabourInfoList(flowLabourInfo);
+        return success(list);
+    }
+
+    /**
+     * 修改劳资投诉
+     */
+    @PreAuthorize("@ss.hasPermi('flow:flowLabourInfo:edit')")
+    @Log(title = "劳资投诉", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody FlowLabourInfo flowLabourInfo)
+    {
+        return toAjax(flowLabourInfoService.updateFlowLabourInfo(flowLabourInfo));
+    }
+
+    /**
+     * 删除劳资投诉
+     */
+    @PreAuthorize("@ss.hasPermi('flow:flowLabourInfo:remove')")
+    @Log(title = "劳资投诉", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(flowLabourInfoService.deleteFlowLabourInfoByIds(ids));
+    }
+}

yanzhu-jh/src/main/java/com/yanzhu/jh/flow/domain/FlowLabourAuditNode.java

@@ -0,0 +1,142 @@
+package com.yanzhu.jh.flow.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 劳资投诉审批节点对象 flow_labour_audit_node
+ * 
+ * @author JiangYuQi
+ * @date 2024-04-20
+ */
+public class FlowLabourAuditNode extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 审批流id */
+    @Excel(name = "审批流id")
+    private Long flowId;
+
+    /** 审批节点 */
+    @Excel(name = "审批节点")
+    private String flowNode;
+
+    /** 审批结果 */
+    @Excel(name = "审批结果")
+    private String flowResult;
+
+    /** 审批意见 */
+    @Excel(name = "审批意见")
+    private String flowComment;
+
+    /** 凭证附件 */
+    @Excel(name = "凭证附件")
+    private String files;
+
+    /** 是否有效 */
+    @Excel(name = "是否有效")
+    private String isDel;
+
+    private String flowNodeName;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setFlowId(Long flowId) 
+    {
+        this.flowId = flowId;
+    }
+
+    public Long getFlowId() 
+    {
+        return flowId;
+    }
+    public void setFlowNode(String flowNode) 
+    {
+        this.flowNode = flowNode;
+    }
+
+    public String getFlowNode() 
+    {
+        return flowNode;
+    }
+    public void setFlowResult(String flowResult) 
+    {
+        this.flowResult = flowResult;
+    }
+
+    public String getFlowResult() 
+    {
+        return flowResult;
+    }
+    public void setFlowComment(String flowComment) 
+    {
+        this.flowComment = flowComment;
+    }
+
+    public String getFlowComment() 
+    {
+        return flowComment;
+    }
+    public void setFiles(String files) 
+    {
+        this.files = files;
+    }
+
+    public String getFiles() 
+    {
+        return files;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel()
+    {
+        return isDel;
+    }
+
+    public String getFlowNodeName() {
+        return flowNodeName;
+    }
+
+    public void setFlowNodeName(String flowNodeName) {
+        if(flowNodeName.startsWith("待")){
+            flowNodeName = flowNodeName.replace("待","");
+            flowNodeName = flowNodeName + "通过";
+            this.flowNodeName = flowNodeName;
+        }else{
+            this.flowNodeName = flowNodeName;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("flowId", getFlowId())
+            .append("flowNode", getFlowNode())
+            .append("flowResult", getFlowResult())
+            .append("flowComment", getFlowComment())
+            .append("files", getFiles())
+            .append("isDel", getIsDel())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

yanzhu-jh/src/main/java/com/yanzhu/jh/flow/domain/FlowLabourInfo.java

@@ -0,0 +1,252 @@
+package com.yanzhu.jh.flow.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 劳资投诉对象 flow_labour_info
+ * 
+ * @author JiangYuQi
+ * @date 2024-04-19
+ */
+public class FlowLabourInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 所属项目 */
+    @Excel(name = "所属项目")
+    private Long projectId;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String projectName;
+
+    /** 总包单位 */
+    @Excel(name = "总包单位")
+    private Long deptId;
+
+    /** 总包单位名称 */
+    @Excel(name = "总包单位名称")
+    private String deptName;
+
+    /** 分包单位 */
+    @Excel(name = "分包单位")
+    private Long subDeptId;
+
+    /** 分包单位名称 */
+    @Excel(name = "分包单位名称")
+    private String subDeptName;
+
+    /** 劳工名称 */
+    @Excel(name = "劳工名称")
+    private String laborName;
+
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    private String laborCardId;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String laborPhone;
+
+    /** 欠薪人数 */
+    @Excel(name = "欠薪人数")
+    private Long laborNumber;
+
+    /** 欠薪金额 */
+    @Excel(name = "欠薪金额")
+    private Long laborAmount;
+
+    /** 欠薪原因说明 */
+    @Excel(name = "欠薪原因说明")
+    private String laborReason;
+
+    /** 附件凭证 */
+    @Excel(name = "附件凭证")
+    private String files;
+
+    /** 审核状态 */
+    @Excel(name = "审核状态")
+    private String approveStatus;
+
+    /** 是否有效 */
+    @Excel(name = "是否有效")
+    private Long isDel;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setProjectId(Long projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public Long getProjectId() 
+    {
+        return projectId;
+    }
+    public void setProjectName(String projectName) 
+    {
+        this.projectName = projectName;
+    }
+
+    public String getProjectName() 
+    {
+        return projectName;
+    }
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+    public void setDeptName(String deptName) 
+    {
+        this.deptName = deptName;
+    }
+
+    public String getDeptName() 
+    {
+        return deptName;
+    }
+    public void setSubDeptId(Long subDeptId) 
+    {
+        this.subDeptId = subDeptId;
+    }
+
+    public Long getSubDeptId() 
+    {
+        return subDeptId;
+    }
+    public void setSubDeptName(String subDeptName) 
+    {
+        this.subDeptName = subDeptName;
+    }
+
+    public String getSubDeptName() 
+    {
+        return subDeptName;
+    }
+    public void setLaborName(String laborName) 
+    {
+        this.laborName = laborName;
+    }
+
+    public String getLaborName() 
+    {
+        return laborName;
+    }
+    public void setLaborCardId(String laborCardId)
+    {
+        this.laborCardId = laborCardId;
+    }
+
+    public String getLaborCardId()
+    {
+        return laborCardId;
+    }
+    public void setLaborPhone(String laborPhone) 
+    {
+        this.laborPhone = laborPhone;
+    }
+
+    public String getLaborPhone() 
+    {
+        return laborPhone;
+    }
+    public void setLaborNumber(Long laborNumber) 
+    {
+        this.laborNumber = laborNumber;
+    }
+
+    public Long getLaborNumber() 
+    {
+        return laborNumber;
+    }
+    public void setLaborAmount(Long laborAmount) 
+    {
+        this.laborAmount = laborAmount;
+    }
+
+    public Long getLaborAmount() 
+    {
+        return laborAmount;
+    }
+    public void setLaborReason(String laborReason) 
+    {
+        this.laborReason = laborReason;
+    }
+
+    public String getLaborReason() 
+    {
+        return laborReason;
+    }
+    public void setFiles(String files) 
+    {
+        this.files = files;
+    }
+
+    public String getFiles() 
+    {
+        return files;
+    }
+    public void setApproveStatus(String approveStatus) 
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public String getApproveStatus() 
+    {
+        return approveStatus;
+    }
+    public void setIsDel(Long isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Long getIsDel() 
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("projectId", getProjectId())
+            .append("projectName", getProjectName())
+            .append("deptId", getDeptId())
+            .append("deptName", getDeptName())
+            .append("subDeptId", getSubDeptId())
+            .append("subDeptName", getSubDeptName())
+            .append("laborName", getLaborName())
+            .append("laborCardid", getLaborCardId())
+            .append("laborPhone", getLaborPhone())
+            .append("laborNumber", getLaborNumber())
+            .append("laborAmount", getLaborAmount())
+            .append("laborReason", getLaborReason())
+            .append("files", getFiles())
+            .append("approveStatus", getApproveStatus())
+            .append("isDel", getIsDel())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

yanzhu-jh/src/main/java/com/yanzhu/jh/flow/mapper/FlowLabourAuditNodeMapper.java

@@ -0,0 +1,61 @@
+package com.yanzhu.jh.flow.mapper;
+
+import java.util.List;
+import com.yanzhu.jh.flow.domain.FlowLabourAuditNode;
+
+/**
+ * 劳资投诉审批节点Mapper接口
+ * 
+ * @author JiangYuQi
+ * @date 2024-04-20
+ */
+public interface FlowLabourAuditNodeMapper 
+{
+    /**
+     * 查询劳资投诉审批节点
+     * 
+     * @param id 劳资投诉审批节点主键
+     * @return 劳资投诉审批节点
+     */
+    public FlowLabourAuditNode selectFlowLabourAuditNodeById(Long id);
+
+    /**
+     * 查询劳资投诉审批节点列表
+     * 
+     * @param flowLabourAuditNode 劳资投诉审批节点
+     * @return 劳资投诉审批节点集合
+     */
+    public List<FlowLabourAuditNode> selectFlowLabourAuditNodeList(FlowLabourAuditNode flowLabourAuditNode);
+
+    /**
+     * 新增劳资投诉审批节点
+     * 
+     * @param flowLabourAuditNode 劳资投诉审批节点
+     * @return 结果
+     */
+    public int insertFlowLabourAuditNode(FlowLabourAuditNode flowLabourAuditNode);
+
+    /**
+     * 修改劳资投诉审批节点
+     * 
+     * @param flowLabourAuditNode 劳资投诉审批节点
+     * @return 结果
+     */
+    public int updateFlowLabourAuditNode(FlowLabourAuditNode flowLabourAuditNode);
+
+    /**
+     * 删除劳资投诉审批节点
+     * 
+     * @param id 劳资投诉审批节点主键
+     * @return 结果
+     */
+    public int deleteFlowLabourAuditNodeById(Long id);
+
+    /**
+     * 批量删除劳资投诉审批节点
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteFlowLabourAuditNodeByIds(Long[] ids);
+}

yanzhu-jh/src/main/java/com/yanzhu/jh/flow/mapper/FlowLabourInfoMapper.java

@@ -0,0 +1,61 @@
+package com.yanzhu.jh.flow.mapper;
+
+import java.util.List;
+import com.yanzhu.jh.flow.domain.FlowLabourInfo;
+
+/**
+ * 劳资投诉Mapper接口
+ * 
+ * @author JiangYuQi
+ * @date 2024-04-19
+ */
+public interface FlowLabourInfoMapper 
+{
+    /**
+     * 查询劳资投诉
+     * 
+     * @param id 劳资投诉主键
+     * @return 劳资投诉
+     */
+    public FlowLabourInfo selectFlowLabourInfoById(Long id);
+
+    /**
+     * 查询劳资投诉列表
+     * 
+     * @param flowLabourInfo 劳资投诉
+     * @return 劳资投诉集合
+     */
+    public List<FlowLabourInfo> selectFlowLabourInfoList(FlowLabourInfo flowLabourInfo);
+
+    /**
+     * 新增劳资投诉
+     * 
+     * @param flowLabourInfo 劳资投诉
+     * @return 结果
+     */
+    public int insertFlowLabourInfo(FlowLabourInfo flowLabourInfo);
+
+    /**
+     * 修改劳资投诉
+     * 
+     * @param flowLabourInfo 劳资投诉
+     * @return 结果
+     */
+    public int updateFlowLabourInfo(FlowLabourInfo flowLabourInfo);
+
+    /**
+     * 删除劳资投诉
+     * 
+     * @param id 劳资投诉主键
+     * @return 结果
+     */
+    public int deleteFlowLabourInfoById(Long id);
+
+    /**
+     * 批量删除劳资投诉
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteFlowLabourInfoByIds(Long[] ids);
+}

yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/IFlowLabourAuditNodeService.java

@@ -0,0 +1,61 @@
+package com.yanzhu.jh.flow.service;
+
+import java.util.List;
+import com.yanzhu.jh.flow.domain.FlowLabourAuditNode;
+
+/**
+ * 劳资投诉审批节点Service接口
+ * 
+ * @author JiangYuQi
+ * @date 2024-04-20
+ */
+public interface IFlowLabourAuditNodeService 
+{
+    /**
+     * 查询劳资投诉审批节点
+     * 
+     * @param id 劳资投诉审批节点主键
+     * @return 劳资投诉审批节点
+     */
+    public FlowLabourAuditNode selectFlowLabourAuditNodeById(Long id);
+
+    /**
+     * 查询劳资投诉审批节点列表
+     * 
+     * @param flowLabourAuditNode 劳资投诉审批节点
+     * @return 劳资投诉审批节点集合
+     */
+    public List<FlowLabourAuditNode> selectFlowLabourAuditNodeList(FlowLabourAuditNode flowLabourAuditNode);
+
+    /**
+     * 新增劳资投诉审批节点
+     * 
+     * @param flowLabourAuditNode 劳资投诉审批节点
+     * @return 结果
+     */
+    public int insertFlowLabourAuditNode(FlowLabourAuditNode flowLabourAuditNode);
+
+    /**
+     * 修改劳资投诉审批节点
+     * 
+     * @param flowLabourAuditNode 劳资投诉审批节点
+     * @return 结果
+     */
+    public int updateFlowLabourAuditNode(FlowLabourAuditNode flowLabourAuditNode);
+
+    /**
+     * 批量删除劳资投诉审批节点
+     * 
+     * @param ids 需要删除的劳资投诉审批节点主键集合
+     * @return 结果
+     */
+    public int deleteFlowLabourAuditNodeByIds(Long[] ids);
+
+    /**
+     * 删除劳资投诉审批节点信息
+     * 
+     * @param id 劳资投诉审批节点主键
+     * @return 结果
+     */
+    public int deleteFlowLabourAuditNodeById(Long id);
+}

yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/IFlowLabourInfoService.java

@@ -0,0 +1,63 @@
+package com.yanzhu.jh.flow.service;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.yanzhu.jh.flow.domain.FlowLabourInfo;
+
+/**
+ * 劳资投诉Service接口
+ * 
+ * @author JiangYuQi
+ * @date 2024-04-19
+ */
+public interface IFlowLabourInfoService 
+{
+    /**
+     * 查询劳资投诉
+     * 
+     * @param id 劳资投诉主键
+     * @return 劳资投诉
+     */
+    public FlowLabourInfo selectFlowLabourInfoById(Long id);
+
+    /**
+     * 查询劳资投诉列表
+     * 
+     * @param flowLabourInfo 劳资投诉
+     * @return 劳资投诉集合
+     */
+    public List<FlowLabourInfo> selectFlowLabourInfoList(FlowLabourInfo flowLabourInfo);
+
+    /**
+     * 新增劳资投诉
+     * 
+     * @param flowLabourInfo 劳资投诉
+     * @return 结果
+     */
+    public AjaxResult insertFlowLabourInfo(FlowLabourInfo flowLabourInfo);
+
+    /**
+     * 修改劳资投诉
+     * 
+     * @param flowLabourInfo 劳资投诉
+     * @return 结果
+     */
+    public int updateFlowLabourInfo(FlowLabourInfo flowLabourInfo);
+
+    /**
+     * 批量删除劳资投诉
+     * 
+     * @param ids 需要删除的劳资投诉主键集合
+     * @return 结果
+     */
+    public int deleteFlowLabourInfoByIds(Long[] ids);
+
+    /**
+     * 删除劳资投诉信息
+     * 
+     * @param id 劳资投诉主键
+     * @return 结果
+     */
+    public int deleteFlowLabourInfoById(Long id);
+}

yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/impl/FlowLabourAuditNodeServiceImpl.java

@@ -0,0 +1,97 @@
+package com.yanzhu.jh.flow.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yanzhu.jh.flow.mapper.FlowLabourAuditNodeMapper;
+import com.yanzhu.jh.flow.domain.FlowLabourAuditNode;
+import com.yanzhu.jh.flow.service.IFlowLabourAuditNodeService;
+import com.ruoyi.common.utils.SecurityUtils;
+/**
+ * 劳资投诉审批节点Service业务层处理
+ * 
+ * @author JiangYuQi
+ * @date 2024-04-20
+ */
+@Service
+public class FlowLabourAuditNodeServiceImpl implements IFlowLabourAuditNodeService 
+{
+    @Autowired
+    private FlowLabourAuditNodeMapper flowLabourAuditNodeMapper;
+
+    /**
+     * 查询劳资投诉审批节点
+     * 
+     * @param id 劳资投诉审批节点主键
+     * @return 劳资投诉审批节点
+     */
+    @Override
+    public FlowLabourAuditNode selectFlowLabourAuditNodeById(Long id)
+    {
+        return flowLabourAuditNodeMapper.selectFlowLabourAuditNodeById(id);
+    }
+
+    /**
+     * 查询劳资投诉审批节点列表
+     * 
+     * @param flowLabourAuditNode 劳资投诉审批节点
+     * @return 劳资投诉审批节点
+     */
+    @Override
+    public List<FlowLabourAuditNode> selectFlowLabourAuditNodeList(FlowLabourAuditNode flowLabourAuditNode)
+    {
+        return flowLabourAuditNodeMapper.selectFlowLabourAuditNodeList(flowLabourAuditNode);
+    }
+
+    /**
+     * 新增劳资投诉审批节点
+     * 
+     * @param flowLabourAuditNode 劳资投诉审批节点
+     * @return 结果
+     */
+    @Override
+    public int insertFlowLabourAuditNode(FlowLabourAuditNode flowLabourAuditNode)
+    {
+        flowLabourAuditNode.setCreateTime(DateUtils.getNowDate());
+        return flowLabourAuditNodeMapper.insertFlowLabourAuditNode(flowLabourAuditNode);
+    }
+
+    /**
+     * 修改劳资投诉审批节点
+     * 
+     * @param flowLabourAuditNode 劳资投诉审批节点
+     * @return 结果
+     */
+    @Override
+    public int updateFlowLabourAuditNode(FlowLabourAuditNode flowLabourAuditNode)
+    {
+        flowLabourAuditNode.setUpdateBy(SecurityUtils.getUsername());
+        flowLabourAuditNode.setUpdateTime(DateUtils.getNowDate());
+        return flowLabourAuditNodeMapper.updateFlowLabourAuditNode(flowLabourAuditNode);
+    }
+
+    /**
+     * 批量删除劳资投诉审批节点
+     * 
+     * @param ids 需要删除的劳资投诉审批节点主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFlowLabourAuditNodeByIds(Long[] ids)
+    {
+        return flowLabourAuditNodeMapper.deleteFlowLabourAuditNodeByIds(ids);
+    }
+
+    /**
+     * 删除劳资投诉审批节点信息
+     * 
+     * @param id 劳资投诉审批节点主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFlowLabourAuditNodeById(Long id)
+    {
+        return flowLabourAuditNodeMapper.deleteFlowLabourAuditNodeById(id);
+    }
+}

yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/impl/FlowLabourInfoServiceImpl.java

@@ -0,0 +1,124 @@
+package com.yanzhu.jh.flow.service.impl;
+
+import java.util.Date;
+import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.yanzhu.jh.flow.domain.FlowLabourAuditNode;
+import com.yanzhu.jh.flow.mapper.FlowLabourAuditNodeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yanzhu.jh.flow.mapper.FlowLabourInfoMapper;
+import com.yanzhu.jh.flow.domain.FlowLabourInfo;
+import com.yanzhu.jh.flow.service.IFlowLabourInfoService;
+import com.ruoyi.common.utils.SecurityUtils;
+/**
+ * 劳资投诉Service业务层处理
+ * 
+ * @author JiangYuQi
+ * @date 2024-04-19
+ */
+@Service
+public class FlowLabourInfoServiceImpl implements IFlowLabourInfoService 
+{
+    @Autowired
+    private FlowLabourInfoMapper flowLabourInfoMapper;
+
+    @Autowired
+    private FlowLabourAuditNodeMapper flowLabourAuditNodeMapper;
+
+    /**
+     * 查询劳资投诉
+     * 
+     * @param id 劳资投诉主键
+     * @return 劳资投诉
+     */
+    @Override
+    public FlowLabourInfo selectFlowLabourInfoById(Long id)
+    {
+        return flowLabourInfoMapper.selectFlowLabourInfoById(id);
+    }
+
+    /**
+     * 查询劳资投诉列表
+     * 
+     * @param flowLabourInfo 劳资投诉
+     * @return 劳资投诉
+     */
+    @Override
+    public List<FlowLabourInfo> selectFlowLabourInfoList(FlowLabourInfo flowLabourInfo)
+    {
+        return flowLabourInfoMapper.selectFlowLabourInfoList(flowLabourInfo);
+    }
+
+    /**
+     * 新增劳资投诉
+     * 
+     * @param flowLabourInfo 劳资投诉
+     * @return 结果
+     */
+    @Override
+    public AjaxResult insertFlowLabourInfo(FlowLabourInfo flowLabourInfo)
+    {
+        //查询是否已有投诉中的问题
+        FlowLabourInfo searchModel = new FlowLabourInfo();
+        searchModel.setLaborCardId(flowLabourInfo.getLaborCardId());
+        searchModel.setActiveName("MyAwait");
+        List<FlowLabourInfo> list = flowLabourInfoMapper.selectFlowLabourInfoList(searchModel);
+        if(StringUtils.isNotEmpty(list)){
+            flowLabourInfo.setId(0L);
+            return AjaxResult.success(flowLabourInfo);
+        }else{
+            flowLabourInfo.setCreateTime(DateUtils.getNowDate());
+            flowLabourInfoMapper.insertFlowLabourInfo(flowLabourInfo);
+            //保存流程节点信息
+            FlowLabourAuditNode flowLabourAuditNode = new FlowLabourAuditNode();
+            flowLabourAuditNode.setFlowId(flowLabourInfo.getId());
+            flowLabourAuditNode.setFlowNode("10");
+            flowLabourAuditNode.setCreateBy(flowLabourInfo.getLaborName());
+            flowLabourAuditNode.setCreateTime(new Date());
+            flowLabourAuditNodeMapper.insertFlowLabourAuditNode(flowLabourAuditNode);
+            return AjaxResult.success(flowLabourInfo);
+        }
+    }
+
+    /**
+     * 修改劳资投诉
+     * 
+     * @param flowLabourInfo 劳资投诉
+     * @return 结果
+     */
+    @Override
+    public int updateFlowLabourInfo(FlowLabourInfo flowLabourInfo)
+    {
+        flowLabourInfo.setUpdateBy(SecurityUtils.getUsername());
+        flowLabourInfo.setUpdateTime(DateUtils.getNowDate());
+        return flowLabourInfoMapper.updateFlowLabourInfo(flowLabourInfo);
+    }
+
+    /**
+     * 批量删除劳资投诉
+     * 
+     * @param ids 需要删除的劳资投诉主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFlowLabourInfoByIds(Long[] ids)
+    {
+        return flowLabourInfoMapper.deleteFlowLabourInfoByIds(ids);
+    }
+
+    /**
+     * 删除劳资投诉信息
+     * 
+     * @param id 劳资投诉主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFlowLabourInfoById(Long id)
+    {
+        return flowLabourInfoMapper.deleteFlowLabourInfoById(id);
+    }
+}

yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMapper.java

@@ -27,6 +27,13 @@ public interface SurProjectMapper
      */
     public List<SurProject> selectSurProjectList(SurProject surProject);
 
+    /**
+     * 查询项目管理列表
+     *
+     * @return 项目管理集合
+     */
+    public List<SurProject> selectAllProjectList();
+
     /**
      * 新增项目管理
      * 

yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectService.java

@@ -27,6 +27,13 @@ public interface ISurProjectService
      */
     public List<SurProject> selectSurProjectList(SurProject surProject);
 
+    /**
+     * 查询项目管理列表
+     *
+     * @return 项目管理集合
+     */
+    public List<SurProject> selectAllProjectList();
+
     /**
      * 新增项目管理
      * 

yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectServiceImpl.java

@@ -46,6 +46,16 @@ public class SurProjectServiceImpl implements ISurProjectService
         return surProjectMapper.selectSurProjectList(surProject);
     }
 
+    /**
+     * 查询项目管理列表
+     *
+     * @return 项目管理集合
+     */
+    @Override
+    public List<SurProject> selectAllProjectList() {
+        return surProjectMapper.selectAllProjectList();
+    }
+
     /**
      * 新增项目管理
      * 

yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java

@@ -20,6 +20,7 @@ import com.yanzhu.jh.project.domain.*;
 import com.yanzhu.jh.project.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -98,6 +99,23 @@ PublicsController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询项目列表
+     */
+    @GetMapping("/projectAllList")
+    public AjaxResult projectAllList()
+    {
+        String key="publics_projectAllList";
+        Object obj=redisCache.getCacheObject(key);
+        if(obj!=null){
+            return success(obj);
+        }
+        SurProject surProject = new SurProject();
+        List<SurProject> list = surProjectService.selectAllProjectList();
+        redisCache.setCacheObject(key, list, 5, TimeUnit.MINUTES);
+        return success(list);
+    }
+
     /**
      * 查询我的项目列表
      */
@@ -156,7 +174,35 @@ PublicsController extends BaseController {
         if(surProjectUnitInfo.getUnitType()!=null && surProjectUnitInfo.getUnitType().equals("2") && (surProjectUnitInfo.getNowRole().equals(SysRoleEnum.ZBDW.getCode()) || surProjectUnitInfo.getNowRole().equals(SysRoleEnum.ZBDWGR.getCode()))){
             surProjectUnitInfo.setUnitId(getDeptId());
         }
-        return getDataTable(surProjectUnitInfoService.selectSurProjectUnitInfoList(surProjectUnitInfo));
+        String key="publics_queryUnitList_"+surProjectUnitInfo.getProjectId()+"_"+surProjectUnitInfo.getNowRole()+"_"+surProjectUnitInfo.getUnitId()+"_"+surProjectUnitInfo.getUnitType()+"_"+surProjectUnitInfo.getUnitTypes();
+        List<SurProjectUnitInfo> list = redisCache.getCacheObject(key);
+        if(list!=null){
+            return getDataTable(list);
+        }
+        //缓存数据2分钟
+        list = surProjectUnitInfoService.selectSurProjectUnitInfoList(surProjectUnitInfo);
+        redisCache.setCacheObject(key, list, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询项目部门列表
+     */
+    @GetMapping("/queryAllUnitList/{projId}/{unitType}")
+    public AjaxResult queryAllUnitList(@PathVariable("projId") Long projId,@PathVariable("unitType") Long unitType)
+    {
+        String key="publics_queryAllUnitList_"+projId+unitType;
+        List<SurProjectUnitInfo> list = redisCache.getCacheObject(key);
+        if(list!=null){
+            return success(list);
+        }
+        SurProjectUnitInfo surProjectUnitInfo = new SurProjectUnitInfo();
+        surProjectUnitInfo.setProjectId(projId);
+        surProjectUnitInfo.setUnitType(unitType);
+        //缓存数据2分钟
+        list = surProjectUnitInfoService.selectSurProjectUnitInfoList(surProjectUnitInfo);
+        redisCache.setCacheObject(key, list, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
+        return success(list);
     }
 
     /**

yanzhu-jh/src/main/resources/mapper/flow/FlowLabourAuditNodeMapper.xml

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yanzhu.jh.flow.mapper.FlowLabourAuditNodeMapper">
+    
+    <resultMap type="FlowLabourAuditNode" id="FlowLabourAuditNodeResult">
+        <result property="id"    column="id"    />
+        <result property="flowId"    column="flow_id"    />
+        <result property="flowNode"    column="flow_node"    />
+        <result property="flowResult"    column="flow_result"    />
+        <result property="flowComment"    column="flow_comment"    />
+        <result property="files"    column="files"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="flowNodeName"    column="flowNodeName"    />
+    </resultMap>
+
+    <sql id="selectFlowLabourAuditNodeVo">
+        SELECT
+            flan.id,
+            flan.flow_id,
+            flan.flow_node,
+            flan.flow_result,
+            flan.flow_comment,
+            flan.files,
+            flan.is_del,
+            flan.create_by,
+            flan.create_time,
+            flan.update_by,
+            flan.update_time,
+            flan.remark,
+            node.dict_label as flowNodeName
+        FROM
+            flow_labour_audit_node flan
+            left join sys_dict_data node on node.dict_type='flow_labou_appstatus' and node.dict_value = flan.flow_node
+    </sql>
+
+    <select id="selectFlowLabourAuditNodeList" parameterType="FlowLabourAuditNode" resultMap="FlowLabourAuditNodeResult">
+        <include refid="selectFlowLabourAuditNodeVo"/>
+        <where>
+            flan.is_del=0
+            <if test="flowId != null "> and flan.flow_id = #{flowId}</if>
+        </where>
+        order by create_time desc
+    </select>
+    
+    <select id="selectFlowLabourAuditNodeById" parameterType="Long" resultMap="FlowLabourAuditNodeResult">
+        <include refid="selectFlowLabourAuditNodeVo"/>
+        where flan.id = #{id}
+    </select>
+        
+    <insert id="insertFlowLabourAuditNode" parameterType="FlowLabourAuditNode" useGeneratedKeys="true" keyProperty="id">
+        insert into flow_labour_audit_node
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="flowId != null">flow_id,</if>
+            <if test="flowNode != null">flow_node,</if>
+            <if test="flowResult != null">flow_result,</if>
+            <if test="flowComment != null">flow_comment,</if>
+            <if test="files != null">files,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="flowId != null">#{flowId},</if>
+            <if test="flowNode != null">#{flowNode},</if>
+            <if test="flowResult != null">#{flowResult},</if>
+            <if test="flowComment != null">#{flowComment},</if>
+            <if test="files != null">#{files},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateFlowLabourAuditNode" parameterType="FlowLabourAuditNode">
+        update flow_labour_audit_node
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="flowId != null">flow_id = #{flowId},</if>
+            <if test="flowNode != null">flow_node = #{flowNode},</if>
+            <if test="flowResult != null">flow_result = #{flowResult},</if>
+            <if test="flowComment != null">flow_comment = #{flowComment},</if>
+            <if test="files != null">files = #{files},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteFlowLabourAuditNodeById" parameterType="Long">
+        delete from flow_labour_audit_node where id = #{id}
+    </delete>
+
+    <delete id="deleteFlowLabourAuditNodeByIds" parameterType="String">
+        delete from flow_labour_audit_node where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

yanzhu-jh/src/main/resources/mapper/flow/FlowLabourInfoMapper.xml

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yanzhu.jh.flow.mapper.FlowLabourInfoMapper">
+    
+    <resultMap type="FlowLabourInfo" id="FlowLabourInfoResult">
+        <result property="id"    column="id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="projectName"    column="project_name"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="subDeptId"    column="sub_dept_id"    />
+        <result property="subDeptName"    column="sub_dept_name"    />
+        <result property="laborName"    column="labor_name"    />
+        <result property="laborCardId"    column="labor_cardId"    />
+        <result property="laborPhone"    column="labor_phone"    />
+        <result property="laborNumber"    column="labor_number"    />
+        <result property="laborAmount"    column="labor_amount"    />
+        <result property="laborReason"    column="labor_reason"    />
+        <result property="files"    column="files"    />
+        <result property="approveStatus"    column="approve_status"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectFlowLabourInfoVo">
+        select id, project_id, project_name, dept_id, dept_name, sub_dept_id, sub_dept_name, labor_name, labor_cardId, labor_phone, labor_number, labor_amount, labor_reason, files, approve_status, is_del, create_by, create_time, update_by, update_time, remark from flow_labour_info
+    </sql>
+
+    <select id="selectFlowLabourInfoList" parameterType="FlowLabourInfo" resultMap="FlowLabourInfoResult">
+        <include refid="selectFlowLabourInfoVo"/>
+        <where>
+            is_del=0
+            <if test="projectId != null "> and project_id = #{projectId}</if>
+            <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="subDeptId != null "> and sub_dept_id = #{subDeptId}</if>
+            <if test="subDeptName != null  and subDeptName != ''"> and sub_dept_name like concat('%', #{subDeptName}, '%')</if>
+            <if test="laborName != null  and laborName != ''"> and labor_name like concat('%', #{laborName}, '%')</if>
+            <if test="laborCardId != null "> and labor_cardId like concat('%', #{laborCardId}, '%')</if>
+            <if test="laborPhone != null  and laborPhone != ''"> and labor_phone = #{laborPhone}</if>
+            <if test="approveStatus != null  and approveStatus != ''"> and approve_status = #{approveStatus}</if>
+            <if test='activeName != null and activeName == "MyAwait"'> and approve_status != 100</if>
+        </where>
+        order by create_time desc
+    </select>
+    
+    <select id="selectFlowLabourInfoById" parameterType="Long" resultMap="FlowLabourInfoResult">
+        <include refid="selectFlowLabourInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertFlowLabourInfo" parameterType="FlowLabourInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into flow_labour_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">project_id,</if>
+            <if test="projectName != null">project_name,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="deptName != null">dept_name,</if>
+            <if test="subDeptId != null">sub_dept_id,</if>
+            <if test="subDeptName != null">sub_dept_name,</if>
+            <if test="laborName != null">labor_name,</if>
+            <if test="laborCardId != null">labor_cardId,</if>
+            <if test="laborPhone != null">labor_phone,</if>
+            <if test="laborNumber != null">labor_number,</if>
+            <if test="laborAmount != null">labor_amount,</if>
+            <if test="laborReason != null">labor_reason,</if>
+            <if test="files != null">files,</if>
+            <if test="approveStatus != null">approve_status,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">#{projectId},</if>
+            <if test="projectName != null">#{projectName},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="deptName != null">#{deptName},</if>
+            <if test="subDeptId != null">#{subDeptId},</if>
+            <if test="subDeptName != null">#{subDeptName},</if>
+            <if test="laborName != null">#{laborName},</if>
+            <if test="laborCardId != null">#{laborCardId},</if>
+            <if test="laborPhone != null">#{laborPhone},</if>
+            <if test="laborNumber != null">#{laborNumber},</if>
+            <if test="laborAmount != null">#{laborAmount},</if>
+            <if test="laborReason != null">#{laborReason},</if>
+            <if test="files != null">#{files},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateFlowLabourInfo" parameterType="FlowLabourInfo">
+        update flow_labour_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="projectName != null">project_name = #{projectName},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="deptName != null">dept_name = #{deptName},</if>
+            <if test="subDeptId != null">sub_dept_id = #{subDeptId},</if>
+            <if test="subDeptName != null">sub_dept_name = #{subDeptName},</if>
+            <if test="laborName != null">labor_name = #{laborName},</if>
+            <if test="laborCardId != null">labor_cardId = #{laborCardId},</if>
+            <if test="laborPhone != null">labor_phone = #{laborPhone},</if>
+            <if test="laborNumber != null">labor_number = #{laborNumber},</if>
+            <if test="laborAmount != null">labor_amount = #{laborAmount},</if>
+            <if test="laborReason != null">labor_reason = #{laborReason},</if>
+            <if test="files != null">files = #{files},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteFlowLabourInfoById" parameterType="Long">
+        delete from flow_labour_info where id = #{id}
+    </delete>
+
+    <delete id="deleteFlowLabourInfoByIds" parameterType="String">
+        delete from flow_labour_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml

@@ -119,6 +119,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             order by sp.projectSort ASC,sp.projectName
     </select>
 
+    <select id="selectAllProjectList" resultMap="SurProjectResult">
+        select sp.*, d.dept_name
+        from sur_project sp
+        left join sys_dept d on d.dept_id = sp.deptId
+        <where>
+            sp.isDel = 0
+            and sp.projectType in ('1','4')
+        </where>
+        order by sp.projectSort ASC,sp.projectName
+    </select>
+    
     <select id="selectSurProjectById" parameterType="Long" resultMap="SurProjectResult">
         <include refid="selectSurProjectVo"/>
         where id = #{id}