Merge branch 'dev-220411' into test

src/assets/scss/pages/caiji.scss

@@ -99,7 +99,7 @@
     font-family: Source Han Serif SC;
     font-weight: 400;
     color: #333333;
-    line-height: 30px;
+   
     text-align: left;
 
     .content_long{
@@ -108,8 +108,15 @@
       align-items: flex-start;
 
       .content_title{
-        flex:0 0 85px;
+        min-width: 85px;
+        // flex:0 0 85px;
+        flex-shrink: 0;
+        text-align: right;
+      }
     }
+
+    .marginT10{
+      margin-top:10px;
     }
   }
 

src/views/modules/base/epidemic/natFocus/natFocusList.vue

@@ -316,7 +316,7 @@
     <el-dialog :visible.sync="editFormShow"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
-               title="修改核酸检测关注名单"
+               :title="editFormTitle"
                width="1050px"
                top="5vh"
                class="dialog-h"
@@ -421,6 +421,8 @@ export default {
       noticeListFormShow: false,
       visiteListFormShow: false,
 
+      editFormTitle: '修改核酸检测关注名单'
+
 
     }
   },
@@ -669,13 +671,16 @@ export default {
     },
 
     handleEdit (row) {
+      this.editFormTitle = "修改核酸检测关注名单"
       this.editFormShow = true
+
       this.$nextTick(() => {
         this.$refs.ref_form_edit.initForm('edit', row)
       })
     },
 
     handleDetail (row) {
+      this.editFormTitle = "查看核酸检测关注名单"
       this.editFormShow = true
       this.$nextTick(() => {
         this.$refs.ref_form_edit.initForm('detail', row)

src/views/modules/base/epidemic/veroFocus/veroFocusList.vue

@@ -317,7 +317,7 @@
     <el-dialog :visible.sync="editFormShow"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
-               title="修改疫苗接种关注名单"
+               :title="editFormTitle"
                width="1050px"
                top="5vh"
                class="dialog-h"
@@ -420,6 +420,7 @@ export default {
       sendNoticeFormShow: false,
       noticeListFormShow: false,
       visiteListFormShow: false,
+      editFormTitle: '修改疫苗接种关注名单'
 
 
     }
@@ -672,6 +673,7 @@ export default {
     },
 
     handleEdit (row) {
+      this.editFormTitle = "修改疫苗接种关注名单"
       this.editFormShow = true
       this.$nextTick(() => {
         this.$refs.ref_form_edit.initForm('edit', row)
@@ -679,6 +681,7 @@ export default {
     },
 
     handleDetail (row) {
+      this.editFormTitle = "查看疫苗接种关注名单"
       this.editFormShow = true
       this.$nextTick(() => {
         this.$refs.ref_form_edit.initForm('detail', row)

src/views/modules/visual/heart/index.vue

@@ -104,7 +104,7 @@ export default {
           },
           {
             align: "center",
-            width: "30",
+            width: "30%",
           },
         ],
         header: ["序号", "网格名称", "活力值"],
@@ -131,7 +131,7 @@ export default {
           },
           {
             align: "center",
-            width: "20",
+            width: "20%",
           },
         ],
         header: ["序号", "党员姓名", "所属网格", "积分总数"],
@@ -158,7 +158,7 @@ export default {
           },
           {
             align: "center",
-            width: "20",
+            width: "20%",
           },
         ],
         header: ["序号", "居民姓名", "所属网格", "积分总数"],

src/views/pages/caijisuccess.vue

@@ -9,32 +9,33 @@
       <div>提交成功</div>
       <div>请截图保存，方便核验人员查看</div>
     </div>
-    <div class="div_content">
+    <div class="div_content marginT10">
       <div class="content_long">
         <div class="content_title">所属社区：</div>
         <div>{{formData.shequName}}</div>
       </div>
-      <div class="content_long">
+      <div class="content_long marginT10">
         <div class="content_title">所属房屋：</div>
-        <div>{{formData.address}}</div>
+        <!-- <div>{{formData.address}}</div> -->
+        <div>所属房屋：所属房屋：所属房屋：所属房屋：</div>
       </div>
-      <div>
-        <span>房主姓名：</span>
-        <span>{{formData.houseHolderName}}</span>
+      <div class="content_long marginT10">
+        <div class="content_title">房主姓名：</div>
+        <div>{{formData.houseHolderName}}</div>
       </div>
       <div v-for="(item,index) in formData.memberList"
            :key="index">
-        <div>
-          <span>成员{{index+1}}：</span>
-          <span>{{item.name}}</span>
+        <div class="content_long marginT10">
+          <div class="content_title">成员{{index+1}}：</div>
+          <div>{{item.name}}</div>
         </div>
-        <div>
-          <span>身份证号：</span>
-          <span>{{item.idNum}}</span>
+        <div class="content_long marginT10">
+          <div class="content_title">身份证号：</div>
+          <div>{{item.idNum}}</div>
         </div>
-        <div>
-          <span>手机号：</span>
-          <span>{{item.mobile}}</span>
+        <div class="content_long marginT10">
+          <div class="content_title">手机号：</div>
+          <div>{{item.mobile}}</div>
         </div>
 
       </div>
@@ -75,37 +76,36 @@ export default {
     let query = this.$route.query
     this.formData = query.formData
 
-    // this.formData = {
-    //   address: "金玉良缘1花好月圆1单元3123123",
-    //   buildId: "1494482424728395778",
-    //   buildName: "花好月圆",
-    //   customerId: "45687aa479955f9d06204d415238f7cc",
-    //   homeId: "other",
-    //   homeName: "3123123",
-    //   houseHolderName: "张三",
-    //   houseType: "1",
-    //   memberList: [
-    //     {
-    //       customerId: "45687aa479955f9d06204d415238f7cc",
-    //       domicilePlace: "23123",
-    //       heSuanCount: "2",
-    //       idNum: "312312",
-    //       mobile: "15111111111",
-    //       name: "张三",
-    //     },
-    //     {
-    //       customerId: "45687aa479955f9d06204d415238f7cc",
-    //       domicilePlace: "123123",
-    //       heSuanCount: null,
-    //       idNum: "王二麻",
-    //       mobile: "3123123123",
-    //       name: "李四",
-    //     }
-    //   ]
-
-
-
-    // }
+    this.formData = {
+      shequName: '清江路社区',
+      address: "金玉良缘1花好月圆1单元3123123金玉良缘1花好月圆1单元3123123",
+      buildId: "1494482424728395778",
+      buildName: "花好月圆",
+      customerId: "45687aa479955f9d06204d415238f7cc",
+      homeId: "other",
+      homeName: "3123123",
+      houseHolderName: "张三",
+      houseType: "1",
+      memberList: [
+        {
+          customerId: "45687aa479955f9d06204d415238f7cc",
+          domicilePlace: "23123",
+          heSuanCount: "2",
+          idNum: "312312",
+          mobile: "15111111111",
+          name: "张三",
+        },
+        {
+          customerId: "45687aa479955f9d06204d415238f7cc",
+          domicilePlace: "123123",
+          heSuanCount: null,
+          idNum: "王二麻",
+          mobile: "3123123123",
+          name: "李四",
+        }
+      ]
+
+    }
     console.log(this.formData)
 
   },