From 88edeb6cb2a58dad77658c915b006f93b19fe377 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 24 Jun 2022 15:39:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9?=
 =?UTF-8?q?=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E7=82=B9=20PC=20?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../point/icpointnucleicmonitoring.vue        | 61 ++++++++++---------
 .../point/icpointvaccinesinoculation.vue      | 24 ++++++--
 2 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index ffba3c65..6ce82ba5 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -6,18 +6,6 @@
         :model="dataForm"
         @keyup.enter.native="getDataList()"
       >
-        <!--<el-form-item label="所属组织名称" prop="orgName">-->
-        <!--<el-select v-model="dataForm.orgName" placeholder="所属组织名称">-->
-        <!--<el-option-->
-        <!--ref="org"-->
-        <!--v-for="item in organizationList"-->
-        <!--:key="item.orgId"-->
-        <!--:label="item.orgName"-->
-        <!--:value="item.orgId"-->
-        <!--&gt;-->
-        <!--</el-option>-->
-        <!--</el-select>-->
-        <!--</el-form-item>-->
         <el-form-item label="所属组织名称" prop="orgName" label-width="130px">
           <el-cascader
             ref="org"
@@ -45,28 +33,27 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button class="diy-button--search" @click="getDataList()">{{
+          <el-button class="diy-button--search" size="small" @click="getDataList()">{{
             $t("query")
           }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button
-            class="diy-button--add"
-            type="primary"
-            @click="addOrUpdateHandle()"
-            >{{ $t("add") }}</el-button
-          >
+                     size="small"
+                     class="diy-button--reset"
+                     @click="resetSearch">重置</el-button>
         </el-form-item>
-        <!--<el-form-item>-->
-        <!--<el-button type="danger" @click="deleteHandle()">{{-->
-        <!--$t("deleteBatch")-->
-        <!--}}</el-button>-->
-        <!--</el-form-item>-->
       </el-form>
     </div>
 
     <div class="div_table">
       <div class="exportBtn">
+        <el-button
+                class="diy-button--add"
+                type="primary" size="small"
+                @click="addOrUpdateHandle('','新增')"
+        >{{ $t("add") }}</el-button
+        >
         <el-button
           style="margin-left: 10px"
           class="diy-button--export"
@@ -160,10 +147,16 @@
           width="150"
         >
           <template slot-scope="scope">
+            <el-button
+                    type="text"
+                    size="small"
+                    @click="addOrUpdateHandle(scope.row.id,'查看')"
+            >{{ '查看' }}</el-button
+            >
             <el-button
               type="text"
               size="small"
-              @click="addOrUpdateHandle(scope.row.id)"
+              @click="addOrUpdateHandle(scope.row.id,'修改')"
               >{{ $t("update") }}</el-button
             >
             <el-button
@@ -189,7 +182,7 @@
     <!-- 弹窗, 新增 / 修改 -->
     <el-dialog
       :visible.sync="addOrUpdateVisible"
-      :title="!updateId ? $t('add') : $t('update')"
+      :title="dialogTitle"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       :destroy-on-close="true"
@@ -239,7 +232,7 @@ export default {
       },
       organizationList: [],
       orgIds: [],
-      updateId: null,
+      dialogTitle: '',
       sendNoticeFormShow:false,
       noticeVisible:false,
       noticeOrigin:"3"
@@ -254,6 +247,16 @@ export default {
     this.getFormInfo();
   },
   methods: {
+      //重置搜索条件
+      resetSearch () {
+          this.dataForm = {
+              name: '',
+              mobile: '',
+              orgId: ''
+          }
+          this.pageNo = 1
+          this.orgIds = []
+      },
     // 发送通知
     handleSendNotice () {
       this.sendNoticeFormShow = true
@@ -263,8 +266,8 @@ export default {
       this.sendNoticeFormShow = false
     },
     // 新增 / 修改
-    addOrUpdateHandle(id) {
-      this.updateId = id;
+    addOrUpdateHandle(id,title) {
+      this.dialogTitle = title;
       this.$nextTick(() => {
         this.$refs.addOrUpdate.dataForm.id = id;
         this.$refs.addOrUpdate.init();
@@ -274,7 +277,7 @@ export default {
     // 关闭弹窗
     closeDialog() {
       this.addOrUpdateVisible = false;
-      this.updateId = null;
+      this.dialogTitle = '';
     },
     // 获取所属组织列表
     getFormInfo() {
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 2fac69f9..8827f4a9 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -21,17 +21,15 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button class="diy-button--search" @click="getDataList()">{{
+          <el-button class="diy-button--search" size="small" @click="getDataList()">{{
             $t("query")
           }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button
-            class="diy-button--add"
-            type="primary"
-            @click="addOrUpdateHandle()"
-            >{{ $t("add") }}</el-button
-          >
+                     size="small"
+                     class="diy-button--reset"
+                     @click="resetSearch">重置</el-button>
         </el-form-item>
         <!--<el-form-item>-->
         <!--<el-button type="danger" @click="deleteHandle()">{{-->
@@ -42,6 +40,12 @@
     </div>
     <div class="div_table">
       <div class="exportBtn">
+        <el-button
+                class="diy-button--add"
+                type="primary" size="small"
+                @click="addOrUpdateHandle()"
+        >{{ $t("add") }}</el-button
+        >
         <el-button
           style="margin-left: 10px"
           class="diy-button--export"
@@ -254,6 +258,14 @@ export default {
     this.noticeFun()
   },
   methods: {
+      //重置搜索条件
+      resetSearch () {
+          this.dataForm = {
+              name: '',
+              mobile: ''
+          }
+          this.pageNo = 1
+      },
     // 发送通知
     handleSendNotice () {
       this.sendNoticeFormShow = true