Merge branch 'dev-0420' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-0420

src/views/modules/base/collect.vue

@@ -130,7 +130,7 @@
                          align="center"
                          label="单位或学校 " />
         <!-- <el-table-column prop="organizationCreatedTime" align="center" label="创建时间"> -->
-        <!-- <el-table-column fixed="right" label="操作" align="center" width="100">
+        <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -139,31 +139,8 @@
               @click="handleWatch(scope.row)"
               >查看</el-button
             >
-
-            <el-button
-              @click="handleEdit(scope.$index)"
-              type="text"
-              size="small"
-              class="div-table-button--edit"
-              >修改</el-button
-            >
-
-            <el-popconfirm
-              title="删除之后无法回复，确认删除？"
-              @onConfirm="handleDel(scope.row, scope.$index)"
-              @confirm="handleDel(scope.row, scope.$index)"
-            >
-              <el-button
-                slot="reference"
-                type="text"
-                size="small"
-                class="div-table-button--delete"
-                style="margin-left: 10px;"
-                >删除</el-button
-              >
-            </el-popconfirm>
           </template>
-        </el-table-column> -->
+        </el-table-column>
       </el-table>
       <div>
         <el-pagination @size-change="handleSizeChange"
@@ -181,16 +158,100 @@
     <el-dialog :visible.sync="formShow"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
-               :title="formTitle"
+               title="信息详情"
-               width="850px"
+               width="60%"
                top="5vh"
                class="dialog-h"
                @closed="handleClose">
-      <!-- <edit-form
+        <div class="scroll-h">
-        ref="eleEditForm"
+          <el-form ref="ref_form"
-        @dialogCancle="handleClose"
+                :inline="true"
-        @dialogOk="handleEditSuccess"
+                :model="dataForm"
-      ></edit-form> -->
+                :disabled="true"
+                class="form">
+            <el-form-item label="户主姓名:"
+                          prop="houseHolderName"
+                          label-width="150px">
+              <!-- <el-input class="item_width_1"
+                        v-model="dataForm.houseHolderName">
+              </el-input> -->
+              <div class="wd50">{{ dataForm.houseHolderName }}</div>
+            </el-form-item>
+            <el-form-item label="居住地址:"
+                          prop="address"
+                          label-width="150px">
+              <!-- <el-input class="wd50" v-model="dataForm.address">
+              </el-input> -->
+              <div class="wd50"> {{ dataForm.address }}</div>
+            </el-form-item>
+            <div>
+              <el-form-item label="自有/租住:"
+                          prop="houseType"
+                          label-width="150px">
+                <!-- <el-input class="item_width_1"
+                          v-model="dataForm.houseType">
+                </el-input> -->
+                <div class="wd50">{{ dataForm.houseType }}</div>
+              </el-form-item>
+              <el-form-item label="居住人数:"
+                            prop="totalResi"
+                            label-width="150px">
+                <!-- <el-input class="item_width_1"
+                          v-model="dataForm.totalResi">
+                </el-input> -->
+                <div class="wd50">{{ dataForm.totalResi }}</div>
+              </el-form-item>
+            </div>
+            
+          </el-form>
+          <el-table :data="dataForm.list"
+                    border
+                    style="width: 100%"
+                    class="resi-table"
+                    :height="tableHeight">
+            <el-table-column label="序号"
+                            type="index"
+                            align="center"
+                            width="50" />
+            <el-table-column prop="memberName"
+                            width="100"
+                            label="成员姓名"
+                            align="center"
+                            :show-overflow-tooltip="true" />
+            <el-table-column prop="memberIdNum"
+                            width="180"
+                            align="center"
+                            label="成员身份证" />
+            <el-table-column prop="memberMobile"
+                            width="140"
+                            align="center"
+                            label="成员手机号" />
+            <el-table-column prop="heSuanCount"
+                            width="120"
+                            align="center"
+                            label="核酸检测次数" />
+
+            <el-table-column prop="ymjz"
+                            width="140"
+                            align="center"
+                            label="疫苗接种情况">
+              <template slot-scope="scope">
+                <span v-if="scope.row.ymjz == 1">全程接种</span>
+                <span v-if="scope.row.ymjz == 2">未全程接种</span>
+                <span v-if="scope.row.ymjz == 0">未接种</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="domicilePlace"
+                            min-width="140"
+                            align="center"
+                            label="户籍所在地 " />
+            <el-table-column prop="workPlace"
+                            min-width="120"
+                            align="center"
+                            label="单位或学校 " />
+            <!-- <el-table-column prop="organizationCreatedTime" align="center" label="创建时间"> -->
+          </el-table>
+        </div>
     </el-dialog>
   </div>
 </template>
@@ -221,6 +282,7 @@ export default {
         endTime: "",
         address: ''
       },
+      dataForm: {},
       communityList: [],
       spanIndex: [], // 合并的行
       importBtnTitle: "导入",
@@ -330,10 +392,23 @@ export default {
       this.handleSearch()
     },
 
-    async handleWatch (rowIndex) {
+    async handleWatch (row) {
-      this.formShow = true;
+      // this.formShow = true;
       await nextTick();
-      this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]);
+      const url = "/epmetuser/icresicollect/detail";
+
+      const { data, code, msg } = await requestPost(url, {
+        id: row.id,
+      });
+
+      if (code === 0) {
+        console.log('data----de', data)
+        this.dataForm = { ...data, houseType: data.houseType == '1' ? '自有' : '租住' }
+        // this.getTableData();
+        this.formShow = true;
+      } else {
+        this.$message.success("操作失败！");
+      }
     },
 
     async handleEdit (rowIndex) {
@@ -466,4 +541,7 @@ export default {
   position: relative;
   overflow: visible;
 }
+.wd50 {
+  min-width: 200px;
+}
 </style>

src/views/modules/visual/basicinfo/basicInfoCommunity.vue

@@ -557,7 +557,9 @@ export default {
   min-width: 50px !important;
   margin-top: 5px !important;
   padding: 3px !important;
-  background-color: rgb(247, 250, 253);
+  background-color: #06186d;
+  color: #1a64cc;
+  border-color: #1a64cc;
   text-align: center;
 }
 </style>