Merge branch 'dev-身份验证1114' into dev

src/assets/scss/buttonstyle.scss

@@ -1,4 +1,5 @@
 //查询、确定
+
 .diy-button--search {
   color: #fff !important;
   background-color: #3e8ef7 !important;

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

@@ -628,12 +628,13 @@ export default {
     },
 
     async timingNat (row) {
-      const url = "/epmetuser/dataSyncConfig/natInfoSyncButton"
+      const url = "/epmetuser/dataSyncConfig/submitSyncJob"
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/synchro"
 
       let params = {
         isSync: '1',
         dataCode: 'hesuan',
+        jobType: 'nat',
         agencyId: this.agencyId
       }
 

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

@@ -123,6 +123,11 @@
                    class="diy-button--reset"
                    size="small"
                    @click="handleExport">导出</el-button>
+        <el-button v-if="isYantai"
+                   style="float:left;margin-left:10px"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleTiming()">更新数据</el-button>
       </div>
 
       <el-table class="table"
@@ -286,6 +291,7 @@ export default {
       pageNo: 0,
       tableLoading: false,
       isResiUser: true,
+      isYantai: false,
 
       agencyId: "",
       orgTypeList: [
@@ -345,6 +351,16 @@ export default {
   },
   async created () { },
   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;
@@ -478,6 +494,49 @@ export default {
       return row;
     },
 
+    async handleTiming (row) {
+
+      this.$confirm("确认执行更新数据?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.timingVaccin(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async timingVaccin (row) {
+      const url = "/epmetuser/dataSyncConfig/submitSyncJob"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/synchro"
+
+      let params = {
+        isSync: '1',
+        dataCode: 'yimiaojiezhong',
+        jobType: 'vaccine',
+        agencyId: this.agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功"
+        });
+
+        // this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
     async handleDelete (row) {
       let message = "确认删除?";
 

src/views/modules/shujuduibi/shenfenyizhi.vue

@@ -63,6 +63,7 @@
         <el-button class="diy-button--reset"
                    size="small"
                    @click="handleExport">导出</el-button>
+
         <el-button class="diy-button--add"
                    size="small"
                    @click="handleBatchCompare">批量比对</el-button>