From e25d1aeef6a1faf5b7515723d0fbbb152eb664a4 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Mon, 14 Nov 2022 21:30:43 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B"?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE"=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0jobType=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/epidemic/natInfo/natList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue
index 776c8c993..5948e40fe 100644
--- a/src/views/modules/base/epidemic/natInfo/natList.vue
+++ b/src/views/modules/base/epidemic/natInfo/natList.vue
@@ -634,6 +634,7 @@ export default {
       let params = {
         isSync: '1',
         dataCode: 'hesuan',
+        jobType: 'nat',
         agencyId: this.agencyId
       }
 

From 8effface879e26ed68fcba5d11352ffb23591384 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 15 Nov 2022 09:45:21 +0800
Subject: [PATCH 2/6] 111

---
 src/views/modules/shujuduibi/shenfenyizhi.vue | 530 ++++++++++++++++++
 1 file changed, 530 insertions(+)
 create mode 100644 src/views/modules/shujuduibi/shenfenyizhi.vue

diff --git a/src/views/modules/shujuduibi/shenfenyizhi.vue b/src/views/modules/shujuduibi/shenfenyizhi.vue
new file mode 100644
index 000000000..d80eba408
--- /dev/null
+++ b/src/views/modules/shujuduibi/shenfenyizhi.vue
@@ -0,0 +1,530 @@
+<template>
+  <div class="div_main">
+    <div class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'100px'">
+
+        <el-form-item label="状态"
+                      prop="identical">
+          <el-select class="item_width_1"
+                     v-model="formData.identical"
+                     placeholder="请选择"
+                     size="small"
+                     clearable>
+            <el-option v-for="item in identicalList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+        <el-form-item label="信息一致"
+                      prop="type">
+          <el-select class="item_width_1"
+                     v-model="formData.type"
+                     placeholder="请选择"
+                     size="small"
+                     clearable>
+            <el-option v-for="item in typeList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+        <el-form-item label="身份证号"
+                      prop="unitName">
+          <el-input v-model="formData.idCard"
+                    class="item_width_1"
+                    clearable
+                    size="small"
+                    placeholder="请输入内容">
+          </el-input>
+
+        </el-form-item>
+
+        <el-button style="margin-left:10px"
+                   class="diy-button--search"
+                   size="small"
+                   @click="handleSearch">查询</el-button>
+        <el-button style="margin-left:10px"
+                   class="diy-button--reset"
+                   size="small"
+                   @click="resetSearch">重置</el-button>
+
+      </el-form>
+    </div>
+    <div class="div_table">
+      <div class="div_btn">
+        <el-button class="diy-button--reset"
+                   size="small"
+                   @click="handleExport">导出</el-button>
+        <el-button class="diy-button--add"
+                   size="small"
+                   @click="handleBatchCompare">批量对比</el-button>
+
+      </div>
+
+      <el-table class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%"
+                @select-all="selectAll"
+                @selection-change="selectionChange">
+        <el-table-column type="selection"
+                         fixed="left"
+                         align="center"
+                         width="55" />
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"></el-table-column>
+
+        <el-table-column prop="resiName"
+                         header-align="center"
+                         align="center"
+                         label="居民库-姓名"
+                         min-width="100">
+        </el-table-column>
+        <el-table-column prop="resiIdCard"
+                         header-align="center"
+                         align="center"
+                         label="居民库-证件号"
+                         min-width="120">
+        </el-table-column>
+        <el-table-column prop="policeName"
+                         header-align="center"
+                         align="center"
+                         label="公安-姓名"
+                         min-width="100">
+        </el-table-column>
+        <el-table-column prop="policeIdCard"
+                         header-align="center"
+                         align="center"
+                         label="公安-证件号"
+                         show-overflow-tooltip
+                         min-width="120">
+
+        </el-table-column>
+        <el-table-column prop="typeName"
+                         header-align="center"
+                         align="center"
+                         label="状态"
+                         width="100">
+        </el-table-column>
+        <el-table-column prop="identicalName"
+                         header-align="center"
+                         align="center"
+                         label="信息一致"
+                         width="140">
+        </el-table-column>
+
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="150"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+
+            <el-button v-if="scope.row.type==='0' && scope.row.identical==='0'"
+                       type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleUpdate(scope.row)">更新</el-button>
+            <el-button v-if="scope.row.type==='0' && scope.row.identical==='2'"
+                       type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleCompare(scope.row)">对比</el-button>
+
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[10, 20, 50]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      loading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 0,
+      tableLoading: false,
+      agencyId: '',
+
+      identicalList: [
+        {
+          value: '0',
+          label: '否'
+        },
+        {
+          value: '1',
+          label: '是'
+        },
+        {
+          value: '2',
+          label: '空'
+        }
+      ],//信息一致list
+      typeList: [
+        {
+          value: '0',
+          label: '未处理'
+        },
+        {
+          value: '1',
+          label: '已处理'
+        },
+      ],//状态list
+
+      formData: {
+        identical: '',
+        type: '',
+        idCard: '',
+      },
+
+      tableData: [],
+      selection: [],
+
+    }
+  },
+  components: {
+
+  },
+  async created () {
+
+  },
+  async mounted () {
+
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+
+    await this.loadTable()
+  },
+
+  methods: {
+    selectAll (selection) {
+      this.selection = selection;
+
+    },
+
+    selectionChange (selection) {
+      this.selection = selection;
+
+    },
+
+    handleSearch () {
+      this.loadTable()
+    },
+
+    async loadTable () {
+      this.tableLoading = true
+
+      // const url = "/epmetuser/icResiComparisonRecord/resiComparisonList"
+      const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icResiComparisonRecord/resiComparisonList"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.formData
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.total = data.total
+
+        this.tableData = data.list
+
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+
+    async handleUpdate (row) {
+
+      this.$confirm("确认更新？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.updateRow(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async updateRow (row) {
+      // const url = "/epmetuser/icResiComparisonRecord/comparisonUpdate"
+      const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icResiComparisonRecord/comparisonUpdate"
+
+      let params = {
+        comparisonRecordId: row.comparisonRecordId,
+
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        if (data.type) {
+          this.$message({
+            type: "success",
+            message: data.msg || "更新成功"
+          });
+
+          this.loadTable()
+        } else {
+          this.$message.error(data.msg)
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleCompare (row) {
+
+      this.$confirm("确认对比?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          let array = [row.resiId]
+          this.compareRow(array)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async compareRow (array) {
+      // const url = "/epmetuser/icResiComparisonRecord/comparison"
+      const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icResiComparisonRecord/comparison"
+
+      let params = {}
+
+      if (array.length > 0) {
+        params.userIdList = array
+      } else {
+        params = {}
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        if (data.type) {
+          this.$message({
+            type: "success",
+            message: "对比成功"
+          });
+          this.loadTable()
+        } else {
+          this.$message.error(data.msg)
+        }
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleBatchCompare () {
+
+      this.$confirm("确认批量对比?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+
+          let array = this.selection.map((item) => item.resiId);
+          this.compareRow(array)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    //重置搜索条件
+    resetSearch () {
+      this.formData = {
+        identical: '',
+        type: '',
+        idCard: '',
+      }
+      // this.pageSize = 10
+      this.pageNo = 0
+      // this.loadTable()
+    },
+
+    //导出表格
+    async handleExport () {
+      let title = '身份一致性验证表格'
+
+      const url = "/epmetuser/icResiComparisonRecord/export"
+      let params = {
+
+        ...this.formData
+      }
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+
+    },
+
+    // 下载文件
+    download (data, fileName) {
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement('a');
+        document.body.appendChild(a);
+        a.style = 'display: none';
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
+      }
+
+    },
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+
+      return this.$store.state.inIframe ? this.clientHeight - 370 + this.iframeHeight : this.clientHeight - 370
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+.div_main {
+  width: 100%;
+}
+
+.div_search {
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 30px 20px 5px;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+}
+
+.item_width_1 {
+  width: 260px;
+}
+.item_width_2 {
+  width: 620px;
+}
+
+.div_table {
+  background: #ffffff;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+  margin-top: 15px;
+  padding: 23px 30px 10px;
+
+  .table {
+    margin-top: 20px;
+  }
+}
+
+.el-row {
+  /* margin-bottom: 20px; */
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 10px;
+  margin-right: 50px;
+}
+</style>

From 10fb1b640f26f333b8db4c8c1684aa857ab9196f Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 15 Nov 2022 09:46:47 +0800
Subject: [PATCH 3/6] 11

---
 src/views/modules/shujuduibi/shenfenyizhi.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/shujuduibi/shenfenyizhi.vue b/src/views/modules/shujuduibi/shenfenyizhi.vue
index d80eba408..7491e5ded 100644
--- a/src/views/modules/shujuduibi/shenfenyizhi.vue
+++ b/src/views/modules/shujuduibi/shenfenyizhi.vue
@@ -249,8 +249,8 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
-      // const url = "/epmetuser/icResiComparisonRecord/resiComparisonList"
-      const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icResiComparisonRecord/resiComparisonList"
+      const url = "/epmetuser/icResiComparisonRecord/resiComparisonList"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icResiComparisonRecord/resiComparisonList"
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
@@ -289,8 +289,8 @@ export default {
     },
 
     async updateRow (row) {
-      // const url = "/epmetuser/icResiComparisonRecord/comparisonUpdate"
-      const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icResiComparisonRecord/comparisonUpdate"
+      const url = "/epmetuser/icResiComparisonRecord/comparisonUpdate"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icResiComparisonRecord/comparisonUpdate"
 
       let params = {
         comparisonRecordId: row.comparisonRecordId,
@@ -336,8 +336,8 @@ export default {
     },
 
     async compareRow (array) {
-      // const url = "/epmetuser/icResiComparisonRecord/comparison"
-      const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icResiComparisonRecord/comparison"
+      const url = "/epmetuser/icResiComparisonRecord/comparison"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icResiComparisonRecord/comparison"
 
       let params = {}
 

From 0cd07c6b0d6eed78d0c05e46e01c3cf2a7d5a2f4 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 15 Nov 2022 13:25:26 +0800
Subject: [PATCH 4/6] 111

---
 src/views/modules/shujuduibi/shenfenyizhi.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/shujuduibi/shenfenyizhi.vue b/src/views/modules/shujuduibi/shenfenyizhi.vue
index 7491e5ded..e20af925c 100644
--- a/src/views/modules/shujuduibi/shenfenyizhi.vue
+++ b/src/views/modules/shujuduibi/shenfenyizhi.vue
@@ -6,7 +6,7 @@
                ref="ref_searchform"
                :label-width="'100px'">
 
-        <el-form-item label="状态"
+        <el-form-item label="信息一致"
                       prop="identical">
           <el-select class="item_width_1"
                      v-model="formData.identical"
@@ -21,7 +21,7 @@
           </el-select>
 
         </el-form-item>
-        <el-form-item label="信息一致"
+        <el-form-item label="状态"
                       prop="type">
           <el-select class="item_width_1"
                      v-model="formData.type"
@@ -65,7 +65,7 @@
                    @click="handleExport">导出</el-button>
         <el-button class="diy-button--add"
                    size="small"
-                   @click="handleBatchCompare">批量对比</el-button>
+                   @click="handleBatchCompare">批量比对</el-button>
 
       </div>
 
@@ -135,7 +135,7 @@
                          class="operate">
           <template slot-scope="scope">
 
-            <el-button v-if="scope.row.type==='0' && scope.row.identical==='0'"
+            <el-button v-if="scope.row.type==='0' && scope.row.identical==='0' && scope.row.comparisonRecordId"
                        type="text"
                        class="div-table-button--detail"
                        size="small"
@@ -344,7 +344,7 @@ export default {
       if (array.length > 0) {
         params.userIdList = array
       } else {
-        params = {}
+        params.userIdList = []
       }
 
       const { data, code, msg } = await requestPost(url, params)

From 1bbbe67718a7652eafe4596468ff532013aed712 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 15 Nov 2022 13:35:38 +0800
Subject: [PATCH 5/6] 11

---
 .../modules/base/epidemic/natInfo/natList.vue |  3 +-
 src/views/modules/base/epidemic/vaccin.vue    | 59 +++++++++++++++++++
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue
index 776c8c993..895fe1c46 100644
--- a/src/views/modules/base/epidemic/natInfo/natList.vue
+++ b/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
       }
 
diff --git a/src/views/modules/base/epidemic/vaccin.vue b/src/views/modules/base/epidemic/vaccin.vue
index 46616b4c4..25b928707 100644
--- a/src/views/modules/base/epidemic/vaccin.vue
+++ b/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 = "确认删除?";
 

From fd8ce998a5b7ab4f48a2087daecefa3f1f52caf3 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 15 Nov 2022 14:55:30 +0800
Subject: [PATCH 6/6] 11

---
 src/assets/scss/buttonstyle.scss              | 1 +
 src/views/modules/shujuduibi/shenfenyizhi.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/assets/scss/buttonstyle.scss b/src/assets/scss/buttonstyle.scss
index 7a60a21be..43c3e4050 100644
--- a/src/assets/scss/buttonstyle.scss
+++ b/src/assets/scss/buttonstyle.scss
@@ -1,4 +1,5 @@
 //查询、确定
+
 .diy-button--search {
   color: #fff !important;
   background-color: #3e8ef7 !important;
diff --git a/src/views/modules/shujuduibi/shenfenyizhi.vue b/src/views/modules/shujuduibi/shenfenyizhi.vue
index e20af925c..15a62229c 100644
--- a/src/views/modules/shujuduibi/shenfenyizhi.vue
+++ b/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>