Merge remote-tracking branch 'origin/sdl_20220916_护理站人员功能' into yan_0916_护理类型信息

# Conflicts:
#	src/views/system/communityInfo/index.vue
#	src/views/system/person/index.vue

src/views/system/communityInfo/index.vue

@@ -558,9 +558,6 @@ export default {
       this.queryParams.city = "";
       this.queryParams.area = "";
       this.queryParams.areaCode = "";
-      // this.item.city = "";
-      // this.item.area = "";
-      // this.item.areaCode = "";
       SecondaryLevelInfo(item.id).then((res) => {
         console.log(res);
         this.SecondaryLevelInfolist = res.data;
@@ -574,12 +571,6 @@ export default {
       this.form.communityInfoList[index].area = "";
       this.form.communityInfoList[index].areaCode = "";
       console.log(item);
-      // this.queryParams.city = "";
-      // this.queryParams.area = "";
-      // this.queryParams.areaCode = "";
-      // this.item.city = "";
-      // this.item.area = "";
-      // this.item.areaCode = "";
       SecondaryLevelInfo(item.id).then((res) => {
         console.log(res);
         this.SecondaryLevelInfolist = res.data;
@@ -589,10 +580,6 @@ export default {
     },
     // 点击市
     clickcity(item) {
-      // this.queryParams.area = "";
-      // this.queryParams.areaCode = "";
-      // this.value2 = "";
-      // this.value3 = "";
       console.log(item);
       SecondaryLevelInfo(item.id).then((res) => {
         console.log(res);
@@ -633,8 +620,8 @@ export default {
     },
     //点击街道
     clickstreet(item) {
-      this.queryParams.areaCode = item.areaCode;
+      this.form.areaCode = item.areaCode;
-      console.log(this.queryParams);
+      console.log(this.form);
     },
     // 所属省下拉框
     loadMore() {

src/views/system/person/index.vue

@@ -8,58 +8,6 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <!-- <el-form-item label="护理站表id" prop="nurseStationId">
-        <el-input
-          v-model="queryParams.nurseStationId"
-          placeholder="请输入护理站表id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="所属科室编码" prop="departmentCode">
-        <el-input
-          v-model="queryParams.departmentCode"
-          placeholder="请输入所属科室编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="创建人id" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入创建人id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="护理站人员编码" prop="nursePersonCode">
-        <el-input
-          v-model="queryParams.nursePersonCode"
-          placeholder="请输入护理站人员编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item
-        label="所属护理站"
-        prop="nursePersonName"
-        label-width="90px"
-      >
-        <el-select
-          v-model="queryParams.nursePersonName"
-          clearable
-          placeholder="请选择护理站"
-          v-loadmore="loadMore"
-        >
-          <el-option
-            v-for="item in nurseStationlist"
-            :key="item.id"
-            :label="item.nurseStationName"
-            :value="item.id"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item> -->
       <el-form-item label="护理站" prop="nurseStationId">
         <el-select
           v-model="queryParams.nurseStationId"
@@ -206,11 +154,7 @@
           {{ scope.row.sex == "FEMALE" ? "女" : "" }}
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column label="护理人职称" align="center" prop="nursePersonType">
-        label="护理站人员类型"
-        align="center"
-        prop="nursePersonType"
-      >
         <template slot-scope="scope">
           {{ scope.row.nursePersonType == "NURSE" ? "护士" : "" }}
           {{ scope.row.nursePersonType == "NURSE_TEACHER" ? "护理师" : "" }}
@@ -270,33 +214,11 @@
         label-width="80px"
         :inline="true"
       >
-        <!-- <el-form-item label="护理站表id" prop="nurseStationId">
-          <el-input v-model="form.nurseStationId" placeholder="请输入护理站表id" />
-        </el-form-item> -->
         <div
           v-for="(item, index) in form.nurseStationPersonList"
           :key="index"
           style="margin-top: 10px"
         >
-          <!-- <el-form-item label="所属科室编码"
-          label-width="120px"  :prop="`nurseStationPersonList.${index}.departmentCode`">
-            <el-input
-              v-model="item.departmentCode"
-
-              placeholder="请输入所属科室编码"
-
-            />
-          </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="护理站人员编码"
-            label-width="120px" :prop="`nurseStationPersonList.${index}.nursePersonCode`">
-            <el-input
-              v-model="item.nursePersonCode"
-              placeholder="请输入护理站人员编码"
-            />
-          </el-form-item> -->
           <el-form-item
             label="所属护理站"
             label-width="120px"
@@ -356,7 +278,6 @@
                 text-align: left;
                 height: 36px;
                 padding-left: -10px;
-                
               "
               >{{ item.departmentName }}</el-button
             >
@@ -465,7 +386,7 @@
       </div>
     </el-dialog>
 
-    <!-- 护理站名称弹框 -->
+    <!-- 新增护理站名称弹框 -->
     <el-dialog
       :title="title2"
       :visible.sync="innerVisible"
@@ -594,6 +515,135 @@
         @pagination="handleQuery2"
       />
     </el-dialog>
+    <!-- 修改护理站名称弹框 -->
+    <el-dialog
+      :title="title2"
+      :visible.sync="innerVisiblexg"
+      width="1000px"
+      append-to-body
+    >
+      <el-form
+        ref="queryForm"
+        :model="queryParams2"
+        :rules="rules"
+        label-width="80px"
+        :inline="true"
+      >
+        <!-- <el-form
+        :model="queryParams2"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="90px"
+      > -->
+        <el-form-item
+          label="护理站编码"
+          prop="nurseStationCode"
+          label-width="120"
+        >
+          <el-input
+            v-model="queryParams2.nurseStationCode"
+            placeholder="请输入护理站编码"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item
+          label="护理站名称"
+          prop="nurseStationName"
+          label-width="120"
+        >
+          <el-input
+            v-model="queryParams2.nurseStationName"
+            placeholder="请输入护理站名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery2"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery2"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+      <el-table :data="stationLists" @cell-dblclick="nurseclick2">
+        <el-table-column label="请选择" width="70" align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              style="width: 15px; height: 15px"
+              v-if="stationid2 == scope.row.id"
+              circle
+              @click="nurseclick2(scope.row)"
+            ></el-button>
+            <el-button
+              v-else
+              style="width: 15px; height: 15px"
+              circle
+              @click="nurseclick2(scope.row)"
+            ></el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          property="nurseStationCode"
+          label="护理站编码"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="nurseStationName"
+          label="护理站名称"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          label="护理站类型"
+          align="center"
+          prop="nurseStationType"
+        >
+          <template slot-scope="scope">
+            {{
+              scope.row.nurseStationType == "LX202209140018" ? "生活护理" : ""
+            }}
+            {{
+              scope.row.nurseStationType == "LX202209140019" ? "医疗护理" : ""
+            }}
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          property="phone"
+          label="联系电话"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="address"
+          label="护理地址"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total2 > 0"
+        :total="total2"
+        :page.sync="queryParams2.pageNum"
+        :limit.sync="queryParams2.pageSize"
+        @pagination="handleQuery2"
+      />
+    </el-dialog>
     <!-- 所属科室弹框 -->
     <el-dialog
       :title="title3"
@@ -654,7 +704,7 @@
             <el-button
               type="primary"
               style="width: 15px; height: 15px"
-              v-if="departid == scope.row.id"
+              v-if="departid == scope.row.departmentCode"
               circle
               @click="StationDepartmentclick(scope.row)"
             ></el-button>
@@ -704,30 +754,172 @@
         @pagination="handleQuery3"
       />
     </el-dialog>
+    <!-- 修改所属科室弹框 -->
+    <el-dialog
+      :title="title3"
+      :visible.sync="innerVisiblexg2"
+      width="1000px"
+      append-to-body
+    >
+      <el-form
+        ref="queryForm"
+        :model="queryParams3"
+        :rules="rules"
+        label-width="80px"
+        :inline="true"
+      >
+        <!-- <el-form
+        :model="queryParams2"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="90px"
+      > -->
+        <el-form-item label="科室编码" prop="departmentCode" label-width="120">
+          <el-input
+            v-model="queryParams3.departmentCode"
+            placeholder="请输入科室编码"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="科室名称" prop="" label-width="120">
+          <el-input
+            v-model="queryParams3.departmentName"
+            placeholder="请输入科室名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery3"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery3"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+      <el-table
+        :data="StationDepartmentLists"
+        @cell-dblclick="StationDepartmentclick2"
+      >
+        <el-table-column label="请选择" width="70" align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              style="width: 15px; height: 15px"
+              v-if="departid2 == scope.row.departmentCode"
+              circle
+              @click="StationDepartmentclick2(scope.row)"
+            ></el-button>
+            <el-button
+              v-else
+              style="width: 15px; height: 15px"
+              circle
+              @click="StationDepartmentclick2(scope.row)"
+            ></el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          property="departmentCode"
+          label="科室编码"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="departmentName"
+          label="科室名称"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+
+        <el-table-column
+          property="departmentPerson"
+          label="科室负责人"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="phone"
+          label="联系电话"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total3 > 0"
+        :total="total3"
+        :page.sync="queryParams3.pageNum"
+        :limit.sync="queryParams3.pageSize"
+        @pagination="handleQuery3"
+      />
+    </el-dialog>
 
     <!-- 修改 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="护理站名称" prop="nurseStationId">
+        <el-form-item
-          <el-input
+          label="所属护理站"
-            :disabled="true"
+          label-width="120px"
-            v-model="form.nurseStationName"
+          prop="nurseStationId"
-            placeholder="请输入护理站名称"
+          style="margin-left: -20px"
-          />
+        >
+          <el-button
+            type=""
+            @click="clickinnerVisible2"
+            v-if="nurseStationName == '请选择护理站名称'"
+            style="width: 362px; text-align: left; height: 36px; color: #c0c4cc"
+            >{{ nurseStationName }}</el-button
+          >
+          <el-button
+            type=""
+            @click="clickinnerVisible2"
+            v-else
+            style="
+              width: 362px;
+              text-align: left;
+              height: 36px;
+              padding-left: -10px;
+            "
+            >{{ nurseStationName }}</el-button
+          >
         </el-form-item>
-        <el-form-item label="科室名称" prop="departmentName">
+
-          <el-input
+        <el-form-item
-            :disabled="true"
+          label="所属科室"
-            v-model="form.departmentName"
+          label-width="120px"
-            placeholder="请输入科室名称"
+          style="margin-left: -20px"
-          />
+          prop="departmentName"
-        </el-form-item>
+        >
-        <el-form-item label="姓名" prop="nursePersonName">
+          <el-button
-          <el-input
+            type=""
-            maxlength="15"
+            @click="departclick2"
-            v-model="form.nursePersonName"
+            v-if="departmentName == '请选择所属科室'"
-            placeholder="请输入护理站人姓名"
+            style="width: 362px; text-align: left; height: 36px; color: #c0c4cc"
-          />
+            >{{ departmentName }}</el-button
+          >
+          <el-button
+            type=""
+            @click="departclick2()"
+            v-else
+            style="
+              width: 362px;
+              text-align: left;
+              height: 36px;
+              padding-left: -10px;
+            "
+            >{{ departmentName }}</el-button
+          >
         </el-form-item>
         <el-form-item
           label="护理人职称"
@@ -852,7 +1044,7 @@ export default {
       }
       cb(new Error("请输入正确的联系电话"));
     };
-     // 验证手机号的规则
+    // 验证手机号的规则
     var checkMobile2 = (rule, value, cb) => {
       // 验证手机号的正则表达式
       const regMobile =
@@ -887,6 +1079,9 @@ export default {
 
       innerVisible: false,
       innerVisible2: false,
+      innerVisiblexg: false,
+      innerVisiblexg2: false,
+
       // 遮罩层
       loading: true,
 
@@ -927,6 +1122,7 @@ export default {
       StationDepartmentLists: [],
       nurseStationlist: [],
       stationid: "",
+      stationid2: "",
       departid: "",
       nurseStationName: "请选择护理站名称",
       departmentName: "请选择所属科室",
@@ -954,7 +1150,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         nurseStationName: null,
-         departmentName: null,
+        departmentName: null,
         id: null,
         nurseStationId: null,
       },
@@ -985,12 +1181,12 @@ export default {
             trigger: "blur",
           },
         ],
-        departmentName: [
+        // departmentName: [
-          { required: true, message: "所属科室不能为空", trigger: "blur" },
+        //   { required: true, message: "所属科室不能为空", trigger: "blur" },
-        ],
+        // ],
-        nurseStationId: [
+        // nurseStationId: [
-          { required: true, message: "所属护理站不能为空", trigger: "blur" },
+        //   { required: true, message: "所属护理站不能为空", trigger: "blur" },
-        ],
+        // ],
         nursePersonName: [
           { required: true, message: "护理人姓名不能为空", trigger: "blur" },
         ],
@@ -999,7 +1195,12 @@ export default {
         ],
         sex: [{ required: true, message: "性别不能为空", trigger: "blur" }],
         phone: [
-          { required: true, validator: checkMobile2,message: "", trigger: "blur" },
+          {
+            required: true,
+            validator: checkMobile2,
+            message: "",
+            trigger: "blur",
+          },
         ],
         address: [
           { required: true, message: "居住地址不能为空", trigger: "blur" },
@@ -1026,7 +1227,12 @@ export default {
           ],
           sex: [{ required: true, message: "性别不能为空", trigger: "blur" }],
           phone: [
-            { required: true,validator: checkMobile, message: "", trigger: "blur" },
+            {
+              required: true,
+              validator: checkMobile,
+              message: "",
+              trigger: "blur",
+            },
           ],
           address: [
             { required: true, message: "居住地址不能为空", trigger: "blur" },
@@ -1049,8 +1255,8 @@ export default {
     this.nurselist();
   },
   methods: {
+    // // 新增所属科室按钮
     departclick(item, index) {
-      // // 所属科室
       StationDepartmentList(this.queryParams3).then((res) => {
         this.StationDepartmentLists = res.rows;
         this.total3 = res.total;
@@ -1061,17 +1267,42 @@ export default {
       this.innerVisible2 = true;
       this.index = index;
     },
+    // // 修改所属科室按钮
+    departclick2() {
+      StationDepartmentList(this.queryParams3).then((res) => {
+        this.StationDepartmentLists = res.rows;
+        this.total3 = res.total;
+        this.loading = false;
+      });
+      // console.log(item);
+      this.departid2 = this.form.departmentCode;
+      this.innerVisiblexg2 = true;
+      // this.index = index;
+    },
+    // 新增护理站按钮
     clickinnerVisible(item, index) {
       stationList(this.queryParams2).then((res) => {
         this.stationLists = res.rows;
         this.total2 = res.total;
         this.loading = false;
       });
-      console.log(item);
+      // console.log(item);
       this.stationid = item.nurseStationId;
       this.innerVisible = true;
       this.index = index;
     },
+    // 修改护理站按钮
+    clickinnerVisible2() {
+      stationList(this.queryParams2).then((res) => {
+        this.stationLists = res.rows;
+        this.total2 = res.total;
+        this.loading = false;
+      });
+      // console.log(item);
+      this.stationid2 = this.form.nurseStationId;
+      this.innerVisiblexg = true;
+      // this.index = index;
+    },
     //xialakuang
     loadMore() {
       console.log("1");
@@ -1107,7 +1338,7 @@ export default {
 
     adddisease() {
       //  this.nurseStationName = "请选择护理站名称";
-        // this.departmentName=""
+      // this.departmentName=""
       var obj = {
         nursePersonCode: "",
         nursePersonCode: "",
@@ -1141,11 +1372,22 @@ export default {
         row.nurseStationName;
       this.form.nurseStationPersonList[this.index].nurseStationId = row.id;
     },
+    // 修改护理站
+    nurseclick2(row) {
+      console.log(row);
+      this.nurseStationName = row.nurseStationName;
+      this.stationid2 = row.id;
+      this.form.nurseStationId = row.id;
+      console.log(this.form);
+      this.innerVisiblexg = false;
+      this.form.nursename = row.nurseStationName;
+    },
     // 所属科室
     StationDepartmentclick(row) {
       console.log(row);
       this.departname = row.departmentName;
-      this.departid = row.id;
+      this.departid = row.departmentCode;
+      console.log(this.departid);
       this.departmentCode = row.departmentCode;
       // this.form.nurseStationId = row.id;
       this.innerVisible2 = false;
@@ -1156,6 +1398,15 @@ export default {
         row.departmentCode;
       console.log(this.form);
     },
+    // 修改科室
+    StationDepartmentclick2(row) {
+      console.log(row);
+      this.departmentName = row.departmentName;
+      this.form.departmentCode = row.departmentCode;
+      this.departid2 = row.departmentCode;
+      this.form.departmentName = row.id;
+      this.innerVisiblexg2 = false;
+    },
     /** 查询护理站人员信息列表 */
     getList() {
       // 护理站名称
@@ -1191,6 +1442,8 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
+        nurseStationName: "请选择护理站名称",
+        departmentName: "请选择所属科室",
         nurseStationPersonList: [
           {
             id: "",
@@ -1317,9 +1570,18 @@ export default {
       const id = row.id || this.ids;
       getPerson(id).then((response) => {
         console.log(response);
+        // this.departmentName="请选择科室"
+        this.departmentName = response.data.departmentName;
+        this.nurseStationName = response.data.nurseStationName;
         this.form = response.data;
         this.open = true;
         this.title = "修改护理站人员信息";
+        if (this.departmentName == null && this.departmentName == undefined) {
+          this.departmentName = "请选择所属科室";
+        } else{
+           this.departmentName = response.data.departmentName;
+        }
+
       });
     },
     /** 提交按钮 */