评分

ruoyi-system/src/main/java/com/ruoyi/care/domain/CareApplications.java

@@ -89,7 +89,15 @@ public class CareApplications extends BaseEntity
     private Long nurseUserId;
 
     private String scoreAssess;
+    private Long scoreId;
 
+    public Long getScoreId() {
+        return scoreId;
+    }
+
+    public void setScoreId(Long scoreId) {
+        this.scoreId = scoreId;
+    }
 
     public Long getCompanyUserId() {
         return companyUserId;

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

@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="assignRemark"    column="assign_remark"    />
         <result property="leaveTime"    column="leave_time"    />
         <result property="disability" column="disability"/>
+        <result property="scoreId" column="score_id"/>
     </resultMap>
 
     <sql id="selectCareApplicationsVo">
@@ -65,7 +66,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             h.`name` hospital_name,
             s.remark assign_remark,
             p.disability,
-            score.assess score_assess
+            score.assess score_assess,
+            score.score_id
         FROM
             care_applications a
                 left join care_persons p on p.person_id=a.person_id

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

@@ -25,47 +25,47 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['care:scores:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['care:scores:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['care:scores:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['care:scores:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+<!--    <el-row :gutter="10" class="mb8">-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="Plus"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['care:scores:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="Edit"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['care:scores:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="Delete"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['care:scores:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="Download"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['care:scores:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+<!--      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>-->
+<!--    </el-row>-->
 
     <el-table v-loading="loading" :data="scoresList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
@@ -75,9 +75,7 @@
       <el-table-column label="科室具体楼层房间床号" align="center" prop="address" />
       <el-table-column label="预计天数" align="center" prop="careDays" />
       <el-table-column label="申请日期" align="center" prop="applyDate" />
-      <el-table-column label="评分" align="center" prop="assess" show-overflow-tooltip/>
-      <el-table-column label="得此评分原因" align="center" prop="reason" show-overflow-tooltip/>
-      <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
+      <el-table-column label="评分" align="center" prop="scoreAssess" 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:scores:edit']">评分</el-button>
@@ -97,21 +95,12 @@
     <!-- 添加或修改业务评分对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="scoresRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="护理业务数据id" prop="applyId">
-          <el-input v-model="form.applyId" placeholder="请输入护理业务数据id" />
-        </el-form-item>
-        <el-form-item label="评分人id" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入评分人id" />
-        </el-form-item>
-        <el-form-item label="评价" prop="assess">
-          <el-input v-model="form.assess" placeholder="请输入评价" />
+        <el-form-item label="评分" prop="assess">
+          <el-input v-model="form.assess" placeholder="满分5分" />
         </el-form-item>
         <el-form-item label="得此评价原因" prop="reason">
           <el-input v-model="form.reason" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -231,11 +220,11 @@ function handleAdd() {
 /** 修改按钮操作 */
 function handleUpdate(row) {
   reset();
-  const _scoreId = row.scoreId || ids.value
+  const _scoreId = row.scoreId
   getScores(_scoreId).then(response => {
     form.value = response.data;
     open.value = true;
-    title.value = "修改业务评分";
+    title.value = "评分";
   });
 }