From f620f8b1f1a81dd1b533e71e9f2cbdfdb20efe1d Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Fri, 24 Jun 2022 16:15:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...icpointnucleicmonitoring-add-or-update.vue |  14 ++-
 .../point/icpointnucleicmonitoring.vue        | 114 ++++++++++--------
 ...pointvaccinesinoculation-add-or-update.vue |  27 +++--
 .../point/icpointvaccinesinoculation.vue      | 112 +++++++++--------
 4 files changed, 157 insertions(+), 110 deletions(-)

diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
index 4365131b..56afb75a 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@@ -8,7 +8,7 @@
       label-width="120px"
     >
       <el-form-item label="所属组织名称" prop="orgId">
-        <el-select v-model="dataForm.orgId" placeholder="所属组织名称" @change="orgChangeHandle">
+        <el-select v-model="dataForm.orgId" placeholder="所属组织名称" @change="orgChangeHandle" :disabled='dialogTitle == "查看"'>
           <el-option
             ref="org"
             v-for="item in organizationList"
@@ -23,6 +23,7 @@
         <el-input
           v-model="dataForm.name"
           placeholder="核酸检测点名称"
+          :disabled='dialogTitle == "查看"'
         ></el-input>
       </el-form-item>
       <el-form-item label="服务时间" prop="serveTime">
@@ -31,6 +32,7 @@
           type="textarea"
           :rows="2"
           placeholder="请输入服务时间，如：每日开放 上午：8:00-11:30 ；下午：13:00-17:00"
+          :disabled='dialogTitle == "查看"'
         ></el-input>
       </el-form-item>
       <el-form-item label="咨询电话" prop="mobile">
@@ -38,6 +40,7 @@
           v-model="dataForm.mobile"
           placeholder="咨询电话"
           :change="check_num()"
+          :disabled='dialogTitle == "查看"'
         ></el-input>
       </el-form-item>
       <el-form-item label="检测点地址" prop="address">
@@ -55,6 +58,7 @@
             placeholder="例:青岛市时代国际广场"
             v-model="keyWords"
             style="width: 200px"
+            :disabled='dialogTitle == "查看"'
           >
           </el-input>
           <el-button
