111

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

@@ -149,10 +149,10 @@ export default {
   methods: {
 
     async initTable (row, origin) {
-
+      console.log('row', row)
       this.formData.idCard = row.realIdCard
       this.formData.name = row.name
-      this.formData.mobile = row.mobile
+      this.formData.mobile = row.realMobile
       this.formData.origin = origin
 
       await this.loadTable()

src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue

@@ -46,7 +46,7 @@
           </div>
 
           <div class="info-prop">
-            <span class="info-title-3">来曹居住地点：</span>
+            <span class="info-title-3">在曹居住地点：</span>
             <span>{{ formData.presentAddress||'--'  }}</span>
           </div>
           <div class="info-prop">

src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue

@@ -152,7 +152,7 @@
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item label="来曹居住地点"
+        <el-form-item label="在曹居住地点"
                       prop="presentAddress"
                       style="display: block">
 
@@ -473,10 +473,10 @@ export default {
         ],
 
         presentAddress: [
-          { required: true, message: '来曹居住地点不能为空', trigger: 'change' },
+          { required: true, message: '在曹居住地点不能为空', trigger: 'change' },
         ],
         detailAddress: [
-          { required: true, message: '来曹居住详细地址不能为空', trigger: 'change' },
+          { required: true, message: '在曹居住详细地址不能为空', trigger: 'change' },
         ],
 
         trafficType: [

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

@@ -151,10 +151,10 @@ export default {
   methods: {
 
     async initTable (row) {
-
+      console.log(row)
-      this.formData.idCard = row.idCard
+      this.formData.idCard = row.realIdCard
       this.formData.name = row.name
-      this.formData.mobile = row.mobile
+      this.formData.mobile = row.realMobile
 
       await this.loadTable()
 

src/views/modules/communityParty/regionalParty/activitys.vue

@@ -193,13 +193,14 @@
                        style="color:#1C6AFD;text-decoration: underline;"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-            <el-button v-if="!scope.row.actId"
+            <el-button v-if="agencyId===scope.row.agencyId&&!scope.row.actId"
                        type="text"
                        style="color:#00A7A9;text-decoration: underline;"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
 
-            <el-button type="text"
+            <el-button v-if="agencyId===scope.row.agencyId"
+                       type="text"
                        style="color:#D51010;text-decoration: underline;"
                        size="small"
                        @click="handleDelete(scope.row)">删除</el-button>

src/views/modules/communityParty/regionalParty/units.vue

@@ -128,6 +128,12 @@
                          label="单位名称"
                          min-width="100">
         </el-table-column>
+        <el-table-column prop="agencyName"
+                         header-align="center"
+                         align="center"
+                         label="所属组织"
+                         min-width="100">
+        </el-table-column>
         <el-table-column prop="type"
                          header-align="center"
                          align="center"
@@ -197,12 +203,14 @@
                        class="div-table-button--detail"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-            <el-button type="text"
+            <el-button v-if="agencyId===scope.row.agencyId"
+                       type="text"
                        class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
 
-            <el-popover popper-class="btn-popper"
+            <el-popover v-if="agencyId===scope.row.agencyId"
+                        popper-class="btn-popper"
                         placement="bottom"
                         style="margin-left:10px"
                         width="20"
@@ -247,6 +255,12 @@
                          slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
             </el-popover>
 
+            <el-button v-else
+                       type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleScore(scope.row)">积分记录</el-button>
+
           </template>
         </el-table-column>
       </el-table>