From 36a60d2f0254253df836402539e5a1a6b8218d95 Mon Sep 17 00:00:00 2001
From: 86156 <823267011@qq.com>
Date: Sun, 3 Nov 2024 17:07:07 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=AE=A1=E7=90=86=E5=85=B3=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E7=94=A8=E6=88=B7=E8=A1=A8=202=E3=80=81=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=BB=B6=E6=9C=9F=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E7=BC=BA=E4=B9=8F=E9=80=BB=E8=BE=91=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=203=E3=80=81=E5=AE=8C=E6=88=90=E5=BA=93=E5=AD=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86ui=E5=BC=80=E5=8F=91=204=E3=80=81=E5=88=9B=E5=BB=BAtas?=
 =?UTF-8?q?k=E5=90=8E=E9=92=88=E5=AF=B9=E4=BA=8E=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E7=9A=84=E4=BB=BB=E5=8A=A1=E5=AE=89=E6=8E=92=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93work=E8=A1=A8=EF=BC=8C=E5=B0=86=E5=9C=A8=E4=B8=8B?=
 =?UTF-8?q?=E6=AC=A1=E8=BF=AD=E4=BB=A3=E5=90=8E=E5=AE=8C=E6=88=90=E4=B8=89?=
 =?UTF-8?q?=E8=A1=A8=E8=81=94=E6=9F=A5=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=205=E3=80=81=E6=B7=BB=E5=8A=A0=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E7=AE=A1=E7=90=86=E7=9A=84=E6=A8=A1=E6=9D=BF=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E3=80=81excl=E6=95=B4=E6=B5=81=E5=90=8E=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E5=AF=BC=E5=85=A5=20=E6=B7=B7=E6=B7=86=E9=A1=B91?=
 =?UTF-8?q?=E3=80=81work=E7=9A=84=E6=97=B6=E9=97=B4=E7=B2=92=E5=BA=A6?=
 =?UTF-8?q?=E5=88=B0=E4=BA=BA|=E4=BB=BB=E5=8A=A1=202=E3=80=81=E5=B7=B2?=
 =?UTF-8?q?=E5=88=86=E9=85=8D=E4=BB=BB=E5=8A=A1=E5=91=98=E5=B7=A5=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=9C=A8=E5=88=86=E9=85=8D=E4=BB=BB=E5=8A=A1=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/system/SysUserController.java  |   8 +
 .../common/core/domain/entity/SysUser.java    |   6 +
 .../com/ruoyi/oa/domain/SysOaProject.java     |  14 +
 .../ruoyi/oa/domain/bo/SysOaProjectBo.java    |  15 +
 .../ruoyi/oa/domain/vo/SysOaProjectVo.java    |  15 +
 .../oa/service/impl/SysOaTaskServiceImpl.java |   1 +
 .../ruoyi/system/mapper/SysUserMapper.java    |   2 +
 .../ruoyi/system/service/ISysUserService.java |  10 +
 .../service/impl/SysUserServiceImpl.java      |  10 +-
 .../resources/mapper/system/SysUserMapper.xml |  11 +-
 ruoyi-ui/src/api/system/user.js               |   9 +
 ruoyi-ui/src/views/oa/project/index.vue       | 131 ++--
 ruoyi-ui/src/views/oa/worker/index.vue        | 604 ++++++++++++++++++
 13 files changed, 786 insertions(+), 50 deletions(-)
 create mode 100644 ruoyi-ui/src/views/oa/worker/index.vue

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index bab44ec..713c543 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -65,6 +65,14 @@ public class SysUserController extends BaseController {
         return userService.selectPageUserList(user, pageQuery);
     }
 
