yidui

pom.xml

@@ -10,7 +10,7 @@
 
     <name>ruoyi</name>
     <url>http://www.ruoyi.vip</url>
-    <description>若依管理系统</description>
+    <description>特困户看护平台</description>
 
     <properties>
         <ruoyi.version>3.8.8</ruoyi.version>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/care/CareApplicationsController.java

@@ -191,5 +191,31 @@ public class CareApplicationsController extends BaseController
         return toAjax(careApplicationsService.complete(careApplications,userId));
     }
 
+    /**
+     * 指派人员列表
+     */
+    @PreAuthorize("@ss.hasPermi('care:applications:assignList')")
+    @GetMapping("/assignList")
+    public TableDataInfo assignList(CareApplications careApplications)
+    {
+        startPage();
+        Long userId=getUserId();
+        careApplications.setCompanyId(userId);
+        List<CareApplications> list = careApplicationsService.selectCareApplicationsList(careApplications);
+        return getDataTable(list);
+    }
 
+    /**
+     * 任务打卡列表
+     */
+    @PreAuthorize("@ss.hasPermi('care:applications:clockList')")
+    @GetMapping("/clockList")
+    public TableDataInfo clockList(CareApplications careApplications)
+    {
+        startPage();
+        Long userId=getUserId();
+        careApplications.setNurseId(userId);
+        List<CareApplications> list = careApplicationsService.selectCareApplicationsList(careApplications);
+        return getDataTable(list);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/care/CareNurseClocksController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.care;
 
 import java.io.File;
+import java.text.ParseException;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -86,7 +87,11 @@ public class CareNurseClocksController extends BaseController
     public AjaxResult add(@RequestBody CareNurseClocks careNurseClocks)
     {
         Long userId=getUserId();
-        return toAjax(careNurseClocksService.insertCareNurseClocks(careNurseClocks,userId));
+        try {
+            return toAjax(careNurseClocksService.insertCareNurseClocks(careNurseClocks,userId));
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     /**
@@ -115,12 +120,16 @@ public class CareNurseClocksController extends BaseController
      * 人员死亡
      */
     @PreAuthorize("@ss.hasPermi('care:clocks:die')")
-    @Log(title = "护理申请", businessType = BusinessType.INSERT)
+    @Log(title = "人员死亡", businessType = BusinessType.INSERT)
     @PostMapping(value = "/die")
     public AjaxResult die(@RequestBody CarePersonDie carePersonDie)
     {
         Long userId=getUserId();
-        return toAjax(careNurseClocksService.die(carePersonDie,userId));
+        try {
+            return toAjax(careNurseClocksService.die(carePersonDie,userId));
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java

@@ -113,7 +113,7 @@ public class SwaggerConfig
         // 用ApiInfoBuilder进行定制
         return new ApiInfoBuilder()
                 // 设置标题
-                .title("标题：若依管理系统_接口文档")
+                .title("标题：特困户看护平台_接口文档")
                 // 描述
                 .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
                 // 作者信息

ruoyi-system/src/main/java/com/ruoyi/care/service/ICareNurseClocksService.java

@@ -1,5 +1,6 @@
 package com.ruoyi.care.service;
 
+import java.text.ParseException;
 import java.util.List;
 import com.ruoyi.care.domain.CareNurseClocks;
 import com.ruoyi.care.domain.CarePersonDie;
@@ -34,7 +35,7 @@ public interface ICareNurseClocksService
      * @param careNurseClocks 护理任务打卡
      * @return 结果
      */
-    public int insertCareNurseClocks(CareNurseClocks careNurseClocks,Long userId);
+    public int insertCareNurseClocks(CareNurseClocks careNurseClocks,Long userId) throws ParseException;
 
     /**
      * 修改护理任务打卡
@@ -60,5 +61,5 @@ public interface ICareNurseClocksService
      */
     public int deleteCareNurseClocksByClockId(Long clockId);
 
-    int die(CarePersonDie carePersonDie, Long userId);
+    int die(CarePersonDie carePersonDie, Long userId) throws ParseException;
 }

ruoyi-system/src/main/java/com/ruoyi/care/service/impl/CareNurseClocksServiceImpl.java

@@ -7,6 +7,8 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
@@ -81,8 +83,7 @@ public class CareNurseClocksServiceImpl implements ICareNurseClocksService
      */
     @Override
     @Transactional
-    public int insertCareNurseClocks(CareNurseClocks careNurseClocks,Long userId)
-    {
+    public int insertCareNurseClocks(CareNurseClocks careNurseClocks,Long userId) {
         //判断当前日期是否可以打卡，非残疾人出院前两天不再护理，残疾人截至到出院当天,若无法打卡，则抛出异常
         CareApplications careApplications = careApplicationsMapper.selectCareApplicationsByApplyId(Long.parseLong(careNurseClocks.getApplyId()));
         String leaveTimeStr = careApplications.getLeaveTime();
@@ -143,8 +144,13 @@ public class CareNurseClocksServiceImpl implements ICareNurseClocksService
             careRecordsMapper.updateCareRecords(curr);
 
             //计算计时天数
-            careNurseRecord=calDayApplyRecord(careNurseRecord,careNurseClocks.getNursingTime());
-           careNurseRecordsMapper.updateCareNurseRecords(careNurseRecord);
+            try {
+                careNurseRecord=calDayApplyRecord(careNurseRecord,careNurseClocks.getNursingTime());
+            } catch (ParseException e) {
+                throw new RuntimeException(e);
+            }
+            System.out.print(careNurseRecord);
+            careNurseRecordsMapper.updateCareNurseRecords(careNurseRecord);
 
            //已经开始了直接新增打卡记录
            result= careNurseClocksMapper.insertCareNurseClocks(careNurseClocks);
@@ -159,7 +165,15 @@ public class CareNurseClocksServiceImpl implements ICareNurseClocksService
            careNurseRecords.setClockNum(1);//当天第一次打卡
            careNurseRecords.setCalDays(new BigDecimal(0));//当天第一次打卡,计算天数为0
             careNurseRecords.setCalDayReason("今天第一次打卡，计算天数暂定为0");
-            careNurseRecords.setCreateTime(DateUtils.getNowDate());
+
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Date time = null;
+            try {
+                time = sdf.parse(careNurseClocks.getNursingTime());
+            } catch (ParseException e) {
+                throw new RuntimeException(e);
+            }
+            careNurseRecords.setCreateTime(time);
             careNurseRecordsMapper.insertCareNurseRecords(careNurseRecords);
 
            //获取打卡次数
@@ -204,11 +218,15 @@ public class CareNurseClocksServiceImpl implements ICareNurseClocksService
         CareNurseClocks careNurseClock=careNurseClocksMapper.selectLastClock(careApplications.getApplyId());
         CareNurseRecords careNurseRecord=careNurseRecordsMapper.selectCareNurseRecordsByNursingRecordId(careNurseClock.getNursingRecordId());
         //计算计时天数
-        careNurseRecord=calDayApplyRecord(careNurseRecord,careNurseClock.getNursingTime());
+        try {
+            careNurseRecord=calDayApplyRecord(careNurseRecord,careNurseClock.getNursingTime());
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
         return careNurseRecordsMapper.updateCareNurseRecords(careNurseRecord);
     }
 
-    private CareNurseRecords calDayApplyRecord(CareNurseRecords careNurseRecords,String nurseTime) {
+    private CareNurseRecords calDayApplyRecord(CareNurseRecords careNurseRecords,String nurseTime) throws ParseException {
         BigDecimal day=new BigDecimal(0);
         String reason="";
         //获取第一次打卡时间 判断是上午开始还是下午开始的
@@ -218,10 +236,7 @@ public class CareNurseClocksServiceImpl implements ICareNurseClocksService
         boolean isFirstClockInMorning = isMorning(firstTime);
 
         //获取当天打卡次数
-        CareNurseClocks param=new CareNurseClocks();
-        param.setApplyId(careNurseRecords.getApplyId().toString());
-        List<CareNurseClocks> lst=careNurseClocksMapper.selectCareNurseClocksList(param);
-        Integer count=lst.size();
+        Integer count=careNurseRecords.getClockNum()+1;
 
         //获取半天次数和全天次数
         Long allday=sysWorkConfigMapper.selectSysWorkConfigByType("day_clock_num").getNumber();
@@ -231,7 +246,8 @@ public class CareNurseClocksServiceImpl implements ICareNurseClocksService
         //如果第一次是下午打卡，若当前是上午且次数已经达到半天次数，则返回0.5天，若次数未达到，则返回0
 
         //判断当前是上午还是下午
-        Date currentTime = new Date(nurseTime);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date currentTime = sdf.parse(nurseTime);
         if (isFirstClockInMorning) {// 第一次打卡在上午
             if (isMorning(currentTime)) {
                 if (count >= halfday) {
@@ -259,6 +275,7 @@ public class CareNurseClocksServiceImpl implements ICareNurseClocksService
         }
         careNurseRecords.setCalDays(day);
         careNurseRecords.setCalDayReason(reason);
+        careNurseRecords.setClockNum(count);
         return careNurseRecords;
     }
 
@@ -325,7 +342,11 @@ public class CareNurseClocksServiceImpl implements ICareNurseClocksService
         if(lst.size()>0){
             CareNurseRecords careNurseRecord=lst.get(0);
             //计算计时天数
-            careNurseRecord=calDayApplyRecord(careNurseRecord,careNurseClocks.getNursingTime());
+            try {
+                careNurseRecord=calDayApplyRecord(careNurseRecord,careNurseClocks.getNursingTime());
+            } catch (ParseException e) {
+                throw new RuntimeException(e);
+            }
             careNurseRecordsMapper.updateCareNurseRecords(careNurseRecord);
 
             //已经开始了直接新增打卡记录

ruoyi-system/src/main/resources/mapper/care/CareApplicationsMapper.xml

@@ -67,8 +67,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             care_applications a
                 left join care_persons p on p.person_id=a.person_id
                 LEFT JOIN care_assignments s ON a.apply_id = s.apply_id
-                LEFT JOIN care_nurses n ON n.nurse_id = s.apply_id
-                LEFT JOIN care_hospital h ON h.hospital_id = s.company_id
+                LEFT JOIN care_nurses n ON n.nurse_id = s.nurse_id
+                LEFT JOIN care_hospital h ON h.hospital_id = a.hospital
                 LEFT JOIN sys_user u ON u.user_id = a.create_by
     </sql>
 
@@ -83,6 +83,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="address != null  and address != ''"> and a.address = #{address}</if>
             <if test="careDays != null  and careDays != ''"> and a.care_days = #{careDays}</if>
             <if test="applyDate != null  and applyDate != ''"> and a.apply_date = #{applyDate}</if>
+            <if test="companyId != null  and companyId != ''"> and s.company_id = #{companyId}</if>
+            <if test="nurseId != null  and nurseId != ''"> and s.nurse_id = #{nurseId}</if>
             <if test="status != null  and status != ''">
              and
              <choose>

ruoyi-system/src/main/resources/mapper/care/CareNurseRecordsMapper.xml

@@ -76,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark = #{remark},</if>
             <if test="calDays != null">cal_days=#{calDays},</if>
             <if test="clockNum != null">clock_num=#{clockNum},</if>
+            <if test="calDayReason != null">cal_day_reason=#{calDayReason},</if>
         </trim>
         where nursing_record_id = #{nursingRecordId}
     </update>

ruoyi-ui/src/views/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">特困户看护平台</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />

ruoyi-ui/vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '特困户看护平台' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 

ruoyi-vue/index.html

@@ -7,7 +7,7 @@
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <link rel="icon" href="/favicon.ico">
-  <title>若依管理系统</title>
+  <title>特困户看护平台</title>
   <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
   <style>
     html,

ruoyi-vue/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.8.4",
-  "description": "若依管理系统",
+  "description": "特困户看护平台",
   "author": "若依",
   "license": "MIT",
   "scripts": {

ruoyi-vue/src/api/care/applications.js

@@ -9,6 +9,7 @@ export function listApplications(query) {
   })
 }
 
+
 // 查询护理申请详细
 export function getApplications(applyId) {
   return request({
@@ -77,3 +78,21 @@ export function completeApplications(data) {
     data: data
   })
 }
+
+// 查询指派人员列表
+export function assignlistApplications(query) {
+  return request({
+    url: '/care/applications/assignList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 打卡列表
+export function clocklistApplications(query) {
+  return request({
+    url: '/care/applications/clockList',
+    method: 'get',
+    params: query
+  })
+}

ruoyi-vue/src/api/care/clocks.js

@@ -58,3 +58,12 @@ export function getleastNum(data) {
     method: 'get'
   })
 }
+
+// 死亡
+export function dieSubmit(data) {
+  return request({
+    url: '/care/clocks/die',
+    method: 'post',
+    data: data
+  })
+}

ruoyi-vue/src/layout/components/Sidebar/Logo.vue

@@ -25,7 +25,7 @@ defineProps({
   }
 })
 
-const title = ref('若依管理系统');
+const title = ref('特困户看护平台');
 const settingsStore = useSettingsStore();
 const sideTheme = computed(() => settingsStore.sideTheme);
 </script>

ruoyi-vue/src/views/care/applications/index_assign_nurse.vue

@@ -97,15 +97,8 @@
       <el-form ref="applicationsRef" :model="form" :rules="rules" label-width="80px">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="申请人" prop="personId">
-              <el-select v-model="form.personId" placeholder="请选择特困人员" disabled>
-                <el-option
-                    v-for="dict in personList"
-                    :key="dict.personId"
-                    :label="dict.name"
-                    :value="dict.personId"
-                ></el-option>
-              </el-select>
+            <el-form-item label="申请人" prop="personName">
+              <el-input v-model="form.personName"  disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -234,22 +227,16 @@
 
 <script setup name="assignNurseApplications">
 import {
-  listApplications,
   getApplications,
-  delApplications,
-  addApplications,
-  updateApplications,
-  assignApplications
+  assignApplications, assignlistApplications
 } from "@/api/care/applications";
 import { listAllHospital } from "@/api/care/hospital";
-import {listAllPersons} from "@/api/care/persons";
 import {listCompanyNurses} from "@/api/care/nurses";
 const { proxy } = getCurrentInstance();
 const { sys_user_sex,care_apply_status,sys_yes_no } = proxy.useDict('sys_user_sex','care_apply_status','sys_yes_no');
 
 const applicationsAssignList = ref([]);
 const hispitalList=ref([]);
-const personList=ref([]);
 const nursesList=ref([]);
 const loading = ref(true);
 const showSearch = ref(true);
@@ -285,7 +272,7 @@ const { queryParams, form, rules } = toRefs(data);
 /** 查询护理指派列表 */
 function getAssignList(){
   loading.value = true;
-  listApplications(queryParams.value).then(response => {
+  assignlistApplications(queryParams.value).then(response => {
     applicationsAssignList.value = response.rows;
     assignTotal.value = response.total;
     loading.value = false;
@@ -371,21 +358,7 @@ function submitForm() {
     }
   });
 }
-/** 导出按钮操作 */
-function handleExport() {
-  proxy.download('care/applications/export', {
-    ...queryParams.value
-  }, `applications_${new Date().getTime()}.xlsx`)
-}
 
-function handleSelectChange(value) {
-  // 找到选中的选项
-  const person =personList.value.find(option => option.personId === value);
-  if (person) {
-    form.value.personId=person.personId
-    form.value.personName=person.name
-  }
-}
 
 /** 查询当前公司的护理人员 */
 function companyNurses() {
@@ -401,13 +374,6 @@ function listHispital() {
   });
 }
 
-/** 查询所有特困人员 */
-function listPersons() {
-  listAllPersons().then(response => {
-    personList.value = response;
-  });
-}
-listPersons();
 getAssignList();
 companyNurses();
 listHispital();

ruoyi-vue/src/views/care/clocks/index_task.vue

@@ -60,9 +60,9 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="168px">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="look(scope.row)" v-hasPermi="['care:applications:look']">查看</el-button>
-          <el-button link type="primary" icon="Edit" @click="clock(scope.row)" v-hasPermi="['care:applications:clock']">打卡</el-button>
+          <el-button link type="primary" icon="Edit" @click="clock(scope.row)" v-hasPermi="['care:clocks:list']">打卡</el-button>
           <el-button link type="primary" icon="Edit" @click="die(scope.row)" v-hasPermi="['care:clocks:die']">死亡</el-button>
-          <el-button link type="primary" icon="Edit" @click="finish(scope.row)" v-hasPermi="['care:applications:finish']">结束</el-button>
+          <el-button link type="primary" icon="Edit" @click="finish(scope.row)" v-hasPermi="['care:clocks:finish']">结束</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -79,15 +79,8 @@
     <el-form ref="applicationsRef" :model="form" label-width="80px">
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="申请人" prop="personId">
-            <el-select v-model="form.personId" placeholder="请选择特困人员" disabled>
-              <el-option
-                  v-for="dict in personList"
-                  :key="dict.personId"
-                  :label="dict.name"
-                  :value="dict.personId"
-              ></el-option>
-            </el-select>
+          <el-form-item label="申请人" prop="personName">
+            <el-input v-model="form.personName"  disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -221,11 +214,11 @@
 <script setup name="ClocksTask">
 import {
   getApplications,
-  listApplications,
+  clocklistApplications,
   completeApplications
 } from "@/api/care/applications";
 import clockIndex from './index.vue';
-import {listAllPersons} from "@/api/care/persons";
+import {dieSubmit} from "@/api/care/clocks";
 import {Plus} from "@element-plus/icons-vue";
 import {ref} from "vue";
 import {getToken} from "@/utils/auth";
@@ -236,7 +229,6 @@ const applicationsList = ref([]);
 const hispitalList=ref([]);
 const currentComponent = ref(null); // 使用 ref 来管理组件
 const componentProps = ref({});     // 使用 ref 来管理传递给组件的属性
-const personList=ref([]);
 const loading = ref(true);
 const showSearch = ref(true);
 const ids = ref([]);
@@ -289,7 +281,7 @@ const { queryParams, form,dieForm,dieRules } = toRefs(data);
 /** 查询护理指派列表 */
 function getList(){
   loading.value = true;
-  listApplications(queryParams.value).then(response => {
+  clocklistApplications(queryParams.value).then(response => {
     applicationsList.value = response.rows;
     total.value = response.total;
     loading.value = false;
@@ -372,12 +364,6 @@ function finish(row){
   }).catch(() => {});
 }
 
-/** 查询所有特困人员 */
-function listPersons() {
-  listAllPersons().then(response => {
-    personList.value = response;
-  });
-}
 function handleRemove(file, fileList) {
   console.log('移除文件:', file, '剩余文件:', fileList);
 }
@@ -403,27 +389,17 @@ function submitForm() {
   });
 
   console.info(dieForm.value);
-  // proxy.$refs["dieRef"].validate(valid => {
-  //   if (valid) {
-  //     if (form.value.clockId != null) {
-  //       updateClocks(form.value).then(response => {
-  //         proxy.$modal.msgSuccess("修改成功");
-  //         open.value = false;
-  //         getList();
-  //       });
-  //     } else {
-  //       addClocks(form.value).then(response => {
-  //         proxy.$modal.msgSuccess("新增成功");
-  //         open.value = false;
-  //         getList();
-  //       });
-  //     }
-  //   }
-  // });
+  proxy.$refs["dieRef"].validate(valid => {
+    if (valid) {
+      dieSubmit(form.value).then(response => {
+        proxy.$modal.msgSuccess("操作成功");
+        open.value = false;
+        getList();
+      });
+    }
+  });
 }
 
-
-listPersons();
 getList();
 
 </script>

ruoyi-vue/src/views/care/persons/index.vue

@@ -146,12 +146,21 @@
       <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['care:persons:edit']">修改</el-button>
-          <el-button link type="primary" icon="Edit" @click="transfer(scope.row)" v-hasPermi="['care:persons:transfer']">中转</el-button>
-          <el-button link type="primary" icon="Edit" @click="endTransfer(scope.row)" v-hasPermi="['care:persons:endTransfer']">结束中转</el-button>
-          <el-button link type="primary" icon="Edit" @click="leave(scope.row)" v-hasPermi="['care:persons:leave']">擅自离院</el-button>
-          <el-button link type="primary" icon="Edit" @click="back(scope.row)" v-hasPermi="['care:persons:back']">回院</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['care:persons:remove']">删除</el-button>
+          <div v-if="scope.row.status == '01'">
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['care:persons:edit']">修改</el-button>
+            <el-button link type="primary" icon="Edit" @click="transfer(scope.row)" v-hasPermi="['care:persons:transfer']">中转</el-button>
+            <el-button link type="primary" icon="Edit" @click="leave(scope.row)" v-hasPermi="['care:persons:leave']">擅自离院</el-button>
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['care:persons:remove']">删除</el-button>
+          </div>
+          <div v-if="scope.row.status == '02'">
+            <el-button link type="primary" icon="Edit" @click="endTransfer(scope.row)" v-hasPermi="['care:persons:endTransfer']">结束中转</el-button>
+          </div>
+          <div v-if="scope.row.status == '03'">
+            <el-button link type="primary" icon="Edit" @click="back(scope.row)" v-hasPermi="['care:persons:back']">回院</el-button>
+          </div>
+
+
+
         </template>
       </el-table-column>
     </el-table>

ruoyi-vue/src/views/index.vue

@@ -41,7 +41,7 @@
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
         <h2>若依后台管理框架</h2>
         <p>
-          一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
+          一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了特困户看护平台，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
         </p>
         <p>
           <b>当前版本:</b> <span>v{{ version }}</span>

ruoyi-vue/src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title"> </h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -156,7 +156,7 @@ getCookie();
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
+  background-image: url("../assets/images/1.png");
   background-size: cover;
 }
 .title {
@@ -168,16 +168,16 @@ getCookie();
 .login-form {
   border-radius: 6px;
   background: #ffffff;
-  width: 400px;
+  width: 500px;
   padding: 25px 25px 5px 25px;
   .el-input {
-    height: 40px;
+    height: 60px;
     input {
-      height: 40px;
+      height: 60px;
     }
   }
   .input-icon {
-    height: 39px;
+    height: 59px;
     width: 14px;
     margin-left: 0px;
   }
@@ -189,7 +189,7 @@ getCookie();
 }
 .login-code {
   width: 33%;
-  height: 40px;
+  height: 58px;
   float: right;
   img {
     cursor: pointer;
@@ -209,7 +209,7 @@ getCookie();
   letter-spacing: 1px;
 }
 .login-code-img {
-  height: 40px;
+  height: 58px;
   padding-left: 12px;
 }
 </style>

ruoyi-vue/src/views/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">特困户看护平台</h3>
       <el-form-item prop="username">
         <el-input 
           v-model="registerForm.username"