修改

ruoyi-ui/src/views/system/wzzry/index.vue

@@ -138,13 +138,30 @@
       <el-table-column label="楼号" align="center" prop="building" width="100" :show-overflow-tooltip="true" />
       <el-table-column label="单元号" align="center" prop="unit" width="100" :show-overflow-tooltip="true" />
       <el-table-column label="楼层" align="center" prop="floor" width="100" :show-overflow-tooltip="true" />
-      <el-table-column label="门牌号或自然村地址" align="center" prop="house" width="100" :show-overflow-tooltip="true" />
+      <el-table-column label="门牌号或自然村地址" align="center" prop="house" width="160" :show-overflow-tooltip="true" />
+      <el-table-column label="人员类型" align="center" prop="userStyle" width="130" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.user_style" :value="scope.row.userStyle"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="其他情况" align="center" prop="otherSituation" width="120" :show-overflow-tooltip="true" />
 <!--      <el-table-column label="住址" align="center" prop="address" width="100" :show-overflow-tooltip="true" />-->
       <el-table-column label="基础病情况" align="center" prop="basicDiseaseName" width="100" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{scope.row.basicDiseaseName ? scope.row.basicDiseaseName.toString() : ''}}</span>
         </template>
       </el-table-column>
+      <el-table-column label="基础病情况说明" align="center" prop="basicDiseaseDetail" width="120" :show-overflow-tooltip="true" />
+      <el-table-column label="经常就诊医院" align="center" prop="hospitalName" width="100" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{scope.row.hospitalName ? scope.row.hospitalName.toString() : ''}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="生活能否自理" align="center" prop="isSelf" width="100" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{scope.row.isSelf === '0' ? '能自理':scope.row.isSelf === '1' ? '不能自理' : '' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="是否有人照顾" align="center" prop="isCare" width="100" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{scope.row.isCare === '0' ? '是':scope.row.isCare === '1' ? '否' : '' }}</span>
@@ -153,6 +170,13 @@
       <el-table-column label="同住人数(不包括自己)" align="center" prop="cohabitantsNumber" width="160" :show-overflow-tooltip="true" />
 <!--      <el-table-column label="状态" align="center" prop="status" width="100" :show-overflow-tooltip="true" />-->
       <el-table-column label="备注" align="center" prop="remark" width="120" :show-overflow-tooltip="true" />
+      <el-table-column label="情况是否属实" align="center" prop="situationTrue" width="100" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{scope.row.situationTrue === '0' ? '是':scope.row.situationTrue === '1' ? '否' : '' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="包联人员姓名" align="center" prop="otherName" width="100" :show-overflow-tooltip="true" />
+      <el-table-column label="包联人员手机号码" align="center" prop="otherPhone" width="130" :show-overflow-tooltip="true" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
         <template slot-scope="scope">
           <el-button
@@ -472,6 +496,7 @@ export default {
       },
       basicdiseaseOptions: [],
       basicDiseaseName: [],
+      hospitalName: [],
       zhen: [],
       zhenList : [
         { name: "长江街道",code: "1",parent: "1"	},
@@ -802,7 +827,11 @@ export default {
       const params = 'basic_disease'
       getDicts(params).then(res=>{
         this.basicdiseaseOptions = res.data
-        this.getList();
+        const params2 = 'hospital'
+        getDicts(params2).then(res=>{
+          this.hospitalOptions = res.data
+          this.getList();
+        })
       })
     },
     /** 查询危重症人员列表 */
@@ -829,6 +858,18 @@ export default {
           } else {
             this.$set(item, 'basicDiseaseName', '')
           }
+          if(item.hospital) {
+            let list = []
+            this.hospitalName = []
+            list = item.hospital.split(',')
+            for (let i = 0; i < list.length; i++) {
+              const name = this.hospitalOptions.find(optionItem => optionItem.dictValue === list[i]).dictLabel
+              this.hospitalName.push(name)
+            }
+            this.$set(item, 'hospitalName', this.hospitalName)
+          } else {
+            this.$set(item, 'hospitalName', '')
+          }
         })
         this.total = response.total;
         this.loading = false;
@@ -922,6 +963,9 @@ export default {
         if(this.form.basicDisease) {
           this.form.basicDisease = this.form.basicDisease.split(',')
         }
+        if(this.form.hospital) {
+          this.form.hospital = this.form.hospital.split(',')
+        }
         this.formLoading = false
       });
     },
@@ -949,6 +993,9 @@ export default {
         if(this.form.basicDisease) {
           this.form.basicDisease = this.form.basicDisease.split(',')
         }
+        if(this.form.hospital) {
+          this.form.hospital = this.form.hospital.split(',')
+        }
         this.title = "修改危重症人员";
         this.formLoading = false
       });
@@ -963,6 +1010,9 @@ export default {
           if(this.form.basicDisease) {
             this.form.basicDisease = this.form.basicDisease.toString()
           }
+          if(this.form.hospital) {
+            this.form.hospital = this.form.hospital.toString()
+          }
           if (this.form.id != null) {
             updateWzzry(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");