+    /**
+     * 获取用户列表
+     */
+    @GetMapping("/worker/list")
+    public TableDataInfo<SysUser> workerList(SysUser user, PageQuery pageQuery) {
+        return userService.selectUserListByRoleId(user, pageQuery);
+    }
+
     /**
      * 查询用户列表，用于用户选择场景
      */
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index d9139c5..5c79bfc 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -151,6 +151,12 @@ public class SysUser extends BaseEntity {
     @TableField(exist = false)
     private Long[] postIds;
 
+    private String idCard;
+
+    private String bankCard;
+
+    private Long laborCost;
+
     /**
      * 数据权限 当前角色ID
      */
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java
index 5acf3dc..5dacfe0 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java
@@ -115,4 +115,18 @@ public class SysOaProject extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 是否延期
+     */
+    private Long isPostpone;
+
+    /**
+     * 延期原因
+     */
+    private String postponeReason;
+
+    /**
+     * 延期至
+     */
+    private Date postponeTime;
 }
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java
index d30db70..ad79cb2 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java
@@ -141,4 +141,19 @@ public class SysOaProjectBo extends BaseEntity {
     private String remark;
 
 
+    /**
+     * 是否延期
+     */
+    private Long isPostpone;
+
+    /**
+     * 延期原因
+     */
+    private String postponeReason;
+
+    /**
+     * 延期至
+     */
+    private Date postponeTime;
+
 }
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java
index b4e137d..8fd90c5 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java
@@ -165,4 +165,19 @@ public class SysOaProjectVo {
     private String remark;
 
 
+    /**
+     * 是否延期
+     */
+    private Long isPostpone;
+
+    /**
+     * 延期原因
+     */
+    private String postponeReason;
+
+    /**
+     * 延期至
+     */
+    private Date postponeTime;
+
 }
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java
index 6cef2d7..6889413 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java
@@ -84,6 +84,7 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService {
             ajax.put("color", "#cccccc");
             objects.add(ajax);
         });
+        System.out.println(objects);
 
         //根据项目id获取任务列表类型属性最大的值
         SysOaTaskBo task = new SysOaTaskBo();
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index 7147198..5c39caa 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -92,4 +92,6 @@ public interface SysUserMapper extends BaseMapperPlus<SysUserMapper, SysUser, Sy
      */
     SysUser selectUserById(Long userId);
 
