Merge branch 'dev-磐石烟台1107' into dev

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

@@ -559,7 +559,7 @@ export default {
   async mounted () {
     //磐石街道：1580460084738760705
     this.customerId = localStorage.getItem("customerId");
-    this.isPanshi = true
+    this.isPanshi = false
     this.reasonTitle = '关注原因'
     if (this.customerId === '1580460084738760705') {
       this.isPanshi = true

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

@@ -501,7 +501,7 @@ export default {
   async mounted () {
     //磐石街道：1580460084738760705
     this.customerId = localStorage.getItem("customerId");
-    this.isPanshi = true
+    this.isPanshi = false
     this.reasonTitle = '关注原因'
     if (this.customerId === '1580460084738760705') {
       this.isPanshi = true

src/views/modules/base/epidemic/natInfo/natList.vue

@@ -141,10 +141,11 @@
                    size="small"
                    @click="handleExport">导出</el-button>
 
-        <el-button style="float:left;margin-left:10px"
+        <el-button v-if="isYantai"
+                   style="float:left;margin-left:10px"
                    class="diy-button--export"
                    size="small"
-                   @click="handleTiming()">定时</el-button>
+                   @click="handleTiming()">更新数据</el-button>
       </div>
 
       <el-table class="table"
@@ -318,6 +319,8 @@ export default {
       pageNo: 0,
       tableLoading: false,
       isResiUser: true,
+      customerId: '',
+      isYantai: false,
 
       agencyId: '',
       orgTypeList: [
@@ -382,6 +385,16 @@ export default {
 
   },
   async mounted () {
+    //磐石街道：1580460084738760705
+    //烟台客户id:   1535072605621841922
+    this.customerId = localStorage.getItem("customerId");
+    this.isYantai = false
+
+    if (this.customerId === '1535072605621841922') {
+      this.isYantai = true
+
+    }
+
     this.updateBtnAuths();
 
     const { user } = this.$store.state
@@ -598,7 +611,7 @@ export default {
 
     async handleTiming (row) {
 
-      this.$confirm("确认执行定时任务?", "提示", {
+      this.$confirm("确认执行更新数据?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -615,7 +628,7 @@ export default {
     },
 
     async timingNat (row) {
-      const url = "/epmetuser/dataSyncConfig/natInfoScanTask"
+      const url = "/epmetuser/dataSyncConfig/natInfoSyncButton"
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/synchro"
 
       let params = {

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

@@ -12,7 +12,7 @@
           </div>
           <div class="info-prop">
             <span class="info-title-2">服务事项：</span>
-            <span>{{ formData.serviceMatterShow }}</span>
+            <span>{{ formData.serviceMatterName }}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-2">活动标题：</span>

src/views/pages/staffRegister.vue

@@ -14,11 +14,12 @@
 
       <div v-if="selectTab==='1'"
            class="content">
+        <div class="content-title">
+          <mt-cell title="*企业名称">
 
-        <mt-cell title="*企业名称">
-
-          <span style="margin-right:20px">{{placeOrgName}}</span>
-        </mt-cell>
+            <span style="margin-right:20px">{{placeOrgName}}</span>
+          </mt-cell>
+        </div>
         <div class="line"></div>
 
         <mt-field class="my-field"
@@ -64,11 +65,12 @@
       </div>
       <div v-if="selectTab==='2'"
            class="content">
+        <div class="content-title">
+          <mt-cell title="*企业名称">
 
-        <mt-cell title="*企业名称">
-
-          <span style="margin-right:20px">{{placeOrgName}}</span>
-        </mt-cell>
+            <span style="margin-right:20px">{{placeOrgName}}</span>
+          </mt-cell>
+        </div>
         <div class="line"></div>
         <div @click="handelSelData()">
           <mt-cell :title="'*核酸检测时间'"
@@ -452,13 +454,19 @@ export default {
 /deep/ .mint-cell-wrapper {
   padding: 0 5px 0 0;
 }
+.content-title {
+  /deep/ .mint-cell-value {
+    flex: 0 0 200px;
+  }
+}
+
 .my-field /deep/ .mint-field-core {
   text-align: right;
   margin-right: 20px;
 }
-.my-field /deep/ .mint-cell-title {
-  width: 110px;
-}
+// .my-field {
+//   /deep/
+// }
 
 /deep/ .mint-popup-bottom {
   height: 300px;