Merge branch 'dev-220411' into test

3 years ago · b6efbde053
11 changed files with 109 additions and 90 deletions
--- a/src/assets/scss/pages/caiji.scss
+++ b/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,9 +108,16 @@
      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;
+    }
  }

  .main {
--- a/src/router/index.js
+++ b/src/router/index.js
@ -115,7 +115,7 @@ export const moduleShujuRoutes = {
      name: "home2",
      meta: {
        title: "主页2",
-        isTab: true,
+        isTab: false,
      },
    },
    {
@ -125,7 +125,7 @@ export const moduleShujuRoutes = {
      name: "visual-basicinfo-people",
      meta: {
        title: "个人详情",
-        isTab: true,
+        isTab: false,
      },
    },
    {
@ -135,7 +135,7 @@ export const moduleShujuRoutes = {
      name: "visual-basicinfo-people-list",
      meta: {
        title: "人员列表",
-        isTab: true,
+        isTab: false,
      },
    },
  ],
--- a/src/views/modules/base/community/roomTable
+++ b/src/views/modules/base/community/roomTable
@ -295,7 +295,11 @@ export default {
    },

    async loadTable (fromTree, treeObj, ownerName, ownerPhone, rentState) {
+
      this.tableLoading = true
+      this.ownerName = ownerName
+      this.ownerPhone = ownerPhone
+      this.rentState = rentState
      let params = {
        pageSize: this.pageSize,
        pageNo: this.pageNo,
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@ -171,6 +171,9 @@ export default {
      // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断

      agencyObj: {},//树所选的小区对象
+      ownerName: '',
+      ownerPhone: '',
+      rentFlag: '',

      validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量
      selection: [],
@ -234,6 +237,10 @@ export default {
    async loadTable (fromTree, treeObj, ownerName, ownerPhone, rentFlag) {

      this.tableLoading = true
+      this.ownerName = ownerName
+      this.ownerPhone = ownerPhone
+      this.rentFlag = rentFlag
+
      let params

      if (fromTree) {
--- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue
+++ b/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)
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
+++ b/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)
--- a/src/views/modules/visual/basicinfo/peopleList.vue
+++ b/src/views/modules/visual/basicinfo/peopleList.vue
@ -68,16 +68,15 @@
          </div>

        </div>
-
-      </div>
-      <div class="pagination">
-        <el-pagination background
-                       layout="prev, pager, next, total"
-                       :current-page="pageNo"
-                       :page-size="pageSize"
-                       :total="total"
-                       @current-change="pageCurrentChangeHandle">
-        </el-pagination>
+        <div class="pagination">
+          <el-pagination background
+                        layout="prev, pager, next, total"
+                        :current-page="pageNo"
+                        :page-size="pageSize"
+                        :total="total"
+                        @current-change="pageCurrentChangeHandle">
+          </el-pagination>
+        </div>
      </div>
    </div>

@ -112,7 +111,7 @@ export default {
      headerList: [],
      tableData: [],
      searchName: '',
-      pageSize: 7,
+      pageSize: 10,
      pageNo: 1,
      total: 0,
      orgLevel: 'search',
@ -236,8 +235,13 @@ export default {
  height: 780px;
  margin: 20px auto;
 }
+.warning-table {
+  height: 640px;
+}
 .pagination {
+  padding-right: 0;
  margin-top: 0;
+  text-align: right;
 }
 .g-bread {
    padding: 10px 20px;
--- a/src/views/modules/visual/measure/dialogInfo.vue
+++ b/src/views/modules/visual/measure/dialogInfo.vue
@ -92,7 +92,7 @@
          </div>
        </div>

-        <div style="padding: 30px 0">
+        <div style="padding: 30px 0; display: flex; justify-content: center;">
          <analyse
            v-if="!loading"
            :single-list="demandList"
--- a/src/views/modules/visual/measure/service.vue
+++ b/src/views/modules/visual/measure/service.vue
@ -255,7 +255,7 @@ export default {
                if (item.legendCode == 'unfinished') {
                  desc += `<div><span>尚有 ${item.serviceDemandTotal} 个需求未完成</span></div>`
                }else {
-                  desc += `<div><span>共有 ${item.totalService} ${unit} ${item.legendName} 完成需求 ${item.serviceDemandTotal} 个</span></div>`
+                  desc += `<div><span>共有 ${item.totalService} ${unit} ${item.legendName} 完成 ${item.serviceDemandTotal} 个需求</span></div>`
                }
                
              })
--- a/src/views/pages/caiji.vue
+++ b/src/views/pages/caiji.vue
@ -912,9 +912,23 @@ export default {
 }

 /deep/ .mint-popup-bottom {
+  height: 300px;
  width: 100vw;
 }

+// /deep/ .picker {
+//   height: 300px;
+// }
+/deep/ .picker-items {
+  height: 250px;
+  width: 100vw;
+}
+/deep/ .picker-slot-center {
+  width: 100vw;
+}
+/deep/ .picker-center-highlight {
+  top: 35%;
+}
 .picker-toolbar-title {
  display: flex;
  flex-direction: row;
--- a/src/views/pages/caijisuccess.vue
+++ b/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>所属房屋：所属房屋：所属房屋：所属房屋：</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)

  },
@ -122,29 +122,4 @@ export default {

 <style lang="scss" scoped >
@import "@/assets/scss/pages/caiji.scss";
-
-.my-field /deep/ .mint-field-core {
-  text-align: right;
-  margin-right: 20px;
-}
-
-/deep/ .mint-popup-bottom {
-  width: 100vw;
-}
-
-.picker-toolbar-title {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-around;
-  align-items: center;
-  background-color: #eee;
-  height: 44px;
-  line-height: 44px;
-  font-size: 16px;
-  .usi-btn-cancel,
-  .usi-btn-sure {
-    color: #26a2ff;
-    font-size: 16px;
-  }
-}
 </style>