@@ -96,7 +100,7 @@
     </el-form>
     <div class="submit">
       <el-button @click="closeSubmit">{{ $t("cancel") }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{
+      <el-button v-if='dialogTitle != "查看"' type="primary" @click="dataFormSubmitHandle()">{{
         $t("confirm")
       }}</el-button>
     </div>
@@ -203,6 +207,12 @@ export default {
   mounted() {
     this.getFormInfo();
   },
+  props:{
+    dialogTitle:{
+      type:String,
+      default:''
+    }
+  },
   methods: {
     closeSubmit(){
       this.$emit('closeDialog')
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index 6ce82ba5..d69ba9f6 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -33,15 +33,17 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button class="diy-button--search" size="small" @click="getDataList()">{{
-            $t("query")
-          }}</el-button>
+          <el-button
+            class="diy-button--search"
+            size="small"
+            @click="getDataList()"
+            >{{ $t("query") }}</el-button
+          >
         </el-form-item>
         <el-form-item>
-          <el-button
-                     size="small"
-                     class="diy-button--reset"
-                     @click="resetSearch">重置</el-button>
+          <el-button size="small" class="diy-button--reset" @click="resetSearch"
+            >重置</el-button
+          >
         </el-form-item>
       </el-form>
     </div>
@@ -49,10 +51,11 @@
     <div class="div_table">
       <div class="exportBtn">
         <el-button
-                class="diy-button--add"
-                type="primary" size="small"
-                @click="addOrUpdateHandle('','新增')"
-        >{{ $t("add") }}</el-button
+          class="diy-button--add"
+          type="primary"
+          size="small"
+          @click="addOrUpdateHandle('', '新增')"
+          >{{ $t("add") }}</el-button
         >
         <el-button
           style="margin-left: 10px"
@@ -148,15 +151,15 @@
         >
           <template slot-scope="scope">
             <el-button
-                    type="text"
-                    size="small"
-                    @click="addOrUpdateHandle(scope.row.id,'查看')"
-            >{{ '查看' }}</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
@@ -188,24 +191,29 @@
       :destroy-on-close="true"
     >
       <add-or-update
-        v-if="addOrUpdateVisible"
         ref="addOrUpdate"
         @refreshDataList="getDataList"
         @closeDialog="closeDialog"
+        :dialogTitle="dialogTitle"
       ></add-or-update>
     </el-dialog>
     <!-- 发送通知弹出框 -->
-    <el-dialog :visible.sync="sendNoticeFormShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               title="发送通知"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose"
-               :destroy-on-close="true">
-      <icpoint-noice ref="ref_sendnotice"
-                      @diaClose="diaClose" :noticeOrigin="noticeOrigin"></icpoint-noice>
+    <el-dialog
+      :visible.sync="sendNoticeFormShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="发送通知"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="diaClose"
+      :destroy-on-close="true"
+    >
+      <icpoint-noice
+        ref="ref_sendnotice"
+        @diaClose="diaClose"
+        :noticeOrigin="noticeOrigin"
+      ></icpoint-noice>
     </el-dialog>
   </div>
 </template>
@@ -213,7 +221,7 @@
 <script>
 import mixinViewModule from "@/mixins/view-module";
 import AddOrUpdate from "./icpointnucleicmonitoring-add-or-update";
-import icpointNoice from './icpointNoice'
+import icpointNoice from "./icpointNoice";
 
 export default {
   mixins: [mixinViewModule],
@@ -232,41 +240,41 @@ export default {
       },
       organizationList: [],
       orgIds: [],
-      dialogTitle: '',
-      sendNoticeFormShow:false,
-      noticeVisible:false,
-      noticeOrigin:"3"
+      dialogTitle: "",
+      sendNoticeFormShow: false,
+      noticeVisible: false,
+      noticeOrigin: "3",
     };
   },
   components: {
     AddOrUpdate,
-    icpointNoice
+    icpointNoice,
   },
   created() {
-    this.noticeFun()
+    this.noticeFun();
     this.getFormInfo();
   },
   methods: {
-      //重置搜索条件
-      resetSearch () {
-          this.dataForm = {
-              name: '',
-              mobile: '',
-              orgId: ''
-          }
-          this.pageNo = 1
-          this.orgIds = []
-      },
+    //重置搜索条件
+    resetSearch() {
+      this.dataForm = {
+        name: "",
+        mobile: "",
+        orgId: "",
+      };
+      this.pageNo = 1;
+      this.orgIds = [];
+    },
     // 发送通知
-    handleSendNotice () {
-      this.sendNoticeFormShow = true
+    handleSendNotice() {
+      this.sendNoticeFormShow = true;
     },
     // 关闭通知
-    diaClose(){
-      this.sendNoticeFormShow = false
+    diaClose() {
+      this.sendNoticeFormShow = false;
     },
     // 新增 / 修改
-    addOrUpdateHandle(id,title) {
+    addOrUpdateHandle(id, title) {
       this.dialogTitle = title;
       this.$nextTick(() => {
         this.$refs.addOrUpdate.dataForm.id = id;
@@ -277,7 +285,7 @@ export default {
     // 关闭弹窗
     closeDialog() {
       this.addOrUpdateVisible = false;
-      this.dialogTitle = '';
+      this.dialogTitle = "";
     },
     // 获取所属组织列表
     getFormInfo() {
@@ -293,12 +301,12 @@ export default {
         .catch(() => {});
     },
     // 获取发送通知按钮显示与隐藏
-    noticeFun(){
+    noticeFun() {
       this.$http
         .post(`/epmetuser/icPointNucleicMonitoring/getShowType`)
         .then(({ data: res }) => {
           if (res.code === 0 && res.data) {
-            this.noticeVisible = true
+            this.noticeVisible = true;
           }
         })
         .catch(() => {});
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
index f71ec288..a2de7613 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -22,6 +22,7 @@
         <el-input
           v-model="dataForm.name"
           placeholder="疫苗接种点名称"
+          :disabled='dialogTitle == "查看"'
         ></el-input>
       </el-form-item>
       <el-form-item label="接种日期" prop="inoculationDate">
@@ -34,6 +35,7 @@
           value-format="yyyy-MM-dd"
           type="date"
           placeholder="选择日期"
+          :disabled='dialogTitle == "查看"'
         >
         </el-date-picker>
       </el-form-item>
@@ -41,12 +43,14 @@
         <el-time-picker
           is-range
           v-model="startTime"
-          value-format="HH:mm:ss"
+          format="HH:mm"
+          value-format="HH:mm"
           range-separator="至"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
           placeholder="选择时间范围"
           @change="startTimeChange"
+          :disabled='dialogTitle == "查看"'
         >
         </el-time-picker>
       </el-form-item>
@@ -54,15 +58,14 @@
         <el-time-picker
           is-range
           v-model="endTime"
-          value-format="HH:mm:ss"
+          format="HH:mm"
+          value-format="HH:mm"
           range-separator="至"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
           placeholder="选择时间范围"
           @change="endTimeChange"
-          :picker-options="{
-            selectableRange: '12:00:01 - 24:00:00',
-          }"
+          :disabled='dialogTitle == "查看"'
         >
         </el-time-picker>
       </el-form-item>
@@ -95,11 +98,12 @@
           v-model="dataForm.noAvailableVaccines"
           true-label="2"
           false-label="1"
+          :disabled='dialogTitle == "查看"'
           >暂无疫苗</el-checkbox
         >
       </el-form-item>
       <el-form-item label="咨询电话" prop="mobile">
-        <el-input v-model="dataForm.mobile" placeholder="咨询电话"></el-input>
+        <el-input v-model="dataForm.mobile" :disabled='dialogTitle == "查看"' placeholder="咨询电话"></el-input>
       </el-form-item>
       <el-form-item label="接种点地址" prop="address">
         <el-input
@@ -121,6 +125,7 @@
             placeholder="例:青岛市时代国际广场"
             v-model="keyWords"
             style="width: 200px"
+            :disabled='dialogTitle == "查看"'
           >
           </el-input>
           <el-button
@@ -162,7 +167,7 @@
     </el-form>
     <div class="submit">
       <el-button @click="closeSubmit">{{ $t("cancel") }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{
+      <el-button v-if='dialogTitle != "查看"' type="primary" @click="dataFormSubmitHandle()">{{
         $t("confirm")
       }}</el-button>
     </div>
@@ -295,6 +300,12 @@ export default {
       };
     },
   },
+  props:{
+    dialogTitle:{
+      type:String,
+      default:''
+    }
+  },
   methods: {
     startTimeChange() {
       if (Array.isArray(this.startTime) && this.startTime.length > 0) {
@@ -472,6 +483,8 @@ export default {
             ...this.dataForm,
             ...res.data,
           };
+          this.startTime = [res.data.moStartTime,res.data.moEndTime]
+          this.endTime = [res.data.afStartTime,res.data.afEndTime]
           this.initMap();
         })
         .catch(() => {});
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 8827f4a9..8f06b1af 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -21,15 +21,17 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button class="diy-button--search" size="small" @click="getDataList()">{{
-            $t("query")
-          }}</el-button>
+          <el-button
+            class="diy-button--search"
+            size="small"
+            @click="getDataList()"
+            >{{ $t("query") }}</el-button
+          >
         </el-form-item>
         <el-form-item>
-          <el-button
-                     size="small"
-                     class="diy-button--reset"
-                     @click="resetSearch">重置</el-button>
+          <el-button size="small" class="diy-button--reset" @click="resetSearch"
+            >重置</el-button
+          >
         </el-form-item>
         <!--<el-form-item>-->
         <!--<el-button type="danger" @click="deleteHandle()">{{-->
@@ -41,10 +43,11 @@
     <div class="div_table">
       <div class="exportBtn">
         <el-button
-                class="diy-button--add"
-                type="primary" size="small"
-                @click="addOrUpdateHandle()"
-        >{{ $t("add") }}</el-button
+          class="diy-button--add"
+          type="primary"
+          size="small"
+          @click="addOrUpdateHandle('', '新增')"
+          >{{ $t("add") }}</el-button
         >
         <el-button
           style="margin-left: 10px"
@@ -172,7 +175,13 @@
             <el-button
               type="text"
               size="small"
-              @click="addOrUpdateHandle(scope.row.id)"
+              @click="addOrUpdateHandle(scope.row.id, '查看')"
+              >{{ "查看" }}</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="addOrUpdateHandle(scope.row.id, '修改')"
               >{{ $t("update") }}</el-button
             >
             <el-button
@@ -198,7 +207,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"
@@ -207,20 +216,26 @@
         ref="addOrUpdate"
         @refreshDataList="getDataList"
         @closeDialog="closeDialog"
+        :dialogTitle="dialogTitle"
       ></add-or-update>
     </el-dialog>
     <!-- 发送通知弹出框 -->
-    <el-dialog :visible.sync="sendNoticeFormShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               title="发送通知"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose"
-               :destroy-on-close="true">
-      <icpoint-noice ref="ref_sendnotice"
-                      @diaClose="diaClose" :noticeOrigin="noticeOrigin" ></icpoint-noice>
+    <el-dialog
+      :visible.sync="sendNoticeFormShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="发送通知"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="diaClose"
+      :destroy-on-close="true"
+    >
+      <icpoint-noice
+        ref="ref_sendnotice"
+        @diaClose="diaClose"
+        :noticeOrigin="noticeOrigin"
+      ></icpoint-noice>
     </el-dialog>
   </div>
 </template>
@@ -228,7 +243,7 @@
 <script>
 import mixinViewModule from "@/mixins/view-module";
 import AddOrUpdate from "./icpointvaccinesinoculation-add-or-update";
-import icpointNoice from './icpointNoice'
+import icpointNoice from "./icpointNoice";
 
 export default {
   mixins: [mixinViewModule],
@@ -245,49 +260,50 @@ export default {
         mobile: "",
       },
       updateId: null,
-      sendNoticeFormShow:false,
-      noticeVisible:false,
-      noticeOrigin:"4"
+      sendNoticeFormShow: false,
+      noticeVisible: false,
+      noticeOrigin: "4",
+      dialogTitle: '',
     };
   },
   components: {
     AddOrUpdate,
-    icpointNoice
+    icpointNoice,
   },
-  mounted(){
-    this.noticeFun()
+  mounted() {
+    this.noticeFun();
   },
   methods: {
-      //重置搜索条件
-      resetSearch () {
-          this.dataForm = {
-              name: '',
-              mobile: ''
-          }
-          this.pageNo = 1
-      },
+    //重置搜索条件
+    resetSearch() {
+      this.dataForm = {
+        name: "",
+        mobile: "",
+      };
+      this.pageNo = 1;
+    },
     // 发送通知
-    handleSendNotice () {
-      this.sendNoticeFormShow = true
+    handleSendNotice() {
+      this.sendNoticeFormShow = true;
     },
     // 关闭通知
-    diaClose(){
-      this.sendNoticeFormShow = false
+    diaClose() {
+      this.sendNoticeFormShow = false;
     },
     // 获取发送通知按钮显示与隐藏
-    noticeFun(){
+    noticeFun() {
       this.$http
         .post(`/epmetuser/icPointNucleicMonitoring/getShowType`)
         .then(({ data: res }) => {
           if (res.code === 0 && res.data) {
-            this.noticeVisible = true
+            this.noticeVisible = true;
           }
         })
         .catch(() => {});
     },
     // 新增 / 修改
-    addOrUpdateHandle(id) {
-      this.updateId = id;
+    addOrUpdateHandle(id,title) {
+      this.dialogTitle = title;
       this.$nextTick(() => {
         this.$refs.addOrUpdate.dataForm.id = id;
         this.$refs.addOrUpdate.init();
@@ -297,7 +313,7 @@ export default {
     // 关闭弹窗
     closeDialog() {
       this.addOrUpdateVisible = false;
-      this.updateId = null;
+      this.dialogTitle = '';
     },
     handleExportModule() {
       let title = "疫苗接种点模板";