添加居民接口联调及操作

src/utils/patients/patientsapi.js

@@ -16,7 +16,16 @@ export const getConstants = (params) => {
     description: '获取常量',
   })
 };
-
+/*获取省市县乡列表*/
+export const getProvinceList = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`basic-data/position/provinces`),
+    method: 'get',
+    params: params,
+    description: '获取省列表',
+  })
+};
 
 /*居民管理*/
 export const getPatientList = (data) => {
@@ -102,6 +111,16 @@ export const deleteCurrentPatients = data => {
   })
 }
 
+export const saveLabelsForPatient = (labelId, data) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`healths/labels/${labelId}/patients`),
+    method: 'post',
+    data: data,
+    description: '分组中添加居民',
+  })
+}
+
 // 获取七牛上传token
 export const getQiniuToken = (params) => {
   return fetch({
@@ -224,3 +243,13 @@ export const getHealthRecordList = (data) => {
     description: '健康档案记录列表',
   })
 };
+/*新的获取居民接口，搜索条件有变化*/
+export const getPatientInfoList = (data) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`healths/patients/v2/infolist`),
+    method: 'post',
+    data: data,
+    description: '获取居民列表',
+  })
+};

src/views/patients/labels-manage/labels-detail.vue

@@ -152,6 +152,7 @@
     deleteCurrentLabel,
     changeLabelName,
     deleteCurrentPatients,
+    saveLabelsForPatient,
   } from '@/utils/patients/patientsapi'
   import SelectPatient from './dialog/select-patitents';
 
@@ -371,6 +372,7 @@
               type: 'success'
             });
             this.showDeletePatientsDialog = false;
+            this.getDetail();
           }else{
             this.$message({
               message: '请求接口失败，请重新再试',
@@ -383,9 +385,33 @@
       },
       addPatientsHandler() {
         this.isShowSelectPatient = true;
+        this.searchData.tableData.forEach(item => {
+          this.patientIdList.push(item.id)
+        })
+      },
+      closeSelectPatient(val) {
+        this.isShowSelectPatient = val;
       },
-      closeSelectPatient() {},
-      sureSelectPatient(arg) {
+      sureSelectPatient() {
+        let getArguments = arguments[0];
+        const selectPatients = getArguments[1]; // 每次选中获取的人
+        let labelId = this.$route.query.labelId;
+        saveLabelsForPatient(labelId,{
+          newLablelName: this.$route.query.labelName,
+          oldLabelName: this.$route.query.labelName,
+          saveLists: selectPatients,
+          // token:
+        }).then((data) => {
+          if(data.code == '000000') {
+            setTimeout(() => {
+              this.$message.success(data.message)
+              this.isShowSelectPatient = getArguments[0];
+              this.getDetail();
+            },500)
+          }else {
+            this.$message.error(data.message)
+          }
+        })
 
       },
     }

src/views/patients/mypatients-manage/components/edit-information.vue

@@ -169,11 +169,13 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="所在地区" prop="patientAddress">
-            <el-input
+            <el-cascader
+              placeholder="请选择省市县乡"
+              :options="provinceList"
               v-model="patientInfoForm.patientAddress"
-              placeholder="请输入居民医保卡号码"
-              clearable>
-            </el-input>
+              @active-item-change="handleItemChange"
+              :props="optionProps">
+            </el-cascader>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -229,7 +231,7 @@
   import { mapGetters } from 'vuex';
   import { checkMobile } from '@/utils/patients/checkValid';
   import { isCardNo, checkProvince, checkBirthday, checkParity } from '@/utils/patients/checkCardNum';
-  import { getDiseasesList, getLabelList, getConstants, getNationsList, getRemindPatient,savePatientInfo } from '@/utils/patients/patientsapi';
+  import { getDiseasesList, getLabelList, getConstants, getNationsList, getRemindPatient,savePatientInfo, getProvinceList } from '@/utils/patients/patientsapi';
   export default {
     name: "basicInfo",
     components: {},
@@ -295,6 +297,9 @@
           isRemind: 1,
           wechatNickname: '',
           remark: '',
+          patientAddress: [],
+          address: '',
+          workplace: '',
         },
         hasIdNo: false,
         validStatus: false,
@@ -303,6 +308,16 @@
           mobilePhone: [{required: true, message: '请输入手机号', trigger: ['change', 'blur'] },{ validator: checkMobile , trigger: ['blur','change'] }],
           idNo: [{required: false,validator: checkCardNum,  trigger: ['change'] }],
         },
+
+        optionProps: {
+          // value: 'value',
+          // children: 'cities'
+          value: "id",
+          label: "name",
+          children: "children"
+        },
+        provinceList: [],
+
       }
     },
     props: {
@@ -337,27 +352,33 @@
             this.hasIdNo = false;
           }
           // this.$refs['patientInfoForm'].clearValidate();
+
+
+          this.patientInfoForm.patientAddress = []; // 特殊处理
           this.$forceUpdate();
         }else {
         //  新增
           this.patientInfoForm = {
-              nickname: '',
-              mobilePhone: '',
-              diseases: [],
-              patientDiseases: [],
-              customLabels: [],
-              idNo: '',
-              birthTime: '',
-              age: '',
-              sex: null,
-              permanentResidence: '',
-              nationality: '',
-              socialCard: '',
-              fileLocator: '',
-              isWechatBind: null,
-              isRemind: null,
-              wechatNickname: '',
-              remark: '',
+            nickname: '',
+            mobilePhone: '',
+            diseases: [],
+            patientDiseases: [],
+            customLabels: [],
+            idNo: '',
+            birthTime: '',
+            age: '',
+            sex: null,
+            permanentResidence: '',
+            nationality: '',
+            socialCard: '',
+            fileLocator: '',
+            isWechatBind: null,
+            isRemind: null,
+            wechatNickname: '',
+            remark: '',
+            patientAddress: [],
+            address: '',
+            workplace: '',
           }
         }
       },
@@ -366,6 +387,9 @@
           this.saveInfoData();
         }
       },
+      idNo(newv, oldv) {
+
+      }
     },
     created() {
       this.initConstant();
@@ -411,7 +435,8 @@
           if(data.code == '000000') {
             this.nationsList = data.data;
           }
-        })
+        });
+        this.getProvinceLists();
       },
       changeDiseases(val) {
         let newDiseaseList = [];
@@ -521,6 +546,25 @@
           this.patientInfoForm.age = null;
         }
       },
+      handleItemChange (val) {
+        console.log('地区选择',val);
+        // this.getPosition(val)
+
+      },
+      getProvinceLists() {
+        getProvinceList({}).then((data) => {
+          if(data.code == '000000') {
+            let provinceLists = data.data.provinceList;
+            provinceLists.map(item => {
+              this.$set(item, "id", item.provinceId);
+              this.$set(item, "name", item.provinceName);
+              this.$set(item, "children", []);
+            });
+            this.provinceList = provinceLists;
+          }
+        })
+        this.$forceUpdate();
+      },
 
     },
     filters: {