From 339ea49928d7b38a640d4584ec881972787a954a Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Wed, 30 Dec 2020 10:26:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A4=E5=B7=A5=E6=B7=BB=E5=8A=A0=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E7=A0=81=E5=8F=8A=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FtStaffInfoDaoController.java  |  2 ++
 .../src/views/fantang/careStaffInfo/index.vue | 23 ++++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffInfoDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffInfoDaoController.java
index b19a2f55b..59203d599 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffInfoDaoController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffInfoDaoController.java
@@ -167,6 +167,8 @@ public class FtStaffInfoDaoController extends BaseController {
     @PutMapping("/nursing")
     public AjaxResult nursingEdit(@RequestBody JSONObject param) {
         FtStaffInfoDao dao = new FtStaffInfoDao();
+        dao.setPassword(param.getString("password"));
+        dao.setTel(param.getString("tel"));
         dao.setStaffId(param.getLong("staffId"));
         dao.setCorpName(param.getString("corpName"));
         dao.setCreateAt(new DateTime());
diff --git a/ruoyi-ui/src/views/fantang/careStaffInfo/index.vue b/ruoyi-ui/src/views/fantang/careStaffInfo/index.vue
index d88233365..72b7a5e1d 100644
--- a/ruoyi-ui/src/views/fantang/careStaffInfo/index.vue
+++ b/ruoyi-ui/src/views/fantang/careStaffInfo/index.vue
@@ -141,11 +141,14 @@
         <el-form-item label="所属公司" prop="corpName">
           <el-input v-model="form.corpName" placeholder="请输入所属公司"/>
         </el-form-item>
-        <el-form-item label="照片">
-          <uploadImage v-model="form.pictureUrl"/>
+        <el-form-item label="手机号码" prop="tel">
+          <el-input v-model="form.tel" placeholder="请输入手机号码"/>
+        </el-form-item>
+        <el-form-item label="密码" prop="password">
+          <el-input v-model="form.password" placeholder="请输入密码"/>
         </el-form-item>
         <el-form-item label="报餐科室" prop="deptList">
-          <el-select v-model="form.deptList" multiple placeholder="请选择报餐科室">
+          <el-select v-model="form.deptList" placeholder="请选择报餐科室">
             <el-option
               v-for="item in deptListOptions"
               :key="item.departName"
@@ -154,6 +157,9 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="照片">
+          <uploadImage v-model="form.pictureUrl"/>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -224,6 +230,9 @@ export default {
         sex: [
           {required: true, message: "性别不能为空", trigger: "blur"}
         ],
+        tel: [
+          {required: true, message: "手机号码不能为空", trigger: "blur"}
+        ],
         deptList: [
           {required: true, message: "报餐科室不能为空", trigger: "blur"}
         ],
@@ -246,7 +255,7 @@ export default {
         this.loading = false;
       });
       listDepart(this.queryParams).then(response => {
-        // console.log("depart", response);
+        console.log("depart", response);
         this.deptListOptions = response.rows;
       })
     },
@@ -272,7 +281,8 @@ export default {
         corpName: null,
         pictureUrl: null,
         deptList: null,
-        qrCode: null
+        qrCode: null,
+        tel:null,
       };
       this.resetForm("form");
     },
@@ -304,7 +314,7 @@ export default {
       const staffId = row.staffId || this.ids;
       getNursingInfo(staffId).then(response => {
         this.form = response.data;
-        this.form.deptList = response.data.deptList.split(',').map(Number);
+        // this.form.deptList = response.data.deptList.split(',').map(Number);
         // this.form.deptList =['2','3'].map(Number);
         this.open = true;
         this.title = "修改护工管理";
@@ -317,6 +327,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.staffId != null) {
+            console.log(this.form);
             updateNursingInfo(this.form).then(response => {
               this.msgSuccess("修改成功");
               this.open = false;