+
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
index cfa6e16..588f879 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
@@ -24,6 +24,16 @@ public interface ISysUserService {
      */
     List<SysUser> selectUserList(SysUser user);
 
+
+    /**
+     * 根据条件分页查询用户列表
+     *
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    TableDataInfo<SysUser> selectUserListByRoleId(SysUser user,PageQuery pageQuery);
+
+
     /**
      * 根据条件分页查询已分配用户角色列表
      *
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 3e0626f..4378fd7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -71,7 +71,15 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         return baseMapper.selectUserList(this.buildQueryWrapper(user));
     }
 
-    private Wrapper<SysUser> buildQueryWrapper(SysUser user) {
+    @Override
+    public TableDataInfo<SysUser> selectUserListByRoleId(SysUser user, PageQuery pageQuery) {
+        QueryWrapper<SysUser> sysUserWrapper = this.buildQueryWrapper(user);
+        sysUserWrapper.eq("sr.role_id", 1852970465740505090L);
+        Page<SysUser> page = baseMapper.selectPageUserList(pageQuery.build(), sysUserWrapper);
+        return TableDataInfo.build(page);
+    }
+
+    private QueryWrapper<SysUser> buildQueryWrapper(SysUser user) {
         Map<String, Object> params = user.getParams();
         QueryWrapper<SysUser> wrapper = Wrappers.query();
         wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index e73e715..7196d54 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -24,6 +24,9 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <result property="idCard" column="id_card"/>
+        <result property="bankCard" column="bank_card"/>
+        <result property="laborCost" column="labor_cost"/>
         <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
         <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
     </resultMap>
@@ -85,10 +88,12 @@
     </sql>
 
     <select id="selectPageUserList" resultMap="SysUserResult">
-        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
-            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
+        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,u.id_card,u.bank_card,u.labor_cost,
+            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,sr.role_id,sr.role_name
         from sys_user u
             left join sys_dept d on u.dept_id = d.dept_id
+            left join sys_user_role sur on sur.user_id = u.user_id
+            left join sys_role sr on sr.role_id = sur.role_id
         ${ew.getCustomSqlSegment}
     </select>
 
@@ -139,4 +144,6 @@
     </select>
 
 
+
+
 </mapper>
diff --git a/ruoyi-ui/src/api/system/user.js b/ruoyi-ui/src/api/system/user.js
index 9f10002..e37bef2 100644
--- a/ruoyi-ui/src/api/system/user.js
+++ b/ruoyi-ui/src/api/system/user.js
@@ -10,6 +10,15 @@ export function listUser(query) {
   })
 }
 
+// 查询员工列表
+export function listWorker(query) {
+  return request({
+    url: '/system/user/worker/list',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询用户列表，用于流程里的用户选择
 export function selectUser(query) {
   return request({
diff --git a/ruoyi-ui/src/views/oa/project/index.vue b/ruoyi-ui/src/views/oa/project/index.vue
index 235ad2c..1fc510c 100644
--- a/ruoyi-ui/src/views/oa/project/index.vue
+++ b/ruoyi-ui/src/views/oa/project/index.vue
@@ -109,9 +109,9 @@
       <!--      <el-table-column label="ID" align="center" prop="projectId" v-if="true"/>-->
       <el-table-column label="项目名称" align="left" prop="projectName"/>
       <el-table-column label="项目编号" align="left" prop="projectNum" width="230"/>
-      <el-table-column label="项目总金额" align="center" prop="funds"  width="120">
+      <el-table-column label="项目总金额" align="center" prop="funds" width="120">
         <template slot-scope="scope">
-          {{convertToTenThousand(scope.row.funds)}}
+          {{ convertToTenThousand(scope.row.funds) }}
         </template>
       </el-table-column>
       <el-table-column label="项目类型" align="center" prop="projectType" width="100">
@@ -123,13 +123,13 @@
         <template slot-scope="scope">
           <div v-if="bailStatusTo(scope.row.bail) === 0">
             <span style="color: #999999">未缴纳</span>
-           </div>
+          </div>
           <div v-else style="color: red">
             <div style="color: #1c84c6">
               已缴纳
               -
               <span v-if="bailStatusIn(scope.row.bail) === 1" style="color: #1ab394">已退回</span>
-              <span  v-else style="color: #ff9900">未退回</span>
+              <span v-else style="color: #ff9900">未退回</span>
             </div>
           </div>
         </template>
@@ -146,9 +146,19 @@
           <dict-tag :options="dict.type.sys_project_status" :value="scope.row.projectStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" width="120">
+      <el-table-column label="是否延期" align="center" prop="remark" width="120">
         <template slot-scope="scope">
-          <span>{{ scope.row.remark == null || scope.row.remark == '' ? '暂无' : scope.row.remark }}</span>
+          <span   v-if = "scope.row.isPostpone == 0">否</span>
+<!--         TODO 等待写一个抽屉 之中包括延期原因等，等待项目绑定人员之后开发 -->
+          <el-button
+            v-if = "scope.row.isPostpone == 1"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="openDrawer(scope.row)"
+            v-hasPermi="['oa:project:remove']"
+          >发生延期
+          </el-button>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
@@ -185,7 +195,7 @@
     <el-dialog :title="title" :visible.sync="editShow" @close="closeDialog" width="76%" append-to-body>
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="项目信息" name="first">
-          <el-tabs :tab-position="tabPosition" v-model="activeChild" >
+          <el-tabs :tab-position="tabPosition" v-model="activeChild">
             <el-tab-pane label="项目查看" name="one">
               <el-descriptions class="margin-top" title="基本信息" :column="4" border>
                 <el-descriptions-item :labelStyle="lableBg" span="2">
@@ -215,7 +225,7 @@
                     <i class="el-icon-goods"></i>
                     项目总金额
                   </template>
-                    {{convertToTenThousand(form.funds)}}
+                  {{ convertToTenThousand(form.funds) }}
                 </el-descriptions-item>
                 <el-descriptions-item :labelStyle="lableBg" span="2">
                   <template slot="label">
@@ -327,7 +337,7 @@
                   {{ bail.ratio == null || bail.ratio == undefined ? '未填写' : bail.ratio }}
                 </el-descriptions-item>
                 <el-descriptions-item label="退回金额" :span="1" :labelStyle="lableBg">
-                  {{ bail.backMoney == null || bail.backMoney == undefined  ? '未填写' : bail.backMoney }}
+                  {{ bail.backMoney == null || bail.backMoney == undefined ? '未填写' : bail.backMoney }}
                 </el-descriptions-item>
                 <el-descriptions-item label="退回时间" :span="2" :labelStyle="lableBg">
                   {{ bail.backTime == null || bail.backTime == undefined ? '未填写' : bail.backTime }}
@@ -342,9 +352,9 @@
             <el-tab-pane label="项目修改" name="two">
 
 
-<!--              TODO 删除必填规则 -->
-<!--              <el-form ref="form" :model="form" :rules="rules" label-width="120px">-->
-                <el-form ref="form" :model="form" label-width="120px">
+              <!--              TODO 删除必填规则 -->
+              <!--              <el-form ref="form" :model="form" :rules="rules" label-width="120px">-->
+              <el-form ref="form" :model="form" label-width="120px">
                 <el-divider content-position="center">基本信息</el-divider>
                 <el-row>
                   <el-col :span="12">
@@ -407,17 +417,36 @@
                       <el-input v-model="form.guarantee" placeholder="请输入质保期"/>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="项目周期">
-                      <el-date-picker
-                        v-model="periodItem"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        @blur="getTimeBlur">
-                      </el-date-picker>
+
+                  <el-col :span="6">
+                    <el-form-item label="是否延期" prop="isPostpone">
+                      <el-switch v-model="form.isPostpone" active-value="1" inactive-value="0"/>
+                    </el-form-item>
+                  </el-col>
+
+                    <el-col :span="24" v-if="form.isPostpone==1">
+                      <el-form-item label="周期延长">
+                        <el-date-picker
+                          v-model="periodItem"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          type="daterange"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"
+                          @blur="getTimeBlur">
+                        </el-date-picker>
+                      </el-form-item>
+                    </el-col>
+
+                  <el-col :span="24" v-if="form.isPostpone==1">
+                    <el-form-item label="延期原因" prop="postPoneReason">
+                      <el-input v-model="form.postPoneReason" type="textarea" placeholder="请输入延期原因"/>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="24">
+                    <el-form-item label="备注" prop="remark">
+                      <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
                     </el-form-item>
                   </el-col>
                   <el-col :span="24">
@@ -493,7 +522,9 @@
                       <el-input v-model="bail.remark" placeholder="请输入备注"/>
                     </el-form-item>
                   </el-col>
-                  <div style="color: #ff9900;padding-left: 50px;margin-bottom: 15px">备注：缴纳金额为空状态即为未缴纳，退回金额为空即为状态为未退回</div>
+                  <div style="color: #ff9900;padding-left: 50px;margin-bottom: 15px">
+                    备注：缴纳金额为空状态即为未缴纳，退回金额为空即为状态为未退回
+                  </div>
                 </el-row>
               </el-form>
               <div class="dialog-footer">
@@ -525,9 +556,10 @@
                     :size="activity.size"
                   >
                     {{ activity.dictValue }} {{ activity.dictLabel }}
-                    <div :id="'print' + index"  v-if="activity.taskList.length > 0">
+                    <div :id="'print' + index" v-if="activity.taskList.length > 0">
                       <el-card class="card-col">
-                        <el-descriptions v-for="(item, key) in activity.taskList" :key="key"  :title="'创建日期：'+ item.createTime"
+                        <el-descriptions v-for="(item, key) in activity.taskList" :key="key"
+                                         :title="'创建日期：'+ item.createTime"
                                          border class="card-col-center" :column="4">
                           <template slot="extra">
                             <div></div>
@@ -535,7 +567,7 @@
                           <el-descriptions-item label-style="width:120px;text-align: center;" span="2">
                             <template slot="label">
                               <i class="el-icon-receiving"></i>
-                              任务主题{{item.length}}
+                              任务主题{{ item.length }}
                             </template>
                             {{ item.taskTitle }}
                           </el-descriptions-item>
@@ -552,7 +584,7 @@
                               <i class="el-icon-mobile-phone"></i>
                               工作时间
                             </template>
-                      {{item.beginTime}} 至 {{item.finishTime}}
+                            {{ item.beginTime }} 至 {{ item.finishTime }}
                           </el-descriptions-item>
 
                           <el-descriptions-item label-style="width:120px;text-align: center;" span="2">
@@ -874,8 +906,8 @@
     <el-dialog :title="title" :visible.sync="addShow" width="76%" append-to-body>
 
 
-<!--      TODO 删除规则<el-form ref="form" :model="form" :rules="rules" label-width="110px">-->
-      <el-form ref="form" :model="form"  label-width="110px">
+      <!--      TODO 删除规则<el-form ref="form" :model="form" :rules="rules" label-width="110px">-->
+      <el-form ref="form" :model="form" label-width="110px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="项目名称" prop="projectName">
@@ -926,26 +958,28 @@
               <el-input v-model="form.funds" placeholder="请输入项目总金额"/>
             </el-form-item>
           </el-col>
-
-
           <el-col :span="12">
             <el-form-item label="交货期" prop="address">
               <el-input v-model="form.delivery" placeholder="请输入交货期"/>
             </el-form-item>
           </el-col>
+
+
           <el-col :span="12">
             <el-form-item label="项目周期">
               <el-date-picker
                 v-model="periodItem"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 type="daterange"
-                range-separator="至"
+                range-separator="延期至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 @blur="getTimeBlur">
               </el-date-picker>
             </el-form-item>
           </el-col>
+
+
           <el-col :span="12">
             <el-form-item label="质保期" prop="address">
               <el-input v-model="form.guarantee" placeholder="请输入质保期"/>
@@ -1234,11 +1268,11 @@ export default {
         functionary: [
           {required: true, message: "项目负责人不能为空", trigger: "blur"}
         ],
-        address:[
+        address: [
           {required: true, message: "项目地址不能为空", trigger: "blur"}
         ],
         funds: [
-          { required: true, message: '项目总金额不能为空', trigger: 'blur' },
+          {required: true, message: '项目总金额不能为空', trigger: 'blur'},
           {
             validator: (rule, value, callback) => {
               const regex = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9]))/;
@@ -1287,16 +1321,17 @@ export default {
 
   methods: {
     /**new-工作类型进度**/
-    getTaskByDictType(pid){
+    getTaskByDictType(pid) {
       getTaskByDictType(pid).then(res => {
         //排序
         this.stepsList = res.data.data.taskList.sort((a, b) => parseInt(b.dictValue) - parseInt(a.dictValue));
+        console.log(this.stepsList)
         this.active = res.data.data.active;
       })
     },
 
     /**获取字典类型为工作类型的数据**/
-    getDicts(){
+    getDicts() {
       getDicts('sys_work_type').then(res => {
         this.stepsListTop = res.data;
       })
@@ -1338,18 +1373,18 @@ export default {
     },
 
     /**履约保证金是否缴纳**/
-    bailStatusTo(data){
-        if(JSON.parse(data).money === '' || JSON.parse(data).money === undefined){
-          return 0; //未缴纳
-        }else {
-          return 1 //已缴纳
-        }
+    bailStatusTo(data) {
+      if (JSON.parse(data).money === '' || JSON.parse(data).money === undefined) {
+        return 0; //未缴纳
+      } else {
+        return 1 //已缴纳
+      }
     },
     /**履约保证金是否退回**/
-    bailStatusIn(data){
-      if(JSON.parse(data).backMoney === '' || JSON.parse(data).backMoney === undefined){
+    bailStatusIn(data) {
+      if (JSON.parse(data).backMoney === '' || JSON.parse(data).backMoney === undefined) {
         return 0; //未退回
-      }else {
+      } else {
         return 1 //已退回
       }
     },
@@ -1455,6 +1490,7 @@ export default {
     getTimeBlur(e) {
       this.form.beginTime = e.value[0]
       this.form.finishTime = e.value[1]
+      this.form.postponeTime = e.value[1]
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -1470,6 +1506,7 @@ export default {
       getProject(projectId).then(response => {
         this.loading = false;
         this.form = response.data;
+        console.log(this.form)
         this.bail = response.data.bail == null ? this.bail : JSON.parse(response.data.bail);
         let period = [];
         period.push(response.data.beginTime);
@@ -1632,7 +1669,7 @@ export default {
     },
 
     /** 金额转为万元 **/
-    convertToTenThousand(amount){
+    convertToTenThousand(amount) {
       const convertToTenThousand = (amount) => `${Number((amount / 10000).toFixed(6))} 万元`;
       return convertToTenThousand(amount);
     },
diff --git a/ruoyi-ui/src/views/oa/worker/index.vue b/ruoyi-ui/src/views/oa/worker/index.vue
new file mode 100644
index 0000000..2f850b0
--- /dev/null
+++ b/ruoyi-ui/src/views/oa/worker/index.vue
@@ -0,0 +1,604 @@
+<template>
+  <div class="app-container">
+
+
+      <!--用户数据-->
+      <el-col :span="24" :xs="24">
+        <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"
+              placeholder="请输入用户名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="手机号码" prop="phonenumber">
+            <el-input
+              v-model="queryParams.phonenumber"
+              placeholder="请输入手机号码"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-select
+              v-model="queryParams.status"
+              placeholder="用户状态"
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in dict.type.sys_normal_disable"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </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="['system:user: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="['system:user: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="['system:user: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="['system:user:export']"
+            >导出</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="序号" align="center" type="index"/>
+          <el-table-column label="用户名称" align="center" key="userName" prop="userName" :show-overflow-tooltip="true" />
+          <el-table-column label="姓名" align="center" key="nickName" prop="nickName" :show-overflow-tooltip="true" />
+          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber"  width="120" />
+          <el-table-column label="人力资源（天）" align="center" key="laborCost" prop="laborCost" />
+          <el-table-column label="性别" align="center" key="sex" prop="sex" >
+            <template slot-scope="scope">
+              <div v-if="scope.row.sex==0">男</div>
+              <div v-if="scope.row.sex==1">女</div>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+            <template slot-scope="scope">
+              <el-switch
+                v-model="scope.row.status"
+                active-value="0"
+                inactive-value="1"
+                @change="handleStatusChange(scope.row)"
+              ></el-switch>
+            </template>
+          </el-table-column>
+          <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>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            align="center"
+            width="160"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope" v-if="scope.row.userId !== 1">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:user:edit']"
+              >修改</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['system:user: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-col>
+
+
+    <!-- 添加或修改用户配置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="姓名" prop="nickName">
+              <el-input v-model="form.nickName" placeholder="请输入姓名" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input v-model="form.idCard" placeholder="请输入身份证号" maxlength="11" />
+            </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-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="人力成本" prop="laborCost">
+              <el-input v-model="form.laborCost" placeholder="请输入人力成本" maxlength="50" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="银行卡号" prop="bankCard">
+              <el-input v-model="form.bankCard" placeholder="请输入银行卡号" maxlength="30" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item 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-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-option
+                  v-for="dict in dict.type.sys_user_sex"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="状态">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in dict.type.sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </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>
+
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <div class="el-upload__tip" slot="tip">
+            <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>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listWorker, 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'],
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      userList: null,
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      // 是否显示弹出层
+      open: false,
+      // 部门名称
+      deptName: undefined,
+      // 默认密码
+      initPassword: undefined,
+      // 日期范围
+      dateRange: [],
+      // 岗位选项
+      postOptions: [],
+      // 角色选项
+      roleOptions: [],
+      // 表单参数
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/system/user/importData"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userName: undefined,
+        phonenumber: undefined,
+        status: undefined,
+        deptId: undefined
+      },
+      // 列信息
+      columns: [
+        { key: 0, label: `用户编号`, visible: true },
+        { key: 1, label: `用户名称`, visible: true },
+        { key: 2, label: `用户昵称`, visible: true },
+        { key: 3, label: `部门`, visible: true },
+        { key: 4, label: `手机号码`, visible: true },
+        { key: 5, label: `状态`, visible: true },
+        { key: 6, label: `创建时间`, visible: true }
+      ],
+      // 表单校验
+      rules: {
+        userName: [
+          { required: true, message: "用户名称不能为空", trigger: "blur" },
+          { min: 2, max: 20, 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' }
+        ],
+        email: [
+          {
+            type: "email",
+            message: "请输入正确的邮箱地址",
+            trigger: ["blur", "change"]
+          }
+        ],
+        phonenumber: [
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ]
+      }
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    this.getList();
+    this.getDeptTree();
+    this.getConfigKey("sys.user.initPassword").then(response => {
+      this.initPassword = response.msg;
+    });
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      listWorker(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.userList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.deptId = data.id;
+      this.handleQuery();
+    },
+    // 用户状态修改
+    handleStatusChange(row) {
+      let text = row.status === "0" ? "启用" : "停用";
+      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
+        return changeUserStatus(row.userId, row.status);
+      }).then(() => {
+        this.$modal.msgSuccess(text + "成功");
+      }).catch(function() {
+        row.status = row.status === "0" ? "1" : "0";
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        userId: undefined,
+        deptId: undefined,
+        userName: undefined,
+        nickName: undefined,
+        password: undefined,
+        phonenumber: undefined,
+        email: undefined,
+        sex: undefined,
+        status: "0",
+        remark: undefined,
+        postIds: [],
+        roleIds: ["1852970465740505090"]
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.queryParams.deptId = undefined;
+      this.$refs.tree.setCurrentKey(null);
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.userId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    // 更多操作触发
+    handleCommand(command, row) {
+      switch (command) {
+        case "handleResetPwd":
+          this.handleResetPwd(row);
+          break;
+        case "handleAuthRole":
+          this.handleAuthRole(row);
+          break;
+        default:
+          break;
+      }
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      getUser().then(response => {
+        this.postOptions = response.data.posts;
+        this.roleOptions = response.data.roles;
+        this.open = true;
+        this.title = "添加用户";
+        this.form.password = this.initPassword;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const userId = row.userId || this.ids;
+      getUser(userId).then(response => {
+        this.form = response.data.user;
+        this.postOptions = response.data.posts;
+        this.roleOptions = response.data.roles;
+        this.$set(this.form, "postIds", response.data.postIds);
+        this.$set(this.form, "roleIds", response.data.roleIds);
+        this.open = true;
+        this.title = "修改用户";
+        this.form.password = "";
+      });
+    },
+    /** 重置密码按钮操作 */
+    handleResetPwd(row) {
+      this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        closeOnClickModal: false,
+        inputPattern: /^.{5,20}$/,
+        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
+      }).then(({ value }) => {
+        resetUserPwd(row.userId, value).then(response => {
+          this.$modal.msgSuccess("修改成功，新密码是：" + value);
+        });
+      }).catch(() => {});
+    },
+    /** 分配角色操作 */
+    handleAuthRole: function(row) {
+      const userId = row.userId;
+      this.$router.push("/system/user-auth/role/" + userId);
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.userId != undefined) {
+            updateUser(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addUser(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const userIds = row.userId || this.ids;
+      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
+        return delUser(userIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/user/export', {
+        ...this.queryParams
+      }, `user_${new Date().getTime()}.xlsx`)
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download('system/user/importTemplate', {
+      }, `user_template_${new Date().getTime()}.xlsx`)
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      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.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    }
+  }
+};
+</script>