Merge branch 'master' into shibei_master

src/views/modules/base/community/buildTable.vue

@@ -330,7 +330,7 @@ export default {
         this.validTableDataNum = 0
         this.total = data.total
         data.list.forEach(item => {
-          item.sort = parseInt(item.sort);
+          item.sort = parseInt(item.sort) || 0;
           item.sort = item.sort.toFixed(2)
           item.isChange = false
           if (item.agencyId === this.staffAgencyId) {

src/views/modules/base/community/roomTable.vue

@@ -357,7 +357,7 @@ export default {
         this.total = data.total
         this.validTableDataNum = 0
         data.list.forEach(item => {
-          item.sort = parseInt(item.sort);
+          item.sort = parseInt(item.sort) || 0;
           item.sort = item.sort.toFixed(2)
           item.isChange = false
           item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + item.doorName

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

@@ -673,16 +673,16 @@ export default {
     async handleEdit(row) {
       this.editFormTitle = "修改核酸检测关注名单";
       this.editFormShow = true;
-
-      let row2 = await this.getInfo(row);
+      const row1 = { ...row }
+      let row2 = await this.getInfo(row1);
       this.$refs.ref_form_edit.initForm("edit", row2);
     },
 
     async handleDetail(row) {
       this.editFormTitle = "查看核酸检测关注名单";
       this.editFormShow = true;
-
-      let row2 = await this.getInfo(row);
+      const row1 = { ...row }
+      let row2 = await this.getInfo(row1);
       this.$refs.ref_form_edit.initForm("detail", row2);
     },
 

src/views/modules/base/epidemic/vaccin.vue

@@ -439,7 +439,8 @@ export default {
     async handleDetail(row) {
       this.formTitle = "详情";
       this.formShow = true;
-      let row2 = await this.getInfo(row);
+      const row1 = { ...row }
+      let row2 = await this.getInfo(row1);
       this.$refs.ref_form.initForm("detail", row2);
     },
 

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

@@ -777,16 +777,16 @@ export default {
     async handleEdit(row) {
       this.editFormTitle = "修改疫苗接种关注名单";
       this.editFormShow = true;
-
-      let row2 = await this.getInfo(row);
+      const row1 = { ...row }
+      let row2 = await this.getInfo(row1);
       this.$refs.ref_form_edit.initForm("edit", row2);
     },
 
     async handleDetail(row) {
       this.editFormTitle = "查看疫苗接种关注名单";
       this.editFormShow = true;
-
-      let row2 = await this.getInfo(row);
+      const row1 = { ...row }
+      let row2 = await this.getInfo(row1);
       this.$refs.ref_form_edit.initForm("detail", row2);
     },